Switch to ninja to significantly reduce build time (bug #546336, thanks to Franz Fellner). Clean out old ebuilds.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

9 files changed, 31 insertions, 948 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index e29b74cba95c..b56167d77b75 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,14 @@
 # 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.325 2015/07/29 11:19:43 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.326 2015/07/31 03:21:24 tetromino Exp $
+
+  31 Jul 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -webkit-gtk-2.4.8.ebuild, -webkit-gtk-2.4.8-r200.ebuild,
+  -webkit-gtk-2.6.5.ebuild, webkit-gtk-2.6.6.ebuild, webkit-gtk-2.8.3.ebuild,
+  -files/webkit-gtk-2.4.7-disable-accelerated-compositing.patch,
+  -files/webkit-gtk-2.4.8-wayland-webkit2.patch:
+  Switch to ninja to significantly reduce build time (bug #546336, thanks to
+  Franz Fellner). Clean out old ebuilds.
 
   29 Jul 2015; Tobias Klausmann <klausman@gentoo.org>
   webkit-gtk-2.4.9-r200.ebuild:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 7eb1f3fad420..fc17ece72072 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -11,34 +11,37 @@ AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2
 AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256 8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 WHIRLPOOL 7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925
 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-accelerated-compositing.patch 544 SHA256 74aeacbc6206d45107fba00428f2fa33a29cc8915fac379bc536fe473db7fb5e SHA512 11e392e0a9bd317f68c369ef7002833bddb0540325b34e23415c97db885ec8ea058ef1fa2a6d599d4623be3c47e2142e053cabfeb6539378724d0fea9b698d67 WHIRLPOOL 64ec0159a5ce5b7e7f05cf04c37a1fcde2fd250461695834b7e9be03b82798d81bbcef4dab3c01baaae37e4607a85f590eb895bfc498463ca0becf97a246bca6
 AUX webkit-gtk-2.4.7-disable-webgl.patch 442 SHA256 6fb78d5f94806ddb976ceb076e623a2fd67e80111d624a2b3c01fde2fbbcd64e SHA512 742854749e674b3fec33652709921630a5fd3d7afd10446b3121a8cf94fb4fef70cc4de6ffe1a08143f518fd76aa05d0f4b54a041192cbc8eb9fbd5766faa5b8 WHIRLPOOL ba3f9b9dbee12f6dae05db9f343a46fd7d182d377e1a951e1785a5aff9a046d057bbf85821642e948c15a084e69d01054fe5632d7460892b196334adea582e72
-AUX webkit-gtk-2.4.8-wayland-webkit2.patch 2379 SHA256 0875047b6171c8336d34003d096b2467c00ec797e9084adc2e562c9473ef6230 SHA512 49c65acfc0afd8a6f6f5919dfe2cc0601b24ec87b26078da705ce05d2b49dd8514744b75f759942c66fed07943d9b894fe7ea3812ea97381490c774ecd39ceef WHIRLPOOL 1c3d6019c7f7e5c0c2d3ffc0fbf624d03b1a890339093e0e6c1c477cc28cc1a2d9d33fb02d10d94251b5854c2fddbff7c19fd26e030cfdf830d0698b9caf95b6
 AUX webkit-gtk-2.6.0-atomic-ppc.patch 1630 SHA256 b5756d91c7bdd37ff13afe784c24efcad2f4c14ec0e901a33c711f4b5d4a3a9b SHA512 2ffea2bd5d1a2bcfbb5ebcf9540006ee6106dc00f2005229ff5862235fae56652f3c3223de99c0c4631e0345024069d8ae45124bec70d0ef18b4e2fba4228c9a WHIRLPOOL f4696efc9cc25957e6610b892a7eb4961f1078cfe2b2d79f4f39b1f793731d658c9411ce9f78099562d2145f7ba872089989270ef7c8e37c729af00718046340
 AUX webkit-gtk-2.6.0-hppa-platform.patch 875 SHA256 b6ce48a290bccf9da2dc425c67003690e52e860d143f36b4eab11de1a81334f2 SHA512 c3f6873d26e926bd8beea0b98dbc499c40b724fce26343b0acff06513427f7a99ed6b339cf3d2ee8accd771949d67931f999dc47c801da8497ea59cab9052c6b WHIRLPOOL 7857cc28e075fc2fd3bcff31d64e7af481a214b120fcb9c9d03360f12e6d790544e45de6f7fe5d3888dcbea4c7f541b112e9430eb5438293511d881044e73e55
 AUX webkit-gtk-2.6.0-ia64-malloc.patch 1066 SHA256 0733f634b13bdd62828ded8b5cd6a32a0249a965d27ad9fac7d085b5d080309b SHA512 caacf20c8c9c418ff19ad312dde656d6ace1f44f2894e8ab37b8f2443f6313336a64cff86f63fbaa83bad123a6091ef79937c052dda862befee8671963b4a38a WHIRLPOOL 7752ee89be0ca64aa4c8dac0a2926a85ae5168dd71925bc08859b70bc4c1f74059c3334d34821c17fdd9cfb933957ecbb1eb419f80cc781e982e444c574dc569
 AUX webkit-gtk-2.6.0-ia64-platform.patch 637 SHA256 050218d8ab6076447ff7cfe2cebad4f4f3ad57b418bc3eeadb8d40d601877add SHA512 d8c5278a35ee3b163366919bfc31862163777af178a1054e86bd32580bad74251398bd3534203eb751770b30689c3c45f571377e93287946a2bba25e6e8a4d12 WHIRLPOOL c8f767aaeb040e0dbfcdc0dc378f43f6ba3bedaf9d53334bbe0393d7db59d14426e3d1a6eb865bb01ee53c571998b9bbd0ebeddca1b6668b815c1dad1d806b57
 AUX webkit-gtk-2.8.1-ia64-malloc.patch 1054 SHA256 af33faffc199b4af4f0d0e85120db692030834343a5232bd55f1f77162a49dd1 SHA512 868496cd4a477032002dec903432f6af64146e9e826929be3936a40914b7a7a6655eebb8aa9e8cff5bd3b361c7fff2f0daf6ffa0f672fcbc9b054d2353572aeb WHIRLPOOL d62a40f085a6a9d070c5120a15ff318639de9f7771c120c905df4eddd693772cd3a39922dcaf692d40f4d077a1ad8b0b2c277dac633b61de7cdf88772d44b124
-DIST webkitgtk-2.4.8.tar.xz 9827632 SHA256 68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23 SHA512 31b8b87142730aa27e5bd4fe85b0de2116fd492ef469592512c185d60df428a9913d6c2738ce57439bf9db10864ed9c121ddbc2a4da2f715818a70885c81c0de WHIRLPOOL 851e3973c00096dd3a98e64bfa9f9f0f278c3513656af9a9aa72442cd6c594119adefafa6c06d05e431ec77bf6e9f1e10432e9b6895d777adfe2952843602ef2
 DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
-DIST webkitgtk-2.6.5.tar.xz 10000124 SHA256 b1658017cea7cc545b9e01f22af585986e21e4242825e215bc5f8e0c0dc67593 SHA512 b8097e16ccfe10c75e43d81a965a14bde19dcefa6f1ac6ef52c075afeb4c603289c3e7cad05b02af053728df16b5681aafa248e5974319849a0967364bca1f19 WHIRLPOOL 60b0cfccefef0f90ba66f3e89819239574f06e42d2508055843addcf20292747d82d258332bb95ae2730a3c11a2acd74ca595f3f2a3cd54230013e4320a6b6d8
 DIST webkitgtk-2.6.6.tar.xz 10000888 SHA256 541e114a203b0f649e89b3ad6b6fdeea1726739320a6b6a52b464cb66ea38eb9 SHA512 faac38cbd64daf180f2e2f9e7df9e1162ccd0b4f5c76b0133ef6d2b95b413b699923fda3a5026ba3c76562de59e4913c45a97cd654797867490633dd3099f5b4 WHIRLPOOL 20be78255c917ecd930e034e38053af054a4271445eaa43319f45db6fde6b369f002f2be5269a696c53200b2bf56b74959e7970932fd62f6c89e3ea1236ce72b
 DIST webkitgtk-2.8.3.tar.xz 10437676 SHA256 b3de60c8676ed54bb3d6201c742bbd702ee176fdfef5ca06f2fc514783792f16 SHA512 29a8f17d921a3015cea8e1e156c42b8f7d5504643157381888c9613a706070b2bde1435cc83048969cc24b525a3f7cd27a493d9636a4bace6bac921b2179874d WHIRLPOOL 03c6f1206203f79ae69c50dab085872a9920982ac556b7e611e114c4d5753ec31d7c6bf3ccf62ae08929886a02bff001a8ac74ad8a4e0ed96879f74539c0c3c4
-EBUILD webkit-gtk-2.4.8-r200.ebuild 10161 SHA256 476b69da58ca1fab52eddbd869db99d263450b639c51bce217f45da1ec9adcb0 SHA512 3b1f831b70ae52dfefe2cbeda34a46c3d26cc57382fea5c68c7bf8769b9675242200e9e18725f581142f38b75efac11d0bb724c52bc93f9571477c8942cdfad1 WHIRLPOOL ddbba599cb550f0bbdc6c92fc17ef75f671bd59605eafd968d1331efcb95f41f2736e3c47ba9dab33063663b506fc7a30c0dd19f02fe61d93caa8e5c29389139
-EBUILD webkit-gtk-2.4.8.ebuild 10618 SHA256 7ec3e0894e41c15e77d964ee9fa16582fceeb03f984c24656cd96a13e1171ce9 SHA512 493453d27852d6ac55172475b6bb414841c9f7db609986e31f5659a52a2eb5e5e5eaaece67d0e00ac1876bce33f50eca689006534d4d0f14191afbbf6905f85c WHIRLPOOL 9a5fdc6fff0cdcdebb7b88c73a0f2b652e5293e973aaa206ac0706fc36432badfb22b13b37e22e981d0df8c33a15be1849d6cd93a8be4a4b1375a4b18b707424
 EBUILD webkit-gtk-2.4.9-r200.ebuild 9284 SHA256 dbdfafc5cfccbc2051c1239af6bf9d74ef319739417732256cf19b7b3bbdcd21 SHA512 3557258f6efcf57ab4fd3e2af6227a76db3219396e0aa41b5a90889f2fa56cd875cdfda13194e97ccd11ef98af06ebaa9c07e67a8f66efb3fa0949e889001f13 WHIRLPOOL faa6e3932b649a93150bd46b642f7273f911ab68d65633646c445b802b8e4ca7a6e570b674f8409bddc0ec85972abf68df3ed819e5d740ba7b83bbfaa31de5df
 EBUILD webkit-gtk-2.4.9.ebuild 9753 SHA256 2107c31e64ab9c38e7ad8976313b33563eae59a7e7d5ff93ebf6eedef831177f SHA512 ba61b11944592e7e8a583cecc0bb364c1580f814437ce35c3924aaf51c4f6f72bcdd3c68de9dd92bd3e1d67cd92385ad057ef9037fdff6f5cf1083c4b5e8e96f WHIRLPOOL 20221e7e94a3e1835bad537d53efaeb3a0d151ec9b4b56459af4e310d23b45b67aa6d833a8b64315b97ced8adce4318248bbc2be64d84df16fad68a2c55b3dd9
-EBUILD webkit-gtk-2.6.5.ebuild 6667 SHA256 98dfebc1e080341c67d8663fe4ee364757d36891072241b4c9db5bcdc5057a63 SHA512 d09aa6258541b73622fc702ee514dd3c09355e754c854f117bba0d971ab4601dda556e4d6c8cfe06e5f6086e2ca66c7bca57a0508540a0d21d653a0feb206743 WHIRLPOOL 3e5b88f2b666913f173eb94748ea0dc1908d794b31308cb3a12432e797e4a7055e2f7d29f1bae605437eee465ca4ca7111a29c72afac29fc1416c0a247365ada
-EBUILD webkit-gtk-2.6.6.ebuild 6991 SHA256 7b79bcbb7c21e47c3f03bf340203af9ab49477d5fb548c7bc045b26010a65161 SHA512 ecf0d9e9a1ab8d23187446d3fa703c4a3c229d8224ef46b5885ddf7095395d8be985921e6f3697c83f5cb4514c1583853cf039f61bd54da28908551c46ec8a17 WHIRLPOOL 2454ed22fa9c3ae5b8564d0999cc0b8372cba9df1650952baa86cffeca96403dddf5af9fb7c74a701cf53902515c1e429a3b619e16a03fd9baa47f7ebfcab25d
-EBUILD webkit-gtk-2.8.3.ebuild 7228 SHA256 baf4f73d2be3859c860c56a0b3b5d88d90e13761f3bb69e59ea7fb6c9156e236 SHA512 d335dd6cdf36fee2b6e35dd9c7bf374b75738ec82edbb206cdc82bd15944bac97aeb07bd92af9e46fde4bfcf522e26e93c37aa759c628eae3324c74f7a30d940 WHIRLPOOL 38f1e1d3ca07cf1856899bc1df68855e755ee2ebd0218d418ddfab32d3c6bec42f21a0b4bc94c99f2b2373aee9595c3874f9f0725464e4247f0b3e8fba891fba
-MISC ChangeLog 68212 SHA256 1a8b21cdc55da14b8025eb9b4fff9664b7b36f3ad472da5a629f85315676b780 SHA512 d94380ae462d68e0e94fd0bbcb04c0306f6d45742582c2261b56eb4243d17fac0a08afcdf3f706a70f5a5be1a0a6b4a2c54153fcf613e26a9b6c065e44d506f5 WHIRLPOOL b3fe2fcef39cf8573ea1c7b0d548884001181c84289fbefa41be0cf44951a7aed1a9d3960691fd094076d7b0cb4b0dedc61eb00414ec35fa13e3c6181873231a
+EBUILD webkit-gtk-2.6.6.ebuild 7024 SHA256 fde9dbf98700523447e13cd47ecb7d64bb994e565ef3c619a39a8fee4cd17883 SHA512 363db43598f305dc8a9280502c227018b04b8078b02d0e09aa54dd60e94c3890fbc4a111f6d51307575f43bd502daaaacd5c6162f0f27356d575d85227a402dc WHIRLPOOL 01bb02eb5cca87c719f0054b381ec99b68913eac00dbc8c2c69c3af1b671f4593fdd56d0ec19efbcbc4ca3b9f98fc8b24bd11d28601fd0e4007359ee8806aecd
+EBUILD webkit-gtk-2.8.3.ebuild 7261 SHA256 259375ee5c2dfccf86495babc5ae90c0d0a9cac4e42413416f0194c4fbb08e40 SHA512 72d8b05b9a91b1d8b67c480701b9b38c63e51f20494793ed3088762f4f2df2be83fe1c90e6fc1055b027d32003034ce3c65dfc5e4356d468cdf72482083b3fb3 WHIRLPOOL b93e235101636823511f656a825d4d5a9d12c28060252694f4367c7d42cc5d538f173f03615c07dd2a479104f0da432f4bfbb0deec695b66315fd10442d9e5b3
+MISC ChangeLog 68642 SHA256 5bff244006d996d0c8420da452b9f38139d3090da7ebade2985991ed283f470a SHA512 dac3a9c9f9ccd64fb1554a5e2c919e1306a69b1757f34e0082f76cdcd45188e8f2e299b5181fa8dcda1480263dc242b91a63449c9c7dd344386be81cc1ae66ae WHIRLPOOL b069be8455c7d13a2552ef91029cf37dd6dc47d93bd96793dead7595f19442fa4ec8ff0da0e1f194dde93b5d88683750f4969cd46848417e44f40d6d8fa991f7
 MISC metadata.xml 610 SHA256 23faf3368df312d51e2dd38d6e7695410deab694bc12558cbe9751067575df11 SHA512 ac78b2e8a719247f5294c045ead7731cd42fb7200ea5a6a450ac18abd3a79fc888045e2c7f98bf984dd2a9484fc352ebc06e6b1c7a0bdd75a65a825e71c09188 WHIRLPOOL f2c88de8a7889cd3cdbb66f498067f85a5e6ce0c7b3732299ad9373e39ac332abe5d3da93f8fbe1e5f63b44306f9def006a3e34349eaca12ee9fb3b7a7368ea1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iKYEAREIAGYFAlW4ttBfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
-RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOhKTQCgiuGTp0arV6x3U7KVsu6OTYeH
-ENEAn2BX7/UwKS+kc5DvPiK2VD1rL1VD
-=UHks
+iQJ8BAEBCABmBQJVuum3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNSbEP/iEVVy4vQq2ZmQ0bJPZy29DE
+U+cCUyxnGWT+871auXnNKUme/Snu0Vgqe93HAcno9/81AL4j1RORRiraOHVQhKFV
+JV/HWOrAngquPMeVpcDFWzPmbF2SOciZYKcb0CPOkFPoIUrHJb1gxiTDzVGjxH0d
+w7u3SeM8GhtVkFD1w22b+pVSA0nb8R7Mx7wKjdl6Owx231Z2EznQMF2OJ+7hvX1O
+5gHAlmRdMsc8vocwdZWL/UUJf9ddk7twciRIDEVtGAZ/4781esN5XfMoXfyN/aqq
+Y8dK6rgCEKZdidMrv0UKOWlujojTjNYqEtkmzRiOUnxHP9TCazDiST1CHUXLVBa8
+d4cYD0rkSzS4xcagXB4TfS2AV2+anxhMb+t8hgHdETOo75Y05qzLrWww07hPipp0
+qZxqGQoY+AHGeEODghAGoO+/47w7DSvg/o870DqzVukLUNZpGTvzInL5Nhp+IeYu
+ZpZwYb/Xk3FEdnQQnsKUkRm1dxvz5WtANIPREZ5b7gX6vZZ+DjQJ1xKZxRrvl7A7
+lvfuZcpJR7RsuRM+mF1Tl+rRDfwddD+97rUFALRb8PAbe/Ks9kUbVg4u1711HH7I
+PAGJrbROjPEj9PK+GKTCArqZzS6tlWe+q+si19AtJrs6+Ytl5Y1nYWaXKnJQ/Wqq
+s035iODs7IJ8xFuT2ii/
+=b86r
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-accelerated-compositing.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-accelerated-compositing.patch
deleted file mode 100644
index 4113471c7dd2..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-accelerated-compositing.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- webkitgtk-2.4.6.orig/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp	2014-09-26 11:40:45.000000000 +0400
-+++ webkitgtk-2.4.6.orig/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp	2014-10-11 20:43:16.687116807 +0400
-@@ -110,7 +110,7 @@ 
-     WebCore::memoryCache()->setDeadDecodedDataDeletionInterval(deadDecodedDataDeletionInterval);
-     WebCore::pageCache()->setCapacity(pageCacheCapacity);
- 
--#if PLATFORM(GTK)
-+#if PLATFORM(GTK) && USE(ACCELERATED_COMPOSITING)
-     WebCore::pageCache()->setShouldClearBackingStores(true);
- #endif
- 
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.8-wayland-webkit2.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.8-wayland-webkit2.patch
deleted file mode 100644
index fd016a53889e..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.8-wayland-webkit2.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From ea9a80ffb659f1b65cc4ccef1f092cfbf79d6ad5 Mon Sep 17 00:00:00 2001
-From: Tomas Popela <tpopela@redhat.com>
-Date: Fri, 16 Jan 2015 12:29:48 +0100
-Subject: [PATCH] 2015-01-16  Tomas Popela  <tpopela@redhat.com>
-
-        REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled
-        https://bugs.webkit.org/show_bug.cgi?id=140241
-
-        Reviewed by NOBODY (OOPS!).
-
-        We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp
-        just when WebKit2 is enabled and we are not building for X11.
-
-        * GNUmakefile.list.am:
----
- Source/WebCore/ChangeLog           | 12 ++++++++++++
- Source/WebCore/GNUmakefile.list.am |  8 ++++++++
- 2 files changed, 20 insertions(+)
-
-diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
-index 587a6c3..7e91646 100644
---- a/Source/WebCore/ChangeLog
-+++ b/Source/WebCore/ChangeLog
-@@ -1,3 +1,15 @@
-+2015-01-16  Tomas Popela  <tpopela@redhat.com>
-+
-+        REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled
-+        https://bugs.webkit.org/show_bug.cgi?id=140241
-+
-+        Reviewed by NOBODY (OOPS!).
-+
-+        We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp
-+        just when WebKit2 is enabled and we are not building for X11.
-+
-+        * GNUmakefile.list.am:
-+
- 2014-11-10  Csaba Osztrogonác  <ossy@webkit.org>
- 
-         Crash in WebCore::Node::getFlag
-diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am
-index 2f5cb19..22956c7 100644
---- a/Source/WebCore/GNUmakefile.list.am
-+++ b/Source/WebCore/GNUmakefile.list.am
-@@ -6254,9 +6254,13 @@ endif # END USE_GLX
- endif # END TARGET_X11
- 
- if TARGET_WAYLAND
-+if !TARGET_X11
-+if ENABLE_WEBKIT2
- webcore_sources += \
- 	Source/WebCore/plugins/PluginPackageNone.cpp \
- 	Source/WebCore/plugins/PluginViewNone.cpp
-+endif # END ENABLE_WEBKIT2
-+endif # END !TARGET_X11
- endif # END TARGET_WAYLAND
- 
- if TARGET_X11_OR_WAYLAND
-@@ -6305,9 +6309,13 @@ webcoregtk_sources += \
- endif # END TARGET_WIN32
- 
- if TARGET_QUARTZ
-+if !TARGET_X11
-+if ENABLE_WEBKIT2
- webcore_sources += \
- 	Source/WebCore/plugins/PluginPackageNone.cpp \
- 	Source/WebCore/plugins/PluginViewNone.cpp
-+endif # END ENABLE_WEBKIT2
-+endif # END !TARGET_X11
- platformgtk_sources += \
- 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
- 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild
deleted file mode 100644
index a458f2ae8b87..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild
+++ /dev/null
@@ -1,310 +0,0 @@
-# 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.8-r200.ebuild,v 1.8 2015/07/26 04:24:08 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-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="2" # no usable subslot
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-
-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 )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( aqua X )
-"
-
-# use sqlite, svg by default
-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
-	>=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-2.1.5:2.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]
-	)
-	>=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.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
-		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() {
-	#nvidia_check || die #463960
-
-	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 [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	#nvidia_check || die #463960
-
-	# 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() {
-	# 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
-
-	# Leave optimization level to user CFLAGS
-	# FORTIFY_SOURCE is enabled by default in Gentoo
-	sed -e 's/-O[012]//g' \
-		-e 's/-D_FORTIFY_SOURCE=2//g' \
-		-i 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 Tools/TestWebKitAPI/GNUmakefile.am || die
-
-	# bug #459978, upstream bug #113397
-	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
-
-	# 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.4.1-ia64-malloc.patch
-
-	epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch #481688
-
-	# 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
-
-	# Fix building with --disable-accelerated-compositing, bug #525072
-	# https://bugs.webkit.org/show_bug.cgi?id=137640
-	epatch "${FILESDIR}"/${PN}-2.4.7-disable-accelerated-compositing.patch
-
-	# Fix building with x11+wayland, bug #536898
-	# https://bugs.webkit.org/show_bug.cgi?id=140241
-	epatch "${FILESDIR}"/${PN}-2.4.8-wayland-webkit2.patch
-
-	AT_M4DIR=Source/autotools eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# 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?
-	#
-	# * dependency-tracking is required so parallel builds won't fail
-	gnome2_src_configure \
-		$(use_enable aqua quartz-target) \
-		$(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) \
-		$(use_enable X x11-target) \
-		--with-gtk=2.0 \
-		--disable-webkit2 \
-		--enable-dependency-tracking \
-		--disable-gtk-doc \
-		${myconf}
-}
-
-src_compile() {
-	# Try to avoid issues like bug #463960
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-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() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by 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-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
-}
-
-#nvidia_check() {
-#	if [[ ${MERGE_TYPE} != "binary" ]] &&
-#	   use introspection &&
-#	   has_version 'x11-drivers/nvidia-drivers' &&
-#	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
-#	then
-#		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers is"
-#		eerror "used as the system OpenGL library. We are very sorry about that."
-#		eerror "You should temporarily select Mesa as the system OpenGL library:"
-#		eerror " # eselect opengl set xorg-x11"
-#		eerror " and then run emerge again."
-#		eerror "See https://bugs.gentoo.org/463960 for more details."
-#		eerror
-#		return 1
-#	fi
-#}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild
deleted file mode 100644
index e3f29765949c..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# 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.8.ebuild,v 1.8 2015/07/26 04:24:08 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-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/25" # soname version of libwebkit2gtk-3.0
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-
-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 )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( aqua wayland 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(+)]
-	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-2.1.5:2.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:= )
-	wayland? ( >=x11-libs/gtk+-3.10:3[wayland] )
-	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.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
-		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() {
-	#nvidia_check || die #463960
-
-	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 [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	#nvidia_check || die #463960
-
-	# 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() {
-	# 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
-
-	# Leave optimization level to user CFLAGS
-	# FORTIFY_SOURCE is enabled by default in Gentoo
-	sed -e 's/-O[012]//g' \
-		-e 's/-D_FORTIFY_SOURCE=2//g' \
-		-i 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 Tools/TestWebKitAPI/GNUmakefile.am || die
-
-	# bug #459978, upstream bug #113397
-	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
-
-	# 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.4.1-ia64-malloc.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
-
-	epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch #481688
-
-	# 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
-
-	# Fix building with --disable-accelerated-compositing, bug #525072
-	# https://bugs.webkit.org/show_bug.cgi?id=137640
-	epatch "${FILESDIR}"/${PN}-2.4.7-disable-accelerated-compositing.patch
-
-	# Fix building with x11+wayland, bug #536898
-	# https://bugs.webkit.org/show_bug.cgi?id=140241
-	epatch "${FILESDIR}"/${PN}-2.4.8-wayland-webkit2.patch
-
-	AT_M4DIR=Source/autotools eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# 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 aqua quartz-target) \
-		$(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) \
-		$(use_enable wayland wayland-target) \
-		$(use_enable X x11-target) \
-		--with-gtk=3.0 \
-		--enable-dependency-tracking \
-		--disable-gtk-doc \
-		${myconf}
-}
-
-src_compile() {
-	# Try to avoid issues like bug #463960
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-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() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by 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, bug #522808
-	use jit && pax-mark m "${ED}usr/bin/jsc-3" "${ED}usr/libexec/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/WebKitPluginProcess"
-}
-
-#nvidia_check() {
-#	if [[ ${MERGE_TYPE} != "binary" ]] &&
-#	   use introspection &&
-#	   has_version 'x11-drivers/nvidia-drivers' &&
-#	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
-#	then
-#		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers is"
-#		eerror "used as the system OpenGL library. We are very sorry about that."
-#		eerror "You should temporarily select Mesa as the system OpenGL library:"
-#		eerror " # eselect opengl set xorg-x11"
-#		eerror " and then run emerge again."
-#		eerror "See https://bugs.gentoo.org/463960 for more details."
-#		eerror
-#		return 1
-#	fi
-#}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild
deleted file mode 100644
index 2c9e12f3e356..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.6.5.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# 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.5.ebuild,v 1.4 2015/07/26 04:24:08 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit check-reqs cmake-utils 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="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-
-IUSE="coverage doc +egl +geoloc +gstreamer +introspection +jit libsecret +opengl spell +webgl"
-# gles2 wayland X
-# bugs 372493, 416331
-REQUIRED_USE="
-	geoloc? ( introspection )
-	introspection? ( gstreamer )
-"
-#	gles2? ( egl )
-#	webgl? ( ^^ ( gles2 opengl ) )
-#	!webgl? ( ?? ( gles2 opengl ) )
-#	|| ( wayland X )
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# 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-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	virtual/jpeg:0=
-	>=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?]
-	>=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/libXrender
-	x11-libs/libXt
-
-	>=x11-libs/gtk+-2.24.10:2
-
-	egl? ( media-libs/mesa[egl] )
-	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
-	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 )
-"
-#	gles2? ( media-libs/mesa[gles2] )
-#	wayland? ( >=x11-libs/gtk+-3.12:3[wayland] )
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5.10
-	|| (
-		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-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	doc? ( >=dev-util/gtk-doc-am-1.10 )
-	geoloc? ( dev-util/gdbus-codegen )
-	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 [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	if [[[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Debian patches to fix support for some arches
-	# https://bugs.webkit.org/show_bug.cgi?id=129540
-	epatch "${FILESDIR}"/${PN}-2.6.0-{hppa,ia64}-platform.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=129542
-	epatch "${FILESDIR}"/${PN}-2.6.0-ia64-malloc.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# 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
-	# 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 #???
-	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 ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="RUBY=$(type -P ruby21)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		ruby_interpreter="RUBY=$(type -P ruby20)"
-	else
-		ruby_interpreter="RUBY=$(type -P ruby19)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm + libcxxabi
-	# $(cmake-utils_use_enable wayland WAYLAND_TARGET)
-	# $(cmake-utils_use_enable X X11_TARGET)
-	# $(cmake-utils_use_find_package gles2 OpenGLES2)
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test API_TESTS)
-		$(cmake-utils_use_enable doc GTKDOC)
-		$(cmake-utils_use_enable geoloc GEOLOCATION)
-		$(cmake-utils_use_enable gstreamer VIDEO)
-		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
-		$(cmake-utils_use_enable introspection)
-		$(cmake-utils_use_enable jit)
-		$(cmake-utils_use_enable libsecret CREDENTIAL_STORAGE)
-		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
-		$(cmake-utils_use_enable webgl WEBGL)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DCMAKE_BUILD_TYPE=Release
-		-DENABLE_X11_TARGET=ON
-		-DPORT=GTK
-		-DENABLE_PLUGIN_PROCESS_GTK2=ON
-		${ruby_interpreter}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"{,2}
-}
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 f80efef3f5d6..f421f4af5bf3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild
@@ -1,8 +1,9 @@
 # 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.5 2015/07/26 04:24:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.6.6.ebuild,v 1.6 2015/07/31 03:21:24 tetromino Exp $
 
 EAPI="5"
+CMAKE_MAKEFILE_GENERATOR="ninja"
 GCONF_DEBUG="no"
 PYTHON_COMPAT=( python2_7 )
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
index afba3b307e03..d1ce0352d12a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
@@ -1,8 +1,9 @@
 # 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.8.3.ebuild,v 1.2 2015/07/26 04:24:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild,v 1.3 2015/07/31 03:21:24 tetromino Exp $
 
 EAPI="5"
+CMAKE_MAKEFILE_GENERATOR="ninja"
 GCONF_DEBUG="no"
 PYTHON_COMPAT=( python2_7 )