net-libs/webkit-gtk: update to 2.4.9.

16 files changed, 274 insertions, 734 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 237fa68f..d1330e5b 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,19 +1,14 @@
-AUX gir-paxctl-lt-wrapper 1015 SHA256 cb11d91ed69c0fcce2ca6502b715d0f846dd6b062ce98441a70a5b2d2f1e042a SHA512 8a0e5ae51ab38f1e27e18cc7a7166267bdb8d9ea814874ddbfc97c5022c555d23cffce496219f0827f9eac32a55d5d95ac353eb56b4439f915a8c34683a1989d WHIRLPOOL 937e28e599f50535f6c8461acc10982719856c5b760d5d592d86819601bca5c032b405f215ff525c0278ce6563704c385cb942e3e21093112dce33d0b280a72c
 AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 422 SHA256 4ee4f54be107bf947b39266c868671670cf759ca52879382dddcef66168b841c SHA512 bb56020948d255f1e9de06528cebd921820862593b865cc6a2ba9e1c0e734dc7bb9bcbd5c6e8a735e4ee3afd906b0d17bc43a4a262a98f28a467c649d9d15a3c WHIRLPOOL 5793470581e9971eb699f464e15153b9080225d6e44011c5af14dd379da4d3f8c614a1029f9b98bcaa5d5ba649d0b542e8796fc564baf31cddafe675df317818
 AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1
-AUX webkit-gtk-2.2.4-unittests-build.patch 2866 SHA256 714b4663c5ae3fc695ae13c40fbedfae358e7ae4b6c2743a35ddd5e96d213133 SHA512 e4ba2eafdc97a673d07d1e253832c30ec32b57e02eb5b61d7a1c327760630f39d24e215a7940bcd5cd9ca321cd4d71e433f231e12e8476ebda62abfa53573297 WHIRLPOOL 5252edd1a69769ef99724f1aaf7844e50a9db1c204984ee066c2dd116bc58814631ddd9bea6bf4822e4c1122ad230f50f87e5f037b00e35ee81299fb9adf7ab5
-AUX webkit-gtk-2.2.5-gir-nvidia-hangs.patch 4078 SHA256 843ed737a72f4cb705901efc05ba23442e1eceb21602c21a7593fa81e5b78a51 SHA512 3cb09602a87e7ab0f45ec1ae38f4ac51f2af86a871fe66373723ed1ce911984d5e9ba572b9d46601ac1f14ca8ecabcd21296b7c32cb21f2c1a1fe005248128d0 WHIRLPOOL aefa244dc599729c9fadb0faeb3f217d8b89b3be35ee2e19e86aa84ec2081d1ac35b81a29255992f9d952bf96386af701bf5a31c0f2aeb139b2044b1a0b394d1
 AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256 9a2b8311a89aa3500d19d2425c0f12f67c1457c67ecaa322511170461c4c6be7 SHA512 168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1 WHIRLPOOL 5fc8070bf07eef199578db5802452b4443ee3a00b555325b430a3cfd923a0cbb827497907462cb224b07f2f1713d65a26af4adf24b3dca59cb9040dbd6227f92
-AUX webkit-gtk-2.2.5-ia64-malloc.patch 780 SHA256 4a057c94f3e83101dc48401897a2e9295106e395bdf2a7abcad8334afb26f22b SHA512 09d3287fb41dbe5f87e483874f9c81b0e5dbcc1eed709285aaa4f0232377ba19865491ed0f2e5a108bbc8f3d486bc6ab30f3c940cb68dc8515c1826b181051df WHIRLPOOL 4f97a8d74b95cdfe1d223391b93c6de0dbe0944fd9872bf81c5e1d357f677ca6650beb73ad44e50dd51dc4505807592b2caaee4010e271cbb6ada772c6b2a72d
 AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e WHIRLPOOL d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072
-AUX webkit-gtk-2.2.5-sparc64-build.patch 1169 SHA256 fe6c7c345eb46a0f6856b5f1c547a65185b36c314d6f55a7980c640da0a53b56 SHA512 c59c6aed45ce237d68e58e5b03f46dc66ae4b73cd8a78f7eab9429ef3fe13882d0985da33f30fb425e0b5945298502ac35f9888e666c177fe2467f3f1ed35892 WHIRLPOOL f5a55fcaafc203352583e9ded39e79edca8e9d13cb1cf6e6574e905729fc8e9f92ccd75cd9309b66734f91830847164ebe9011c149e17c85af5549bd40b04f90
-AUX webkit-gtk-2.2.6-musl-remove-execinfo.patch 1205 SHA256 81a965fb74a00e1f3a806fb3aa7910317ee340ee606cc1e66672b1514d028d07 SHA512 7f39e6889f96d11e9e255a5f131d3bf43e9b8742f1a87dbafb626e2f11b7037f74ab2a42a7b0cb3f25278d0bf18a52baed2fe8c6c003acd9a9760fc18437faeb WHIRLPOOL 9151d8f0a9bae2fc06122d769906694984fc6afe9ffeb2bda11ee5f3bc64b757f5b19c7fe176adfa360a07e86d5735a5e4348c5cc513fcdef70c15c14dad58a9
 AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256 8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 WHIRLPOOL 7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925
-AUX webkit-gtk-2.4.1-musl-remove-execinfo.patch 1163 SHA256 88bf7b60857ce237ca07ef07dca3f16a72c20d2d2dc2b5dd8f5d0ccf78744843 SHA512 a7815a7894f4ad8d6f920ab8d7845bec80519b18ba70deff0e087d86bf2a800f4a341150d7a0e6973e1b11b591f34169cbd62b4dfc89765a82f4602e5e23bd05 WHIRLPOOL 4d176a7404605ebb1d5a4b195ca36a033f78ebba7019131bd5b16a04373124932b6536430270520ce8abe232e9978fadda937d93b82316dee4ebe9acc360ca5e
-DIST webkitgtk-2.2.6.tar.xz 9400300 SHA256 157ee7377ae97a27bb3b9bd2733d9353979632543c3d078b6578aeeb1319bf06 SHA512 9a90109ee8f591ae34ac2282e21aeee872292d82d1f66ebc69fb506c89a8ec952e373b35d1db7cc68307ea6ee90949c5c447ed206f14ec77374f8d68ab56021d WHIRLPOOL 47e5ffa17b53238f6282b17e2eb3e988dac7f295dd6757c097ea81d826770b1929d04d79f8a0e03abe5e30bfeb8626c42ad06c6a13aa0e9626120f590b55a931
-DIST webkitgtk-2.4.1.tar.xz 9836352 SHA256 6eed5d41ecdcfbafe3c2fbb0f0b79b9cda87a5ea0e7d0938afb6c6c82996e2f7 SHA512 59f7d053fce46efc47461e721f0bf75cdda1a89c2ad57e4866d2effd86995704eb63fcc797a9ea2b0764491c21cda28840ca388dd7d0c89447df35304ca835de WHIRLPOOL 2c9f940267b462731eed0d487338a7f6897e63c6420eedf2bd0cde0e272ed766fec979f6658618d4d535868ce782d7a1256ce5fd178ae621f03170067c6c96a9
-DIST webkitgtk-2.4.3.tar.xz 9841564 SHA256 9862c3eac1d12cc6e52cc39060a1284163950b304d534529a0dbcc5958a8ceac SHA512 fc4b36a3e11075325c79ced9f0d70a4b3daec43c5d3fff63ec843c513f04fd6cbe1b6472ea83e77f250f334f962a636a2423d8dbea4db0c767e823e2bd63f8d4 WHIRLPOOL dc9eb5211bbbea899379e688816ec978aa0f813ece777d0d9da08309eb2d647c662be66599a945bf743ff2946646e9e7d0554e0e9333fd10be425f05c7c8ffb6
-EBUILD webkit-gtk-2.2.6-r99.ebuild 8884 SHA256 f2b7d013665e1c1e3f63d3d4592c3d19663cae6a1618f916655650f34e12e2be SHA512 01df0abece0281db90e8bc774f9caa82d09576cf388d8c5e4145929b8786062270b57710e2e4bf2e1cde155dbe263a1293ee8dc21cb3547d760a297d0a20abcc WHIRLPOOL beeaabe0c403751fa91d82a57d6717480e6114fb98016482aca1ad1b57744355b16f1df84b3865eaf0f782cc5ddb0e68aa04f77d5f9bcd94a2e14d8c05c73288
-EBUILD webkit-gtk-2.4.1-r99.ebuild 9008 SHA256 ae749acd31433578eb2bd1527bc8be1a4755c8a1daa4abe60dea4e87e97a93f7 SHA512 af9e8b6482b1bfac11ee4e5127b7fdc7e0d916116cf946f704fb48e7c9866f80f53865ae0da2c4fe2732be88c408c966f84c030c95b07e7c20474ff98add8642 WHIRLPOOL 84025fff7b12420606b0a9e0a934c47b7f2f6252ad94289f6cc89130bfbda878a57d343421c2c82c6126a00789860c792a37f36240643904684095ce367939d0
-EBUILD webkit-gtk-2.4.3-r99.ebuild 9010 SHA256 1bf5f2c90b61448d375a343606ffc9da92360a1353090c8210c17a26036941ff SHA512 8c941c0e149903e5206803b7a8ad24c53f51c3091d5993f31735c129af08676a5f1dcbeee430c2d3e68c09390bbeac2690ff2fd6e0e5fa50c608e883da5719c8 WHIRLPOOL e76df6c5b7f6ba0212e81cbe870537a47d2cc43898aaa21e2b616fe6d39d281921ff087ca1b7a53a8a231b2abbfd2332306733d9ad3dc3c2a21db28035e20f79
+AUX webkit-gtk-2.4.4-atomic-ppc.patch 1286 SHA256 458942430a4ee4c7f4efe0524b3b2c7d5213609136d1bc6c2a58fff92b247a33 SHA512 2aabf77fc69a26fde006cf16eabe7339bd5839bf205f50258978cad089f368cc5ce51f965ca3684c7958cfe217e50db1f09f47f5ee0b5057f4a108b2cfe23f6b WHIRLPOOL 7d346765d531d4c52423d963da3082398112ac4e82d2f5d6f973237a53917d4b3498d5c5f2398ed53337b7abc2774354496494f01de4dd592a512daff3cfbed9
+AUX webkit-gtk-2.4.4-jpeg-9a.patch 1258 SHA256 bd626ff2df4a44b98b0a82fa3f555a0a2cca8d1233f56104d78ff6959f5b2f2b SHA512 27be24cb4d592b5a8e1378751563baae6862ee64b69a4fe24f9f8da7b31020860adad784ecf6be6959c857566e0893526242ae03268679e3a590d673bf8717b8 WHIRLPOOL d768198c603a85afc56be1aa35506781e2bc7d561c7eda9ee64f6a504f6d77edda1537aa7d652b99350dfdd8213dd701b4d7fc8133946b67a4648ef8d5b7dac0
+AUX webkit-gtk-2.4.7-disable-webgl.patch 442 SHA256 6fb78d5f94806ddb976ceb076e623a2fd67e80111d624a2b3c01fde2fbbcd64e SHA512 742854749e674b3fec33652709921630a5fd3d7afd10446b3121a8cf94fb4fef70cc4de6ffe1a08143f518fd76aa05d0f4b54a041192cbc8eb9fbd5766faa5b8 WHIRLPOOL ba3f9b9dbee12f6dae05db9f343a46fd7d182d377e1a951e1785a5aff9a046d057bbf85821642e948c15a084e69d01054fe5632d7460892b196334adea582e72
+AUX webkit-gtk-2.4.9-remove-disallow_ctypes_h-braindead.patch 733 SHA256 d447d71943cacdec166f0a65f34258494f70719ba9cd951d5b512902e20200d0 SHA512 580531428c0498e996de358a20a499f36edaaa98a108088c5dde428a997a61e5a55293cf855d652655c193cd5cda8e25723cac360d3983fcd1fbce35aa9b41a0 WHIRLPOOL b68bc94045ef46f5959146b6d14e2e39c9a1e3c7a39a9e7164ece4db1d1fc9f3c846b26af5e7b2b81db5ee82913b4018097367c6843a8b41758316cd27371bcc
+AUX webkit-gtk-2.4.9-remove-execinfo_h.patch 1374 SHA256 9a6cea9456c7d38b280be1d4f29417e3d4ebd619e183535368175c473485c2dd SHA512 f4a0647530f29bed5fdbf0fcec5d52c6064a13c00715fb6fb490490dee29dac87bb2b1d9ab35ce2bf7b9eb2da262cf5bb07b7c84f82f84cfab784a61f163811e WHIRLPOOL f18be67ef26051ebe271481c3444761c604a40fcda9679f3778cccbc3513f8501a6c3ea9b43fa1b3c3eaa04ca08585e62d8b3a27185358dc69c612ef8eab8364
+DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
+EBUILD webkit-gtk-2.4.9-r200.ebuild 9285 SHA256 8585b0e59c31696aa9486ff25ef278a43d0a4d75d28faed2dbce31e60be09178 SHA512 9e5af9413736d8da7eeaa9e5f4ca07dc757f7249623aec3eaa4d2401992451ac5eca77861171e93d9d56d19e6c521910a8d42c5fbf6a7cd9ab0bc0020066a686 WHIRLPOOL 5e844692c665e08cb8fcef250b0043752ac71f5019069a253ae2a552d570827f727505b6da143a17236a47bfec65bd4545ef6e05837219d15a2ddbe67026a6c8
+EBUILD webkit-gtk-2.4.9.ebuild 9759 SHA256 82f509817636144fdbeb1f499d34673c7d5178ec171d379279a77b10815fb4bf SHA512 4d04b16ab3c546a9363e452681345b8a989da971b0e8cc1a8f55088e9e3f30fc12a5806d43186421ad7b11bda1268bf2dfc1a7d75972e8451d3c6d53af639314 WHIRLPOOL b191db4c9d7365b88eba0106bc6c5a360a826b1236cdfaf440353db551124488c94bd3a6c35f84b83c0ff6a1831d95dbe9c259138ca8174fa9a88d1ba240e93c
 MISC metadata.xml 610 SHA256 23faf3368df312d51e2dd38d6e7695410deab694bc12558cbe9751067575df11 SHA512 ac78b2e8a719247f5294c045ead7731cd42fb7200ea5a6a450ac18abd3a79fc888045e2c7f98bf984dd2a9484fc352ebc06e6b1c7a0bdd75a65a825e71c09188 WHIRLPOOL f2c88de8a7889cd3cdbb66f498067f85a5e6ce0c7b3732299ad9373e39ac332abe5d3da93f8fbe1e5f63b44306f9def006a3e34349eaca12ee9fb3b7a7368ea1
diff --git a/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper b/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper
deleted file mode 100755
index d4f270c2..00000000
--- a/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-# Wrapper for $(LIBTOOL) that performs PaX marking on the dumper binary
-# generated by g-ir-scanner.
-# PaX marking code stolen from pax-utils.eclass
-
-flags=${1//-}; shift
-
-echo ${LIBTOOL} "$@"
-${LIBTOOL} "$@"
-
-retval=$?
-
-files=$(find . -path "*tmp-introspect*/.libs/*")
-
-if type -p paxctl > /dev/null; then
-	echo "PT PaX marking -${flags} ${files}"
-	for f in ${files}; do
-		# First, try modifying the existing PAX_FLAGS header
-		paxctl -q${flags} "${f}" && continue
-		# Second, try stealing the (unused under PaX) PT_GNU_STACK header
-		paxctl -qc${flags} "${f}" && continue
-		# Third, try pulling the base down a page, to create space and
-		# insert a PT_GNU_STACK header (works on ET_EXEC)
-		paxctl -qC${flags} "${f}" && continue
-	done
-elif type -p scanelf > /dev/null; then
-	# Try scanelf, the Gentoo swiss-army knife ELF utility
-	# Currently this sets PT if it can, no option to control what it does.
-	echo "Fallback PaX marking -${flags} ${files}"
-	scanelf -Xxz ${flags} ${files}
-fi
-
-exit ${retval}
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
deleted file mode 100644
index a6077b4a..00000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.4-unittests-build.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-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/files/webkit-gtk-2.2.5-gir-nvidia-hangs.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-gir-nvidia-hangs.patch
deleted file mode 100644
index 854a1120..00000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-gir-nvidia-hangs.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Description: deadlock in gobject introspection
-Bug-Dyson: http://osdyson.org/issues/161
-Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=463960
-Stack:
-25849:  /home/pashev/packaging/webkitgtk/webkitgtk-2.0.4/build-2.0/tmp-introsp
------------------  lwp# 1 / thread# 1  --------------------
- fffffd7ffeeaf957 lwp_park (0, 0, 0)
- fffffd7ffeea8036 mutex_lock_impl () + 156
- fffffd7ffeea810b mutex_lock () + b
- fffffd7ffee340fa _preexec_atfork_unload () + 3a
- fffffd7ffee343ab _preexec_exit_handlers () + bb
- fffffd7fff5ccf0d purge_exit_handlers () + 10d
- fffffd7fff5cec18 remove_hdl () + ce8
- fffffd7fff5c8895 dlclose_core () + c5
- fffffd7fff5c88e5 dlclose_intn () + 15
- fffffd7fff5c89bb dlclose_check () + 7b
- fffffd7fff5c8a21 dlclose () + 41
- fffffd7ffaa03c41 px_module_manager_load () + 191
- fffffd7ffaa03cf6 px_module_manager_load_dir () + 66
- fffffd7ffaa050d7 px_proxy_factory_new () + 107
- fffffd7ffb201671 ???????? ()
- fffffd7feca30eca g_type_create_instance () + 16a
- fffffd7feca1597c ???????? ()
- fffffd7feca17472 g_object_newv () + 792
- fffffd7feca17aec g_object_new () + ec
- fffffd7fece5d052 ???????? ()
- fffffd7fece5d1d8 ???????? ()
- fffffd7fc98659a5 ???????? ()
- fffffd7feca173f6 g_object_newv () + 716
- fffffd7feca17aec g_object_new () + ec
- fffffd7fc986da24 soup_session_add_feature_by_type () + e4
- fffffd7fc986fb43 ???????? ()
- fffffd7feca17e00 g_object_set_valist () + 300
- fffffd7feca186d7 g_object_set () + e7
- fffffd7fc5724f87 WebCore::ResourceHandle::defaultSession() () + a7
- fffffd7fc48da299 webkitExit() () + 9
- fffffd7ffee33f56 _exithandle () + 66
- fffffd7ffee1e191 exit () + 11
- 00000000004086af ???????? ()
- 000000000040724c _start () + 6c
------------------  lwp# 2 / thread# 2  --------------------
- fffffd7ffeeaf957 lwp_park (0, 0, 0)
- fffffd7ffeea94bf cond_wait_queue () + 4f
- fffffd7ffeea9b12 __cond_wait () + b2
- fffffd7ffeea9b42 cond_wait () + 22
- fffffd7ffeea9b79 pthread_cond_wait () + 9
- fffffd7fc4eed04b WebCore::IconDatabase::syncThreadMainLoop() () + 12b
- fffffd7fc4eed278 WebCore::IconDatabase::iconDatabaseSyncThread() () + 138
- fffffd7fc3b2bc59 WTF::wtfThreadEntryPoint(void*) () + 19
- fffffd7ffeeaf617 _thrp_setup () + 77
- fffffd7ffeeaf910 _lwp_start ()
------------------  lwp# 3 / thread# 3  --------------------
- fffffd7ffeeaf957 lwp_park (0, 0, 0)
- fffffd7ffeea8036 mutex_lock_impl () + 156
- fffffd7ffeea810b mutex_lock () + b
- fffffd7ffee33e17 atexit_locks () + 17
- fffffd7ffee58ce9 libc_prepare_atfork () + 9
- fffffd7ffee34533 _prefork_handler () + 33
- fffffd7ffee9fc85 forkx () + 275
- fffffd7ffee9fcab fork () + b
- fffffd7fec68aacb ???????? ()
- fffffd7fec68b2a7 g_spawn_sync () + 167
- fffffd7fec68b994 g_spawn_command_line_sync () + 74
- fffffd7feceb2748 ???????? ()
- fffffd7feceb4019 g_dbus_address_get_for_bus_sync () + 2c9
- fffffd7fecebd11e ???????? ()
- fffffd7fecec4643 g_bus_get_sync () + 63
- fffffd7ffc60700b ???????? ()
- fffffd7ffc60714f ???????? ()
- fffffd7fec648ad0 g_main_context_dispatch () + 130
- fffffd7fec648e40 ???????? ()
- fffffd7fec648f08 g_main_context_iteration () + 38
- fffffd7ffc606f65 ???????? ()
- fffffd7fec66d50d ???????? ()
- fffffd7ffeeaf617 _thrp_setup () + 77
- fffffd7ffeeaf910 _lwp_start ()
-Index: webkit/Source/WebKit/gtk/webkit/webkitglobals.cpp
-===================================================================
---- webkit.orig/Source/WebKit/gtk/webkit/webkitglobals.cpp	2013-12-02 00:06:10.504150531 +0400
-+++ webkit/Source/WebKit/gtk/webkit/webkitglobals.cpp	2013-12-03 14:08:05.956932011 +0400
-@@ -564,6 +564,14 @@
- 
-     WebCore::SchemeRegistry::registerURLSchemeAsLocal("resource");
- 
-+    // http://osdyson.org/issues/161
-+    // WebKitGTK FTBFS when building GObject introspection due to deadlock.
-+    // When gobject introspection is done, a simple program call exit()
-+    // exit() -> webkitExit() -> g_object_unref() -> webkit_get_default_session()
-+    // -> ResourceHandle::defaultSession() => default session doesn't exist! AND
-+    // we try to create it! Thus deadlock. So, create default session earlier:
-+    (void) webkit_get_default_session();
-+
-     atexit(webkitExit);
- }
- 
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch
deleted file mode 100644
index 5f0542c4..00000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix wide pointer issues on ia64 (closes: #642750).
-Author: Stephan Schreiber <info@fs-driver.org>
-Index: webkitgtk/Source/WTF/wtf/Platform.h
-===================================================================
---- webkitgtk.orig/Source/WTF/wtf/Platform.h
-+++ webkitgtk/Source/WTF/wtf/Platform.h
-@@ -705,6 +705,13 @@
- #define ENABLE_JIT 1
- #endif
- 
-+/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because
-+   some memory barriers are missing in the thread-unsafe code around the
-+   pagemap_cache_ object. */
-+#if CPU(IA64) || CPU(IA64_32)
-+#define USE_SYSTEM_MALLOC 1
-+#endif
-+
- /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms. */
- #if !defined(ENABLE_JIT) \
-     && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(MIPS)) \
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-sparc64-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-sparc64-build.patch
deleted file mode 100644
index 691b5286..00000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-sparc64-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-Source_WTF_wtf_Atomics_h,v 1.3 2013/10/20 09:07:57 landry Exp $
-
-https://bugs.webkit.org/show_bug.cgi?id=86835
-Fix build failure on sparc64 since 1.8.1, provide atomic{In,De}crement implems based on __sync_fetch_and_add builtin
-
---- Source/WTF/wtf/Atomics.h.orig	Sat Aug  3 18:10:38 2013
-+++ Source/WTF/wtf/Atomics.h	Sun Oct 20 11:06:14 2013
-@@ -112,6 +112,15 @@ inline int atomicDecrement(int volatile* addend) { ret
- inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_add_and_fetch(addend, 1); }
- inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_sub_and_fetch(addend, 1); }
- 
-+#elif COMPILER(GCC) && CPU(SPARC64)
-+#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
-+
-+inline int atomicIncrement(int volatile* addend) { return __sync_fetch_and_add(addend, 1) + 1; }
-+inline int atomicDecrement(int volatile* addend) { return __sync_fetch_and_add(addend, -1) - 1; }
-+
-+inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_fetch_and_add(addend, 1) + 1; }
-+inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_fetch_and_add(addend, -1) - 1; }
-+
- #endif
- 
- #if OS(WINDOWS)
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.6-musl-remove-execinfo.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.6-musl-remove-execinfo.patch
deleted file mode 100644
index bb120f60..00000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.6-musl-remove-execinfo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur webkitgtk-2.2.6.orig/Source/WTF/wtf/Assertions.cpp webkitgtk-2.2.6/Source/WTF/wtf/Assertions.cpp
---- webkitgtk-2.2.6.orig/Source/WTF/wtf/Assertions.cpp	2014-03-19 03:53:02.000000000 -0400
-+++ webkitgtk-2.2.6/Source/WTF/wtf/Assertions.cpp	2014-06-18 08:33:19.280216672 -0400
-@@ -64,12 +64,6 @@
- #include <windows.h>
- #endif
- 
--#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
--#include <cxxabi.h>
--#include <dlfcn.h>
--#include <execinfo.h>
--#endif
--
- #if PLATFORM(BLACKBERRY)
- #include <BlackBerryPlatformLog.h>
- #endif
-@@ -242,9 +236,7 @@
- 
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
--    *size = backtrace(stack, *size);
--#elif OS(WINDOWS) && !OS(WINCE)
-+#if OS(WINDOWS) && !OS(WINCE)
-     // The CaptureStackBackTrace function is available in XP, but it is not defined
-     // in the Windows Server 2003 R2 Platform SDK. So, we'll grab the function
-     // through GetProcAddress.
-@@ -278,9 +270,6 @@
- 
- #if OS(DARWIN) || OS(LINUX)
- #  if PLATFORM(QT) || PLATFORM(GTK)
--#    if defined(__GLIBC__) && !defined(__UCLIBC__)
--#      define WTF_USE_BACKTRACE_SYMBOLS 1
--#    endif
- #  else
- #    define WTF_USE_DLADDR 1
- #  endif
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-musl-remove-execinfo.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-musl-remove-execinfo.patch
deleted file mode 100644
index a234f269..00000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-musl-remove-execinfo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur webkitgtk-2.4.1.orig/Source/WTF/wtf/Assertions.cpp webkitgtk-2.4.1/Source/WTF/wtf/Assertions.cpp
---- webkitgtk-2.4.1.orig/Source/WTF/wtf/Assertions.cpp	2014-04-14 02:40:45.000000000 -0400
-+++ webkitgtk-2.4.1/Source/WTF/wtf/Assertions.cpp	2014-06-18 09:16:35.617334849 -0400
-@@ -63,12 +63,6 @@
- #include <windows.h>
- #endif
- 
--#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
--#include <cxxabi.h>
--#include <dlfcn.h>
--#include <execinfo.h>
--#endif
--
- extern "C" {
- 
- WTF_ATTRIBUTE_PRINTF(1, 0)
-@@ -233,9 +227,7 @@
- 
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
--    *size = backtrace(stack, *size);
--#elif OS(WINDOWS) && !OS(WINCE)
-+#if OS(WINDOWS) && !OS(WINCE)
-     // The CaptureStackBackTrace function is available in XP, but it is not defined
-     // in the Windows Server 2003 R2 Platform SDK. So, we'll grab the function
-     // through GetProcAddress.
-@@ -269,9 +261,6 @@
- 
- #if OS(DARWIN) || OS(LINUX)
- #  if PLATFORM(GTK)
--#    if defined(__GLIBC__) && !defined(__UCLIBC__)
--#      define WTF_USE_BACKTRACE_SYMBOLS 1
--#    endif
- #  else
- #    define WTF_USE_DLADDR 1
- #  endif
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch
new file mode 100644
index 00000000..3c0ea88b
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch
@@ -0,0 +1,32 @@
+$OpenBSD: patch-Source_WebKit2_Platform_IPC_Connection_h,v 1.2 2014/07/14 21:13:31 ajacoutot Exp $
+https://bugs.webkit.org/show_bug.cgi?id=130837
+--- Source/WebKit2/Platform/IPC/Connection.h.orig	Fri Jul  4 11:06:55 2014
++++ Source/WebKit2/Platform/IPC/Connection.h	Mon Jul 14 19:31:35 2014
+@@ -216,7 +216,11 @@ class Connection : public ThreadSafeRefCounted<Connect
+ 
+     Client* m_client;
+     bool m_isServer;
++#if CPU(PPC)
++    uint64_t m_syncRequestID;
++#else
+     std::atomic<uint64_t> m_syncRequestID;
++#endif
+ 
+     bool m_onlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage;
+     bool m_shouldExitOnSyncMessageSendFailure;
+$OpenBSD: patch-Source_WebKit2_UIProcess_StatisticsRequest_cpp,v 1.3 2014/03/27 22:03:48 landry Exp $
+https://bugs.webkit.org/show_bug.cgi?id=130837
+--- Source/WebKit2/UIProcess/StatisticsRequest.cpp.orig	Thu Mar 27 21:13:49 2014
++++ Source/WebKit2/UIProcess/StatisticsRequest.cpp	Thu Mar 27 21:14:23 2014
+@@ -44,7 +44,11 @@ StatisticsRequest::~StatisticsRequest()
+ 
+ uint64_t StatisticsRequest::addOutstandingRequest()
+ {
++#if CPU(PPC)
++    static int64_t uniqueRequestID;
++#else
+     static std::atomic<int64_t> uniqueRequestID;
++#endif
+ 
+     uint64_t requestID = ++uniqueRequestID;
+     m_outstandingRequests.add(requestID);
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch
new file mode 100644
index 00000000..4226f2fb
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/481688
+http://trac.webkit.org/changeset/166490/trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+
+--- Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
++++ Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+@@ -334,5 +334,5 @@
+         case JPEG_HEADER:
+             // Read file parameters with jpeg_read_header().
+-            if (jpeg_read_header(&m_info, true) == JPEG_SUSPENDED)
++            if (jpeg_read_header(&m_info, TRUE) == JPEG_SUSPENDED)
+                 return false; // I/O suspension.
+ 
+@@ -420,7 +420,7 @@
+             m_info.dct_method = dctMethod();
+             m_info.dither_mode = ditherMode();
+-            m_info.do_fancy_upsampling = doFancyUpsampling();
+-            m_info.enable_2pass_quant = false;
+-            m_info.do_block_smoothing = true;
++            m_info.do_fancy_upsampling = doFancyUpsampling() ? TRUE : FALSE;
++            m_info.enable_2pass_quant = FALSE;
++            m_info.do_block_smoothing = TRUE;
+ 
+             // Start decompressor.
+@@ -573,5 +573,5 @@
+     // called, then we have hit the end of the buffer.  A return value of false
+     // indicates that we have no data to supply yet.
+-    return false;
++    return FALSE;
+ }
+ 
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch
new file mode 100644
index 00000000..67760e28
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch
@@ -0,0 +1,11 @@
+--- webkitgtk-2.4.6.orig/Source/WebCore/platform/graphics/OpenGLShims.cpp	2014-09-26 11:40:44.000000000 +0400
++++ webkitgtk-2.4.6.orig/Source/WebCore/platform/graphics/OpenGLShims.cpp	2014-10-13 15:38:38.496444600 +0400
+@@ -17,7 +17,7 @@ 
+  */
+ 
+ #include "config.h"
+-#if USE(3D_GRAPHICS) || defined(QT_OPENGL_SHIMS)
++#if USE(3D_GRAPHICS) || defined(QT_OPENGL_SHIMS) || USE(EGL) || USE(GLX)
+ 
+ #define DISABLE_SHIMS
+ #include "OpenGLShims.h"
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-remove-disallow_ctypes_h-braindead.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-remove-disallow_ctypes_h-braindead.patch
new file mode 100644
index 00000000..61aae3de
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-remove-disallow_ctypes_h-braindead.patch
@@ -0,0 +1,19 @@
+diff -Naur webkitgtk-2.4.9.orig/Source/WTF/wtf/DisallowCType.h webkitgtk-2.4.9/Source/WTF/wtf/DisallowCType.h
+--- webkitgtk-2.4.9.orig/Source/WTF/wtf/DisallowCType.h	2015-05-20 05:03:24.000000000 -0400
++++ webkitgtk-2.4.9/Source/WTF/wtf/DisallowCType.h	2015-07-19 14:44:26.855225521 -0400
+@@ -29,6 +29,8 @@
+ #ifndef WTF_DisallowCType_h
+ #define WTF_DisallowCType_h
+ 
++#if 0 // BRAIN DEAD - The detection here makes some bad assumptions.
++
+ // The behavior of many of the functions in the <ctype.h> header is dependent
+ // on the current locale. But almost all uses of these functions are for
+ // locale-independent, ASCII-specific purposes. In WebKit code we use our own
+@@ -81,4 +83,6 @@
+ 
+ #endif
+ 
++#endif // BRAIN DEAD
++
+ #endif
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-remove-execinfo_h.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-remove-execinfo_h.patch
new file mode 100644
index 00000000..d7be9ddb
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-remove-execinfo_h.patch
@@ -0,0 +1,37 @@
+diff -Naur webkitgtk-2.4.9.orig/Source/WTF/wtf/Assertions.cpp webkitgtk-2.4.9/Source/WTF/wtf/Assertions.cpp
+--- webkitgtk-2.4.9.orig/Source/WTF/wtf/Assertions.cpp	2015-05-20 05:03:24.000000000 -0400
++++ webkitgtk-2.4.9/Source/WTF/wtf/Assertions.cpp	2015-07-19 14:41:58.665232623 -0400
+@@ -66,7 +66,8 @@
+ #if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
+ #include <cxxabi.h>
+ #include <dlfcn.h>
+-#include <execinfo.h>
++// removed for musl - we need better intelligence here
++//#include <execinfo.h>
+ #endif
+ 
+ extern "C" {
+@@ -234,7 +235,8 @@
+ void WTFGetBacktrace(void** stack, int* size)
+ {
+ #if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
+-    *size = backtrace(stack, *size);
++// removed for musl - we need better intelligence here
++//    *size = backtrace(stack, *size);
+ #elif OS(WINDOWS) && !OS(WINCE)
+     // The CaptureStackBackTrace function is available in XP, but it is not defined
+     // in the Windows Server 2003 R2 Platform SDK. So, we'll grab the function
+@@ -280,9 +282,10 @@
+ void WTFPrintBacktrace(void** stack, int size)
+ {
+ #if USE(BACKTRACE_SYMBOLS)
+-    char** symbols = backtrace_symbols(stack, size);
+-    if (!symbols)
+-        return;
++// removed for musl - we need better intelligence here
++//    char** symbols = backtrace_symbols(stack, size);
++//    if (!symbols)
++//        return;
+ #endif
+ 
+     for (int i = 0; i < size; ++i) {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.6-r99.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.6-r99.ebuild
deleted file mode 100644
index bb018bec..00000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.6-r99.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# 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.6.ebuild,v 1.9 2014/04/21 10:30:20 ago Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} )
-GCONF_DEBUG="no"
-
-inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="3/29" # soname version
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell +webgl"
-# bugs 372493, 416331
-REQUIRED_USE="
-	geoloc? ( introspection )
-	introspection? ( gstreamer )
-	gles2? ( egl )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# 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(+)]
-	media-libs/libwebp:=
-	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/gtk+-2.24.10:2
-
-	egl? ( media-libs/mesa[egl] )
-	geoloc? ( app-misc/geoclue:0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gstreamer? (
-		>=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 )
-	spell? ( >=app-text/enchant-0.22:= )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/perl
-	|| (
-		virtual/rubygems[ruby_targets_ruby20]
-		virtual/rubygems[ruby_targets_ruby21]
-		virtual/rubygems[ruby_targets_ruby19]
-	)
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	dev-util/gperf
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.33
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.0 )
-	sys-devel/gettext
-	>=sys-devel/make-3.82-r4
-	virtual/pkgconfig
-
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-		check-reqs_pkg_pretend
-	fi
-
-	if ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.0 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	# Check whether any of the debugging flags is enabled
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
-			replace-flags -ggdb -g
-			ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS."
-			ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too"
-			ewarn "large for current binutils releases (bug #432784) and has very"
-			ewarn "high temporary build space and memory requirements."
-			ewarn "If you really want to build ${PN} with \"-ggdb\", add"
-			ewarn "WEBKIT_GTK_GGDB=yes"
-			ewarn "to your make.conf file."
-		fi
-		einfo "You need to have at least 18GB of temporary build space available"
-		einfo "to build ${PN} with debugging CFLAGS. Note that it might still"
-		einfo "not be enough, as the total space requirements depend on the flags"
-		einfo "(-ggdb vs -g1) and enabled features."
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
-	# intermediate MacPorts hack while upstream bug is not fixed properly
-	# https://bugs.webkit.org/show_bug.cgi?id=28727
-	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
-
-	# Don't force -O2
-	sed -i 's/-O2//g' "${S}"/Source/autotools/SetupCompilerFlags.m4 || die
-
-	# 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 #???
-	# * webdatasource test needs a network connection and intermittently fails with icedtea-web
-	# * webplugindatabase intermittently fails with icedtea-web, bug #????
-	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
-
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# bug #459978, upstream bug #113397
-	epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
-
-	# Do not build unittests unless requested, upstream bug #128163
-	epatch "${FILESDIR}"/${PN}-2.2.4-unittests-build.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
-	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
-	epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=129542
-	epatch "${FILESDIR}"/${PN}-2.2.5-ia64-malloc.patch
-
-	# OpenBSD patches to fix support for some arches
-	# https://bugs.webkit.org/show_bug.cgi?id=86835
-	epatch "${FILESDIR}"/${PN}-2.2.5-sparc64-build.patch
-
-	epatch "${FILESDIR}"/${P}-musl-remove-execinfo.patch
-
-	AT_M4DIR=Source/autotools eautoreconf
-
-	gnome2_src_prepare
-}
-
-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 #???
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	local myconf=""
-
-	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)"
-	else
-		myconf="${myconf} RUBY=$(type -P ruby19)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# * Aqua support in gtk3 is untested
-	# * dependency-tracking is required so parallel builds won't fail
-	gnome2_src_configure \
-		$(use_enable coverage) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable geoloc geolocation) \
-		$(use_enable gles2) \
-		$(use_enable gstreamer video) \
-		$(use_enable gstreamer web-audio) \
-		$(use_enable introspection) \
-		$(use_enable jit) \
-		$(use_enable libsecret credential_storage) \
-		$(use_enable opengl glx) \
-		$(use_enable spell spellcheck) \
-		$(use_enable webgl) \
-		$(use_enable webgl accelerated-compositing) \
-		--with-gtk=3.0 \
-		--enable-dependency-tracking \
-		--disable-gtk-doc \
-		$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
-		${myconf}
-}
-
-src_test() {
-	# Tests expect an out-of-source build in WebKitBuild
-	ln -s . WebKitBuild || die "ln failed"
-
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	unset DISPLAY
-	# Tests need virtualx, bug #294691, bug #310695
-	# Parallel tests sometimes fail
-	Xemake -j1 check
-}
-
-src_install() {
-	# https://bugs.webkit.org/show_bug.cgi?id=129242
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	# Prevents crashes on PaX systems
-	use jit && pax-mark m "${ED}usr/bin/jsc-3"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.1-r99.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
index 5a6f1ab9..4fa05568 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.1-r99.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.1.ebuild,v 1.1 2014/04/27 18:26:53 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild,v 1.5 2015/06/26 09:23:38 ago Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
 
@@ -14,40 +14,39 @@ HOMEPAGE="http://www.webkitgtk.org/"
 SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
-SLOT="3/25" # soname version of libwebkit2gtk-3.0
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl +X"
+SLOT="2" # no usable subslot
+KEYWORDS="amd64 ~arm ~mips ~ppc x86"
+
+IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell +webgl +X"
 # bugs 372493, 416331
 REQUIRED_USE="
 	geoloc? ( introspection )
-	introspection? ( gstreamer )
 	gles2? ( egl )
+	introspection? ( gstreamer )
 	webgl? ( ^^ ( gles2 opengl ) )
 	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( aqua wayland X )
+	|| ( aqua X )
 "
 
 # use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# 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/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 )
@@ -59,7 +58,6 @@ RDEPEND="
 	libsecret? ( app-crypt/libsecret )
 	opengl? ( virtual/opengl )
 	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.10:3[wayland] )
 	webgl? (
 		x11-libs/cairo[opengl]
 		x11-libs/libXcomposite
@@ -70,23 +68,24 @@ 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]
+		virtual/rubygems[ruby_targets_ruby22]
 		virtual/rubygems[ruby_targets_ruby19]
 	)
-	>=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
 	virtual/pkgconfig
 
+	geoloc? ( dev-util/gdbus-codegen )
 	introspection? ( jit? ( sys-apps/paxctl ) )
 	test? (
 		dev-lang/python:2.7
@@ -150,24 +149,15 @@ src_prepare() {
 	# * 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\/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 Tools/TestWebKitAPI/GNUmakefile.am || die
+#	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 Tools/TestWebKitAPI/GNUmakefile.am || die
 
 	# bug #459978, upstream bug #113397
-	epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
-
-	# Do not build unittests unless requested, upstream bug #128163
-	epatch "${FILESDIR}"/${PN}-2.2.4-unittests-build.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
-	epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.patch
+	epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
 
 	# Debian patches to fix support for some arches
 	# https://bugs.webkit.org/show_bug.cgi?id=129540
@@ -175,7 +165,17 @@ 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.1-musl-remove-execinfo.patch
+	# 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
+	epatch "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
+
+	# musl patches
+	epatch "${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch
+	epatch "${FILESDIR}"/${PN}-2.4.9-remove-execinfo_h.patch
 
 	AT_M4DIR=Source/autotools eautoreconf
 
@@ -189,7 +189,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 #???
@@ -207,20 +208,21 @@ src_configure() {
 		append-ldflags "-Wl,--reduce-memory-overheads"
 	fi
 
-	local myconf=""
+	local ruby_interpreter=""
 
-	if has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		myconf="${myconf} RUBY=$(type -P ruby21)"
+	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="RUBY=$(type -P ruby22)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		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
 	# should somehow let user select between them?
 	#
-	# * Aqua support in gtk3 is untested
 	# * dependency-tracking is required so parallel builds won't fail
 	gnome2_src_configure \
 		$(use_enable aqua quartz-target) \
@@ -238,12 +240,18 @@ src_configure() {
 		$(use_enable spell spellcheck) \
 		$(use_enable webgl) \
 		$(use_enable webgl accelerated-compositing) \
-		$(use_enable wayland wayland-target) \
 		$(use_enable X x11-target) \
-		--with-gtk=3.0 \
+		--with-gtk=2.0 \
+		--disable-webkit2 \
 		--enable-dependency-tracking \
 		--disable-gtk-doc \
-		${myconf}
+		${ruby_interpreter}
+}
+
+src_compile() {
+	# Try to avoid issues like bug #463960
+	unset DISPLAY
+	gnome2_src_compile
 }
 
 src_test() {
@@ -270,5 +278,9 @@ src_install() {
 	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
 
 	# Prevents crashes on PaX systems
-	use jit && pax-mark m "${ED}usr/bin/jsc-3"
+	use jit && pax-mark m "${ED}usr/bin/jsc-1"
+
+	# File collisions with slot 3
+	# bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134
+	rm -rf "${ED}usr/share/gtk-doc" || die
 }
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.3-r99.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
index 68651e56..5cceb09f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.3-r99.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.3.ebuild,v 1.1 2014/05/30 05:03:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.9.ebuild,v 1.5 2015/06/26 09:23:38 ago Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
 
@@ -15,13 +15,14 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="3/25" # soname version of libwebkit2gtk-3.0
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc x86"
+
 IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl +X"
 # bugs 372493, 416331
 REQUIRED_USE="
 	geoloc? ( introspection )
-	introspection? ( gstreamer )
 	gles2? ( egl )
+	introspection? ( gstreamer )
 	webgl? ( ^^ ( gles2 opengl ) )
 	!webgl? ( ?? ( gles2 opengl ) )
 	|| ( aqua wayland X )
@@ -32,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] )
@@ -64,29 +66,35 @@ 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]
+		virtual/rubygems[ruby_targets_ruby22]
 		virtual/rubygems[ruby_targets_ruby19]
 	)
 	>=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
 	virtual/pkgconfig
 
+	geoloc? ( dev-util/gdbus-codegen )
 	introspection? ( jit? ( sys-apps/paxctl ) )
 	test? (
 		dev-lang/python:2.7
@@ -150,24 +158,15 @@ src_prepare() {
 	# * 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\/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 Tools/TestWebKitAPI/GNUmakefile.am || die
+#	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 Tools/TestWebKitAPI/GNUmakefile.am || die
 
 	# bug #459978, upstream bug #113397
-	epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
-
-	# Do not build unittests unless requested, upstream bug #128163
-	epatch "${FILESDIR}"/${PN}-2.2.4-unittests-build.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
-	epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.patch
+	epatch "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
 
 	# Debian patches to fix support for some arches
 	# https://bugs.webkit.org/show_bug.cgi?id=129540
@@ -175,7 +174,21 @@ 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.1-musl-remove-execinfo.patch
+	# Fix building on ppc (from OpenBSD, only needed on slot 3)
+	# https://bugs.webkit.org/show_bug.cgi?id=130837
+	epatch "${FILESDIR}"/${PN}-2.4.4-atomic-ppc.patch
+
+	# 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
+	epatch "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
+
+	# musl patches
+	epatch "${FILESDIR}"/${PN}-2.4.9-remove-disallow_ctypes_h-braindead.patch
+	epatch "${FILESDIR}"/${PN}-2.4.9-remove-execinfo_h.patch
 
 	AT_M4DIR=Source/autotools eautoreconf
 
@@ -189,7 +202,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 #???
@@ -207,14 +221,16 @@ src_configure() {
 		append-ldflags "-Wl,--reduce-memory-overheads"
 	fi
 
-	local myconf=""
+	local ruby_interpreter=""
 
-	if has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		myconf="${myconf} RUBY=$(type -P ruby21)"
+	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="RUBY=$(type -P ruby22)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		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
@@ -243,7 +259,13 @@ src_configure() {
 		--with-gtk=3.0 \
 		--enable-dependency-tracking \
 		--disable-gtk-doc \
-		${myconf}
+		${ruby_interpreter}
+}
+
+src_compile() {
+	# Try to avoid issues like bug #463960
+	unset DISPLAY
+	gnome2_src_compile
 }
 
 src_test() {
@@ -269,6 +291,7 @@ src_install() {
 	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
 	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
 
-	# Prevents crashes on PaX systems
-	use jit && pax-mark m "${ED}usr/bin/jsc-3"
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/bin/jsc-3" "${ED}usr/libexec/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/WebKitPluginProcess"
 }