Sync ebuilds. Add missing minimum version requirements, fix dependencies for USE=X on slot 3 and USE=aqua on slot 2.

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

5 files changed, 92 insertions, 86 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index b35a443fdd03..cf2706f87cbb 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.317 2015/05/24 22:43:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.318 2015/05/24 23:12:46 eva Exp $
+
+  24 May 2015; Gilles Dartiguelongue <eva@gentoo.org> webkit-gtk-2.4.9.ebuild,
+  webkit-gtk-2.4.9-r200.ebuild, webkit-gtk-2.6.6.ebuild:
+  Sync ebuilds. Add missing minimum version requirements, fix dependencies for
+  USE=X on slot 3 and USE=aqua on slot 2.
 
 *webkit-gtk-2.4.9-r200 (24 May 2015)
 *webkit-gtk-2.4.9 (24 May 2015)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 8c4f9f5b5907..70d5044aee54 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -24,28 +24,16 @@ DIST webkitgtk-2.6.5.tar.xz 10000124 SHA256 b1658017cea7cc545b9e01f22af585986e21
 DIST webkitgtk-2.6.6.tar.xz 10000888 SHA256 541e114a203b0f649e89b3ad6b6fdeea1726739320a6b6a52b464cb66ea38eb9 SHA512 faac38cbd64daf180f2e2f9e7df9e1162ccd0b4f5c76b0133ef6d2b95b413b699923fda3a5026ba3c76562de59e4913c45a97cd654797867490633dd3099f5b4 WHIRLPOOL 20be78255c917ecd930e034e38053af054a4271445eaa43319f45db6fde6b369f002f2be5269a696c53200b2bf56b74959e7970932fd62f6c89e3ea1236ce72b
 EBUILD webkit-gtk-2.4.8-r200.ebuild 10123 SHA256 e5987b45d3dd92b069e9693690c9a5408875870852307e17b138dd13d8c5888d SHA512 dbce25c2db3c22006f3d8cc964857f46851790bf38c93fa2b86a5ca1814c2f4440099b811bba89145f59b1f9e8efe1b52bc53ba5d279ab21048206c14991791d WHIRLPOOL 90f8d5b7073e530ef5a37e77076a0a88c36553774f8c84a6a75b68dc9e0bc3fe6db7cf606f0e0c6f17ea7f229c232b7caf585a9dc713ccb1bb0bc6744d39117c
 EBUILD webkit-gtk-2.4.8.ebuild 10580 SHA256 f674e94df9333a9decf3f3ecbc5e871d00bb97fd8688ced9061cc9fcf39108fe SHA512 cb02a31079c776ceb9a82ee35f4c69d5313f77ddc7179e281ef1c38b5008c118caf782a491d3ed92f4c037bc9f6a6fd79eaaa49368d7b242a6cb8dff80ae66c6 WHIRLPOOL 297f3dd59a1db2ae3fb01955ec9fcf59f7eb6a59bfefe04f8ab1d5a2ae4d12aa681e196053b96d9cda0e2cc6484e24eb50a143a0ab4a111bb08047f7866b9cc7
-EBUILD webkit-gtk-2.4.9-r200.ebuild 9932 SHA256 fc4b866595a3c69c21bdbd056e7caa5429b58a290b936ba59d773bf7d5a35123 SHA512 21fba466d15a65e5300c203c8331de13932128164b973edbe2cd147121c61c7468cde617b5f9a2d58d727de94ec253e9f14b27d2c50106a6a7c7a262839ef1a8 WHIRLPOOL 13230e0ed9292ea57651e394bc94ea22aaebce947bac84e2245308920cb4fe321b23dc84bac40bb72a7a4de673db6c31278f5a4068b63cddbaba755fa31bc619
-EBUILD webkit-gtk-2.4.9.ebuild 10389 SHA256 2a8652f03ddc5b0ba21fc2601f6670761a29d66908c9667d088d1778830d3ba9 SHA512 15371759231be7b92b121671bf89fc5611c8d48da39551ead4bdc4ade93c8b832a73839f8fa7838fafaba71980511727785653e34e376d3ebc3c22d3b9e23ce1 WHIRLPOOL 5223c46b683c7c5a92ec980c369a1df3ee2ecc91af40c247507d0775070cacb06035f21cf28116395559b2ca994f4f609549bc93c84ec0dd685758afda5f75e5
+EBUILD webkit-gtk-2.4.9-r200.ebuild 10203 SHA256 c0526b3f629e09d1d92561576d154266195aaac0c169e2fa8430a9bb05ad234c SHA512 b9fb6db97fdd47611862709c56ccfc0175601d540bd98f56b62a07abba6f9a6f6852687793f1581a171ed1d9d01ed87b5d9055d6d19de1d46d0bd9dbbca20390 WHIRLPOOL c9eb8d63200c9576a0e60c64b0b1db18c082c539cb74c961296ee54eb807d2d7e2c68757f287bc8942d5761aa345d89c6c88c982b851c3925a1ec19694d23542
+EBUILD webkit-gtk-2.4.9.ebuild 10671 SHA256 2cfb6b83d15ce6b417634a767b075a3f9181f3f172aeddfc4847f54a170e7df2 SHA512 6eab6127025e58cbef70211bb431307bd35be2d32c64467da2a7e9267e8b8bf55391cc9c0f4023cf1c93d73c5c666ce74d5015bed4235daee07f07e0188ca56c WHIRLPOOL 36ba0ab52767a99f50e6f46d7ee38fd90ac3eacccd85e5f079540864bf2bc84cd2cceb46443d513d0c8955460de5c30f0a1cc027bca461ee9c48e9d3a3a3905a
 EBUILD webkit-gtk-2.6.5.ebuild 6588 SHA256 bba61069c92720242a6861ae93e04d3003f4c0021b7cbeb6639a6b5bbffabc65 SHA512 acd4da445efcd875599b54098f9354065df58ee4f8fe175adcb4d00d0bfb0ab1ae29d885b6c263d145b91e7312742172cfb31df59092ff116a20d90be87f604c WHIRLPOOL 832464171ac03f92a021a8bd9570db43d76cfd9a3e137e4d2f47a570638d4491282d1f744f6733491742494a4ee455c01d7c6455e964791b151af4d0499c80d8
-EBUILD webkit-gtk-2.6.6.ebuild 6916 SHA256 8fcdf8aa0eb9ccf7cec85efd9f4dac910669867753028a2a1f6c4a21a855a998 SHA512 5aecb638426097e1d2162fa1de0d3dd8dc2c411c68313c64949df2e9fa14104b96d0494a860b16e6f23f07aa62d34b9232e740b357d6cb6f3f0144a9370d2201 WHIRLPOOL e9ab2b1cd96d8ca17185911251b8d04005e68ec404edc00d679b2b271d8405e89ce01fca06eb6539aa4f964f85acab8825f4235f4f01f23ce9b619833ccf756e
-MISC ChangeLog 66466 SHA256 9bf7f2d7d267c17f8efd6b9252d46ac7d79dbd68b802b0cd8ea2ce06c01dfec0 SHA512 a5b62606ebb67a07dd72430571bb4c5f725a290fc1ff3e079ebbd49bd99fa3ca54f15f81ef099c8a44e11a7f9a3899976a132a3d89063325030127b14336aaf6 WHIRLPOOL ea7cb599e0af99a45c243f63b8dc6d568229f24ca4049456bc8114ebd1b3c8408a66058b36916fa330ca09ebfce6c7f0d48bd65d6e13d088251e28088ad12d38
+EBUILD webkit-gtk-2.6.6.ebuild 6913 SHA256 67c95c404fb6793dc882b50f2e8349802629a1975514e69cd16ddc9311975eaf SHA512 4c08addbf15621d04468c6bc406f5ee691308ce7ee94f27c33bea43cb85273695628c7af58c3715013ecfd6d720b93069fc7ef98fbf4d7ab0de684c566a9677c WHIRLPOOL 2632dc12c3ab54f93e2288cbe224b24d145fa0a51a526f51db4d7139c40311c095c30d6fdc25754509d551bae5b16ed5e0ad40fc7e0d3859c86a703a5592b1c7
+MISC ChangeLog 66718 SHA256 faf42e349280c3518dc455dd49dd97d586e5d7b9517c0a6682eee58d6349d1b2 SHA512 3e38022e0efca3535f4316f1b0d8f5bde03f6058365a9571c48e669bc6b2e21a380f8138d3b2103a03cd227861473343d6d24d98a9cc234b5b1a681af75d7a92 WHIRLPOOL ad81028a116d355f65ed4cb9a01ee84d49951dae74e83578821b7e3d60b4bd81a5948fced4da415bfeb54a3e52264008a5e3c9f60c4b1626874b1847aed9a952
 MISC metadata.xml 610 SHA256 23faf3368df312d51e2dd38d6e7695410deab694bc12558cbe9751067575df11 SHA512 ac78b2e8a719247f5294c045ead7731cd42fb7200ea5a6a450ac18abd3a79fc888045e2c7f98bf984dd2a9484fc352ebc06e6b1c7a0bdd75a65a825e71c09188 WHIRLPOOL f2c88de8a7889cd3cdbb66f498067f85a5e6ce0c7b3732299ad9373e39ac332abe5d3da93f8fbe1e5f63b44306f9def006a3e34349eaca12ee9fb3b7a7368ea1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVYlQiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
-OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNgbQQAMf2dIc8dmYAvNOmB+PV12Bu
-Gkedxrzv4S8+OzTfwa5eGnxjrFlrTueaVm6K2mvS14z3X+oGByAcrxtP4xF6wRBf
-bKGIWlaGgXITe6C5rPLVs0e7bHNEeT4SNmsB2hbZPDGeFNgIBAtChc/fpZMnAVZ6
-z58A6hxKdPWufaccIDv6lNASEbLGeY9Y6hXAcbErkL8k+HbJvLQJLJLvhbgsGW9b
-/px9+W4fupMdJUdATY/dPwVBPuF1lHpKtIcpp27PGenbuZYF0j7QmvcmRu6NdBWW
-sOwdQoVcPLiNYNVnV00RQQN6nZYCHWdoD667ZBQs9R5cEObMiuW7NVgq3oEqq+AB
-XO9b7Qv6QnGsZgrBdcA1TI9aPpc1CCvJ9YFfz5d5i9kl2C5+2D0HKfW5CvUrebCg
-A8jQqaWsohzVo8l7MkzfsnvfT/KvSmrD2SjY1VBdDx1ttHBUo33S9h8RwCdq6PNs
-allWexEivfIGYmF/tdO8hM2fGLR92rN3GFvksU/e1sE8PwcKex8554BLtVsxTex0
-iy94WGLa8NMlneM5/T7VA7nee63OuEYySYebndtOBQc1U02yJykCL4Ntxu//KDT+
-fZQYFM27To5x37gWDzbMasDcEyCM7F+i1f4iEXXMoTg9RKtjk027ohqGBbl15j03
-qzD5Gz4rXevvPIiu+W12
-=2k1u
+iEYEAREIAAYFAlViWu8ACgkQ1fmVwcYIWAZkugCdG6lAvF19ZdgdaNjPQq0Fvtpa
+2/AAnA0a1DRa1UilBDoVLfzwaJuCrl2k
+=TRuO
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
index fa3ee26a9c6e..91c689c6e696 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.4.9-r200.ebuild,v 1.1 2015/05/24 22:43:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild,v 1.2 2015/05/24 23:12:46 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -21,8 +21,8 @@ IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libs
 # bugs 372493, 416331
 REQUIRED_USE="
 	geoloc? ( introspection )
-	introspection? ( gstreamer )
 	gles2? ( egl )
+	introspection? ( gstreamer )
 	webgl? ( ^^ ( gles2 opengl ) )
 	!webgl? ( ?? ( gles2 opengl ) )
 	|| ( aqua X )
@@ -30,21 +30,23 @@ REQUIRED_USE="
 
 # use sqlite, svg by default
 RDEPEND="
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	media-libs/harfbuzz:=[icu(+)]
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.6:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.5:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.7:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
 	media-libs/libwebp:=
+	>=net-libs/libsoup-2.42:2.4[introspection?]
 	virtual/jpeg:0=
-	>=media-libs/libpng-1.4:0=
 	>=x11-libs/cairo-1.10:=[X]
-	>=dev-libs/glib-2.36.0:2
-	>=dev-libs/icu-3.8.1-r1:=
-	>=net-libs/libsoup-2.42.0:2.4[introspection?]
-	dev-db/sqlite:3=
-	>=x11-libs/pango-1.30.0.0
+	>=x11-libs/gtk+-2.24.10:2[aqua?,introspection?]
 	x11-libs/libXrender
 	x11-libs/libXt
-	>=x11-libs/gtk+-2.24.10:2
+	>=x11-libs/pango-1.30.0
 
 	egl? ( media-libs/mesa[egl] )
 	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
@@ -66,7 +68,7 @@ RDEPEND="
 # Need real bison, not yacc
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-lang/perl
+	>=dev-lang/perl-5.10
 	|| (
 		virtual/rubygems[ruby_targets_ruby20]
 		virtual/rubygems[ruby_targets_ruby21]
@@ -75,9 +77,9 @@ DEPEND="${RDEPEND}
 	)
 	>=dev-libs/atk-2.8.0
 	>=dev-util/gtk-doc-am-1.10
-	dev-util/gperf
+	>=dev-util/gperf-3.0.1
 	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.33
+	>=sys-devel/flex-2.5.34
 	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
 	sys-devel/gettext
 	>=sys-devel/make-3.82-r4
@@ -159,14 +161,14 @@ src_prepare() {
 		-i Tools/TestWebKitAPI/GNUmakefile.am || die
 
 	# bug #459978, upstream bug #113397
-	epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
+	epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
 
 	# Deadlock causing infinite compilations with nvidia-drivers:
 	# https://bugs.gentoo.org/show_bug.cgi?id=463960
 	# http://osdyson.org/issues/161
 	# https://bugs.webkit.org/show_bug.cgi?id=125651
-#	FIXME: it doesn't really work for us
-#	epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.patch
+	# FIXME: it doesn't really work for us
+	#epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.patch
 
 	# Debian patches to fix support for some arches
 	# https://bugs.webkit.org/show_bug.cgi?id=129540
@@ -174,7 +176,9 @@ src_prepare() {
 	# https://bugs.webkit.org/show_bug.cgi?id=129542
 	epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
 
-	epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch #481688
+	# Fix build with recent libjpeg, bug #481688
+	# https://bugs.webkit.org/show_bug.cgi?id=122412
+	epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch
 
 	# Fix building with --disable-webgl, bug #500966
 	# https://bugs.webkit.org/show_bug.cgi?id=131267
@@ -192,7 +196,8 @@ src_configure() {
 	# Arches without JIT support also need this to really disable it in all places
 	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
 
-	# It doesn't compile on alpha without this in LDFLAGS, bug #???
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
 	use alpha && append-ldflags "-Wl,--no-relax"
 
 	# Sigbuses on SPARC with mcpu and co., bug #???
@@ -210,16 +215,16 @@ src_configure() {
 		append-ldflags "-Wl,--reduce-memory-overheads"
 	fi
 
-	local myconf=""
+	local ruby_interpreter=""
 
 	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		myconf="${myconf} RUBY=$(type -P ruby22)"
+		ruby_interpreter="RUBY=$(type -P ruby22)"
 	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		myconf="${myconf} RUBY=$(type -P ruby21)"
+		ruby_interpreter="RUBY=$(type -P ruby21)"
 	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		myconf="${myconf} RUBY=$(type -P ruby20)"
+		ruby_interpreter="RUBY=$(type -P ruby20)"
 	else
-		myconf="${myconf} RUBY=$(type -P ruby19)"
+		ruby_interpreter="RUBY=$(type -P ruby19)"
 	fi
 
 	# TODO: Check Web Audio support
@@ -247,7 +252,7 @@ src_configure() {
 		--disable-webkit2 \
 		--enable-dependency-tracking \
 		--disable-gtk-doc \
-		${myconf}
+		${ruby_interpreter}
 }
 
 src_compile() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
index a09cd91b3517..d94854bdacd5 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.4.9.ebuild,v 1.1 2015/05/24 22:43:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild,v 1.2 2015/05/24 23:12:46 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -21,8 +21,8 @@ IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libs
 # bugs 372493, 416331
 REQUIRED_USE="
 	geoloc? ( introspection )
-	introspection? ( gstreamer )
 	gles2? ( egl )
+	introspection? ( gstreamer )
 	webgl? ( ^^ ( gles2 opengl ) )
 	!webgl? ( ?? ( gles2 opengl ) )
 	|| ( aqua wayland X )
@@ -33,21 +33,22 @@ REQUIRED_USE="
 # gtk2 is needed for plugin process support
 # gtk3-3.10 required for wayland
 RDEPEND="
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	media-libs/harfbuzz:=[icu(+)]
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.6:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.5:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-0.9.7:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
 	media-libs/libwebp:=
+	>=net-libs/libsoup-2.42:2.4[introspection?]
 	virtual/jpeg:0=
-	>=media-libs/libpng-1.4:0=
-	>=x11-libs/cairo-1.10:=[X]
-	>=dev-libs/glib-2.36.0:2
-	>=x11-libs/gtk+-3.6.0:3[aqua=,introspection?]
-	>=dev-libs/icu-3.8.1-r1:=
-	>=net-libs/libsoup-2.42.0:2.4[introspection?]
-	dev-db/sqlite:3=
-	>=x11-libs/pango-1.30.0.0
-	x11-libs/libXrender
-	x11-libs/libXt
+	>=x11-libs/cairo-1.10:=[X?]
+	>=x11-libs/gtk+-3.6.0:3[X?,aqua?,introspection?]
+	>=x11-libs/pango-1.30.0
+
 	>=x11-libs/gtk+-2.24.10:2
 
 	egl? ( media-libs/mesa[egl] )
@@ -65,13 +66,17 @@ RDEPEND="
 		x11-libs/cairo[opengl]
 		x11-libs/libXcomposite
 		x11-libs/libXdamage )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt )
 "
 
 # paxctl needed for bug #407085
 # Need real bison, not yacc
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	dev-lang/perl
+	>=dev-lang/perl-5.10
 	|| (
 		virtual/rubygems[ruby_targets_ruby20]
 		virtual/rubygems[ruby_targets_ruby21]
@@ -81,9 +86,9 @@ DEPEND="${RDEPEND}
 	>=app-accessibility/at-spi2-core-2.5.3
 	>=dev-libs/atk-2.8.0
 	>=dev-util/gtk-doc-am-1.10
-	dev-util/gperf
+	>=dev-util/gperf-3.0.1
 	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.33
+	>=sys-devel/flex-2.5.34
 	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
 	sys-devel/gettext
 	>=sys-devel/make-3.82-r4
@@ -165,14 +170,14 @@ src_prepare() {
 		-i Tools/TestWebKitAPI/GNUmakefile.am || die
 
 	# bug #459978, upstream bug #113397
-	epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
+	epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
 
 	# Deadlock causing infinite compilations with nvidia-drivers:
 	# https://bugs.gentoo.org/show_bug.cgi?id=463960
 	# http://osdyson.org/issues/161
 	# https://bugs.webkit.org/show_bug.cgi?id=125651
-#	FIXME: it doesn't really work for us
-#	epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.patch
+	# FIXME: it doesn't really work for us
+	#epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.patch
 
 	# Debian patches to fix support for some arches
 	# https://bugs.webkit.org/show_bug.cgi?id=129540
@@ -184,7 +189,9 @@ src_prepare() {
 	# https://bugs.webkit.org/show_bug.cgi?id=130837
 	epatch "${FILESDIR}"/${PN}-2.4.4-atomic-ppc.patch
 
-	epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch #481688
+	# Fix build with recent libjpeg, bug #481688
+	# https://bugs.webkit.org/show_bug.cgi?id=122412
+	epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch
 
 	# Fix building with --disable-webgl, bug #500966
 	# https://bugs.webkit.org/show_bug.cgi?id=131267
@@ -202,7 +209,8 @@ src_configure() {
 	# Arches without JIT support also need this to really disable it in all places
 	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
 
-	# It doesn't compile on alpha without this in LDFLAGS, bug #???
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
 	use alpha && append-ldflags "-Wl,--no-relax"
 
 	# Sigbuses on SPARC with mcpu and co., bug #???
@@ -220,16 +228,16 @@ src_configure() {
 		append-ldflags "-Wl,--reduce-memory-overheads"
 	fi
 
-	local myconf=""
+	local ruby_interpreter=""
 
 	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		myconf="${myconf} RUBY=$(type -P ruby21)"
+		ruby_interpreter="RUBY=$(type -P ruby22)"
 	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		myconf="${myconf} RUBY=$(type -P ruby21)"
+		ruby_interpreter="RUBY=$(type -P ruby21)"
 	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		myconf="${myconf} RUBY=$(type -P ruby20)"
+		ruby_interpreter="RUBY=$(type -P ruby20)"
 	else
-		myconf="${myconf} RUBY=$(type -P ruby19)"
+		ruby_interpreter="RUBY=$(type -P ruby19)"
 	fi
 
 	# TODO: Check Web Audio support
@@ -258,7 +266,7 @@ src_configure() {
 		--with-gtk=3.0 \
 		--enable-dependency-tracking \
 		--disable-gtk-doc \
-		${myconf}
+		${ruby_interpreter}
 }
 
 src_compile() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild
index 32ff62ee41aa..143ad216ae72 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.6.6.ebuild,v 1.1 2015/05/02 16:18:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild,v 1.2 2015/05/24 23:12:46 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -35,24 +35,24 @@ REQUIRED_USE="
 # gtk2 is needed for plugin process support, should we add a USE flag to configure this?
 # gtk3-3.10 required for wayland
 RDEPEND="
-	>=dev-libs/glib-2.36.0:2
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/icu-3.8.1-r1:=
 	>=dev-libs/libxml2-2.8:2
 	>=dev-libs/libxslt-1.1.7
-	virtual/jpeg:0=
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
 	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
 	>=media-libs/libpng-1.4:0=
 	media-libs/libwebp:=
-	>=dev-libs/icu-3.8.1-r1:=
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
 	>=net-libs/libsoup-2.42:2.4[introspection?]
+	virtual/jpeg:0=
 	>=x11-libs/cairo-1.10.2:=[X]
 	>=x11-libs/gtk+-3.6.0:3[X,introspection?]
-	dev-db/sqlite:3=
-	>=x11-libs/pango-1.30.0.0
+	>=x11-libs/pango-1.30.0
+	x11-libs/libX11
 	x11-libs/libXrender
 	x11-libs/libXt
-	x11-libs/libX11
 
 	>=x11-libs/gtk+-2.24.10:2
 
@@ -144,7 +144,7 @@ src_configure() {
 	# Arches without JIT support also need this to really disable it in all places
 	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
 
-	# It doesn't compile on alpha without this in LDFLAGS
+	# It does not compile on alpha without this in LDFLAGS
 	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
 	use alpha && append-ldflags "-Wl,--no-relax"