Fix build with USE=-gstreamer, bug #500162. Fix configure with USE=gles2 opengl, it is a forbidden configuration not only under the scope of the webgl flag unfortunately, bug #500150. Raise dependency on gst-plugins-base, bug #499964. Add dependency on rubygems[ruby21], bug #499896. Update path to disable building of unittests unless requested. Update sed paths due to upstream re-arranging sources.

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

5 files changed, 153 insertions, 39 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 85ad7e7c87a7..2e9a33f1a467 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,15 @@
 # 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.234 2014/02/02 13:59:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.235 2014/02/03 23:05:03 eva Exp $
+
+  03 Feb 2014; Gilles Dartiguelongue <eva@gentoo.org> webkit-gtk-2.2.4.ebuild,
+  webkit-gtk-2.2.4-r200.ebuild, +files/webkit-gtk-2.2.4-unittests-build.patch:
+  Fix build with USE=-gstreamer, bug #500162. Fix configure with USE=gles2
+  opengl, it is a forbidden configuration not only under the scope of the webgl
+  flag unfortunately, bug #500150. Raise dependency on gst-plugins-base, bug
+  #499964. Add dependency on rubygems[ruby21], bug #499896. Update path to
+  disable building of unittests unless requested. Update sed paths due to
+  upstream re-arranging sources.
 
 *webkit-gtk-2.2.4 (02 Feb 2014)
 *webkit-gtk-2.2.4-r200 (02 Feb 2014)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index db389cc71d8d..445404525041 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -36,6 +36,7 @@ AUX webkit-gtk-2.0.2-harfbuzz-0.9.18.patch 1374 SHA256 2a1b197842fc36607e68cf35f
 AUX webkit-gtk-2.0.4-freetype-2.5.1.patch 2893 SHA256 f1069fa1f7a867bdf894dd6295caac12ff5ed3353aa54ad047b22907c2028205 SHA512 c36cd38a3898daee31c814780e18ea0b0c8b8fe7bca9242564cec93240bc79cd28f59060be9c9dd99ef2e5399c5dc4a11837ea01603abe541d4d9caa902c32c8 WHIRLPOOL 4262e2d3f0c40c17644c3cf4126d13151f445e1acf8adb3654f57afc79544b8b75c6a705a4d11216370484ea85190effb310f1dbfd2d54af1c569c45978c7455
 AUX webkit-gtk-2.2.2-freetype-2.5.1.patch 2851 SHA256 5f1fe73fb19c91b44749cdd68452ab124b533001d9e8a1c90f4cb9cbe416a9d8 SHA512 19c51e02189a177ce4a2b4a2f929cacc621e2e453d402c3b0eea91306a1ed6cde638ce62b665301a48c365efc8aedcedb2370ea95555515d4d6c546dc19c569f WHIRLPOOL cfa950c38310effa0eb09c3942d8e321097d783197e5bbcfbf2967a5414d40a8270baf2589765cc12da32ab1b25b26752d9932158b91df404aee2e8ece6fef2c
 AUX webkit-gtk-2.2.2-unittests-build.patch 1328 SHA256 f49a561effc00858c21db55607849f5b9c8f09cf4ee76f60262e71992013b625 SHA512 66d44483ac7de8b12f310239c4f8cb40a700ea9aad494decbe15b8976a4f4ff5ed53c97660e7762a7bb51de721ec081133368ca2871128d6e6e871fed5b0e042 WHIRLPOOL 77b308072cd705be3700da85ec05208d24bf8ff4aec9b93a1f73b311314fde1608e89ca8218e1f9da206d30bf2c378d727bc51a83f8144f7a559d35e6b5fe47e
+AUX webkit-gtk-2.2.4-unittests-build.patch 2866 SHA256 714b4663c5ae3fc695ae13c40fbedfae358e7ae4b6c2743a35ddd5e96d213133 SHA512 e4ba2eafdc97a673d07d1e253832c30ec32b57e02eb5b61d7a1c327760630f39d24e215a7940bcd5cd9ca321cd4d71e433f231e12e8476ebda62abfa53573297 WHIRLPOOL 5252edd1a69769ef99724f1aaf7844e50a9db1c204984ee066c2dd116bc58814631ddd9bea6bf4822e4c1122ad230f50f87e5f037b00e35ee81299fb9adf7ab5
 DIST webkit-1.8.3.tar.xz 7814028 SHA256 ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7 SHA512 4d400cb0dfbde7eadcce52e7a37d2095ec382b65c6c0d4ea4795410dabad771fac0def50875092634075dc0a80043058d2d2913767e59db3e32cf3e13361803f WHIRLPOOL 25b8ce9a26f2c475a5e061bedf75d835ae5a907a92628e11cd9ae5962fcacbdfa6a0181ae7730fb39e4544615d2d78741025b17fa202f3d42d0f3956fcb7c3f0
 DIST webkitgtk-1.10.2.tar.xz 8633640 SHA256 19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c SHA512 0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f WHIRLPOOL f733244ce7601f7906f7aa26e750f770cc1472737f62d64c706e7c8c32cc31db22a38824e32c347bf70166f7c5104bac049a80eb08dc040733aee4988542e954
 DIST webkitgtk-2.0.4.tar.xz 9849620 SHA256 bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f SHA512 d5fd825d01f700df8eb7d9021673a2a551cb6b4ba9e35ad0038e3d4e76322c0e751e1cd4cd7293a3388d58b8cc18169fec75044412a428c886376609d52fc3ce WHIRLPOOL ce42703d535b97e9e65bc05eacf462292ddf0434da3f056698fabaab007e53a5ded8c02a31ce9c289e22dcf73308daad4b3ca54ef1be7904035e2482abea6ce1
@@ -47,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 9012 SHA256 ef1f119e3230e0517ccdf662963e04a520ef97fbc5b3c931fd3eee32ae598ac8 SHA512 36654d61a4345234fdb214583b7e08f74c113c104dbbdba09fefc47b72c5f7479a3555b08f9c09f9c8177ed30fc01fa4ba3da35d4524e6f86beb79e0f6ca4d2c WHIRLPOOL a4458120d7b8bc5a9daf4ff43488e969501ab25d040ef807f68fa0d185d228476f0f51e4b73b96651172ab851d0be5073b592d8aff8c6177d5e4924cd2722f3f
-EBUILD webkit-gtk-2.2.4.ebuild 9031 SHA256 5e3c6cf56b76c4d2f7f2a5606fd551f2a1dd453270a87968e461319bb2e98b88 SHA512 39d9723c3ced94e5e112e66d9ec87e19d066f4253ab732181cb79d41bff8256a10f10460c7ecd5d830da2e84bfe7ae7f167b21049e70ad0b1b0987b050b4e9a8 WHIRLPOOL 36973a584498a056dd4de10f8e6aaf9b1d050df92ce7e7eafe9e15afb4fd5afcf56e0048f3d5bb607ad03dec3c8a60560f2b9c0340189a07aa412bc30b27f372
-MISC ChangeLog 47294 SHA256 25f8a11df11b9305d6b5f5385de711d9dbc15e92f34a5a2658cebf6b398d555e SHA512 71b450a4c473e45067ad80bc8da4d2f0f0dcb07463e7502415498c41e0e501dfe22236c6667918b7d24ead81d2937112af55a9b0b832519aeae62a7b4b8df430 WHIRLPOOL f4438e0424e7b9f729eec865946a2a4709622ae398ad5243844c9eaff4102f6d18cd292fd00ae644b6b9b5c32480322c75b26d9d7c6d32fe01aa498d3ccbb369
+EBUILD webkit-gtk-2.2.4-r200.ebuild 9009 SHA256 e171930a72282d505b7ec7004d21ac95df63d64332db940f6c111766d0971d52 SHA512 0049f3fc4f7841b78b1494f74b35bb494e1cc319c0901fefbef0e027b71e66745c70cc03bb2f2447f0cd3f0e3cf1007ff656d1af546e1ae25f062b9915903bf3 WHIRLPOOL 5dee4e850681be7bfa54632a81322c21e6135002abb96477e619898dbc5a956d87f295a56448e7c90bc1ab61712293061924cb79a0ffe9bbbcda7642b466e1a9
+EBUILD webkit-gtk-2.2.4.ebuild 9105 SHA256 3c03fbff33fe07d733696be960cc699de587e8d09eec437d43aa357e38278119 SHA512 4a9828f51d4c323066f99de418ed2b71c86328ef193fef01aebd37d26c9c7bc6d571c7bef7f5469b14f49db93504705e7b4babb52f57e8ab19ae0b06cd5aae82 WHIRLPOOL 4eb61158b1358e68bba784985ec7f47684f2cd8e719a1000db3ff0854240b919229f46430e70672d955281572707cf28285bf9ed6f90e295b44b846b7653575f
+MISC ChangeLog 47865 SHA256 78a84cb52d07d36cf94d6cc74510f18e1df132f48f7fc2a9536d282dceb17327 SHA512 e4011292ffdacef148cf2c05cb7c4995bbe5bb85865521492a68fc3b894d27457186db00af7a58a7ccd232f635bfd55288979321b579ecddda2282a5146a12e4 WHIRLPOOL 30bdf6c94e3b7609f448c10549bd8a1e0f7c1047e28413c35316427ebc61daf3498e9f83263093b978a117e7100ef3ae82f57dfd02e6084555fafa4f2ecd3007
 MISC metadata.xml 735 SHA256 25d9027d26b4842187348aa43666ea6e00af2a55fb16d4fae447e81a59c072be SHA512 4c67d850758b3bf54a5de45e35797d2cb2133776e15d729f81aa592e4d4b58e7c9869ed476c25a6dc442bfc131961875e433e3c3fa73e693cf948eeed2230fa8 WHIRLPOOL c5bc56d53e735e5b9cd8dd03ca55ae5380f2ddb333118797b222914307c57248cc8f55cab80abfd41d1054a9e856c8e1d3f88f2aa36fb7cb885d7f3e442dd307
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLuT00ACgkQCaWpQKGI+9Sf4ACfc6FzJ/BKKDLtpfaQ6BvPwm8Q
-xJcAnjy5KE5DECGluLa5pPnaiPdwFab3
-=eTPe
+iEYEAREIAAYFAlLwIKAACgkQ1fmVwcYIWAZ8RgCeMieyzYSkySSx+bZRga1hJbSb
+zTIAoNOxyBsT05iWTRXSsOAqvCL4uYSs
+=UJQN
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.4-unittests-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.4-unittests-build.patch
new file mode 100644
index 000000000000..a6077b4a25ff
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.4-unittests-build.patch
@@ -0,0 +1,103 @@
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 03 Feb 2014 23:47:39 +0100
+Subject: [PATCH] Build unittests on demand
+
+--- a/GNUmakefile.am	2013-11-27 23:52:56.148735433 +0100
++++ b/GNUmakefile.am	2013-11-27 23:51:25.551590806 +0100
+@@ -51,6 +51,9 @@
+ # Libraries and support components
+ bin_PROGRAMS :=
+ noinst_PROGRAMS :=
++check_PROGRAMS :=
++check_LTLIBRARIES :=
++check_DATA :=
+ libexec_PROGRAMS :=
+ noinst_DATA :=
+ noinst_HEADERS :=
+--- a/Tools/TestWebKitAPI/GNUmakefile.am	2014-02-03 23:44:52.534272572 +0100
++++ b/Tools/TestWebKitAPI/GNUmakefile.am	2014-02-03 23:45:41.711783299 +0100
+@@ -1,8 +1,8 @@
+-noinst_LTLIBRARIES += \
++check_LTLIBRARIES += \
+ 	Libraries/libTestWebKitAPIMain.la
+ 
+ if ENABLE_WEBKIT2
+-noinst_LTLIBRARIES += \
++check_LTLIBRARIES += \
+ 	Libraries/libTestWebKit2GtkAPI.la
+ endif
+ 
+@@ -111,14 +111,14 @@
+ Libraries_libTestWebKit2GtkAPI_la_CPPFLAGS = $(webkit2gtk_tests_cppflags)
+ 
+ 
+-noinst_PROGRAMS += \
++check_PROGRAMS += \
+ 	Programs/TestWebKitAPI/WTF/TestWTF \
+ 	Programs/TestWebKitAPI/JavaScriptCore/TestJavaScriptCore \
+ 	Programs/TestWebKitAPI/WebCore/TestWebCore \
+ 	Programs/TestWebKitAPI/WebCoreGtk/TestWebCoreGtk
+ 
+ if ENABLE_WEBKIT1
+-noinst_PROGRAMS += \
++check_PROGRAMS += \
+ 	Programs/TestWebKitAPI/WebKitGtk/testapplicationcache \
+ 	Programs/TestWebKitAPI/WebKitGtk/testcontextmenu \
+ 	Programs/TestWebKitAPI/WebKitGtk/testdomdocument \
+@@ -150,7 +150,7 @@
+ endif
+ 
+ if ENABLE_WEBKIT2
+-noinst_PROGRAMS += \
++check_PROGRAMS += \
+ 	Programs/TestWebKitAPI/WebKit2/TestWebKit2 \
+ 	Programs/TestWebKitAPI/WebKit2Gtk/InspectorTestServer \
+ 	Programs/TestWebKitAPI/WebKit2Gtk/TestAuthentication \
+@@ -179,7 +179,7 @@
+ 	Programs/TestWebKitAPI/WebKit2Gtk/TestWebViewEditor
+ 
+ if HAVE_ATSPI2
+-noinst_PROGRAMS += \
++check_PROGRAMS += \
+ 	Programs/TestWebKitAPI/WebKit2Gtk/AccessibilityTestServer \
+ 	Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitAccessibility
+ endif
+@@ -627,7 +627,7 @@
+ 	Tools/TestWebKitAPI/Tests/WebKit2/WKURL.cpp
+ 
+ if ENABLE_WEBKIT2
+-noinst_LTLIBRARIES += \
++check_LTLIBRARIES += \
+ 	Libraries/libTestWebKitAPIInjectedBundle.la
+ endif # ENABLE_WEBKIT2
+ 
+@@ -684,7 +684,7 @@
+ 
+ 
+ if ENABLE_WEBKIT2
+-noinst_LTLIBRARIES += Libraries/WebExtensions/libWebExtensionTest.la
++check_LTLIBRARIES += Libraries/WebExtensions/libWebExtensionTest.la
+ endif
+ 
+ Libraries_WebExtensions_libWebExtensionTest_la_SOURCES = \
+@@ -711,7 +711,7 @@
+ 
+ 
+ if ENABLE_WEBKIT2
+-noinst_LTLIBRARIES += Libraries/WebExtensions/libWebProcessTest.la
++check_LTLIBRARIES += Libraries/WebExtensions/libWebProcessTest.la
+ endif
+ 
+ Libraries_WebExtensions_libWebProcessTest_la_SOURCES = \
+@@ -747,7 +747,7 @@
+ DISTCLEANFILES += \
+ 	Programs/TestWebKitAPI/WebKit2Gtk/resources/webkit2gtk-tests-resources.gresource
+ 
+-noinst_DATA += \
++check_DATA += \
+ 	Programs/TestWebKitAPI/WebKit2Gtk/resources/webkit2gtk-tests-resources.gresource
+ 
+ 
+-- 
+1.8.3.2
+
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 1164c2dda125..4a681cd11b3a 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.1 2014/02/02 13:59:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.2.4-r200.ebuild,v 1.2 2014/02/03 23:05:03 eva Exp $
 
 EAPI="5"
 
@@ -19,9 +19,9 @@ 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 )
-	webgl? ( ^^ ( gles2 opengl ) )
 	gles2? ( egl )
 "
 
@@ -47,8 +47,8 @@ RDEPEND="
 	geoloc? ( app-misc/geoclue:0 )
 	gles2? ( media-libs/mesa[gles2] )
 	gstreamer? (
-		>=media-libs/gstreamer-1.0.3:1.0
-		>=media-libs/gst-plugins-base-1.0.3:1.0 )
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0 )
 	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
 	libsecret? ( app-crypt/libsecret )
 	opengl? ( virtual/opengl )
@@ -66,6 +66,7 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	|| (
 		virtual/rubygems[ruby_targets_ruby20]
+		virtual/rubygems[ruby_targets_ruby21]
 		virtual/rubygems[ruby_targets_ruby19]
 		virtual/rubygems[ruby_targets_ruby18] )
 	>=dev-util/gtk-doc-am-1.10
@@ -150,20 +151,20 @@ src_prepare() {
 	# Failing tests
 	# * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
 	# * keyevents is interactive
-	# * mimehandling test sometimes fails under Xvfb (works fine manually), bug #????
+	# * mimehandling test sometimes fails under Xvfb (works fine manually), bug #???
 	# * webdatasource test needs a network connection and intermittently fails with icedtea-web
 	# * webplugindatabase intermittently fails with icedtea-web, bug #????
-	sed -e '/Programs\/unittests\/testwebinspector/ d' \
-		-e '/Programs\/unittests\/testkeyevents/ d' \
-		-e '/Programs\/unittests\/testmimehandling/ d' \
-		-e '/Programs\/unittests\/testwebdatasource/ d' \
-		-e '/Programs\/unittests\/testwebplugindatabase/ d' \
+	sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
+		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
+		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
+		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
+		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \
 		-i Source/WebKit/gtk/GNUmakefile.am || die
 
 	if ! use gstreamer; then
-		# webkit2's TestWebKitWebView requires <video> support, bug #????
+		# webkit2's TestWebKitWebView requires <video> support, bug #???
 		sed -e '/Programs\/WebKit2APITests\/TestWebKitWebView/ d' \
-			-i Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am || die
+			-i Tools/TestWebKitAPI/GNUmakefile.am || die
 	fi
 
 	# Respect CC, otherwise fails on prefix #395875
@@ -172,15 +173,15 @@ src_prepare() {
 	# bug #459978, upstream bug #113397
 	epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
 
-	# Do not build unittests unless requested, upstream bug #????
-	#epatch "${FILESDIR}"/${PN}-2.2.2-unittests-build.patch
+	# Do not build unittests unless requested, upstream bug #???
+	epatch "${FILESDIR}"/${PN}-2.2.4-unittests-build.patch
 
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
 }
 
 src_configure() {
-	# It doesn't compile on alpha without this in LDFLAGS, bug #????
+	# It doesn't compile on alpha without this in LDFLAGS, bug #???
 	use alpha && append-ldflags "-Wl,--no-relax"
 
 	# Sigbuses on SPARC with mcpu and co., bug #????
@@ -207,7 +208,6 @@ src_configure() {
 	# should somehow let user select between them?
 	#
 	# * dependency-tracking is required so parallel builds won't fail
-	# API documentation (gtk-doc) is built in webkit-gtk:3, always disable here
 	econf \
 		$(use_enable coverage) \
 		$(use_enable debug) \
@@ -224,8 +224,8 @@ src_configure() {
 		$(use_enable webgl accelerated-compositing) \
 		--with-gtk=2.0 \
 		--disable-webkit2 \
-		--disable-gtk-doc \
 		--enable-dependency-tracking \
+		--disable-gtk-doc \
 		$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
 		${myconf}
 }
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 b56a92769796..9e01be027f35 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.1 2014/02/02 13:59:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.2.4.ebuild,v 1.2 2014/02/03 23:05:03 eva Exp $
 
 EAPI="5"
 
@@ -19,9 +19,9 @@ 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 )
-	webgl? ( ^^ ( gles2 opengl ) )
 	gles2? ( egl )
 "
 
@@ -51,8 +51,8 @@ RDEPEND="
 	geoloc? ( app-misc/geoclue:0 )
 	gles2? ( media-libs/mesa[gles2] )
 	gstreamer? (
-		>=media-libs/gstreamer-1.0.3:1.0
-		>=media-libs/gst-plugins-base-1.0.3:1.0 )
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0 )
 	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
 	libsecret? ( app-crypt/libsecret )
 	opengl? ( virtual/opengl )
@@ -70,6 +70,7 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	|| (
 		virtual/rubygems[ruby_targets_ruby20]
+		virtual/rubygems[ruby_targets_ruby21]
 		virtual/rubygems[ruby_targets_ruby19]
 		virtual/rubygems[ruby_targets_ruby18] )
 	>=app-accessibility/at-spi2-core-2.5.3
@@ -155,20 +156,20 @@ src_prepare() {
 	# Failing tests
 	# * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
 	# * keyevents is interactive
-	# * mimehandling test sometimes fails under Xvfb (works fine manually), bug #????
+	# * mimehandling test sometimes fails under Xvfb (works fine manually), bug #???
 	# * webdatasource test needs a network connection and intermittently fails with icedtea-web
 	# * webplugindatabase intermittently fails with icedtea-web, bug #????
-	sed -e '/Programs\/unittests\/testwebinspector/ d' \
-		-e '/Programs\/unittests\/testkeyevents/ d' \
-		-e '/Programs\/unittests\/testmimehandling/ d' \
-		-e '/Programs\/unittests\/testwebdatasource/ d' \
-		-e '/Programs\/unittests\/testwebplugindatabase/ d' \
+	sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
+		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
+		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
+		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
+		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \
 		-i Source/WebKit/gtk/GNUmakefile.am || die
 
 	if ! use gstreamer; then
-		# webkit2's TestWebKitWebView requires <video> support, bug #????
+		# webkit2's TestWebKitWebView requires <video> support, bug #???
 		sed -e '/Programs\/WebKit2APITests\/TestWebKitWebView/ d' \
-			-i Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am || die
+			-i Tools/TestWebKitAPI/GNUmakefile.am || die
 	fi
 
 	# Respect CC, otherwise fails on prefix #395875
@@ -177,15 +178,15 @@ src_prepare() {
 	# bug #459978, upstream bug #113397
 	epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
 
-	# Do not build unittests unless requested, upstream bug #????
-	#epatch "${FILESDIR}"/${PN}-2.2.2-unittests-build.patch
+	# Do not build unittests unless requested, upstream bug #???
+	epatch "${FILESDIR}"/${PN}-2.2.4-unittests-build.patch
 
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
 }
 
 src_configure() {
-	# It doesn't compile on alpha without this in LDFLAGS, bug #????
+	# It doesn't compile on alpha without this in LDFLAGS, bug #???
 	use alpha && append-ldflags "-Wl,--no-relax"
 
 	# Sigbuses on SPARC with mcpu and co., bug #????