removed all vulernable ebuilds except 1.7.13

(Portage version: 2.1)
 (Unsigned Manifest commit)

19 files changed, 88 insertions, 3675 deletions

diff --git a/www-client/mozilla/Manifest b/www-client/mozilla/Manifest
index 2bc8743dca12..4b52d2593788 100644
--- a/www-client/mozilla/Manifest
+++ b/www-client/mozilla/Manifest
@@ -1,45 +1,112 @@
-MD5 3ef665ab994d221d2bd9f0ba4d297acf ChangeLog 54607
+AUX 010_glibc-2.4.patch 2628 RMD160 77d35dec11624ef1b3ad84d72eb437068cbc9f0f SHA1 0e408a5e7e19b6ed06beed1bc3977b35b109cdba SHA256 5a64ffadb56c3c2316202e57ce82b6439c3037c6f4a5a1d4783d03173741e5cd
 MD5 1bbe55892586ddbce300e5abb134a681 files/010_glibc-2.4.patch 2628
+RMD160 77d35dec11624ef1b3ad84d72eb437068cbc9f0f files/010_glibc-2.4.patch 2628
+SHA256 5a64ffadb56c3c2316202e57ce82b6439c3037c6f4a5a1d4783d03173741e5cd files/010_glibc-2.4.patch 2628
+AUX 1.3/mozilla-1.3-fix-RAW-target.patch 328 RMD160 37834d7eafe6e3bb54867bbaea00a8685132b757 SHA1 42854a10be12544e5fcfeedcda8aba5b5a7f92f5 SHA256 0ad5d45928b057d72dfa29818d74d0048157c8d25ebc063bc023cb8e49bdb449
 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
+RMD160 37834d7eafe6e3bb54867bbaea00a8685132b757 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
+SHA256 0ad5d45928b057d72dfa29818d74d0048157c8d25ebc063bc023cb8e49bdb449 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
+AUX 10mozilla 105 RMD160 cd5910f9e6c07bc36c11ff81b0157709e0b77df0 SHA1 caab49f1bd6771caf6e1907799a1a6169b4f374f SHA256 4b8a060e8e9e20a0d291e72e31006fb924540d9245455f61b97a02854201a42e
 MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
-MD5 02b40068b293c0728318f94a88036276 files/digest-mozilla-1.7.10-r1 1572
-MD5 02b40068b293c0728318f94a88036276 files/digest-mozilla-1.7.10-r2 1572
-MD5 a9e30e22768b09109f1c9aa615fff264 files/digest-mozilla-1.7.10-r3 1560
-MD5 151d28952480dac2bcf3a7c88552b38b files/digest-mozilla-1.7.11 1560
-MD5 151d28952480dac2bcf3a7c88552b38b files/digest-mozilla-1.7.11-r1 1560
-MD5 151d28952480dac2bcf3a7c88552b38b files/digest-mozilla-1.7.11-r2 1560
-MD5 151d28952480dac2bcf3a7c88552b38b files/digest-mozilla-1.7.11-r3 1560
-MD5 4efed08007b248c4956315b5c586c889 files/digest-mozilla-1.7.12-r2 1310
-MD5 4efed08007b248c4956315b5c586c889 files/digest-mozilla-1.7.12-r3 1310
-MD5 d0748fae907f1cba5f5c90e6d91148d0 files/digest-mozilla-1.7.13 360
+RMD160 cd5910f9e6c07bc36c11ff81b0157709e0b77df0 files/10mozilla 105
+SHA256 4b8a060e8e9e20a0d291e72e31006fb924540d9245455f61b97a02854201a42e files/10mozilla 105
+AUX google.src 706 RMD160 083b439d5aeb27cdf35345b043e7cf2cbf92d369 SHA1 462c353b64f8be172be7ca8778e1548ee339a934 SHA256 885e7a1a1ce41c3f199eca193277869d6634dd6fd5efae437d3e809d5b5ac80a
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
+RMD160 083b439d5aeb27cdf35345b043e7cf2cbf92d369 files/google.src 706
+SHA256 885e7a1a1ce41c3f199eca193277869d6634dd6fd5efae437d3e809d5b5ac80a files/google.src 706
+AUX icon/mozilla-icon.png 2350 RMD160 450a78d2d31915eb6b5722125013de7d73c8326a SHA1 57b0ab801e87dfea588dde75ab108350288f39a6 SHA256 6dccb80517b5b58344ec3d668034dd689b1cf7abd7116cc8053c99a988b9c2d6
 MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
+RMD160 450a78d2d31915eb6b5722125013de7d73c8326a files/icon/mozilla-icon.png 2350
+SHA256 6dccb80517b5b58344ec3d668034dd689b1cf7abd7116cc8053c99a988b9c2d6 files/icon/mozilla-icon.png 2350
+AUX icon/mozilla.desktop 153 RMD160 74ab97c01adf6e1b3a91364a7a0cbf072f51bc61 SHA1 285eb23343057263db4a5f4412840519b4032b5f SHA256 ad4f97b5920449e94ad869d7d4d120e8f372870ebcd6d19531fd13044ade8bf3
 MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153
+RMD160 74ab97c01adf6e1b3a91364a7a0cbf072f51bc61 files/icon/mozilla.desktop 153
+SHA256 ad4f97b5920449e94ad869d7d4d120e8f372870ebcd6d19531fd13044ade8bf3 files/icon/mozilla.desktop 153
+AUX mozilla-1.7.11-GLSA105396.patch 4049 RMD160 703ff560d0a5a7d6af56ab78f495805e1fa32a1c SHA1 4bbea317f5afdadb09073e76157cdd3219a13028 SHA256 e9d84f78bf121ae6508fa1732adb3509166498f3369aa856fbab975723ac7f7e
 MD5 787437939618daf271673626f6414b15 files/mozilla-1.7.11-GLSA105396.patch 4049
+RMD160 703ff560d0a5a7d6af56ab78f495805e1fa32a1c files/mozilla-1.7.11-GLSA105396.patch 4049
+SHA256 e9d84f78bf121ae6508fa1732adb3509166498f3369aa856fbab975723ac7f7e files/mozilla-1.7.11-GLSA105396.patch 4049
+AUX mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch 620 RMD160 c0955bf06763d91322e50012487698e4b919e6b9 SHA1 0c87f1e44ed0f72bca8fdf8f64da1b9d719fdd24 SHA256 f801785b303e68439bd781e25038db99d7c753ecfd4e678d4b49ee4419205112
 MD5 bedafc238f92edd9cb98fae3d1af96df files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch 620
+RMD160 c0955bf06763d91322e50012487698e4b919e6b9 files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch 620
+SHA256 f801785b303e68439bd781e25038db99d7c753ecfd4e678d4b49ee4419205112 files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch 620
+AUX mozilla-1.7.12-gtk2xft-link-pangoxft.patch 465 RMD160 eb8d4e5bf83d3997dec93c1e51e4b4b02bdf064e SHA1 044719bfa70f922ef7a73f57c5630b6911d15461 SHA256 e13fdd216f1746ff5c0e217c4f2e763f5b1c6393b54723ea35b5534044b30d9b
 MD5 1f71cb3a30531a90fb7d1d3445588ba6 files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 465
+RMD160 eb8d4e5bf83d3997dec93c1e51e4b4b02bdf064e files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 465
+SHA256 e13fdd216f1746ff5c0e217c4f2e763f5b1c6393b54723ea35b5534044b30d9b files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 465
+AUX mozilla-1.7.12-libart-freetype.patch 2412 RMD160 dfbe1717346ce27d9834d423d890e28fbc165a5f SHA1 fc2d988a00471970e15ef6f307067ee503a1eaa3 SHA256 e0145b919750c0a0c418a1d905863f8b0c24bfb0d6947c92eecb512031b3b601
 MD5 f7930e7f2cba691a9b6654b61ba1217e files/mozilla-1.7.12-libart-freetype.patch 2412
+RMD160 dfbe1717346ce27d9834d423d890e28fbc165a5f files/mozilla-1.7.12-libart-freetype.patch 2412
+SHA256 e0145b919750c0a0c418a1d905863f8b0c24bfb0d6947c92eecb512031b3b601 files/mozilla-1.7.12-libart-freetype.patch 2412
+AUX mozilla-1.7.12-rpath.patch 1752 RMD160 98f66862f7e53d12004f387bf43ece3c4b01763d SHA1 aa1e6b80c8dc79598e00af35c69c35522bb4f664 SHA256 841f46d7d38963dcdc18867cc7baf61c8cafbc6cc9a877cb80ede14e52364b49
 MD5 730bebc28f073d8c08d32c78252445d5 files/mozilla-1.7.12-rpath.patch 1752
+RMD160 98f66862f7e53d12004f387bf43ece3c4b01763d files/mozilla-1.7.12-rpath.patch 1752
+SHA256 841f46d7d38963dcdc18867cc7baf61c8cafbc6cc9a877cb80ede14e52364b49 files/mozilla-1.7.12-rpath.patch 1752
+AUX mozilla-1.7.13-as-needed.patch 305 RMD160 408ef402944928bf263c12ce4a83022cc12a85ef SHA1 9cffbf00d1cc083dea30cf65cb291d93f30d7e29 SHA256 a3c2b79822275455fda2e7ab71a9e4ce29c9f82eb65bd02615b66fd0c9a8e20e
 MD5 a5130ec6f4203ab321d05e7e3452bc68 files/mozilla-1.7.13-as-needed.patch 305
+RMD160 408ef402944928bf263c12ce4a83022cc12a85ef files/mozilla-1.7.13-as-needed.patch 305
+SHA256 a3c2b79822275455fda2e7ab71a9e4ce29c9f82eb65bd02615b66fd0c9a8e20e files/mozilla-1.7.13-as-needed.patch 305
+AUX mozilla-1.7.6-gcc4.patch 1818 RMD160 7be7c0f39933dcad5c45909ef6099ad3a170d40e SHA1 035334857928da20d70c8dbac7f667348f4080dd SHA256 09bf6b2d51c27eccbf3b6c21aafb7f6263b723b3e526419f81a90db7bc203046
 MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818
+RMD160 7be7c0f39933dcad5c45909ef6099ad3a170d40e files/mozilla-1.7.6-gcc4.patch 1818
+SHA256 09bf6b2d51c27eccbf3b6c21aafb7f6263b723b3e526419f81a90db7bc203046 files/mozilla-1.7.6-gcc4.patch 1818
+AUX mozilla-1.7.6-ppc64.patch 3651 RMD160 312e41a02f755ded2ad9d4cb556899086b10b311 SHA1 e8bd606f19fbf48d9f92e7d962b69ecdef999c60 SHA256 ef4731d5d2cd960591ae1358c3a15f245652485e91c7510bab381908134a18c0
 MD5 b7c78ba7ca0c519d0f3d2b80ab4cdd74 files/mozilla-1.7.6-ppc64.patch 3651
+RMD160 312e41a02f755ded2ad9d4cb556899086b10b311 files/mozilla-1.7.6-ppc64.patch 3651
+SHA256 ef4731d5d2cd960591ae1358c3a15f245652485e91c7510bab381908134a18c0 files/mozilla-1.7.6-ppc64.patch 3651
+AUX mozilla-1.7.8-amd64.patch 4020 RMD160 8233071590d4237288923dba664d7da62853b70c SHA1 d952fe6541c0f15b00f85d92fbc99fb04f3cc674 SHA256 d1244c42644ff428228e7dcfc6d9f9f7251bc9ca06172053e6456379fd73c824
 MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020
+RMD160 8233071590d4237288923dba664d7da62853b70c files/mozilla-1.7.8-amd64.patch 4020
+SHA256 d1244c42644ff428228e7dcfc6d9f9f7251bc9ca06172053e6456379fd73c824 files/mozilla-1.7.8-amd64.patch 4020
+AUX mozilla-1.7.8-objectframefix.diff 673 RMD160 746b76958538089eff6e05404237068006bda14e SHA1 464a3f7cf7fd270fced55701d9917e58a9e82a87 SHA256 e222f935eb2e23c8ca4117dd4af4862579e8110c46534603bdcaff7b36568dfa
 MD5 5b22d0e1ea93923e3e66787c286ad86f files/mozilla-1.7.8-objectframefix.diff 673
+RMD160 746b76958538089eff6e05404237068006bda14e files/mozilla-1.7.8-objectframefix.diff 673
+SHA256 e222f935eb2e23c8ca4117dd4af4862579e8110c46534603bdcaff7b36568dfa files/mozilla-1.7.8-objectframefix.diff 673
+AUX mozilla-alpha-xpcom-subs-fix.patch 4953 RMD160 8703ed9d22d35fc6a95ca1607c3dedcfb377c267 SHA1 131abd5bc314b5a509b234bbcd1937d63520a29c SHA256 7ad36d16f9811742bdb95e838afb5f2d1cc9c58a7d180fc8f304b4d10bf53197
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+RMD160 8703ed9d22d35fc6a95ca1607c3dedcfb377c267 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+SHA256 7ad36d16f9811742bdb95e838afb5f2d1cc9c58a7d180fc8f304b4d10bf53197 files/mozilla-alpha-xpcom-subs-fix.patch 4953
+AUX mozilla-hppa.patch 7863 RMD160 e45ff21ec6bb4a947c20f5ec9a7252375e91bff4 SHA1 55bfd2eacbe1952cefe77df23097ca303e9c37d2 SHA256 911d636992214701754db91b76245beae469ce95efd242233a5acf5d474f9359
 MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863
+RMD160 e45ff21ec6bb4a947c20f5ec9a7252375e91bff4 files/mozilla-hppa.patch 7863
+SHA256 911d636992214701754db91b76245beae469ce95efd242233a5acf5d474f9359 files/mozilla-hppa.patch 7863
+AUX mozilla-rebuild-databases.pl 2310 RMD160 b26da16d31a6713a162abbf2d2d44fc57c5877ae SHA1 d4735215149b61d95c523b63eeed0048612b3cdd SHA256 5832e4f6e162f90fe9f6046182e45a24500b4502b01baaa012d6f556636cd7f9
 MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
+RMD160 b26da16d31a6713a162abbf2d2d44fc57c5877ae files/mozilla-rebuild-databases.pl 2310
+SHA256 5832e4f6e162f90fe9f6046182e45a24500b4502b01baaa012d6f556636cd7f9 files/mozilla-rebuild-databases.pl 2310
+AUX mozilla-rpath-1.patch 1716 RMD160 23bf20d57b996f6c86658aad378682497a07544c SHA1 5079624a2927f5c4bac1387e64e2632351092305 SHA256 e34d5bae7787b76253add7ec03de19a85919d42dd949f6dd4d8e0fe3ed7fc620
 MD5 07f9a980afa2dde67554657c00b8be18 files/mozilla-rpath-1.patch 1716
+RMD160 23bf20d57b996f6c86658aad378682497a07544c files/mozilla-rpath-1.patch 1716
+SHA256 e34d5bae7787b76253add7ec03de19a85919d42dd949f6dd4d8e0fe3ed7fc620 files/mozilla-rpath-1.patch 1716
+AUX mozilla-stackgrowth.patch 931 RMD160 c2b81d96f968e3cae36462bd4b567fe60b1a83e0 SHA1 ed66e2a00d42f961ddb4292654629fc4d0ab1786 SHA256 80dcdfd2feda3ec59a715b59e86e54a6110ccac4ad499cfaa032151606682605
 MD5 278524216669b594ea5b6468a180ed73 files/mozilla-stackgrowth.patch 931
+RMD160 c2b81d96f968e3cae36462bd4b567fe60b1a83e0 files/mozilla-stackgrowth.patch 931
+SHA256 80dcdfd2feda3ec59a715b59e86e54a6110ccac4ad499cfaa032151606682605 files/mozilla-stackgrowth.patch 931
+AUX svg-cairo-0.3.0-fix.patch 1063 RMD160 70653936eac849f95151b14972d8b8fe67607887 SHA1 a2afa856827f984fc41f2950ac62a7fcefe7760a SHA256 c4281db59cfb67c052a677f909c0be843a0812fa5253838784fbf3877844f219
 MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
+RMD160 70653936eac849f95151b14972d8b8fe67607887 files/svg-cairo-0.3.0-fix.patch 1063
+SHA256 c4281db59cfb67c052a677f909c0be843a0812fa5253838784fbf3877844f219 files/svg-cairo-0.3.0-fix.patch 1063
+AUX xft.js 135 RMD160 ace4fbdb541bb73890f89bded3c24db3ede6c0ba SHA1 f913d5ac7d7741c418ffa8706fd01522d1502f16 SHA256 b31467ca939e473b5898190b067c705eb04a3f293a97bcf2fe0abcd2fb34274b
 MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
-MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 1a242e5dd432f1fc4b5396b7593c1cb8 mozilla-1.7.10-r1.ebuild 12594
-MD5 00cce95a37df57816d9bf357e04c3b73 mozilla-1.7.10-r2.ebuild 11834
-MD5 585e249f746a24ae127ff7a39b12133e mozilla-1.7.10-r3.ebuild 12179
-MD5 afa167a2e95520ba2899ca04145f7a87 mozilla-1.7.11-r1.ebuild 12179
-MD5 efb11836f2b5c8f484f743a401229c53 mozilla-1.7.11-r2.ebuild 12246
-MD5 999feebd8d74bccf4fe0b8efaaf474b1 mozilla-1.7.11-r3.ebuild 12327
-MD5 d93266fa522c8503a5c3c8563b799968 mozilla-1.7.11.ebuild 12172
-MD5 091cdbde677ba08bcf0b1a286668a228 mozilla-1.7.12-r2.ebuild 12155
-MD5 16f369066f08ad71a1bb9d35dfbb83e8 mozilla-1.7.12-r3.ebuild 12221
+RMD160 ace4fbdb541bb73890f89bded3c24db3ede6c0ba files/xft.js 135
+SHA256 b31467ca939e473b5898190b067c705eb04a3f293a97bcf2fe0abcd2fb34274b files/xft.js 135
+DIST enigmail-0.92.0.tar.gz 377123
+DIST ipc-1.1.3.tar.gz 102593
+DIST moz_libart_lgpl-2.3.10p1.tar.bz2 103063
+DIST mozilla-1.7.13-patches-1.0.tar.bz2 105494 RMD160 33aae97e5260fc096caaffa3e7219201bbc0c421 SHA1 75ed5df68f706534d8ffec7e92385f069fe61a30 SHA256 87b73deab017ee85e588ebaf6292910d03ac8e95c5e49222be0d77477212dc5d
+DIST mozilla-1.7.13-source.tar.bz2 30525187
+EBUILD mozilla-1.7.13.ebuild 12217 RMD160 fbfdc54e1f9d7408c3c06e9805496dbabee42480 SHA1 99d96e290949fd3ddac312250f5c41a2fc61b969 SHA256 df0646ea99c627bff42642222a8625b13b182ee22b19ce353fa39cb56bc2f8e8
 MD5 1bdf5e617079b8dad3d014fb2ea0b15f mozilla-1.7.13.ebuild 12217
+RMD160 fbfdc54e1f9d7408c3c06e9805496dbabee42480 mozilla-1.7.13.ebuild 12217
+SHA256 df0646ea99c627bff42642222a8625b13b182ee22b19ce353fa39cb56bc2f8e8 mozilla-1.7.13.ebuild 12217
+MISC ChangeLog 54952 RMD160 17fbb333af54eaf8b9c28baee2831613451201de SHA1 4f1519a0cdf30fdd053b51a45caae57d6ac49b13 SHA256 c46af4d2f5c59f52dc9cee0ea2d396e03a7f7030625dffed08f1818aa33e505f
+MD5 c82fefaee0a5555d6e771287d2c14eed ChangeLog 54952
+RMD160 17fbb333af54eaf8b9c28baee2831613451201de ChangeLog 54952
+SHA256 c46af4d2f5c59f52dc9cee0ea2d396e03a7f7030625dffed08f1818aa33e505f ChangeLog 54952
+MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
+MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
+SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b metadata.xml 160
+MD5 fea14c88ab7b9c96480b4c8cefe16632 files/digest-mozilla-1.7.13 564
+RMD160 70ae81e9771cfc12df4afc161d7cd9ef2e4af0e4 files/digest-mozilla-1.7.13 564
+SHA256 91cefcd45b5f75bc0a1bf2e479b7c2027016b7718665e128ae9d5a6345f43176 files/digest-mozilla-1.7.13 564
diff --git a/www-client/mozilla/files/digest-mozilla-1.7.10-r1 b/www-client/mozilla/files/digest-mozilla-1.7.10-r1
deleted file mode 100644
index 4d0787148f6b..000000000000
--- a/www-client/mozilla/files/digest-mozilla-1.7.10-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 50c369ce6d6fcb2d275cd30319a601ff enigmail-0.92.0.tar.gz 377123
-RMD160 8c91725b7102e690dedfa69224eaea75fb78c917 enigmail-0.92.0.tar.gz 377123
-SHA256 de820405e4f3ca5531108ca99fc2bb1f260670f2fc4b45c7fb70ef9aa164bf6c enigmail-0.92.0.tar.gz 377123
-MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
-RMD160 7f748096a252ba21de25db7351545c868509fb63 ipc-1.1.3.tar.gz 102593
-SHA256 0265ae1a639e0975a8820928598a357f769350801ea3633016e974d32f7db725 ipc-1.1.3.tar.gz 102593
-MD5 27d4215b2a52aff47dcf328b3b135fa2 mozilla-1.7.10-source.tar.bz2 30443617
-RMD160 85c414baef33c0967fc222b186766e7cb9c4bf53 mozilla-1.7.10-source.tar.bz2 30443617
-SHA256 69567f70ec0c179ef3d0fa09ee24afb53eb0f439b1e9e8f868a75bb77939ed08 mozilla-1.7.10-source.tar.bz2 30443617
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
-RMD160 b3ea2512d641d4aa0af4925ddab75351889c3c35 mozilla-firefox-1.0-4ft2.patch.bz2 5601
-SHA256 10b20c0acf58650992c01e5481478304ebb709298d42748033cb252b40525b7f mozilla-firefox-1.0-4ft2.patch.bz2 5601
-MD5 9dfe0379cb62cc623c7f5752fb4dd849 mozilla-firefox-1.0.6-nsplugins.patch 1167
-RMD160 71669558fcefd2fa768095be3e3d5eb7a82c5a68 mozilla-firefox-1.0.6-nsplugins.patch 1167
-SHA256 9e4bdadb4afa550d4ce6b4629a5302633540f62926dd1d49ddb0671662185ac8 mozilla-firefox-1.0.6-nsplugins.patch 1167
-MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
-RMD160 25215a45e8c97259666252dcfb3ad90c547d632f mozilla-jslibmath-alpha.patch 625
-SHA256 5b2b47453bdcaba6970d3773a2d9882688c3e26e2f6d5a96192977c8b3cd5569 mozilla-jslibmath-alpha.patch 625
diff --git a/www-client/mozilla/files/digest-mozilla-1.7.10-r2 b/www-client/mozilla/files/digest-mozilla-1.7.10-r2
deleted file mode 100644
index 4d0787148f6b..000000000000
--- a/www-client/mozilla/files/digest-mozilla-1.7.10-r2
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 50c369ce6d6fcb2d275cd30319a601ff enigmail-0.92.0.tar.gz 377123
-RMD160 8c91725b7102e690dedfa69224eaea75fb78c917 enigmail-0.92.0.tar.gz 377123
-SHA256 de820405e4f3ca5531108ca99fc2bb1f260670f2fc4b45c7fb70ef9aa164bf6c enigmail-0.92.0.tar.gz 377123
-MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
-RMD160 7f748096a252ba21de25db7351545c868509fb63 ipc-1.1.3.tar.gz 102593
-SHA256 0265ae1a639e0975a8820928598a357f769350801ea3633016e974d32f7db725 ipc-1.1.3.tar.gz 102593
-MD5 27d4215b2a52aff47dcf328b3b135fa2 mozilla-1.7.10-source.tar.bz2 30443617
-RMD160 85c414baef33c0967fc222b186766e7cb9c4bf53 mozilla-1.7.10-source.tar.bz2 30443617
-SHA256 69567f70ec0c179ef3d0fa09ee24afb53eb0f439b1e9e8f868a75bb77939ed08 mozilla-1.7.10-source.tar.bz2 30443617
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
-RMD160 b3ea2512d641d4aa0af4925ddab75351889c3c35 mozilla-firefox-1.0-4ft2.patch.bz2 5601
-SHA256 10b20c0acf58650992c01e5481478304ebb709298d42748033cb252b40525b7f mozilla-firefox-1.0-4ft2.patch.bz2 5601
-MD5 9dfe0379cb62cc623c7f5752fb4dd849 mozilla-firefox-1.0.6-nsplugins.patch 1167
-RMD160 71669558fcefd2fa768095be3e3d5eb7a82c5a68 mozilla-firefox-1.0.6-nsplugins.patch 1167
-SHA256 9e4bdadb4afa550d4ce6b4629a5302633540f62926dd1d49ddb0671662185ac8 mozilla-firefox-1.0.6-nsplugins.patch 1167
-MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
-RMD160 25215a45e8c97259666252dcfb3ad90c547d632f mozilla-jslibmath-alpha.patch 625
-SHA256 5b2b47453bdcaba6970d3773a2d9882688c3e26e2f6d5a96192977c8b3cd5569 mozilla-jslibmath-alpha.patch 625
diff --git a/www-client/mozilla/files/digest-mozilla-1.7.10-r3 b/www-client/mozilla/files/digest-mozilla-1.7.10-r3
deleted file mode 100644
index 2c585ce076ed..000000000000
--- a/www-client/mozilla/files/digest-mozilla-1.7.10-r3
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 50c369ce6d6fcb2d275cd30319a601ff enigmail-0.92.0.tar.gz 377123
-RMD160 8c91725b7102e690dedfa69224eaea75fb78c917 enigmail-0.92.0.tar.gz 377123
-SHA256 de820405e4f3ca5531108ca99fc2bb1f260670f2fc4b45c7fb70ef9aa164bf6c enigmail-0.92.0.tar.gz 377123
-MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
-RMD160 7f748096a252ba21de25db7351545c868509fb63 ipc-1.1.3.tar.gz 102593
-SHA256 0265ae1a639e0975a8820928598a357f769350801ea3633016e974d32f7db725 ipc-1.1.3.tar.gz 102593
-MD5 a120cd14ade242622387f76875ca9c39 mozilla-1.7.10-nsplugins-v2.patch 1968
-RMD160 42f20651c93d904829fd80d4bf6bf8f07456124d mozilla-1.7.10-nsplugins-v2.patch 1968
-SHA256 bd5ce9f3b58496ce66852f7decec1e9531966568c9530bf4d7c1cc6d97ea0a06 mozilla-1.7.10-nsplugins-v2.patch 1968
-MD5 27d4215b2a52aff47dcf328b3b135fa2 mozilla-1.7.10-source.tar.bz2 30443617
-RMD160 85c414baef33c0967fc222b186766e7cb9c4bf53 mozilla-1.7.10-source.tar.bz2 30443617
-SHA256 69567f70ec0c179ef3d0fa09ee24afb53eb0f439b1e9e8f868a75bb77939ed08 mozilla-1.7.10-source.tar.bz2 30443617
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
-RMD160 b3ea2512d641d4aa0af4925ddab75351889c3c35 mozilla-firefox-1.0-4ft2.patch.bz2 5601
-SHA256 10b20c0acf58650992c01e5481478304ebb709298d42748033cb252b40525b7f mozilla-firefox-1.0-4ft2.patch.bz2 5601
-MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
-RMD160 25215a45e8c97259666252dcfb3ad90c547d632f mozilla-jslibmath-alpha.patch 625
-SHA256 5b2b47453bdcaba6970d3773a2d9882688c3e26e2f6d5a96192977c8b3cd5569 mozilla-jslibmath-alpha.patch 625
diff --git a/www-client/mozilla/files/digest-mozilla-1.7.11 b/www-client/mozilla/files/digest-mozilla-1.7.11
deleted file mode 100644
index b9d77dfa9f40..000000000000
--- a/www-client/mozilla/files/digest-mozilla-1.7.11
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 50c369ce6d6fcb2d275cd30319a601ff enigmail-0.92.0.tar.gz 377123
-RMD160 8c91725b7102e690dedfa69224eaea75fb78c917 enigmail-0.92.0.tar.gz 377123
-SHA256 de820405e4f3ca5531108ca99fc2bb1f260670f2fc4b45c7fb70ef9aa164bf6c enigmail-0.92.0.tar.gz 377123
-MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
-RMD160 7f748096a252ba21de25db7351545c868509fb63 ipc-1.1.3.tar.gz 102593
-SHA256 0265ae1a639e0975a8820928598a357f769350801ea3633016e974d32f7db725 ipc-1.1.3.tar.gz 102593
-MD5 a120cd14ade242622387f76875ca9c39 mozilla-1.7.10-nsplugins-v2.patch 1968
-RMD160 42f20651c93d904829fd80d4bf6bf8f07456124d mozilla-1.7.10-nsplugins-v2.patch 1968
-SHA256 bd5ce9f3b58496ce66852f7decec1e9531966568c9530bf4d7c1cc6d97ea0a06 mozilla-1.7.10-nsplugins-v2.patch 1968
-MD5 c40e4d1a445cc31897462982c2aec333 mozilla-1.7.11-source.tar.bz2 29818300
-RMD160 5cd5387968008535c6444a2f36fef70aa5685ae1 mozilla-1.7.11-source.tar.bz2 29818300
-SHA256 d2d57aa3bf21489e06dfb989054aa7fe1a6f0f098fc3a90c4c5ee9070c7b5990 mozilla-1.7.11-source.tar.bz2 29818300
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
-RMD160 b3ea2512d641d4aa0af4925ddab75351889c3c35 mozilla-firefox-1.0-4ft2.patch.bz2 5601
-SHA256 10b20c0acf58650992c01e5481478304ebb709298d42748033cb252b40525b7f mozilla-firefox-1.0-4ft2.patch.bz2 5601
-MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
-RMD160 25215a45e8c97259666252dcfb3ad90c547d632f mozilla-jslibmath-alpha.patch 625
-SHA256 5b2b47453bdcaba6970d3773a2d9882688c3e26e2f6d5a96192977c8b3cd5569 mozilla-jslibmath-alpha.patch 625
diff --git a/www-client/mozilla/files/digest-mozilla-1.7.11-r1 b/www-client/mozilla/files/digest-mozilla-1.7.11-r1
deleted file mode 100644
index b9d77dfa9f40..000000000000
--- a/www-client/mozilla/files/digest-mozilla-1.7.11-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 50c369ce6d6fcb2d275cd30319a601ff enigmail-0.92.0.tar.gz 377123
-RMD160 8c91725b7102e690dedfa69224eaea75fb78c917 enigmail-0.92.0.tar.gz 377123
-SHA256 de820405e4f3ca5531108ca99fc2bb1f260670f2fc4b45c7fb70ef9aa164bf6c enigmail-0.92.0.tar.gz 377123
-MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
-RMD160 7f748096a252ba21de25db7351545c868509fb63 ipc-1.1.3.tar.gz 102593
-SHA256 0265ae1a639e0975a8820928598a357f769350801ea3633016e974d32f7db725 ipc-1.1.3.tar.gz 102593
-MD5 a120cd14ade242622387f76875ca9c39 mozilla-1.7.10-nsplugins-v2.patch 1968
-RMD160 42f20651c93d904829fd80d4bf6bf8f07456124d mozilla-1.7.10-nsplugins-v2.patch 1968
-SHA256 bd5ce9f3b58496ce66852f7decec1e9531966568c9530bf4d7c1cc6d97ea0a06 mozilla-1.7.10-nsplugins-v2.patch 1968
-MD5 c40e4d1a445cc31897462982c2aec333 mozilla-1.7.11-source.tar.bz2 29818300
-RMD160 5cd5387968008535c6444a2f36fef70aa5685ae1 mozilla-1.7.11-source.tar.bz2 29818300
-SHA256 d2d57aa3bf21489e06dfb989054aa7fe1a6f0f098fc3a90c4c5ee9070c7b5990 mozilla-1.7.11-source.tar.bz2 29818300
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
-RMD160 b3ea2512d641d4aa0af4925ddab75351889c3c35 mozilla-firefox-1.0-4ft2.patch.bz2 5601
-SHA256 10b20c0acf58650992c01e5481478304ebb709298d42748033cb252b40525b7f mozilla-firefox-1.0-4ft2.patch.bz2 5601
-MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
-RMD160 25215a45e8c97259666252dcfb3ad90c547d632f mozilla-jslibmath-alpha.patch 625
-SHA256 5b2b47453bdcaba6970d3773a2d9882688c3e26e2f6d5a96192977c8b3cd5569 mozilla-jslibmath-alpha.patch 625
diff --git a/www-client/mozilla/files/digest-mozilla-1.7.11-r2 b/www-client/mozilla/files/digest-mozilla-1.7.11-r2
deleted file mode 100644
index b9d77dfa9f40..000000000000
--- a/www-client/mozilla/files/digest-mozilla-1.7.11-r2
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 50c369ce6d6fcb2d275cd30319a601ff enigmail-0.92.0.tar.gz 377123
-RMD160 8c91725b7102e690dedfa69224eaea75fb78c917 enigmail-0.92.0.tar.gz 377123
-SHA256 de820405e4f3ca5531108ca99fc2bb1f260670f2fc4b45c7fb70ef9aa164bf6c enigmail-0.92.0.tar.gz 377123
-MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
-RMD160 7f748096a252ba21de25db7351545c868509fb63 ipc-1.1.3.tar.gz 102593
-SHA256 0265ae1a639e0975a8820928598a357f769350801ea3633016e974d32f7db725 ipc-1.1.3.tar.gz 102593
-MD5 a120cd14ade242622387f76875ca9c39 mozilla-1.7.10-nsplugins-v2.patch 1968
-RMD160 42f20651c93d904829fd80d4bf6bf8f07456124d mozilla-1.7.10-nsplugins-v2.patch 1968
-SHA256 bd5ce9f3b58496ce66852f7decec1e9531966568c9530bf4d7c1cc6d97ea0a06 mozilla-1.7.10-nsplugins-v2.patch 1968
-MD5 c40e4d1a445cc31897462982c2aec333 mozilla-1.7.11-source.tar.bz2 29818300
-RMD160 5cd5387968008535c6444a2f36fef70aa5685ae1 mozilla-1.7.11-source.tar.bz2 29818300
-SHA256 d2d57aa3bf21489e06dfb989054aa7fe1a6f0f098fc3a90c4c5ee9070c7b5990 mozilla-1.7.11-source.tar.bz2 29818300
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
-RMD160 b3ea2512d641d4aa0af4925ddab75351889c3c35 mozilla-firefox-1.0-4ft2.patch.bz2 5601
-SHA256 10b20c0acf58650992c01e5481478304ebb709298d42748033cb252b40525b7f mozilla-firefox-1.0-4ft2.patch.bz2 5601
-MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
-RMD160 25215a45e8c97259666252dcfb3ad90c547d632f mozilla-jslibmath-alpha.patch 625
-SHA256 5b2b47453bdcaba6970d3773a2d9882688c3e26e2f6d5a96192977c8b3cd5569 mozilla-jslibmath-alpha.patch 625
diff --git a/www-client/mozilla/files/digest-mozilla-1.7.11-r3 b/www-client/mozilla/files/digest-mozilla-1.7.11-r3
deleted file mode 100644
index b9d77dfa9f40..000000000000
--- a/www-client/mozilla/files/digest-mozilla-1.7.11-r3
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 50c369ce6d6fcb2d275cd30319a601ff enigmail-0.92.0.tar.gz 377123
-RMD160 8c91725b7102e690dedfa69224eaea75fb78c917 enigmail-0.92.0.tar.gz 377123
-SHA256 de820405e4f3ca5531108ca99fc2bb1f260670f2fc4b45c7fb70ef9aa164bf6c enigmail-0.92.0.tar.gz 377123
-MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
-RMD160 7f748096a252ba21de25db7351545c868509fb63 ipc-1.1.3.tar.gz 102593
-SHA256 0265ae1a639e0975a8820928598a357f769350801ea3633016e974d32f7db725 ipc-1.1.3.tar.gz 102593
-MD5 a120cd14ade242622387f76875ca9c39 mozilla-1.7.10-nsplugins-v2.patch 1968
-RMD160 42f20651c93d904829fd80d4bf6bf8f07456124d mozilla-1.7.10-nsplugins-v2.patch 1968
-SHA256 bd5ce9f3b58496ce66852f7decec1e9531966568c9530bf4d7c1cc6d97ea0a06 mozilla-1.7.10-nsplugins-v2.patch 1968
-MD5 c40e4d1a445cc31897462982c2aec333 mozilla-1.7.11-source.tar.bz2 29818300
-RMD160 5cd5387968008535c6444a2f36fef70aa5685ae1 mozilla-1.7.11-source.tar.bz2 29818300
-SHA256 d2d57aa3bf21489e06dfb989054aa7fe1a6f0f098fc3a90c4c5ee9070c7b5990 mozilla-1.7.11-source.tar.bz2 29818300
-MD5 1d6205bf7449fcdcae08cc1db524760d mozilla-firefox-1.0-4ft2.patch.bz2 5601
-RMD160 b3ea2512d641d4aa0af4925ddab75351889c3c35 mozilla-firefox-1.0-4ft2.patch.bz2 5601
-SHA256 10b20c0acf58650992c01e5481478304ebb709298d42748033cb252b40525b7f mozilla-firefox-1.0-4ft2.patch.bz2 5601
-MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
-RMD160 25215a45e8c97259666252dcfb3ad90c547d632f mozilla-jslibmath-alpha.patch 625
-SHA256 5b2b47453bdcaba6970d3773a2d9882688c3e26e2f6d5a96192977c8b3cd5569 mozilla-jslibmath-alpha.patch 625
diff --git a/www-client/mozilla/files/digest-mozilla-1.7.12-r2 b/www-client/mozilla/files/digest-mozilla-1.7.12-r2
deleted file mode 100644
index 434fce0930d2..000000000000
--- a/www-client/mozilla/files/digest-mozilla-1.7.12-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 50c369ce6d6fcb2d275cd30319a601ff enigmail-0.92.0.tar.gz 377123
-RMD160 8c91725b7102e690dedfa69224eaea75fb78c917 enigmail-0.92.0.tar.gz 377123
-SHA256 de820405e4f3ca5531108ca99fc2bb1f260670f2fc4b45c7fb70ef9aa164bf6c enigmail-0.92.0.tar.gz 377123
-MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
-RMD160 7f748096a252ba21de25db7351545c868509fb63 ipc-1.1.3.tar.gz 102593
-SHA256 0265ae1a639e0975a8820928598a357f769350801ea3633016e974d32f7db725 ipc-1.1.3.tar.gz 102593
-MD5 b4355a5746dde47cf0a7981df1dff998 moz_libart_lgpl-2.3.10p1.tar.bz2 103063
-RMD160 c1ab4b41fe40e3f63dbf95476a1cc125d5537be7 moz_libart_lgpl-2.3.10p1.tar.bz2 103063
-SHA256 8cc868780a0763a5afaa36f92d7c5f9efe248b4e05440f645e4e91ddfdd6d1b5 moz_libart_lgpl-2.3.10p1.tar.bz2 103063
-MD5 8260c8412cda7f33b0a4dade34494772 mozilla-1.7.12-patches-1.1.tar.bz2 107977
-RMD160 b191c7713273bea08bfd5dd520cf1ecfaa4d0a3f mozilla-1.7.12-patches-1.1.tar.bz2 107977
-SHA256 710f5ac06caa01a6a9e1a59f9d252744ccfe350cd97ce25c67d2b68e3bfb67cd mozilla-1.7.12-patches-1.1.tar.bz2 107977
-MD5 f1ad6adbbc0510eb76d352c94c801fac mozilla-1.7.12-source.tar.bz2 30446836
-RMD160 8881779a39f360a814177ed948fab5a8330193aa mozilla-1.7.12-source.tar.bz2 30446836
-SHA256 9fcbcdd0d72775659817cd0d826c2f59356e07545e4cc8d14086cd96cec7c200 mozilla-1.7.12-source.tar.bz2 30446836
diff --git a/www-client/mozilla/files/digest-mozilla-1.7.12-r3 b/www-client/mozilla/files/digest-mozilla-1.7.12-r3
deleted file mode 100644
index 434fce0930d2..000000000000
--- a/www-client/mozilla/files/digest-mozilla-1.7.12-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 50c369ce6d6fcb2d275cd30319a601ff enigmail-0.92.0.tar.gz 377123
-RMD160 8c91725b7102e690dedfa69224eaea75fb78c917 enigmail-0.92.0.tar.gz 377123
-SHA256 de820405e4f3ca5531108ca99fc2bb1f260670f2fc4b45c7fb70ef9aa164bf6c enigmail-0.92.0.tar.gz 377123
-MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
-RMD160 7f748096a252ba21de25db7351545c868509fb63 ipc-1.1.3.tar.gz 102593
-SHA256 0265ae1a639e0975a8820928598a357f769350801ea3633016e974d32f7db725 ipc-1.1.3.tar.gz 102593
-MD5 b4355a5746dde47cf0a7981df1dff998 moz_libart_lgpl-2.3.10p1.tar.bz2 103063
-RMD160 c1ab4b41fe40e3f63dbf95476a1cc125d5537be7 moz_libart_lgpl-2.3.10p1.tar.bz2 103063
-SHA256 8cc868780a0763a5afaa36f92d7c5f9efe248b4e05440f645e4e91ddfdd6d1b5 moz_libart_lgpl-2.3.10p1.tar.bz2 103063
-MD5 8260c8412cda7f33b0a4dade34494772 mozilla-1.7.12-patches-1.1.tar.bz2 107977
-RMD160 b191c7713273bea08bfd5dd520cf1ecfaa4d0a3f mozilla-1.7.12-patches-1.1.tar.bz2 107977
-SHA256 710f5ac06caa01a6a9e1a59f9d252744ccfe350cd97ce25c67d2b68e3bfb67cd mozilla-1.7.12-patches-1.1.tar.bz2 107977
-MD5 f1ad6adbbc0510eb76d352c94c801fac mozilla-1.7.12-source.tar.bz2 30446836
-RMD160 8881779a39f360a814177ed948fab5a8330193aa mozilla-1.7.12-source.tar.bz2 30446836
-SHA256 9fcbcdd0d72775659817cd0d826c2f59356e07545e4cc8d14086cd96cec7c200 mozilla-1.7.12-source.tar.bz2 30446836
diff --git a/www-client/mozilla/mozilla-1.7.10-r1.ebuild b/www-client/mozilla/mozilla-1.7.10-r1.ebuild
deleted file mode 100644
index 4e8644dbbe59..000000000000
--- a/www-client/mozilla/mozilla-1.7.10-r1.ebuild
+++ /dev/null
@@ -1,406 +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/mozilla/mozilla-1.7.10-r1.ebuild,v 1.9 2005/08/10 02:14:39 hardave Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
-
-EMVER="0.92.0"
-IPCVER="1.1.3"
-
-# handle _rc versions
-MY_PV=${PV/_alpha/a} 	# handle alpha
-MY_PV=${MY_PV/_beta/b}	# handle beta
-MY_PV=${MY_PV/_rc/rc}	# handle rc
-
-DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
-HOMEPAGE="http://www.mozilla.org"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/source/${PN}-${MY_PV}-source.tar.bz2
-	crypt? ( !moznomail? (
-		http://www.mozilla-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
-		http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
-	) )
-	mirror://gentoo/mozilla-jslibmath-alpha.patch
-	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
-	mirror://gentoo/mozilla-firefox-1.0.6-nsplugins.patch
-	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0.6-nsplugins.patch"
-
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
-
-# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
-# and is required to build with support for cairo.  #71504
-RDEPEND="java? ( virtual/jre )
-	mozsvg? (
-		>=x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
-	>=www-client/mozilla-launcher-1.39"
-
-DEPEND="${RDEPEND}
-	~sys-devel/autoconf-2.13
-	java? ( >=dev-java/java-config-0.2.0 )
-	dev-lang/perl
-	postgres? ( >=dev-db/postgresql-7.2.0 )"
-
-S=${WORKDIR}/mozilla
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-#
-# NB: We can't export these vars until enigmail is installed separately instead
-# of integrated into this ebuild.
-#
-#export BUILD_OFFICIAL=1
-#export MOZILLA_OFFICIAL=1
-
-src_unpack() {
-	declare x
-
-	for x in ${A}; do
-		[[ $x == *.tar.* ]] || continue
-		unpack $x || die "unpack failed"
-	done
-	cd ${S} || die "cd failed"
-
-	# Unpack the enigmail plugin
-	if use crypt && ! use moznomail; then
-		for x in ipc enigmail; do
-			mv ${WORKDIR}/${x} ${S}/extensions || die "mv failed"
-			cd ${S}/extensions/${x} || die "cd failed"
-			makemake	# from mozconfig.eclass
-		done
-	fi
-	cd ${S}
-
-	####################################
-	#
-	# architecture patches
-	#
-	####################################
-
-	if [[ $(gcc-major-version) -eq 3 ]]; then
-		# ABI Patch for alpha/xpcom for gcc-3.x
-		if [[ ${ARCH} == alpha ]]; then
-			epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
-		fi
-	fi
-
-	# HPPA patches from Ivar <orskaug@stud.ntnu.no>
-	# <gmsoft@gentoo.org> (22 Dec 2004)
-	epatch ${FILESDIR}/mozilla-hppa.patch
-
-	# patch to fix math operations on alpha, makes maps.google.com work!
-	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
-
-	# Patch to allow compilation on ppc64 - bug #54843
-	use ppc64 && epatch ${FILESDIR}/mozilla-1.7.6-ppc64.patch
-
-	# Fix building on amd64 with gcc4 (patch from Debian)
-	epatch ${FILESDIR}/${PN}-1.7.8-amd64.patch
-
-	####################################
-	#
-	# general compilation and run-time fixes
-	#
-	####################################
-
-	# GCC4 compile fix, bug #87800
-	epatch ${FILESDIR}/${PN}-1.7.6-gcc4.patch
-
-	# Fix stack growth logic
-	epatch ${FILESDIR}/${PN}-stackgrowth.patch
-
-	# patch out ft caching code since the API changed between releases of
-	# freetype; this enables freetype-2.1.8+ compat.
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
-
-	# Patch for newer versions of cairo #80301
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-
-	####################################
-	#
-	# behavioral fixes
-	#
-	####################################
-
-	# Mozilla Bug 292257, https://bugzilla.mozilla.org/show_bug.cgi?id=292257
-	# Mozilla crashes under some rare cases when plugin.default_plugin_disabled
-	# is true. This patch fixes that. Backported by hansmi@gentoo.org.
-	epatch ${FILESDIR}/${PN}-1.7.8-objectframefix.diff
-
-	# Fix scripts that call for /usr/local/bin/perl #51916
-	ebegin "Patching smime to call perl from /usr/bin"
-	sed -i -e '1s,usr/local/bin,usr/bin,' security/nss/cmd/smimetools/smime
-	eend $? || die "sed failed"
-
-	# look in /usr/lib/nsplugins for plugins, in addition to the usual places
-	epatch ${DISTDIR}/mozilla-firefox-1.0.6-nsplugins.patch
-
-	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
-	# regardless of java setting.
-	mozconfig_annotate '' --enable-oji --enable-mathml
-
-	# Other moz-specific settings
-	mozconfig_use_enable mozdevelop jsd
-	mozconfig_use_enable mozdevelop xpctools
-	mozconfig_use_extension mozdevelop venkman
-	mozconfig_use_enable gnome gnomevfs
-	mozconfig_use_extension gnome gnomevfs
-	mozconfig_use_extension !moznoirc irc
-	mozconfig_use_extension postgres sql
-	if use postgres ; then
-		export MOZ_ENABLE_PGSQL=1
-		export MOZ_PGSQL_INCLUDES=/usr/include
-		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
-	fi
-	mozconfig_use_enable mozcalendar calendar
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --with-user-appdir=.mozilla
-
-	if use moznomail && ! use mozcalendar; then
-		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
-	fi
-	if use moznocompose && use moznomail; then
-		mozconfig_annotate "+moznocompose +moznomail" --disable-composer
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, which breaks us
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die
-
-	####################################
-	#
-	#  Build Mozilla NSS
-	#
-	####################################
-
-	# Build the NSS/SSL support
-	if use ssl; then
-		einfo "Building Mozilla NSS..."
-
-		# Fix #include problem
-		cd ${S}/security/coreconf || die "cd coreconf failed"
-		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
-			>>headers.mk
-		emake -j1 || die "make security headers failed"
-
-		cd ${S}/security/nss || die "cd nss failed"
-		emake -j1 moz_import || die "make moz_import failed"
-		emake -j1 || die "make nss failed"
-	fi
-
-	####################################
-	#
-	#  Build Enigmail plugin
-	#
-	####################################
-
-	# Build the enigmail plugin
-	if use crypt && ! use moznomail; then
-		einfo "Building Enigmail plugin..."
-		cd ${S}/extensions/ipc || die "cd ipc failed"
-		emake || die "make ipc failed"
-
-		cd ${S}/extensions/enigmail || die "cd enigmail failed"
-		emake || die "make enigmail failed"
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Most of the installation happens here
-	dodir ${MOZILLA_FIVE_HOME}
-	cp -RL ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
-
-	# Create directory structure to support portage-installed extensions.
-	# See update_chrome() in mozilla-launcher
-	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
-	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
-	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
-		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
-
-	# Create /usr/bin/mozilla
-	install_mozilla_launcher_stub mozilla ${MOZILLA_FIVE_HOME}
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/mozilla-icon.png
-
-	# Fix bug 54179: Install .desktop file into /usr/share/applications
-	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozilla.desktop
-
-	# Fix icons to look the same everywhere
-	insinto ${MOZILLA_FIVE_HOME}/icons
-	doins ${S}/widget/src/gtk/mozicon16.xpm
-	doins ${S}/widget/src/gtk/mozicon50.xpm
-
-	####################################
-	#
-	# Install files necessary for applications to build against mozilla
-	#
-	####################################
-
-	einfo "Installing includes and idl files..."
-	dodir ${MOZILLA_FIVE_HOME}/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include
-	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/include/idl
-
-	# Install the NSS/SSL libs, headers and tools
-	if use ssl; then
-		einfo "Installing Mozilla NSS..."
-		# Install the headers ('make install' do not work for headers ...)
-		insinto ${MOZILLA_FIVE_HOME}/include/nss
-		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
-		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
-		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
-		# These come with zlib ...
-		rm -f ${D}${MOZILLA_FIVE_HOME}/include/nss/{zconf.h,zlib.h}
-
-		cd ${S}/security/nss
-
-		mkdir -p ${WORKDIR}/nss/{bin,lib}
-		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
-		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
-
-		make install || die "make failed"
-		# Gets installed as symbolic links ...
-		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
-		cp -Lf ${WORKDIR}/nss/lib/* ${D}${MOZILLA_FIVE_HOME}
-
-		# Need to unset these incase we want to rebuild, else the build
-		# gets newked.
-		unset SOURCE_LIB_DIR
-		unset SOURCE_BIN_DIR
-	fi
-
-	# Fix mozilla-config and install it
-	sed -i -e "s|/usr/lib/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}|g
-		s|/usr/include/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}/include|g" \
-		${S}/build/unix/mozilla-config
-	exeinto ${MOZILLA_FIVE_HOME}
-	doexe ${S}/build/unix/mozilla-config
-
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in ${S}/build/unix/*.pc; do
-		sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}|
-			s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|" ${x}
-		doins ${x}
-	done
-
-	# Install env.d snippet, which isn't necessary for running mozilla, but
-	# might be necessary for programs linked against firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10mozilla
-	dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10mozilla
-
-	# Install rebuild script since mozilla-bin doesn't support registration yet
-	exeinto ${MOZILLA_FIVE_HOME}
-	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
-
-	# Install docs
-	dodoc LEGAL LICENSE
-
-	# Update Google search plugin to use UTF8 charset ...
-	insinto ${MOZILLA_FIVE_HOME}/searchplugins
-	doins ${FILESDIR}/google.src
-}
-
-pkg_preinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Remove entire installed instance to solve various problems,
-	# for example see bug 27719
-	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
-}
-
-pkg_postinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-#	Unfortunately this doesn't work for mozilla ... maybe seamonkey will fix
-#	it!
-#
-#	# Update the component registry
-#	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
-#		/usr/libexec/mozilla-launcher -register
-
-	# Register Components and Chrome
-	einfo "Registering Components and Chrome..."
-	umask 022
-	MOZILLA_FIVE_HOME=${ROOT}${MOZILLA_FIVE_HOME} \
-		${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
-
-	# This should be called in the postinst and postrm of all the
-	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
-	# thunderbird-bin ebuilds.
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-#	Unfortunately this doesn't work for mozilla ... maybe seamonkey will fix
-#	it!
-#
-#	# Update the component registry
-#	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
-#		/usr/libexec/mozilla-launcher -register
-
-	# Register Components and Chrome
-	if [[ -x ${ROOT}${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl ]]; then
-		einfo "Registering Components and Chrome..."
-		umask 022
-		MOZILLA_FIVE_HOME=${ROOT}${MOZILLA_FIVE_HOME} \
-			${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
-	fi
-
-	update_mozilla_launcher_symlinks
-}
diff --git a/www-client/mozilla/mozilla-1.7.10-r2.ebuild b/www-client/mozilla/mozilla-1.7.10-r2.ebuild
deleted file mode 100644
index 98d28dcf8d3c..000000000000
--- a/www-client/mozilla/mozilla-1.7.10-r2.ebuild
+++ /dev/null
@@ -1,383 +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/mozilla/mozilla-1.7.10-r2.ebuild,v 1.5 2005/08/10 02:14:39 hardave Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
-
-EMVER="0.92.0"
-IPCVER="1.1.3"
-
-# handle _rc versions
-MY_PV=${PV/_alpha/a} 	# handle alpha
-MY_PV=${MY_PV/_beta/b}	# handle beta
-MY_PV=${MY_PV/_rc/rc}	# handle rc
-
-DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
-HOMEPAGE="http://www.mozilla.org"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/source/${PN}-${MY_PV}-source.tar.bz2
-	crypt? ( !moznomail? (
-		http://www.mozilla-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
-		http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
-	) )
-	mirror://gentoo/mozilla-jslibmath-alpha.patch
-	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
-	mirror://gentoo/mozilla-firefox-1.0.6-nsplugins.patch
-	http://dev.gentoo.org/~agriffis/dist/mozilla-firefox-1.0.6-nsplugins.patch"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
-
-# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
-# and is required to build with support for cairo.  #71504
-RDEPEND="java? ( virtual/jre )
-	mozsvg? (
-		>=x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
-	>=www-client/mozilla-launcher-1.42"
-
-DEPEND="${RDEPEND}
-	~sys-devel/autoconf-2.13
-	java? ( >=dev-java/java-config-0.2.0 )
-	dev-lang/perl
-	postgres? ( >=dev-db/postgresql-7.2.0 )"
-
-S=${WORKDIR}/mozilla
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-#
-# NB: We can't export these vars until enigmail is installed separately instead
-# of integrated into this ebuild.
-#
-#export BUILD_OFFICIAL=1
-#export MOZILLA_OFFICIAL=1
-
-src_unpack() {
-	declare x
-
-	unpack mozilla-${MY_PV}-source.tar.bz2
-	cd ${S} || die
-
-	# Unpack the enigmail plugin
-	if use crypt && ! use moznomail; then
-		cd ${S}/extensions || die
-		unpack ipc-${IPCVER}.tar.gz enigmail-${EMVER}.tar.gz
-		for x in ipc enigmail; do
-			cd ${S}/extensions/${x} || die "cd failed"
-			makemake	# from mozconfig.eclass
-		done
-	fi
-	cd ${S}
-
-	####################################
-	#
-	# architecture patches
-	#
-	####################################
-
-	if [[ $(gcc-major-version) -eq 3 ]]; then
-		# ABI Patch for alpha/xpcom for gcc-3.x
-		if [[ ${ARCH} == alpha ]]; then
-			epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
-		fi
-	fi
-
-	# HPPA patches from Ivar <orskaug@stud.ntnu.no>
-	# <gmsoft@gentoo.org> (22 Dec 2004)
-	epatch ${FILESDIR}/mozilla-hppa.patch
-
-	# patch to fix math operations on alpha, makes maps.google.com work!
-	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
-
-	# Patch to allow compilation on ppc64 - bug #54843
-	use ppc64 && epatch ${FILESDIR}/mozilla-1.7.6-ppc64.patch
-
-	# Fix building on amd64 with gcc4 (patch from Debian)
-	epatch ${FILESDIR}/${PN}-1.7.8-amd64.patch
-
-	####################################
-	#
-	# general compilation and run-time fixes
-	#
-	####################################
-
-	# GCC4 compile fix, bug #87800
-	epatch ${FILESDIR}/${PN}-1.7.6-gcc4.patch
-
-	# Fix stack growth logic
-	epatch ${FILESDIR}/${PN}-stackgrowth.patch
-
-	# patch out ft caching code since the API changed between releases of
-	# freetype; this enables freetype-2.1.8+ compat.
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
-
-	# Patch for newer versions of cairo #80301
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-
-	####################################
-	#
-	# behavioral fixes
-	#
-	####################################
-
-	# Mozilla Bug 292257, https://bugzilla.mozilla.org/show_bug.cgi?id=292257
-	# Mozilla crashes under some rare cases when plugin.default_plugin_disabled
-	# is true. This patch fixes that. Backported by hansmi@gentoo.org.
-	epatch ${FILESDIR}/${PN}-1.7.8-objectframefix.diff
-
-	# Fix scripts that call for /usr/local/bin/perl #51916
-	ebegin "Patching smime to call perl from /usr/bin"
-	sed -i -e '1s,usr/local/bin,usr/bin,' security/nss/cmd/smimetools/smime
-	eend $? || die "sed failed"
-
-	# look in /usr/lib/nsplugins for plugins, in addition to the usual places
-	epatch ${DISTDIR}/mozilla-firefox-1.0.6-nsplugins.patch
-
-	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-	declare x
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
-	# regardless of java setting.
-	mozconfig_annotate '' --enable-oji --enable-mathml
-
-	# Other moz-specific settings
-	mozconfig_use_enable mozdevelop jsd
-	mozconfig_use_enable mozdevelop xpctools
-	mozconfig_use_extension mozdevelop venkman
-	mozconfig_use_enable gnome gnomevfs
-	mozconfig_use_extension gnome gnomevfs
-	mozconfig_use_extension !moznoirc irc
-	mozconfig_use_extension postgres sql
-	if use postgres ; then
-		export MOZ_ENABLE_PGSQL=1
-		export MOZ_PGSQL_INCLUDES=/usr/include
-		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
-	fi
-	mozconfig_use_enable mozcalendar calendar
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --with-user-appdir=.mozilla
-
-	if use moznomail && ! use mozcalendar; then
-		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
-	fi
-	if use moznocompose && use moznomail; then
-		mozconfig_annotate "+moznocompose +moznomail" --disable-composer
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, which breaks us
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die
-
-	####################################
-	#
-	#  Build Mozilla NSS
-	#
-	####################################
-
-	# Build the NSS/SSL support
-	if use ssl; then
-		einfo "Building Mozilla NSS..."
-
-		# Fix #include problem
-		cd ${S}/security/coreconf || die "cd coreconf failed"
-		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
-			>>headers.mk
-		emake -j1 || die "make security headers failed"
-
-		cd ${S}/security/nss || die "cd nss failed"
-		emake -j1 moz_import || die "make moz_import failed"
-		emake -j1 || die "make nss failed"
-	fi
-
-	####################################
-	#
-	#  Build Enigmail extension
-	#
-	####################################
-
-	if use crypt && ! use moznomail; then
-		for x in ipc enigmail; do
-			emake -C ${S}/extensions/${x} || die "emake ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Most of the installation happens here
-	dodir ${MOZILLA_FIVE_HOME}
-	cp -RL ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
-
-	# Create directory structure to support portage-installed extensions.
-	# See update_chrome() in mozilla-launcher
-	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
-	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
-	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
-		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
-
-	# Create /usr/bin/mozilla
-	install_mozilla_launcher_stub mozilla ${MOZILLA_FIVE_HOME}
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/mozilla-icon.png
-
-	# Fix bug 54179: Install .desktop file into /usr/share/applications
-	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozilla.desktop
-
-	# Fix icons to look the same everywhere
-	insinto ${MOZILLA_FIVE_HOME}/icons
-	doins ${S}/widget/src/gtk/mozicon16.xpm
-	doins ${S}/widget/src/gtk/mozicon50.xpm
-
-	####################################
-	#
-	# Install files necessary for applications to build against mozilla
-	#
-	####################################
-
-	einfo "Installing includes and idl files..."
-	dodir ${MOZILLA_FIVE_HOME}/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include
-	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/include/idl
-
-	# Install the NSS/SSL libs, headers and tools
-	if use ssl; then
-		einfo "Installing Mozilla NSS..."
-		# Install the headers ('make install' do not work for headers ...)
-		insinto ${MOZILLA_FIVE_HOME}/include/nss
-		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
-		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
-		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
-		# These come with zlib ...
-		rm -f ${D}${MOZILLA_FIVE_HOME}/include/nss/{zconf.h,zlib.h}
-
-		cd ${S}/security/nss
-
-		mkdir -p ${WORKDIR}/nss/{bin,lib}
-		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
-		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
-
-		make install || die "make failed"
-		# Gets installed as symbolic links ...
-		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
-		cp -Lf ${WORKDIR}/nss/lib/* ${D}${MOZILLA_FIVE_HOME}
-
-		# Need to unset these incase we want to rebuild, else the build
-		# gets newked.
-		unset SOURCE_LIB_DIR
-		unset SOURCE_BIN_DIR
-	fi
-
-	# Fix mozilla-config and install it
-	sed -i -e "s|/usr/lib/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}|g
-		s|/usr/include/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}/include|g" \
-		${S}/build/unix/mozilla-config
-	exeinto ${MOZILLA_FIVE_HOME}
-	doexe ${S}/build/unix/mozilla-config
-
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in ${S}/build/unix/*.pc; do
-		sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}|
-			s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|" ${x}
-		doins ${x}
-	done
-
-	# Install env.d snippet, which isn't necessary for running mozilla, but
-	# might be necessary for programs linked against firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10mozilla
-	dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10mozilla
-
-	# Install rebuild script since mozilla-bin doesn't support registration yet
-	exeinto ${MOZILLA_FIVE_HOME}
-	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
-
-	# Install docs
-	dodoc LEGAL LICENSE
-
-	# Update Google search plugin to use UTF8 charset ...
-	insinto ${MOZILLA_FIVE_HOME}/searchplugins
-	doins ${FILESDIR}/google.src
-}
-
-pkg_preinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Remove entire installed instance to solve various problems,
-	# for example see bug 27719
-	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
-}
-
-pkg_postinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Update the component registry
-	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
-		/usr/libexec/mozilla-launcher -register
-
-	# This should be called in the postinst and postrm of all the
-	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
-	# thunderbird-bin ebuilds.
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Update the component registry
-	if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-bin ]]; then
-		MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
-			/usr/libexec/mozilla-launcher -register
-	fi
-
-	update_mozilla_launcher_symlinks
-}
diff --git a/www-client/mozilla/mozilla-1.7.10-r3.ebuild b/www-client/mozilla/mozilla-1.7.10-r3.ebuild
deleted file mode 100644
index abbdbd6df160..000000000000
--- a/www-client/mozilla/mozilla-1.7.10-r3.ebuild
+++ /dev/null
@@ -1,388 +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/mozilla/mozilla-1.7.10-r3.ebuild,v 1.8 2005/08/10 02:14:39 hardave Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
-
-EMVER="0.92.0"
-IPCVER="1.1.3"
-
-# handle _rc versions
-MY_PV=${PV/_alpha/a} 	# handle alpha
-MY_PV=${MY_PV/_beta/b}	# handle beta
-MY_PV=${MY_PV/_rc/rc}	# handle rc
-
-DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
-HOMEPAGE="http://www.mozilla.org"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/source/${PN}-${MY_PV}-source.tar.bz2
-	crypt? ( !moznomail? (
-		http://www.mozilla-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
-		http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
-	) )
-	mirror://gentoo/mozilla-jslibmath-alpha.patch
-	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
-	http://dev.gentoo.org/~agriffis/dist/mozilla-1.7.10-nsplugins-v2.patch"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
-
-# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
-# and is required to build with support for cairo.  #71504
-RDEPEND="java? ( virtual/jre )
-	mozsvg? (
-		>=x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
-	>=www-client/mozilla-launcher-1.42"
-
-DEPEND="${RDEPEND}
-	~sys-devel/autoconf-2.13
-	java? ( >=dev-java/java-config-0.2.0 )
-	dev-lang/perl
-	postgres? ( >=dev-db/postgresql-7.2.0 )"
-
-S=${WORKDIR}/mozilla
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-#
-# NB: We can't export these vars until enigmail is installed separately instead
-# of integrated into this ebuild.
-#
-#export BUILD_OFFICIAL=1
-#export MOZILLA_OFFICIAL=1
-
-src_unpack() {
-	declare x
-
-	unpack mozilla-${MY_PV}-source.tar.bz2
-	cd ${S} || die
-
-	# Unpack the enigmail plugin
-	if use crypt && ! use moznomail; then
-		cd ${S}/extensions || die
-		unpack ipc-${IPCVER}.tar.gz enigmail-${EMVER}.tar.gz
-		for x in ipc enigmail; do
-			cd ${S}/extensions/${x} || die "cd failed"
-			makemake	# from mozconfig.eclass
-		done
-	fi
-	cd ${S}
-
-	####################################
-	#
-	# architecture patches
-	#
-	####################################
-
-	if [[ $(gcc-major-version) -eq 3 ]]; then
-		# ABI Patch for alpha/xpcom for gcc-3.x
-		if [[ ${ARCH} == alpha ]]; then
-			epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
-		fi
-	fi
-
-	# HPPA patches from Ivar <orskaug@stud.ntnu.no>
-	# <gmsoft@gentoo.org> (22 Dec 2004)
-	epatch ${FILESDIR}/mozilla-hppa.patch
-
-	# patch to fix math operations on alpha, makes maps.google.com work!
-	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
-
-	# Patch to allow compilation on ppc64 - bug #54843
-	use ppc64 && epatch ${FILESDIR}/mozilla-1.7.6-ppc64.patch
-
-	# Fix building on amd64 with gcc4 (patch from Debian)
-	epatch ${FILESDIR}/${PN}-1.7.8-amd64.patch
-
-	####################################
-	#
-	# general compilation and run-time fixes
-	#
-	####################################
-
-	# GCC4 compile fix, bug #87800
-	epatch ${FILESDIR}/${PN}-1.7.6-gcc4.patch
-
-	# Fix stack growth logic
-	epatch ${FILESDIR}/${PN}-stackgrowth.patch
-
-	# patch out ft caching code since the API changed between releases of
-	# freetype; this enables freetype-2.1.8+ compat.
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
-
-	# Patch for newer versions of cairo #80301
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-
-	####################################
-	#
-	# behavioral fixes
-	#
-	####################################
-
-	# Mozilla Bug 292257, https://bugzilla.mozilla.org/show_bug.cgi?id=292257
-	# Mozilla crashes under some rare cases when plugin.default_plugin_disabled
-	# is true. This patch fixes that. Backported by hansmi@gentoo.org.
-	epatch ${FILESDIR}/${PN}-1.7.8-objectframefix.diff
-
-	# Fix scripts that call for /usr/local/bin/perl #51916
-	ebegin "Patching smime to call perl from /usr/bin"
-	sed -i -e '1s,usr/local/bin,usr/bin,' security/nss/cmd/smimetools/smime
-	eend $? || die "sed failed"
-
-	# look in /usr/lib/nsplugins for plugins, in addition to the usual places
-	epatch ${DISTDIR}/mozilla-1.7.10-nsplugins-v2.patch
-
-	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-	declare x
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
-	# regardless of java setting.
-	mozconfig_annotate '' --enable-oji --enable-mathml
-
-	# Other moz-specific settings
-	mozconfig_use_enable mozdevelop jsd
-	mozconfig_use_enable mozdevelop xpctools
-	mozconfig_use_extension mozdevelop venkman
-	mozconfig_use_enable gnome gnomevfs
-	mozconfig_use_extension gnome gnomevfs
-	mozconfig_use_extension !moznoirc irc
-	mozconfig_use_extension postgres sql
-	if use postgres ; then
-		export MOZ_ENABLE_PGSQL=1
-		export MOZ_PGSQL_INCLUDES=/usr/include
-		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
-	fi
-	mozconfig_use_enable mozcalendar calendar
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --with-user-appdir=.mozilla
-
-	if use moznomail && ! use mozcalendar; then
-		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
-	fi
-	if use moznocompose && use moznomail; then
-		mozconfig_annotate "+moznocompose +moznomail" --disable-composer
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, which breaks us
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
-	# to econf, but the quotes cause configure to fail.
-	grep -Flre -DARON_WAS_HERE --exclude=config.\* . | xargs sed -i -e \
-	's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|'
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die
-
-	####################################
-	#
-	#  Build Mozilla NSS
-	#
-	####################################
-
-	# Build the NSS/SSL support
-	if use ssl; then
-		einfo "Building Mozilla NSS..."
-
-		# Fix #include problem
-		cd ${S}/security/coreconf || die "cd coreconf failed"
-		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
-			>>headers.mk
-		emake -j1 || die "make security headers failed"
-
-		cd ${S}/security/nss || die "cd nss failed"
-		emake -j1 moz_import || die "make moz_import failed"
-		emake -j1 || die "make nss failed"
-	fi
-
-	####################################
-	#
-	#  Build Enigmail extension
-	#
-	####################################
-
-	if use crypt && ! use moznomail; then
-		for x in ipc enigmail; do
-			emake -C ${S}/extensions/${x} || die "emake ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Most of the installation happens here
-	dodir ${MOZILLA_FIVE_HOME}
-	cp -RL ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
-
-	# Create directory structure to support portage-installed extensions.
-	# See update_chrome() in mozilla-launcher
-	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
-	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
-	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
-		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
-
-	# Create /usr/bin/mozilla
-	install_mozilla_launcher_stub mozilla ${MOZILLA_FIVE_HOME}
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/mozilla-icon.png
-
-	# Fix bug 54179: Install .desktop file into /usr/share/applications
-	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozilla.desktop
-
-	# Fix icons to look the same everywhere
-	insinto ${MOZILLA_FIVE_HOME}/icons
-	doins ${S}/widget/src/gtk/mozicon16.xpm
-	doins ${S}/widget/src/gtk/mozicon50.xpm
-
-	####################################
-	#
-	# Install files necessary for applications to build against mozilla
-	#
-	####################################
-
-	einfo "Installing includes and idl files..."
-	dodir ${MOZILLA_FIVE_HOME}/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include
-	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/include/idl
-
-	# Install the NSS/SSL libs, headers and tools
-	if use ssl; then
-		einfo "Installing Mozilla NSS..."
-		# Install the headers ('make install' do not work for headers ...)
-		insinto ${MOZILLA_FIVE_HOME}/include/nss
-		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
-		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
-		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
-		# These come with zlib ...
-		rm -f ${D}${MOZILLA_FIVE_HOME}/include/nss/{zconf.h,zlib.h}
-
-		cd ${S}/security/nss
-
-		mkdir -p ${WORKDIR}/nss/{bin,lib}
-		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
-		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
-
-		make install || die "make failed"
-		# Gets installed as symbolic links ...
-		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
-		cp -Lf ${WORKDIR}/nss/lib/* ${D}${MOZILLA_FIVE_HOME}
-
-		# Need to unset these incase we want to rebuild, else the build
-		# gets newked.
-		unset SOURCE_LIB_DIR
-		unset SOURCE_BIN_DIR
-	fi
-
-	# Fix mozilla-config and install it
-	sed -i -e "s|/usr/lib/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}|g
-		s|/usr/include/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}/include|g" \
-		${S}/build/unix/mozilla-config
-	exeinto ${MOZILLA_FIVE_HOME}
-	doexe ${S}/build/unix/mozilla-config
-
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in ${S}/build/unix/*.pc; do
-		sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}|
-			s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|" ${x}
-		doins ${x}
-	done
-
-	# Install env.d snippet, which isn't necessary for running mozilla, but
-	# might be necessary for programs linked against firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10mozilla
-	dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10mozilla
-
-	# Install rebuild script since mozilla-bin doesn't support registration yet
-	exeinto ${MOZILLA_FIVE_HOME}
-	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
-
-	# Install docs
-	dodoc LEGAL LICENSE
-
-	# Update Google search plugin to use UTF8 charset ...
-	insinto ${MOZILLA_FIVE_HOME}/searchplugins
-	doins ${FILESDIR}/google.src
-}
-
-pkg_preinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Remove entire installed instance to solve various problems,
-	# for example see bug 27719
-	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
-}
-
-pkg_postinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Update the component registry
-	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
-		/usr/libexec/mozilla-launcher -register
-
-	# This should be called in the postinst and postrm of all the
-	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
-	# thunderbird-bin ebuilds.
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Update the component registry
-	if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-bin ]]; then
-		MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
-			/usr/libexec/mozilla-launcher -register
-	fi
-
-	update_mozilla_launcher_symlinks
-}
diff --git a/www-client/mozilla/mozilla-1.7.11-r1.ebuild b/www-client/mozilla/mozilla-1.7.11-r1.ebuild
deleted file mode 100644
index 195ff7360c64..000000000000
--- a/www-client/mozilla/mozilla-1.7.11-r1.ebuild
+++ /dev/null
@@ -1,388 +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/mozilla/mozilla-1.7.11-r1.ebuild,v 1.1 2005/08/14 21:13:01 anarchy Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
-
-EMVER="0.92.0"
-IPCVER="1.1.3"
-
-# handle _rc versions
-MY_PV=${PV/_alpha/a} 	# handle alpha
-MY_PV=${MY_PV/_beta/b}	# handle beta
-MY_PV=${MY_PV/_rc/rc}	# handle rc
-
-DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
-HOMEPAGE="http://www.mozilla.org"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/source/${PN}-${MY_PV}-source.tar.bz2
-	crypt? ( !moznomail? (
-		http://www.mozilla-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
-		http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
-	) )
-	mirror://gentoo/mozilla-jslibmath-alpha.patch
-	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
-	http://dev.gentoo.org/~agriffis/dist/mozilla-1.7.10-nsplugins-v2.patch"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
-
-# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
-# and is required to build with support for cairo.  #71504
-RDEPEND="java? ( virtual/jre )
-	mozsvg? (
-		!<x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
-	>=www-client/mozilla-launcher-1.42"
-
-DEPEND="${RDEPEND}
-	~sys-devel/autoconf-2.13
-	java? ( >=dev-java/java-config-0.2.0 )
-	dev-lang/perl
-	postgres? ( >=dev-db/postgresql-7.2.0 )"
-
-S=${WORKDIR}/mozilla
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-#
-# NB: We can't export these vars until enigmail is installed separately instead
-# of integrated into this ebuild.
-#
-#export BUILD_OFFICIAL=1
-#export MOZILLA_OFFICIAL=1
-
-src_unpack() {
-	declare x
-
-	unpack mozilla-${MY_PV}-source.tar.bz2
-	cd ${S} || die
-
-	# Unpack the enigmail plugin
-	if use crypt && ! use moznomail; then
-		cd ${S}/extensions || die
-		unpack ipc-${IPCVER}.tar.gz enigmail-${EMVER}.tar.gz
-		for x in ipc enigmail; do
-			cd ${S}/extensions/${x} || die "cd failed"
-			makemake	# from mozconfig.eclass
-		done
-	fi
-	cd ${S}
-
-	####################################
-	#
-	# architecture patches
-	#
-	####################################
-
-	if [[ $(gcc-major-version) -eq 3 ]]; then
-		# ABI Patch for alpha/xpcom for gcc-3.x
-		if [[ ${ARCH} == alpha ]]; then
-			epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
-		fi
-	fi
-
-	# HPPA patches from Ivar <orskaug@stud.ntnu.no>
-	# <gmsoft@gentoo.org> (22 Dec 2004)
-	epatch ${FILESDIR}/mozilla-hppa.patch
-
-	# patch to fix math operations on alpha, makes maps.google.com work!
-	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
-
-	# Patch to allow compilation on ppc64 - bug #54843
-	use ppc64 && epatch ${FILESDIR}/mozilla-1.7.6-ppc64.patch
-
-	# Fix building on amd64 with gcc4 (patch from Debian)
-	epatch ${FILESDIR}/${PN}-1.7.8-amd64.patch
-
-	####################################
-	#
-	# general compilation and run-time fixes
-	#
-	####################################
-
-	# GCC4 compile fix, bug #87800
-	epatch ${FILESDIR}/${PN}-1.7.6-gcc4.patch
-
-	# Fix stack growth logic
-	epatch ${FILESDIR}/${PN}-stackgrowth.patch
-
-	# patch out ft caching code since the API changed between releases of
-	# freetype; this enables freetype-2.1.8+ compat.
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
-
-	# Patch for newer versions of cairo #80301
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-
-	####################################
-	#
-	# behavioral fixes
-	#
-	####################################
-
-	# Mozilla Bug 292257, https://bugzilla.mozilla.org/show_bug.cgi?id=292257
-	# Mozilla crashes under some rare cases when plugin.default_plugin_disabled
-	# is true. This patch fixes that. Backported by hansmi@gentoo.org.
-	epatch ${FILESDIR}/${PN}-1.7.8-objectframefix.diff
-
-	# Fix scripts that call for /usr/local/bin/perl #51916
-	ebegin "Patching smime to call perl from /usr/bin"
-	sed -i -e '1s,usr/local/bin,usr/bin,' security/nss/cmd/smimetools/smime
-	eend $? || die "sed failed"
-
-	# look in /usr/lib/nsplugins for plugins, in addition to the usual places
-	epatch ${DISTDIR}/mozilla-1.7.10-nsplugins-v2.patch
-
-	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-	declare x
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
-	# regardless of java setting.
-	mozconfig_annotate '' --enable-oji --enable-mathml
-
-	# Other moz-specific settings
-	mozconfig_use_enable mozdevelop jsd
-	mozconfig_use_enable mozdevelop xpctools
-	mozconfig_use_extension mozdevelop venkman
-	mozconfig_use_enable gnome gnomevfs
-	mozconfig_use_extension gnome gnomevfs
-	mozconfig_use_extension !moznoirc irc
-	mozconfig_use_extension postgres sql
-	if use postgres ; then
-		export MOZ_ENABLE_PGSQL=1
-		export MOZ_PGSQL_INCLUDES=/usr/include
-		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
-	fi
-	mozconfig_use_enable mozcalendar calendar
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --with-user-appdir=.mozilla
-
-	if use moznomail && ! use mozcalendar; then
-		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
-	fi
-	if use moznocompose && use moznomail; then
-		mozconfig_annotate "+moznocompose +moznomail" --disable-composer
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, which breaks us
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
-	# to econf, but the quotes cause configure to fail.
-	grep -Flre -DARON_WAS_HERE --exclude=config.\* . | xargs sed -i -e \
-	's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|'
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die
-
-	####################################
-	#
-	#  Build Mozilla NSS
-	#
-	####################################
-
-	# Build the NSS/SSL support
-	if use ssl; then
-		einfo "Building Mozilla NSS..."
-
-		# Fix #include problem
-		cd ${S}/security/coreconf || die "cd coreconf failed"
-		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
-			>>headers.mk
-		emake -j1 || die "make security headers failed"
-
-		cd ${S}/security/nss || die "cd nss failed"
-		emake -j1 moz_import || die "make moz_import failed"
-		emake -j1 || die "make nss failed"
-	fi
-
-	####################################
-	#
-	#  Build Enigmail extension
-	#
-	####################################
-
-	if use crypt && ! use moznomail; then
-		for x in ipc enigmail; do
-			emake -C ${S}/extensions/${x} || die "emake ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Most of the installation happens here
-	dodir ${MOZILLA_FIVE_HOME}
-	cp -RL ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
-
-	# Create directory structure to support portage-installed extensions.
-	# See update_chrome() in mozilla-launcher
-	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
-	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
-	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
-		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
-
-	# Create /usr/bin/mozilla
-	install_mozilla_launcher_stub mozilla ${MOZILLA_FIVE_HOME}
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/mozilla-icon.png
-
-	# Fix bug 54179: Install .desktop file into /usr/share/applications
-	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozilla.desktop
-
-	# Fix icons to look the same everywhere
-	insinto ${MOZILLA_FIVE_HOME}/icons
-	doins ${S}/widget/src/gtk/mozicon16.xpm
-	doins ${S}/widget/src/gtk/mozicon50.xpm
-
-	####################################
-	#
-	# Install files necessary for applications to build against mozilla
-	#
-	####################################
-
-	einfo "Installing includes and idl files..."
-	dodir ${MOZILLA_FIVE_HOME}/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include
-	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/include/idl
-
-	# Install the NSS/SSL libs, headers and tools
-	if use ssl; then
-		einfo "Installing Mozilla NSS..."
-		# Install the headers ('make install' do not work for headers ...)
-		insinto ${MOZILLA_FIVE_HOME}/include/nss
-		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
-		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
-		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
-		# These come with zlib ...
-		rm -f ${D}${MOZILLA_FIVE_HOME}/include/nss/{zconf.h,zlib.h}
-
-		cd ${S}/security/nss
-
-		mkdir -p ${WORKDIR}/nss/{bin,lib}
-		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
-		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
-
-		make install || die "make failed"
-		# Gets installed as symbolic links ...
-		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
-		cp -Lf ${WORKDIR}/nss/lib/* ${D}${MOZILLA_FIVE_HOME}
-
-		# Need to unset these incase we want to rebuild, else the build
-		# gets newked.
-		unset SOURCE_LIB_DIR
-		unset SOURCE_BIN_DIR
-	fi
-
-	# Fix mozilla-config and install it
-	sed -i -e "s|/usr/lib/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}|g
-		s|/usr/include/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}/include|g" \
-		${S}/build/unix/mozilla-config
-	exeinto ${MOZILLA_FIVE_HOME}
-	doexe ${S}/build/unix/mozilla-config
-
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in ${S}/build/unix/*.pc; do
-		sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}|
-			s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|" ${x}
-		doins ${x}
-	done
-
-	# Install env.d snippet, which isn't necessary for running mozilla, but
-	# might be necessary for programs linked against firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10mozilla
-	dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10mozilla
-
-	# Install rebuild script since mozilla-bin doesn't support registration yet
-	exeinto ${MOZILLA_FIVE_HOME}
-	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
-
-	# Install docs
-	dodoc LEGAL LICENSE
-
-	# Update Google search plugin to use UTF8 charset ...
-	insinto ${MOZILLA_FIVE_HOME}/searchplugins
-	doins ${FILESDIR}/google.src
-}
-
-pkg_preinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Remove entire installed instance to solve various problems,
-	# for example see bug 27719
-	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
-}
-
-pkg_postinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Update the component registry
-	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
-		/usr/libexec/mozilla-launcher -register
-
-	# This should be called in the postinst and postrm of all the
-	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
-	# thunderbird-bin ebuilds.
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Update the component registry
-	if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-bin ]]; then
-		MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
-			/usr/libexec/mozilla-launcher -register
-	fi
-
-	update_mozilla_launcher_symlinks
-}
diff --git a/www-client/mozilla/mozilla-1.7.11-r2.ebuild b/www-client/mozilla/mozilla-1.7.11-r2.ebuild
deleted file mode 100644
index 6b1f0c7c58d4..000000000000
--- a/www-client/mozilla/mozilla-1.7.11-r2.ebuild
+++ /dev/null
@@ -1,390 +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/mozilla/mozilla-1.7.11-r2.ebuild,v 1.2 2005/08/16 15:04:24 anarchy Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
-
-EMVER="0.92.0"
-IPCVER="1.1.3"
-
-# handle _rc versions
-MY_PV=${PV/_alpha/a} 	# handle alpha
-MY_PV=${MY_PV/_beta/b}	# handle beta
-MY_PV=${MY_PV/_rc/rc}	# handle rc
-
-DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
-HOMEPAGE="http://www.mozilla.org"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/source/${PN}-${MY_PV}-source.tar.bz2
-	crypt? ( !moznomail? (
-		http://www.mozilla-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
-		http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
-	) )
-	mirror://gentoo/mozilla-jslibmath-alpha.patch
-	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
-	http://dev.gentoo.org/~agriffis/dist/mozilla-1.7.10-nsplugins-v2.patch"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
-
-# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
-# and is required to build with support for cairo.  #71504
-RDEPEND="java? ( virtual/jre )
-	mozsvg? (
-		!<x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
-	>=www-client/mozilla-launcher-1.42"
-
-DEPEND="${RDEPEND}
-	~sys-devel/autoconf-2.13
-	java? ( >=dev-java/java-config-0.2.0 )
-	dev-lang/perl
-	postgres? ( >=dev-db/postgresql-7.2.0 )"
-
-S=${WORKDIR}/mozilla
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-#
-# NB: We can't export these vars until enigmail is installed separately instead
-# of integrated into this ebuild.
-#
-#export BUILD_OFFICIAL=1
-#export MOZILLA_OFFICIAL=1
-
-src_unpack() {
-	declare x
-
-	unpack mozilla-${MY_PV}-source.tar.bz2
-	cd ${S} || die
-
-	# Unpack the enigmail plugin
-	if use crypt && ! use moznomail; then
-		cd ${S}/extensions || die
-		unpack ipc-${IPCVER}.tar.gz enigmail-${EMVER}.tar.gz
-		for x in ipc enigmail; do
-			cd ${S}/extensions/${x} || die "cd failed"
-			makemake	# from mozconfig.eclass
-		done
-	fi
-	cd ${S}
-
-	####################################
-	#
-	# architecture patches
-	#
-	####################################
-
-	if [[ $(gcc-major-version) -eq 3 ]]; then
-		# ABI Patch for alpha/xpcom for gcc-3.x
-		if [[ ${ARCH} == alpha ]]; then
-			epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
-		fi
-	fi
-
-	# HPPA patches from Ivar <orskaug@stud.ntnu.no>
-	# <gmsoft@gentoo.org> (22 Dec 2004)
-	epatch ${FILESDIR}/mozilla-hppa.patch
-
-	# patch to fix math operations on alpha, makes maps.google.com work!
-	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
-
-	# Patch to allow compilation on ppc64 - bug #54843
-	use ppc64 && epatch ${FILESDIR}/mozilla-1.7.6-ppc64.patch
-
-	# Fix building on amd64 with gcc4 (patch from Debian)
-	epatch ${FILESDIR}/${PN}-1.7.8-amd64.patch
-
-	####################################
-	#
-	# general compilation and run-time fixes
-	#
-	####################################
-
-	# GCC4 compile fix, bug #87800
-	epatch ${FILESDIR}/${PN}-1.7.6-gcc4.patch
-
-	# Fix stack growth logic
-	epatch ${FILESDIR}/${PN}-stackgrowth.patch
-
-	# patch out ft caching code since the API changed between releases of
-	# freetype; this enables freetype-2.1.8+ compat.
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
-
-	# Patch for newer versions of cairo #80301
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-
-	####################################
-	#
-	# behavioral fixes
-	#
-	####################################
-
-	# Mozilla Bug 292257, https://bugzilla.mozilla.org/show_bug.cgi?id=292257
-	# Mozilla crashes under some rare cases when plugin.default_plugin_disabled
-	# is true. This patch fixes that. Backported by hansmi@gentoo.org.
-	epatch ${FILESDIR}/${PN}-1.7.8-objectframefix.diff
-
-	# Fix scripts that call for /usr/local/bin/perl #51916
-	ebegin "Patching smime to call perl from /usr/bin"
-	sed -i -e '1s,usr/local/bin,usr/bin,' security/nss/cmd/smimetools/smime
-	eend $? || die "sed failed"
-
-	# look in /usr/lib/nsplugins for plugins, in addition to the usual places
-	epatch ${DISTDIR}/mozilla-1.7.10-nsplugins-v2.patch
-
-	#rpath patch
-	epatch ${FILESDIR}/mozilla-rpath-1.patch
-
-	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-	declare x
-
-	grep -Flr "#RPATH_FIXER" --include=*.mk . | xargs sed -i -e \
-		's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|'
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
-	# regardless of java setting.
-	mozconfig_annotate '' --enable-oji --enable-mathml
-
-	# Other moz-specific settings
-	mozconfig_use_enable mozdevelop jsd
-	mozconfig_use_enable mozdevelop xpctools
-	mozconfig_use_extension mozdevelop venkman
-	mozconfig_use_enable gnome gnomevfs
-	mozconfig_use_extension gnome gnomevfs
-	mozconfig_use_extension !moznoirc irc
-	mozconfig_use_extension postgres sql
-	if use postgres ; then
-		export MOZ_ENABLE_PGSQL=1
-		export MOZ_PGSQL_INCLUDES=/usr/include
-		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
-	fi
-	mozconfig_use_enable mozcalendar calendar
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --with-user-appdir=.mozilla
-
-	if use moznomail && ! use mozcalendar; then
-		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
-	fi
-	if use moznocompose && use moznomail; then
-		mozconfig_annotate "+moznocompose +moznomail" --disable-composer
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, which breaks us
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
-	# to econf, but the quotes cause configure to fail.
-	grep -Flre -DARON_WAS_HERE --exclude=config.\* . | xargs sed -i -e \
-	's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|'
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die
-
-	####################################
-	#
-	#  Build Mozilla NSS
-	#
-	####################################
-
-	# Build the NSS/SSL support
-	if use ssl; then
-		einfo "Building Mozilla NSS..."
-
-		# Fix #include problem
-		cd ${S}/security/coreconf || die "cd coreconf failed"
-		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
-			>>headers.mk
-		emake -j1 || die "make security headers failed"
-
-		cd ${S}/security/nss || die "cd nss failed"
-		emake -j1 moz_import || die "make moz_import failed"
-		emake -j1 || die "make nss failed"
-	fi
-
-	####################################
-	#
-	#  Build Enigmail extension
-	#
-	####################################
-
-	if use crypt && ! use moznomail; then
-		for x in ipc enigmail; do
-			emake -C ${S}/extensions/${x} || die "emake ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Most of the installation happens here
-	dodir ${MOZILLA_FIVE_HOME}
-	cp -RL ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
-
-	# Create directory structure to support portage-installed extensions.
-	# See update_chrome() in mozilla-launcher
-	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
-	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
-	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
-		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
-
-	# Create /usr/bin/mozilla
-	install_mozilla_launcher_stub mozilla ${MOZILLA_FIVE_HOME}
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/mozilla-icon.png
-
-	# Fix bug 54179: Install .desktop file into /usr/share/applications
-	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozilla.desktop
-
-	# Fix icons to look the same everywhere
-	insinto ${MOZILLA_FIVE_HOME}/icons
-	doins ${S}/widget/src/gtk/mozicon16.xpm
-	doins ${S}/widget/src/gtk/mozicon50.xpm
-
-	####################################
-	#
-	# Install files necessary for applications to build against mozilla
-	#
-	####################################
-
-	einfo "Installing includes and idl files..."
-	dodir ${MOZILLA_FIVE_HOME}/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include
-	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/include/idl
-
-	# Install the NSS/SSL libs, headers and tools
-	if use ssl; then
-		einfo "Installing Mozilla NSS..."
-		# Install the headers ('make install' do not work for headers ...)
-		insinto ${MOZILLA_FIVE_HOME}/include/nss
-		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
-		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
-		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
-		# These come with zlib ...
-		rm -f ${D}${MOZILLA_FIVE_HOME}/include/nss/{zconf.h,zlib.h}
-
-		cd ${S}/security/nss
-
-		mkdir -p ${WORKDIR}/nss/{bin,lib}
-		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
-		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
-
-		make install || die "make failed"
-		# Gets installed as symbolic links ...
-		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
-		cp -Lf ${WORKDIR}/nss/lib/* ${D}${MOZILLA_FIVE_HOME}
-
-		# Need to unset these incase we want to rebuild, else the build
-		# gets newked.
-		unset SOURCE_LIB_DIR
-		unset SOURCE_BIN_DIR
-	fi
-
-	# Fix mozilla-config and install it
-	sed -i -e "s|/usr/lib/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}|g
-		s|/usr/include/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}/include|g" \
-		${S}/build/unix/mozilla-config
-	exeinto ${MOZILLA_FIVE_HOME}
-	doexe ${S}/build/unix/mozilla-config
-
-	# Fix pkgconfig files and install them
-	sed -i -e "s|-L/usr/lib/mozilla-${PV}|-L\$\{libdir\}|" \
-			${S}/build/unix/mozilla-nspr.pc
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in ${S}/build/unix/*.pc; do
-		sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}|
-			s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|
-			s|\(^Libs: -L.*\)\($\)|\1 -Wl,-R\$\{libdir\}\2|" ${x}
-		doins ${x}
-	done
-
-	# Install rebuild script since mozilla-bin doesn't support registration yet
-	exeinto ${MOZILLA_FIVE_HOME}
-	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
-
-	# Install docs
-	dodoc LEGAL LICENSE
-
-	# Update Google search plugin to use UTF8 charset ...
-	insinto ${MOZILLA_FIVE_HOME}/searchplugins
-	doins ${FILESDIR}/google.src
-}
-
-pkg_preinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Remove entire installed instance to solve various problems,
-	# for example see bug 27719
-	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
-}
-
-pkg_postinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Update the component registry
-	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
-		/usr/libexec/mozilla-launcher -register
-
-	# This should be called in the postinst and postrm of all the
-	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
-	# thunderbird-bin ebuilds.
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Update the component registry
-	if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-bin ]]; then
-		MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
-			/usr/libexec/mozilla-launcher -register
-	fi
-
-	update_mozilla_launcher_symlinks
-}
diff --git a/www-client/mozilla/mozilla-1.7.11-r3.ebuild b/www-client/mozilla/mozilla-1.7.11-r3.ebuild
deleted file mode 100644
index 72b6052dc967..000000000000
--- a/www-client/mozilla/mozilla-1.7.11-r3.ebuild
+++ /dev/null
@@ -1,396 +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/mozilla/mozilla-1.7.11-r3.ebuild,v 1.11 2006/01/10 06:16:17 vapier Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
-
-EMVER="0.92.0"
-IPCVER="1.1.3"
-
-# handle _rc versions
-MY_PV=${PV/_alpha/a} 	# handle alpha
-MY_PV=${MY_PV/_beta/b}	# handle beta
-MY_PV=${MY_PV/_rc/rc}	# handle rc
-
-DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
-HOMEPAGE="http://www.mozilla.org"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/source/${PN}-${MY_PV}-source.tar.bz2
-	crypt? ( !moznomail? (
-		http://www.mozilla-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
-		http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
-	) )
-	mirror://gentoo/mozilla-jslibmath-alpha.patch
-	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
-	http://dev.gentoo.org/~agriffis/dist/mozilla-1.7.10-nsplugins-v2.patch"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sparc x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
-
-# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
-# and is required to build with support for cairo.  #71504
-RDEPEND="java? ( virtual/jre )
-	mozsvg? (
-		!<x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
-	>=www-client/mozilla-launcher-1.42"
-
-DEPEND="${RDEPEND}
-	~sys-devel/autoconf-2.13
-	java? ( >=dev-java/java-config-0.2.0 )
-	dev-lang/perl
-	postgres? ( >=dev-db/postgresql-7.2.0 )"
-
-S=${WORKDIR}/mozilla
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-#
-# NB: We can't export these vars until enigmail is installed separately instead
-# of integrated into this ebuild.
-#
-#export BUILD_OFFICIAL=1
-#export MOZILLA_OFFICIAL=1
-
-src_unpack() {
-	declare x
-
-	unpack mozilla-${MY_PV}-source.tar.bz2
-	cd ${S} || die
-
-	# Unpack the enigmail plugin
-	if use crypt && ! use moznomail; then
-		cd ${S}/extensions || die
-		unpack ipc-${IPCVER}.tar.gz enigmail-${EMVER}.tar.gz
-		for x in ipc enigmail; do
-			cd ${S}/extensions/${x} || die "cd failed"
-			makemake	# from mozconfig.eclass
-		done
-	fi
-	cd ${S}
-
-	####################################
-	#
-	# architecture patches
-	#
-	####################################
-
-	if [[ $(gcc-major-version) -eq 3 ]]; then
-		# ABI Patch for alpha/xpcom for gcc-3.x
-		if [[ ${ARCH} == alpha ]]; then
-			epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
-		fi
-	fi
-
-	# HPPA patches from Ivar <orskaug@stud.ntnu.no>
-	# <gmsoft@gentoo.org> (22 Dec 2004)
-	epatch ${FILESDIR}/mozilla-hppa.patch
-
-	# patch to fix math operations on alpha, makes maps.google.com work!
-	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
-
-	# Patch to allow compilation on ppc64 - bug #54843
-	use ppc64 && epatch ${FILESDIR}/mozilla-1.7.6-ppc64.patch
-
-	# Fix building on amd64 with gcc4 (patch from Debian)
-	epatch ${FILESDIR}/${PN}-1.7.8-amd64.patch
-
-	####################################
-	#
-	# general compilation and run-time fixes
-	#
-	####################################
-
-	# GCC4 compile fix, bug #87800
-	epatch ${FILESDIR}/${PN}-1.7.6-gcc4.patch
-
-	# Fix stack growth logic
-	epatch ${FILESDIR}/${PN}-stackgrowth.patch
-
-	# patch out ft caching code since the API changed between releases of
-	# freetype; this enables freetype-2.1.8+ compat.
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
-
-	# Patch for newer versions of cairo #80301
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-
-	####################################
-	#
-	# behavioral fixes
-	#
-	####################################
-
-	# Mozilla Bug 292257, https://bugzilla.mozilla.org/show_bug.cgi?id=292257
-	# Mozilla crashes under some rare cases when plugin.default_plugin_disabled
-	# is true. This patch fixes that. Backported by hansmi@gentoo.org.
-	epatch ${FILESDIR}/${PN}-1.7.8-objectframefix.diff
-
-	# Fix scripts that call for /usr/local/bin/perl #51916
-	ebegin "Patching smime to call perl from /usr/bin"
-	sed -i -e '1s,usr/local/bin,usr/bin,' security/nss/cmd/smimetools/smime
-	eend $? || die "sed failed"
-
-	# look in /usr/lib/nsplugins for plugins, in addition to the usual places
-	epatch ${DISTDIR}/mozilla-1.7.10-nsplugins-v2.patch
-
-	####################################
-	#
-	# security fixes
-	#
-	####################################
-
-	epatch ${FILESDIR}/${P}-GLSA105396.patch
-
-	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-	declare x
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
-	# regardless of java setting.
-	mozconfig_annotate '' --enable-oji --enable-mathml
-
-	# Other moz-specific settings
-	mozconfig_use_enable mozdevelop jsd
-	mozconfig_use_enable mozdevelop xpctools
-	mozconfig_use_extension mozdevelop venkman
-	mozconfig_use_enable gnome gnomevfs
-	mozconfig_use_extension gnome gnomevfs
-	mozconfig_use_extension !moznoirc irc
-	mozconfig_use_extension postgres sql
-	if use postgres ; then
-		export MOZ_ENABLE_PGSQL=1
-		export MOZ_PGSQL_INCLUDES=/usr/include
-		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
-	fi
-	mozconfig_use_enable mozcalendar calendar
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --with-user-appdir=.mozilla
-
-	if use moznomail && ! use mozcalendar; then
-		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
-	fi
-	if use moznocompose && use moznomail; then
-		mozconfig_annotate "+moznocompose +moznomail" --disable-composer
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, which breaks us
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
-	# to econf, but the quotes cause configure to fail.
-	grep -Flre -DARON_WAS_HERE --exclude=config.\* . | xargs sed -i -e \
-	's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|'
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die
-
-	####################################
-	#
-	#  Build Mozilla NSS
-	#
-	####################################
-
-	# Build the NSS/SSL support
-	if use ssl; then
-		einfo "Building Mozilla NSS..."
-
-		# Fix #include problem
-		cd ${S}/security/coreconf || die "cd coreconf failed"
-		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
-			>>headers.mk
-		emake -j1 || die "make security headers failed"
-
-		cd ${S}/security/nss || die "cd nss failed"
-		emake -j1 moz_import || die "make moz_import failed"
-		emake -j1 || die "make nss failed"
-	fi
-
-	####################################
-	#
-	#  Build Enigmail extension
-	#
-	####################################
-
-	if use crypt && ! use moznomail; then
-		for x in ipc enigmail; do
-			emake -C ${S}/extensions/${x} || die "emake ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Most of the installation happens here
-	dodir ${MOZILLA_FIVE_HOME}
-	cp -RL ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
-
-	# Create directory structure to support portage-installed extensions.
-	# See update_chrome() in mozilla-launcher
-	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
-	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
-	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
-		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
-
-	# Create /usr/bin/mozilla
-	install_mozilla_launcher_stub mozilla ${MOZILLA_FIVE_HOME}
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/mozilla-icon.png
-
-	# Fix bug 54179: Install .desktop file into /usr/share/applications
-	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozilla.desktop
-
-	# Fix icons to look the same everywhere
-	insinto ${MOZILLA_FIVE_HOME}/icons
-	doins ${S}/widget/src/gtk/mozicon16.xpm
-	doins ${S}/widget/src/gtk/mozicon50.xpm
-
-	####################################
-	#
-	# Install files necessary for applications to build against mozilla
-	#
-	####################################
-
-	einfo "Installing includes and idl files..."
-	dodir ${MOZILLA_FIVE_HOME}/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include
-	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/include/idl
-
-	# Install the NSS/SSL libs, headers and tools
-	if use ssl; then
-		einfo "Installing Mozilla NSS..."
-		# Install the headers ('make install' do not work for headers ...)
-		insinto ${MOZILLA_FIVE_HOME}/include/nss
-		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
-		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
-		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
-		# These come with zlib ...
-		rm -f ${D}${MOZILLA_FIVE_HOME}/include/nss/{zconf.h,zlib.h}
-
-		cd ${S}/security/nss
-
-		mkdir -p ${WORKDIR}/nss/{bin,lib}
-		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
-		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
-
-		make install || die "make failed"
-		# Gets installed as symbolic links ...
-		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
-		cp -Lf ${WORKDIR}/nss/lib/* ${D}${MOZILLA_FIVE_HOME}
-
-		# Need to unset these incase we want to rebuild, else the build
-		# gets newked.
-		unset SOURCE_LIB_DIR
-		unset SOURCE_BIN_DIR
-	fi
-
-	# Fix mozilla-config and install it
-	sed -i -e "s|/usr/lib/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}|g
-		s|/usr/include/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}/include|g" \
-		${S}/build/unix/mozilla-config
-	exeinto ${MOZILLA_FIVE_HOME}
-	doexe ${S}/build/unix/mozilla-config
-
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in ${S}/build/unix/*.pc; do
-		sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}|
-			s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|" ${x}
-		doins ${x}
-	done
-
-	# Install env.d snippet, which isn't necessary for running mozilla, but
-	# might be necessary for programs linked against firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10mozilla
-	dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10mozilla
-
-	# Install rebuild script since mozilla-bin doesn't support registration yet
-	exeinto ${MOZILLA_FIVE_HOME}
-	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
-
-	# Install docs
-	dodoc LEGAL LICENSE
-
-	# Update Google search plugin to use UTF8 charset ...
-	insinto ${MOZILLA_FIVE_HOME}/searchplugins
-	doins ${FILESDIR}/google.src
-}
-
-pkg_preinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Remove entire installed instance to solve various problems,
-	# for example see bug 27719
-	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
-}
-
-pkg_postinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Update the component registry
-	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
-		/usr/libexec/mozilla-launcher -register
-
-	# This should be called in the postinst and postrm of all the
-	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
-	# thunderbird-bin ebuilds.
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Update the component registry
-	if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-bin ]]; then
-		MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
-			/usr/libexec/mozilla-launcher -register
-	fi
-
-	update_mozilla_launcher_symlinks
-}
diff --git a/www-client/mozilla/mozilla-1.7.11.ebuild b/www-client/mozilla/mozilla-1.7.11.ebuild
deleted file mode 100644
index 88f4974890ab..000000000000
--- a/www-client/mozilla/mozilla-1.7.11.ebuild
+++ /dev/null
@@ -1,388 +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/mozilla/mozilla-1.7.11.ebuild,v 1.10 2005/08/11 21:19:20 killerfox Exp $
-
-unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
-inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
-
-EMVER="0.92.0"
-IPCVER="1.1.3"
-
-# handle _rc versions
-MY_PV=${PV/_alpha/a} 	# handle alpha
-MY_PV=${MY_PV/_beta/b}	# handle beta
-MY_PV=${MY_PV/_rc/rc}	# handle rc
-
-DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
-HOMEPAGE="http://www.mozilla.org"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/${PN}${MY_PV}/source/${PN}-${MY_PV}-source.tar.bz2
-	crypt? ( !moznomail? (
-		http://www.mozilla-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
-		http://www.mozilla-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
-	) )
-	mirror://gentoo/mozilla-jslibmath-alpha.patch
-	mirror://gentoo/mozilla-firefox-1.0-4ft2.patch.bz2
-	http://dev.gentoo.org/~agriffis/dist/mozilla-1.7.10-nsplugins-v2.patch"
-
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
-
-# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
-# and is required to build with support for cairo.  #71504
-RDEPEND="java? ( virtual/jre )
-	mozsvg? (
-		>=x11-base/xorg-x11-6.7.0-r2
-		x11-libs/cairo
-	)
-	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
-	>=www-client/mozilla-launcher-1.42"
-
-DEPEND="${RDEPEND}
-	~sys-devel/autoconf-2.13
-	java? ( >=dev-java/java-config-0.2.0 )
-	dev-lang/perl
-	postgres? ( >=dev-db/postgresql-7.2.0 )"
-
-S=${WORKDIR}/mozilla
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-#
-# NB: We can't export these vars until enigmail is installed separately instead
-# of integrated into this ebuild.
-#
-#export BUILD_OFFICIAL=1
-#export MOZILLA_OFFICIAL=1
-
-src_unpack() {
-	declare x
-
-	unpack mozilla-${MY_PV}-source.tar.bz2
-	cd ${S} || die
-
-	# Unpack the enigmail plugin
-	if use crypt && ! use moznomail; then
-		cd ${S}/extensions || die
-		unpack ipc-${IPCVER}.tar.gz enigmail-${EMVER}.tar.gz
-		for x in ipc enigmail; do
-			cd ${S}/extensions/${x} || die "cd failed"
-			makemake	# from mozconfig.eclass
-		done
-	fi
-	cd ${S}
-
-	####################################
-	#
-	# architecture patches
-	#
-	####################################
-
-	if [[ $(gcc-major-version) -eq 3 ]]; then
-		# ABI Patch for alpha/xpcom for gcc-3.x
-		if [[ ${ARCH} == alpha ]]; then
-			epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
-		fi
-	fi
-
-	# HPPA patches from Ivar <orskaug@stud.ntnu.no>
-	# <gmsoft@gentoo.org> (22 Dec 2004)
-	epatch ${FILESDIR}/mozilla-hppa.patch
-
-	# patch to fix math operations on alpha, makes maps.google.com work!
-	epatch ${DISTDIR}/mozilla-jslibmath-alpha.patch
-
-	# Patch to allow compilation on ppc64 - bug #54843
-	use ppc64 && epatch ${FILESDIR}/mozilla-1.7.6-ppc64.patch
-
-	# Fix building on amd64 with gcc4 (patch from Debian)
-	epatch ${FILESDIR}/${PN}-1.7.8-amd64.patch
-
-	####################################
-	#
-	# general compilation and run-time fixes
-	#
-	####################################
-
-	# GCC4 compile fix, bug #87800
-	epatch ${FILESDIR}/${PN}-1.7.6-gcc4.patch
-
-	# Fix stack growth logic
-	epatch ${FILESDIR}/${PN}-stackgrowth.patch
-
-	# patch out ft caching code since the API changed between releases of
-	# freetype; this enables freetype-2.1.8+ compat.
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
-	epatch ${DISTDIR}/mozilla-firefox-1.0-4ft2.patch.bz2
-
-	# Patch for newer versions of cairo #80301
-	if has_version '>=x11-libs/cairo-0.3.0'; then
-		epatch ${FILESDIR}/svg-cairo-0.3.0-fix.patch
-	fi
-
-	####################################
-	#
-	# behavioral fixes
-	#
-	####################################
-
-	# Mozilla Bug 292257, https://bugzilla.mozilla.org/show_bug.cgi?id=292257
-	# Mozilla crashes under some rare cases when plugin.default_plugin_disabled
-	# is true. This patch fixes that. Backported by hansmi@gentoo.org.
-	epatch ${FILESDIR}/${PN}-1.7.8-objectframefix.diff
-
-	# Fix scripts that call for /usr/local/bin/perl #51916
-	ebegin "Patching smime to call perl from /usr/bin"
-	sed -i -e '1s,usr/local/bin,usr/bin,' security/nss/cmd/smimetools/smime
-	eend $? || die "sed failed"
-
-	# look in /usr/lib/nsplugins for plugins, in addition to the usual places
-	epatch ${DISTDIR}/mozilla-1.7.10-nsplugins-v2.patch
-
-	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-	declare x
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
-	# regardless of java setting.
-	mozconfig_annotate '' --enable-oji --enable-mathml
-
-	# Other moz-specific settings
-	mozconfig_use_enable mozdevelop jsd
-	mozconfig_use_enable mozdevelop xpctools
-	mozconfig_use_extension mozdevelop venkman
-	mozconfig_use_enable gnome gnomevfs
-	mozconfig_use_extension gnome gnomevfs
-	mozconfig_use_extension !moznoirc irc
-	mozconfig_use_extension postgres sql
-	if use postgres ; then
-		export MOZ_ENABLE_PGSQL=1
-		export MOZ_PGSQL_INCLUDES=/usr/include
-		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
-	fi
-	mozconfig_use_enable mozcalendar calendar
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-cairo
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --with-user-appdir=.mozilla
-
-	if use moznomail && ! use mozcalendar; then
-		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
-	fi
-	if use moznocompose && use moznomail; then
-		mozconfig_annotate "+moznocompose +moznomail" --disable-composer
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, which breaks us
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
-	# to econf, but the quotes cause configure to fail.
-	grep -Flre -DARON_WAS_HERE --exclude=config.\* . | xargs sed -i -e \
-	's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|'
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die
-
-	####################################
-	#
-	#  Build Mozilla NSS
-	#
-	####################################
-
-	# Build the NSS/SSL support
-	if use ssl; then
-		einfo "Building Mozilla NSS..."
-
-		# Fix #include problem
-		cd ${S}/security/coreconf || die "cd coreconf failed"
-		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
-			>>headers.mk
-		emake -j1 || die "make security headers failed"
-
-		cd ${S}/security/nss || die "cd nss failed"
-		emake -j1 moz_import || die "make moz_import failed"
-		emake -j1 || die "make nss failed"
-	fi
-
-	####################################
-	#
-	#  Build Enigmail extension
-	#
-	####################################
-
-	if use crypt && ! use moznomail; then
-		for x in ipc enigmail; do
-			emake -C ${S}/extensions/${x} || die "emake ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Most of the installation happens here
-	dodir ${MOZILLA_FIVE_HOME}
-	cp -RL ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
-
-	# Create directory structure to support portage-installed extensions.
-	# See update_chrome() in mozilla-launcher
-	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
-	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
-	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
-		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
-
-	# Create /usr/bin/mozilla
-	install_mozilla_launcher_stub mozilla ${MOZILLA_FIVE_HOME}
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/mozilla-icon.png
-
-	# Fix bug 54179: Install .desktop file into /usr/share/applications
-	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/mozilla.desktop
-
-	# Fix icons to look the same everywhere
-	insinto ${MOZILLA_FIVE_HOME}/icons
-	doins ${S}/widget/src/gtk/mozicon16.xpm
-	doins ${S}/widget/src/gtk/mozicon50.xpm
-
-	####################################
-	#
-	# Install files necessary for applications to build against mozilla
-	#
-	####################################
-
-	einfo "Installing includes and idl files..."
-	dodir ${MOZILLA_FIVE_HOME}/include/idl /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include
-	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/include/idl
-
-	# Install the NSS/SSL libs, headers and tools
-	if use ssl; then
-		einfo "Installing Mozilla NSS..."
-		# Install the headers ('make install' do not work for headers ...)
-		insinto ${MOZILLA_FIVE_HOME}/include/nss
-		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
-		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
-		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
-		# These come with zlib ...
-		rm -f ${D}${MOZILLA_FIVE_HOME}/include/nss/{zconf.h,zlib.h}
-
-		cd ${S}/security/nss
-
-		mkdir -p ${WORKDIR}/nss/{bin,lib}
-		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
-		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
-
-		make install || die "make failed"
-		# Gets installed as symbolic links ...
-		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
-		cp -Lf ${WORKDIR}/nss/lib/* ${D}${MOZILLA_FIVE_HOME}
-
-		# Need to unset these incase we want to rebuild, else the build
-		# gets newked.
-		unset SOURCE_LIB_DIR
-		unset SOURCE_BIN_DIR
-	fi
-
-	# Fix mozilla-config and install it
-	sed -i -e "s|/usr/lib/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}|g
-		s|/usr/include/mozilla-${MY_PV}|${MOZILLA_FIVE_HOME}/include|g" \
-		${S}/build/unix/mozilla-config
-	exeinto ${MOZILLA_FIVE_HOME}
-	doexe ${S}/build/unix/mozilla-config
-
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in ${S}/build/unix/*.pc; do
-		sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}|
-			s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|" ${x}
-		doins ${x}
-	done
-
-	# Install env.d snippet, which isn't necessary for running mozilla, but
-	# might be necessary for programs linked against firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10mozilla
-	dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10mozilla
-
-	# Install rebuild script since mozilla-bin doesn't support registration yet
-	exeinto ${MOZILLA_FIVE_HOME}
-	doexe ${FILESDIR}/mozilla-rebuild-databases.pl
-
-	# Install docs
-	dodoc LEGAL LICENSE
-
-	# Update Google search plugin to use UTF8 charset ...
-	insinto ${MOZILLA_FIVE_HOME}/searchplugins
-	doins ${FILESDIR}/google.src
-}
-
-pkg_preinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Remove entire installed instance to solve various problems,
-	# for example see bug 27719
-	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
-}
-
-pkg_postinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Update the component registry
-	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
-		/usr/libexec/mozilla-launcher -register
-
-	# This should be called in the postinst and postrm of all the
-	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
-	# thunderbird-bin ebuilds.
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Update the component registry
-	if [[ -x ${MOZILLA_FIVE_HOME}/mozilla-bin ]]; then
-		MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=mozilla \
-			/usr/libexec/mozilla-launcher -register
-	fi
-
-	update_mozilla_launcher_symlinks
-}
diff --git a/www-client/mozilla/mozilla-1.7.12-r2.ebuild b/www-client/mozilla/mozilla-1.7.12-r2.ebuild
deleted file mode 100644
index 4466366dc7e5..000000000000
--- a/www-client/mozilla/mozilla-1.7.12-r2.ebuild
+++ /dev/null
@@ -1,378 +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/mozilla/mozilla-1.7.12-r2.ebuild,v 1.9 2005/10/02 16:37:13 agriffis Exp $
-
-unset ALLOWED_FLAGS  # Stupid extra-functions.sh ... bug 49179
-MOZ_FREETYPE2="no"   # Need to disable for newer .. remove here and in mozconfig
-	                 # when older is removed from tree.
-MOZ_PANGO="yes"      # Need to enable for newer .. remove here and in mozconfig
-	                 # when older is removed from tree.
-inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
-
-PVER="1.1"
-EMVER="0.92.0"
-IPCVER="1.1.3"
-SVGVER="2.3.10p1"
-
-# handle _rc versions
-MY_PV=${PV/_alpha/a} 	# handle alpha
-MY_PV=${MY_PV/_beta/b}	# handle beta
-MY_PV=${MY_PV/_rc/rc}	# handle rc
-
-DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
-HOMEPAGE="http://www.mozilla.org"
-SRC_URI="http://ftp.${PN}.org/pub/${PN}.org/${PN}/releases/${PN}${MY_PV}/source/${PN}-${MY_PV}-source.tar.bz2
-	crypt? ( !moznomail? (
-		http://www.${PN}-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
-		http://www.${PN}-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
-	) )
-	mozsvg? (
-		mirror://gentoo/moz_libart_lgpl-${SVGVER}.tar.bz2
-		http://dev.gentoo.org/~azarah/${PN}/moz_libart_lgpl-${SVGVER}.tar.bz2
-	)
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2
-	http://dev.gentoo.org/~azarah/${PN}/${P}-patches-${PVER}.tar.bz2"
-
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
-
-# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
-# and is required to build with support for cairo.  #71504
-RDEPEND="java? ( virtual/jre )
-	mozsvg? ( !<x11-base/xorg-x11-6.7.0-r2 )
-	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
-	>=www-client/mozilla-launcher-1.42"
-
-DEPEND="${RDEPEND}
-	~sys-devel/autoconf-2.13
-	java? ( >=dev-java/java-config-0.2.0 )
-	dev-lang/perl
-	postgres? ( >=dev-db/postgresql-7.2.0 )"
-
-S=${WORKDIR}/${PN}
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-#
-# NB: We can't export these vars until enigmail is installed separately instead
-# of integrated into this ebuild.
-#
-#export BUILD_OFFICIAL=1
-#export MOZILLA_OFFICIAL=1
-
-src_unpack() {
-	unpack ${PN}-${MY_PV}-source.tar.bz2 ${P}-patches-${PVER}.tar.bz2
-	cd ${S} || die
-
-	# Unpack the enigmail plugin
-	if use crypt && ! use moznomail; then
-		cd ${S}/extensions || die
-		unpack ipc-${IPCVER}.tar.gz enigmail-${EMVER}.tar.gz
-		for x in ipc enigmail; do
-			cd ${S}/extensions/${x} || die "cd failed"
-			makemake	# from mozconfig.eclass
-		done
-	fi
-	if use mozsvg; then
-		cd ${S}/other-licenses
-		unpack moz_libart_lgpl-${SVGVER}.tar.bz2
-	fi
-	cd ${S}
-
-	####################################
-	#
-	# patch collection
-	#
-	####################################
-
-	# Firefox only patches
-	rm -f ${WORKDIR}/patch/{093,094,402,407}*
-	# Need pango-1.10.0 stable
-	rm -f ${WORKDIR}/patch/03[67]*
-	epatch ${WORKDIR}/patch
-
-	# Without 03[67]* patches, we need to link to pangoxft
-	epatch ${FILESDIR}/${PN}-1.7.12-gtk2xft-link-pangoxft.patch
-
-	# Fix scripts that call for /usr/local/bin/perl #51916
-	ebegin "Patching smime to call perl from /usr/bin"
-	sed -i -e '1s,usr/local/bin,usr/bin,' ${S}/security/nss/cmd/smimetools/smime
-	eend $? || die "sed failed"
-
-	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
-	# PowerPC, because with that configuration, mozilla detects a ppc64 system.
-	# -- hansmi, 2005-10-02
-	if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
-		sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
-			${S}/configure.in
-		sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
-			${S}/security/coreconf/arch.mk
-	fi
-
-	# Needed by some of the patches
-	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-	declare x
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
-	# regardless of java setting.
-	mozconfig_annotate '' --enable-oji --enable-mathml
-
-	# Other moz-specific settings
-	mozconfig_use_enable mozdevelop jsd
-	mozconfig_use_enable mozdevelop xpctools
-	mozconfig_use_extension mozdevelop venkman
-	mozconfig_use_enable gnome gnomevfs
-	mozconfig_use_extension gnome gnomevfs
-	mozconfig_use_extension !moznoirc irc
-	mozconfig_use_extension postgres sql
-	if use postgres ; then
-		export MOZ_ENABLE_PGSQL=1
-		export MOZ_PGSQL_INCLUDES=/usr/include
-		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
-	fi
-	mozconfig_use_enable mozcalendar calendar
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-libart
-	use mozsvg && export MOZ_INTERNAL_LIBART_LGPL=1
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --with-user-appdir=.mozilla
-
-	if use moznomail && ! use mozcalendar; then
-		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
-	fi
-	if use moznocompose && use moznomail; then
-		mozconfig_annotate "+moznocompose +moznomail" --disable-composer
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, which breaks us
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
-	# to econf, but the quotes cause configure to fail.
-	sed -i -e \
-		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
-		${S}/config/autoconf.mk \
-		${S}/nsprpub/config/autoconf.mk \
-		${S}/xpfe/global/buildconfig.html
-
-	# Fixup the RPATH
-	sed -i -e \
-		's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|' \
-		${S}/config/rules.mk \
-		${S}/nsprpub/config/rules.mk \
-		${S}/security/coreconf/rules.mk \
-		${S}/security/coreconf/rules.mk
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die
-
-	####################################
-	#
-	#  Build Mozilla NSS
-	#
-	####################################
-
-	# Build the NSS/SSL support
-	if use ssl; then
-		einfo "Building Mozilla NSS..."
-
-		# Fix #include problem
-		cd ${S}/security/coreconf || die "cd coreconf failed"
-		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
-			>>headers.mk
-		emake -j1 || die "make security headers failed"
-
-		cd ${S}/security/nss || die "cd nss failed"
-		emake -j1 moz_import || die "make moz_import failed"
-		emake -j1 || die "make nss failed"
-	fi
-
-	####################################
-	#
-	#  Build Enigmail extension
-	#
-	####################################
-
-	if use crypt && ! use moznomail; then
-		for x in ipc enigmail; do
-			emake -C ${S}/extensions/${x} || die "emake ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Most of the installation happens here
-	dodir ${MOZILLA_FIVE_HOME}
-	cp -RL ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
-
-	# Create directory structure to support portage-installed extensions.
-	# See update_chrome() in mozilla-launcher
-	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
-	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
-	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
-		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
-
-	# Create /usr/bin/mozilla
-	install_mozilla_launcher_stub mozilla ${MOZILLA_FIVE_HOME}
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/${PN}-icon.png
-
-	# Fix bug 54179: Install .desktop file into /usr/share/applications
-	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/${PN}.desktop
-
-	# Fix icons to look the same everywhere
-	insinto ${MOZILLA_FIVE_HOME}/icons
-	doins ${S}/widget/src/gtk/mozicon16.xpm
-	doins ${S}/widget/src/gtk/mozicon50.xpm
-
-	####################################
-	#
-	# Install files necessary for applications to build against mozilla
-	#
-	####################################
-
-	einfo "Installing includes and idl files..."
-	dodir ${MOZILLA_FIVE_HOME}/{include,idl} /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include
-	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/idl
-
-	# Install the NSS/SSL libs, headers and tools
-	if use ssl; then
-		einfo "Installing Mozilla NSS..."
-		# Install the headers ('make install' do not work for headers ...)
-		insinto ${MOZILLA_FIVE_HOME}/include/nss
-		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
-		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
-		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
-		# These come with zlib ...
-		rm -f ${D}${MOZILLA_FIVE_HOME}/include/nss/{zconf.h,zlib.h}
-
-		cd ${S}/security/nss
-
-		mkdir -p ${WORKDIR}/nss/{bin,lib}
-		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
-		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
-
-		make install || die "make failed"
-		# Gets installed as symbolic links ...
-		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
-		cp -Lf ${WORKDIR}/nss/lib/* ${D}${MOZILLA_FIVE_HOME}
-
-		# Need to unset these incase we want to rebuild, else the build
-		# gets newked.
-		unset SOURCE_LIB_DIR
-		unset SOURCE_BIN_DIR
-	fi
-
-	# Fix mozilla-config and install it
-	sed -i -e "s|/usr/$(get_libdir)/${PN}-${MY_PV}|${MOZILLA_FIVE_HOME}|g
-		s|/usr/include/${PN}-${MY_PV}|${MOZILLA_FIVE_HOME}/include|g
-		s|/usr/share/idl/${PN}-${MY_PV}|${MOZILLA_FIVE_HOME}/idl|g
-		s|\(echo -L.*\)\($\)|\1 -Wl,-rpath,${MOZILLA_FIVE_HOME}\2|" \
-		${S}/build/unix/${PN}-config
-	exeinto ${MOZILLA_FIVE_HOME}
-	doexe ${S}/build/unix/${PN}-config
-
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in ${S}/build/unix/*.pc; do
-		sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}|
-			s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|
-			s|^idldir=.*|idldir=${MOZILLA_FIVE_HOME}/idl|
-			s|\(Libs:.*\)\($\)|\1 -Wl,-rpath,\${libdir}\2|" ${x}
-		doins ${x}
-	done
-
-	# Install env.d snippet, which isn't necessary for running mozilla, but
-	# might be necessary for programs linked against firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10${PN}
-	dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10${PN}
-
-	# Install rebuild script since mozilla-bin doesn't support registration yet
-	exeinto ${MOZILLA_FIVE_HOME}
-	doexe ${FILESDIR}/${PN}-rebuild-databases.pl
-	dosed -e 's|/lib/|/'"$(get_libdir)"'/|g' \
-		${MOZILLA_FIVE_HOME}/${PN}-rebuild-databases.pl
-
-	# Install docs
-	dodoc ${S}/{LEGAL,LICENSE}
-
-	# Update Google search plugin to use UTF8 charset ...
-	insinto ${MOZILLA_FIVE_HOME}/searchplugins
-	doins ${FILESDIR}/google.src
-}
-
-pkg_preinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Remove entire installed instance to solve various problems,
-	# for example see bug 27719
-	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
-}
-
-pkg_postinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Update the component registry
-	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=${PN} \
-		/usr/libexec/mozilla-launcher -register
-
-	# This should be called in the postinst and postrm of all the
-	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
-	# thunderbird-bin ebuilds.
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Update the component registry
-	if [[ -x ${MOZILLA_FIVE_HOME}/${PN}-bin ]]; then
-		MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=${PN} \
-			/usr/libexec/mozilla-launcher -register
-	fi
-
-	update_mozilla_launcher_symlinks
-}
diff --git a/www-client/mozilla/mozilla-1.7.12-r3.ebuild b/www-client/mozilla/mozilla-1.7.12-r3.ebuild
deleted file mode 100644
index edc1bb6b72d4..000000000000
--- a/www-client/mozilla/mozilla-1.7.12-r3.ebuild
+++ /dev/null
@@ -1,381 +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/mozilla/mozilla-1.7.12-r3.ebuild,v 1.1 2006/03/20 02:04:13 anarchy Exp $
-
-unset ALLOWED_FLAGS  # Stupid extra-functions.sh ... bug 49179
-MOZ_FREETYPE2="no"   # Need to disable for newer .. remove here and in mozconfig
-	                 # when older is removed from tree.
-MOZ_PANGO="yes"      # Need to enable for newer .. remove here and in mozconfig
-	                 # when older is removed from tree.
-inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
-
-PVER="1.1"
-EMVER="0.92.0"
-IPCVER="1.1.3"
-SVGVER="2.3.10p1"
-
-# handle _rc versions
-MY_PV=${PV/_alpha/a} 	# handle alpha
-MY_PV=${MY_PV/_beta/b}	# handle beta
-MY_PV=${MY_PV/_rc/rc}	# handle rc
-
-DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
-HOMEPAGE="http://www.mozilla.org"
-SRC_URI="http://ftp.${PN}.org/pub/${PN}.org/${PN}/releases/${PN}${MY_PV}/source/${PN}-${MY_PV}-source.tar.bz2
-	crypt? ( !moznomail? (
-		http://www.${PN}-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
-		http://www.${PN}-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
-	) )
-	mozsvg? (
-		mirror://gentoo/moz_libart_lgpl-${SVGVER}.tar.bz2
-		http://dev.gentoo.org/~azarah/${PN}/moz_libart_lgpl-${SVGVER}.tar.bz2
-	)
-	mirror://gentoo/${P}-patches-${PVER}.tar.bz2
-	http://dev.gentoo.org/~azarah/${PN}/${P}-patches-${PVER}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-LICENSE="MPL-1.1 NPL-1.1"
-IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
-
-# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
-# and is required to build with support for cairo.  #71504
-RDEPEND="java? ( virtual/jre )
-	mozsvg? ( !<x11-base/xorg-x11-6.7.0-r2 )
-	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
-	>=www-client/mozilla-launcher-1.42"
-
-DEPEND="${RDEPEND}
-	~sys-devel/autoconf-2.13
-	java? ( >=dev-java/java-config-0.2.0 )
-	dev-lang/perl
-	postgres? ( >=dev-db/postgresql-7.2.0 )"
-
-S=${WORKDIR}/${PN}
-
-# Needed by src_compile() and src_install().
-# Would do in pkg_setup but that loses the export attribute, they
-# become pure shell variables.
-#
-# NB: We can't export these vars until enigmail is installed separately instead
-# of integrated into this ebuild.
-#
-#export BUILD_OFFICIAL=1
-#export MOZILLA_OFFICIAL=1
-
-src_unpack() {
-	unpack ${PN}-${MY_PV}-source.tar.bz2 ${P}-patches-${PVER}.tar.bz2
-	cd ${S} || die
-
-	# Unpack the enigmail plugin
-	if use crypt && ! use moznomail; then
-		cd ${S}/extensions || die
-		unpack ipc-${IPCVER}.tar.gz enigmail-${EMVER}.tar.gz
-		for x in ipc enigmail; do
-			cd ${S}/extensions/${x} || die "cd failed"
-			makemake	# from mozconfig.eclass
-		done
-	fi
-	if use mozsvg; then
-		cd ${S}/other-licenses
-		unpack moz_libart_lgpl-${SVGVER}.tar.bz2
-	fi
-	cd ${S}
-
-	####################################
-	#
-	# patch collection
-	#
-	####################################
-
-	# Firefox only patches
-	rm -f ${WORKDIR}/patch/{093,094,402,407}*
-	# Need pango-1.10.0 stable
-	rm -f ${WORKDIR}/patch/03[67]*
-	epatch ${WORKDIR}/patch
-
-	# Without 03[67]* patches, we need to link to pangoxft
-	epatch ${FILESDIR}/${PN}-1.7.12-gtk2xft-link-pangoxft.patch
-
-	# Glibc-2.4 fix
-	epatch "${FILESDIR}/010_glibc-2.4.patch"
-
-	# Fix scripts that call for /usr/local/bin/perl #51916
-	ebegin "Patching smime to call perl from /usr/bin"
-	sed -i -e '1s,usr/local/bin,usr/bin,' ${S}/security/nss/cmd/smimetools/smime
-	eend $? || die "sed failed"
-
-	# Fix a compilation issue using the 32-bit userland with 64-bit kernel on
-	# PowerPC, because with that configuration, mozilla detects a ppc64 system.
-	# -- hansmi, 2005-10-02
-	if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
-		sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
-			${S}/configure.in
-		sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
-			${S}/security/coreconf/arch.mk
-	fi
-
-	# Needed by some of the patches
-	WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
-}
-
-src_compile() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-	declare x
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-
-	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
-	# regardless of java setting.
-	mozconfig_annotate '' --enable-oji --enable-mathml
-
-	# Other moz-specific settings
-	mozconfig_use_enable mozdevelop jsd
-	mozconfig_use_enable mozdevelop xpctools
-	mozconfig_use_extension mozdevelop venkman
-	mozconfig_use_enable gnome gnomevfs
-	mozconfig_use_extension gnome gnomevfs
-	mozconfig_use_extension !moznoirc irc
-	mozconfig_use_extension postgres sql
-	if use postgres ; then
-		export MOZ_ENABLE_PGSQL=1
-		export MOZ_PGSQL_INCLUDES=/usr/include
-		export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
-	fi
-	mozconfig_use_enable mozcalendar calendar
-	mozconfig_use_enable ldap
-	mozconfig_use_enable ldap ldap-experimental
-	mozconfig_use_enable mozsvg svg
-	mozconfig_use_enable mozsvg svg-renderer-libart
-	use mozsvg && export MOZ_INTERNAL_LIBART_LGPL=1
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	mozconfig_annotate '' --with-user-appdir=.mozilla
-
-	if use moznomail && ! use mozcalendar; then
-		mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
-	fi
-	if use moznocompose && use moznomail; then
-		mozconfig_annotate "+moznocompose +moznomail" --disable-composer
-	fi
-
-	# Finalize and report settings
-	mozconfig_final
-
-	# hardened GCC uses -fstack-protector-all by default, which breaks us
-	has_hardened && append-flags -fno-stack-protector-all
-	replace-flags -fstack-protector-all -fstack-protector
-
-	####################################
-	#
-	#  Configure and build
-	#
-	####################################
-
-	CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	econf || die
-
-	# It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
-	# to econf, but the quotes cause configure to fail.
-	sed -i -e \
-		's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
-		${S}/config/autoconf.mk \
-		${S}/nsprpub/config/autoconf.mk \
-		${S}/xpfe/global/buildconfig.html
-
-	# Fixup the RPATH
-	sed -i -e \
-		's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|' \
-		${S}/config/rules.mk \
-		${S}/nsprpub/config/rules.mk \
-		${S}/security/coreconf/rules.mk \
-		${S}/security/coreconf/rules.mk
-
-	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
-	# requirements while compiling
-	edit_makefiles
-
-	emake || die
-
-	####################################
-	#
-	#  Build Mozilla NSS
-	#
-	####################################
-
-	# Build the NSS/SSL support
-	if use ssl; then
-		einfo "Building Mozilla NSS..."
-
-		# Fix #include problem
-		cd ${S}/security/coreconf || die "cd coreconf failed"
-		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
-			>>headers.mk
-		emake -j1 || die "make security headers failed"
-
-		cd ${S}/security/nss || die "cd nss failed"
-		emake -j1 moz_import || die "make moz_import failed"
-		emake -j1 || die "make nss failed"
-	fi
-
-	####################################
-	#
-	#  Build Enigmail extension
-	#
-	####################################
-
-	if use crypt && ! use moznomail; then
-		for x in ipc enigmail; do
-			emake -C ${S}/extensions/${x} || die "emake ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Most of the installation happens here
-	dodir ${MOZILLA_FIVE_HOME}
-	cp -RL ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
-
-	# Create directory structure to support portage-installed extensions.
-	# See update_chrome() in mozilla-launcher
-	keepdir ${MOZILLA_FIVE_HOME}/chrome.d
-	keepdir ${MOZILLA_FIVE_HOME}/extensions.d
-	cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
-		${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
-
-	# Create /usr/bin/mozilla
-	install_mozilla_launcher_stub mozilla ${MOZILLA_FIVE_HOME}
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/icon/${PN}-icon.png
-
-	# Fix bug 54179: Install .desktop file into /usr/share/applications
-	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
-	insinto /usr/share/applications
-	doins ${FILESDIR}/icon/${PN}.desktop
-
-	# Fix icons to look the same everywhere
-	insinto ${MOZILLA_FIVE_HOME}/icons
-	doins ${S}/widget/src/gtk/mozicon16.xpm
-	doins ${S}/widget/src/gtk/mozicon50.xpm
-
-	####################################
-	#
-	# Install files necessary for applications to build against mozilla
-	#
-	####################################
-
-	einfo "Installing includes and idl files..."
-	dodir ${MOZILLA_FIVE_HOME}/{include,idl} /usr/include
-	cd ${S}/dist
-	cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include
-	cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/idl
-
-	# Install the NSS/SSL libs, headers and tools
-	if use ssl; then
-		einfo "Installing Mozilla NSS..."
-		# Install the headers ('make install' do not work for headers ...)
-		insinto ${MOZILLA_FIVE_HOME}/include/nss
-		[ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
-		[ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
-		[ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
-		# These come with zlib ...
-		rm -f ${D}${MOZILLA_FIVE_HOME}/include/nss/{zconf.h,zlib.h}
-
-		cd ${S}/security/nss
-
-		mkdir -p ${WORKDIR}/nss/{bin,lib}
-		export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
-		export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
-
-		make install || die "make failed"
-		# Gets installed as symbolic links ...
-		cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
-		cp -Lf ${WORKDIR}/nss/lib/* ${D}${MOZILLA_FIVE_HOME}
-
-		# Need to unset these incase we want to rebuild, else the build
-		# gets newked.
-		unset SOURCE_LIB_DIR
-		unset SOURCE_BIN_DIR
-	fi
-
-	# Fix mozilla-config and install it
-	sed -i -e "s|/usr/$(get_libdir)/${PN}-${MY_PV}|${MOZILLA_FIVE_HOME}|g
-		s|/usr/include/${PN}-${MY_PV}|${MOZILLA_FIVE_HOME}/include|g
-		s|/usr/share/idl/${PN}-${MY_PV}|${MOZILLA_FIVE_HOME}/idl|g
-		s|\(echo -L.*\)\($\)|\1 -Wl,-rpath,${MOZILLA_FIVE_HOME}\2|" \
-		${S}/build/unix/${PN}-config
-	exeinto ${MOZILLA_FIVE_HOME}
-	doexe ${S}/build/unix/${PN}-config
-
-	# Fix pkgconfig files and install them
-	insinto /usr/$(get_libdir)/pkgconfig
-	for x in ${S}/build/unix/*.pc; do
-		sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}|
-			s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|
-			s|^idldir=.*|idldir=${MOZILLA_FIVE_HOME}/idl|
-			s|\(Libs:.*\)\($\)|\1 -Wl,-rpath,\${libdir}\2|" ${x}
-		doins ${x}
-	done
-
-	# Install env.d snippet, which isn't necessary for running mozilla, but
-	# might be necessary for programs linked against firefox
-	insinto /etc/env.d
-	doins ${FILESDIR}/10${PN}
-	dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10${PN}
-
-	# Install rebuild script since mozilla-bin doesn't support registration yet
-	exeinto ${MOZILLA_FIVE_HOME}
-	doexe ${FILESDIR}/${PN}-rebuild-databases.pl
-	dosed -e 's|/lib/|/'"$(get_libdir)"'/|g' \
-		${MOZILLA_FIVE_HOME}/${PN}-rebuild-databases.pl
-
-	# Install docs
-	dodoc ${S}/{LEGAL,LICENSE}
-
-	# Update Google search plugin to use UTF8 charset ...
-	insinto ${MOZILLA_FIVE_HOME}/searchplugins
-	doins ${FILESDIR}/google.src
-}
-
-pkg_preinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Remove entire installed instance to solve various problems,
-	# for example see bug 27719
-	rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
-}
-
-pkg_postinst() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Update the component registry
-	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=${PN} \
-		/usr/libexec/mozilla-launcher -register
-
-	# This should be called in the postinst and postrm of all the
-	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
-	# thunderbird-bin ebuilds.
-	update_mozilla_launcher_symlinks
-}
-
-pkg_postrm() {
-	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
-
-	# Update the component registry
-	if [[ -x ${MOZILLA_FIVE_HOME}/${PN}-bin ]]; then
-		MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=${PN} \
-			/usr/libexec/mozilla-launcher -register
-	fi
-
-	update_mozilla_launcher_symlinks
-}