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

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

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

4 files changed, 35 insertions, 12 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/Manifest b/x11-libs/wxGTK/Manifest
index d052efe7ad78..943685f3851d 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX wxGTK-2.8.10.1-odbc-defines.patch 1341 SHA256 db875bf122cac00b1283debe3a92851ec7d91f481198736041bba5e4dce22698 SHA512 119e99f06f238d0982bc1a5fac834ef0ca7c09dc5a97f612cf3f0fffd9e01eebb0d8bfe122ebff6f3857cf6518a226477d2cb5959c47c4fd5c50ea5040abe6b2 WHIRLPOOL ac8f565adeaee0110e6e2b229cd9c5afd3edf3bc3b7abb8aba5347dac64021a255a63dbf879b5ddcbc658f6f78518c988435399af0af1f5fd437f36dc102cfc8
 AUX wxGTK-2.8.11-collision.patch 5710 SHA256 b4a34748a0e3c8f784d777b197f903de9d681baf12395fa1b8a5d2b2636c9ffe SHA512 9eb4fd8f783d073236364acb322c2d3315d75d01197d119ae4760a97e5ce6d3c700b28b5516ffda856c9decd1ad05ec063941855fa18cf5f9927a5a72fcaf4ae WHIRLPOOL 391a8c2e319742bca1a32f71c82f8b14653a3c91dc0b11ba87e8cd99905ffe5ed6897da67c5e5ae2711e30ae0aea5d9d3bc93a7275f39aca5ef6635a771feacd
 AUX wxGTK-2.8.11-unicode-odbc.patch 624 SHA256 2e2cbeb2240770497611bf845127f737e67311c4b898d21446fc3d739941cb65 SHA512 e58e661ae95deb7da31c7742088c6e8b8705494261d00975a7dd0eba0fc720ae7d91017616152915849b747c96f3a0302cd958946db886d7491520883f311a86 WHIRLPOOL 710ac8ada38a42d762ea1d271540b9eb47aae36a072b1b63310b4c1e970afc7b0b485cc55a50691d69f92712e3b772d35d72ae1e24dc550a9e0b60db8c20ace5
@@ -11,7 +14,18 @@ DIST wxPython-src-2.9.3.1.tar.bz2 49131100 SHA256 7bae5bf45e98eba836472bdb358330
 DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507
 DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811
 EBUILD wxGTK-2.8.12.1.ebuild 4115 SHA256 aa81865193740be0455ed613ae39a112bb6622ea50bc36023d72693d5c8d7022 SHA512 5e401e0dd2702d2e74ce43992a6b6e0147d43852273eb929bdae231fd05f30b18c51581e535fb1377fa405aac9d5277eb18d6266f2e25fb90d3b463ffb5ba467 WHIRLPOOL 8781c3976aa543d91e6dd0fe0c69b23cd04db6601d98786ec5e3d0b530594090d8bc23826fc90efdbb93696e229bb5ecf283dec5388435600807f080daf8736a
-EBUILD wxGTK-2.9.3.1.ebuild 4146 SHA256 b7a41d6be730440d83156c63fe9fa9bdf6de0dd88d2acd79cb87aacedb1c5d9f SHA512 6e7bf9870ad7f3ae9f6226486458cfeb69305299d69779c37eb74bf80bdec9b70f5e42a62795e785dd3c4f79fe8fac62beb31031dd45ce737e2d4322479cc547 WHIRLPOOL 2c5a76ebf360204605a2bfc9b91404e99bde06b2bc8b17cf3b6d9ae3e930671a76408ca888aab9a01210068f3f7fe102a9d145092591bad11eb589ea430be5f2
-EBUILD wxGTK-2.9.4.1.ebuild 4195 SHA256 98f59a9cb73ac8bb673a38cee60ebd1c89bf48b5b5221e05e7b244e7aac5ce16 SHA512 5a54aa6c035f4adf1498444e64b668da7ca70d44bcfb9cf20d3ca67da083494aa88e16e795fe16a790a99afd55795591b6602fa7b496d33c394bd1d48d420ac2 WHIRLPOOL 83a3b5071d97aec93e0499182afd140214df3eb1821ccc7d58a7366d34d10302c4c9ca46e82c3befadd86889e5799642e51b3dc477d139aaaf5bdeaa1de3f2b6
-MISC ChangeLog 46736 SHA256 c776ba15792580a771a9ae569abdbdd9bff02bea11d23d6833f110041710c7ed SHA512 ffc3edae07b1736a7288684ed0ca7dc810737ed5ac83ff088ecba0e35875d7806c3be4f4dffc478533c4954e31d6fb57846a630eefc296ff53e5500c331138b1 WHIRLPOOL a90411fe1b9a5fb477d7c2d0b9f8c81bb0f84cb3da1ac1a8b1e0b63d5df3951fc3d8f40a1ff9771b8b981b2bc18a66f7974c7a13f9969e7835f93172fa2080fb
+EBUILD wxGTK-2.9.3.1.ebuild 4220 SHA256 ff5dff0eebef2475ce2f1ced22bbb3a2a40b401154ed88435762477c913efc99 SHA512 8a4a40913e192437fc249219677aa844e454aefc9f27986152d927ecc0c57456ce091a24939dc4b5381cda7956bcac017f1cfb61193a5dbf52225517e2862147 WHIRLPOOL a162b95fc4196247034a4f0ea45eb2d71fd631b5858321a4ef619e69e3572baac1ae3c1e1e1f3d6b4db871b3ad58b9092aa81e3ec0324f0293582703b4e2f710
+EBUILD wxGTK-2.9.4.1.ebuild 4281 SHA256 6245bdd415bc6477f414558b2a6ba066b387a30975850b496d1037c50d0a59cb SHA512 116b7544587ff15dea61f91ad6f23b490e634652c0ed59cb874c113a712757fa0f47d1cd1a4cb7b0527944c55e8a48a16c05c8ba63efe66e64b10f69a674e4fd WHIRLPOOL 51bd6c735a49d0b4f6324c6fffef1d900b140f13d4867dbc12eff8718a3be125cc77a0dc705e6da03b6c40c07cff9fbe42351742b15fa8ca7939f838c8565446
+MISC ChangeLog 46968 SHA256 4a5ffc724ff410a2f61de70f5043a286cfc7453b21da640108ea75e2c0e59443 SHA512 09b640f792800ce1217d91512a526d3dace44034c5b5daae22c3bb4c7de6d5a5faed2ed5eb57ac7525de0bdf13e2d30054e825eac992d5dc57eeab5d27e70f49 WHIRLPOOL 9b1616e451a1cc98f21ecdaecfab0573450a46d3f65d88c45a33238759c6bf88a4743c519a1624e8665e9860f0f69a1a4107a79bbe164671c8312902760f0beb
 MISC metadata.xml 670 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75 SHA512 37ec56d00b488857a285a61c894f8c28dde61efce48d79b7767a207f5c533ad01f2ef09ebecc98dd5b803b4545e1d7f513ffb48e5ead4818ecb607129339c907 WHIRLPOOL cbcc9d2aea988f0b8e1a0615918903cf332976b192156296051c9f5ac5563e9ab512376453a52ad02db0fe3465b9b30d88d6808e38bea52bb58abe6fed316586
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRURzpAAoJEO04vUmVeoRjepQIAKyHYAsfSvxh7xjeUY3afvlK
+jIQJY6BZTcmykOVh0YYgCd/7ClJGoonibfVsz1KCw7sorGae/rFHBgAL5pIYOdvG
+MNwCP/Y4bQh+Q2Ii6B1/T6bE4ByQyB2N7tk9dIXjDv1iauuJhU1EKKRQLmpLu+7c
+JYg68LJUNkDMP/crQCcZH9m/gpGw0O6jCXrIlOvejs6cWMw4YN0vsEw1VIbldftV
+Gof7Xz7MPF3gdvat3Mt1TefwfASer8D/B++VVgQjVelgs5BEKL3EhPN0mckSUrsH
+ndhIlPlGSU/IU0xE/k0QIXaHvCafTC4ehZ31Zf3qCHwyZ5s2O3R9SbaQoU7hR9M=
+=cDId
+-----END PGP SIGNATURE-----
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)