Add webkit USE flag to control building of webview library (bug #462544).

Drop cppunit dep since we don't run tests (bug #462876).

(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 957A8463)

3 files changed, 18 insertions, 9 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 41530f1bd015..c9edc4b03c95 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.298 2013/02/04 01:50:56 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.299 2013/03/26 03:47:46 dirtyepic Exp $
+
+  26 Mar 2013; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.9.3.1.ebuild,
+  wxGTK-2.9.4.1.ebuild:
+  Add webkit USE flag to control building of webview library (bug #462544).
+  Drop cppunit dep since we don't run tests (bug #462876).
 
   04 Feb 2013; Benda Xu <heroxbd@gentoo.org> wxGTK-2.8.12.1.ebuild:
   fix Prefix library location in configure. bug 394123
diff --git a/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild
index 1fe678f6b8a7..b849e9ebcc72 100644
--- a/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild,v 1.6 2012/11/23 04:53:30 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.3.1.ebuild,v 1.7 2013/03/26 03:47:46 dirtyepic Exp $
 
 EAPI="3"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
 	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="X aqua doc debug gnome gstreamer opengl pch sdl tiff"
+IUSE="X aqua doc debug gnome gstreamer opengl pch sdl tiff webkit"
 
 RDEPEND="
 	dev-libs/expat
@@ -37,6 +37,7 @@ RDEPEND="
 			media-libs/gst-plugins-base:0.10 )
 		opengl? ( virtual/opengl )
 		tiff?   ( media-libs/tiff:0 )
+		webkit? ( net-libs/webkit-gtk:2 )
 		)
 	aqua? (
 		>=x11-libs/gtk+-2.4[aqua=]
@@ -52,7 +53,7 @@ DEPEND="${RDEPEND}
 		x11-proto/xineramaproto
 		x11-proto/xf86vidmodeproto
 		)"
-#		test? ( dev-util/cppunit )
+#	test? ( dev-util/cppunit )
 
 PDEPEND=">=app-admin/eselect-wxwidgets-1.4"
 
@@ -104,6 +105,7 @@ src_configure() {
 			--with-libjpeg=sys
 			--without-gnomevfs
 			$(use_enable gstreamer mediactrl)
+			$(use_enable webkit webview)
 			$(use_with opengl)
 			$(use_with gnome gnomeprint)
 			$(use_with !gnome gtkprint)
diff --git a/x11-libs/wxGTK/wxGTK-2.9.4.1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.4.1.ebuild
index 3327096e7a86..0786b2c63a47 100644
--- a/x11-libs/wxGTK/wxGTK-2.9.4.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.9.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.4.1.ebuild,v 1.3 2012/11/23 04:53:30 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.4.1.ebuild,v 1.4 2013/03/26 03:47:46 dirtyepic Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/wxpython/wxPython-src-2.9.4.0.tar.bz2
 	mirror://sourceforge/wxpython/wxPython-src-${PV}.patch"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="X aqua doc debug gnome gstreamer opengl pch sdl tiff"
+IUSE="X aqua doc debug gnome gstreamer opengl pch sdl tiff webkit"
 
 RDEPEND="
 	dev-libs/expat
@@ -38,6 +38,7 @@ RDEPEND="
 			media-libs/gst-plugins-base:0.10 )
 		opengl? ( virtual/opengl )
 		tiff?   ( media-libs/tiff:0 )
+		webkit? ( net-libs/webkit-gtk:2 )
 		)
 	aqua? (
 		>=x11-libs/gtk+-2.4[aqua=]
@@ -46,7 +47,6 @@ RDEPEND="
 		)"
 
 DEPEND="${RDEPEND}
-	dev-util/cppunit
 	virtual/pkgconfig
 	opengl? ( virtual/glu )
 	X?  (
@@ -54,6 +54,7 @@ DEPEND="${RDEPEND}
 		x11-proto/xineramaproto
 		x11-proto/xf86vidmodeproto
 		)"
+#	test? ( dev-util/cppunit )
 
 PDEPEND=">=app-admin/eselect-wxwidgets-1.4"
 
@@ -106,6 +107,7 @@ src_configure() {
 			--with-libjpeg=sys
 			--without-gnomevfs
 			$(use_enable gstreamer mediactrl)
+			$(use_enable webkit webview)
 			$(use_with opengl)
 			$(use_with gnome gnomeprint)
 			$(use_with !gnome gtkprint)