Revbump to fix bug #126105 with jawt.h patch. Thanks to Ed Catmur <ed@catmur.co.uk> for the initial report and patch, and everyone else in the bug. Also removed old version.

Package-Manager: portage-2.1.2_rc2-r1

3 files changed, 15 insertions, 299 deletions

diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index af1b4abf088c..4028fc6c7917 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -6,6 +6,10 @@ AUX ibm-jdk-bin-1.4.env 1125 RMD160 9ee81d807088259b7c2f0a5062965e0e94195cef SHA
 MD5 e37ccf364b849b3bb5d11f25228927c2 files/ibm-jdk-bin-1.4.env 1125
 RMD160 9ee81d807088259b7c2f0a5062965e0e94195cef files/ibm-jdk-bin-1.4.env 1125
 SHA256 72c0d5ac1ea2e132a40a8e74402d01faa6c99af6abc8465bf8c4c7a4be03a2a1 files/ibm-jdk-bin-1.4.env 1125
+AUX ibm-jdk-bin-1.5.0.3-jawt-h.patch 377 RMD160 d9e5eab16ca4002b00ca70d55fb3a3112d0011dd SHA1 5fa611adbdf036678bb0d582d2013225251d5a9e SHA256 87d54a556d706c1f4ab0f2cd98cd89c354e69c3caf83518f687d6cac11cfb8ff
+MD5 c571cbaa0d1b37682528b8b90573d051 files/ibm-jdk-bin-1.5.0.3-jawt-h.patch 377
+RMD160 d9e5eab16ca4002b00ca70d55fb3a3112d0011dd files/ibm-jdk-bin-1.5.0.3-jawt-h.patch 377
+SHA256 87d54a556d706c1f4ab0f2cd98cd89c354e69c3caf83518f687d6cac11cfb8ff files/ibm-jdk-bin-1.5.0.3-jawt-h.patch 377
 AUX ibm-jdk-bin-1.5.env 1125 RMD160 39e84106fd3b6a1106a99b81472936320b1585ba SHA1 c73e1a50b07b6a5255a9e6e81c3ccc5d3be77f50 SHA256 215af1e5143626956a98b631b683cf1e71d4c9272edd8cd571dc763ae75e9234
 MD5 04a66efa73f1153ed512e93c823f7eab files/ibm-jdk-bin-1.5.env 1125
 RMD160 39e84106fd3b6a1106a99b81472936320b1585ba files/ibm-jdk-bin-1.5.env 1125
@@ -17,38 +21,30 @@ DIST IBMJava2-142-z31-SDK-1.4.2-6.0.s390.rpm 54720659 RMD160 ce4f51f0b2d6ce6e0a4
 DIST IBMJava2-AMD64-142-SDK-1.4.2-6.0.x86_64.rpm 52722325 RMD160 f2d1fe49a606c204dbc0b0bdd054b7ec8bb7ca63 SHA1 c5659f4d3e658a7642f51513c4d2d8789a705d9a SHA256 4bfd9461aec661fee1584920bb2d0a4274c8ac592eec612f724824cf2790d7f1
 DIST IBMJava2-JAVACOMM-1.4.2-6.0.i386.rpm 121766 RMD160 e543dac45fac2773fd0f54f6b1b516eefc24763e SHA1 32fd6ca156df6b1b7d840cb76f32e3f0943e9e89 SHA256 749c6400a7a78e7300ef5cc9e588c490b788661b0917586cca6d07639711cebd
 DIST IBMJava2-JAVACOMM-AMD64-1.4.2-6.0.x86_64.rpm 123609 RMD160 449904345b1377568264e348ba2c71811472a61d SHA1 6e23299873b8e660c2ff94843631aa253780b2c7 SHA256 ff13b4cb1fcfb5ef658cbab8725ef896a64da496b95bcbd05981dba1a0499f30
-DIST ibm-java2-i386-javacomm-5.0-2.0.i386.rpm 125588 RMD160 759f566f23867d116f0ff2a37bcef366b3f1df98 SHA1 8300d93dd3e28c762af7876a3a34d05027a8fe41 SHA256 5a3d632515b3e7aaa89a0d5d9da9750973d8e0dba64e60579eba012e180ff005
 DIST ibm-java2-i386-javacomm-5.0-3.0.i386.rpm 125502 RMD160 7f730b454c73f95f59589735713d748736c6e7a5 SHA1 f0fe51d0e2c1a126d885a10afc6dd8776bff4899 SHA256 5766c8d8656c7dff6defda953954dee8f22d18c6dfbadb889bc5b27534ebd730
-DIST ibm-java2-i386-sdk-5.0-2.0.i386.rpm 62733887 RMD160 3c5d53bcabf4d82b114597325b6be730806eb843 SHA1 aa85adee04712fa4cd0613096c375248d02d3c6c SHA256 30c51e71696cedbf7419b24e4be61483ec80ab4d03c12128b2d5ebae184b5aa1
 DIST ibm-java2-i386-sdk-5.0-3.0.i386.rpm 63033967 RMD160 dd32bc82e274923bb23e538942f727f1cbf36528 SHA1 b951f1d75a984dff3ef18b1689fdda88ecd84c9a SHA256 6455de039dac7c5ee6642d04940b2704fdf611f6275914821fdc548ee685ecd8
-DIST ibm-java2-ppc-javacomm-5.0-2.0.ppc.rpm 133479 RMD160 e613a3908f145526e34b8684333728530beb4849 SHA1 4ae23e8336320ea348c47a54a07f2f4a33162869 SHA256 caf09fc9eef95938e277deee34aad133d673d7ea319dff9099cc22bed4d06323
 DIST ibm-java2-ppc-javacomm-5.0-3.0.ppc.rpm 133427 RMD160 082e914b846803bbb5b777dad28dc93cc605ecc8 SHA1 80160b02fc49e3dbde4c9b3b54488eddcaf81f03 SHA256 c1179604922b978d720fc15b1eca24c411d0bd61cb3e006e147c19cf8376cafa
-DIST ibm-java2-ppc-sdk-5.0-2.0.ppc.rpm 70286457 RMD160 96394252461b4a593498d34b84207cddf03763cf SHA1 e8d6c8222151554dc6757d14394a7b77ddc9938e SHA256 d9f38a4d76bb62ab27b486c4db48863a616f0defdacd8f4e37a3ce814711648e
 DIST ibm-java2-ppc-sdk-5.0-3.0.ppc.rpm 70722009 RMD160 c354d619b720f36bacd8592ac32cb6d4b7034b99 SHA1 08adad9010708cc92c61b246779e5f8d36a8ecfc SHA256 cd947dc317c8d0ae91ecdce44ee4165aa6cba0c018ee5f706125ec12f37ab141
-DIST ibm-java2-ppc64-javacomm-5.0-2.0.ppc64.rpm 135911 RMD160 975dc26fdca0181ccc7dc891135c8c6e1a5c700f SHA1 f343443131015eeff132249e103a945db3b6df45 SHA256 d0b25a6a2428a5704387252c19f2fcffc5c2169b1ed65fdd00e48b28791200b8
 DIST ibm-java2-ppc64-javacomm-5.0-3.0.ppc64.rpm 135853 RMD160 a7853bfc8c33eda88092abb49b245d73fe1eb733 SHA1 9627b7121134bb6a01737d89783b32effb440bea SHA256 b2ea5661b97a6a5bce130ad7137ff94a60f15f56774be9fad2e35f587ece7c71
-DIST ibm-java2-ppc64-sdk-5.0-2.0.ppc64.rpm 68655331 RMD160 8ebfb1f668db151973091b4efb52546aacb79b4c SHA1 0b8b6f270321675ec71aaa4bae16af781593dc69 SHA256 218e9efae35d295402e4aa6592e6a371c1c289337afe83400e2397f357dae06a
 DIST ibm-java2-ppc64-sdk-5.0-3.0.ppc64.rpm 68640918 RMD160 9ba5e027ea38aaf2164e5eeb88eface227d7c8d0 SHA1 5f6877c9ee836143bb55f9b57fc25568d5d62b2d SHA256 74771d4d40f044f54a93d0711937976afc840e4f117b4f0d46609d361e421727
-DIST ibm-java2-x86_64-javacomm-5.0-2.0.x86_64.rpm 127845 RMD160 3063d6f7064aac2eaf52f1fae5ee6a484bd0b57e SHA1 f2996d006651a1ab323f87880320fc19d8307650 SHA256 40dbba9edf6d40a8cbbc70f098acb1cb1c43353049eba6053d04afb21c778c87
 DIST ibm-java2-x86_64-javacomm-5.0-3.0.x86_64.rpm 127812 RMD160 e574bebd9ab5ddc82b68a585e927c574de4f19f7 SHA1 ea3b0fb184f3e651e5be5e606e4828985e75352f SHA256 fc1c7ce4a63ac61c76c99125218e504598849398645be711f6c44d47c6a4e54c
-DIST ibm-java2-x86_64-sdk-5.0-2.0.x86_64.rpm 64402669 RMD160 82178652578519966a24d744d07e3d88518a7e16 SHA1 e022f0f3feb7ff1aeaf56726e3838fc524626cc9 SHA256 17976989afe60b2fcd4540fd6e90c1ee1e39671bd9eff6875461963da8cfcee7
 DIST ibm-java2-x86_64-sdk-5.0-3.0.x86_64.rpm 64564753 RMD160 1d6c9441b1b7ce62b6e7967509ad3cb0732543ec SHA1 74e0b3f6590669905e3bd9f8dedaf03ca731cddc SHA256 75fe72f73c226084c21e7f63bd5267006c48daa7121f47c9034aad00c48e29a4
 EBUILD ibm-jdk-bin-1.4.2.6-r4.ebuild 4896 RMD160 ec7bc6ac93ceacf2230af3684797c35d39285ddf SHA1 acc57205227e5ba330d846269d7e3e2b7adba221 SHA256 20f1819e9b40d6c529661621243adb1cb03378385ca700df30523073309af836
 MD5 b51018207af413c770df7ad3feacddec ibm-jdk-bin-1.4.2.6-r4.ebuild 4896
 RMD160 ec7bc6ac93ceacf2230af3684797c35d39285ddf ibm-jdk-bin-1.4.2.6-r4.ebuild 4896
 SHA256 20f1819e9b40d6c529661621243adb1cb03378385ca700df30523073309af836 ibm-jdk-bin-1.4.2.6-r4.ebuild 4896
-EBUILD ibm-jdk-bin-1.5.0.2.ebuild 7431 RMD160 c6242cc06b0c68d541f8f43215b105a950394d45 SHA1 a811387bbf28ad1a474791652062de06eb7f774c SHA256 e0a92874771eedfecd0d7ede216652b14847d2add07a5534e7e1a11aeb23ee7e
-MD5 01e0e8a90f3fbd908203dd19ed17fcd2 ibm-jdk-bin-1.5.0.2.ebuild 7431
-RMD160 c6242cc06b0c68d541f8f43215b105a950394d45 ibm-jdk-bin-1.5.0.2.ebuild 7431
-SHA256 e0a92874771eedfecd0d7ede216652b14847d2add07a5534e7e1a11aeb23ee7e ibm-jdk-bin-1.5.0.2.ebuild 7431
+EBUILD ibm-jdk-bin-1.5.0.3-r1.ebuild 7613 RMD160 12cff60154170a1d2e9a8ed94a28669b565742e0 SHA1 84656d3af82e066e3d802efadf8442e3ea9c9b96 SHA256 fd215007290d6ff8cc9937018cbd974482ff44a8e8f32801cb98bf6f43e8afb1
+MD5 fd3c7f6af8ec5041ce7654fd0dc14c01 ibm-jdk-bin-1.5.0.3-r1.ebuild 7613
+RMD160 12cff60154170a1d2e9a8ed94a28669b565742e0 ibm-jdk-bin-1.5.0.3-r1.ebuild 7613
+SHA256 fd215007290d6ff8cc9937018cbd974482ff44a8e8f32801cb98bf6f43e8afb1 ibm-jdk-bin-1.5.0.3-r1.ebuild 7613
 EBUILD ibm-jdk-bin-1.5.0.3.ebuild 7505 RMD160 d796df42f0dfae8440350ea0d899d9476c7d0c72 SHA1 50ff2330713b2e9b1f4ffa85799226ed0c3f7be1 SHA256 5ce4cfd16db75fa8f0ce2e2a84879191016dd4501a2dcbd9ec16e7bbe31a164e
 MD5 fb8fa3c8a3745bd56aef7203515a3f61 ibm-jdk-bin-1.5.0.3.ebuild 7505
 RMD160 d796df42f0dfae8440350ea0d899d9476c7d0c72 ibm-jdk-bin-1.5.0.3.ebuild 7505
 SHA256 5ce4cfd16db75fa8f0ce2e2a84879191016dd4501a2dcbd9ec16e7bbe31a164e ibm-jdk-bin-1.5.0.3.ebuild 7505
-MISC ChangeLog 15509 RMD160 412ed53adb6a007ce5116aaebe1db121dbe249ca SHA1 969fe00e64af4e5e449e8c1bead0d4ef56ae8eb3 SHA256 753d8dce7e9a4ef3ec3ee02995358ae0a5e94773adf559856759d4461110cb9b
-MD5 112f2efd0c94ec6d9b4a174ea1d12eb2 ChangeLog 15509
-RMD160 412ed53adb6a007ce5116aaebe1db121dbe249ca ChangeLog 15509
-SHA256 753d8dce7e9a4ef3ec3ee02995358ae0a5e94773adf559856759d4461110cb9b ChangeLog 15509
+MISC ChangeLog 15886 RMD160 b5e10f693e5067d16abbeec5e79e65c2fd433fb0 SHA1 ac9ed989b5065e2ab9c72131db3d3adacb798f33 SHA256 d4f94ef6ade0d4693ae9baf65e1932aed5e568fa6f43050376ceefd3c69f91f0
+MD5 3336afc6a36a770d248bfebeefb7fa06 ChangeLog 15886
+RMD160 b5e10f693e5067d16abbeec5e79e65c2fd433fb0 ChangeLog 15886
+SHA256 d4f94ef6ade0d4693ae9baf65e1932aed5e568fa6f43050376ceefd3c69f91f0 ChangeLog 15886
 MISC metadata.xml 219 RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e SHA1 7f610c6c183a353d1969b4d9ac48e01629830026 SHA256 97628c0f582c0835c18b9ea2d722a316084d64ded80d4e1be2db984a2c292428
 MD5 4a3cb4232103a0de9bd143a145086a7b metadata.xml 219
 RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e metadata.xml 219
@@ -56,9 +52,9 @@ SHA256 97628c0f582c0835c18b9ea2d722a316084d64ded80d4e1be2db984a2c292428 metadata
 MD5 35ce90be8c07b578b83a0813986813f2 files/digest-ibm-jdk-bin-1.4.2.6-r4 2149
 RMD160 0fca43d73aec0e76916059a2eb7ca441c5d8eddb files/digest-ibm-jdk-bin-1.4.2.6-r4 2149
 SHA256 b6fa2ae167cd41f796b7638c70ef9f8e1fb91e1fe212f2d77bb38d569b5573f2 files/digest-ibm-jdk-bin-1.4.2.6-r4 2149
-MD5 51e8e04e14a44502ca27a46a6fa16355 files/digest-ibm-jdk-bin-1.5.0.2 2396
-RMD160 1b3fe81686391ecf0fdef07586643292b64e071f files/digest-ibm-jdk-bin-1.5.0.2 2396
-SHA256 904666cd8dbe71ebed3d7c19323c840b26ff3d6390fbaa2e918cc2d9376d3485 files/digest-ibm-jdk-bin-1.5.0.2 2396
 MD5 bb9a5af9ad7ff0deddf4774fae62c81a files/digest-ibm-jdk-bin-1.5.0.3 2396
 RMD160 fda8627b96f7aa9352f3b4e682a3beb2c50a2e33 files/digest-ibm-jdk-bin-1.5.0.3 2396
 SHA256 e961c91ba6dc3a8afb2e2d763a0d92a82c6a178ea7800b8ab3cce00ecebe5af8 files/digest-ibm-jdk-bin-1.5.0.3 2396
+MD5 bb9a5af9ad7ff0deddf4774fae62c81a files/digest-ibm-jdk-bin-1.5.0.3-r1 2396
+RMD160 fda8627b96f7aa9352f3b4e682a3beb2c50a2e33 files/digest-ibm-jdk-bin-1.5.0.3-r1 2396
+SHA256 e961c91ba6dc3a8afb2e2d763a0d92a82c6a178ea7800b8ab3cce00ecebe5af8 files/digest-ibm-jdk-bin-1.5.0.3-r1 2396
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.2 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.2
deleted file mode 100644
index b868a53b30c3..000000000000
--- a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.2
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 75fdbb0febd04ed88d851d380dbba096 ibm-java2-i386-javacomm-5.0-2.0.i386.rpm 125588
-RMD160 759f566f23867d116f0ff2a37bcef366b3f1df98 ibm-java2-i386-javacomm-5.0-2.0.i386.rpm 125588
-SHA256 5a3d632515b3e7aaa89a0d5d9da9750973d8e0dba64e60579eba012e180ff005 ibm-java2-i386-javacomm-5.0-2.0.i386.rpm 125588
-MD5 811be6f84dcb8f89f9bf4d8af7fefcca ibm-java2-i386-sdk-5.0-2.0.i386.rpm 62733887
-RMD160 3c5d53bcabf4d82b114597325b6be730806eb843 ibm-java2-i386-sdk-5.0-2.0.i386.rpm 62733887
-SHA256 30c51e71696cedbf7419b24e4be61483ec80ab4d03c12128b2d5ebae184b5aa1 ibm-java2-i386-sdk-5.0-2.0.i386.rpm 62733887
-MD5 4794542265bc35621e1ac453204122ce ibm-java2-ppc-javacomm-5.0-2.0.ppc.rpm 133479
-RMD160 e613a3908f145526e34b8684333728530beb4849 ibm-java2-ppc-javacomm-5.0-2.0.ppc.rpm 133479
-SHA256 caf09fc9eef95938e277deee34aad133d673d7ea319dff9099cc22bed4d06323 ibm-java2-ppc-javacomm-5.0-2.0.ppc.rpm 133479
-MD5 93a1e46ded316f66c90d724c310d98f1 ibm-java2-ppc-sdk-5.0-2.0.ppc.rpm 70286457
-RMD160 96394252461b4a593498d34b84207cddf03763cf ibm-java2-ppc-sdk-5.0-2.0.ppc.rpm 70286457
-SHA256 d9f38a4d76bb62ab27b486c4db48863a616f0defdacd8f4e37a3ce814711648e ibm-java2-ppc-sdk-5.0-2.0.ppc.rpm 70286457
-MD5 6c54e14ebb8fdf28fc4aefe0518bc5b6 ibm-java2-ppc64-javacomm-5.0-2.0.ppc64.rpm 135911
-RMD160 975dc26fdca0181ccc7dc891135c8c6e1a5c700f ibm-java2-ppc64-javacomm-5.0-2.0.ppc64.rpm 135911
-SHA256 d0b25a6a2428a5704387252c19f2fcffc5c2169b1ed65fdd00e48b28791200b8 ibm-java2-ppc64-javacomm-5.0-2.0.ppc64.rpm 135911
-MD5 10dea51224a5e13eef69a86b1a811517 ibm-java2-ppc64-sdk-5.0-2.0.ppc64.rpm 68655331
-RMD160 8ebfb1f668db151973091b4efb52546aacb79b4c ibm-java2-ppc64-sdk-5.0-2.0.ppc64.rpm 68655331
-SHA256 218e9efae35d295402e4aa6592e6a371c1c289337afe83400e2397f357dae06a ibm-java2-ppc64-sdk-5.0-2.0.ppc64.rpm 68655331
-MD5 be470995320ffababc9df6502688fd79 ibm-java2-x86_64-javacomm-5.0-2.0.x86_64.rpm 127845
-RMD160 3063d6f7064aac2eaf52f1fae5ee6a484bd0b57e ibm-java2-x86_64-javacomm-5.0-2.0.x86_64.rpm 127845
-SHA256 40dbba9edf6d40a8cbbc70f098acb1cb1c43353049eba6053d04afb21c778c87 ibm-java2-x86_64-javacomm-5.0-2.0.x86_64.rpm 127845
-MD5 22948b08b72e63560d4a757a246fa0e7 ibm-java2-x86_64-sdk-5.0-2.0.x86_64.rpm 64402669
-RMD160 82178652578519966a24d744d07e3d88518a7e16 ibm-java2-x86_64-sdk-5.0-2.0.x86_64.rpm 64402669
-SHA256 17976989afe60b2fcd4540fd6e90c1ee1e39671bd9eff6875461963da8cfcee7 ibm-java2-x86_64-sdk-5.0-2.0.x86_64.rpm 64402669
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild
deleted file mode 100644
index 06b3f88713cb..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild
+++ /dev/null
@@ -1,256 +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/ibm-jdk-bin/ibm-jdk-bin-1.5.0.2.ebuild,v 1.13 2006/10/14 02:07:16 nichoj Exp $
-
-inherit java-vm-2 versionator eutils rpm
-
-JDK_RELEASE=$(get_version_component_range 2-3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-
-X86_JDK_DIST="ibm-java2-i386-sdk-${RPM_PV}.i386.rpm"
-X86_JAVACOMM_DIST="ibm-java2-i386-javacomm-${RPM_PV}.i386.rpm"
-
-AMD64_JDK_DIST="ibm-java2-x86_64-sdk-${RPM_PV}.x86_64.rpm"
-AMD64_JAVACOMM_DIST="ibm-java2-x86_64-javacomm-${RPM_PV}.x86_64.rpm"
-
-PPC_JDK_DIST="ibm-java2-ppc-sdk-${RPM_PV}.ppc.rpm"
-PPC_JAVACOMM_DIST="ibm-java2-ppc-javacomm-${RPM_PV}.ppc.rpm"
-
-PPC64_JDK_DIST="ibm-java2-ppc64-sdk-${RPM_PV}.ppc64.rpm"
-PPC64_JAVACOMM_DIST="ibm-java2-ppc64-javacomm-${RPM_PV}.ppc64.rpm"
-
-if use x86; then
-	JDK_DIST=${X86_JDK_DIST}
-	JAVACOMM_DIST=${X86_JAVACOMM_DIST}
-	S="${WORKDIR}/opt/ibm/java2-i386-50"
-elif use amd64; then
-	JDK_DIST=${AMD64_JDK_DIST}
-	JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
-	S="${WORKDIR}/opt/ibm/java2-x86_64-50"
-elif use ppc; then
-	JDK_DIST=${PPC_JDK_DIST}
-	JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
-	S="${WORKDIR}/opt/ibm/java2-ppc-50"
-elif use ppc64; then
-	JDK_DIST=${PPC64_JDK_DIST}
-	JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
-	S="${WORKDIR}/opt/ibm/java2-ppc64-50"
-fi
-
-SLOT="1.5"
-DESCRIPTION="IBM Java Development Kit ${SLOT}"
-HOMEPAGE="http://www-106.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.5"
-KEYWORDS="-* ~amd64 ~ppc ppc64 x86"
-RESTRICT="fetch"
-
-RDEPEND="
-		=virtual/libstdc++-3.3
-		X? ( || (
-					(
-						x11-libs/libXt
-						x11-libs/libX11
-						x11-libs/libXtst
-						x11-libs/libXp
-						x11-libs/libXext
-						x11-libs/libXi
-						x11-libs/libXmu
-						x11-libs/libXft
-					)
-					virtual/x11
-				)
-			)
-		alsa? ( media-libs/alsa-lib )
-		nsplugin? (
-			x86? ( =x11-libs/gtk+-2* =x11-libs/gtk+-1* )
-			ppc? ( =x11-libs/gtk+-1* )
-		)"
-DEPEND=""
-
-IUSE="X alsa javacomm nsplugin"
-
-QA_EXECSTACK_amd64="opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/libj9vrb23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libj9trc23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9shr23.so
-	opt/${P}/jre/bin/libj9prt23.so
-	opt/${P}/jre/bin/libj9jvmti23.so
-	opt/${P}/jre/bin/libj9jpi23.so
-	opt/${P}/jre/bin/libj9jit23.so
-	opt/${P}/jre/bin/libj9jextract.so
-	opt/${P}/jre/bin/libj9hookable23.so
-	opt/${P}/jre/bin/libj9gc23.so
-	opt/${P}/jre/bin/libj9dyn23.so
-	opt/${P}/jre/bin/libj9dmp23.so
-	opt/${P}/jre/bin/libj9dbg23.so
-	opt/${P}/jre/bin/libj9bcv23.so
-	opt/${P}/jre/bin/libiverel23.so
-	opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/bin/j9vm/libjvm.so"
-
-QA_TEXTRELS_amd64="opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/libj9jit23.so"
-
-QA_EXECSTACK_x86="opt/${P}/jre/bin/j9vm/libjvm.so
-	opt/${P}/jre/bin/libj9jvmti23.so
-	opt/${P}/jre/bin/libj9hookable23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libj9dyn23.so
-	opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/libj9jpi23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9dmp23.so
-	opt/${P}/jre/bin/libj9prt23.so
-	opt/${P}/jre/bin/libj9jit23.so
-	opt/${P}/jre/bin/libiverel23.so
-	opt/${P}/jre/bin/libj9trc23.so
-	opt/${P}/jre/bin/libj9dbg23.so
-	opt/${P}/jre/bin/libj9jextract.so
-	opt/${P}/jre/bin/libj9shr23.so
-	opt/${P}/jre/bin/libj9gc23.so
-	opt/${P}/jre/bin/libj9vrb23.so
-	opt/${P}/jre/bin/libj9bcv23.so
-	opt/${P}/jre/bin/libj9aotrt23.so
-	opt/${P}/jre/bin/classic/libjvm.so"
-
-QA_TEXTRELS_ppc="opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/bin/j9vm/libjvm.so
-	opt/${P}/jre/bin/libj9aotrt23.so
-	opt/${P}/jre/bin/libj9dbg23.so
-	opt/${P}/jre/bin/libj9gc23.so
-	opt/${P}/jre/bin/libj9gcchk23.so
-	opt/${P}/jre/bin/libj9jextract.so
-	opt/${P}/jre/bin/libj9jit23.so
-	opt/${P}/jre/bin/libj9jitd23.so
-	opt/${P}/jre/bin/libj9jpi23.so
-	opt/${P}/jre/bin/libj9jvmti23.so
-	opt/${P}/jre/bin/libj9prt23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9ute23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libjaas.so
-	opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/libjsig.so
-"
-
-QA_TEXTRELS_ppc64="opt/${P}/jre/bin/libj9jextract.so
-	opt/${P}/jre/bin/libjsig.so
-	opt/${P}/jre/bin/libj9jitd23.so
-	opt/${P}/jre/bin/libj9ute23.so
-	opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/bin/libj9prt23.so
-	opt/${P}/jre/bin/libjclscar_23.so
-	opt/${P}/jre/bin/j9vm/libjvm.so
-	opt/${P}/jre/bin/libj9gc23.so
-	opt/${P}/jre/bin/libj9dbg23.so
-	opt/${P}/jre/bin/libj9thr23.so
-	opt/${P}/jre/bin/libj9jpi23.so
-	opt/${P}/jre/bin/libj9gcchk23.so
-	opt/${P}/jre/bin/libj9vm23.so
-	opt/${P}/jre/bin/libj9jit23.so"
-
-
-QA_TEXTRELS_x86="opt/${P}/jre/bin/lib*.so
-	opt/${P}/jre/bin/j9vm/libjvm.so
-	opt/${P}/jre/bin/xawt/libmawt.so
-	opt/${P}/jre/bin/javaplugin.so
-	opt/${P}/jre/bin/motif21/libmawt.so
-	opt/${P}/jre/bin/headless/libmawt.so
-	opt/${P}/jre/bin/classic/libjvm.so
-	opt/${P}/jre/lib/i386/libdeploy.so"
-
-pkg_nofetch() {
-	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
-	einfo "Please visit: ${DOWNLOADPAGE}"
-
-	einfo "Under J2SE 5.0, download SR${SERVICE_RELEASE}:"
-	einfo "${JDK_DIST}"
-	if use javacomm ; then
-		einfo "${JAVACOMM_DIST}"
-	fi
-	einfo "Place the file(s) in: ${DISTDIR}"
-	einfo "Then run emerge =${VMHANDLE}*"
-
-	einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}"
-	einfo "it may have been moved to ${ALT_DOWNLOADPAGE}"
-}
-
-src_compile() { :; }
-
-src_install() {
-	# Copy all the files to the designated directory
-	mkdir -p ${D}opt/${P}
-	cp -pR ${S}/{bin,jre,lib,include} ${D}opt/${P}/
-
-	mkdir -p ${D}/opt/${P}/share
-	cp -pPR ${S}/{demo,src.jar} ${D}opt/${P}/share/
-
-	# 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
-
-
-	local x86plugin=libjavaplugin_ojigtk2.so
-	local ppcplugin=libjavaplugin_oji.so
-	local jrebindest="${D}/opt/${P}/jre/bin/"
-
-	local plugin
-	if use x86; then
-		plugin=${x86plugin}
-	elif use ppc; then
-		plugin=${ppcplugin}
-	#	rm "${jrebindest}/${x86plugin}" "${jrebindest}/libjavaplugin_nscpgtk2.so" || \
-	#		eerror "Failed to delete gtk2 javaplugin."
-	fi
-
-	plugin=/opt/${P}/jre/bin/${plugin}
-
-	if use nsplugin  && ! use amd64 && ! use ppc64; then
-		install_mozilla_plugin ${plugin}
-	elif use x86 || use ppc; then
-		rm "${D}/opt/${P}"/jre/bin/*javaplugin*.so || \
-			eerror "Failed to delete javaplugin shared libraries"
-	fi
-
-	use !alsa && rm "${D}/opt/${P}/jre/bin/libjsoundalsa.so"
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc ${S}/COPYRIGHT
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-	if ! use X; then
-		echo
-		ewarn "You're not using X so its possible that you dont have"
-		ewarn "a X server installed, please read the following warning: "
-		ewarn "Some parts of IBM JDK require XFree86 to be installed."
-		ewarn "Be careful which Java libraries you attempt to use."
-	fi
-}