Finer control on gles2 vs. opengl USE, bug #500150. Actually properly allow ruby21, bug #500230.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 25 insertions, 14 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index b81df6e8231e..c9a19575eeb0 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.236 2014/02/04 07:15:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.237 2014/02/04 08:37:19 eva Exp $
+
+  04 Feb 2014; Gilles Dartiguelongue <eva@gentoo.org> webkit-gtk-2.2.4.ebuild,
+  webkit-gtk-2.2.4-r200.ebuild:
+  Finer control on gles2 vs. opengl USE, bug #500150. Actually properly allow
+  ruby21, bug #500230.
 
   04 Feb 2014; Pacho Ramos <pacho@gentoo.org> webkit-gtk-2.2.4-r200.ebuild,
   webkit-gtk-2.2.4.ebuild:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 97611707e9f0..509bacfa9489 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -48,14 +48,14 @@ EBUILD webkit-gtk-1.8.3-r201.ebuild 9610 SHA256 d624ff02d974fd706c4f0511182ca222
 EBUILD webkit-gtk-1.8.3-r300.ebuild 9759 SHA256 9404a95936f1c043a71dd94f6681dfeb4e194dcd5f474af0663c80faba4b6bd5 SHA512 a99bcd2462838a39db811839f1d16f1d163c8d6916a891419fdf6458eacb8073eef117e0a5e77f5ffcd322f8e7f7c8806f7e291eeb7f08c1ccd869b7efa346e1 WHIRLPOOL e78d3d3327e214f7c231ae1e54a81012608dde15f5faa0243f73d4cb0b84dd064feb73e496e0834e70ce52d1fcb252cd7cbc8dad074a4f0f96aa3e53ea699a4d
 EBUILD webkit-gtk-2.0.4.ebuild 9039 SHA256 296e9efaefad105ff350d7669d2c5baebd9fe796719238ee5a39646901198279 SHA512 3550522141269c643a86546e89ee12f8045033423219efad21ebf138144e296006735c6c1d6980c1bb74564a338dded14fea809490471895c060beac4dbe4720 WHIRLPOOL 14f043df57bfbf36664c06b77f80d7f2f69f36b8efb9f76fa18bfa93306c541f7c4799f2de34beaf60cdbe95540c844e4b3617bdd39176d14cc9f2a855aeea6c
 EBUILD webkit-gtk-2.2.2.ebuild 9172 SHA256 4b58cd0cde9ea281254b65f6e90418128b0e6cc71eeb395aadad46f0945c3279 SHA512 98cb031534a9615c82b5c4c2119f63a1819360dd5120bedba44dcd8308ad5951480f3041390184a1ab5812d144f5ed6d1b19e15a13b06f135185304813421767 WHIRLPOOL 108a8610387201a6efde0d1f776146742c1cc25045109bea41d1a0341041bedbd1334290bc6cfe1fe9c83aa4a5d34c19eb6d56e008f3912711bb731512b65190
-EBUILD webkit-gtk-2.2.4-r200.ebuild 9017 SHA256 eeaf22126f835044165c5f5916e31311f7f8f95cc76d859a10d1e640c95d78af SHA512 3ebc9e46b701408c6e3383536024a49ff8aad7c9302070a65374576337d5952c47a20f8b2f24ea74222f6ae7b5d24b48c1cfcd4014e52c897a1fe15ee5d21c15 WHIRLPOOL 19f3ee23467f55c95e4757f5f0706c2550fcb182a2b0b1ff98f4b7dd963bfc0653e4eaa14f714803b9e7e9bcce8465437e0d75e99212bbead2b67a78cfbfae08
-EBUILD webkit-gtk-2.2.4.ebuild 9122 SHA256 5d2fde0bd82ceeb8d45b688b361556f7fe1064dd0298b5062e0e4c6fd8e05bb1 SHA512 8c5dfcdbc282e57e5672c823bc60bf28f13fcc43915aa14da7186b7a691403f7d427d2e87e7ba2e8158db1cce14ace06dfabc5eb365dd91320cb461a1b914d9c WHIRLPOOL e96559eb42de5cdea20fdce46ac64b9bf52b84a1c5de69d146dbc11a0201536f8175958639e32b5172c17b82270350cca94f498372fed4413dc8c65f65e6beea
-MISC ChangeLog 48017 SHA256 a4df462b8780a1c0ca3aecc4607ea93495650caa91038ecac1d69304b9d6400b SHA512 23ce08004c2cd60b34bae6309126d03f204706afa269deae1973fb27127879b2b2c3d3ae6e99ffe2a334961bbe72a6a2e1de9f738b907557188395db2c13957c WHIRLPOOL 9e7254b222042df700bd5d16a88a1a4ea8b0d4fa8d066c8dffe154dc559d8fbea27b7c95a59288b39ceb13e7bff8439391b10bc166827729fa5166bd02df0104
+EBUILD webkit-gtk-2.2.4-r200.ebuild 9176 SHA256 34e139cbfedd7bf86b1cf44da9e14f97070db44d7b3e8891cc772896d11bc50d SHA512 ef2710b21b85043f2992646ba03c9a27f63585ca891a6835aa65c1912e2652e5a077e6c845ad2f2c9ee0ab846caf333ef7788ae4bb7a449703b1578ae3d93c68 WHIRLPOOL 3e7f36e409b103fbb672fa34d3b0e621470dcd798d9a678a895332b3bfb1421f8e52ef23076165ec2b082dfe887a22931d1b8c3ef43e29aa109a261d14dff111
+EBUILD webkit-gtk-2.2.4.ebuild 9272 SHA256 5e1c6aa55d6f305b6b7938fcdbc02e4bc648f697ffc8b9ee06fdbcead1271b75 SHA512 e1a1507b026801d858331a0a76519c27c43c8aad2796e3bfa306a10da35ae523e0b3c45ee102c577660fea478ab8e58152ec94ac506216810ca9971424e5e7a5 WHIRLPOOL 2e7112d803ebc086a02328e4b1b01b62ebcaaf86ae6c7aa1d83c2b40a0c0745397c1b21a2ad802a93eaa7f71024063a241669f041676a1c72b58d738ec5066dc
+MISC ChangeLog 48228 SHA256 423cc5e4ff6f355c36449ff2ea7eee6c4e70a29d9c9e9d7b6fd69713dc39f043 SHA512 87f25ccead5a245dc62634390212823c5ed958f4c5d0c8c611398a4b44ea04dde2a602fc809162ad8ff56fa3f7175ba871d62cb74d8f9ca61c3d942720b59cbb WHIRLPOOL eb6a1aafa39fa2df973d987d374a2890f51f236b9fe70a7512d19859de252bfab58bad88361b8e5afe552d28b8f4fa026edebaf33c8558a7cd2ef89d84f9b29c
 MISC metadata.xml 735 SHA256 25d9027d26b4842187348aa43666ea6e00af2a55fb16d4fae447e81a59c072be SHA512 4c67d850758b3bf54a5de45e35797d2cb2133776e15d729f81aa592e4d4b58e7c9869ed476c25a6dc442bfc131961875e433e3c3fa73e693cf948eeed2230fa8 WHIRLPOOL c5bc56d53e735e5b9cd8dd03ca55ae5380f2ddb333118797b222914307c57248cc8f55cab80abfd41d1054a9e856c8e1d3f88f2aa36fb7cb885d7f3e442dd307
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLwk58ACgkQCaWpQKGI+9RnngCfZB/ZKLI1y4hfTG3XDr5CxRj9
-DDUAni4Vi46ZxVJHijgX+DWfYLjvngtJ
-=olzW
+iEYEAREIAAYFAlLwpsAACgkQ1fmVwcYIWAYXqgCeJYL2MVk4SA4cloYI1dwNzvcs
+rG8An1qxWzfR4KihJ12BVefIUV9vztYH
+=8xbc
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.4-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.4-r200.ebuild
index 24b381a76f1b..701cfedd850c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.4-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.2.4-r200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.2.4-r200.ebuild,v 1.3 2014/02/04 07:15:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.2.4-r200.ebuild,v 1.4 2014/02/04 08:37:19 eva Exp $
 
 EAPI="5"
 
@@ -19,10 +19,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell +webgl"
 # bugs 372493, 416331
 REQUIRED_USE="
-	^^ ( gles2 opengl )
 	geoloc? ( introspection )
 	introspection? ( gstreamer )
 	gles2? ( egl )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
 "
 
 # use sqlite, svg by default
@@ -162,7 +163,7 @@ src_prepare() {
 		-i Source/WebKit/gtk/GNUmakefile.am || die
 
 	if ! use gstreamer; then
-		# webkit2's TestWebKitWebView requires <video> support, bug #128164
+		# webkit2's TestWebKitWebView requires <video> support, upstream bug #128164
 		sed -e '/Programs\/WebKit2APITests\/TestWebKitWebView/ d' \
 			-i Tools/TestWebKitAPI/GNUmakefile.am || die
 	fi
@@ -196,7 +197,9 @@ src_configure() {
 
 	local myconf=""
 
-	if has_version "virtual/rubygems[ruby_targets_ruby20]"; then
+	if has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		myconf="${myconf} RUBY=$(type -P ruby21)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
 		myconf="${myconf} RUBY=$(type -P ruby20)"
 	elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then
 		myconf="${myconf} RUBY=$(type -P ruby19)"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.4.ebuild
index 9605673a044f..088c4582bcb1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.2.4.ebuild,v 1.3 2014/02/04 07:15:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.2.4.ebuild,v 1.4 2014/02/04 08:37:19 eva Exp $
 
 EAPI="5"
 
@@ -19,10 +19,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell +webgl"
 # bugs 372493, 416331
 REQUIRED_USE="
-	^^ ( gles2 opengl )
 	geoloc? ( introspection )
 	introspection? ( gstreamer )
 	gles2? ( egl )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
 "
 
 # use sqlite, svg by default
@@ -201,7 +202,9 @@ src_configure() {
 
 	local myconf=""
 
-	if has_version "virtual/rubygems[ruby_targets_ruby20]"; then
+	if has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		myconf="${myconf} RUBY=$(type -P ruby21)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
 		myconf="${myconf} RUBY=$(type -P ruby20)"
 	elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then
 		myconf="${myconf} RUBY=$(type -P ruby19)"