Redigest because IBM changed distfiles silently, bug #265760. The only change seems to be omiting BigDecimal.java in src.zip, so no revbump. Remove old versions.

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

4 files changed, 12 insertions, 456 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index d3c4b91db595..b73014a75587 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.196 2009/04/21 18:59:24 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.197 2009/04/21 19:11:10 caster Exp $
+
+  21 Apr 2009; Vlastimil Babka <caster@gentoo.org>
+  -ibm-jdk-bin-1.4.2.12.ebuild, -ibm-jdk-bin-1.6.0.3.ebuild:
+  Redigest because IBM changed distfiles silently, bug #265760. The only
+  change seems to be omiting BigDecimal.java in src.zip, so no revbump.
+  Remove old versions.
 
   21 Apr 2009; Vlastimil Babka <caster@gentoo.org> Manifest:
   Fix digest of IBMJava2-SDK-1.4.2-13.0.ppc.tgz - bug #265680.
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index b768ed2b6f53..e0e02b595ce1 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -3,26 +3,14 @@ AUX ibm-jdk-bin-1.4.env 1125 RMD160 9ee81d807088259b7c2f0a5062965e0e94195cef SHA
 AUX ibm-jdk-bin-1.5.env 1149 RMD160 04ac562f22f2e16ae0a21380bcf6781f2e05b6e1 SHA1 93d3694d723cbcb1f776a8d064200f5a91394896 SHA256 1ccf08c7cc6429065978a6a0c038654c4e9768c8c150c56c39eb5408c1abe21d
 AUX ibm-jdk-bin-1.6.env 1626 RMD160 425aa7a4e65154c0f426472d8e2ec62324598124 SHA1 a56f585b3c472f467276422ba8b55c12f9043852 SHA256 5c1804c89e0e1699972a08e3f420988ac4f6aa074d8c63ca585b09646ec5c28d
 AUX ibm-jdk-bin-jawt.h.patch 377 RMD160 d9e5eab16ca4002b00ca70d55fb3a3112d0011dd SHA1 5fa611adbdf036678bb0d582d2013225251d5a9e SHA256 87d54a556d706c1f4ab0f2cd98cd89c354e69c3caf83518f687d6cac11cfb8ff
-DIST IBMJava2-JAVACOMM-1.4.2-12.0.ppc.tgz 124657 RMD160 b0d8b39f252fd576265870db249f54717806beae SHA1 4384291e6ede9b9d7478723c3be45c1effa40fd6 SHA256 15c9f51648c5c9d0b673758589c6f31066f798e11100895f72ca0bcfd7134b67
-DIST IBMJava2-JAVACOMM-1.4.2-12.0.ppc64.tgz 126796 RMD160 ab7c419683ab324f11a9a039b123785d8d1fd907 SHA1 e12643eb6c692eb538a147c80ce3e95171c62648 SHA256 0851184dfc138ce651a9643b24d159118e27e3af2a3d812133f50bdec0b00d3e
-DIST IBMJava2-JAVACOMM-1.4.2-12.0.tgz 118353 RMD160 2cafb8e68d24776d0679c7d7cfbc1258d14caf55 SHA1 099529de2bffb62867741df38f42d8ff6f8f2e38 SHA256 a03142d883005366bce1552fa1eda7f2ab772f305c6043dca7f1699479e7ed2e
 DIST IBMJava2-JAVACOMM-1.4.2-13.0.ppc.tgz 124759 RMD160 2b0e06911ae5a03a52a96e61edc613201834dbbc SHA1 320daaa3e52dac3f996b3b9f2fe318946f1368ee SHA256 a8f990039305f6557058c2326155d8efcc2cc1d07d15a7a9b9e225ef63d9e028
 DIST IBMJava2-JAVACOMM-1.4.2-13.0.ppc64.tgz 126768 RMD160 eb1a5831b61d4db0b7491aed519bbf7888e4ae1e SHA1 261fd83686258de4bf25c3c825fe92d43334dcaa SHA256 f4e88001884bb76696be3e09dd3ff33230667776602bf4624285e01a6bae80af
 DIST IBMJava2-JAVACOMM-1.4.2-13.0.tgz 118484 RMD160 27c03896460ae4228abc75ea2f2d80c6f5ec8d32 SHA1 a334c3eea1da7ca46d3d89bf8ab017bc417d73af SHA256 a8ff3aae2e9e5d22f3c8889e2df577f746a544c16c3c071641543bc08c452f0b
-DIST IBMJava2-JAVACOMM-AMD64-1.4.2-12.0.x86_64.tgz 120038 RMD160 824a0e37326fbf23bb71c05c3dd1a520ace24b5a SHA1 70a14ebebb9b210abe0341b3f32d6fe5525925cd SHA256 fefd33e2e9310e865ca60938c40b2c0ff839a10a833eeb5fe6e7e7c4493bca01
 DIST IBMJava2-JAVACOMM-AMD64-1.4.2-13.0.x86_64.tgz 120805 RMD160 6dce013044acf169955055e8f65b342fa97e80d2 SHA1 986ca5ff1dd3ac2161766ad94c42f9b0640edfd8 SHA256 4151ec541cb4b6d3a74525a3af49b2c7f33621a50244513fff4f2d60c94125f7
-DIST IBMJava2-SDK-1.4.2-12.0.ppc.tgz 67068227 RMD160 2a931490d32c4c746dca179808449524e228e67a SHA1 a86991ebeddefb546c667b8a130902e09fbba69b SHA256 c179214062d5a2c7a4ffd5a7a98de44567be1495fcecbb427227a17c3c3643b3
-DIST IBMJava2-SDK-1.4.2-12.0.ppc64.tgz 65272395 RMD160 72a362fa0010ea3aa07a5dbaf88a398ed3e6573a SHA1 18c2465d573b0ea366a8adf82795b946da43d53a SHA256 793765f65bc0618acc383a2e00d7df96b587fb2c4bfc3f1abbfaa38f78858d0c
-DIST IBMJava2-SDK-1.4.2-12.0.tgz 59064312 RMD160 7897673086ed892bf63038a7c629db00b611c82c SHA1 254c465ee2aa2857b02f2f905c30a162468ad8dd SHA256 c93c7c6cc970c69bab738dd9cf99ab0e6c01d9f541903dc1120a52c756491cdf
 DIST IBMJava2-SDK-1.4.2-13.0.ppc.tgz 67149283 RMD160 d4fbdecbffcce41a30c099f26639c6030f268895 SHA1 f391ee402a94d4557648a7b73c3d3430522a4094 SHA256 796c8b9e4dac96ba23dce2bd7c371acd25195cafabe82feb3b9256414aebe930
 DIST IBMJava2-SDK-1.4.2-13.0.ppc64.tgz 65363596 RMD160 6878cf80813a216e8368e706ff6f4417d2f92c1d SHA1 c95fbd1bfad15cb3d88c8e97eb0894e772843602 SHA256 2f68c37f6d9717396e7f9fbfa92af4cdd16769c4f6e1fe19b994f90916037fe5
 DIST IBMJava2-SDK-1.4.2-13.0.tgz 59094335 RMD160 77235dd15bd0c11fd66ddcfa27f16211dcdd6201 SHA1 6e58988f6099e388899f62f3777493935d130e7c SHA256 f631218b86ac7bba487e0beca091ce832d9c8ba137c05ac6785385ebc1535667
-DIST IBMJava2-SDK-AMD64-1.4.2-12.0.x86_64.tgz 57332160 RMD160 61e9cc53187c58f3422605034d2fcb513980f764 SHA1 53744754799837e460f79456fe58cea63f12f7e0 SHA256 ae54c5099b2d6eeef8951bfef19cd6d8c7897d62c5bdf489f17b5bfe0da3d496
 DIST IBMJava2-SDK-AMD64-1.4.2-13.0.x86_64.tgz 57358200 RMD160 5d90751932d5e0a64f05e197b69ccd8f1f30c34b SHA1 7a5525a0f573bb862ec0be24a1d7b3c2e3f06fe1 SHA256 67559e72b8a5df7d1e8d5a790cda98395629da9be3d9f371ccebafa4a9cf7844
-DIST ibm-java-javacomm-6.0-3.0-linux-i386.tgz 336297 RMD160 d8397e8e34da596d5bf2837baac9b41e1fe1bc24 SHA1 0e1b33d23c9896407d4bc6b7327d7bcb3dcbb564 SHA256 fba0f870d1c2ab37bb9fb5402cd17a21fd8ecb73678b3c1062ac49f59617f85a
-DIST ibm-java-javacomm-6.0-3.0-linux-ppc.tgz 342368 RMD160 0cd3857ed50c747ef4e09367312feeca03cb9827 SHA1 85ae07c3f4d2adf9107b40b2e13550ee829a4b3c SHA256 87901f05f53d3d7c756a3cf591d2f57e5749b6a04e87ad4d0570a1bc1890578d
-DIST ibm-java-javacomm-6.0-3.0-linux-ppc64.tgz 341644 RMD160 6c3383a577e48888cd7903714d03b9af8d99c079 SHA1 4fdf4c6e0e20523bd1731da26f542d2502bfbb61 SHA256 1a935af182d156129ff399c19f051f1e3f6620cbbe0d6f77534af67c5d6f8ed1
-DIST ibm-java-javacomm-6.0-3.0-linux-x86_64.tgz 338635 RMD160 774286e416322723221d0a39dbe5397d56fa94eb SHA1 af67e7268cdc1c7abc19eaba4b39c0d84785605f SHA256 02b0353885424ce7c5aed02b2d5cd27658ac36c394ae94d2f1e8fbdb1544ad2f
 DIST ibm-java-javacomm-6.0-4.0-linux-i386.tgz 336897 RMD160 c22d3ad9d09f869ec743fab599463a9dbea0511e SHA1 6b645130654596096ee3949c530d1c2fc49c62f1 SHA256 2a04826238b0e2a24b611622191e3c3545ec6e2737fc9f240c8b53f19841d705
 DIST ibm-java-javacomm-6.0-4.0-linux-ppc.tgz 343028 RMD160 711d942d7895ea016d060d2f0db549a5fda130e4 SHA1 3932368b932bb3e69b05e4995aad0b57baf9eea3 SHA256 5618541e0cdb38607856eb47aa1878a3db4165c2ba0d59a87ada875c9b300da0
 DIST ibm-java-javacomm-6.0-4.0-linux-ppc64.tgz 342371 RMD160 57f9d943079ace31ea5777717c449c79ccefd4a8 SHA1 e54dd49c71bb014af3e33a05579b60a7e0751186 SHA256 27feede3959306f264185876440f55d5807782dc31d519600004f4868c644c4a
@@ -31,14 +19,10 @@ DIST ibm-java-sdk-6.0-0.0-linux-i386.tgz 86573879 RMD160 6489716e491907193c0d270
 DIST ibm-java-sdk-6.0-0.0-linux-ppc.tgz 88854304 RMD160 626bec6e1f97e3fb214915c4e51421b5e206bd5d SHA1 d17570549080fd434c973298b68ee6e11eb273dd SHA256 b299eca3276a35b794f9543768e51e707051dda74d819d67f0d6660352be36f7
 DIST ibm-java-sdk-6.0-0.0-linux-ppc64.tgz 90297044 RMD160 23e96a95c714bfe8e0384d806e056c6228386d89 SHA1 a5a515b312c42fd526e6ccbbe21f0d736f32a6b7 SHA256 0aa829dc7498bcb8031de2f759622bc754981a7417a89e434d1b87b4f59e41a2
 DIST ibm-java-sdk-6.0-0.0-linux-x86_64.tgz 84220678 RMD160 be7dbbc05c6ff5d0108d49be3610ee3d1aa4b379 SHA1 eac9beb66734a3d4d95b0287797769c877b0e81a SHA256 d43a7bf89e1457bfc68464fc84d9533d6d49f4cebb354ee0a12ce6dff9f6a191
-DIST ibm-java-sdk-6.0-3.0-linux-i386.tgz 90138190 RMD160 fada6ea7dfc1eb0480665e37687ad0c9eca16fb5 SHA1 7ca14cfc130e61811e7b010fecb2947d25b2ce1a SHA256 39fccb68187d10e7a278686210afa75e367f7200c5c9fc88ad97ccf42b7f12ca
-DIST ibm-java-sdk-6.0-3.0-linux-ppc.tgz 92293913 RMD160 53c17fdbdac85fc1ff5bb97efb32ae8facdf8330 SHA1 f65694189fb61e9e3bb7369e3d90989058c8a6fb SHA256 855441a97dd5a35dac0407aeb3d021c46d0115a4e677aa67aaa1334747902c9b
-DIST ibm-java-sdk-6.0-3.0-linux-ppc64.tgz 96798746 RMD160 c0ee3721b651b2bc1e1130a6f393fb6220d989ca SHA1 4e405ca2f619d59b769c10d84f671039cc9b54a6 SHA256 128d71812e728ce16f2582d63cd4374703da95dacb8fa73f67c3749f9b17b269
-DIST ibm-java-sdk-6.0-3.0-linux-x86_64.tgz 88124225 RMD160 e93dd1faf4f2f56c7978cdd8399433c93e5a2f41 SHA1 9335c0198d1dea1f2f19399fe6984162cd9318ca SHA256 30da9c83bc96c8e39e9e246b5be1bfdabc994edfa8e615f1ba9a5fdb37beee19
-DIST ibm-java-sdk-6.0-4.0-linux-i386.tgz 90323366 RMD160 420f973af896647e6e98035a434218b7d09d3dab SHA1 4512782ed3ed5a3eddab573279304500da8ee494 SHA256 451b34e676faf9be324469eb32f61b3b81a6d3c4bfda1ad6771f05681d906cda
-DIST ibm-java-sdk-6.0-4.0-linux-ppc.tgz 92467344 RMD160 3c66c9f255d20d931ac2b9bbe7ad58224cdf1f63 SHA1 689e19ca566ec6f7b2ab9c872a027485b7fb14e8 SHA256 0486c7d70049b76bfc714f0170b4961cf2f57e53b72bf0bfadc783745cf38a8d
-DIST ibm-java-sdk-6.0-4.0-linux-ppc64.tgz 97003037 RMD160 8e1758d156cca9f17bf0b8d4b60df01a5dca5a98 SHA1 fb92716b19b67467a85e1eb3bb326d4e95dced1a SHA256 6774360a653a0a06ce638f5733b0ab1cb098eec694869b87821af628c7b3661a
-DIST ibm-java-sdk-6.0-4.0-linux-x86_64.tgz 88318614 RMD160 3de14ba7a48d5ec4b34f130bd4f2e57f45334654 SHA1 54c5628415b629edd8075b78739fd2e1275dbce8 SHA256 338698bacf0dbbffb3d9a9b383cab0a434e9e6afd4b5eed78ae38ce70f690626
+DIST ibm-java-sdk-6.0-4.0-linux-i386.tgz 90258217 RMD160 21b739c30ffcbfbd1fc552ae4125d77c7cf726d5 SHA1 3b7458e41e27533718f9feeba03e663cafc530de SHA256 24ee9721250504cf0599d3a1344d5e18985f2fdde3500e20307692579abe85d0
+DIST ibm-java-sdk-6.0-4.0-linux-ppc.tgz 92415505 RMD160 44fb6752a5fbaaeb4a5858d5aa62fbfc6b6ec239 SHA1 3f3f0544a91e3f26142383cc5d2f573174bb7994 SHA256 4f190afa6b428b9d9f8dce992e55e37790537b860ca4c223c21234092c31d3d1
+DIST ibm-java-sdk-6.0-4.0-linux-ppc64.tgz 96947121 RMD160 57e7579de3e241954353320f6ab4b25c9b8514b0 SHA1 e5c59073547405903a61fce0e165bfbe551dac24 SHA256 ddd38464395042ff60a3578ce43bdbe96f8ec5061fa18a2be2545e302f6137da
+DIST ibm-java-sdk-6.0-4.0-linux-x86_64.tgz 88254741 RMD160 3269fb539da0e20555d15bcd27522188456c57e4 SHA1 1c0f9580101d01c9e254f43d82cb79d6af18a00e SHA256 2ede679ebef141bb0abc07f85307b197dbb1b14aefdde24b3bbc13574649541d
 DIST ibm-java2-javacomm-5.0-9.0-linux-i386.tgz 119995 RMD160 10958d53babfe5fbb6f9a18e32ffa39b1f55d8c7 SHA1 d44816f749d80d3675a6f01cf093ad5b4d722f60 SHA256 9c307b88477d64a439375324cdea98668d3dd3e31c16ca75598506379e814711
 DIST ibm-java2-javacomm-5.0-9.0-linux-ppc.tgz 124739 RMD160 54c0f94fdec50d01a8ebede4ff8ab966f5d593a9 SHA1 09a4541ddc3c5a589272e21430112514d13d21c7 SHA256 53a819c6ad568f57f5053375a645856cc989d27d38245b0a6c35f3c50a258054
 DIST ibm-java2-javacomm-5.0-9.0-linux-ppc64.tgz 128501 RMD160 f44b83175c7b4e4205d007132ce8e90d6cc2ef44 SHA1 4ecc456c4e02a21210d7d76821056c3d6cc8d260 SHA256 5e475e7df63189814bc70b5976978c699c897cdba64819bb6d4019c0a57882bd
@@ -51,11 +35,9 @@ DIST ibm-javacomm-3.0-0.0-linux-i386.tgz 398689 RMD160 ef72d2210532f8534184b9c57
 DIST ibm-javacomm-3.0-0.0-linux-ppc.tgz 403218 RMD160 b791c0b5a2f8dd8165bda31443b689201137ded3 SHA1 442747354d2a74c3970f5ed2c8a7cd5558fe2111 SHA256 1dfc49f3b93ca01b25f3dc4a315232754910da8c7b50d26413ef9352414e388d
 DIST ibm-javacomm-3.0-0.0-linux-ppc64.tgz 407966 RMD160 d7c1185660e680b4f8d2a3591616cb29be6cee83 SHA1 c257cdf07b3a379e51718c4f4360c501d15600a5 SHA256 ef135dc9b13484b6b5bc81c11d186de1d65ca4db2dde765c4a8b41a4970f1fe8
 DIST ibm-javacomm-3.0-0.0-linux-x86_64.tgz 401081 RMD160 ac9e7fe4dfc47e7b54bd01e9b806644bcfcf1a8c SHA1 adab954713c52d419ea47b7266a59b90d6f71161 SHA256 181cc8d90a3404345a40dc11b4f83230d919cdce025256418483314d11f91dfd
-EBUILD ibm-jdk-bin-1.4.2.12.ebuild 5024 RMD160 9cb233f1c01bbed2afcd30f2c18ee167fb3a38af SHA1 2c1deb8f0a4259b6937184df2b01c187f1226bb2 SHA256 296f454e958ece4bc048b9ee9c90a04b550ab195506b0b1e5a5e870a4ff8dc64
 EBUILD ibm-jdk-bin-1.4.2.13.ebuild 5023 RMD160 13e8a22582159c3bd68988035167d89b8dca9c1b SHA1 f14e6d64e1bb313bbb2bd09f832b34a2a8d1a7ec SHA256 1d100db7a2a2029d94eb3d1cbc8bd39bf3a50966e98ff21cce0d8c4d6baf487a
 EBUILD ibm-jdk-bin-1.5.0.9.ebuild 7296 RMD160 9dfdf304f5419c4a641aea79230e4cbceb1f8357 SHA1 f34508d5810691259c135c29df7ecacd5caf206c SHA256 5761e69721b0e7cda605f9e40d5eba62015dbcad1d1b53cef8e17b285c2e2bb4
 EBUILD ibm-jdk-bin-1.6.0.0.ebuild 6974 RMD160 84625cb36b4b366ed22169396229c8750141644a SHA1 2a77f60a72c8996d4b3e03756ea2f604b6dc2138 SHA256 c29aba6cce9d0f997006df201f366550e87f382f513bab8bb9ffffd93a3d18ba
-EBUILD ibm-jdk-bin-1.6.0.3.ebuild 8977 RMD160 1b6c0a2e20217ca6ca25e49a9aa4ccae636a0aa6 SHA1 a91658ed07afd1f0153dcbc5eb24a94ebe74770e SHA256 92e8d2170e164499512becf55d563c693b9aa6676a2665e023e01aec2f8eef3b
 EBUILD ibm-jdk-bin-1.6.0.4.ebuild 8977 RMD160 8e7392a09c0f1fe5fc9773f7ff05eab88ca83aa8 SHA1 58b2e1d70faf053e3c7e44ffd992f04d8d1f977d SHA256 ccbe3fede29fab434c5bd434bbe127a8a05e90a8ad0e22fc1cff592fc1b3702d
-MISC ChangeLog 30343 RMD160 6fb26b9778969d2ee891e4893fd64bf96c93f59f SHA1 d831f2057508c2b79cb097ccccae9cf074f48496 SHA256 b0e9b5c41c60a9977072b3ff90a62bcf016819b41c664a91f0e8659a02622701
+MISC ChangeLog 30624 RMD160 5f5449b2e1ecb671553c3186268645d39a36091a SHA1 c27e7d4c54d703938a8d454c340084e2132524f2 SHA256 b335c6e5b08ad93f837f23a84ffa13e42ed4aebc2bd7a75451e1b48ab15591a7
 MISC metadata.xml 310 RMD160 ac3496cf91b69c0bab3ab8fb6656fbcbf8845f8d SHA1 c8bca85a871e8f7c11481456b490a0fd09175884 SHA256 ffd62e0957318b6c4f3308be446258eae8ce7b8436075f231a30e2ae4691fabf
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.12.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.12.ebuild
deleted file mode 100644
index 03afd3dd40c0..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.12.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.12.ebuild,v 1.3 2008/10/15 07:42:59 corsair Exp $
-
-JAVA_SUPPORTS_GENERATION_1="true"
-inherit java-vm-2 eutils versionator
-
-JDK_RELEASE=$(get_version_component_range 1-3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-
-JDK_DIST_PREFIX="IBMJava2-SDK-${RPM_PV}"
-JAVACOMM_DIST_PREFIX="IBMJava2-JAVACOMM-${RPM_PV}"
-
-X86_JDK_DIST="${JDK_DIST_PREFIX}.tgz"
-X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}.tgz"
-
-# wonder why amd64 has this extra special AMD64 in its filename...
-AMD64_JDK_DIST="IBMJava2-SDK-AMD64-${RPM_PV}.x86_64.tgz"
-AMD64_JAVACOMM_DIST="IBMJava2-JAVACOMM-AMD64-${RPM_PV}.x86_64.tgz"
-
-PPC_JDK_DIST="${JDK_DIST_PREFIX}.ppc.tgz"
-PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}.ppc.tgz"
-
-PPC64_JDK_DIST="${JDK_DIST_PREFIX}.ppc64.tgz"
-PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}.ppc64.tgz"
-
-if use x86; then
-	JDK_DIST=${X86_JDK_DIST}
-	JAVACOMM_DIST=${X86_JAVACOMM_DIST}
-	S="${WORKDIR}/IBMJava2-142"
-	LINK_ARCH="ia32"
-elif use amd64; then
-	JDK_DIST=${AMD64_JDK_DIST}
-	JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
-	S="${WORKDIR}/IBMJava2-amd64-142"
-	LINK_ARCH="amd64"
-elif use ppc; then
-	JDK_DIST=${PPC_JDK_DIST}
-	JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
-	S="${WORKDIR}/IBMJava2-ppc-142"
-	LINK_ARCH="ip32"
-elif use ppc64; then
-	JDK_DIST=${PPC64_JDK_DIST}
-	JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
-	S="${WORKDIR}/IBMJava2-ppc64-142"
-	LINK_ARCH="ip64"
-fi
-
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=lxdk&S_PKG=${LINK_ARCH}142sr${SERVICE_RELEASE}&cp=UTF-8&S_TACT=105AGX05&S_CMP=JDK"
-
-DESCRIPTION="IBM Java Development Kit"
-HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
-DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
-# bug #125178
-ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
-
-SRC_URI="x86? ( ${X86_JDK_DIST} )
-	amd64? ( ${AMD64_JDK_DIST} )
-	ppc? ( ${PPC_JDK_DIST} )
-	ppc64? ( ${PPC64_JDK_DIST} )
-	javacomm? (
-		x86? ( ${X86_JAVACOMM_DIST} )
-		amd64? ( ${AMD64_JAVACOMM_DIST} )
-		ppc? ( ${PPC_JAVACOMM_DIST} )
-		ppc64? ( ${PPC64_JAVACOMM_DIST} )
-	)"
-
-LICENSE="IBM-J1.4"
-SLOT="1.4"
-KEYWORDS="-* amd64 ppc ppc64 x86"
-IUSE="X alsa doc examples javacomm nsplugin"
-
-RDEPEND="=virtual/libstdc++-3.3
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXp
-		x11-libs/libXtst
-		x11-libs/libXt
-		x11-libs/libX11
-	)
-	doc? ( =dev-java/java-sdk-docs-1.4.2* )"
-
-RESTRICT="fetch"
-
-QA_TEXTRELS_amd64="opt/${P}/jre/bin/libj9jit23.so
-	opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/j9vm/libjclscar_23.so
-	opt/${P}/jre/bin/j9vm/libj9jit23.so
-	opt/${P}/jre/bin/libjclscar_22.so
-	opt/${P}/jre/bin/libj9jit22.so"
-QA_TEXTRELS_ppc64="opt/${P}/jre/bin/classic/libjvm.so"
-QA_TEXTRELS_ppc="opt/${P}/jre/bin/libjitc.so
-	opt/${P}/jre/bin/libjaas.so"
-QA_TEXTRELS_x86="opt/${P}/jre/bin/lib*.so
-	opt/${P}/jre/bin/javaplugin.so
-	opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/bin/classic/libcore.so"
-
-pkg_nofetch() {
-	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
-	einfo "Please visit: ${DOWNLOADPAGE}"
-
-	einfo "Under Java 1.4.2, download SR${SERVICE_RELEASE} for your arch:"
-	einfo "${JDK_DIST}"
-	if use javacomm ; then
-		einfo "${JAVACOMM_DIST}"
-	fi
-	einfo "You can also use direct link to your arch download page:"
-	einfo "${DIRECT_DOWNLOAD}"
-	einfo "Place the file(s) in: ${DISTDIR}"
-	einfo "Then restart emerge: 'emerge --resume'"
-
-	einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}"
-	einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
-	einfo "isn't updated, but the files should still available through the"
-	einfo "direct link to arch download page. If it doesn't work, file a bug."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# bug #126105
-	epatch "${FILESDIR}/${PN}-jawt.h.patch"
-}
-
-src_compile() { true; }
-
-src_install() {
-	# javaws is on x86 only
-	if use x86; then
-		# The javaws execution script is 777 why?
-		chmod 0755 "${S}"/jre/javaws/javaws
-
-		# bug #147259
-		dosym ../jre/javaws/javaws /opt/${P}/bin/javaws
-		dosym ../javaws/javaws /opt/${P}/jre/bin/javaws
-	fi
-
-	# Copy all the files to the designated directory
-	dodir /opt/${P}
-	cp -pR "${S}"/{bin,jre,lib,include,src.jar} "${D}"/opt/${P}/
-
-	dodir /opt/${P}/share
-	if use examples; then
-		cp -pPR "${S}"/demo "${D}"/opt/${P}/share/
-	fi
-
-	# setting the ppc stuff
-	if use ppc; then
-		dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc.so
-		dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc_g.so
-		insinto /etc
-		doins "${FILESDIR}/cpuinfo"
-	fi
-
-	if use x86 && use nsplugin; then
-		local plugin="libjavaplugin_oji.so"
-
-		if has_version '>=sys-devel/gcc-3' ; then
-			plugin="libjavaplugin_ojigcc3.so"
-		fi
-
-		install_mozilla_plugin /opt/${P}/jre/bin/${plugin}
-	fi
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc "${S}"/docs/COPYRIGHT
-
-	set_java_env
-	java-vm_revdep-mask
-}
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.3.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.3.ebuild
deleted file mode 100644
index 232308c0e64c..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.3.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.3.ebuild,v 1.3 2009/01/26 16:47:55 ranger Exp $
-
-inherit java-vm-2 versionator eutils
-
-JDK_RELEASE=$(get_version_component_range 2-3)
-JAVACOMM_RELEASE=$(get_version_component_range 3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
-TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-#JAVACOMM_PV="3.${JAVACOMM_RELEASE}-${SERVICE_RELEASE}.0"
-# looks like they didn't bump javacomm
-JAVACOMM_PV_ORIG="3.${JAVACOMM_RELEASE}-0.0"
-JAVACOMM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-
-JDK_DIST_PREFIX="ibm-java-sdk-${TGZ_PV}-linux"
-JAVACOMM_DIST_PREFIX="ibm-java-javacomm-${JAVACOMM_PV}-linux"
-JAVACOMM_DIST_PREFIX_ORIG="ibm-java-javacomm-${JAVACOMM_PV_ORIG}-linux"
-
-X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.tgz"
-X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.tgz"
-X86_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-i386.tgz"
-
-AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.tgz"
-AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-x86_64.tgz"
-AMD64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-x86_64.tgz"
-
-PPC_JDK_DIST="${JDK_DIST_PREFIX}-ppc.tgz"
-PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc.tgz"
-PPC_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc.tgz"
-
-PPC64_JDK_DIST="${JDK_DIST_PREFIX}-ppc64.tgz"
-PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc64.tgz"
-PPC64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc64.tgz"
-
-if use x86; then
-	JDK_DIST=${X86_JDK_DIST}
-	JAVACOMM_DIST=${X86_JAVACOMM_DIST}
-	JAVACOMM_DIST_ORIG=${X86_JAVACOMM_DIST_ORIG}
-	S="${WORKDIR}/ibm-java-i386-60"
-	LINK_ARCH="intel"
-elif use amd64; then
-	JDK_DIST=${AMD64_JDK_DIST}
-	JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
-	JAVACOMM_DIST_ORIG=${AMD64_JAVACOMM_DIST_ORIG}
-	S="${WORKDIR}/ibm-java-x86_64-60"
-	LINK_ARCH="amd64"
-elif use ppc; then
-	JDK_DIST=${PPC_JDK_DIST}
-	JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
-	JAVACOMM_DIST_ORIG=${PPC_JAVACOMM_DIST_ORIG}
-	S="${WORKDIR}/ibm-java-ppc-60"
-	LINK_ARCH="ipseries32"
-elif use ppc64; then
-	JDK_DIST=${PPC64_JDK_DIST}
-	JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
-	JAVACOMM_DIST_ORIG=${PPC64_JAVACOMM_DIST_ORIG}
-	S="${WORKDIR}/ibm-java-ppc64-60"
-	LINK_ARCH="ipseries64"
-fi
-
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}&S_TACT=105AGX05&S_CMP=JDK"
-
-SLOT="1.6"
-DESCRIPTION="IBM Java Development Kit ${SLOT}"
-HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
-DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
-# bug #125178
-ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
-
-SRC_URI="
-	x86? ( ${X86_JDK_DIST} )
-	amd64? ( ${AMD64_JDK_DIST} )
-	ppc? ( ${PPC_JDK_DIST} )
-	ppc64? ( ${PPC64_JDK_DIST} )
-	javacomm? (
-		x86? ( ${X86_JAVACOMM_DIST} )
-		amd64? ( ${AMD64_JAVACOMM_DIST} )
-		ppc? ( ${PPC_JAVACOMM_DIST} )
-		ppc64? ( ${PPC64_JAVACOMM_DIST} )
-	)"
-LICENSE="IBM-J1.6"
-KEYWORDS="-* ~amd64 ppc ppc64 ~x86"
-RESTRICT="fetch"
-IUSE="X alsa doc examples javacomm nsplugin odbc"
-
-RDEPEND="
-	ppc? ( =virtual/libstdc++-3.3 )
-	ppc64? ( =virtual/libstdc++-3.3 )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXi
-		x11-libs/libXp
-		x11-libs/libXtst
-		x11-libs/libX11
-		amd64? ( x11-libs/libXt )
-	)
-	alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.6.0* )
-	odbc? ( dev-db/unixODBC )"
-
-DEPEND=""
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libj9jvmti24.so
-opt/${P}/jre/lib/i386/libj9vm24.so
-opt/${P}/jre/lib/i386/libjclscar_24.so
-opt/${P}/jre/lib/i386/motif21/libmawt.so
-opt/${P}/jre/lib/i386/libj9thr24.so
-opt/${P}/jre/lib/i386/libj9jit24.so
-opt/${P}/jre/lib/i386/libj9dbg24.so
-opt/${P}/jre/lib/i386/libj9gc24.so"
-
-QA_EXECSTACK_x86="opt/${P}/jre/bin/classic/libjvm.so
-opt/${P}/jre/lib/i386/j9vm/libjvm.so
-opt/${P}/jre/lib/i386/libj9jvmti24.so
-opt/${P}/jre/lib/i386/libj9hookable24.so
-opt/${P}/jre/lib/i386/libj9vm24.so
-opt/${P}/jre/lib/i386/libjclscar_24.so
-opt/${P}/jre/lib/i386/libj9thr24.so
-opt/${P}/jre/lib/i386/libj9dmp24.so
-opt/${P}/jre/lib/i386/libj9prt24.so
-opt/${P}/jre/lib/i386/libj9jit24.so
-opt/${P}/jre/lib/i386/libiverel24.so
-opt/${P}/jre/lib/i386/libj9trc24.so
-opt/${P}/jre/lib/i386/libj9dbg24.so
-opt/${P}/jre/lib/i386/libj9shr24.so
-opt/${P}/jre/lib/i386/libj9gc24.so
-opt/${P}/jre/lib/i386/libj9bcv24.so
-opt/${P}/jre/lib/i386/classic/libjvm.so"
-
-QA_EXECSTACK_amd64="opt/${P}/jre/lib/amd64/default/libjvm.so
-opt/${P}/jre/lib/amd64/default/libj9jvmti24.so
-opt/${P}/jre/lib/amd64/default/libj9hookable24.so
-opt/${P}/jre/lib/amd64/default/libj9vm24.so
-opt/${P}/jre/lib/amd64/default/libjclscar_24.so
-opt/${P}/jre/lib/amd64/default/libj9jpi24.so
-opt/${P}/jre/lib/amd64/default/libj9thr24.so
-opt/${P}/jre/lib/amd64/default/libj9dmp24.so
-opt/${P}/jre/lib/amd64/default/libj9prt24.so
-opt/${P}/jre/lib/amd64/default/libj9jit24.so
-opt/${P}/jre/lib/amd64/default/libiverel24.so
-opt/${P}/jre/lib/amd64/default/libj9trc24.so
-opt/${P}/jre/lib/amd64/default/libj9dbg24.so
-opt/${P}/jre/lib/amd64/default/libj9shr24.so
-opt/${P}/jre/lib/amd64/default/libj9gc24.so
-opt/${P}/jre/lib/amd64/default/libj9bcv24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libjvm.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9jvmti24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9hookable24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9vm24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libjclscar_24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9jpi24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9thr24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9dmp24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9prt24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9jit24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libiverel24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9trc24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9dbg24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9shr24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9gc24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9bcv24.so"
-
-pkg_nofetch() {
-	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
-	einfo "Please visit: ${DOWNLOADPAGE}"
-
-	einfo "Under Java SE 6, download SR${SERVICE_RELEASE} for your arch:"
-	einfo "${JDK_DIST}"
-	if use javacomm ; then
-		einfo "Also download ${JAVACOMM_DIST_ORIG}"
-		ewarn "and save it as ${JAVACOMM_DIST}"
-		ewarn "Renaming is needed because javacomm changes content without changing filename."
-	fi
-
-	einfo "You can also use a direct link to your arch download page:"
-	einfo "${DIRECT_DOWNLOAD}"
-	einfo "Place the file(s) in: ${DISTDIR}"
-	einfo "Then restart emerge: 'emerge --resume'"
-
-	einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}"
-	einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
-	einfo "isn't updated, but the files should still available through the"
-	einfo "direct link to arch download page. If it doesn't work, file a bug."
-}
-
-src_unpack() {
-	unpack ${JDK_DIST}
-	if use javacomm; then
-		mkdir "${WORKDIR}/javacomm/" || die
-		cd "${WORKDIR}/javacomm/"
-		unpack ${JAVACOMM_DIST}
-	fi
-	cd "${S}"
-
-	# bug #126105
-	epatch "${FILESDIR}/${PN}-jawt.h.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
-	# Copy all the files to the designated directory
-	dodir /opt/${P}
-	cp -pR "${S}"/{bin,jre,lib,include,src.zip} "${D}/opt/${P}/" || die
-
-	if use examples; then
-		cp -pPR "${S}"/demo "${D}"/opt/${P}/ || die
-	fi
-	if use javacomm; then
-		chmod -x "${WORKDIR}"/javacomm/*/jar/*.jar "${WORKDIR}"/javacomm/*/lib/*.properties || die
-		cp -pR "${WORKDIR}"/javacomm/*/jar/*.jar "${D}"/opt/${P}/jre/lib/ext/ || die
-		cp -pR "${WORKDIR}"/javacomm/*/lib/*.properties "${D}"/opt/${P}/jre/lib/ || die
-		cp -pR "${WORKDIR}"/javacomm/*/lib/*.so "${D}"/opt/${P}/jre/lib/$(get_system_arch)/ || die
-		if use examples; then
-			cp -pPR "${WORKDIR}"/javacomm/*/examples "${D}"/opt/${P}/ || die
-		fi
-	fi
-
-	if use x86 || use ppc; then
-		if use nsplugin; then
-			local plugin="/opt/${P}/jre/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
-			install_mozilla_plugin "${plugin}"
-		fi
-	fi
-
-	if use amd64; then
-		# a workaround to fix the BOOTCLASSPATH in our env file
-		# this is not optimal, using -Xcompressedrefs would probably make it
-		# expect the compressedrefs version...
-		dosym /opt/${P}/jre/lib/amd64/default/jclSC160/vm.jar /opt/${P}/jre/lib/
-	fi
-
-	local desktop_in="${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop"
-	if [[ -f "${desktop_in}" ]]; then
-		local desktop_out="${T}/ibm_jdk-${SLOT}.desktop"
-		# install control panel for Gnome/KDE
-		# The jre also installs these so make sure that they do not have the same
-		# Name
-		sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JDK ${SLOT}/" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
-			-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
-			"${desktop_in}" > \
-			"${desktop_out}" || die
-
-		domenu "${desktop_out}" || die
-	fi
-
-	dohtml -a html,htm,HTML -r docs || die
-	dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die
-
-	set_java_env
-	java-vm_revdep-mask
-}