new version, remove as-needed patch since it was applied in this version. remove old versions

(Portage version: 2.1.1_pre1-r2)
 (Unsigned Manifest commit)

8 files changed, 30 insertions, 299 deletions

diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index c4e43597df09..1d600e3a3c1f 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,71 +1,57 @@
-AUX epiphany-1.6.0-fix_includes.patch 519 RMD160 1e34df540c5a6a611e9b37c3c94efaf9d36deca0 SHA1 385eb170a62a4f43516ed0da8ea78d956427282c SHA256 00746c1fd2ca4b92bd9d61f9ead21e10fc5a63243ca17999b4d62af4456567f2 size 519
+AUX epiphany-1.6.0-fix_includes.patch 519 RMD160 1e34df540c5a6a611e9b37c3c94efaf9d36deca0 SHA1 385eb170a62a4f43516ed0da8ea78d956427282c SHA256 00746c1fd2ca4b92bd9d61f9ead21e10fc5a63243ca17999b4d62af4456567f2
 MD5 c1fc78ef3e0793861e74799bbcb6238c files/epiphany-1.6.0-fix_includes.patch 519
 RMD160 1e34df540c5a6a611e9b37c3c94efaf9d36deca0 files/epiphany-1.6.0-fix_includes.patch 519
 SHA256 00746c1fd2ca4b92bd9d61f9ead21e10fc5a63243ca17999b4d62af4456567f2 files/epiphany-1.6.0-fix_includes.patch 519
-AUX epiphany-1.6.0-view_source.patch 11178 RMD160 94f67d146ada89789f67e2bb49748ed14538ee42 SHA1 35384073ad42a803ee56335148a8a1d5f0eb2d01 SHA256 75d6d9b5e70ef676f1d61ffdd6ed1cf2897e700c5d4fc030a44096ac42a143e3 size 11178
+AUX epiphany-1.6.0-view_source.patch 11178 RMD160 94f67d146ada89789f67e2bb49748ed14538ee42 SHA1 35384073ad42a803ee56335148a8a1d5f0eb2d01 SHA256 75d6d9b5e70ef676f1d61ffdd6ed1cf2897e700c5d4fc030a44096ac42a143e3
 MD5 a9590e1794335ecb9fb376a3b128570b files/epiphany-1.6.0-view_source.patch 11178
 RMD160 94f67d146ada89789f67e2bb49748ed14538ee42 files/epiphany-1.6.0-view_source.patch 11178
 SHA256 75d6d9b5e70ef676f1d61ffdd6ed1cf2897e700c5d4fc030a44096ac42a143e3 files/epiphany-1.6.0-view_source.patch 11178
-AUX epiphany-1.6.0-wallet_fix.patch 598 RMD160 ae79eb7e03b2dc23293d79af0fc01f5a303dc6df SHA1 109a8cd3a9389acabbde5fbdb457e57ef642da23 SHA256 99fd4de0919055aca6309629ec733262f8e45cc2d5d0ec5cb46aada2ad82067e size 598
+AUX epiphany-1.6.0-wallet_fix.patch 598 RMD160 ae79eb7e03b2dc23293d79af0fc01f5a303dc6df SHA1 109a8cd3a9389acabbde5fbdb457e57ef642da23 SHA256 99fd4de0919055aca6309629ec733262f8e45cc2d5d0ec5cb46aada2ad82067e
 MD5 40c2cd3b20e5f2847e868edbc4f58915 files/epiphany-1.6.0-wallet_fix.patch 598
 RMD160 ae79eb7e03b2dc23293d79af0fc01f5a303dc6df files/epiphany-1.6.0-wallet_fix.patch 598
 SHA256 99fd4de0919055aca6309629ec733262f8e45cc2d5d0ec5cb46aada2ad82067e files/epiphany-1.6.0-wallet_fix.patch 598
-AUX epiphany-1.6.0-wallet_password.patch 1307 RMD160 f4d958ca3bbb0d2e4a12d1d4dc4d3fe94c88bc52 SHA1 59e3d1104962219b0ec7d8d94eddefbc0a3b970a SHA256 1e883ce76645d6293019a65282f2312223a5516473ad9e2f7483fd64af138f8f size 1307
+AUX epiphany-1.6.0-wallet_password.patch 1307 RMD160 f4d958ca3bbb0d2e4a12d1d4dc4d3fe94c88bc52 SHA1 59e3d1104962219b0ec7d8d94eddefbc0a3b970a SHA256 1e883ce76645d6293019a65282f2312223a5516473ad9e2f7483fd64af138f8f
 MD5 2a6d9343d321b67fb737cb87301facfc files/epiphany-1.6.0-wallet_password.patch 1307
 RMD160 f4d958ca3bbb0d2e4a12d1d4dc4d3fe94c88bc52 files/epiphany-1.6.0-wallet_password.patch 1307
 SHA256 1e883ce76645d6293019a65282f2312223a5516473ad9e2f7483fd64af138f8f files/epiphany-1.6.0-wallet_password.patch 1307
-AUX epiphany-1.6.3-fix_includes.patch 369 RMD160 c5819d9d146ef60cb70b0e8c6bfa21d113e3e58e SHA1 ef4539e61db1f1e3f0ab686db694e4241ef070e2 SHA256 41b4cf39d1efeb2b865b287729f3f1134ab572c2547434f65a1ffec3b680c24f size 369
+AUX epiphany-1.6.3-fix_includes.patch 369 RMD160 c5819d9d146ef60cb70b0e8c6bfa21d113e3e58e SHA1 ef4539e61db1f1e3f0ab686db694e4241ef070e2 SHA256 41b4cf39d1efeb2b865b287729f3f1134ab572c2547434f65a1ffec3b680c24f
 MD5 3e5d6d82d44078ec1c95566207f9bad1 files/epiphany-1.6.3-fix_includes.patch 369
 RMD160 c5819d9d146ef60cb70b0e8c6bfa21d113e3e58e files/epiphany-1.6.3-fix_includes.patch 369
 SHA256 41b4cf39d1efeb2b865b287729f3f1134ab572c2547434f65a1ffec3b680c24f files/epiphany-1.6.3-fix_includes.patch 369
-AUX epiphany-1.9.2-broken-firefox.patch 563 RMD160 ae6d867b1168ef98b2c50bcc2002f5fb088da7c8 SHA1 1628d707e8aff03dd3992f9db30e2189ff7e2197 SHA256 7012e6b2dcc15eea073be4e082f79ad549840216f315f339271539b9c469775e size 563
+AUX epiphany-1.9.2-broken-firefox.patch 563 RMD160 ae6d867b1168ef98b2c50bcc2002f5fb088da7c8 SHA1 1628d707e8aff03dd3992f9db30e2189ff7e2197 SHA256 7012e6b2dcc15eea073be4e082f79ad549840216f315f339271539b9c469775e
 MD5 9bff9c987534a9f2cbefa291a28affe7 files/epiphany-1.9.2-broken-firefox.patch 563
 RMD160 ae6d867b1168ef98b2c50bcc2002f5fb088da7c8 files/epiphany-1.9.2-broken-firefox.patch 563
 SHA256 7012e6b2dcc15eea073be4e082f79ad549840216f315f339271539b9c469775e files/epiphany-1.9.2-broken-firefox.patch 563
-AUX epiphany-2.14.1-as-needed.patch 883 RMD160 0cf6604205f6a2237c3f894b5d36b4be684c82b6 SHA1 6135c077f37c257aedf81d556b9456d0d8585a62 SHA256 c7a4bc19998c7f0dedd1d732e9d1e553961c6018e2c20200ad77968987d10738 size 883
-MD5 535d3916ce512a2952ebc5998491a35a files/epiphany-2.14.1-as-needed.patch 883
-RMD160 0cf6604205f6a2237c3f894b5d36b4be684c82b6 files/epiphany-2.14.1-as-needed.patch 883
-SHA256 c7a4bc19998c7f0dedd1d732e9d1e553961c6018e2c20200ad77968987d10738 files/epiphany-2.14.1-as-needed.patch 883
-DIST epiphany-1.6.0.tar.bz2 2983514 RMD160 2b8670023b5a8f2c20c03ee3c69a5b3cbbd35b35 SHA256 465f7cffb494e71f5dfd31233cef86c09413b878765f6607f1fb64a49793120b size 2983514
-DIST epiphany-1.6.3.tar.bz2 3021173 RMD160 fce6c356abe8aeb923ea974b4b959af6a9e47d4f SHA256 b0d432501523069196d5716be8750267098928702d9eca5ae7a5649d54b51367 size 3021173
-DIST epiphany-1.6.4.tar.bz2 3036153 size 3036153
-DIST epiphany-1.8.2.tar.bz2 3354620 RMD160 8fcc70a936a55ac33ef716f83b12ff6609110042 SHA256 b254c631a4949031d60a039f6d5b385a1ee3330f975eef827b7af5adfbeef13b size 3354620
-DIST epiphany-1.8.3.tar.bz2 3355417 RMD160 f1086c551632ece29f056fad9a409f0e903c6aee SHA256 3f5b5f750ba05f8baa44b598d732a94b105dde2c42bd110c1d98ddfca41b8ab5 size 3355417
-DIST epiphany-1.8.4.1.tar.bz2 3360178 RMD160 de5e4f6bfed1269300145c015fea34b03238a771 SHA256 ccdcfddbd0dfaa5eeca57e868c3b77c90369bb1126eaa0175efeee823e67f112 size 3360178
-DIST epiphany-2.14.1.tar.bz2 3520979 RMD160 bb755beacab63470381daf32b9d25cf74886e80e SHA256 4eb5f8f8dacc81f47c54e3a579af3059cca3a7fa59d6cc270ed5b50d0b6a37a2 size 3520979
-EBUILD epiphany-1.6.0-r3.ebuild 1539 RMD160 7e1d0d366702dbe9efb6f732c64b5d35e9e9cd61 SHA1 c4c7ed5e8d902fd10a64c7c5cd580a1d1abca325 SHA256 336e83e2fe1e9dc7c79f4aaeb5380da5120bba74b713351a6bbed2c696df17ae size 1539
+DIST epiphany-1.6.0.tar.bz2 2983514 RMD160 2b8670023b5a8f2c20c03ee3c69a5b3cbbd35b35 SHA256 465f7cffb494e71f5dfd31233cef86c09413b878765f6607f1fb64a49793120b
+DIST epiphany-1.6.3.tar.bz2 3021173 RMD160 fce6c356abe8aeb923ea974b4b959af6a9e47d4f SHA1 1a1d26526dc5ae455dde12fc5c6b9f7326139d3e SHA256 b0d432501523069196d5716be8750267098928702d9eca5ae7a5649d54b51367
+DIST epiphany-1.6.4.tar.bz2 3036153 RMD160 a37e7d2f3ea606fbf114afe25ad690fbd71249c7 SHA1 de2e38752ff5ae557817090cf5e11ca4d2e5c685 SHA256 ac122a7c8a3f4916b58f2b3f7d2c44cbdd7070680c06548b5affe2af5501303d
+DIST epiphany-1.8.4.1.tar.bz2 3360178 RMD160 de5e4f6bfed1269300145c015fea34b03238a771 SHA1 1651f328351469fbdcdd9aaa3ba7ab6c58016274 SHA256 ccdcfddbd0dfaa5eeca57e868c3b77c90369bb1126eaa0175efeee823e67f112
+DIST epiphany-2.14.2.1.tar.bz2 3599395 RMD160 c25bc2d22fee0eeaa32ce1e1f71b6d5f3de06cbb SHA1 c1b20979670755f2e82beedb475c42a54be8f993 SHA256 f5cc3aa382fb9b0eec4117dcbfb5a7744943602d1a76bf260c7e5c66741ee6d0
+EBUILD epiphany-1.6.0-r3.ebuild 1539 RMD160 7e1d0d366702dbe9efb6f732c64b5d35e9e9cd61 SHA1 c4c7ed5e8d902fd10a64c7c5cd580a1d1abca325 SHA256 336e83e2fe1e9dc7c79f4aaeb5380da5120bba74b713351a6bbed2c696df17ae
 MD5 5ef08e685400da84661b9f037d81a668 epiphany-1.6.0-r3.ebuild 1539
 RMD160 7e1d0d366702dbe9efb6f732c64b5d35e9e9cd61 epiphany-1.6.0-r3.ebuild 1539
 SHA256 336e83e2fe1e9dc7c79f4aaeb5380da5120bba74b713351a6bbed2c696df17ae epiphany-1.6.0-r3.ebuild 1539
-EBUILD epiphany-1.6.3.ebuild 1387 RMD160 e0744c736c7a578945d78cfd1f356c490b50df75 SHA1 c6c509b78804d642a3a8d8b958cdb3e1296a0dcc SHA256 e1e2656f5aa21364867f730d837508a9bb2414f0973a10c9eb0a5f08c7481c4b size 1387
+EBUILD epiphany-1.6.3.ebuild 1387 RMD160 e0744c736c7a578945d78cfd1f356c490b50df75 SHA1 c6c509b78804d642a3a8d8b958cdb3e1296a0dcc SHA256 e1e2656f5aa21364867f730d837508a9bb2414f0973a10c9eb0a5f08c7481c4b
 MD5 d89a18b9e1f3c752a5ea444c4ccfc52f epiphany-1.6.3.ebuild 1387
 RMD160 e0744c736c7a578945d78cfd1f356c490b50df75 epiphany-1.6.3.ebuild 1387
 SHA256 e1e2656f5aa21364867f730d837508a9bb2414f0973a10c9eb0a5f08c7481c4b epiphany-1.6.3.ebuild 1387
-EBUILD epiphany-1.6.4.ebuild 1540 RMD160 4faf12eee0b1bb0fd6f88e614b33c5fa8c9abc23 SHA1 56925854278f9ead60687f40e271a263ac5653ec SHA256 904140f08e369087a3faffc8a20f86cefdec9908779d18d1ae123cf9ef612b0b size 1540
+EBUILD epiphany-1.6.4.ebuild 1540 RMD160 4faf12eee0b1bb0fd6f88e614b33c5fa8c9abc23 SHA1 56925854278f9ead60687f40e271a263ac5653ec SHA256 904140f08e369087a3faffc8a20f86cefdec9908779d18d1ae123cf9ef612b0b
 MD5 4c5adfec221fca880f8114d80bcaf86c epiphany-1.6.4.ebuild 1540
 RMD160 4faf12eee0b1bb0fd6f88e614b33c5fa8c9abc23 epiphany-1.6.4.ebuild 1540
 SHA256 904140f08e369087a3faffc8a20f86cefdec9908779d18d1ae123cf9ef612b0b epiphany-1.6.4.ebuild 1540
-EBUILD epiphany-1.8.2.ebuild 1794 RMD160 5476567bbe84a5574f52e68ffce5e6da7cddad8c SHA1 8da90d391e953d871c183d9a3e44a1733a0096c2 SHA256 b585bab2df110cb28a42e79a691216e33b101f9f5b692baa270f365c6cd1c615 size 1794
-MD5 fd9fa2d2bd4eedbb575ad30d45d423dc epiphany-1.8.2.ebuild 1794
-RMD160 5476567bbe84a5574f52e68ffce5e6da7cddad8c epiphany-1.8.2.ebuild 1794
-SHA256 b585bab2df110cb28a42e79a691216e33b101f9f5b692baa270f365c6cd1c615 epiphany-1.8.2.ebuild 1794
-EBUILD epiphany-1.8.3.ebuild 1818 RMD160 d9cc9915c31f18bc2dc3c7f98a556aa4298d4ef6 SHA1 3928955be9d22fc865e335e0ccec6ce2d463b10c SHA256 534c536c06f4e089fb28a6cc6ea8ef9020961984a5ccf16430f8ddd5fe869446 size 1818
-MD5 d1e4371d7cefccac203c37cb24c5acbc epiphany-1.8.3.ebuild 1818
-RMD160 d9cc9915c31f18bc2dc3c7f98a556aa4298d4ef6 epiphany-1.8.3.ebuild 1818
-SHA256 534c536c06f4e089fb28a6cc6ea8ef9020961984a5ccf16430f8ddd5fe869446 epiphany-1.8.3.ebuild 1818
-EBUILD epiphany-1.8.4.1.ebuild 1817 RMD160 983f69a2ee756c8f0e82d7643337cb2da851e43b SHA1 60d473f3dd7c4cade0ea4a2b1473c7d78204fb56 SHA256 df7e9556413855c1f6ce1fe87668e9a22523311195b0ac85c509da5559ad9996 size 1817
+EBUILD epiphany-1.8.4.1.ebuild 1817 RMD160 983f69a2ee756c8f0e82d7643337cb2da851e43b SHA1 60d473f3dd7c4cade0ea4a2b1473c7d78204fb56 SHA256 df7e9556413855c1f6ce1fe87668e9a22523311195b0ac85c509da5559ad9996
 MD5 8a9d604bd0df162154fc85372470052c epiphany-1.8.4.1.ebuild 1817
 RMD160 983f69a2ee756c8f0e82d7643337cb2da851e43b epiphany-1.8.4.1.ebuild 1817
 SHA256 df7e9556413855c1f6ce1fe87668e9a22523311195b0ac85c509da5559ad9996 epiphany-1.8.4.1.ebuild 1817
-EBUILD epiphany-2.14.1-r1.ebuild 2331 RMD160 3e52fff70c6c20f24750a7c536e7627f446e3184 SHA1 b4d92056aea403c488458da218a6abf5bdd0c8c3 SHA256 60d2dfe0cdf9478f13a5794cf7037c6faf93f73106273399db12abfa52b32e46 size 2331
-MD5 5613e275a68c9d73c2bb02b4142c3af7 epiphany-2.14.1-r1.ebuild 2331
-RMD160 3e52fff70c6c20f24750a7c536e7627f446e3184 epiphany-2.14.1-r1.ebuild 2331
-SHA256 60d2dfe0cdf9478f13a5794cf7037c6faf93f73106273399db12abfa52b32e46 epiphany-2.14.1-r1.ebuild 2331
-MISC ChangeLog 21363 RMD160 2bf6f488b52e16fdd26185f7d8594a2555f14bd8 SHA1 8c8927b16867a170c9ecd23c5562976bd0c211f6 SHA256 f7a6edf66f53d4c85285fc25ca5e8aa41f3327f5b8f37c16cb2c7838533f8264 size 21363
-MD5 f6ae38319caffb8cf77541f22e28fcc3 ChangeLog 21363
-RMD160 2bf6f488b52e16fdd26185f7d8594a2555f14bd8 ChangeLog 21363
-SHA256 f7a6edf66f53d4c85285fc25ca5e8aa41f3327f5b8f37c16cb2c7838533f8264 ChangeLog 21363
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 size 158
+EBUILD epiphany-2.14.2.1.ebuild 2289 RMD160 303aba48ab790381229f1fb25fd3d607b353e5a9 SHA1 028daa585266361b9b83f1dc0d5c5bba37cf25a8 SHA256 3aef9532722e1585572971ac1ef6bb6fa7dddc4702009ae676103e985fd6214e
+MD5 9e17791167fdfe60117e7c7d897264f9 epiphany-2.14.2.1.ebuild 2289
+RMD160 303aba48ab790381229f1fb25fd3d607b353e5a9 epiphany-2.14.2.1.ebuild 2289
+SHA256 3aef9532722e1585572971ac1ef6bb6fa7dddc4702009ae676103e985fd6214e epiphany-2.14.2.1.ebuild 2289
+MISC ChangeLog 21701 RMD160 eb393862768c1ec9999564e6aa6ecbea86a4100b SHA1 a62ce95ad3358f49c40037aa0d1262ce5bfb3635 SHA256 ffd3300afebeaf0c251d92b339f743d2e97143c4979fc85eee8dfbfb43c437e4
+MD5 a8ba92617e58b8d7cc2fe3bc52b071dd ChangeLog 21701
+RMD160 eb393862768c1ec9999564e6aa6ecbea86a4100b ChangeLog 21701
+SHA256 ffd3300afebeaf0c251d92b339f743d2e97143c4979fc85eee8dfbfb43c437e4 ChangeLog 21701
+MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
@@ -75,18 +61,12 @@ SHA256 450ab114c51b1ff75be09a162244b0c43ffdb701567081a1241e744294dfcc65 files/di
 MD5 bf3c2df87a36c6f75c8a7d787a04a86e files/digest-epiphany-1.6.3 250
 RMD160 753f216451981ee6dccdd0b7e5b9bb52111e965a files/digest-epiphany-1.6.3 250
 SHA256 87046078d64dc3913bd6f70f9c779142782f68df1b587f9639b62516a0db34df files/digest-epiphany-1.6.3 250
-MD5 f5e29a6e660b776ab387ee60f32007da files/digest-epiphany-1.6.4 68
-RMD160 1d9fdbfd683a39e55eb6fd216ce9657e14dcb5b7 files/digest-epiphany-1.6.4 68
-SHA256 c3229eb1243786ad9c48120f8f65309219b216fa3080b901d8fd552c0b6fe8b8 files/digest-epiphany-1.6.4 68
-MD5 2e9c2790594b0a532a7b53cb8c4c33d4 files/digest-epiphany-1.8.2 250
-RMD160 941e2fc62e9df75981f45cdc09e7b09120589e41 files/digest-epiphany-1.8.2 250
-SHA256 11ad77afbc4d43742b9e519a169da4ecadf73be32c7c63bed4aa3b0e6ec47b18 files/digest-epiphany-1.8.2 250
-MD5 87de5c6695ecc1626278f3a8dafb0acb files/digest-epiphany-1.8.3 250
-RMD160 d0eb6f54a61804575b9d0e5106a44a1f739d34ad files/digest-epiphany-1.8.3 250
-SHA256 3194daec5c4e995c4ef229b7843caae8a2914024a56ac8cc6ba501e0b16ba527 files/digest-epiphany-1.8.3 250
+MD5 ef48b9386235d055c8625f674bb7fdb1 files/digest-epiphany-1.6.4 250
+RMD160 f4dfdfff90d0fb9535f44b247b516c6bef9a5730 files/digest-epiphany-1.6.4 250
+SHA256 bfa978106ebbef8d95c3274f9937c0e544cc8759c1adf5d488388171c2b63f92 files/digest-epiphany-1.6.4 250
 MD5 c1c5c058f46fd7d3f0993a3799bf6883 files/digest-epiphany-1.8.4.1 256
 RMD160 b45f694013b20ef2e4e632eb5b6e0b01cefdace7 files/digest-epiphany-1.8.4.1 256
 SHA256 fc4db14b7380baa26e2ac416baa0a6c00a52f44f0285387c798331ab3017fec5 files/digest-epiphany-1.8.4.1 256
-MD5 6d783a7edc5fa85710893a6d992bf897 files/digest-epiphany-2.14.1-r1 253
-RMD160 5ab6497c2b5870e7c841ec707004eaa7e0a20412 files/digest-epiphany-2.14.1-r1 253
-SHA256 bc07fba6c17f10159930aaa2f91c8d34231f477de1a3c6ddb4f8931c7c159a72 files/digest-epiphany-2.14.1-r1 253
+MD5 e6eb99ca8a49bae736e8fd92ebe755d6 files/digest-epiphany-2.14.2.1 259
+RMD160 5b77b67a96fe85ed11d22ded151f911dfd3b65c5 files/digest-epiphany-2.14.2.1 259
+SHA256 ae3d6849d636421f6c7694df3e227277d6badaf54579154868b78ea559c9fb19 files/digest-epiphany-2.14.2.1 259
diff --git a/www-client/epiphany/epiphany-1.8.2.ebuild b/www-client/epiphany/epiphany-1.8.2.ebuild
deleted file mode 100644
index 7608defac58c..000000000000
--- a/www-client/epiphany/epiphany-1.8.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.8.2.ebuild,v 1.5 2005/12/26 15:27:05 kloeri Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="dbus doc firefox python"
-
-# Note that there is no libgnomeprint dep, while it is 
-# specified in configure.in . This could in some rare
-# situations break portage dep resolution.
-#
-# Marinus <foser@gentoo.org> 14-9-2005
-
-RDEPEND=">=dev-libs/glib-2.8
-	>=x11-libs/gtk+-2.8.3
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/gnome-vfs-2.9.2
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/gnome-desktop-2.9.91
-	>=x11-libs/startup-notification-0.5
-	>=gnome-base/libgnomeprintui-2.4
-	>=gnome-base/libbonobo-2
-	>=gnome-base/orbit-2
-	>=gnome-base/gconf-2
-	>=app-text/iso-codes-0.35
-	!firefox? ( >=www-client/mozilla-1.7.9 )
-	firefox? ( >=www-client/mozilla-firefox-1.0.5 )
-	dbus? ( >=sys-apps/dbus-0.34 )
-	python? (
-		>=dev-lang/python-2.3
-		>=dev-python/pygtk-2.7.1
-		>=dev-python/gnome-python-2.6 )
-	x11-themes/gnome-icon-theme"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.29
-	app-text/gnome-doc-utils
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-USE_DESTDIR="1"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-
-pkg_setup() {
-	G2CONF="--disable-scrollkeeper \
-		$(use_enable dbus) \
-		$(use_enable python)"
-
-	if use firefox; then
-		G2CONF="${G2CONF} --with-mozilla=firefox"
-	else
-		G2CONF="${G2CONF} --with-mozilla=mozilla"
-	fi
-}
diff --git a/www-client/epiphany/epiphany-1.8.3.ebuild b/www-client/epiphany/epiphany-1.8.3.ebuild
deleted file mode 100644
index 151e15372bda..000000000000
--- a/www-client/epiphany/epiphany-1.8.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.8.3.ebuild,v 1.9 2006/03/10 01:37:44 agriffis Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-IUSE="dbus doc firefox python"
-
-# Note that there is no libgnomeprint dep, while it is 
-# specified in configure.in . This could in some rare
-# situations break portage dep resolution.
-#
-# Marinus <foser@gentoo.org> 14-9-2005
-
-RDEPEND=">=dev-libs/glib-2.8
-	>=x11-libs/gtk+-2.8.3
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/gnome-vfs-2.9.2
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/gnome-desktop-2.9.91
-	>=x11-libs/startup-notification-0.5
-	>=gnome-base/libgnomeprintui-2.4
-	>=gnome-base/libbonobo-2
-	>=gnome-base/orbit-2
-	>=gnome-base/gconf-2
-	>=app-text/iso-codes-0.35
-	!firefox? ( >=www-client/mozilla-1.7.9 )
-	firefox? ( >=www-client/mozilla-firefox-1.0.5 )
-	dbus? ( >=sys-apps/dbus-0.34 )
-	python? (
-		>=dev-lang/python-2.3
-		>=dev-python/pygtk-2.7.1
-		>=dev-python/gnome-python-2.6 )
-	x11-themes/gnome-icon-theme"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.29
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS COPYING.README ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-USE_DESTDIR="1"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-
-pkg_setup() {
-	G2CONF="--disable-scrollkeeper \
-		$(use_enable dbus) \
-		$(use_enable python)"
-
-	if use firefox; then
-		G2CONF="${G2CONF} --with-mozilla=firefox"
-	else
-		G2CONF="${G2CONF} --with-mozilla=mozilla"
-	fi
-}
diff --git a/www-client/epiphany/epiphany-2.14.1-r1.ebuild b/www-client/epiphany/epiphany-2.14.1-r1.ebuild
deleted file mode 100644
index 7f584c7c7b2c..000000000000
--- a/www-client/epiphany/epiphany-2.14.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.14.1-r1.ebuild,v 1.1 2006/05/11 00:32:24 allanonjl Exp $
-
-inherit eutils gnome2 multilib autotools
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc firefox python"
-
-# Note that there is no libgnomeprint dep, while it is 
-# specified in configure.in . This could in some rare
-# situations break portage dep resolution.
-#
-# Marinus <foser@gentoo.org> 14-9-2005
-
-RDEPEND=">=dev-libs/glib-2.8
-	>=x11-libs/gtk+-2.8.3
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/gnome-vfs-2.9.2
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/gnome-desktop-2.9.91
-	>=x11-libs/startup-notification-0.5
-	>=gnome-base/libgnomeprintui-2.4
-	>=gnome-base/libbonobo-2
-	>=gnome-base/orbit-2
-	>=gnome-base/gconf-2
-	>=app-text/iso-codes-0.35
-	!firefox? ( >=www-client/mozilla-1.7.9 )
-	firefox? ( >=www-client/mozilla-firefox-1.0.5 )
-	>=sys-apps/dbus-0.35
-	python? (
-		>=dev-lang/python-2.3
-		>=dev-python/pygtk-2.7.1
-		>=dev-python/gnome-python-2.6 )
-	x11-themes/gnome-icon-theme"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.29
-	app-text/gnome-doc-utils
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	G2CONF="--disable-scrollkeeper \
-		$(use_enable python)"
-
-	if use firefox; then
-		G2CONF="${G2CONF} --with-mozilla=firefox"
-	else
-		G2CONF="${G2CONF} --with-mozilla=mozilla"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	epatch ${FILESDIR}/${PN}-1.9.2-broken-firefox.patch
-	epatch ${FILESDIR}/${P}-as-needed.patch
-
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR=". ${S}/m4" WANT_AUTOCONF="2.59" \
-	eautoreconf || die "Failed to reconfigure"
-}
-
-src_compile() {
-	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat
-	addpredict /usr/$(get_libdir)/mozilla-firefox/components/compreg.dat.tmp
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
-	gnome2_src_compile
-}
diff --git a/www-client/epiphany/files/digest-epiphany-1.8.2 b/www-client/epiphany/files/digest-epiphany-1.8.2
deleted file mode 100644
index ef2a1f3203a6..000000000000
--- a/www-client/epiphany/files/digest-epiphany-1.8.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0a2e479816a1b2845c758e7a5d84a848 epiphany-1.8.2.tar.bz2 3354620
-RMD160 8fcc70a936a55ac33ef716f83b12ff6609110042 epiphany-1.8.2.tar.bz2 3354620
-SHA256 b254c631a4949031d60a039f6d5b385a1ee3330f975eef827b7af5adfbeef13b epiphany-1.8.2.tar.bz2 3354620
diff --git a/www-client/epiphany/files/digest-epiphany-1.8.3 b/www-client/epiphany/files/digest-epiphany-1.8.3
deleted file mode 100644
index c6bab2e6bb15..000000000000
--- a/www-client/epiphany/files/digest-epiphany-1.8.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 317e18f1d415a37d3b9934c106edf34a epiphany-1.8.3.tar.bz2 3355417
-RMD160 f1086c551632ece29f056fad9a409f0e903c6aee epiphany-1.8.3.tar.bz2 3355417
-SHA256 3f5b5f750ba05f8baa44b598d732a94b105dde2c42bd110c1d98ddfca41b8ab5 epiphany-1.8.3.tar.bz2 3355417
diff --git a/www-client/epiphany/files/digest-epiphany-2.14.1-r1 b/www-client/epiphany/files/digest-epiphany-2.14.1-r1
deleted file mode 100644
index 40eb72db6724..000000000000
--- a/www-client/epiphany/files/digest-epiphany-2.14.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 69f9760646b736d953f24442e0e38f7b epiphany-2.14.1.tar.bz2 3520979
-RMD160 bb755beacab63470381daf32b9d25cf74886e80e epiphany-2.14.1.tar.bz2 3520979
-SHA256 4eb5f8f8dacc81f47c54e3a579af3059cca3a7fa59d6cc270ed5b50d0b6a37a2 epiphany-2.14.1.tar.bz2 3520979
diff --git a/www-client/epiphany/files/epiphany-2.14.1-as-needed.patch b/www-client/epiphany/files/epiphany-2.14.1-as-needed.patch
deleted file mode 100644
index 50abe3e2c0e3..000000000000
--- a/www-client/epiphany/files/epiphany-2.14.1-as-needed.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- m4/gecko.m4.orig	2006-05-02 21:06:28.000000000 +0200
-+++ m4/gecko.m4	2006-05-02 21:06:42.000000000 +0200
-@@ -319,9 +319,11 @@
- _SAVE_CPPFLAGS="$CPPFLAGS"
- _SAVE_CXXFLAGS="$CXXFLAGS"
- _SAVE_LDFLAGS="$LDFLAGS"
-+_SAVE_LIBS="$LIBS"
- CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
- CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
--LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom) -Wl,--rpath=$_GECKO_HOME"
-+LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
-+LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
- 
- _GECKO_DISPATCH_INCLUDEDIRS="$2"
- 
-@@ -340,6 +342,7 @@
- CPPFLAGS="$_SAVE_CPPFLAGS"
- CXXFLAGS="$_SAVE_CXXFLAGS"
- LDFLAGS="$_SAVE_LDFLAGS"
-+LIBS="$_SAVE_LIBS"
- 
- AC_LANG_POP([C++])
-