drop old

Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4
author: Pacho Ramos <pacho@gentoo.org> 2014-04-27 08:46:00 +0000
committer: Pacho Ramos <pacho@gentoo.org> 2014-04-27 08:46:00 +0000
commit: 785e2b2b3fb29540c2b47383cf6075488f8daaad (patch)
tree: 81557b8c05e15f7d8fdf20e6d40298d8e422e915 /net-libs/webkit-gtk
parent: drop old (diff)
download: historical-785e2b2b3fb29540c2b47383cf6075488f8daaad.tar.gz
historical-785e2b2b3fb29540c2b47383cf6075488f8daaad.tar.bz2
historical-785e2b2b3fb29540c2b47383cf6075488f8daaad.zip
39 files changed, 41 insertions, 3319 deletions
diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 5cb1dcf5c526..ffbcc1109965 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.263 2014/04/21 10:30:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.264 2014/04/27 08:45:59 pacho Exp $
+
+  27 Apr 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/webkit-gtk-1.10.1-disable-backtrace-uclibc.patch,
+  -files/webkit-gtk-1.10.2-gcc-4.8.patch, -files/webkit-gtk-1.10.2-librt.patch,
+  -files/webkit-gtk-1.10.2-wifexited.patch,
+  -files/webkit-gtk-1.11.1-libdl.patch,
+  -files/webkit-gtk-1.2.3-fix-pool-sparc.patch,
+  -files/webkit-gtk-1.2.5-darwin-quartz.patch,
+  -files/webkit-gtk-1.2.5-darwin8.patch,
+  -files/webkit-gtk-1.2.5-tests-build.patch,
+  -files/webkit-gtk-1.2.7-libpng15.patch,
+  -files/webkit-gtk-1.4.1-libpng15.patch,
+  -files/webkit-gtk-1.6.1-double-conversion.patch,
+  -files/webkit-gtk-1.6.1-pkgconfig-fix.patch,
+  -files/webkit-gtk-1.6.1-sparc-needs-alignment.patch,
+  -files/webkit-gtk-1.6.3-paxctl-introspection.patch,
+  -files/webkit-gtk-1.7.5-linguas.patch,
+  -files/webkit-gtk-1.7.90-parallel-make-hack.patch,
+  -files/webkit-gtk-1.7.90-test_garbage_collection.patch,
+  -files/webkit-gtk-1.8.0-typedef-WebKitWebView.patch,
+  -files/webkit-gtk-1.8.1-CodeGeneratorGObject-properties.patch,
+  -files/webkit-gtk-1.8.1-gst-required-version.patch,
+  -files/webkit-gtk-1.8.1-tests-xvfb.patch,
+  -files/webkit-gtk-1.8.2-bison-2.6.patch,
+  -files/webkit-gtk-1.8.3-bison-3.patch,
+  -files/webkit-gtk-1.8.3-disable-backtrace-uclibc.patch,
+  -files/webkit-gtk-1.8.3-libdl.patch,
+  -files/webkit-gtk-1.8.3-spellchecker.patch,
+  -files/webkit-gtk-1.9.91-libdl.patch,
+  -files/webkit-gtk-2.2.2-freetype-2.5.1.patch,
+  -files/webkit-gtk-2.2.2-unittests-build.patch, -webkit-gtk-1.10.2-r300.ebuild,
+  -webkit-gtk-1.8.3-r200.ebuild, -webkit-gtk-1.8.3-r201.ebuild,
+  -webkit-gtk-1.8.3-r300.ebuild, -webkit-gtk-2.2.5-r200.ebuild,
+  -webkit-gtk-2.2.5.ebuild, metadata.xml:
+  drop old
 
   21 Apr 2014; Agostino Sarubbo <ago@gentoo.org> webkit-gtk-2.2.6-r200.ebuild,
   webkit-gtk-2.2.6.ebuild:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 003bf73174b2..4456311e8942 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -2,72 +2,23 @@
 Hash: SHA256
 
 AUX gir-paxctl-lt-wrapper 1015 SHA256 cb11d91ed69c0fcce2ca6502b715d0f846dd6b062ce98441a70a5b2d2f1e042a SHA512 8a0e5ae51ab38f1e27e18cc7a7166267bdb8d9ea814874ddbfc97c5022c555d23cffce496219f0827f9eac32a55d5d95ac353eb56b4439f915a8c34683a1989d WHIRLPOOL 937e28e599f50535f6c8461acc10982719856c5b760d5d592d86819601bca5c032b405f215ff525c0278ce6563704c385cb942e3e21093112dce33d0b280a72c
-AUX webkit-gtk-1.10.1-disable-backtrace-uclibc.patch 1056 SHA256 3d899d5d93e4d5c96c7fe1f82ab96038b8a3add8cec001f023badb1a21eebfb2 SHA512 09c9d3f5dc64d1389279d8fba9027772c9d718ea86ec9649deb01841d5b45930ee5fe9bbc61829cb7b2df0e4a05b8acfdaba0dc08b2786eb9c5e39626fe54b98 WHIRLPOOL d7dc3b235465bc4c96eed6d2b79ceb579b7ed6958b95faeab5e8421a286e03bef48bcfb963fa3cd5ef1375a75749b458227d1b4516dddfdb49e15eee1508bb32
-AUX webkit-gtk-1.10.2-gcc-4.8.patch 2354 SHA256 9336af033a43f166a67e5e9bdd23b4181225c7695c4011c04783ba7d9becdc81 SHA512 da92230ebbb45c14ed3557bf716f49e2e89c1a7f6fb1e7033f24d6dee407cd4936437eb416724a34d46caf4e83c258e736f0e9c8c7919cbae459ac093bf6ff3b WHIRLPOOL a65c0189ee853ca388aa912ec97d41e4f37280132764519357e5af73653d10207a4ab2ab42dea5a07912f2455082b39f11cf724e1110e0735d6f12287750b072
-AUX webkit-gtk-1.10.2-librt.patch 1570 SHA256 27b9cbb716e3a78bfd83351c0ab91ab4caff0d2e52bc5b9002cc281f37c783a4 SHA512 464ea019eab06ef38263fd7c05fb87f92c743eb09fcaf8524ac917d479169f281cfa28f6d1e08fca5dc1100898ddb90690cb057786550a935783cd857e7011d3 WHIRLPOOL 12d1572a14e62b5411e9019e09835a315db57801bc8c5d819cf3a9c276e06ab257aaf694a4337e2b7ff37d5211d5143a33606de68c768f28be5644aa384849e9
-AUX webkit-gtk-1.10.2-wifexited.patch 1045 SHA256 c710aa913e86896365920e3eadab28c3efdbb41906b5b1818bdc40023abd0fee SHA512 078a9b5ed0b5c2b0d13d63b871d837d6dace5a9830ff5a25abe2aca12669ea1941b963c0772659975073cd604757655f0ef972dfeb5a64cd817824cad48f7465 WHIRLPOOL d7b35fccef866bc4eabc18dc0bd21bdf8f392c313cfdf5612153cae0fa4d90c8f628de5aa18c13fe812f1c19dee6bc300559229c94c9a7c2c729acc283495442
-AUX webkit-gtk-1.11.1-libdl.patch 621 SHA256 e99823ba03b99e6490b53b881f67090112d9b8c2ff30b92666e3c9bb39a5cef0 SHA512 46ebcb3ed83a0d2c5d30627c18013a6d1a481be78672e36fea7fbfaa4459a26700446c1a03054e03e87a7d84ab8990467c23187f62a11349d7ccda42c6a14ccc WHIRLPOOL 2ab17276050dac09dd3e78f9b0761d7484e06b5d288ebe75d798f5fe97714e3a7d8b081d356eee279dd2ddfb42d4838474fe48010f1629f27e1c6ff787c14c53
 AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 422 SHA256 4ee4f54be107bf947b39266c868671670cf759ca52879382dddcef66168b841c SHA512 bb56020948d255f1e9de06528cebd921820862593b865cc6a2ba9e1c0e734dc7bb9bcbd5c6e8a735e4ee3afd906b0d17bc43a4a262a98f28a467c649d9d15a3c WHIRLPOOL 5793470581e9971eb699f464e15153b9080225d6e44011c5af14dd379da4d3f8c614a1029f9b98bcaa5d5ba649d0b542e8796fc564baf31cddafe675df317818
-AUX webkit-gtk-1.2.3-fix-pool-sparc.patch 2518 SHA256 aee1f0d846c1e47c225e421a774fe93c49b71b7d31234fc5515d33922f130434 SHA512 9f1787ee4cb78239475577c46361ef70e2c889ff3ed784c31a4dde638339c25d2f659f9411a11764c5a2d034783b2f47e27860129554196bd5d8faa14a99801f WHIRLPOOL 16c989a480bcb13322f9f620e291efc8fbab86730f4510b54e78145841ba3de2ee2036749ac1856dff69fd043de3fcbe17b0bdb77f11281782be608f71999e0f
-AUX webkit-gtk-1.2.5-darwin-quartz.patch 1858 SHA256 694ad79c55d737a919f6246566c5c64a0282caf02fbdb6d371152da49bcf233d SHA512 3179a4da9a6d34883de533e66e135e052da7c9f9fcb14c7b3d0a9dcfad6047408864a0cb0845d5b8f834d9a938644a3f17369df42ac9698707c1d1fec7e848ed WHIRLPOOL d8f208bea4933f5227f8aca4b965167d94caefe3517c83864259a1187f64eeb975257c9b9bef1eb4717cf6ef7248adfec6239a3685b202290829e8144556b8e5
-AUX webkit-gtk-1.2.5-darwin8.patch 1152 SHA256 51e3fb832793cb0be13ceff63d1b4c4ef82efaa7b3151ab53d04ae966d65efa6 SHA512 82f63c0954af5ffc37acd7a21ba367b9b3687773d2a3ea777d26cdbadd96f6274bd28388d667e49aec894d90efea481ff097046338e5ec581e79a4cc7b09ac10 WHIRLPOOL 3c94112f4ff8050f7762cdf750074f99903a155ee7795694a27f8f3f3308944a2bd2cad3e96110c5c673be75dd85214ba1105e376a91c3f94076fdd8e8d98808
-AUX webkit-gtk-1.2.5-tests-build.patch 526 SHA256 aa2875954048318f2a9c5035b670774a1c5ce1b641b067f936fa076f38659383 SHA512 0db9519c2733c8964ba4748fc36abeee7327f7fe7e4fac04c57f83bddbbd88ce8dac40e2752611e371d2e07b604fb4dedf747284a2a3ca294e47f197c43865cb WHIRLPOOL 173fdfa77b9892098fe37e0b1263e8c902830d366b3b08444189eb191a1342533cd45bdd935af6a752313a73abe555ff0fbabb56d966f0db09217b3cd6e53c14
-AUX webkit-gtk-1.2.7-libpng15.patch 1657 SHA256 0aef21a127b9427cb98684102c91902f38585c7d7642525760c7a7d9f0d39dc7 SHA512 4fef77d8b36540b83b5df4725a0d00b86324d26e29ec55dbd13117af69a3c59121c87e8a742bb44283d7710de7cf8925aef277ba867450169aab240a11e06a79 WHIRLPOOL 395a1b272f33421680e4bacf020e91de3f4cf88e0dab31a514ae36c4be60a0f19dcd819295108e14532d22b6e88cb7390dd7f272d4cf382aa276ac60e8cf8546
-AUX webkit-gtk-1.4.1-libpng15.patch 2571 SHA256 c014d8380270a73d96069f5eac343fab40d1a1112b03c32e5e6365da89ab7705 SHA512 0506e59374bd32233452fb389a8d7d0814b9db63407464655610fbcf893cb5123b4ee2506b753b29ca14b1e366c809928a534d1e6b4108127c5e5625c59b0268 WHIRLPOOL bfa96ab02d12a188693590e2a0e4b2ed187cc5b7ecef2f9ac202d86d2b39d23de1be2fe744cb177f9c128bf2ef4bb243426041e982f8dd22dfabf4bd3eceb433
 AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1
-AUX webkit-gtk-1.6.1-double-conversion.patch 1599 SHA256 7699e501785518bce36ebdd4faf2d3ace521fc27e748dfadedd65420de5d1e41 SHA512 fb51220dfa696d9da19ffe62bcff1323e44fa0cb740ef2db5aa27a14073c8ba05aa3f196cc6ba7c59134730624703cf99c20ebc9cd8212b202e558560e96dd34 WHIRLPOOL aa2b112956d541dfbd98263cb9a7761620038883d6a37be057644e772e70990064005b9a610a22c7a53d0e1ab1a6bfb9ac260ec74b666e7932106c83099e1d0e
-AUX webkit-gtk-1.6.1-pkgconfig-fix.patch 1297 SHA256 f4a41c4dd1c40347e846b377bd94b2d3ad10b1f110711b5f341f8fd8a5a13014 SHA512 36b4a8b34b6c37f6a2e05cb87b524a693c638744650fb9e2a99e396513c4f353d327d73dccddace424b8146172315e475e00eff38f0bd4befea0718e36f13f28 WHIRLPOOL 5f8c76464821b2ea822c2add2e05e56c2ae94d49d970e790eefd3defc6784930f3bd78c715920dedfac9e1c85996720e1638ca61391485a4f232733c431670f6
-AUX webkit-gtk-1.6.1-sparc-needs-alignment.patch 430 SHA256 870f314ed330b8cb1d7ffc498e2019c001eded83f14dfb4976804f85af403f80 SHA512 9767253267e343b8a0d7f1e255c59e8f803b0c755a8f5b6eb4891688df05dca8629ed52366399502dce8710a6eba5591e3a0ac9ba4d74959c6e89fa7c6fadf77 WHIRLPOOL 9a5d150a6c9a34f6996334b0df969437787d54409fbda5b3ed3eb1c93a0a4bf89f3b50ccdd7b28f0ef36d311dd431208c7c1e88dca8cb2a95b69d87188bd8371
-AUX webkit-gtk-1.6.3-paxctl-introspection.patch 929 SHA256 96efa5fcd823eca76f24c4d975dda0f7d9cfc439c71807941e895a70d0aea377 SHA512 5822a3a4044bba43e536c793237e8fa3141d6bb68d02f165222b8bd95e8f43e6b5c5ee5539fb980dcb55709c6b14526e14ed2c87e6c258d23fd54d40c6e0da13 WHIRLPOOL e7a0552801c26caca6a46ef64151111bc4d9a0569df53ab3ac0a21c81c1dd538d53ed15f9780fee32e122ec7a8d7903e9ace78983e67e8f4926bb8afc447804e
-AUX webkit-gtk-1.7.5-linguas.patch 1447 SHA256 42cf057556cb1493a40b12db87fa91820c0e493e542e211e9aed10c86bcb3d74 SHA512 842cfa7cc16bb225654fd70ce33d81bb51e2d92eed6ab123dca0a4da4eee8a3fd5e7d5e04b113c77e5f4198118ac8e4bea53dcbaf0d924752e01a897e8abfc03 WHIRLPOOL 25c9e0f506bed031536acd6d0d98e2ee2eddf7bed9b66ad570665d3dea27c3377c8698170ea0ff34b6240fb4342c4092278b9e4eda4e768ba0f9b082fcb4d3cc
-AUX webkit-gtk-1.7.90-parallel-make-hack.patch 592 SHA256 e20d7d45e6230308f7d4a7aac1095cb1fe8d9c7eb0f3e65b061acf8bc4bbaf73 SHA512 907356faab08ebf65da8760ad11ee8ecd4e97274b1c00c1e207fd52e479d64a0545ba66859b1a79bd150a95da4a9e8724b3c461a24f803fb341b8242566b5cc0 WHIRLPOOL 0e405878a137f6ddc2de84ec242cd5fb1ebcf20030a22299a9d6132a8f0c2880ab8718124dec6c89d1d8504bb8bc51a36194a7edad21a766e75c408c96f77ba5
-AUX webkit-gtk-1.7.90-test_garbage_collection.patch 597 SHA256 f2ca641430a0ff09001391d649aaf135c151177ce879a29136c78a68f2dfc4d0 SHA512 5d6cbe8977918ef75d9d9d2b3c31815981e85ebe2ddf467577a3de5854aa123b884158fb4c3142ab69e028f32e3715f8d9ace56545236b6bf470af8a3dff42ec WHIRLPOOL c905f847ea9c75eca9f1ba127ab0a46d3c993bef23d5c40b75bfe4fa109bb01d8f3f181c933ac7440308d112bffc5c50f20af735d24b7781b43f742be5e9e888
-AUX webkit-gtk-1.8.0-typedef-WebKitWebView.patch 1259 SHA256 7ea519b8212d752c3a794ec7f54b6222defc3c08d8a82b9a11bcea8875e783aa SHA512 9c0451ba7e9bf57474f7f96d2851d874d9b5cec2f55ea9e1f2ce40954214b56d33aa4b23faec74b2fafa886297f438d23b8c6cc1aadd2711ca256a7a6dda9799 WHIRLPOOL 03ad809f64394fad460014d96670318d47aea6e90fb3ccd33ea0d814eb41d41143369faf46fcf4523f43969575b9e3dc878283e7434fbcd22a85356bc92d8bbb
-AUX webkit-gtk-1.8.1-CodeGeneratorGObject-properties.patch 712 SHA256 a83c1ac0682598600d15f8e682a24ccb660e21ddedd730bc2f52e20b5d21fc6b SHA512 69cdb516edc02fef9cdb94aad7e91383c54349c62804e7881912ad7d0c11e178328a763f2e6d6da2ca0ae688f7d672197afc908acc8744d47dabaf3ba3f87d95 WHIRLPOOL 671840d83230561da9a3bd7d019ad332fcf38aa8e296c8af009f1c5acc2e27021f8f2b75a652c9e39b9df94f95d1cdef1f5066f4bda4bced6cf653916099c822
-AUX webkit-gtk-1.8.1-gst-required-version.patch 1321 SHA256 7301b76ccc98d3f9d96bb15c15e543568ef2360277cf85a8c24a93f3d490ce61 SHA512 aa9f2f8ade47fe8c4043cf1194a29fcb3a68feab70a9aa2575b0d366ffaa3786960116099b6f1213488cda20b2e1ea7984e8ec59add01a0d1056f50281ee290d WHIRLPOOL 5d55cb276c29ba6d3c355bb04e60e9789d4e4ce19fd7de71fb72825c95073633c8a36edcf2f547d1b5e42420fbee4b7a1573011c938f88418e00d839216d2508
-AUX webkit-gtk-1.8.1-tests-xvfb.patch 1391 SHA256 9ba0bd2364b9c766921b2b4440d1921773dd28a323868703dbf7ae495d52487c SHA512 3e00bf13dfaf0a38b881f8aa66cc25657b8e41aa2f19c0f635f06ff777697228dea442638e00f21cb3ce88c8c13a04b852f90398fab2dfe4114b36096b70f113 WHIRLPOOL 824479742482caba3bfb5c874602d01412c6a25042ae6cf2a63ad1894dfb1ab1c9927a555323ce069b64c6a71ee9c1daf953528df72d38c0670c9aef58b0df75
-AUX webkit-gtk-1.8.2-bison-2.6.patch 15829 SHA256 dcbb85c73be96841a69a1be5d01f9b110fa1f6cbc4ebd4e0c6a6470bca6627ef SHA512 a430a1286ad4e9a9ad33680c95e19408e99b2fade3cc5f8b45c6346c2f06316ec62a4736ad754ecec14ee410723d166a1cd4ccbe7cd0a89c6cf07f2a7b551183 WHIRLPOOL 2d41d72dc67da9927dabee09874c482b02691ede9b1e62ccad7a56d3ab6f8fd3ede94ee2393602e2d6b4b488e17a0dfa8eb1143cad956b7288652525efa19ae9
-AUX webkit-gtk-1.8.3-bison-3.patch 441 SHA256 01fef0947d7a5cbf936462d3911da677800a0fce27e51b78c949be95918a6ebf SHA512 086298d5d57dd4ad0fbe4620e43876c98371acfe2b555a09f842767a2c07a6deab6a597487e70dbad85cb57e7238e6af4298e85fceb0423c43809e24fb8374fc WHIRLPOOL 90088409541ceb781c0a9926db199746680a52e63cd27b9fff38d304f70a3aa9c530ac1e79aeb4256ee7dcf5910d0f8d8b567a03e63ed57fb3b467e3c30a825e
-AUX webkit-gtk-1.8.3-disable-backtrace-uclibc.patch 1007 SHA256 5f4f640991a1822f45f6a97c6aef016fdff411f8ee68b0dfea208cc5b9cc1ed5 SHA512 710da823e0506140239bc5890ce8a47a830ec1dd2ebf2134092e533e0f9041e400d680f65b3a45247a370443bc346b11bfcdea4873d6ddd569650495c724a276 WHIRLPOOL 5cc137dcdcfa858c02daf0be2389cf95a7fd7db88e92ba5e3d251092969c32cef95c0e98a1829fb2cd2ce715ce2b8d49c20602b80d0a71bf99ce1e1d08654c55
-AUX webkit-gtk-1.8.3-libdl.patch 874 SHA256 4cc477deb430915a60af6267e0400ea6210e9febea775d6d231aac6c408867b2 SHA512 87cfff6f72d73cf8ca2b9da3d59bef292f97688063bb9c6f8c8b3e0eb4ddfa0242300b5d35e5c6a41d75ee2a0f1e4a2e78a9fee6e702dac619401c8a92efaf99 WHIRLPOOL 1457c87606f9ace7067e93e43a6575e5ccb912ab1fe080f8c868ccbda252e293d24be20ed7e9bfc256cf10caa9441766f82cd4808688eb6ac4336ef646ab9b85
-AUX webkit-gtk-1.8.3-spellchecker.patch 792 SHA256 5c68f2c4052f660ab34476006f5fd600c6ba5427079ac83e08e787b7cbe6598c SHA512 a182a22b58aaa9e5efda5b23851d5c224370e03835ff76353f54fceabdb9dc2244c324cf0d3d5069ea8773e32008e671cdc7921846233397d7d9ec44fdf63118 WHIRLPOOL f7060b8c6aa88df85c583c65635a1a1845e1d0a0442d554a618d42759c13b4dbdb23dfb4dd18094915a42bfe8f90399ea84375b4ae6b3d94042947cb6367b0e0
-AUX webkit-gtk-1.9.91-libdl.patch 691 SHA256 a4da8aaea1a14ab9e67bcec01c666c074cbdc0785af2d2655a6cf6b1ff67072c SHA512 a7d3ab2a2065d18b16d5758c29d63543da1902f71dfb641e5b7d5db0a50c90b443026368b24b9f601d2f63f9eaaea67d3f686492d49068c2b013ad1cf6cf76a9 WHIRLPOOL 7808838f8d5389adb703dce234fa28e2da8266b57576fc70c37d11ea22af3b21a68f0e8600d237fbfc645a2796a7694e75c176035d57df75402f2adef690c4f8
-AUX webkit-gtk-2.2.2-freetype-2.5.1.patch 2851 SHA256 5f1fe73fb19c91b44749cdd68452ab124b533001d9e8a1c90f4cb9cbe416a9d8 SHA512 19c51e02189a177ce4a2b4a2f929cacc621e2e453d402c3b0eea91306a1ed6cde638ce62b665301a48c365efc8aedcedb2370ea95555515d4d6c546dc19c569f WHIRLPOOL cfa950c38310effa0eb09c3942d8e321097d783197e5bbcfbf2967a5414d40a8270baf2589765cc12da32ab1b25b26752d9932158b91df404aee2e8ece6fef2c
-AUX webkit-gtk-2.2.2-unittests-build.patch 1328 SHA256 f49a561effc00858c21db55607849f5b9c8f09cf4ee76f60262e71992013b625 SHA512 66d44483ac7de8b12f310239c4f8cb40a700ea9aad494decbe15b8976a4f4ff5ed53c97660e7762a7bb51de721ec081133368ca2871128d6e6e871fed5b0e042 WHIRLPOOL 77b308072cd705be3700da85ec05208d24bf8ff4aec9b93a1f73b311314fde1608e89ca8218e1f9da206d30bf2c378d727bc51a83f8144f7a559d35e6b5fe47e
 AUX webkit-gtk-2.2.4-unittests-build.patch 2866 SHA256 714b4663c5ae3fc695ae13c40fbedfae358e7ae4b6c2743a35ddd5e96d213133 SHA512 e4ba2eafdc97a673d07d1e253832c30ec32b57e02eb5b61d7a1c327760630f39d24e215a7940bcd5cd9ca321cd4d71e433f231e12e8476ebda62abfa53573297 WHIRLPOOL 5252edd1a69769ef99724f1aaf7844e50a9db1c204984ee066c2dd116bc58814631ddd9bea6bf4822e4c1122ad230f50f87e5f037b00e35ee81299fb9adf7ab5
 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
-DIST webkit-1.8.3.tar.xz 7814028 SHA256 ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7 SHA512 4d400cb0dfbde7eadcce52e7a37d2095ec382b65c6c0d4ea4795410dabad771fac0def50875092634075dc0a80043058d2d2913767e59db3e32cf3e13361803f WHIRLPOOL 25b8ce9a26f2c475a5e061bedf75d835ae5a907a92628e11cd9ae5962fcacbdfa6a0181ae7730fb39e4544615d2d78741025b17fa202f3d42d0f3956fcb7c3f0
-DIST webkitgtk-1.10.2.tar.xz 8633640 SHA256 19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c SHA512 0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f WHIRLPOOL f733244ce7601f7906f7aa26e750f770cc1472737f62d64c706e7c8c32cc31db22a38824e32c347bf70166f7c5104bac049a80eb08dc040733aee4988542e954
-DIST webkitgtk-2.2.5.tar.xz 9400456 SHA256 c710994a1ed0ec78f746a05ae7dc65369ed56d7475f0de576ca7a73ad9c6e670 SHA512 e412c0bc97b700e76b25c55f12be26e57701c448b5bf2dc060c361be2b85ef7dd2a7d7c178450703cac83f41ebc4f291a562b867453793e553683dac1cb920bd WHIRLPOOL f585b994569130f702f9ac0874066fa045bbc3ebcf0c14d2510920860a3e207130c0c8847e62af232b06ce86489da3cfe5921f37c1ca6ce15c95c7f499d88893
 DIST webkitgtk-2.2.6.tar.xz 9400300 SHA256 157ee7377ae97a27bb3b9bd2733d9353979632543c3d078b6578aeeb1319bf06 SHA512 9a90109ee8f591ae34ac2282e21aeee872292d82d1f66ebc69fb506c89a8ec952e373b35d1db7cc68307ea6ee90949c5c447ed206f14ec77374f8d68ab56021d WHIRLPOOL 47e5ffa17b53238f6282b17e2eb3e988dac7f295dd6757c097ea81d826770b1929d04d79f8a0e03abe5e30bfeb8626c42ad06c6a13aa0e9626120f590b55a931
-EBUILD webkit-gtk-1.10.2-r300.ebuild 9797 SHA256 3fbcb7ad9647aaa34457d478225b2315fb67a2a9c7353cfe5812acb27970839f SHA512 e4d885718c622a7185c5bf4fe6e65c61adb07fff0bd08a4d1b10bd89e292b32cc430127cbf795ecc105932361af2113632bdc393160da1c78ac2edf9e340ef49 WHIRLPOOL 849bd3f80bdcce711874a1ad422ccb5137a4626824d22686a817c4cbaedb0dfa635c47216314c5449eca07aa23067cdfc307874bdb2f2e414fb978ad67c4dca0
-EBUILD webkit-gtk-1.8.3-r200.ebuild 9156 SHA256 10a39327ff264ad68e04a027342e62b979cea035d1b16b102b79386379a1a982 SHA512 d2ab883aeb7ea1944c5cc2259ee5ade4766e3d879d90c447fd8fe7beaa5e5165a1a083b08785094b94f3e532e0a9424ca80b3bc23e423f12eab2f95c5644ee9b WHIRLPOOL 5eb9fc4ce8ee9536eaf5d2da5257d58120c964c96b73c8ae0bc2aa00d03226e93ac240a265f4e8d1007ffa25490c9f0eaf687c1ee9d1f4f65b8eef01c92f9838
-EBUILD webkit-gtk-1.8.3-r201.ebuild 9610 SHA256 d624ff02d974fd706c4f0511182ca2227a550f10a936f4d5e003d64b4ef7b5f5 SHA512 0ee9bfd80d36d82487d9ad2789b3046fb0a1d34081c4905ab6cc661890b757b445edcfb1396cedeb5b6d79ec9f3835757f234c2abd43d37d78b992b671db9816 WHIRLPOOL f812239bb7803677acc4250d7f1e2517dc00669dd6d683af44225b4ac5b0b09934ce8c135a60481415215d1d2925beb30e1e988cc55d371fff1d2df7918883ca
-EBUILD webkit-gtk-1.8.3-r300.ebuild 9759 SHA256 9404a95936f1c043a71dd94f6681dfeb4e194dcd5f474af0663c80faba4b6bd5 SHA512 a99bcd2462838a39db811839f1d16f1d163c8d6916a891419fdf6458eacb8073eef117e0a5e77f5ffcd322f8e7f7c8806f7e291eeb7f08c1ccd869b7efa346e1 WHIRLPOOL e78d3d3327e214f7c231ae1e54a81012608dde15f5faa0243f73d4cb0b84dd064feb73e496e0834e70ce52d1fcb252cd7cbc8dad074a4f0f96aa3e53ea699a4d
-EBUILD webkit-gtk-2.2.5-r200.ebuild 10103 SHA256 4c8993f08e07099b3d797bbb3067d2943568dc9a485e3b979556489056ee0fa6 SHA512 751fd7070d2f7eeeee4b155b0e952c92bd3f3ff496d3268028d4bcfbe104c973dd4ad72685a398ec5a08989b1705202d87e016b4d944323b26e187f96c784de5 WHIRLPOOL 04549a9c61eae00f039b85afd56d9241b1ab4152eb2e7fe24ebf23a57f24840fad5139d0bae61bc247e3c84be6eb8f3e3726a0b22ce61c5e70ba0bc43d052bfc
-EBUILD webkit-gtk-2.2.5.ebuild 10198 SHA256 2e68e2cee1147697d2e4a8a08846768e75180feeea9dd8975966c68de3b22b95 SHA512 86f202c9e8ab94505cb7f6f98b94e651a0538804a1d26b002cb3bdc9f46aed5d1fe29e3438bf2dc4e7cda89312b684e4369119e785c2ff2a4e2997fa8ebb9c93 WHIRLPOOL 6cce02d686003992c1d47e21ca4eb94308ee32cf23fda53ab6630def291d517f7db18c3952f238ba54dedcf2e1770065a113ce94f86b07a3af73fba22c54e6e5
 EBUILD webkit-gtk-2.2.6-r200.ebuild 8839 SHA256 51b4d2814a33794d3d17c9bfd68ac6889b2c664effb95e4af3f93555ea4e64da SHA512 017955f7ba0dc75d601349b142ed39d5f126e3beac5933c973c0a2273bfabbfe63402a026396d28ab967956aca1d703afe31f5ee0274abd6ba2084145dd519dd WHIRLPOOL 5544ec7cbf8f218966927e887ed95b4fd549e4a705d2b32cbaa45fd3f6d17dd34739c97d45c627cd7b74281039690dc60f85d723e40d5619ab4fe54ce6b1d694
 EBUILD webkit-gtk-2.2.6.ebuild 8934 SHA256 94e709b74f78b67b2ff1d0a4abe7b67d7a95b550bd6fc7a9904df44984319f1c SHA512 2f37e59f8fe373593f3771771644e64facac02bf2549bfd1ce008a30e19eba7746114e562b257108b1cf6d1955211cd32660a798b5fbf1a194e4d0b5557a90a7 WHIRLPOOL 5ce8581796cf5505f1ffb8f8237397d01861e4b64c3c4ec9ea5ec6311abade60a9cac3051c8a9beedcc5f9840d2314f2b335392e1c2e9a5048bbcfb2771c50d0
-MISC ChangeLog 53028 SHA256 e9a7ee5dd434d555e7a2ff876edd87c43ff233ba4def18278723ef92aa6ffacd SHA512 bd80ebf1bdd9ef03e2763c0eed68dec04ee06bd9612a758ab67b190fcf1489acbe12309608f5c5ff336bd7e28fd921ef43b0baf6ce8e9caf36fa4181201f911a WHIRLPOOL 4c49ae948780eebad67594842869891976599a986d56efcaeb0f23b7e882a06744f7d71398e51f2ede1b6d0593de608dacdc2f4c46ce9114f709f8e1840fe01c
-MISC metadata.xml 735 SHA256 25d9027d26b4842187348aa43666ea6e00af2a55fb16d4fae447e81a59c072be SHA512 4c67d850758b3bf54a5de45e35797d2cb2133776e15d729f81aa592e4d4b58e7c9869ed476c25a6dc442bfc131961875e433e3c3fa73e693cf948eeed2230fa8 WHIRLPOOL c5bc56d53e735e5b9cd8dd03ca55ae5380f2ddb333118797b222914307c57248cc8f55cab80abfd41d1054a9e856c8e1d3f88f2aa36fb7cb885d7f3e442dd307
+MISC ChangeLog 54719 SHA256 1b47159ecfe660b343446ec05c8cee2d55914b16743d0409ce6c40e67221e2ad SHA512 5f41609dedf00cd757e3b827689cf9f49fab6d4c91d82e8c182121fabee1b95b208e8f5f4bf962bac090d94097a0062ff264b71d5560048d8a403753380f1617 WHIRLPOOL 150b8a9d73806e434100c83b3dc8f2b3d1b0b03c2c02d22e6fa74464ec2ed0f7d6055023cc206e65826e44e03e80f740692898ef0b7e42c4a1f51db389e82cac
+MISC metadata.xml 610 SHA256 23faf3368df312d51e2dd38d6e7695410deab694bc12558cbe9751067575df11 SHA512 ac78b2e8a719247f5294c045ead7731cd42fb7200ea5a6a450ac18abd3a79fc888045e2c7f98bf984dd2a9484fc352ebc06e6b1c7a0bdd75a65a825e71c09188 WHIRLPOOL f2c88de8a7889cd3cdbb66f498067f85a5e6ce0c7b3732299ad9373e39ac332abe5d3da93f8fbe1e5f63b44306f9def006a3e34349eaca12ee9fb3b7a7368ea1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTVPM+AAoJELp701BxlEWf4/wP/jsIxgAiv6Yno7zrJZiNmpqb
-K+vffB65tyvmRBstDFMmna5gmue594EnIAGlHmm7P5Znnm24c4U2WpeEnpk9dxpT
-atMlYra3f1FVOVNmqoRG9kZCHI3UJz4KzrysnIVi0T12GMcZRhhCMXWyCe9jkqYS
-4WCP/YXo8SJDu6B9AK1MPiQ2Cc5b2H89++9haNW02VINWs5qolPajY8dRFuicUGO
-TwTZFyGu3OVYQux2VIbEQ1Zp8jCEo70BXkLQV9hBa3tKFpBWOLrRvZ4iOlkGp6XH
-MdmKPqK0o8Jz3vWY38U75VbBNx6nl+xLc/5LRCB7iFop6z4uJvaIPhhzMfcua4y+
-0rr97sWCJYhwNf8I5GmTyAkO+b9VUiZQrkxqcCbCHUQp4fhcF6wRe2Tj/+HDoOuo
-fA7W0J5nzN7sX6gjdQBJcTsHmbhZPhuXhtK04uyLPMt6Ye8TK3cmAV1+kJzGKjgl
-cJcIC7ShIrbX12mpOAdx1zHpAo5Kd6BJxqrqKOdz6Ot8LV3QoOoQpQgPIDF5eKuX
-GpMWyf8+ZvYsau8W/x0t32/V8bUsvUL3vMpLTUSqSNnKWjsY5lEZs8x0vqRVY7RV
-oCpnibFLWjk6VyyUP7+Nt5hXNBnQsH9Uj79k9WYubGwcUghvs3SQCRdviclt/tql
-QNGY3FLspNNYG99M+9D5
-=6R3o
+iEYEAREIAAYFAlNcw8gACgkQCaWpQKGI+9QNYACeOlsaKs72kjMeUUjLH8HfNGmn
+bYgAn1nwG8muqPNRjdSMBDf4Pn9glVHr
+=xXCj
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.10.1-disable-backtrace-uclibc.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.10.1-disable-backtrace-uclibc.patch
deleted file mode 100644
index 510fe4fd3668..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.10.1-disable-backtrace-uclibc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Anthony Basile <blueness@gentoo.org>
-Date: Sun, 04 Nov 2012 01:51:27 +0000
-
-webkit-gtk fails to build on a uclibc system because
-Source/JavaScriptCore/wtf/Assertions.cpp assumes that all linux systems have
-/usr/include/execinfo.h and provide backtrace().  But uclibc does not.  Its
-straightforward to extend the test to see if its also a uclibc system and not
-include execinfo.h or call backtrace()
-
---- a/Source/WTF/wtf/Assertions.cpp
-+++ b/Source/WTF/wtf/Assertions.cpp
-@@ -58,7 +58,7 @@
- #include <windows.h>
- #endif
- 
--#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
-+#if (OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)) && !OS(ANDROID)
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -268,7 +268,7 @@
- 
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
-+#if (OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)) && !OS(ANDROID)
-     *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
-     // The CaptureStackBackTrace function is available in XP, but it is not defined
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-gcc-4.8.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-gcc-4.8.patch
deleted file mode 100644
index 656a7b18c012..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-gcc-4.8.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-2013-04-04  Andras Becsi  <andras.becsi@digia.com>
-
-        Fix the build with GCC 4.8
-        https://bugs.webkit.org/show_bug.cgi?id=113147
-
-        Initialize JSObject* exception to suppress warnings that make
-        the build fail because of -Werror=maybe-uninitialized.
-
-        * runtime/Executable.cpp:
-        (JSC::FunctionExecutable::compileForCallInternal):
-        (JSC::FunctionExecutable::compileForConstructInternal):
-
-        Fix the build with GCC 4.8
-        https://bugs.webkit.org/show_bug.cgi?id=113147
-
-        Disable diagnostic warning -Wunused-local-typedefs for GCC 4.8
-        since dummy typedefs are commonly used in the codebase.
-
-        * wtf/Compiler.h:
-
-diff --git a/Source/JavaScriptCore/runtime/Executable.cpp b/Source/JavaScriptCore/runtime/Executable.cpp
-index 8b58b62aa3e39a347fae92961af69484de795a07..057bb43c6777bc4b63b23c0cabf32d106ca0243c 100644
---- a/Source/JavaScriptCore/runtime/Executable.cpp
-@@ -515,7 +515,7 @@
-     UNUSED_PARAM(bytecodeIndex);
- #endif
-     ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForCall);
--    JSObject* exception;
-+    JSObject* exception = 0;
-     OwnPtr<FunctionCodeBlock> newCodeBlock = produceCodeBlockFor(scopeChainNode, !!m_codeBlockForCall ? OptimizingCompilation : FirstCompilation, CodeForCall, exception);
-     if (!newCodeBlock)
-         return exception;
-@@ -558,7 +558,7 @@
- #endif
-     
-     ASSERT((jitType == JITCode::bottomTierJIT()) == !m_codeBlockForConstruct);
--    JSObject* exception;
-+    JSObject* exception = 0;
-     OwnPtr<FunctionCodeBlock> newCodeBlock = produceCodeBlockFor(scopeChainNode, !!m_codeBlockForConstruct ? OptimizingCompilation : FirstCompilation, CodeForConstruct, exception);
-     if (!newCodeBlock)
-         return exception;
-diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
-index e11747fb6519fe59560b47aabbe5480e98a9f155..b886f37151292851f311306b90fa5b9bc2880e06 100644
---- a/Source/WTF/wtf/Compiler.h
-+++ b/Source/WTF/wtf/Compiler.h
-@@ -122,6 +122,9 @@
- 
- /* Specific compiler features */
- #if COMPILER(GCC) && !COMPILER(CLANG)
-+#if GCC_VERSION_AT_LEAST(4, 8, 0)
-+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
-+#endif
- #if GCC_VERSION_AT_LEAST(4, 7, 0) && __cplusplus >= 201103L
- #define WTF_COMPILER_SUPPORTS_CXX_RVALUE_REFERENCES 1
- #define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-librt.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-librt.patch
deleted file mode 100644
index 2e0ae62b8673..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-librt.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3c499aa2a70b06b40a64fb5699622ff458e4ee0f Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember@gmail.com>
-Date: Sun, 25 Nov 2012 03:26:42 +0100
-Subject: [PATCH] [GTK] Explicitly link against librt
-
-Fixes broken build with undefined references to shm_open / shm_unlink
-symbols. SharedMemoryUnix.cpp uses these so we need to link with -lrt.
-
-https://bugs.webkit.org/show_bug.cgi?id=103194
----
- ChangeLog                     | 12 ++++++++++++
- Source/WebKit2/ChangeLog      | 12 ++++++++++++
- Source/WebKit2/GNUmakefile.am |  1 +
- configure.ac                  |  7 +++++++
- 4 files changed, 32 insertions(+)
-
-diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am
-index 9a02bbd..c775990 100644
---- a/Source/WebKit2/GNUmakefile.am
-+++ b/Source/WebKit2/GNUmakefile.am
-@@ -572,6 +572,7 @@ Programs_WebKitPluginProcess_LDADD += \
- 	$(PANGO_LIBS) \
- 	$(PNG_LIBS) \
- 	$(SHLWAPI_LIBS) \
-+	$(SHM_LIBS) \
- 	$(SQLITE3_LIBS) \
- 	$(UNICODE_LIBS) \
- 	$(XRENDER_LIBS) \
-diff --git a/configure.ac b/configure.ac
-index 4e1f0e8..97980e4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1118,6 +1118,13 @@ if test "$enable_webkit2" = "yes"; then
-    if test "$have_gtk_unix_printing" = "yes"; then
-        AC_DEFINE([HAVE_GTK_UNIX_PRINTING], [1], [Define if GTK+ UNIX Printing is available])
-    fi
-+
-+   # On some Linux/Unix platforms, shm_* may only be available if linking
-+   # against librt
-+   if test "$os_win32" = "no"; then
-+       AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIBS="-lrt"])
-+       AC_SUBST(SHM_LIBS)
-+   fi
- fi
- 
- # Plugin Process
--- 
-1.8.0
-
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-wifexited.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-wifexited.patch
deleted file mode 100644
index a1a120f2a6e4..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.10.2-wifexited.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-WIFEXITED definitions: POSIX documents this in stdlib.h as optional, and is
-defined there on linux, but on FreeBSD it is not, so we need to include
-sys/wait.h where POSIX mandates it to be.
-
-
---- webkitgtk-1.10.2/Source/WebKit2/UIProcess/Plugins/gtk/PluginProcessProxyGtk.cpp.old	2013-01-28 20:38:45.000000000 -0300
-+++ webkitgtk-1.10.2/Source/WebKit2/UIProcess/Plugins/gtk/PluginProcessProxyGtk.cpp	2013-01-28 20:39:10.000000000 -0300
-@@ -35,6 +35,7 @@
- #include <glib.h>
- #include <wtf/text/CString.h>
- #include <wtf/text/WTFString.h>
-+#include <sys/wait.h> // WIFEXITED
- 
- using namespace WebCore;
- 
---- webkitgtk-1.10.2/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp.old	2013-01-28 20:40:26.000000000 -0300
-+++ webkitgtk-1.10.2/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp	2013-01-28 20:40:46.000000000 -0300
-@@ -38,6 +38,7 @@
- #include <wtf/text/WTFString.h>
- #include <wtf/gobject/GOwnPtr.h>
- #include <wtf/gobject/GlibUtilities.h>
-+#include <sys/wait.h> // WIFEXITED
- 
- #if OS(LINUX)
- #include <sys/prctl.h>
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.11.1-libdl.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.11.1-libdl.patch
deleted file mode 100644
index 50f272901f3a..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.11.1-libdl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=96602
-
---- configure.ac	(revision 132329)
-+++ configure.ac	(working copy)
-@@ -278,6 +278,10 @@
- AC_SUBST([OLE32_LIBS])
- 
- 
-+AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
-+AC_SUBST([DLOPEN_LIBS])
-+
-+
- # determine the GTK+ version to use
- AC_MSG_CHECKING([the GTK+ version to use])
- AC_ARG_WITH([gtk],
-@@ -1039,7 +1043,7 @@
-    if test "$enable_glx" = "yes"; then
-     acceleration_backend_description+=", glx"
-    fi
--   OPENGL_LIBS+=" -ldl"
-+   OPENGL_LIBS+=" $DLOPEN_LIBS"
-    acceleration_backend_description+=")"
- fi
- AC_SUBST([OPENGL_LIBS])
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.3-fix-pool-sparc.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.2.3-fix-pool-sparc.patch
deleted file mode 100644
index 3b1c5c4351f3..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.2.3-fix-pool-sparc.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: Fixup pool and add sparc support
---- webkit-1.2.1.orig/JavaScriptCore/wtf/ListHashSet.h
-+++ webkit-1.2.1/JavaScriptCore/wtf/ListHashSet.h
-@@ -127,7 +127,7 @@ namespace WTF {
-             : m_freeList(pool())
-             , m_isDoneWithInitialFreeList(false)
-         { 
--            memset(m_pool.pool, 0, sizeof(m_pool.pool));
-+            memset(m_pool, 0, sizeof(m_pool));
-         }
- 
-         Node* allocate()
-@@ -171,7 +171,7 @@ namespace WTF {
-         }
- 
-     private:
--        Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); }
-+        Node* pool() { return reinterpret_cast<Node*>(m_pool); }
-         Node* pastPool() { return pool() + m_poolSize; }
- 
-         bool inPool(Node* node)
-@@ -182,10 +182,7 @@ namespace WTF {
-         Node* m_freeList;
-         bool m_isDoneWithInitialFreeList;
-         static const size_t m_poolSize = 256;
--        union {
--            char pool[sizeof(Node) * m_poolSize];
--            double forAlignment;
--        } m_pool;
-+        uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)];
-     };
- 
-     template<typename ValueArg> struct ListHashSetNode {
---- webkit-1.2.1.orig/WebCore/platform/text/AtomicString.cpp
-+++ webkit-1.2.1/WebCore/platform/text/AtomicString.cpp
-@@ -103,9 +103,9 @@ static inline bool equal(StringImpl* str
-     if (string->length() != length)
-         return false;
- 
-+#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
-     // FIXME: perhaps we should have a more abstract macro that indicates when
-     // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4)
-     const UChar* stringCharacters = string->characters();
-     for (unsigned i = 0; i != length; ++i) {
-         if (*stringCharacters++ != *characters++)
---- webkit-1.2.1.orig/WebCore/platform/text/StringHash.h
-+++ webkit-1.2.1/WebCore/platform/text/StringHash.h
-@@ -54,13 +54,13 @@ namespace WebCore {
- 
-             // FIXME: perhaps we should have a more abstract macro that indicates when
-             // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4)
-+#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
-             const UChar* aChars = a->characters();
-             const UChar* bChars = b->characters();
--            for (unsigned i = 0; i != aLength; ++i) {
-+            for (unsigned i = 0; i != aLength; ++i)
-                 if (*aChars++ != *bChars++)
-                     return false;
--            }
-+
-             return true;
- #else
-             /* Do it 4-bytes-at-a-time on architectures where it's safe */
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch
deleted file mode 100644
index 5046118af949..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt
-http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt
-
---- Source/WebCore/plugins/gtk/gtk2xtbin.c
-+++ Source/WebCore/plugins/gtk/gtk2xtbin.c
-@@ -41,7 +41,7 @@
-  * The GtkXtBin widget allows for Xt toolkit code to be used
-  * inside a GTK application.  
-  */
--
-+#if 0
- #include "GtkVersioning.h"
- #include "xembed.h"
- #include "gtk2xtbin.h"
-@@ -951,3 +951,4 @@
- 
-   return;
- }
-+#endif
---- Source/WebCore/plugins/gtk/PluginViewGtk.cpp
-+++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp
-@@ -60,10 +60,13 @@
- #include "runtime_root.h"
- #include <runtime/JSLock.h>
- #include <runtime/JSValue.h>
-+#include "NotImplemented.h"
- 
- #include <gdkconfig.h>
- #include <gtk/gtk.h>
- 
-+#undef XP_UNIX
-+
- #if defined(XP_UNIX)
- #include "gtk2xtbin.h"
- #define Bool int // this got undefined somewhere
-@@ -441,9 +444,9 @@
-         event->setDefaultHandled();
- }
- 
--#if defined(XP_UNIX)
- void PluginView::handleFocusInEvent()
- {
-+#if defined(XP_UNIX)
-     XEvent npEvent;
-     initXEvent(&npEvent);
- 
-@@ -453,10 +456,12 @@
-     event.detail = NotifyDetailNone;
- 
-     dispatchNPEvent(npEvent);
-+#endif
- }
- 
- void PluginView::handleFocusOutEvent()
- {
-+#if defined(XP_UNIX)
-     XEvent npEvent;
-     initXEvent(&npEvent);
- 
-@@ -466,8 +471,8 @@
-     event.detail = NotifyDetailNone;
- 
-     dispatchNPEvent(npEvent);
--}
- #endif
-+}
- 
- void PluginView::setParent(ScrollView* parent)
- {
-@@ -797,8 +802,8 @@
-     }
- 
-     if (m_isWindowed) {
--#if defined(XP_UNIX)
-         GtkWidget* pageClient = m_parentFrame->view()->hostWindow()->platformPageClient();
-+#if defined(XP_UNIX)
- 
-         if (m_needsXEmbed) {
-             // If our parent is not anchored the startup process will
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch
deleted file mode 100644
index cf25b5dd57a9..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.webkit.org/show_bug.cgi?id=39847
-
-additionally, also on Darwin8 glib stuff includes system headers that
-use isascii, so we can't have it die on that.
-
---- JavaScriptCore/wtf/FastMalloc.cpp
-+++ JavaScriptCore/wtf/FastMalloc.cpp
-@@ -1381,14 +1381,12 @@
-   // Bytes allocated from system
-   uint64_t system_bytes_;
- 
--#if USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY
-   // Number of pages kept in free lists that are still committed.
-   Length free_committed_pages_;
- 
-   // Minimum number of free committed pages since last scavenge. (Can be 0 if
-   // we've committed new pages since the last scavenge.)
-   Length min_free_committed_pages_since_last_scavenge_;
--#endif
- 
-   bool GrowHeap(Length n);
- 
---- WebCore/config.h
-+++ WebCore/config.h
-@@ -125,7 +125,7 @@
- // this breaks compilation of <QFontDatabase>, at least, so turn it off for now
- // Also generates errors on wx on Windows, presumably because these functions
- // are used from wx headers.
--#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM)
-+#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !defined(BUILDING_ON_TIGER)
- #include <wtf/DisallowCType.h>
- #endif
- 
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch
deleted file mode 100644
index 0d9e1448056e..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Do not build tests if not requested to.
-
---- a/GNUmakefile.am	2010-12-21 17:23:58.000000000 +0100
-+++ b/GNUmakefile.am	2010-12-21 17:24:28.000000000 +0100
-@@ -46,7 +46,8 @@
- 
- # Libraries and support components
- bin_PROGRAMS :=
-+check_PROGRAMS :=
- noinst_PROGRAMS :=
- noinst_HEADERS :=
- noinst_LTLIBRARIES :=
- lib_LIBRARIES :=
-@@ -541,7 +541,7 @@
- include WebKit/gtk/po/GNUmakefile.am
- 
- # Build unit tests
--noinst_PROGRAMS += $(TEST_PROGS)
-+check_PROGRAMS += $(TEST_PROGS)
- 
- webkit_tests_cflags = \
- 	-fno-strict-aliasing \
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.7-libpng15.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.2.7-libpng15.patch
deleted file mode 100644
index 567486188fd2..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.2.7-libpng15.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
-+++ WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
-@@ -242,9 +242,9 @@
-     png_structp png = m_reader->pngPtr();
-     png_infop info = m_reader->infoPtr();
--    png_uint_32 width = png->width;
--    png_uint_32 height = png->height;
-+    png_uint_32 width = png_get_image_width(png, info);
-+    png_uint_32 height = png_get_image_height(png, info);
-     
-     // Protect against large images.
--    if (png->width > cMaxPNGSize || png->height > cMaxPNGSize) {
-+    if (width > cMaxPNGSize || height > cMaxPNGSize) {
-         longjmp(JMPBUF(png), 1);
-         return;
-@@ -319,7 +319,12 @@
- 
-     if (m_reader->decodingSizeOnly()) {
--        // If we only needed the size, halt the reader.     
-+        // If we only needed the size, halt the reader.
-+#if defined(PNG_LIBPNG_VER_MAJOR) && defined(PNG_LIBPNG_VER_MINOR) && (PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5))
-+        // '0' argument to png_process_data_pause means: Do not cache unprocessed data.
-+        m_reader->setReadOffset(m_reader->currentBufferSize() - png_process_data_pause(png, 0));
-+#else
-         m_reader->setReadOffset(m_reader->currentBufferSize() - png->buffer_size);
-         png->buffer_size = 0;
-+#endif
-     }
- }
-@@ -344,5 +349,5 @@
-         buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));
- 
--        if (m_reader->pngPtr()->interlaced)
-+        if (png_get_interlace_type(m_reader->pngPtr(), m_reader->infoPtr()) != PNG_INTERLACE_NONE)
-             m_reader->createInterlaceBuffer((m_reader->hasAlpha() ? 4 : 3) * size().width() * size().height());
-     }
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.4.1-libpng15.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.4.1-libpng15.patch
deleted file mode 100644
index 75a0d84c5e29..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.4.1-libpng15.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp b/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
-index 8edfe36..44cb98c 100644
---- a/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
-+++ b/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
-@@ -226,7 +226,11 @@ static ColorProfile readColorProfile(png_structp png, png_infop info)
- #ifdef PNG_iCCP_SUPPORTED
-     char* profileName;
-     int compressionType;
--    char* profile;
-+#if (PNG_LIBPNG_VER < 10500)
-+    png_charp profile;
-+#else
-+    png_bytep profile;
-+#endif
-     png_uint_32 profileLength;
-     if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) {
-         ColorProfile colorProfile;
-@@ -241,11 +245,11 @@ void PNGImageDecoder::headerAvailable()
- {
-     png_structp png = m_reader->pngPtr();
-     png_infop info = m_reader->infoPtr();
--    png_uint_32 width = png->width;
--    png_uint_32 height = png->height;
-+    png_uint_32 width = png_get_image_width(png, info);
-+    png_uint_32 height = png_get_image_height(png, info);
-     
-     // Protect against large images.
--    if (png->width > cMaxPNGSize || png->height > cMaxPNGSize) {
-+    if (width > cMaxPNGSize || height > cMaxPNGSize) {
-         longjmp(JMPBUF(png), 1);
-         return;
-     }
-@@ -318,9 +322,14 @@ void PNGImageDecoder::headerAvailable()
-     m_reader->setHasAlpha(channels == 4);
- 
-     if (m_reader->decodingSizeOnly()) {
--        // If we only needed the size, halt the reader.     
-+        // If we only needed the size, halt the reader.
-+#if defined(PNG_LIBPNG_VER_MAJOR) && defined(PNG_LIBPNG_VER_MINOR) && (PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5))
-+        // '0' argument to png_process_data_pause means: Do not cache unprocessed data.
-+        m_reader->setReadOffset(m_reader->currentBufferSize() - png_process_data_pause(png, 0));
-+#else
-         m_reader->setReadOffset(m_reader->currentBufferSize() - png->buffer_size);
-         png->buffer_size = 0;
-+#endif
-     }
- }
- 
-@@ -343,7 +352,7 @@ void PNGImageDecoder::rowAvailable(unsigned char* rowBuffer, unsigned rowIndex,
-         // For PNGs, the frame always fills the entire image.
-         buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));
- 
--        if (m_reader->pngPtr()->interlaced)
-+        if (png_get_interlace_type(m_reader->pngPtr(), m_reader->infoPtr()) != PNG_INTERLACE_NONE)
-             m_reader->createInterlaceBuffer((m_reader->hasAlpha() ? 4 : 3) * size().width() * size().height());
-     }
- 
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-double-conversion.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-double-conversion.patch
deleted file mode 100644
index 0c07a5133123..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-double-conversion.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From adad38e6096468a22f62a913cd4cc8fb95e698ec Mon Sep 17 00:00:00 2001
-From: "commit-queue@webkit.org"
- <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Sun, 16 Oct 2011 00:54:05 +0000
-Subject: [PATCH] The s390 and s390x architectures both use 64-bit double type
- that conforms to the IEEE-754 standard.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugs.webkit.org/show_bug.cgi?id=69940
-
-Patch by Dan Horák <dan@danny.cz> on 2011-10-15
-Reviewed by Gavin Barraclough.
-
-* wtf/dtoa/utils.h:
-
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@97568 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/JavaScriptCore/ChangeLog        |   11 +++++++++++
- Source/JavaScriptCore/wtf/dtoa/utils.h |    2 +-
- 2 files changed, 12 insertions(+), 1 deletions(-)
-
-Index: webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h
-===================================================================
---- webkit-1.6.1.orig/Source/JavaScriptCore/wtf/dtoa/utils.h	2011-10-21 11:44:37.000000000 -0200
-+++ webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h	2011-10-21 11:46:41.928885576 -0200
-@@ -49,7 +49,7 @@
- defined(__ARMEL__) || \
- defined(_MIPS_ARCH_MIPS32R2)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
--#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4)
-+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__)
- #if defined(_WIN32)
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-pkgconfig-fix.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-pkgconfig-fix.patch
deleted file mode 100644
index 765dbe0f36ff..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-pkgconfig-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9adb931bd0899eaa53aa77a57a296b75ece8f0dc Mon Sep 17 00:00:00 2001
-From: "kov@webkit.org" <kov@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Thu, 20 Oct 2011 15:00:16 +0000
-Subject: [PATCH] [GTK] webkitgtk's pkgconfig file needs to require
- javascriptcoregtk
- https://bugs.webkit.org/show_bug.cgi?id=70500
-
-Reviewed by Philippe Normand.
-
-* webkit.pc.in: add javascriptcoregtk to Requires
-
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@97979 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/WebKit/gtk/ChangeLog    |    9 +++++++++
- Source/WebKit/gtk/webkit.pc.in |    2 +-
- 2 files changed, 10 insertions(+), 1 deletions(-)
-
-Index: webkit-1.6.1/Source/WebKit/gtk/webkit.pc.in
-===================================================================
---- webkit-1.6.1.orig/Source/WebKit/gtk/webkit.pc.in	2011-10-23 20:36:14.000000000 -0200
-+++ webkit-1.6.1/Source/WebKit/gtk/webkit.pc.in	2011-10-23 20:38:06.180793290 -0200
-@@ -6,6 +6,6 @@
- Name: WebKit
- Description: Web content engine for GTK+
- Version: @VERSION@
--Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4
-+Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@
- Libs: -L${libdir} -lwebkitgtk-@WEBKITGTK_API_VERSION@
- Cflags: -I${includedir}/webkit-@WEBKITGTK_API_VERSION@
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-sparc-needs-alignment.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-sparc-needs-alignment.patch
deleted file mode 100644
index 2b678e5f9469..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-sparc-needs-alignment.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur a/Source/JavaScriptCore/wtf/Platform.h b/Source/JavaScriptCore/wtf/Platform.h
---- a/Source/JavaScriptCore/wtf/Platform.h	2012-02-25 11:10:13.000000000 +0000
-+++ b/Source/JavaScriptCore/wtf/Platform.h	2012-02-25 11:26:17.992010602 +0000
-@@ -295,7 +295,7 @@
- 
- #endif /* ARM */
- 
--#if CPU(ARM) || CPU(MIPS) || CPU(SH4)
-+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC)
- #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
- #endif
- 
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch
deleted file mode 100644
index c34cc402026f..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.6.3-paxctl-introspection.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru a/Source/WebKit/gtk/GNUmakefile.am b/Source/WebKit/gtk/GNUmakefile.am
---- a/Source/WebKit/gtk/GNUmakefile.am
-+++ b/Source/WebKit/gtk/GNUmakefile.am
-@@ -269,7 +269,7 @@
- WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir
- 
- $(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
--	$(AM_V_GEN)$(G_IR_SCANNER) -v --warn-all \
-+	$(AM_V_GEN)LIBTOOL="$(LIBTOOL)" $(G_IR_SCANNER) -v --warn-all \
- 	     --symbol-prefix=webkit \
- 	     --identifier-prefix=WebKit \
- 	     --namespace=WebKit \
-@@ -280,7 +280,7 @@
- 	     --include=Soup-2.4 \
- 	     --library=webkitgtk-@WEBKITGTK_API_VERSION@ \
- 	     --library=javascriptcoregtk-@WEBKITGTK_API_VERSION@ \
--	     --libtool="$(LIBTOOL)" \
-+	     --libtool="bash $(top_srcdir)/gir-paxctl-lt-wrapper m" \
- 	     --pkg=gobject-2.0 \
- 	     --pkg=gtk+-@GTK_API_VERSION@ \
- 	     --pkg=libsoup-2.4 \
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.5-linguas.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.7.5-linguas.patch
deleted file mode 100644
index df14a5cfe305..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.7.5-linguas.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Respect intltool's LINGUAS variable for building translations.
-
---- a/webkit-1.7.5/GNUmakefile.am
-+++ b/webkit-1.7.5/GNUmakefile.am
-@@ -54,6 +54,9 @@
- IDL_BINDINGS :=
- TEST_PROGS :=
- POFILES :=
-+PO_LINGUAS :=
-+USER_LINGUAS :=
-+USE_LINGUAS :=
- MOFILES :=
- dom_binding_idls :=
- wtf_cppflags:=
---- a/webkit-1.7.5/Source/WebKit/gtk/po/GNUmakefile.am
-+++ b/webkit-1.7.5/Source/WebKit/gtk/po/GNUmakefile.am
-@@ -27,7 +27,15 @@
- 
- POFILES += $(shell ls $(srcdir)/Source/WebKit/gtk/po/*.po)
- 
--MOFILES += $(shell echo $(POFILES) | tr ' ' '\n' | sed "s,^$(srcdir)/,,g" | sed 's/\.po/.mo/g')
-+PO_LINGUAS += $(patsubst $(srcdir)/Source/WebKit/gtk/po/%.po,%,$(POFILES))
-+
-+USER_LINGUAS += $(filter $(LINGUAS),$(PO_LINGUAS))
-+
-+USE_LINGUAS += $(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else LLINGUAS="$(PO_LINGUAS)"; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-+
-+MOFILES += $(USE_LINGUAS:%=Source/WebKit/gtk/po/%.mo)
-+
-+ALL_MOFILES := $(shell echo $(POFILES) | tr ' ' '\n' | sed "s,^$(srcdir)/,,g" | sed 's/\.po/.mo/g')
- 
- .po.mo:
- 	test -d Source/WebKit/gtk/po/ || mkdir -p Source/WebKit/gtk/po/
-@@ -124,11 +132,11 @@
- 	$(top_builddir)/stamp-po
- 
- MAINTAINERCLEANFILES += \
--	$(MOFILES) \
-+	$(ALL_MOFILES) \
- 	$(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot
- 
- DISTCLEANFILES += \
--	$(MOFILES) \
-+	$(ALL_MOFILES) \
- 	$(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot
- 
- po-install-data-local: all
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-parallel-make-hack.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-parallel-make-hack.patch
deleted file mode 100644
index b632ca2791db..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-parallel-make-hack.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Horrible failure of a hack to enable workaround for
-https://bugs.webkit.org/show_bug.cgi?id=79498
-
---- a/GNUmakefile.am
-+++ b/GNUmakefile.am
-@@ -285,6 +285,15 @@
- all-local: stamp-po
- 	$(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
- 
-+# Horrible hack to enable workaround for parallel make failure
-+all-built-sources-local: $(BUILT_SOURCES) autotoolsconfig.h
-+
-+all-ltlibraries-local: GNUmakefile $(LTLIBRARIES)
-+
-+all-programs-local: GNUmakefile $(PROGRAMS)
-+
-+all-data-local: GNUmakefile $(DATA)
-+
- # remove built sources and program directories
- clean-local:
- 	-rm -rf $(GENPROGRAMS)
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch
deleted file mode 100644
index 577c249eeda2..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Garbage collection test fails intermittently if icedtea browser plugin is
-installed.
-
---- a/Source/WebKit/gtk/tests/testdomdocument.c
-+++ b/Source/WebKit/gtk/tests/testdomdocument.c
-@@ -353,12 +353,6 @@
-                test_dom_document_get_links,
-                dom_document_fixture_teardown);
- 
--    g_test_add("/webkit/domdocument/test_garbage_collection",
--               DomDocumentFixture, HTML_DOCUMENT_LINKS,
--               dom_document_fixture_setup,
--               test_dom_document_garbage_collection,
--               dom_document_fixture_teardown);
--
-     return g_test_run();
- }
- 
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.0-typedef-WebKitWebView.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.0-typedef-WebKitWebView.patch
deleted file mode 100644
index c3852aa1d7d3..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.0-typedef-WebKitWebView.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h
-===================================================================
---- /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h	(revision 109222)
-+++ /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDefines.h	(revision 109329)
-@@ -34,4 +34,6 @@
- 
- typedef struct _WebKitPrintOperation WebKitPrintOperation;
-+typedef struct _WebKitFindController WebKitFindController;
-+typedef struct _WebKitWebView        WebKitWebView;
- 
- #ifdef G_OS_WIN32
-@@ -47,6 +49,3 @@
- #endif
- 
--typedef struct _WebKitFindController WebKitFindController;
--typedef struct _WebKitWebView        WebKitWebView;
--
- #endif // WebKitDefines_h
-Index: /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h
-===================================================================
---- /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h	(revision 109222)
-+++ /trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h	(revision 109329)
-@@ -49,5 +49,4 @@
- #define WEBKIT_WEB_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  WEBKIT_TYPE_WEB_VIEW, WebKitWebViewClass))
- 
--typedef struct _WebKitWebView WebKitWebView;
- typedef struct _WebKitWebViewClass WebKitWebViewClass;
- typedef struct _WebKitWebViewPrivate WebKitWebViewPrivate;
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-CodeGeneratorGObject-properties.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-CodeGeneratorGObject-properties.patch
deleted file mode 100644
index ff2f5ae5d7ff..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-CodeGeneratorGObject-properties.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Mikhail Khokhlov <mikhail.khokhlov@lge.com>
-
-https://bugs.webkit.org/show_bug.cgi?id=84526
-
-Index: Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm
-===================================================================
---- Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm	(revision 115562)
-+++ Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm	(working copy)
-@@ -1444,9 +1444,10 @@
-     print IMPL "namespace WebKit {\n\n";
-     print IMPL @cBodyPriv;
-     print IMPL "} // namespace WebKit\n\n";
-+
-+    print IMPL @cBodyProperties;
-     print IMPL "#endif // ${conditionalString}\n\n" if $conditionalString;
- 
--    print IMPL @cBodyProperties;
-     print IMPL @cBody;
- 
-     close(IMPL);
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-gst-required-version.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-gst-required-version.patch
deleted file mode 100644
index cd0337bf7db0..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-gst-required-version.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-2012-05-01  Landry Breuil  <landry@openbsd.org>
-
-        [GTK] Fix gstreamer detection during configure
-        https://bugs.webkit.org/show_bug.cgi?id=84325
-
-        Reviewed by Philippe Normand.
-
-        * configure.ac: Fix GSTREAMER_REQUIRED_VERSION and
-        GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION assignments.
-
-Index: /trunk/configure.ac
-===================================================================
---- /trunk/configure.ac	(revision 115666)
-+++ /trunk/configure.ac	(revision 115737)
-@@ -343,10 +343,10 @@
- 
- case "$with_gstreamer" in
--     0.10) GSTREAMER_REQUIRED_VERSION=GSTREAMER_0_10_REQUIRED_VERSION
--           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION
-+     0.10) GSTREAMER_REQUIRED_VERSION=$GSTREAMER_0_10_REQUIRED_VERSION
-+           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=$GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION
-            GST_API_VERSION=0.10
-            ;;
--     0.11) GSTREAMER_REQUIRED_VERSION=GSTREAMER_0_11_REQUIRED_VERSION
--           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=GSTREAMER_0_11_PLUGINS_BASE_REQUIRED_VERSION
-+     0.11) GSTREAMER_REQUIRED_VERSION=$GSTREAMER_0_11_REQUIRED_VERSION
-+           GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=$GSTREAMER_0_11_PLUGINS_BASE_REQUIRED_VERSION
-            GST_API_VERSION=0.11
-            ;;
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-tests-xvfb.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-tests-xvfb.patch
deleted file mode 100644
index e310c6521c29..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-tests-xvfb.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Rely on virtualx.eclass instead of manually spawning Xvfb. Fixes occasional
-test failures.
-
---- a/Tools/Scripts/run-gtk-tests
-+++ b/Tools/Scripts/run-gtk-tests
-@@ -147,18 +147,9 @@
- 
-     def _setup_testing_environment(self):
-         self._test_env = os.environ
--        self._test_env["DISPLAY"] = self._options.display
-         self._test_env["WEBKIT_INSPECTOR_PATH"] = os.path.abspath(os.path.join(self._programs_path, 'resources', 'inspector'))
-         self._test_env['GSETTINGS_BACKEND'] = 'memory'
- 
--        try:
--            self._xvfb = self._create_process(["Xvfb", self._options.display, "-screen", "0", "800x600x24", "-nolisten", "tcp"],
--                                              stdout=subprocess.PIPE, stderr=subprocess.PIPE)
--        except Exception as e:
--            sys.stderr.write("Failed to run Xvfb: %s\n", e)
--            sys.stderr.flush()
--            return False
--
-         # If we cannot start the accessibility daemons, we can just skip the accessibility tests.
-         if not self._start_accessibility_daemons():
-             print "Could not start accessibility bus, so skipping TestWebKitAccessibility"
-@@ -170,7 +161,6 @@
-             self._spi_registryd.terminate()
-         if self._spi_bus_launcher:
-             self._spi_bus_launcher.terminate()
--        self._xvfb.kill();
- 
-     def _remove_skipped_tests(self):
-         tests_to_remove = []
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.2-bison-2.6.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.2-bison-2.6.patch
deleted file mode 100644
index 73b657b59e37..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.2-bison-2.6.patch
+++ /dev/null
@@ -1,508 +0,0 @@
-2012-07-30  Alexis Menard  <alexis.menard@openbossa.org>
-
-        Build fix with newer bison 2.6.
-        https://bugs.webkit.org/show_bug.cgi?id=92264
-
-        Reviewed by Adam Barth.
-
-        As stated in http://www.gnu.org/software/bison/manual/html_node/Table-of-Symbols.html
-        YYLEX_PARAM and YYPARSE_PARAM are depecreated since version 1.875. So far all Mac OS
-        version I had access to as well as recent Linux runs at least version 2.3 so it's safe
-        to use the replacement of these deprecated macros in favor of %lex-param and %parse-param.
-        As announced http://lists.gnu.org/archive/html/info-gnu/2012-07/msg00011.html with the release
-        of version 2.6 YYLEX_PARAM and YYPARSE_PARAM are not supported anymore.
-
-        No new tests : build fix and the patch should not trigger any regressions
-
-        * css/CSSGrammar.y:
-        * css/CSSParser.cpp:
-        * xml/XPathGrammar.y: Refactored a bit to not use an intermediate PARSER define.
-        * xml/XPathParser.cpp: bison 2.6 declare xpathyyparse in the .h file now, i.e. XPathGrammar.h
-        therefore including this file within the namespace {} declarations leads to xpathyyparse being
-        defined part of WebCore::XPath namespaces but the actual implementation of xpathyyparse is in XPathGrammar.cpp
-        (generated) and not implemented within the WebCore::XPath so it lead to linking issues. Last, XPathGrammar.h needs 
-        to be included after the other includes as it uses some XPath types. It breaks the style but CSSParser.cpp is doing the same.
-
-Index: /trunk/Source/WebCore/css/CSSParser.cpp
-===================================================================
---- /trunk/Source/WebCore/css/CSSParser.cpp	(revision 124098)
-+++ /trunk/Source/WebCore/css/CSSParser.cpp	(revision 124099)
-@@ -115,5 +115,5 @@
- #endif
- 
--extern int cssyyparse(void* parser);
-+extern int cssyyparse(WebCore::CSSParser*);
- 
- using namespace std;
-Index: /trunk/Source/WebCore/css/CSSGrammar.y
-===================================================================
---- /trunk/Source/WebCore/css/CSSGrammar.y	(revision 124098)
-+++ /trunk/Source/WebCore/css/CSSGrammar.y	(revision 124099)
-@@ -54,11 +54,10 @@
- #define YYDEBUG 0
- 
--// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x
--#define YYPARSE_PARAM parser
--#define YYLEX_PARAM parser
--
- %}
- 
- %pure_parser
-+
-+%parse-param { CSSParser* parser }
-+%lex-param { CSSParser* parser }
- 
- %union {
-@@ -90,5 +89,5 @@
- %{
- 
--static inline int cssyyerror(const char*)
-+static inline int cssyyerror(void*, const char*)
- {
-     return 1;
-Index: /trunk/Source/WebCore/xml/XPathParser.cpp
-===================================================================
---- /trunk/Source/WebCore/xml/XPathParser.cpp	(revision 124098)
-+++ /trunk/Source/WebCore/xml/XPathParser.cpp	(revision 124099)
-@@ -33,22 +33,19 @@
- #include "XPathException.h"
- #include "XPathNSResolver.h"
-+#include "XPathPath.h"
- #include "XPathStep.h"
- #include <wtf/StdLibExtras.h>
- #include <wtf/text/StringHash.h>
- 
--int xpathyyparse(void*);
--
-+using namespace WebCore;
- using namespace WTF;
- using namespace Unicode;
--
--namespace WebCore {
--namespace XPath {
--
--class LocationPath;
--
--#include "XPathGrammar.h"    
-+using namespace XPath;
-+
-+extern int xpathyyparse(WebCore::XPath::Parser*);
-+#include "XPathGrammar.h"
- 
- Parser* Parser::currentParser = 0;
--    
-+
- enum XMLCat { NameStart, NameCont, NotPartOfName };
- 
-@@ -631,4 +628,2 @@
- }
- 
--}
--}
-Index: /trunk/Source/WebCore/xml/XPathGrammar.y
-===================================================================
---- /trunk/Source/WebCore/xml/XPathGrammar.y	(revision 124098)
-+++ /trunk/Source/WebCore/xml/XPathGrammar.y	(revision 124099)
-@@ -35,4 +35,5 @@
- #include "XPathPath.h"
- #include "XPathPredicate.h"
-+#include "XPathStep.h"
- #include "XPathVariableReference.h"
- #include <wtf/FastMalloc.h>
-@@ -45,6 +46,4 @@
- #define YYDEBUG 0
- #define YYMAXDEPTH 10000
--#define YYPARSE_PARAM parserParameter
--#define PARSER static_cast<Parser*>(parserParameter)
- 
- using namespace WebCore;
-@@ -54,4 +53,5 @@
- 
- %pure_parser
-+%parse-param { WebCore::XPath::Parser* parser }
- 
- %union
-@@ -72,5 +72,5 @@
- 
- static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
--static void xpathyyerror(const char*) { }
-+static void xpathyyerror(void*, const char*) { }
-     
- %}
-@@ -119,5 +119,5 @@
-     OrExpr
-     {
--        PARSER->m_topExpr = $1;
-+        parser->m_topExpr = $1;
-     }
-     ;
-@@ -139,5 +139,5 @@
-     {
-         $$ = new LocationPath;
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -151,5 +151,5 @@
-         $$ = $2;
-         $$->insertFirstStep($1);
--        PARSER->unregisterParseNode($1);
-+        parser->unregisterParseNode($1);
-     }
-     ;
-@@ -160,6 +160,6 @@
-         $$ = new LocationPath;
-         $$->appendStep($1);
--        PARSER->unregisterParseNode($1);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -167,5 +167,5 @@
-     {
-         $$->appendStep($3);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($3);
-     }
-     |
-@@ -174,6 +174,6 @@
-         $$->appendStep($2);
-         $$->appendStep($3);
--        PARSER->unregisterParseNode($2);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($2);
-+        parser->unregisterParseNode($3);
-     }
-     ;
-@@ -184,9 +184,9 @@
-         if ($2) {
-             $$ = new Step(Step::ChildAxis, *$1, *$2);
--            PARSER->deletePredicateVector($2);
-+            parser->deletePredicateVector($2);
-         } else
-             $$ = new Step(Step::ChildAxis, *$1);
--        PARSER->deleteNodeTest($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteNodeTest($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -195,6 +195,6 @@
-         String localName;
-         String namespaceURI;
--        if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
--            PARSER->m_gotNamespaceError = true;
-+        if (!parser->expandQName(*$1, localName, namespaceURI)) {
-+            parser->m_gotNamespaceError = true;
-             YYABORT;
-         }
-@@ -202,9 +202,9 @@
-         if ($2) {
-             $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
--            PARSER->deletePredicateVector($2);
-+            parser->deletePredicateVector($2);
-         } else
-             $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -213,9 +213,9 @@
-         if ($3) {
-             $$ = new Step($1, *$2, *$3);
--            PARSER->deletePredicateVector($3);
-+            parser->deletePredicateVector($3);
-         } else
-             $$ = new Step($1, *$2);
--        PARSER->deleteNodeTest($2);
--        PARSER->registerParseNode($$);
-+        parser->deleteNodeTest($2);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -224,6 +224,6 @@
-         String localName;
-         String namespaceURI;
--        if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
--            PARSER->m_gotNamespaceError = true;
-+        if (!parser->expandQName(*$2, localName, namespaceURI)) {
-+            parser->m_gotNamespaceError = true;
-             YYABORT;
-         }
-@@ -231,9 +231,9 @@
-         if ($3) {
-             $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
--            PARSER->deletePredicateVector($3);
-+            parser->deletePredicateVector($3);
-         } else
-             $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
--        PARSER->deleteString($2);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($2);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -260,6 +260,6 @@
-             $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
- 
--        PARSER->deleteString($1);
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->registerNodeTest($$);
-     }
-     |
-@@ -267,6 +267,6 @@
-     {
-         $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
--        PARSER->deleteString($1);        
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->registerNodeTest($$);
-     }
-     |
-@@ -274,7 +274,7 @@
-     {
-         $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
--        PARSER->deleteString($1);        
--        PARSER->deleteString($3);
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->deleteString($3);
-+        parser->registerNodeTest($$);
-     }
-     ;
-@@ -294,6 +294,6 @@
-         $$ = new Vector<Predicate*>;
-         $$->append(new Predicate($1));
--        PARSER->unregisterParseNode($1);
--        PARSER->registerPredicateVector($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerPredicateVector($$);
-     }
-     |
-@@ -301,5 +301,5 @@
-     {
-         $$->append(new Predicate($2));
--        PARSER->unregisterParseNode($2);
-+        parser->unregisterParseNode($2);
-     }
-     ;
-@@ -316,5 +316,5 @@
-     {
-         $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -324,5 +324,5 @@
-     {
-         $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -330,5 +330,5 @@
-     {
-         $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -338,6 +338,6 @@
-     {
-         $$ = new VariableReference(*$1);
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -350,6 +350,6 @@
-     {
-         $$ = new StringExpression(*$1);
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -357,6 +357,6 @@
-     {
-         $$ = new Number($1->toDouble());
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -370,6 +370,6 @@
-         if (!$$)
-             YYABORT;
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -379,7 +379,7 @@
-         if (!$$)
-             YYABORT;
--        PARSER->deleteString($1);
--        PARSER->deleteExpressionVector($3);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->deleteExpressionVector($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -390,6 +390,6 @@
-         $$ = new Vector<Expression*>;
-         $$->append($1);
--        PARSER->unregisterParseNode($1);
--        PARSER->registerExpressionVector($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerExpressionVector($$);
-     }
-     |
-@@ -397,5 +397,5 @@
-     {
-         $$->append($3);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($3);
-     }
-     ;
-@@ -413,7 +413,7 @@
-         $$->addSubExpression($1);
-         $$->addSubExpression($3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -431,7 +431,7 @@
-         $3->setAbsolute(true);
-         $$ = new Path(static_cast<Filter*>($1), $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -441,8 +441,8 @@
-         $3->setAbsolute(true);
-         $$ = new Path(static_cast<Filter*>($1), $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($2);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($2);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -454,7 +454,7 @@
-     {
-         $$ = new Filter($1, *$2);
--        PARSER->unregisterParseNode($1);
--        PARSER->deletePredicateVector($2);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->deletePredicateVector($2);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -466,7 +466,7 @@
-     {
-         $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -478,7 +478,7 @@
-     {
-         $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -490,7 +490,7 @@
-     {
-         $$ = new EqTestOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -502,7 +502,7 @@
-     {
-         $$ = new EqTestOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -514,7 +514,7 @@
-     {
-         $$ = new NumericOp(NumericOp::OP_Add, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -522,7 +522,7 @@
-     {
-         $$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -534,7 +534,7 @@
-     {
-         $$ = new NumericOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -547,6 +547,6 @@
-         $$ = new Negative;
-         $$->addSubExpression($2);
--        PARSER->unregisterParseNode($2);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($2);
-+        parser->registerParseNode($$);
-     }
-     ;
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-bison-3.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-bison-3.patch
deleted file mode 100644
index d3d2477a79e3..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-bison-3.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-can't rely on YYLEX_PARAM calling yylex correctly, so use %lex-param
-instead.  fixes building with bison-3.
-
-https://bugs.gentoo.org/485818
-
---- Source/ThirdParty/ANGLE/src/compiler/glslang.y
-+++ Source/ThirdParty/ANGLE/src/compiler/glslang.y
-@@ -32,6 +32,7 @@
- %expect 1 /* One shift reduce conflict because of if | else */
- %pure-parser
- %parse-param {TParseContext* context}
-+%lex-param {TParseContext* context}
- 
- %union {
-     struct {
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-disable-backtrace-uclibc.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-disable-backtrace-uclibc.patch
deleted file mode 100644
index 618dec1d601e..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-disable-backtrace-uclibc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Anthony Basile <blueness@gentoo.org>
-Date: Sun, 04 Nov 2012 01:51:27 +0000
-
-webkit-gtk fails to build on a uclibc system because
-Source/JavaScriptCore/wtf/Assertions.cpp assumes that all linux systems have
-/usr/include/execinfo.h and provide backtrace().  But uclibc does not.  Its
-straightforward to extend the test to see if its also a uclibc system and not
-include execinfo.h or call backtrace().
-
---- a/Source/JavaScriptCore/wtf/Assertions.cpp
-+++ b/Source/JavaScriptCore/wtf/Assertions.cpp
-@@ -52,7 +52,7 @@
- #include <windows.h>
- #endif
- 
--#if OS(DARWIN) || OS(LINUX)
-+#if OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -249,7 +249,7 @@
- 
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if OS(DARWIN) || OS(LINUX)
-+#if OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)
-     *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
-     // The CaptureStackBackTrace function is available in XP, but it is not defined
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-libdl.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-libdl.patch
deleted file mode 100644
index e422aa413740..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-libdl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=417523
-https://bugs.webkit.org/show_bug.cgi?id=96602
-
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 128398)
-+++ configure.ac	(working copy)
-@@ -268,6 +268,10 @@
- AC_SUBST([OLE32_LIBS])
- 
- 
-+AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
-+AC_SUBST([DLOPEN_LIBS])
-+
-+
- # determine the GTK+ version to use
- AC_MSG_CHECKING([the GTK+ version to use])
- AC_ARG_WITH([gtk],
-@@ -554,7 +558,7 @@
- if test "$enable_webgl" = "yes" ||  test "$with_accelerated_compositing" = "opengl" ; then
-     AC_CHECK_HEADERS([GL/gl.h], [], AC_MSG_ERROR([OpenGL header not found]))
-     AC_CHECK_HEADERS([GL/glx.h], [], AC_MSG_ERROR([GLX header not found]))
--    OPENGL_LIBS="-lGL -ldl"
-+    OPENGL_LIBS="-lGL $DLOPEN_LIBS"
- fi
- AC_SUBST([OPENGL_LIBS])
- 
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-spellchecker.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-spellchecker.patch
deleted file mode 100644
index 5a6c8890b36e..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-spellchecker.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur webkit-1.8.3-ori/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp webkit-1.8.3/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp
---- webkit-1.8.3-ori/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp	2012-12-16 14:58:49.658580218 +0100
-+++ webkit-1.8.3/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp	2012-12-16 14:59:05.546538356 +0100
-@@ -141,7 +141,7 @@
- 
-             for (; dicts; dicts = dicts->next) {
-                 EnchantDict* dict = static_cast<EnchantDict*>(dicts->data);
--                if (enchant_dict_check(dict, word.get(), wordLength)) {
-+                if (enchant_dict_check(dict, word.get(), bytes)) {
-                     *misspellingLocation = start;
-                     *misspellingLength = wordLength;
-                 } else {
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.9.91-libdl.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.9.91-libdl.patch
deleted file mode 100644
index 1ab7a6de3115..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.9.91-libdl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=417523
-https://bugs.webkit.org/show_bug.cgi?id=96602
-
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 128397)
-+++ configure.ac	(working copy)
-@@ -278,6 +278,10 @@
- AC_SUBST([OLE32_LIBS])
- 
- 
-+AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
-+AC_SUBST([DLOPEN_LIBS])
-+
-+
- # determine the GTK+ version to use
- AC_MSG_CHECKING([the GTK+ version to use])
- AC_ARG_WITH([gtk],
-@@ -1124,7 +1128,7 @@
- fi
- 
- if test "$with_acceleration_backend" = "opengl"; then
--    OPENGL_LIBS="-lGL -ldl"
-+    OPENGL_LIBS="-lGL $DLOPEN_LIBS"
- fi
- AC_SUBST([OPENGL_LIBS])
- 
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-freetype-2.5.1.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-freetype-2.5.1.patch
deleted file mode 100644
index 783c226940d1..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-freetype-2.5.1.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -bur Source-Old/WebCore/ChangeLog Source/WebCore/ChangeLog 
---- Source-Old/WebCore/ChangeLog	2013-11-11 20:57:19.000000000 +1100
-+++ Source/WebCore/ChangeLog	2014-01-19 10:57:59.164325097 +1100
-@@ -1,3 +1,19 @@
-+2013-12-02  Andres Gomez  <agomez@igalia.com>
-+
-+        [GTK] Fails to build with freetype 2.5.1
-+        https://bugs.webkit.org/show_bug.cgi?id=125074
-+
-+        Reviewed by Carlos Garcia Campos.
-+
-+        FreeType specifies a canonical way of including their own
-+        headers. Now, we are following this recommendation so the
-+        compilation won't be broken again due to an upgrade in FeeType's
-+        including paths.
-+
-+        * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
-+        * platform/graphics/freetype/SimpleFontDataFreeType.cpp:
-+        * platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp:
-+
- 2013-09-24  Lorenzo Tilve  <ltilve@igalia.com>
- 
-         [GTK] Fix compilation problems when setting ENABLE_DRAG_SUPPORT = FALSE
-diff -bur Source-Old/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
---- Source-Old/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp	2014-01-03 17:02:12.965019204 -0500
-+++ Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp	2014-01-03 17:07:05.353299934 -0500
-@@ -29,6 +29,8 @@
- #include <cairo-ft.h>
- #include <cairo.h>
- #include <fontconfig/fcfreetype.h>
-+#include <ft2build.h>
-+#include FT_TRUETYPE_TABLES_H
- #include <wtf/text/WTFString.h>
- 
- #if !PLATFORM(EFL)
-diff -bur Source-Old/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp
---- Source-Old/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp	2014-01-03 17:02:12.965019204 -0500
-+++ Source/WebCore/platform/graphics/freetype/SimpleFontDataFreeType.cpp	2014-01-03 17:06:34.064841946 -0500
-@@ -43,6 +43,9 @@
- #include <cairo-ft.h>
- #include <cairo.h>
- #include <fontconfig/fcfreetype.h>
-+#include <ft2build.h>
-+#include FT_TRUETYPE_TABLES_H
-+#include FT_TRUETYPE_TAGS_H
- #include <unicode/normlzr.h>
- #include <wtf/MathExtras.h>
- #include <wtf/unicode/Unicode.h>
-diff -bur Source-Old/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp
---- Source-Old/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp	2014-01-03 17:02:12.963019175 -0500
-+++ Source/WebCore/platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp	2014-01-03 17:10:17.954121668 -0500
-@@ -39,8 +39,9 @@
- #include "TextEncoding.h"
- #include <cairo-ft.h>
- #include <cairo.h>
--#include <freetype/freetype.h>
--#include <freetype/tttables.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-+#include FT_TRUETYPE_TABLES_H
- #include <hb.h>
- #include <wtf/text/CString.h>
- 
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-unittests-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-unittests-build.patch
deleted file mode 100644
index 14fa30f33d6a..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-unittests-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 27 Nov 2013 23:36:41 +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,7 @@
- # Libraries and support components
- bin_PROGRAMS :=
- noinst_PROGRAMS :=
-+check_PROGRAMS :=
- libexec_PROGRAMS :=
- noinst_DATA :=
- noinst_HEADERS :=
---- a/Source/WebKit/gtk/GNUmakefile.am
-+++ b/Source/WebKit/gtk/GNUmakefile.am
-@@ -446,7 +446,7 @@ webkit_tests_ldflags = \
- 	-no-fast-install
- 
- if ENABLE_WEBKIT1
--noinst_PROGRAMS += \
-+check_PROGRAMS += \
- 	Programs/unittests/testapplicationcache \
- 	Programs/unittests/testcontextmenu \
- 	Programs/unittests/testdomdocument \
---- a/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
-+++ b/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
-@@ -25,12 +25,12 @@ TEST_PROGS += \
- 	Programs/WebKit2APITests/TestWebKitWebViewGroup \
- 	Programs/WebKit2APITests/TestWebViewEditor
- 
--noinst_PROGRAMS += $(TEST_PROGS)
-+check_PROGRAMS += $(TEST_PROGS)
- 
- if HAVE_ATSPI2
- TEST_PROGS += Programs/WebKit2APITests/TestWebKitAccessibility
- 
--noinst_PROGRAMS += Programs/WebKit2APITests/AccessibilityTestServer
-+check_PROGRAMS += Programs/WebKit2APITests/AccessibilityTestServer
- endif
- 
- webkit2_tests_cppflags = \
--- 
-1.8.3.2
-
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 5785756955e3..b49dc036b1ef 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -9,6 +9,5 @@
 	<flag name='gles2'>Enable GLESv2 support.</flag>
 	<flag name="libsecret">Enable libsecret support to store login credentials</flag>
 	<flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
-	<flag name="webkit2">Enable WebKit2 API that splits web content rendering and application UI into separate processes</flag>
   </use>
 </pkgmetadata>
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild
deleted file mode 100644
index afa6d03cad83..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild
+++ /dev/null
@@ -1,295 +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-1.10.2-r300.ebuild,v 1.18 2014/02/21 06:34:57 pacho Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-any-r1 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"
-KEYWORDS="arm"
-IUSE="aqua coverage debug +geoloc +gstreamer +introspection +jit spell +webgl"
-# bugs 372493, 416331
-REQUIRED_USE="introspection? ( geoloc gstreamer )"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# gtk2 is needed for plugin process support
-# FIXME: with-acceleration-backend is left automagic
-RDEPEND="
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	virtual/jpeg:0=
-	>=media-libs/libpng-1.4:0=
-	>=x11-libs/cairo-1.10:=
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.4:3[aqua=,introspection?]
-	>=dev-libs/icu-3.8.1-r1:=
-	>=net-libs/libsoup-2.39.2:2.4[introspection?]
-	dev-db/sqlite:3=
-	>=x11-libs/pango-1.21
-	x11-libs/libXrender
-	>=x11-libs/gtk+-2.13:2
-
-	geoloc? ( app-misc/geoclue:0 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	spell? ( >=app-text/enchant-0.22:= )
-	webgl? (
-		virtual/opengl
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-# paxctl needed for bug #407085
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/perl
-	|| (
-		virtual/rubygems[ruby_targets_ruby20]
-		virtual/rubygems[ruby_targets_ruby19]
-		virtual/rubygems[ruby_targets_ruby18] )
-	app-accessibility/at-spi2-core
-	>=dev-util/gtk-doc-am-1.10
-	dev-util/gperf
-	sys-devel/bison
-	>=sys-devel/flex-2.5.33
-	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 ) )
-"
-# Need real bison, not yacc
-
-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
-}
-
-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() {
-	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
-
-	# Drop DEPRECATED flags
-	LC_ALL=C sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die
-
-	# Don't force -O2
-	sed -i 's/-O2//g' "${S}"/configure.ac || die
-
-	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
-	if use introspection && use jit; then
-		epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
-		cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
-	fi
-
-	# We need to reset some variables to prevent permissions problems and failures
-	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
-	gnome2_environment_reset
-
-	# XXX: failing tests
-	# https://bugs.webkit.org/show_bug.cgi?id=50744
-	# testkeyevents is interactive
-	# mimehandling test sometimes fails under Xvfb (works fine manually)
-	# datasource test needs a network connection and intermittently fails with icedtea-web
-	# webplugindatabase intermittently fails with icedtea-web
-	# testWebContextGetPlugins calls Programs/WebKitPluginProcess which fails unless webkit-gtk-${PV} is already installed
-	# TestWebKitAPI/TestWebKit2 seems to fail if webkit-gtk-${PV} is not already installed and/or if opengl cannot be initialized
-	sed -e '/Programs\/unittests\/testwebinspector/ d' \
-		-e '/Programs\/unittests\/testkeyevents/ d' \
-		-e '/Programs\/unittests\/testmimehandling/ d' \
-		-e '/Programs\/unittests\/testwebdatasource/ d' \
-		-e '/Programs\/unittests\/testwebplugindatabase/ d' \
-		-i Source/WebKit/gtk/GNUmakefile.am || die
-
-	sed -e '/PluginsTest::add.*testWebContextGetPlugins/ d' \
-		-i Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebContext.cpp || die
-
-	sed -e 's#\(SkippedTest("TestWebKitAPI/TestWebKit2"\).*#\1, None, "skipped by ebuild"),#' \
-		-i Tools/Scripts/run-gtk-tests || die
-
-	if ! use gstreamer; then
-		# webkit2's TestWebKitWebView requires <video> support
-		sed -e '/Programs\/WebKit2APITests\/TestWebKitWebView/ d' \
-			-i Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am || die
-	fi
-	# garbage collection test fails intermittently if icedtea-web is installed
-	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
-
-	# occasional test failure due to additional Xvfb process spawned
-	# TODO epatch "${FILESDIR}/${PN}-1.8.1-tests-xvfb.patch"
-
-	# bug #417523, https://bugs.webkit.org/show_bug.cgi?id=96602
-	epatch "${FILESDIR}/${PN}-1.9.91-libdl.patch"
-
-	# uclibc fix, bug #441674
-	epatch "${FILESDIR}/${PN}-1.10.1-disable-backtrace-uclibc.patch"
-
-	# fix for freebsd for WIFEXITED definition
-	# https://bugs.gentoo.org/show_bug.cgi?id=449220#c17
-	epatch "${FILESDIR}/${PN}-1.10.2-wifexited.patch"
-
-	# patch for gcc 4.8, to disable COMPILE_ASSERT warnings; fixed in 2.0.x
-	# https://bugs.webkit.org/show_bug.cgi?id=113147
-	epatch "${FILESDIR}/${P}-gcc-4.8.patch"
-
-	# patch for -lrt underlinking issue, bug #458164; fixed in 2.0.x
-	epatch "${FILESDIR}/${P}-librt.patch"
-
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# AM_PROG_CC_STDC is obsolete with sys-devel/automake-1.13.1, #467244
-	sed -i -e 's/AM_PROG_CC_STDC/AM_PROG_CC/g' aclocal.m4 || die
-	sed -i -e '/AM_PROG_CC_STDC/d' configure.ac || die
-
-	# Prevent maintainer mode from being triggered during make
-	AT_M4DIR=Source/autotools eautoreconf
-
-	# Ugly hack of a workaround for bizarre paludis behavior, bug #406117
-	# http://paludis.exherbo.org/trac/ticket/1230
-	sed -e '/  --\(en\|dis\)able-dependency-tracking/ d' -i configure || die
-}
-
-src_configure() {
-	# It doesn't compile on alpha without this in LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co.
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	local myconf
-
-	# XXX: Check Web Audio support
-	# XXX: dependency-tracking is required so parallel builds won't fail
-	myconf="
-		$(use_enable coverage)
-		$(use_enable debug)
-		$(use_enable debug debug-features)
-		$(use_enable geoloc geolocation)
-		$(use_enable spell spellcheck)
-		$(use_enable introspection)
-		$(use_enable gstreamer video)
-		$(use_enable jit)
-		$(use_enable webgl)
-		--with-gtk=3.0
-		--with-gstreamer=1.0
-		--enable-accelerated-compositing
-		--enable-dependency-tracking
-		--disable-gtk-doc
-		"$(usex aqua "--with-font-backend=pango --with-target=quartz" "")
-		# Aqua support in gtk3 is untested
-
-	if has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		myconf="${myconf} RUBY=$(type -P ruby20)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then
-		myconf="${myconf} RUBY=$(type -P ruby19)"
-	else
-		myconf="${myconf} RUBY=$(type -P ruby18)"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Avoid parallel make failure with -j9
-	emake DerivedSources/WebCore/JSNode.h
-	default
-}
-
-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() {
-	default
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	prune_libtool_files
-
-	# Prevents crashes on PaX systems
-	use jit && pax-mark m "${ED}usr/bin/jsc-3"
-}
-
-nvidia_check() {
-	if [[ ${MERGE_TYPE} != "binary" ]] &&
-	   use introspection &&
-	   has_version '=x11-drivers/nvidia-drivers-325*' &&
-	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
-	then
-		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
-		eerror "used as the system OpenGL library."
-		eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
-		eerror "Mesa as the system OpenGL library:"
-		eerror " # eselect opengl set xorg-x11"
-		eerror "See https://bugs.gentoo.org/463960 for more details."
-		eerror
-		return 1
-	fi
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild
deleted file mode 100644
index edd065738d39..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r200.ebuild
+++ /dev/null
@@ -1,282 +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-1.8.3-r200.ebuild,v 1.17 2014/02/21 06:34:57 pacho Exp $
-
-EAPI="4"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-any-r1 virtualx
-
-MY_P="webkit-${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"
-KEYWORDS="sparc"
-IUSE="aqua coverage debug +geoloc +gstreamer +introspection +jit spell +webgl"
-# bugs 372493, 416331
-REQUIRED_USE="introspection? ( geoloc gstreamer )"
-
-# use sqlite, svg by default
-# dependency on >=x11-libs/gtk+-2.13:2 for gail
-RDEPEND="
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	virtual/jpeg
-	>=media-libs/libpng-1.4:0
-	>=x11-libs/cairo-1.10
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-2.13:2[aqua=,introspection?]
-	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.37.92:2.4[introspection?]
-	dev-db/sqlite:3
-	>=x11-libs/pango-1.21
-	x11-libs/libXrender
-
-	geoloc? ( app-misc/geoclue:0 )
-
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		>=media-libs/gst-plugins-base-0.10.30:0.10 )
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-
-	spell? ( >=app-text/enchant-0.22 )
-
-	webgl? ( virtual/opengl )
-"
-# paxctl needed for bug #407085
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/perl
-	sys-devel/bison
-	>=sys-devel/flex-2.5.33
-	sys-devel/gettext
-	dev-util/gperf
-	virtual/pkgconfig
-	dev-util/gtk-doc-am
-	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 ) )
-"
-# Need real bison, not yacc
-
-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
-}
-
-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() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
-	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
-	# https://bugs.webkit.org/show_bug.cgi?id=19775
-	# TODO: FAILS TO APPLY!
-	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
-
-	# USE=-gstreamer build failure, bug #412221, https://bugs.webkit.org/show_bug.cgi?id=84526
-	epatch "${FILESDIR}/${PN}-1.8.1-CodeGeneratorGObject-properties.patch"
-
-	# bug #416057; in 1.9.x
-	epatch "${FILESDIR}/${PN}-1.8.1-gst-required-version.patch"
-
-	# bug #428012; in 1.9.x
-	epatch "${FILESDIR}/${PN}-1.8.2-bison-2.6.patch"
-
-	# bug #417523, https://bugs.webkit.org/show_bug.cgi?id=96602
-	epatch "${FILESDIR}/${PN}-1.8.3-libdl.patch"
-
-	# uclibc fix, bug #441674
-	epatch "${FILESDIR}/${PN}-1.8.3-disable-backtrace-uclibc.patch"
-
-	# 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
-
-	# Bug #403049, https://bugs.webkit.org/show_bug.cgi?id=79605
-	epatch "${FILESDIR}/${PN}-1.7.5-linguas.patch"
-
-	# Drop DEPRECATED flags
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die
-
-	# Don't force -O2
-	sed -i 's/-O2//g' "${S}"/configure.ac || die
-
-	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
-	if use introspection && use jit; then
-		epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
-		cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
-	fi
-
-	# We need to reset some variables to prevent permissions problems and failures
-	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
-	gnome2_environment_reset
-
-	# https://bugs.webkit.org/show_bug.cgi?id=79498
-	epatch "${FILESDIR}/${PN}-1.7.90-parallel-make-hack.patch"
-
-	# XXX: failing tests
-	# https://bugs.webkit.org/show_bug.cgi?id=50744
-	# testkeyevents is interactive
-	# mimehandling test sometimes fails under Xvfb (works fine manually)
-	# datasource test needs a network connection and intermittently fails with icedtea-web
-	# webplugindatabase intermittently fails with icedtea-web
-	sed -e '/Programs\/unittests\/testwebinspector/ d' \
-		-e '/Programs\/unittests\/testkeyevents/ d' \
-		-e '/Programs\/unittests\/testmimehandling/ d' \
-		-e '/Programs\/unittests\/testwebdatasource/ d' \
-		-e '/Programs\/unittests\/testwebplugindatabase/ d' \
-		-i Source/WebKit/gtk/GNUmakefile.am || die
-	# garbage collection test fails intermittently if icedtea-web is installed
-	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
-
-	# occasional test failure due to additional Xvfb process spawned
-	epatch "${FILESDIR}/${PN}-1.8.1-tests-xvfb.patch"
-
-	# For >=sys-devel/automake-1.12 compability wrt #420591
-	sed -i -e 's:mkdir_p:MKDIR_P:' {.,Source/WebKit/gtk/po}/GNUmakefile.am || die
-
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Prevent maintainer mode from being triggered during make
-	AT_M4DIR=Source/autotools eautoreconf
-
-	# Ugly hack of a workaround for bizarre paludis behavior, bug #406117
-	# http://paludis.exherbo.org/trac/ticket/1230
-	sed -e '/  --\(en\|dis\)able-dependency-tracking/ d' -i configure || die
-}
-
-src_configure() {
-	# It doesn't compile on alpha without this in LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co.
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	local myconf
-
-	# XXX: Check Web Audio support
-	# XXX: dependency-tracking is required so parallel builds won't fail
-	# WebKit2 can only be built with gtk3
-	# API documentation (gtk-doc) is built in webkit-gtk:3, always disable here
-	myconf="
-		$(use_enable coverage)
-		$(use_enable debug)
-		$(use_enable debug debug-features)
-		$(use_enable geoloc geolocation)
-		$(use_enable spell spellcheck)
-		$(use_enable introspection)
-		$(use_enable gstreamer video)
-		$(use_enable jit)
-		$(use_enable webgl)
-		--enable-web-sockets
-		--with-gtk=2.0
-		--disable-gtk-doc
-		--disable-webkit2
-		--enable-dependency-tracking
-		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Horrible failure of a hack to work around parallel make problems,
-	# see https://bugs.webkit.org/show_bug.cgi?id=79498
-	emake -j1 all-built-sources-local
-	emake all-ltlibraries-local
-	emake all-programs-local
-	use introspection && emake WebKit-1.0.gir
-	emake all-data-local
-	default
-}
-
-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/unittests/test*) \
-		Programs/unittests/.libs/test*
-	unset DISPLAY
-	# Tests need virtualx, bug #294691, bug #310695
-	# Parallel tests sometimes fail
-	Xemake -j1 check
-}
-
-src_install() {
-	default
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	# Remove .la files
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-
-	# 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-325*' &&
-	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
-	then
-		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
-		eerror "used as the system OpenGL library."
-		eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
-		eerror "Mesa as the system OpenGL library:"
-		eerror " # eselect opengl set xorg-x11"
-		eerror "See https://bugs.gentoo.org/463960 for more details."
-		eerror
-		return 1
-	fi
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild
deleted file mode 100644
index e540a7b006b2..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild
+++ /dev/null
@@ -1,292 +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-1.8.3-r201.ebuild,v 1.16 2014/01/29 15:03:56 leio Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-any-r1 virtualx
-
-MY_P="webkit-${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"
-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 +geoloc +gstreamer +introspection +jit spell +webgl"
-# bugs 372493, 416331
-REQUIRED_USE="introspection? ( geoloc gstreamer )"
-
-# use sqlite, svg by default
-# dependency on >=x11-libs/gtk+-2.13:2 for gail
-RDEPEND="
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	virtual/jpeg
-	>=media-libs/libpng-1.4:0=
-	>=x11-libs/cairo-1.10
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-2.13:2[aqua=,introspection?]
-	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.37.92:2.4[introspection?]
-	dev-db/sqlite:3
-	>=x11-libs/pango-1.21
-	x11-libs/libXrender
-	x11-libs/libXt
-
-	geoloc? ( app-misc/geoclue:0 )
-
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		>=media-libs/gst-plugins-base-0.10.30:0.10 )
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-
-	spell? ( >=app-text/enchant-0.22 )
-
-	webgl? ( virtual/opengl )
-"
-# paxctl needed for bug #407085
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/perl
-	sys-devel/bison
-	>=sys-devel/flex-2.5.33
-	sys-devel/gettext
-	dev-util/gperf
-	virtual/pkgconfig
-	dev-util/gtk-doc-am
-	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 ) )
-"
-# Need real bison, not yacc
-
-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
-}
-
-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() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
-	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
-	# https://bugs.webkit.org/show_bug.cgi?id=19775
-	# TODO: FAILS TO APPLY!
-	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
-
-	# USE=-gstreamer build failure, bug #412221, https://bugs.webkit.org/show_bug.cgi?id=84526
-	epatch "${FILESDIR}/${PN}-1.8.1-CodeGeneratorGObject-properties.patch"
-
-	# bug #416057; in 1.9.x
-	epatch "${FILESDIR}/${PN}-1.8.1-gst-required-version.patch"
-
-	# bug #428012; in 1.9.x
-	epatch "${FILESDIR}/${PN}-1.8.2-bison-2.6.patch"
-
-	# bug #417523, https://bugs.webkit.org/show_bug.cgi?id=96602
-	epatch "${FILESDIR}/${PN}-1.8.3-libdl.patch"
-
-	# uclibc fix, bug #441674
-	epatch "${FILESDIR}/${PN}-1.8.3-disable-backtrace-uclibc.patch"
-
-	# 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
-
-	# Bug #403049, https://bugs.webkit.org/show_bug.cgi?id=79605
-	epatch "${FILESDIR}/${PN}-1.7.5-linguas.patch"
-
-	# Bad utf8 data is being passed to enchant_dict_check, bug #447500
-	epatch "${FILESDIR}/${PN}-1.8.3-spellchecker.patch"
-
-	epatch "${FILESDIR}/${PN}-1.8.3-bison-3.patch" #485818
-
-	# Drop DEPRECATED flags
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die
-
-	# Don't force -O2
-	sed -i 's/-O2//g' "${S}"/configure.ac || die
-
-	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
-	if use introspection && use jit; then
-		epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
-		cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
-	fi
-
-	# We need to reset some variables to prevent permissions problems and failures
-	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
-	gnome2_environment_reset
-
-	# https://bugs.webkit.org/show_bug.cgi?id=79498
-	epatch "${FILESDIR}/${PN}-1.7.90-parallel-make-hack.patch"
-
-	# XXX: failing tests
-	# https://bugs.webkit.org/show_bug.cgi?id=50744
-	# testkeyevents is interactive
-	# mimehandling test sometimes fails under Xvfb (works fine manually)
-	# datasource test needs a network connection and intermittently fails with icedtea-web
-	# webplugindatabase intermittently fails with icedtea-web
-	sed -e '/Programs\/unittests\/testwebinspector/ d' \
-		-e '/Programs\/unittests\/testkeyevents/ d' \
-		-e '/Programs\/unittests\/testmimehandling/ d' \
-		-e '/Programs\/unittests\/testwebdatasource/ d' \
-		-e '/Programs\/unittests\/testwebplugindatabase/ d' \
-		-i Source/WebKit/gtk/GNUmakefile.am || die
-
-	# garbage collection test fails intermittently if icedtea-web is installed
-	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
-
-	# occasional test failure due to additional Xvfb process spawned
-	epatch "${FILESDIR}/${PN}-1.8.1-tests-xvfb.patch"
-
-	# For >=sys-devel/automake-1.12 compability wrt #420591
-	sed -i -e 's:mkdir_p:MKDIR_P:' {.,Source/WebKit/gtk/po}/GNUmakefile.am || die
-
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# AM_PROG_CC_STDC is obsolete with sys-devel/automake-1.13.1, #467244
-	sed -i -e 's/AM_PROG_CC_STDC/AM_PROG_CC/g' aclocal.m4 || die
-	sed -i -e '/AM_PROG_CC_STDC/d' configure.ac || die
-
-	# Prevent maintainer mode from being triggered during make
-	AT_M4DIR=Source/autotools eautoreconf
-
-	# Ugly hack of a workaround for bizarre paludis behavior, bug #406117
-	# http://paludis.exherbo.org/trac/ticket/1230
-	sed -e '/  --\(en\|dis\)able-dependency-tracking/ d' -i configure || die
-}
-
-src_configure() {
-	# It doesn't compile on alpha without this in LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co.
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	local myconf
-
-	# XXX: Check Web Audio support
-	# XXX: dependency-tracking is required so parallel builds won't fail
-	# WebKit2 can only be built with gtk3
-	# API documentation (gtk-doc) is built in webkit-gtk:3, always disable here
-	myconf="
-		$(use_enable coverage)
-		$(use_enable debug)
-		$(use_enable debug debug-features)
-		$(use_enable geoloc geolocation)
-		$(use_enable spell spellcheck)
-		$(use_enable introspection)
-		$(use_enable gstreamer video)
-		$(use_enable jit)
-		$(use_enable webgl)
-		--enable-web-sockets
-		--with-gtk=2.0
-		--disable-gtk-doc
-		--disable-webkit2
-		--enable-dependency-tracking
-		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Horrible failure of a hack to work around parallel make problems,
-	# see https://bugs.webkit.org/show_bug.cgi?id=79498
-	emake -j1 all-built-sources-local
-	emake all-ltlibraries-local
-	emake all-programs-local
-	use introspection && emake WebKit-1.0.gir
-	emake all-data-local
-	default
-}
-
-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/unittests/test*) \
-		Programs/unittests/.libs/test*
-	unset DISPLAY
-	# Tests need virtualx, bug #294691, bug #310695
-	# Parallel tests sometimes fail
-	Xemake -j1 check
-}
-
-src_install() {
-	default
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	prune_libtool_files
-
-	# 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-325*' &&
-	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
-	then
-		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
-		eerror "used as the system OpenGL library."
-		eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
-		eerror "Mesa as the system OpenGL library:"
-		eerror " # eselect opengl set xorg-x11"
-		eerror "See https://bugs.gentoo.org/463960 for more details."
-		eerror
-		return 1
-	fi
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild
deleted file mode 100644
index 1c83a815839d..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild
+++ /dev/null
@@ -1,296 +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-1.8.3-r300.ebuild,v 1.17 2014/01/29 15:03:56 leio Exp $
-
-EAPI="4"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-any-r1 virtualx
-
-MY_P="webkit-${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"
-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 doc +geoloc +gstreamer +introspection +jit spell +webgl webkit2"
-# bugs 372493, 416331
-REQUIRED_USE="introspection? ( geoloc gstreamer )"
-
-# use sqlite, svg by default
-# dependency on >=x11-libs/gtk+-2.13:2 for gail
-# Aqua support in gtk3 is untested
-# gtk2 is needed for plugin process support
-RDEPEND="
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	virtual/jpeg
-	>=media-libs/libpng-1.4:0
-	>=x11-libs/cairo-1.10
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.4:3[aqua=,introspection?]
-	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.37.92:2.4[introspection?]
-	dev-db/sqlite:3
-	>=x11-libs/pango-1.21
-	x11-libs/libXrender
-	x11-libs/libXt
-
-	geoloc? ( app-misc/geoclue:0 )
-
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		>=media-libs/gst-plugins-base-0.10.30:0.10 )
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-
-	spell? ( >=app-text/enchant-0.22 )
-
-	webgl? ( virtual/opengl )
-
-	webkit2? ( >=x11-libs/gtk+-2.13:2 )
-"
-# paxctl needed for bug #407085
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/perl
-	sys-devel/bison
-	>=sys-devel/flex-2.5.33
-	sys-devel/gettext
-	dev-util/gperf
-	virtual/pkgconfig
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	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 ) )
-	webkit2? ( app-accessibility/at-spi2-core )
-"
-# Need real bison, not yacc
-
-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
-}
-
-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() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
-	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
-	# https://bugs.webkit.org/show_bug.cgi?id=19775
-	# TODO: FAILS TO APPLY!
-	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
-
-	# webkit2 build failure with gcc-4.5, bug #412027
-	epatch "${FILESDIR}/${PN}-1.8.0-typedef-WebKitWebView.patch"
-
-	# USE=-gstreamer build failure, bug #412221, https://bugs.webkit.org/show_bug.cgi?id=84526
-	epatch "${FILESDIR}/${PN}-1.8.1-CodeGeneratorGObject-properties.patch"
-
-	# bug #416057; in 1.9.x
-	epatch "${FILESDIR}/${PN}-1.8.1-gst-required-version.patch"
-
-	# bug #428012; in 1.9.x
-	epatch "${FILESDIR}/${PN}-1.8.2-bison-2.6.patch"
-
-	# bug #417523, https://bugs.webkit.org/show_bug.cgi?id=96602
-	epatch "${FILESDIR}/${PN}-1.8.3-libdl.patch"
-
-	# uclibc fix, bug #441674
-	epatch "${FILESDIR}/${PN}-1.8.3-disable-backtrace-uclibc.patch"
-
-	# 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
-
-	# Bug #403049, https://bugs.webkit.org/show_bug.cgi?id=79605
-	epatch "${FILESDIR}/${PN}-1.7.5-linguas.patch"
-
-	epatch "${FILESDIR}/${PN}-1.8.3-bison-3.patch" #485818
-
-	# Drop DEPRECATED flags
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die
-
-	# Don't force -O2
-	sed -i 's/-O2//g' "${S}"/configure.ac || die
-
-	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
-	if use introspection && use jit; then
-		epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
-		cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
-	fi
-
-	# We need to reset some variables to prevent permissions problems and failures
-	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
-	gnome2_environment_reset
-
-	# https://bugs.webkit.org/show_bug.cgi?id=79498
-	epatch "${FILESDIR}/${PN}-1.7.90-parallel-make-hack.patch"
-
-	# XXX: failing tests
-	# https://bugs.webkit.org/show_bug.cgi?id=50744
-	# testkeyevents is interactive
-	# mimehandling test sometimes fails under Xvfb (works fine manually)
-	# datasource test needs a network connection and intermittently fails with icedtea-web
-	# webplugindatabase intermittently fails with icedtea-web
-	sed -e '/Programs\/unittests\/testwebinspector/ d' \
-		-e '/Programs\/unittests\/testkeyevents/ d' \
-		-e '/Programs\/unittests\/testmimehandling/ d' \
-		-e '/Programs\/unittests\/testwebdatasource/ d' \
-		-e '/Programs\/unittests\/testwebplugindatabase/ d' \
-		-i Source/WebKit/gtk/GNUmakefile.am || die
-	# FIXME: TestWebKitWebView always fails for webkit-gtk-1.8.2-r300. Why?
-	# if ! use gstreamer; then
-		# webkit2's TestWebKitWebView requires <video> support
-		sed -e '/Programs\/WebKit2APITests\/TestWebKitWebView/ d' \
-			-i Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am || die
-	# fi
-	# garbage collection test fails intermittently if icedtea-web is installed
-	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
-
-	# occasional test failure due to additional Xvfb process spawned
-	epatch "${FILESDIR}/${PN}-1.8.1-tests-xvfb.patch"
-
-	# For >=sys-devel/automake-1.12 compability wrt #420591
-	sed -i -e 's:mkdir_p:MKDIR_P:' {.,Source/WebKit/gtk/po}/GNUmakefile.am || die
-
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Prevent maintainer mode from being triggered during make
-	AT_M4DIR=Source/autotools eautoreconf
-
-	# Ugly hack of a workaround for bizarre paludis behavior, bug #406117
-	# http://paludis.exherbo.org/trac/ticket/1230
-	sed -e '/  --\(en\|dis\)able-dependency-tracking/ d' -i configure || die
-}
-
-src_configure() {
-	# It doesn't compile on alpha without this in LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co.
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	local myconf
-
-	# XXX: Check Web Audio support
-	# XXX: dependency-tracking is required so parallel builds won't fail
-	myconf="
-		$(use_enable coverage)
-		$(use_enable debug)
-		$(use_enable debug debug-features)
-		$(use_enable doc gtk-doc)
-		$(use_enable geoloc geolocation)
-		$(use_enable spell spellcheck)
-		$(use_enable introspection)
-		$(use_enable gstreamer video)
-		$(use_enable jit)
-		$(use_enable webgl)
-		$(use_enable webkit2)
-		--enable-web-sockets
-		--with-gtk=3.0
-		--enable-dependency-tracking
-		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
-		# Aqua support in gtk3 is untested
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Horrible failure of a hack to work around parallel make problems,
-	# see https://bugs.webkit.org/show_bug.cgi?id=79498
-	emake -j1 all-built-sources-local
-	emake all-ltlibraries-local
-	emake all-programs-local
-	use introspection && emake WebKit-3.0.gir
-	emake -j1 all-data-local
-	default
-}
-
-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() {
-	default
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	# Remove .la files
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-
-	# Prevents crashes on PaX systems
-	use jit && pax-mark m "${ED}usr/bin/jsc-3"
-}
-
-nvidia_check() {
-	if [[ ${MERGE_TYPE} != "binary" ]] &&
-	   use introspection &&
-	   has_version '=x11-drivers/nvidia-drivers-325*' &&
-	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
-	then
-		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
-		eerror "used as the system OpenGL library."
-		eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
-		eerror "Mesa as the system OpenGL library:"
-		eerror " # eselect opengl set xorg-x11"
-		eerror "See https://bugs.gentoo.org/463960 for more details."
-		eerror
-		return 1
-	fi
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.5-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.5-r200.ebuild
deleted file mode 100644
index 1fa4f50a6a28..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.5-r200.ebuild
+++ /dev/null
@@ -1,302 +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.5-r200.ebuild,v 1.10 2014/03/09 12:03:40 pacho Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools check-reqs eutils flag-o-matic gnome2-utils 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"
-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"
-# bugs 372493, 416331
-REQUIRED_USE="
-	geoloc? ( introspection )
-	introspection? ( gstreamer )
-	gles2? ( egl )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-"
-
-# 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: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]
-		virtual/rubygems[ruby_targets_ruby18] )
-	>=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() {
-#	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 ! 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() {
-#	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() {
-	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
-
-	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
-	#if use introspection && use jit; then
-	#	epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
-	#	cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
-	#fi
-
-	# We need to reset some variables to prevent permissions problems and failures
-	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
-	gnome2_environment_reset
-
-	# 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
-
-	# Prevent maintainer mode from being triggered during make
-	AT_M4DIR=Source/autotools eautoreconf
-}
-
-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)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then
-		myconf="${myconf} RUBY=$(type -P ruby19)"
-	else
-		myconf="${myconf} RUBY=$(type -P ruby18)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# * dependency-tracking is required so parallel builds won't fail
-	econf \
-		$(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=2.0 \
-		--disable-webkit2 \
-		--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" default
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	prune_libtool_files
-
-	# 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-325*' &&
-#	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
-#	then
-#		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
-#		eerror "used as the system OpenGL library."
-#		eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
-#		eerror "Mesa as the system OpenGL library:"
-#		eerror " # eselect opengl set xorg-x11"
-#		eerror "See https://bugs.gentoo.org/463960 for more details."
-#		eerror
-#		return 1
-#	fi
-#}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.5.ebuild
deleted file mode 100644
index de621d39effa..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.5.ebuild
+++ /dev/null
@@ -1,303 +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.5.ebuild,v 1.10 2014/03/09 12:03:40 pacho Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools check-reqs eutils flag-o-matic gnome2-utils 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="~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"
-# 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]
-		virtual/rubygems[ruby_targets_ruby18] )
-	>=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() {
-#	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 ! 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() {
-#	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() {
-	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
-
-	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
-	#if use introspection && use jit; then
-	#	epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
-	#	cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
-	#fi
-
-	# We need to reset some variables to prevent permissions problems and failures
-	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
-	gnome2_environment_reset
-
-	# 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
-
-	# Prevent maintainer mode from being triggered during make
-	AT_M4DIR=Source/autotools eautoreconf
-}
-
-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)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then
-		myconf="${myconf} RUBY=$(type -P ruby19)"
-	else
-		myconf="${myconf} RUBY=$(type -P ruby18)"
-	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
-	econf \
-		$(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" default
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	prune_libtool_files
-
-	# Prevents crashes on PaX systems
-	use jit && pax-mark m "${ED}usr/bin/jsc-3"
-}
-
-#nvidia_check() {
-#	if [[ ${MERGE_TYPE} != "binary" ]] &&
-#	   use introspection &&
-#	   has_version '=x11-drivers/nvidia-drivers-325*' &&
-#	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
-#	then
-#		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers-325.* is"
-#		eerror "used as the system OpenGL library."
-#		eerror "You can either update to >=nvidia-drivers-331.13, or temporarily select"
-#		eerror "Mesa as the system OpenGL library:"
-#		eerror " # eselect opengl set xorg-x11"
-#		eerror "See https://bugs.gentoo.org/463960 for more details."
-#		eerror
-#		return 1
-#	fi
-#}
author	Pacho Ramos <pacho@gentoo.org>	2014-04-27 08:46:00 +0000
committer	Pacho Ramos <pacho@gentoo.org>	2014-04-27 08:46:00 +0000
commit	785e2b2b3fb29540c2b47383cf6075488f8daaad (patch)
tree	81557b8c05e15f7d8fdf20e6d40298d8e422e915 /net-libs/webkit-gtk
parent	drop old (diff)
download	historical-785e2b2b3fb29540c2b47383cf6075488f8daaad.tar.gz historical-785e2b2b3fb29540c2b47383cf6075488f8daaad.tar.bz2 historical-785e2b2b3fb29540c2b47383cf6075488f8daaad.zip