Pruned old version.

(Portage version: 2.1.2_pre1)
 (Unsigned Manifest commit)

15 files changed, 4 insertions, 1391 deletions

diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index 3a65189e65c2..ef1e7dba45fb 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -22,54 +22,22 @@ DIST j2re-1_4_2_10-linux-i586.bin 14417572 RMD160 fab835b3469e4a38adfd24312ebc0a
 DIST j2re-1_4_2_12-linux-i586.bin 14339018 RMD160 a63313d5a57f770ec6cd6c89c56b101f7a77f964 SHA1 18631914aeff51fcd89d226dbe3396ea91d21408 SHA256 b80403dc39008f53e50c47a04322a2046b257654653ef41a05aca29b3636fb2f
 DIST jdk-1_5_0_08-dlj-linux-amd64.bin 43854617 RMD160 c6669cba980b9097c6921041ee3af8753587ea37 SHA1 f43776629e50834be1f25060bcbe7f8ee0483173 SHA256 a4a4baa5488c7be8b109ed6c1f460a8b30861ae546c050c319de41e987bc857f
 DIST jdk-1_5_0_08-dlj-linux-i586.bin 49498712 RMD160 11c01f6391cec0476a3d96306a7bee7ec82d8425 SHA1 e7bc2da45219c54f9ac0dcbe6b3b8bf7ead3cc4e SHA256 e96ebeefb5116182c01f6e3fb306d24f1b81ba6849b76b0d4705051b01647ce8
-DIST jre-1_5_0_06-linux-amd64.bin 16403250 RMD160 4309c9805c9595587e385bcfe951c693609b8560 SHA1 19b55fb7a0133ef8347741bcd6eb83d88ae266dd SHA256 3caff8426bb55fa6f3e40738a537b9351ef5f38c5a50b1f5ac6756b16f4bcfee
-DIST jre-1_5_0_06-linux-i586.bin 16769166 RMD160 b5f306da7d2569ab7698beaaa7dc2a662c04e876 SHA1 8244fe7a97647a19f43dd527d975650eb16800c9 SHA256 316a925f5a4f3edd5bf64c138c3585d979f15a1ffb517798e8ed8f3bde5024fc
-DIST jre-1_5_0_07-linux-amd64.bin 16482873 RMD160 c3adbcb3e95f587d65742b8a3a133e78cdf67228 SHA1 b622bc11ccb4ddf90044b0d0ffd47cad53a8ff38 SHA256 becfa5565ede25cdef057f7d4831469ae96904401e1fec050f68dde779903f13
-DIST jre-1_5_0_07-linux-i586.bin 16850419 RMD160 63b263aaba81d35f26672216edf19b036cc64d6e SHA1 3be9ba52c982a4a22f036f587e96418234399a0f SHA256 12fc92cce34342419525545484900c863f9fbbe24f10fe66d6be4644e2b8fa12
-EBUILD sun-jre-bin-1.4.2.10-r2.ebuild 5326 RMD160 50d100bf4bdd79727ddfefb309b86d64a4dfc3d6 SHA1 098ea4b4bbddc2e21799e45aba1e28806eabcf80 SHA256 8502d5f3960f3bc6ed98445e9f64f5d901c893ddc5dfb7b331fe74cdff476187
-MD5 73f7fd99ab21020e5a4651461241e686 sun-jre-bin-1.4.2.10-r2.ebuild 5326
-RMD160 50d100bf4bdd79727ddfefb309b86d64a4dfc3d6 sun-jre-bin-1.4.2.10-r2.ebuild 5326
-SHA256 8502d5f3960f3bc6ed98445e9f64f5d901c893ddc5dfb7b331fe74cdff476187 sun-jre-bin-1.4.2.10-r2.ebuild 5326
 EBUILD sun-jre-bin-1.4.2.10.ebuild 5238 RMD160 c792f8baa8602b7d86679df163f6e69d50d727eb SHA1 86a2c93772b657dee83ebc6ce57ad5c305e9af16 SHA256 6e08907d4ce855d2bdd6e1e230ba51dcba2b52fc529202201283affb39845251
 MD5 5db1f52645c8f51a7a7852fb3002c12d sun-jre-bin-1.4.2.10.ebuild 5238
 RMD160 c792f8baa8602b7d86679df163f6e69d50d727eb sun-jre-bin-1.4.2.10.ebuild 5238
 SHA256 6e08907d4ce855d2bdd6e1e230ba51dcba2b52fc529202201283affb39845251 sun-jre-bin-1.4.2.10.ebuild 5238
-EBUILD sun-jre-bin-1.4.2.12-r1.ebuild 4800 RMD160 46c89eec6e3a6476023f0a2a634706627edffc11 SHA1 6dc75fd0085310d7eb8ca91273d3bd729532731b SHA256 326503d1c9ba057e45a4ca5a76dca8c9ef4ec8cce51bf01c767f80a0133aa1ac
-MD5 aa1af9ffc8d2cab7b86c4f87209cf764 sun-jre-bin-1.4.2.12-r1.ebuild 4800
-RMD160 46c89eec6e3a6476023f0a2a634706627edffc11 sun-jre-bin-1.4.2.12-r1.ebuild 4800
-SHA256 326503d1c9ba057e45a4ca5a76dca8c9ef4ec8cce51bf01c767f80a0133aa1ac sun-jre-bin-1.4.2.12-r1.ebuild 4800
 EBUILD sun-jre-bin-1.4.2.12-r2.ebuild 4609 RMD160 8675299ab86c52019e310503b3e76aa8c0a23e4c SHA1 86101efc676b10552203c9dca7ba3c4465939318 SHA256 8537a89c2e4ac9f5afe5e2d4e6b652154215b041371807524a1246e5166e7cde
 MD5 9462e9d5a0ab175e9d572763c8abc80f sun-jre-bin-1.4.2.12-r2.ebuild 4609
 RMD160 8675299ab86c52019e310503b3e76aa8c0a23e4c sun-jre-bin-1.4.2.12-r2.ebuild 4609
 SHA256 8537a89c2e4ac9f5afe5e2d4e6b652154215b041371807524a1246e5166e7cde sun-jre-bin-1.4.2.12-r2.ebuild 4609
-EBUILD sun-jre-bin-1.4.2.12.ebuild 4799 RMD160 eda0fcf60bf2ec07b5f0de383bfe7a9081792948 SHA1 56032178b1ae9eca899b4d8aa65ec4faacdeea25 SHA256 e468b677748574db0439a4dc02ec4dce720e37cb4dcdcf47852c944aaf6647ff
-MD5 8e52996f18e5a7eac3399d9692ff9c2e sun-jre-bin-1.4.2.12.ebuild 4799
-RMD160 eda0fcf60bf2ec07b5f0de383bfe7a9081792948 sun-jre-bin-1.4.2.12.ebuild 4799
-SHA256 e468b677748574db0439a4dc02ec4dce720e37cb4dcdcf47852c944aaf6647ff sun-jre-bin-1.4.2.12.ebuild 4799
-EBUILD sun-jre-bin-1.5.0.06-r2.ebuild 5821 RMD160 bfd8e136e288306a0efdbca87f763697f98bbb98 SHA1 4a533b2da804c410e86f6f8c2e77d5ea4641cad0 SHA256 445cc2d92404108288fa77c613f33388e391ae5b99546cc89da1eb94cd0db493
-MD5 87a2dc662cb9f290417d1514cd79856f sun-jre-bin-1.5.0.06-r2.ebuild 5821
-RMD160 bfd8e136e288306a0efdbca87f763697f98bbb98 sun-jre-bin-1.5.0.06-r2.ebuild 5821
-SHA256 445cc2d92404108288fa77c613f33388e391ae5b99546cc89da1eb94cd0db493 sun-jre-bin-1.5.0.06-r2.ebuild 5821
-EBUILD sun-jre-bin-1.5.0.06.ebuild 5732 RMD160 9686d47a462f644e243f35c8bf05011b2f009d6a SHA1 2d1878a3f69383d063da8c87589688bdca8b533f SHA256 f439d0c172249259216357d4484ee722104dd83ea4f3701770ad87d4cfc13150
-MD5 1f408af3fed867fed8a9e710a9ed4054 sun-jre-bin-1.5.0.06.ebuild 5732
-RMD160 9686d47a462f644e243f35c8bf05011b2f009d6a sun-jre-bin-1.5.0.06.ebuild 5732
-SHA256 f439d0c172249259216357d4484ee722104dd83ea4f3701770ad87d4cfc13150 sun-jre-bin-1.5.0.06.ebuild 5732
-EBUILD sun-jre-bin-1.5.0.07.ebuild 5591 RMD160 f7103d57786fd1b9459cd851e1f5442705d4fdf8 SHA1 620629028eaf11765d4a3316eaeae4059bdf657d SHA256 9ccc02375aab8983f6898ae1e56c1bc051fee1d251b6fc82edc1cd204b9a1549
-MD5 b1245b9cb2f99ac50c1e8f21d9f140c6 sun-jre-bin-1.5.0.07.ebuild 5591
-RMD160 f7103d57786fd1b9459cd851e1f5442705d4fdf8 sun-jre-bin-1.5.0.07.ebuild 5591
-SHA256 9ccc02375aab8983f6898ae1e56c1bc051fee1d251b6fc82edc1cd204b9a1549 sun-jre-bin-1.5.0.07.ebuild 5591
 EBUILD sun-jre-bin-1.5.0.08-r1.ebuild 4564 RMD160 6f657092c3fa85ba04608866612f78fbc5bbfc24 SHA1 c3c1d37f224c711e8e25526d3b7abe7afa8b2b24 SHA256 5cf536a04ff77908b271229f7397633ee22867e88d320a62c5026baac8be0535
 MD5 4d256581850c25969f3b114ef72252c0 sun-jre-bin-1.5.0.08-r1.ebuild 4564
 RMD160 6f657092c3fa85ba04608866612f78fbc5bbfc24 sun-jre-bin-1.5.0.08-r1.ebuild 4564
 SHA256 5cf536a04ff77908b271229f7397633ee22867e88d320a62c5026baac8be0535 sun-jre-bin-1.5.0.08-r1.ebuild 4564
-EBUILD sun-jre-bin-1.5.0.08.ebuild 4561 RMD160 f76c0005b56646f76a846449ccea6ff281fc9fcb SHA1 864806b2714c0e84d42049be984dc959fdbe50e7 SHA256 ecc79e419129d65122fc203e9c2744c0a9846fa9c90c1ab82f7c19a91718a031
-MD5 a5e31bfa288f7d3e78b5680b3989a52a sun-jre-bin-1.5.0.08.ebuild 4561
-RMD160 f76c0005b56646f76a846449ccea6ff281fc9fcb sun-jre-bin-1.5.0.08.ebuild 4561
-SHA256 ecc79e419129d65122fc203e9c2744c0a9846fa9c90c1ab82f7c19a91718a031 sun-jre-bin-1.5.0.08.ebuild 4561
-MISC ChangeLog 10992 RMD160 a79b6a000b6ce4d11b5d578cfe274f461bb67026 SHA1 e4fb7d65f68dc7570f4b57355a44e52cf8c08bb9 SHA256 619a80101c555b295445565d402ef9347008030f0b3cfae5db1fc5d7cf64f364
-MD5 f9deac6a904d6c32e64a996537505f1c ChangeLog 10992
-RMD160 a79b6a000b6ce4d11b5d578cfe274f461bb67026 ChangeLog 10992
-SHA256 619a80101c555b295445565d402ef9347008030f0b3cfae5db1fc5d7cf64f364 ChangeLog 10992
+MISC ChangeLog 11292 RMD160 73815d224b04f52457b883649ec5a20d48a3d7a3 SHA1 d90619854084068158a53c33c4888413348c227e SHA256 5174419e6e68b3c4a4947c3dc87826b80d4683a7e32f29d41b738781d67a7a81
+MD5 0ef4b1863bc3fcf0aee592ea2dd66cf3 ChangeLog 11292
+RMD160 73815d224b04f52457b883649ec5a20d48a3d7a3 ChangeLog 11292
+SHA256 5174419e6e68b3c4a4947c3dc87826b80d4683a7e32f29d41b738781d67a7a81 ChangeLog 11292
 MISC metadata.xml 242 RMD160 b334d6a9cb5f410f7b422482586264e8ca3d7d0f SHA1 f203abfda28c6fbc87ba71a4a53af5459ff83236 SHA256 8a5ff51f49458f906fc5b494530b268982044b68bbbd85ff646757b88c9e350d
 MD5 ca35f917561afc166491d77810b71095 metadata.xml 242
 RMD160 b334d6a9cb5f410f7b422482586264e8ca3d7d0f metadata.xml 242
@@ -77,30 +45,9 @@ SHA256 8a5ff51f49458f906fc5b494530b268982044b68bbbd85ff646757b88c9e350d metadata
 MD5 073f671a6a5d8ddb2f9645824debb43c files/digest-sun-jre-bin-1.4.2.10 271
 RMD160 b1ff7bcee524ecc258da418b019accd88eed1afd files/digest-sun-jre-bin-1.4.2.10 271
 SHA256 441d20feed468696d5129d21bfedd9b408e0584b9d235fb2b145a76c825a001b files/digest-sun-jre-bin-1.4.2.10 271
-MD5 073f671a6a5d8ddb2f9645824debb43c files/digest-sun-jre-bin-1.4.2.10-r2 271
-RMD160 b1ff7bcee524ecc258da418b019accd88eed1afd files/digest-sun-jre-bin-1.4.2.10-r2 271
-SHA256 441d20feed468696d5129d21bfedd9b408e0584b9d235fb2b145a76c825a001b files/digest-sun-jre-bin-1.4.2.10-r2 271
-MD5 7d9a0bb012c6f7004240891b62a9d03e files/digest-sun-jre-bin-1.4.2.12 542
-RMD160 f6ff299e938d169ac154e1722ab09806a5a16d39 files/digest-sun-jre-bin-1.4.2.12 542
-SHA256 125ca5696a4be1c54b2581f68499accc3a360117fdfc177d33544f42d7cab8b0 files/digest-sun-jre-bin-1.4.2.12 542
-MD5 7d9a0bb012c6f7004240891b62a9d03e files/digest-sun-jre-bin-1.4.2.12-r1 542
-RMD160 f6ff299e938d169ac154e1722ab09806a5a16d39 files/digest-sun-jre-bin-1.4.2.12-r1 542
-SHA256 125ca5696a4be1c54b2581f68499accc3a360117fdfc177d33544f42d7cab8b0 files/digest-sun-jre-bin-1.4.2.12-r1 542
 MD5 85b90dc2d065efaee3065eebe6814224 files/digest-sun-jre-bin-1.4.2.12-r2 271
 RMD160 9428423bb0e74bcacee9428aac0436b67438c429 files/digest-sun-jre-bin-1.4.2.12-r2 271
 SHA256 3e71d56840f86073ed25b7d52c9f1afb8bd0f1c13d04f20efd53803ef670cb76 files/digest-sun-jre-bin-1.4.2.12-r2 271
-MD5 575297db348a3e09371ab435ebddbea0 files/digest-sun-jre-bin-1.5.0.06 539
-RMD160 805a47eeb2ff25e53606c13cdd774db8a8b3b601 files/digest-sun-jre-bin-1.5.0.06 539
-SHA256 631931544e94f62bfa7526e9ac1a7c24ac3724f94f650989138b15867b780e8f files/digest-sun-jre-bin-1.5.0.06 539
-MD5 575297db348a3e09371ab435ebddbea0 files/digest-sun-jre-bin-1.5.0.06-r2 539
-RMD160 805a47eeb2ff25e53606c13cdd774db8a8b3b601 files/digest-sun-jre-bin-1.5.0.06-r2 539
-SHA256 631931544e94f62bfa7526e9ac1a7c24ac3724f94f650989138b15867b780e8f files/digest-sun-jre-bin-1.5.0.06-r2 539
-MD5 12a66b55f4042f653d3035746d578da9 files/digest-sun-jre-bin-1.5.0.07 1078
-RMD160 ca0f27979a6f4f0a892f9e2a87b0702e97ef8dc8 files/digest-sun-jre-bin-1.5.0.07 1078
-SHA256 2658a92eae032064944213718691190cdfeb0418c48f258c9827bdd4e1185b3f files/digest-sun-jre-bin-1.5.0.07 1078
-MD5 20fa891f2c9e4953c1da7d1c318d3216 files/digest-sun-jre-bin-1.5.0.08 563
-RMD160 59f63ab1ef5f3a40c10ccd954d1cfa2ca47f4e15 files/digest-sun-jre-bin-1.5.0.08 563
-SHA256 36ee47fae9d203d6e249bd407da3fd700d2d4f672a258285010f1a44f38ea0b8 files/digest-sun-jre-bin-1.5.0.08 563
 MD5 20fa891f2c9e4953c1da7d1c318d3216 files/digest-sun-jre-bin-1.5.0.08-r1 563
 RMD160 59f63ab1ef5f3a40c10ccd954d1cfa2ca47f4e15 files/digest-sun-jre-bin-1.5.0.08-r1 563
 SHA256 36ee47fae9d203d6e249bd407da3fd700d2d4f672a258285010f1a44f38ea0b8 files/digest-sun-jre-bin-1.5.0.08-r1 563
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.10-r2 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.10-r2
deleted file mode 100644
index 6125d3b33f50..000000000000
--- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.10-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e9a9cb196308783c72666f3707b84919 j2re-1_4_2_10-linux-i586.bin 14417572
-RMD160 fab835b3469e4a38adfd24312ebc0a6995639921 j2re-1_4_2_10-linux-i586.bin 14417572
-SHA256 832e50175e797c18602ae30ef4499fcf3e9002d9f317d8718b1d26512e6c51ac j2re-1_4_2_10-linux-i586.bin 14417572
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.12 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.12
deleted file mode 100644
index 69f486c72f02..000000000000
--- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.12
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1df6655d341c736d8e3845d920612420 j2re-1_4_2_12-linux-i586.bin 14339018
-RMD160 a63313d5a57f770ec6cd6c89c56b101f7a77f964 j2re-1_4_2_12-linux-i586.bin 14339018
-SHA256 b80403dc39008f53e50c47a04322a2046b257654653ef41a05aca29b3636fb2f j2re-1_4_2_12-linux-i586.bin 14339018
-MD5 1df6655d341c736d8e3845d920612420 j2re-1_4_2_12-linux-i586.bin 14339018
-RMD160 a63313d5a57f770ec6cd6c89c56b101f7a77f964 j2re-1_4_2_12-linux-i586.bin 14339018
-SHA256 b80403dc39008f53e50c47a04322a2046b257654653ef41a05aca29b3636fb2f j2re-1_4_2_12-linux-i586.bin 14339018
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.12-r1 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.12-r1
deleted file mode 100644
index 69f486c72f02..000000000000
--- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.4.2.12-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1df6655d341c736d8e3845d920612420 j2re-1_4_2_12-linux-i586.bin 14339018
-RMD160 a63313d5a57f770ec6cd6c89c56b101f7a77f964 j2re-1_4_2_12-linux-i586.bin 14339018
-SHA256 b80403dc39008f53e50c47a04322a2046b257654653ef41a05aca29b3636fb2f j2re-1_4_2_12-linux-i586.bin 14339018
-MD5 1df6655d341c736d8e3845d920612420 j2re-1_4_2_12-linux-i586.bin 14339018
-RMD160 a63313d5a57f770ec6cd6c89c56b101f7a77f964 j2re-1_4_2_12-linux-i586.bin 14339018
-SHA256 b80403dc39008f53e50c47a04322a2046b257654653ef41a05aca29b3636fb2f j2re-1_4_2_12-linux-i586.bin 14339018
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.06 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.06
deleted file mode 100644
index 1927b3ed0548..000000000000
--- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.06
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 6a771c3c9e93021ab34a30bcf609c74b jre-1_5_0_06-linux-amd64.bin 16403250
-RMD160 4309c9805c9595587e385bcfe951c693609b8560 jre-1_5_0_06-linux-amd64.bin 16403250
-SHA256 3caff8426bb55fa6f3e40738a537b9351ef5f38c5a50b1f5ac6756b16f4bcfee jre-1_5_0_06-linux-amd64.bin 16403250
-MD5 e0a88dbec9bfe3195794bb652bfc6516 jre-1_5_0_06-linux-i586.bin 16769166
-RMD160 b5f306da7d2569ab7698beaaa7dc2a662c04e876 jre-1_5_0_06-linux-i586.bin 16769166
-SHA256 316a925f5a4f3edd5bf64c138c3585d979f15a1ffb517798e8ed8f3bde5024fc jre-1_5_0_06-linux-i586.bin 16769166
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.06-r2 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.06-r2
deleted file mode 100644
index 1927b3ed0548..000000000000
--- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.06-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 6a771c3c9e93021ab34a30bcf609c74b jre-1_5_0_06-linux-amd64.bin 16403250
-RMD160 4309c9805c9595587e385bcfe951c693609b8560 jre-1_5_0_06-linux-amd64.bin 16403250
-SHA256 3caff8426bb55fa6f3e40738a537b9351ef5f38c5a50b1f5ac6756b16f4bcfee jre-1_5_0_06-linux-amd64.bin 16403250
-MD5 e0a88dbec9bfe3195794bb652bfc6516 jre-1_5_0_06-linux-i586.bin 16769166
-RMD160 b5f306da7d2569ab7698beaaa7dc2a662c04e876 jre-1_5_0_06-linux-i586.bin 16769166
-SHA256 316a925f5a4f3edd5bf64c138c3585d979f15a1ffb517798e8ed8f3bde5024fc jre-1_5_0_06-linux-i586.bin 16769166
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.07 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.07
deleted file mode 100644
index d4f933cfd840..000000000000
--- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.07
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 e117e9f6443ed2be8bca50439b8316c6 jre-1_5_0_07-linux-amd64.bin 16482873
-RMD160 c3adbcb3e95f587d65742b8a3a133e78cdf67228 jre-1_5_0_07-linux-amd64.bin 16482873
-SHA256 becfa5565ede25cdef057f7d4831469ae96904401e1fec050f68dde779903f13 jre-1_5_0_07-linux-amd64.bin 16482873
-MD5 e2ad1c9e47f3e34d1efae059b9e2a2d9 jre-1_5_0_07-linux-i586.bin 16850419
-RMD160 63b263aaba81d35f26672216edf19b036cc64d6e jre-1_5_0_07-linux-i586.bin 16850419
-SHA256 12fc92cce34342419525545484900c863f9fbbe24f10fe66d6be4644e2b8fa12 jre-1_5_0_07-linux-i586.bin 16850419
-MD5 e117e9f6443ed2be8bca50439b8316c6 jre-1_5_0_07-linux-amd64.bin 16482873
-RMD160 c3adbcb3e95f587d65742b8a3a133e78cdf67228 jre-1_5_0_07-linux-amd64.bin 16482873
-SHA256 becfa5565ede25cdef057f7d4831469ae96904401e1fec050f68dde779903f13 jre-1_5_0_07-linux-amd64.bin 16482873
-MD5 e2ad1c9e47f3e34d1efae059b9e2a2d9 jre-1_5_0_07-linux-i586.bin 16850419
-RMD160 63b263aaba81d35f26672216edf19b036cc64d6e jre-1_5_0_07-linux-i586.bin 16850419
-SHA256 12fc92cce34342419525545484900c863f9fbbe24f10fe66d6be4644e2b8fa12 jre-1_5_0_07-linux-i586.bin 16850419
diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.08 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.08
deleted file mode 100644
index 89b29a996b47..000000000000
--- a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.08
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e6388e30448ffd7ccaaca3cfc0708e44 jdk-1_5_0_08-dlj-linux-amd64.bin 43854617
-RMD160 c6669cba980b9097c6921041ee3af8753587ea37 jdk-1_5_0_08-dlj-linux-amd64.bin 43854617
-SHA256 a4a4baa5488c7be8b109ed6c1f460a8b30861ae546c050c319de41e987bc857f jdk-1_5_0_08-dlj-linux-amd64.bin 43854617
-MD5 3e2935cca24ceb54dd2181892a3d5456 jdk-1_5_0_08-dlj-linux-i586.bin 49498712
-RMD160 11c01f6391cec0476a3d96306a7bee7ec82d8425 jdk-1_5_0_08-dlj-linux-i586.bin 49498712
-SHA256 e96ebeefb5116182c01f6e3fb306d24f1b81ba6849b76b0d4705051b01647ce8 jdk-1_5_0_08-dlj-linux-i586.bin 49498712
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10-r2.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10-r2.ebuild
deleted file mode 100644
index 2fe22dcafb8c..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10-r2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.10-r2.ebuild,v 1.3 2006/07/06 10:42:15 nelchael Exp $
-
-inherit java eutils
-
-MY_PV=${PV%.*}_${PV##*.}
-MY_PV2=${PV//./_}
-At="j2re-${MY_PV2}-linux-i586.bin"
-S="${WORKDIR}/j2re${MY_PV}"
-DESCRIPTION="Sun's J2SE Platform"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
-SRC_URI=${At}
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm-1.4.2"
-KEYWORDS="-* ~x86"
-RESTRICT="fetch stricter"
-IUSE="X alsa browserplugin nsplugin mozilla"
-
-DEPEND="sys-apps/sed"
-
-RDEPEND="sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	X? ( || (	(
-				x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXp
-				x11-libs/libXt
-				x11-libs/libXtst
-			)
-
-			virtual/x11
-		)
-	)"
-
-
-PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar
-lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2re-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${DOWNLOAD_URL}
-	einfo "(select the \"Linux self-extracting file\" package format of the JRE"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		eerror "cannot read ${At}. Please check the permission and try again."
-		die
-	fi
-	#Search for the ELF Header
-	testExp=`echo -e "\177\105\114\106\001\001\001"`
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
-	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-
-	if [ -f ${S}/lib/unpack ]; then
-		UNPACK_CMD=${S}/lib/unpack
-		chmod +x $UNPACK_CMD
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		for i in $PACKED_JARS; do
-			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
-			if [ -f ${PACK_FILE} ]; then
-				echo "	unpacking: $i"
-				$UNPACK_CMD ${PACK_FILE} ${S}/$i
-				rm -f ${PACK_FILE}
-			fi
-		done
-	fi
-}
-
-src_install() {
-	local dirs="bin lib man javaws plugin"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/
-	done
-
-	dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
-	dohtml Welcome.html ControlPanel.html
-
-	if use nsplugin ||       # global useflag for netscape-compat plugins
-	   use browserplugin ||  # deprecated but honor for now
-	   use mozilla; then     # wrong but used to honor it
-		local plugin_dir="ns610"
-		if has_version '>=sys-devel/gcc-3.2' ; then
-			plugin_dir="ns610-gcc32"
-		fi
-		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java-jre.desktop
-	domenu ${T}/sun_java-jre.desktop
-
-	use !alsa && java_remove-libjsoundalsa /opt/${P}/jre/
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-	fix-i386-dir /opt/${P}/lib
-
-	# TODO prepman "fixes" symlink ja -> ja__JP.eucJP in 'man' directory,
-	#      creating ja.gz -> ja_JP.eucJP.gz. This is broken as ja_JP.eucJP
-	#      is a directory and will not be gzipped ;)
-}
-
-pkg_postinst () {
-	# Create files used as storage for system preferences.
-	touch /opt/${P}/.systemPrefs/.system.lock
-	chmod 644 /opt/${P}/.systemPrefs/.system.lock
-	touch /opt/${P}/.systemPrefs/.systemRootModFile
-	chmod 644 /opt/${P}/.systemPrefs/.systemRootModFile
-
-	java_pkg_postinst
-
-	if ! use nsplugin && ( use browserplugin || use mozilla ); then
-		echo
-		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
-		ewarn "future jdk/jre ebuilds for plugin installation.  Please"
-		ewarn "update your USE to include 'nsplugin'."
-	fi
-
-	# Show info about netscape
-	if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then
-		echo
-		einfo "If you want to install the plugin for Netscape 4.x, type"
-		einfo
-		einfo "   cd /usr/lib/nsbrowser/plugins/"
-		einfo "   ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
-	fi
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar, javac and java"
-
-		for paxkills in "java"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/sun-jdk-1.4.2.03/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	if ! use X; then
-		echo
-		ewarn "Some parts of Sun's JDK require virtual/x11 to be installed."
-		ewarn "Be careful which Java libraries you attempt to use."
-	fi
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.12-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.12-r1.ebuild
deleted file mode 100644
index 31bdedc01ac9..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.12-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.12-r1.ebuild,v 1.2 2006/09/01 03:09:34 nichoj Exp $
-
-inherit java-vm-2 eutils
-
-MY_PV=${PV%.*}_${PV##*.}
-MY_PV2=${PV//./_}
-At="j2re-${MY_PV2}-linux-i586.bin"
-S="${WORKDIR}/j2re${MY_PV}"
-DESCRIPTION="Sun's J2SE Platform"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
-SRC_URI=${At}
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm-1.4.2"
-KEYWORDS="-* ~x86"
-RESTRICT="fetch stricter"
-IUSE="X alsa nsplugin"
-
-DEPEND="sys-apps/sed"
-
-RDEPEND="sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	X? ( || (	(
-				x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXp
-				x11-libs/libXt
-				x11-libs/libXtst
-			)
-
-			virtual/x11
-		)
-	)"
-
-
-PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar
-lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2re-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${DOWNLOAD_URL}
-	einfo "(select the \"Linux self-extracting file\" package format of the JRE"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		eerror "cannot read ${At}. Please check the permission and try again."
-		die
-	fi
-	#Search for the ELF Header
-	testExp=`echo -e "\177\105\114\106\001\001\001"`
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
-	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-
-	if [ -f ${S}/lib/unpack ]; then
-		UNPACK_CMD=${S}/lib/unpack
-		chmod +x $UNPACK_CMD
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		for i in $PACKED_JARS; do
-			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
-			if [ -f ${PACK_FILE} ]; then
-				echo "	unpacking: $i"
-				$UNPACK_CMD ${PACK_FILE} ${S}/$i
-				rm -f ${PACK_FILE}
-			fi
-		done
-	fi
-}
-
-src_install() {
-	local dirs="bin lib man javaws plugin"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/
-	done
-
-	dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
-	dohtml Welcome.html ControlPanel.html
-
-	if use nsplugin; then
-		local plugin_dir="ns610"
-		if has_version '>=sys-devel/gcc-3.2' ; then
-			plugin_dir="ns610-gcc32"
-		fi
-		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java-jre.desktop
-	domenu ${T}/sun_java-jre.desktop
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-
-	# TODO prepman "fixes" symlink ja -> ja__JP.eucJP in 'man' directory,
-	#      creating ja.gz -> ja_JP.eucJP.gz. This is broken as ja_JP.eucJP
-	#      is a directory and will not be gzipped ;)
-}
-
-pkg_postinst () {
-	# Create files used as storage for system preferences.
-	touch /opt/${P}/.systemPrefs/.system.lock
-	chmod 644 /opt/${P}/.systemPrefs/.system.lock
-	touch /opt/${P}/.systemPrefs/.systemRootModFile
-	chmod 644 /opt/${P}/.systemPrefs/.systemRootModFile
-
-	java-vm-2_pkg_postinst
-
-	# Show info about netscape
-	if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then
-		echo
-		einfo "If you want to install the plugin for Netscape 4.x, type"
-		einfo
-		einfo "   cd /usr/lib/nsbrowser/plugins/"
-		einfo "   ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
-	fi
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar, javac and java"
-
-		for paxkills in "java"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/sun-jdk-1.4.2.03/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	if ! use X; then
-		echo
-		ewarn "Some parts of Sun's JDK require virtual/x11 to be installed."
-		ewarn "Be careful which Java libraries you attempt to use."
-	fi
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.12.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.12.ebuild
deleted file mode 100644
index 4beab5cd4d88..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.12.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.12.ebuild,v 1.2 2006/07/06 10:42:15 nelchael Exp $
-
-inherit java-vm-2 eutils
-
-MY_PV=${PV%.*}_${PV##*.}
-MY_PV2=${PV//./_}
-At="j2re-${MY_PV2}-linux-i586.bin"
-S="${WORKDIR}/j2re${MY_PV}"
-DESCRIPTION="Sun's J2SE Platform"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/"
-SRC_URI=${At}
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm-1.4.2"
-KEYWORDS="-* ~x86"
-RESTRICT="fetch stricter"
-IUSE="X alsa nsplugin"
-
-DEPEND="sys-apps/sed"
-
-RDEPEND="sys-libs/glibc
-	alsa? ( media-libs/alsa-lib )
-	X? ( || (	(
-				x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXp
-				x11-libs/libXt
-				x11-libs/libXtst
-			)
-
-			virtual/x11
-		)
-	)"
-
-
-PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar
-lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2re-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-pkg_nofetch() {
-	einfo "Please download ${At} from:"
-	einfo ${DOWNLOAD_URL}
-	einfo "(select the \"Linux self-extracting file\" package format of the JRE"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		eerror "cannot read ${At}. Please check the permission and try again."
-		die
-	fi
-	#Search for the ELF Header
-	testExp=`echo -e "\177\105\114\106\001\001\001"`
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
-	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-
-	if [ -f ${S}/lib/unpack ]; then
-		UNPACK_CMD=${S}/lib/unpack
-		chmod +x $UNPACK_CMD
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		for i in $PACKED_JARS; do
-			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
-			if [ -f ${PACK_FILE} ]; then
-				echo "	unpacking: $i"
-				$UNPACK_CMD ${PACK_FILE} ${S}/$i
-				rm -f ${PACK_FILE}
-			fi
-		done
-	fi
-}
-
-src_install() {
-	local dirs="bin lib man javaws plugin"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/
-	done
-
-	dodoc CHANGES COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt
-	dohtml Welcome.html ControlPanel.html
-
-	if use nsplugin; then
-		local plugin_dir="ns610"
-		if has_version '>=sys-devel/gcc-3.2' ; then
-			plugin_dir="ns610-gcc32"
-		fi
-		install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java-jre.desktop
-	domenu ${T}/sun_java-jre.desktop
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-
-	# TODO prepman "fixes" symlink ja -> ja__JP.eucJP in 'man' directory,
-	#      creating ja.gz -> ja_JP.eucJP.gz. This is broken as ja_JP.eucJP
-	#      is a directory and will not be gzipped ;)
-}
-
-pkg_postinst () {
-	# Create files used as storage for system preferences.
-	touch /opt/${P}/.systemPrefs/.system.lock
-	chmod 644 /opt/${P}/.systemPrefs/.system.lock
-	touch /opt/${P}/.systemPrefs/.systemRootModFile
-	chmod 644 /opt/${P}/.systemPrefs/.systemRootModFile
-
-	java-vm-2_pkg_postinst
-
-	# Show info about netscape
-	if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then
-		echo
-		einfo "If you want to install the plugin for Netscape 4.x, type"
-		einfo
-		einfo "   cd /usr/lib/nsbrowser/plugins/"
-		einfo "   ln -sf /opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so"
-	fi
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar, javac and java"
-
-		for paxkills in "java"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/sun-jdk-1.4.2.03/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	if ! use X; then
-		echo
-		ewarn "Some parts of Sun's JDK require virtual/x11 to be installed."
-		ewarn "Be careful which Java libraries you attempt to use."
-	fi
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06-r2.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06-r2.ebuild
deleted file mode 100644
index f173115b9a06..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06-r2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06-r2.ebuild,v 1.3 2006/07/06 10:42:15 nelchael Exp $
-
-inherit java eutils
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-
-amd64file="jre-${MY_PVA}-linux-amd64.bin"
-x86file="jre-${MY_PVA}-linux-i586.bin"
-
-if use x86; then
-	At=${x86file}
-elif use amd64; then
-	At=${amd64file}
-fi
-
-S="${WORKDIR}/jre${MY_PVL}"
-DESCRIPTION="Sun's J2SE Platform"
-HOMEPAGE="http://java.sun.com/j2se/"
-SRC_URI="x86? ( $x86file ) amd64? ( $amd64file )"
-SLOT="1.5"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="fetch stricter"
-IUSE="X alsa browserplugin nsplugin mozilla"
-
-DEPEND="sys-apps/sed"
-
-RDEPEND="sys-libs/glibc
-		alsa? ( media-libs/alsa-lib )
-		X? ( || ( (
-					x11-libs/libX11
-					x11-libs/libXext
-					x11-libs/libXi
-					x11-libs/libXp
-					x11-libs/libXt
-					x11-libs/libXtst
-				)
-				virtual/x11
-			)
-		)"
-
-
-PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-FETCH_SDK="http://javashoplm.sun.com:80/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jre-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-
-pkg_nofetch() {
-	local archtext=""
-
-	if use x86; then
-		archtext="Linux"
-	elif use amd64; then
-		archtext="Linux AMD64"
-	fi
-
-	einfo "Please download ${At} from:"
-	einfo ${FETCH_SDK}
-	einfo "Select the ${archtext} self-extracting file"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-
-	#Search for the ELF Header
-	testExp=`echo -e "\105\114\106"`
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
-	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-
-	if [ -f ${S}/bin/unpack200 ]; then
-		UNPACK_CMD=${S}/bin/unpack200
-		chmod +x $UNPACK_CMD
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		for i in $PACKED_JARS; do
-			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
-			if [ -f ${PACK_FILE} ]; then
-				echo "	unpacking: $i"
-				$UNPACK_CMD ${PACK_FILE} ${S}/$i
-				rm -f ${PACK_FILE}
-			fi
-		done
-		rm -f ${UNPACK_CMD}
-	else
-		die "unpack not found"
-	fi
-}
-
-src_install() {
-
-	if use amd64; then
-		local dirs="bin lib man"
-	else
-		local dirs="bin lib man plugin javaws"
-	fi
-
-
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to build"
-	done
-
-	dodoc COPYRIGHT README
-	dohtml Welcome.html
-
-	if use nsplugin ||       # global useflag for netscape-compat plugins
-	   use browserplugin ||  # deprecated but honor for now
-	   use mozilla; then     # wrong but used to honor it
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java-jre.desktop
-
-	domenu ${T}/sun_java-jre.desktop
-
-	use !alsa && java_remove-libjsoundalsa /opt/${P}/jre/
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-	fix-i386-dir /opt/${P}/lib
-}
-
-pkg_postinst() {
-	# Create files used as storage for system preferences.
-	PREFS_LOCATION=/opt/${P}/
-	mkdir -p ${PREFS_LOCATION}/.systemPrefs
-	if [ ! -f ${PREFS_LOCATION}/.systemPrefs/.system.lock ] ; then
-		touch $PREFS_LOCATION/.systemPrefs/.system.lock
-		chmod 644 $PREFS_LOCATION/.systemPrefs/.system.lock
-	fi
-	if [ ! -f $PREFS_LOCATION/.systemPrefs/.systemRootModFile ] ; then
-		touch $PREFS_LOCATION/.systemPrefs/.systemRootModFile
-		chmod 644 $PREFS_LOCATION/.systemPrefs/.systemRootModFile
-	fi
-
-	# Set as default VM if none exists
-	java_pkg_postinst
-
-	if ! use nsplugin && ( use browserplugin || use mozilla ); then
-		echo
-		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
-		ewarn "future jdk/jre ebuilds for plugin installation. Please"
-		ewarn "update your USE to include 'nsplugin'."
-	fi
-
-	# Show info about netscape
-	if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then
-		echo
-		einfo "If you want to install the plugin for Netscape 4.x, type"
-		einfo
-		einfo "   cd /usr/lib/nsbrowser/plugins/"
-		einfo "   ln -sf /opt/${P}/plugin/i386/ns4/libjavaplugin.so"
-	fi
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar, javac and java"
-
-		for paxkills in "java"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/$VM/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	if ! use X; then
-		local xwarn="virtual/x11 and/or"
-	fi
-
-	echo
-	ewarn "Some parts of Sun's JRE require ${xwarn} virtual/lpr to be installed."
-	ewarn "Be careful which Java libraries you attempt to use."
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06.ebuild
deleted file mode 100644
index bddadbecbef6..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.06.ebuild,v 1.8 2006/07/06 10:42:15 nelchael Exp $
-
-inherit java eutils
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-
-amd64file="jre-${MY_PVA}-linux-amd64.bin"
-x86file="jre-${MY_PVA}-linux-i586.bin"
-
-if use x86; then
-	At=${x86file}
-elif use amd64; then
-	At=${amd64file}
-fi
-
-S="${WORKDIR}/jre${MY_PVL}"
-DESCRIPTION="Sun's J2SE Platform"
-HOMEPAGE="http://java.sun.com/j2se/"
-SRC_URI="x86? ( $x86file ) amd64? ( $amd64file )"
-SLOT="1.5"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="-* amd64 x86"
-RESTRICT="fetch stricter"
-IUSE="X alsa browserplugin nsplugin mozilla"
-
-DEPEND="sys-apps/sed"
-
-RDEPEND="sys-libs/glibc
-		alsa? ( media-libs/alsa-lib )
-		X? ( || ( (
-					x11-libs/libX11
-					x11-libs/libXext
-					x11-libs/libXi
-					x11-libs/libXp
-					x11-libs/libXt
-					x11-libs/libXtst
-				)
-				virtual/x11
-			)
-		)"
-
-
-PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-FETCH_SDK="http://javashoplm.sun.com:80/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jre-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-
-pkg_nofetch() {
-	local archtext=""
-
-	if use x86; then
-		archtext="Linux"
-	elif use amd64; then
-		archtext="Linux AMD64"
-	fi
-
-	einfo "Please download ${At} from:"
-	einfo ${FETCH_SDK}
-	einfo "Select the ${archtext} self-extracting file"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-
-	#Search for the ELF Header
-	testExp=`echo -e "\105\114\106"`
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
-	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-
-	if [ -f ${S}/bin/unpack200 ]; then
-		UNPACK_CMD=${S}/bin/unpack200
-		chmod +x $UNPACK_CMD
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		for i in $PACKED_JARS; do
-			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
-			if [ -f ${PACK_FILE} ]; then
-				echo "	unpacking: $i"
-				$UNPACK_CMD ${PACK_FILE} ${S}/$i
-				rm -f ${PACK_FILE}
-			fi
-		done
-		rm -f ${UNPACK_CMD}
-	else
-		die "unpack not found"
-	fi
-}
-
-src_install() {
-
-	if use amd64; then
-		local dirs="bin lib man"
-	else
-		local dirs="bin lib man plugin javaws"
-	fi
-
-
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to build"
-	done
-
-	dodoc COPYRIGHT README
-	dohtml Welcome.html
-
-	if use nsplugin ||       # global useflag for netscape-compat plugins
-	   use browserplugin ||  # deprecated but honor for now
-	   use mozilla; then     # wrong but used to honor it
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java-jre.desktop
-
-	domenu ${T}/sun_java-jre.desktop
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-}
-
-pkg_postinst() {
-	# Create files used as storage for system preferences.
-	PREFS_LOCATION=/opt/${P}/
-	mkdir -p ${PREFS_LOCATION}/.systemPrefs
-	if [ ! -f ${PREFS_LOCATION}/.systemPrefs/.system.lock ] ; then
-		touch $PREFS_LOCATION/.systemPrefs/.system.lock
-		chmod 644 $PREFS_LOCATION/.systemPrefs/.system.lock
-	fi
-	if [ ! -f $PREFS_LOCATION/.systemPrefs/.systemRootModFile ] ; then
-		touch $PREFS_LOCATION/.systemPrefs/.systemRootModFile
-		chmod 644 $PREFS_LOCATION/.systemPrefs/.systemRootModFile
-	fi
-
-	# Set as default VM if none exists
-	java_pkg_postinst
-
-	if ! use nsplugin && ( use browserplugin || use mozilla ); then
-		echo
-		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
-		ewarn "future jdk/jre ebuilds for plugin installation. Please"
-		ewarn "update your USE to include 'nsplugin'."
-	fi
-
-	# Show info about netscape
-	if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then
-		echo
-		einfo "If you want to install the plugin for Netscape 4.x, type"
-		einfo
-		einfo "   cd /usr/lib/nsbrowser/plugins/"
-		einfo "   ln -sf /opt/${P}/plugin/i386/ns4/libjavaplugin.so"
-	fi
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar, javac and java"
-
-		for paxkills in "java"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/$VM/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	if ! use X; then
-		local xwarn="virtual/x11 and/or"
-	fi
-
-	echo
-	ewarn "Some parts of Sun's JRE require ${xwarn} virtual/lpr to be installed."
-	ewarn "Be careful which Java libraries you attempt to use."
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.07.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.07.ebuild
deleted file mode 100644
index 5e93f97e3e9a..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.07.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.07.ebuild,v 1.2 2006/07/06 10:42:15 nelchael Exp $
-
-inherit java-vm-2 eutils
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-
-amd64file="jre-${MY_PVA}-linux-amd64.bin"
-x86file="jre-${MY_PVA}-linux-i586.bin"
-
-if use x86; then
-	At=${x86file}
-elif use amd64; then
-	At=${amd64file}
-fi
-
-S="${WORKDIR}/jre${MY_PVL}"
-DESCRIPTION="Sun's J2SE Platform"
-HOMEPAGE="http://java.sun.com/j2se/"
-SRC_URI="x86? ( $x86file ) amd64? ( $amd64file )"
-SLOT="1.5"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="fetch stricter"
-IUSE="X alsa nsplugin"
-
-JAVA_VM_NO_GENERATION1=true
-
-DEPEND="sys-apps/sed"
-
-RDEPEND="sys-libs/glibc
-		alsa? ( media-libs/alsa-lib )
-		X? ( || ( (
-					x11-libs/libX11
-					x11-libs/libXext
-					x11-libs/libXi
-					x11-libs/libXp
-					x11-libs/libXt
-					x11-libs/libXtst
-				)
-				virtual/x11
-			)
-		)"
-
-
-PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-FETCH_SDK="http://javashoplm.sun.com:80/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jre-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-
-
-pkg_nofetch() {
-	local archtext=""
-
-	if use x86; then
-		archtext="Linux"
-	elif use amd64; then
-		archtext="Linux AMD64"
-	fi
-
-	einfo "Please download ${At} from:"
-	einfo ${FETCH_SDK}
-	einfo "Select the ${archtext} self-extracting file"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-
-	#Search for the ELF Header
-	testExp=`echo -e "\105\114\106"`
-	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
-	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-
-	if [ -f ${S}/bin/unpack200 ]; then
-		UNPACK_CMD=${S}/bin/unpack200
-		chmod +x $UNPACK_CMD
-		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
-		for i in $PACKED_JARS; do
-			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
-			if [ -f ${PACK_FILE} ]; then
-				echo "	unpacking: $i"
-				$UNPACK_CMD ${PACK_FILE} ${S}/$i
-				rm -f ${PACK_FILE}
-			fi
-		done
-		rm -f ${UNPACK_CMD}
-	else
-		die "unpack not found"
-	fi
-}
-
-src_install() {
-
-	if use amd64; then
-		local dirs="bin lib man"
-	else
-		local dirs="bin lib man plugin javaws"
-	fi
-
-
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to build"
-	done
-
-	dodoc COPYRIGHT README
-	dohtml Welcome.html
-
-	if use nsplugin; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# create dir for system preferences
-	dodir /opt/${P}/.systemPrefs
-
-	# install control panel for Gnome/KDE
-	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
-		-e "s/\(Name=Java\)/\1 Control Panel/" \
-		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
-		${T}/sun_java-jre.desktop
-
-	domenu ${T}/sun_java-jre.desktop
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-}
-
-pkg_postinst() {
-	# Create files used as storage for system preferences.
-	PREFS_LOCATION=/opt/${P}/
-	mkdir -p ${PREFS_LOCATION}/.systemPrefs
-	if [ ! -f ${PREFS_LOCATION}/.systemPrefs/.system.lock ] ; then
-		touch $PREFS_LOCATION/.systemPrefs/.system.lock
-		chmod 644 $PREFS_LOCATION/.systemPrefs/.system.lock
-	fi
-	if [ ! -f $PREFS_LOCATION/.systemPrefs/.systemRootModFile ] ; then
-		touch $PREFS_LOCATION/.systemPrefs/.systemRootModFile
-		chmod 644 $PREFS_LOCATION/.systemPrefs/.systemRootModFile
-	fi
-
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if ! use nsplugin && ( use browserplugin || use mozilla ); then
-		echo
-		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
-		ewarn "future jdk/jre ebuilds for plugin installation. Please"
-		ewarn "update your USE to include 'nsplugin'."
-	fi
-
-	# Show info about netscape
-	if has_version '>=www-client/netscape-navigator-4.79-r1' || has_version '>=www-client/netscape-communicator-4.79-r1' ; then
-		echo
-		einfo "If you want to install the plugin for Netscape 4.x, type"
-		einfo
-		einfo "   cd /usr/lib/nsbrowser/plugins/"
-		einfo "   ln -sf /opt/${P}/plugin/i386/ns4/libjavaplugin.so"
-	fi
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar, javac and java"
-
-		for paxkills in "java"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/$VM/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	if ! use X; then
-		local xwarn="virtual/x11 and/or"
-	fi
-
-	echo
-	ewarn "Some parts of Sun's JRE require ${xwarn} virtual/lpr to be installed."
-	ewarn "Be careful which Java libraries you attempt to use."
-}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08.ebuild
deleted file mode 100644
index 4fcd3ad01cb9..000000000000
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08.ebuild,v 1.2 2006/08/17 20:43:47 nichoj Exp $
-
-inherit java-vm-2 eutils
-
-MY_PVL=${PV%.*}_${PV##*.}
-MY_PVA=${PV//./_}
-#S="${WORKDIR}/jdk${MY_PVL}"
-
-X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin"
-AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin"
-if use x86; then
-	At=${X86_AT}
-elif use amd64; then
-	At=${AMD64_AT}
-fi
-DESCRIPTION="Sun's J2SE Development Kit, version ${PV}"
-HOMEPAGE="http://java.sun.com/j2se/1.5.0/"
-SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
-		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
-SLOT="1.5"
-LICENSE="dlj-1.1"
-KEYWORDS="~amd64 ~x86 -*"
-# Restrict stricter because of textrels
-RESTRICT="nostrip stricter"
-IUSE="X alsa nsplugin"
-
-JAVA_VM_NO_GENERATION1=true
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	X? ( || ( ( x11-libs/libICE
-				x11-libs/libSM
-		 		x11-libs/libX11
-				x11-libs/libXau
-				x11-libs/libXdmcp
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXp
-				x11-libs/libXt
-				x11-libs/libXtst
-			  )
-				virtual/x11
-			)
-		)"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-
-PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar"
-
-# this is needed for proper operating under a PaX kernel without activated grsecurity acl
-CHPAX_CONSERVATIVE_FLAGS="pemsv"
-
-src_unpack() {
-	if [ ! -r ${DISTDIR}/${At} ]; then
-		die "cannot read ${At}. Please check the permission and try again."
-	fi
-
-	mkdir bundled-jdk
-	cd bundled-jdk
-	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
-
-	cd ..
-	bash ${FILESDIR}/construct.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
-
-	${S}/bin/java -client -Xshare:dump
-}
-
-src_install() {
-	local dirs="bin lib man"
-	# only X86 has the plugin and javaws
-	use x86 && dirs="${dirs} javaws plugin"
-	dodir /opt/${P}
-
-	for i in $dirs ; do
-		cp -pPR $i ${D}/opt/${P}/ || die "failed to copy"
-	done
-	dodoc CHANGES README THIRDPARTYLICENSEREADME.txt
-	dohtml Welcome.html
-	dodir /opt/${P}/share/
-
-	if use nsplugin; then
-		local plugin_dir="ns7-gcc29"
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin_dir="ns7"
-		fi
-
-		if use x86 ; then
-			install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so
-		else
-			eerror "No plugin available for amd64 arch"
-		fi
-	fi
-
-	# TODO Don't think we still needs these -nichoj
-	# create dir for system preferences
-	#dodir /opt/${P}/jre/.systemPrefs
-	# Create files used as storage for system preferences.
-	#touch ${D}/opt/${P}/jre/.systemPrefs/.system.lock
-	#chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.system.lock
-	#touch ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
-	#chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
-
-	# FIXME figure out how to handle the control pannel conflict with
-	# sun-jdk-bin
-
-	# install control panel for Gnome/KDE
-#	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
-#		-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
-#		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
-#		${T}/sun_java-${SLOT}.desktop
-
-#	domenu ${T}/sun_java-${SLOT}.desktop
-
-	set_java_env
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version sys-apps/chpax
-	then
-		echo
-		einfo "setting up conservative PaX flags for java"
-
-		for paxkills in "java"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
-		done
-
-		# /opt/$VM/jre/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + hardened@gentoo.org"
-	fi
-
-	if ! use X; then
-		local xwarn="virtual/x11 and/or"
-	fi
-
-	echo
-	ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed."
-	ewarn "Be careful which Java libraries you attempt to use."
-
-	echo
-	einfo " Be careful: ${P}'s Java compiler uses"
-	einfo " '-source 1.5' as default. Some keywords such as 'enum'"
-	einfo " are not valid identifiers any more in that mode,"
-	einfo " which can cause incompatibility with certain sources."
-}