Removal of 1.4 per bug #287615.

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

8 files changed, 9 insertions, 772 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index a77b8a9b661f..2eb5ec876b14 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,11 @@
 # 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.220 2009/12/31 18:16:22 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.221 2010/02/22 22:40:19 caster Exp $
+
+  22 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+  -ibm-jdk-bin-1.4.2.13.ebuild, -files/ibm-jdk-bin-1.4.env,
+  -ibm-jdk-bin-1.5.0.10.ebuild, -ibm-jdk-bin-1.6.0.6.ebuild, -files/cpuinfo:
+  Removal of 1.4 per bug #287615.
 
   31 Dec 2009; Markus Meier <maekke@gentoo.org> ibm-jdk-bin-1.5.0.11.ebuild,
   ibm-jdk-bin-1.6.0.7.ebuild:
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index e09a800fc14f..d859033dd9cd 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -1,62 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX cpuinfo 12 RMD160 ae173b2d66cd4becce06fbd7e01a0b62aa2bab2d SHA1 2c35d51e0110bd74f2c4cf9f7f063358837ea907 SHA256 b90ea3549103fa261cd711ecb3d11158c984bc20a020630aa3ebc3f8b402ec11
-AUX ibm-jdk-bin-1.4.env 1125 RMD160 9ee81d807088259b7c2f0a5062965e0e94195cef SHA1 d20ed99899733c15b57494ae0c90e61517fc8814 SHA256 72c0d5ac1ea2e132a40a8e74402d01faa6c99af6abc8465bf8c4c7a4be03a2a1
 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-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-13.0.x86_64.tgz 120805 RMD160 6dce013044acf169955055e8f65b342fa97e80d2 SHA1 986ca5ff1dd3ac2161766ad94c42f9b0640edfd8 SHA256 4151ec541cb4b6d3a74525a3af49b2c7f33621a50244513fff4f2d60c94125f7
-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-13.0.x86_64.tgz 57358200 RMD160 5d90751932d5e0a64f05e197b69ccd8f1f30c34b SHA1 7a5525a0f573bb862ec0be24a1d7b3c2e3f06fe1 SHA256 67559e72b8a5df7d1e8d5a790cda98395629da9be3d9f371ccebafa4a9cf7844
-DIST ibm-java-javacomm-6.0-6.0-linux-i386.tgz 336897 RMD160 c22d3ad9d09f869ec743fab599463a9dbea0511e SHA1 6b645130654596096ee3949c530d1c2fc49c62f1 SHA256 2a04826238b0e2a24b611622191e3c3545ec6e2737fc9f240c8b53f19841d705
-DIST ibm-java-javacomm-6.0-6.0-linux-ppc.tgz 343028 RMD160 711d942d7895ea016d060d2f0db549a5fda130e4 SHA1 3932368b932bb3e69b05e4995aad0b57baf9eea3 SHA256 5618541e0cdb38607856eb47aa1878a3db4165c2ba0d59a87ada875c9b300da0
-DIST ibm-java-javacomm-6.0-6.0-linux-ppc64.tgz 342371 RMD160 57f9d943079ace31ea5777717c449c79ccefd4a8 SHA1 e54dd49c71bb014af3e33a05579b60a7e0751186 SHA256 27feede3959306f264185876440f55d5807782dc31d519600004f4868c644c4a
-DIST ibm-java-javacomm-6.0-6.0-linux-x86_64.tgz 339256 RMD160 ec5f116aca6c534528572b73c1a8db3ac936b67d SHA1 39c32392233baadfb234b54b7f44c67c48166d20 SHA256 10265a692a5056fe8d12c3d082f20ec113596e28bf98eb43d5a17a9a90176c8c
 DIST ibm-java-javacomm-6.0-7.0-linux-i386.tgz 336897 RMD160 c22d3ad9d09f869ec743fab599463a9dbea0511e SHA1 6b645130654596096ee3949c530d1c2fc49c62f1 SHA256 2a04826238b0e2a24b611622191e3c3545ec6e2737fc9f240c8b53f19841d705
 DIST ibm-java-javacomm-6.0-7.0-linux-ppc.tgz 343028 RMD160 711d942d7895ea016d060d2f0db549a5fda130e4 SHA1 3932368b932bb3e69b05e4995aad0b57baf9eea3 SHA256 5618541e0cdb38607856eb47aa1878a3db4165c2ba0d59a87ada875c9b300da0
 DIST ibm-java-javacomm-6.0-7.0-linux-ppc64.tgz 342371 RMD160 57f9d943079ace31ea5777717c449c79ccefd4a8 SHA1 e54dd49c71bb014af3e33a05579b60a7e0751186 SHA256 27feede3959306f264185876440f55d5807782dc31d519600004f4868c644c4a
 DIST ibm-java-javacomm-6.0-7.0-linux-x86_64.tgz 339256 RMD160 ec5f116aca6c534528572b73c1a8db3ac936b67d SHA1 39c32392233baadfb234b54b7f44c67c48166d20 SHA256 10265a692a5056fe8d12c3d082f20ec113596e28bf98eb43d5a17a9a90176c8c
-DIST ibm-java-sdk-6.0-6.0-linux-i386.tgz 92341726 RMD160 9c8345dcbc7be831ff5f0bce1dbe61136559f253 SHA1 fd24679229fda5b05f4e42b0d000e2c16a09d559 SHA256 ca5b9ab1e0fd0beff4b6b475f0b4a441e06e4f7ffe4cac4acd71f2eb51dea46a
-DIST ibm-java-sdk-6.0-6.0-linux-ppc.tgz 94489677 RMD160 5c1388df06abccff56acb5c9fabfee226f12b357 SHA1 eaeb66aa6a8b24f00835b4fea0d70a18f040da1d SHA256 7879d3bbd04692ad537cd2fbbb5f9357752aec6bac4dac448cdd4ec3a91f23f5
-DIST ibm-java-sdk-6.0-6.0-linux-ppc64.tgz 96885825 RMD160 ddfb1b739375cfd9c44c14a57d3734fcceb70138 SHA1 4267ab643392eb737d7a648b22ef242f34575a57 SHA256 110cb9d9582f24ed87057e10b063bc18b72d1ee09258196ee68519a31ecc8734
-DIST ibm-java-sdk-6.0-6.0-linux-x86_64.tgz 93411950 RMD160 29b31df7fb68035c5e54b3e7ea6b77ba60450d69 SHA1 911425b011947ff427bf80ff68924c1e9598c3f6 SHA256 f868cf14274c38c53fda52c1821639e1dfa60477463c6dd997b23714f95b97a7
 DIST ibm-java-sdk-6.0-7.0-linux-i386.tgz 92369339 RMD160 58bdfcd01063c7f6e24b97657c17659447bb9418 SHA1 943f4c4954cf2f5c85d2910b2063d3e9f66cab7f SHA256 d9b7904ae93e58644ce7026bd1b45851a080667524d8c2f8194e07438a3e80c8
 DIST ibm-java-sdk-6.0-7.0-linux-ppc.tgz 94637963 RMD160 ef3cf9f3ad38ef15c91f5752c40d834b650b9caa SHA1 ddbc2192ddd1425e4d5f8a9dc09c35c21b9d86ef SHA256 d7e63b79b8bdad369e6f1286eb53906c489f9e78ccdf0f8eb845a241dd796dee
 DIST ibm-java-sdk-6.0-7.0-linux-ppc64.tgz 96912498 RMD160 e2b0cccbda04749b5cfe136614e740788720bba1 SHA1 dcb9818b9462edbc6907705e05098d95ff755960 SHA256 be0d5e2e3539f4b63e9658a7e1045872056dfae6185cb11aea8a806d0dc6957f
 DIST ibm-java-sdk-6.0-7.0-linux-x86_64.tgz 93457031 RMD160 faaf9d8f88a55f59c8eac64e8abe02cdfd3f6b36 SHA1 33f4762c79bc43f06b80e4e7b724d0f9304e410b SHA256 5e8bcbd3f458014abda25e93752769804aff65a1646180f306a34ecc666377fd
-DIST ibm-java2-javacomm-5.0-10.0-linux-i386.tgz 120018 RMD160 55f92b556fb60c13743e9ba9bcd02297e4459e9d SHA1 d2a0e18d30c91d6d72043a2f1a5ca3ee4df6e11c SHA256 72ab8e1c0f9617c63fc991def5e196945a7704d48455cf240639d90ab965ce5c
-DIST ibm-java2-javacomm-5.0-10.0-linux-ppc.tgz 124733 RMD160 f542634f87becaf330996c073d1fbe9f5e1b9b10 SHA1 47ea6ba585e6512b1526e271ad96767f11468ccc SHA256 8d8067a30a8a8ea0d44eb65cea4ef3a929168da2ba281a26513f8106eb0b307e
-DIST ibm-java2-javacomm-5.0-10.0-linux-ppc64.tgz 128252 RMD160 b2d26cfb219f412a71bbda89ed6c64413abc3fd0 SHA1 d4a80a4c7f7a08b01d73558c808be225523bdef2 SHA256 6a9c40dd4d9f7ab8fa07bcbefc8ff0b531e3e06807f820e62aa1777d5c1b2cd6
-DIST ibm-java2-javacomm-5.0-10.0-linux-x86_64.tgz 121869 RMD160 48bd06dcdc39deaf74e9c8920ebdcabe28b91ebe SHA1 7120144031fe03c100910c121de1ed11281b5d28 SHA256 50cf7fb9863bee4faa8b824bff8e9ad4ea7a423847db784fe6b7f3e6d3964f2d
 DIST ibm-java2-javacomm-5.0-11.0-linux-i386.tgz 120024 RMD160 b51e98cc370aada411ee34d0980cc9c90c077f0e SHA1 e7c310afc602a79282d2210a23fc793cbd24c951 SHA256 ae804dd984f91d945ca8a01b553c2fa6c3ea50f70e09d76d88570255b0d993b3
 DIST ibm-java2-javacomm-5.0-11.0-linux-ppc.tgz 124985 RMD160 5e28563982be2713e352668bdd4c36fb5ae6f6d6 SHA1 d8b822489c61f2859cf869d06ff8ded91a574e05 SHA256 b4f43b815a1ff8f72ea30420fc188efa227109970379eac704843e649132f5dc
 DIST ibm-java2-javacomm-5.0-11.0-linux-ppc64.tgz 128787 RMD160 888f812678b4653dc5ebc2e143359c0297c8efbe SHA1 770b222fb84ffa35bb4b6437e1bc3798f33adf57 SHA256 3481aba5556431e32e00b0f4b5986f0c805a7df29fe4ef65bc7ca17540b42cba
 DIST ibm-java2-javacomm-5.0-11.0-linux-x86_64.tgz 121553 RMD160 cd8d82c233d7d313c6815f7b58c68262595d34ee SHA1 421f6c4ebf3ac30bdadfa7671a841bf24e7b793a SHA256 b0efc72d7a818cad0410d30a0742c428e99b804f77d42c6f64952cd10dcba28f
-DIST ibm-java2-sdk-5.0-10.0-linux-i386.tgz 65587370 RMD160 2e83b374a230dbe6f1ab96f199090324353ebbb4 SHA1 984c4f43c215fac7ffec8a11098f508ca8fb8401 SHA256 c44e4e2e50f14d35f80317e1533cd3058e4ae3f6d16aea49c52855fc91fd873f
-DIST ibm-java2-sdk-5.0-10.0-linux-ppc.tgz 73235001 RMD160 28fd9ff40b4250c4e8dfec2b51332cb5eedb0bda SHA1 6ecf43f030de686b301a7e9e10cb939c86e3f746 SHA256 58065d6bf68d2eb700a7b97dba76f9b4297e1df83512498d32364e6b00a5c25e
-DIST ibm-java2-sdk-5.0-10.0-linux-ppc64.tgz 71438646 RMD160 1754d334acd69d4ca5f7f927723b1a2a85bc4cf3 SHA1 ad9665ed0638b2af4db1c2b2044da4111290acd8 SHA256 4c08497a7ee3e7cdfad41e525cfa0002ad3085aa9d00f60069d9c106cef5fcb6
-DIST ibm-java2-sdk-5.0-10.0-linux-x86_64.tgz 67042847 RMD160 3fcef4ecad32f95a8dc4f8d79cd5b1f7ddf9d6c4 SHA1 9ad7103e387e490ec7ed114e7cb9980c5b3576e6 SHA256 adc652d534f02b997069f8eba51d9bc6a88a7033bbe9fd19d9be2433fc333203
 DIST ibm-java2-sdk-5.0-11.0-linux-i386.tgz 65891509 RMD160 05cd7820cdc68db10da8533c4e96605ad283bf42 SHA1 97240daf29fd06f12e5c8988cf74ccd305a60f99 SHA256 a1de7b72a64118599b2587519cf9ebdff9094191d4aa28859d099f6e361d77cd
 DIST ibm-java2-sdk-5.0-11.0-linux-ppc.tgz 73556256 RMD160 609f9dc10d0ba7c0c8480693965458d58e48c79a SHA1 56019e88ee199ea01c68e703bcf446d643ee411e SHA256 3669074c53c3d572baeda8930d04e0d0e99935eecf263d8a988da6d29045488a
 DIST ibm-java2-sdk-5.0-11.0-linux-ppc64.tgz 72036736 RMD160 5865961d589839a2af449ca51885d1da098bf768 SHA1 c4502ef4afe59b6c1937851323cd977031f90c5d SHA256 aa372cd8a627f3f3d2ae5de9e007d0bb6dd8aec277bb4af3307a33a0b19f38f0
 DIST ibm-java2-sdk-5.0-11.0-linux-x86_64.tgz 67627975 RMD160 e120ee5208bc7874909bce952af9f659adf7ab8f SHA1 5e536bb8a328575ccccad5f5e891a8e419c80da6 SHA256 1661c2547965d8a1433a0cbd3dfa7f7601ef73f48cfd904b345e5b101e1665e0
-EBUILD ibm-jdk-bin-1.4.2.13.ebuild 5026 RMD160 9cb6c1147e87a3a3c9791ac4f973af3aa06040a8 SHA1 fb28abe5605acfa051f730aa01f60fb9f72040cb SHA256 622c82344134d03b5f288b520562da6d4f27d32d0c5ebbed241956653c7d4ea2
-EBUILD ibm-jdk-bin-1.5.0.10.ebuild 7611 RMD160 d97393e965680c53c1a461e8b0bd1a3f1c5b8a3f SHA1 a19cb906fd5d053d063eb49d8b1a055104293e8c SHA256 d94e4d41c168f47f1d022aa4045761ffd9b3bcd3b7e9696b6e7ddcb160425c78
 EBUILD ibm-jdk-bin-1.5.0.11.ebuild 7324 RMD160 52f701e368059058e041deca9a4e6fdbeeb76f3f SHA1 4f9a2295107dc1f64ee59a12c086060c426b7a48 SHA256 5908aa67c9c24146beb3c2b750c392cb86df55552812253f25d6b242710862c6
-EBUILD ibm-jdk-bin-1.6.0.6.ebuild 9137 RMD160 66376ecd211ad7e885ea4c986016692eaeb89605 SHA1 345690c203c4b21f5e7fc1ef6b3699e7bf4a6696 SHA256 ebc6b9512b12f7be5db874581a262f74cfe6ec490aa7a0784df9ce8e7ce1aef3
 EBUILD ibm-jdk-bin-1.6.0.7.ebuild 9233 RMD160 8910b72845f4138229092f92e52ba9f2db939300 SHA1 afeba4b6f227ea3c9ee47f77eeac27098b8d1cf4 SHA256 ae58d9faa7929a3f21357549593b5adbdb61f2368deea76f3ab8c6d08aa1efbc
-MISC ChangeLog 34173 RMD160 7efb83b021043f4216d949f5a29e936323ee03f9 SHA1 48c3f739a1afb31ec375454c5807a7c497a64bb4 SHA256 17a053905068432e99611fa41269ca30659d5cfce01959f8ba24e138a366a6e9
+MISC ChangeLog 34396 RMD160 759fcabc6b7a8e2c7f0cca0e621a53da28975345 SHA1 0d6088aa0de9c731fe760b54efbb318fea81f210 SHA256 db84662c5e593d850f3e2237b3ee2280ed3cfb9a4be597281e3cc612b9d68ae1
 MISC metadata.xml 310 RMD160 ac3496cf91b69c0bab3ab8fb6656fbcbf8845f8d SHA1 c8bca85a871e8f7c11481456b490a0fd09175884 SHA256 ffd62e0957318b6c4f3308be446258eae8ce7b8436075f231a30e2ae4691fabf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks86mUACgkQkKaRLQcq0GIy9ACdEAwU8lhxY01rYlu8/cjom5IR
-G9UAnj4yeLtBNEN1BpHJJffwimZwjLUY
-=Nd8+
------END PGP SIGNATURE-----
diff --git a/dev-java/ibm-jdk-bin/files/cpuinfo b/dev-java/ibm-jdk-bin/files/cpuinfo
deleted file mode 100644
index f83be9638014..000000000000
--- a/dev-java/ibm-jdk-bin/files/cpuinfo
+++ /dev/null
@@ -1 +0,0 @@
-cpu		: 604e
diff --git a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.env b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.env
deleted file mode 100644
index edf74905f923..000000000000
--- a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.env
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.4.env,v 1.1 2006/06/25 18:07:17 nichoj Exp $
-
-VERSION="IBM JDK @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-LDPATH="/opt/@P@/jre/bin/:/opt/@P@/jre/bin/classic"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.4"
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/core.jar:${JAVA_HOME}/jre/lib/graphics.jar:${JAVA_HOME}/jre/lib/security.jar:${JAVA_HOME}/jre/lib/server.jar:${JAVA_HOME}/jre/lib/xml.jar:${JAVA_HOME}/jre/lib/charsets.jar:${JAVA_HOME}/jre/lib/ibmjgssprovider.jar:${JAVA_HOME}/jre/lib/ibmjaaslm.jar:${JAVA_HOME}/jre/lib/ibmorbapi.jar:${JAVA_HOME}/jre/lib/ibmorb.jar:${JAVA_HOME}/jre/lib/ibmjcefw.jar:${JAVA_HOME}/jre/lib/ibmjssefips.jar:${JAVA_HOME}/jre/lib/ibmjsseprovider.jar:${JAVA_HOME}/jre/lib/ibmpkcs.jar:${JAVA_HOME}/jre/lib/ibmcertpathprovider.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH"
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.13.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.13.ebuild
deleted file mode 100644
index a11fedf40c3e..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.13.ebuild
+++ /dev/null
@@ -1,176 +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.4.2.13.ebuild,v 1.4 2009/05/29 20:37:25 caster 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 SE 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.5.0.10.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.10.ebuild
deleted file mode 100644
index d61c60dac381..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.10.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.5.0.10.ebuild,v 1.5 2009/11/09 12:48:28 maekke Exp $
-
-inherit java-vm-2 versionator eutils
-
-JDK_RELEASE=$(get_version_component_range 2-3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
-TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-
-JDK_DIST_PREFIX="ibm-java2-sdk-${TGZ_PV}-linux"
-JAVACOMM_DIST_PREFIX="ibm-java2-javacomm-${TGZ_PV}-linux"
-
-X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.tgz"
-X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.tgz"
-
-AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.tgz"
-AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-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}/ibm-java2-i386-50"
-	LINK_ARCH="intel"
-elif use amd64; then
-	JDK_DIST=${AMD64_JDK_DIST}
-	JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
-	S="${WORKDIR}/ibm-java2-x86_64-50"
-	LINK_ARCH="amd64"
-elif use ppc; then
-	JDK_DIST=${PPC_JDK_DIST}
-	JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
-	S="${WORKDIR}/ibm-java2-ppc-50"
-	LINK_ARCH="ipseries32"
-elif use ppc64; then
-	JDK_DIST=${PPC64_JDK_DIST}
-	JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
-	S="${WORKDIR}/ibm-java2-ppc64-50"
-	LINK_ARCH="ipseries64"
-fi
-
-#DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=sdk5&S_PKG=${LINK_ARCH}5sr${SERVICE_RELEASE_LINK}&S_TACT=105AGX05&S_CMP=JDK"
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=sdk5&S_PKG=${LINK_ARCH}5sr${SERVICE_RELEASE_LINK}-ssu&S_TACT=105AGX05&S_CMP=JDK"
-
-SLOT="1.5"
-DESCRIPTION="IBM Java SE 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.5"
-KEYWORDS="-* amd64 ppc ppc64 x86"
-RESTRICT="fetch"
-IUSE="X alsa doc examples javacomm nsplugin odbc"
-
-RDEPEND="=virtual/libstdc++-3.3
-	X? (
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXp
-		x11-libs/libXtst
-		x11-libs/libXt
-		x11-libs/libX11
-	)
-	alsa? ( media-libs/alsa-lib )
-	doc? ( =dev-java/java-sdk-docs-1.5.0* )
-	nsplugin? (
-		x86? ( =x11-libs/gtk+-2* =x11-libs/gtk+-1* )
-		ppc? ( =x11-libs/gtk+-1* )
-	)
-	odbc? ( dev-db/unixODBC )"
-
-DEPEND=""
-
-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} for your arch:"
-	einfo "Under J2SE 5.0, download SR${SERVICE_RELEASE}-SSU for your arch:"
-	einfo "(note that we switched to tgz format because it's now versioned)"
-	einfo "${JDK_DIST}"
-	if use javacomm ; then
-		einfo "${JAVACOMM_DIST}"
-	fi
-
-	einfo "You can 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 "Note: if SR${SERVICE_RELEASE}-SSU 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() { :; }
-
-src_install() {
-	# 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
-
-	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}
-	fi
-
-	plugin=/opt/${P}/jre/bin/${plugin}
-
-	if use x86 || use ppc; then
-		if use nsplugin; then
-			install_mozilla_plugin ${plugin}
-		fi
-	fi
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc "${S}/COPYRIGHT"
-
-	set_java_env
-	java-vm_revdep-mask
-}
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.6.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.6.ebuild
deleted file mode 100644
index 700e28d2133f..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.6.ebuild
+++ /dev/null
@@ -1,260 +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.6.ebuild,v 1.5 2009/11/17 16:17:06 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 SE 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.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
-		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
-
-	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
-
-	# a workaround to fix the BOOTCLASSPATH in our env file
-	# this is not optimal, using -Xcompressedrefs would probably make it
-	# expect the compressedrefs version...
-	if use amd64; then
-		sed -i -e "s|vm.jar|amd64/default/jclSC160/vm.jar|g" "${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
-	fi
-	if use ppc64; then
-		sed -i -e "s|vm.jar|ppc64/default/jclSC160/vm.jar|g" "${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
-	fi
-
-	java-vm_revdep-mask
-}
diff --git a/dev-java/ibm-jre-bin/Manifest b/dev-java/ibm-jre-bin/Manifest
index 5ad4f75a7b0e..3443e571bdb1 100644
--- a/dev-java/ibm-jre-bin/Manifest
+++ b/dev-java/ibm-jre-bin/Manifest
@@ -1,34 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ibm-jre-bin-1.5.env 996 RMD160 732bdc06efdf693093b876f9ed1a49842f38bd26 SHA1 08eb88d122216062193cdc36f3b82ee0b859626a SHA256 ddeeec0fd9ab384ad4236659b0c5bb8789c086f51e5fe3e7a9c80c6a3fd1686f
 AUX ibm-jre-bin-1.6.env 1769 RMD160 63d50da16bd3d1587db7e7d7d1c3974ed1d0c181 SHA1 30325a578b002a010ec9a28d5b965f7af38e559b SHA256 78bcd9d65d4ad872b880745708a86a5c75bb3bc0f71cf17fe72e4e53fbc5961f
-DIST ibm-java-jre-6.0-6.0-linux-i386.tgz 62458514 RMD160 118d0cb293fd0919f1abc334bfa1e99ffbfe621c SHA1 9d28d3ac60a37d7481ba65fb1be6710463a5ef22 SHA256 0084216bd1babdfcf1de72ddf0323405c4fd977f21dca8d73ed88ac2771cfea5
-DIST ibm-java-jre-6.0-6.0-linux-ppc.tgz 64557194 RMD160 612547cb147c32ad82b392c554d733be9ac98797 SHA1 b21fca47b4b2a6e52f6ec163f3a7ef0b1ea96a71 SHA256 2a96c46617f1e9e9fcc962fd94cab104124568bf8a5a93107adb7e4941cb9dbb
-DIST ibm-java-jre-6.0-6.0-linux-ppc64.tgz 72192139 RMD160 5fe0e994f1d432ae12be9ed7358fa64a7e90120b SHA1 0645e9bba505a0bebe56b1a427ef6f67838def47 SHA256 d24a3a20577928bc695389a3a6761a5711741422868d3c82a1b909c207fdde95
-DIST ibm-java-jre-6.0-6.0-linux-x86_64.tgz 68418142 RMD160 67e6e7ca503551479461abcda68f89e878947e76 SHA1 d72315c77398a5fbdfd426e921d349955b10ba23 SHA256 97a2ab812cb05e6cde1f570a587f7b9ff5165a89ade07e0327608cbb065ad581
 DIST ibm-java-jre-6.0-7.0-linux-i386.tgz 62504910 RMD160 78db1ff3659ee31b10f5a59868e953e9649d81f5 SHA1 92c4bc726469455382cb6817c94b588b4ca23095 SHA256 6ac800c352fe7a8931a7769a757379041e0be7650a13866a2042e5ae1383f963
 DIST ibm-java-jre-6.0-7.0-linux-ppc.tgz 64689533 RMD160 4bc49965659abca9bb6046f046ae707204b948d3 SHA1 85ec22ff9767b1c94ffbd30ffa02208f93851bfa SHA256 43d745a032c2d964e4dbfcd4f357d47f7fa9b81d68e9f77c647bbdfad458fb5a
 DIST ibm-java-jre-6.0-7.0-linux-ppc64.tgz 72278639 RMD160 7b7df7381c9386137362fd17f461ac2f4ccda0d0 SHA1 70f6043d3a6db710c8816809ba79096c760a278b SHA256 2fae3276c3b83af9e5b8296253fa91686a7fe059b632954767cb3e6884513648
 DIST ibm-java-jre-6.0-7.0-linux-x86_64.tgz 68493449 RMD160 550ea375f0c167b95ce9825d58cc160ed3cd69b2 SHA1 01fc9468059a5038aeed8859518920cc5df67b76 SHA256 89145fa7e1758bb73373ccc99e6a94f3f441e97f1ca30786faccd8121e5a2c84
-DIST ibm-java2-jre-5.0-10.0-linux-i386.tgz 45084733 RMD160 1a84822fb09dd261c4e7efd964092011145923e8 SHA1 db56e1a0c1066848bebae21b8d9945d9b1ffac39 SHA256 931e6748e479d914aae3d0cf682444f4c9709c8481256d67fd1a3a9eb0bd2470
-DIST ibm-java2-jre-5.0-10.0-linux-ppc.tgz 51525401 RMD160 5a9cd4329e4c85ca159f0f853fc0bdb47037737d SHA1 0556f88f996fbf8e28a271dafe2e5dfb3c389b61 SHA256 bee5ed2a3e2713688c6b07bece7e9d4f2cb5c30b08736426adea186106a01cd5
-DIST ibm-java2-jre-5.0-10.0-linux-ppc64.tgz 51265148 RMD160 c9664b7282880c7f8f7ec34d11569bb5d1c4100b SHA1 9abaa84fda41951bbb9ebf6269d70eb922f21ded SHA256 dfbccf858fc9076513b5fba39ee11097c61505e0a6d10c5e6dccb73e06d6a491
-DIST ibm-java2-jre-5.0-10.0-linux-x86_64.tgz 47075725 RMD160 03a3e97abb00da96e1ed177bde4a25c09732a550 SHA1 244c03ba218544039657816a9c0e6da22cf5694c SHA256 b5131415d8e3d6d40505bd416a2c556135c372a5157c2f31ea1f708cea93828a
 DIST ibm-java2-jre-5.0-11.0-linux-i386.tgz 45252740 RMD160 c95d5bff490fe18ac4e50bdb96c53032c30d40ef SHA1 471cea1be0a316f0d61a14ced0c092fceaa5a44b SHA256 7f0c07ff9aa6f7b0d3f5da9d44841ca15fd04cbc805dc0c3de7212bdf785977c
 DIST ibm-java2-jre-5.0-11.0-linux-ppc.tgz 51704544 RMD160 7a288aea5d974f1c6c81a1e5f18daef13a963e60 SHA1 838392261c1357ba26627a0c9cfdc081a122d234 SHA256 83cd3592fefc89874a438beea1ab14dcccc96a806579bc8837e7d220975469ae
 DIST ibm-java2-jre-5.0-11.0-linux-ppc64.tgz 51713670 RMD160 79cc57f451952ab95b3cc71f55220e1a94b045f2 SHA1 35a3dee2da9bb184f33b8ec5e740332cd4d3b8ab SHA256 58655b2b4da5aadf54837ffb920b12977c15ec1b6555d47bfbffcb0d76c9fe18
 DIST ibm-java2-jre-5.0-11.0-linux-x86_64.tgz 47522478 RMD160 bb4b21e5b143c144bd4f762a78a274815b279274 SHA1 0e6fe873e96bde01849ec2fae15df964d334bbfc SHA256 abb7158db7bbdfb2a71289176511b825959c32b1e11f727c9e43e15c5a980c0d
-EBUILD ibm-jre-bin-1.5.0.10.ebuild 6303 RMD160 68e33c080b8a569f8077948e91d437ee078635c4 SHA1 ffad4be1ab1d05403f0de2b64a149531e0c90738 SHA256 715dedd37bc8e453b56153de84dcf6e570ff356e49549aed45bc0e0070dabfa8
 EBUILD ibm-jre-bin-1.5.0.11.ebuild 6010 RMD160 ed9ebd1de9002870ddb734d2d04b2dd98877303b SHA1 a915637eb9166923518bfa87191944762268a2fd SHA256 c74e055875922b0bab6f04abfac42b6da9358efb3e3b97a96acb45c04a48b33e
-EBUILD ibm-jre-bin-1.6.0.6.ebuild 5968 RMD160 a7259ab422e69f13f0ada1baa77b202362e8c099 SHA1 c06385ab08ba6d78dec8a5fd95734f7adefcd309 SHA256 6e1f0609b295ed6e9e4f306ef6cc41eabea3dde120b0725ba2845bc35027aa34
 EBUILD ibm-jre-bin-1.6.0.7.ebuild 6055 RMD160 77fb0f7ac1a3d8bcbe176593fa52f68f6ed3c67d SHA1 ba3493c086af3c552ea1ec1c84a4ea3a59f605c0 SHA256 b7795196bede5ce70e56629c9fba394964ca39b0b29114505a7aa058330bebfe
-MISC ChangeLog 21810 RMD160 9e3c26380153f4d03e3bc66742dc328f2b50a62c SHA1 f3cde2ea2111bd5583920d0e5f6a0b5b51fc5551 SHA256 fb64c0ecabb9f4fcaa1672ac07c2561cfb542c25889290095329810baf3729aa
+MISC ChangeLog 21937 RMD160 877e06cd212f91488eb1224f85ce08efa97b46e7 SHA1 6595ee15da0de4851453364feca542c4333363e0 SHA256 5cda926a674984ea2a0a007efc2e98905b31b2b0338e32774231592e3914f9a0
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks86jsACgkQkKaRLQcq0GJlGQCgo3J4PRpgLCalMhunnJs2uXvQ
-6XMAn3iR1f/Sd+jKCFkGIfB3KDWgZrNb
-=bOIA
------END PGP SIGNATURE-----