Version bump, security bug #216112.

Package-Manager: portage-2.1.5_rc6

4 files changed, 248 insertions, 264 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index caee806306cf..32b1e515b6c6 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.156 2008/04/06 20:31:35 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.157 2008/05/01 22:46:46 caster Exp $
+
+*ibm-jdk-bin-1.6.0.1 (01 May 2008)
+
+  01 May 2008; Vlastimil Babka <caster@gentoo.org>
+  -ibm-jdk-bin-1.5.0.6-r1.ebuild, +ibm-jdk-bin-1.6.0.1.ebuild:
+  Version bump, security bug #216112.
 
   06 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   ibm-jdk-bin-1.5.0.7.ebuild:
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index 145c2e39f4de..0f694cc12aa0 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -15,18 +15,14 @@ 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-java2-javacomm-5.0-6.0-linux-i386.tgz 119310 RMD160 8009b7e10da297476169d29f3e0afe37a9a858f0 SHA1 a0d8577c8bfb86a0fa828beea77218a790328c20 SHA256 adff409840898174684483b59ee2b0b9bafe6f19a781671d2b604dbec9dc5c48
-DIST ibm-java2-javacomm-5.0-6.0-linux-ppc.tgz 125788 RMD160 92f4e542b1c3392579d93018bed37734b9938201 SHA1 c002ea28e1c6754b2fa09feede098447463c8763 SHA256 a34a09cf9b892230f6eeb26b1f607abe1ffdf8dccff1402b21281972db4bfac2
-DIST ibm-java2-javacomm-5.0-6.0-linux-ppc64.tgz 128332 RMD160 726c5ec0260313770f9c4be237955118d3721104 SHA1 171735f2abc644cd251c56f7f142ae6a7a66f40a SHA256 643287ebe3d0551f2a49642b75ad3635e57589473df0d3c15b4ce1b20533266e
-DIST ibm-java2-javacomm-5.0-6.0-linux-x86_64.tgz 121803 RMD160 66144c0ef46786bebc795e57d449a09fd4a88da5 SHA1 3efd1253a86be9210ea9f7aa57c207a71aa5a312 SHA256 176914ab03a4a9b02a8cad0675e3dadb5893eac62d7b4cbc129fc783ed0a1436
+DIST ibm-java-sdk-6.0-1.0-linux-i386.tgz 88992245 RMD160 6fe6b3e0a213a1a8111d4f688c57f9da7258402e SHA1 138d4490bcee6fd8582e3b72b23474af16ce54b3 SHA256 122f61737ddc92f5faac82ce3025a6412f4009e164f65f95fbdd50bb2868bad8
+DIST ibm-java-sdk-6.0-1.0-linux-ppc.tgz 91260631 RMD160 d7e34f2e78dba5ec3e8a20e2ecccedb07cd540b9 SHA1 f4f42bc09f6c7f33e1b3c75c29d88b2ad277ea10 SHA256 f829449a74ca728ac8b44eb09abc5fd9bacfc4a82def3bba759105cdbe584feb
+DIST ibm-java-sdk-6.0-1.0-linux-ppc64.tgz 95690162 RMD160 bacc953ef1debb164427e7b28c051bf8861071b6 SHA1 80e1a014e111f88ec226c5be80c90de3bece1b0f SHA256 9dcec67d55b2c078c428f30a0c32837d49e9cc52ecf428b73e7e511589ce90a5
+DIST ibm-java-sdk-6.0-1.0-linux-x86_64.tgz 87043644 RMD160 fae604f3eef3a214ef6d69dbc6e2733710b73f5e SHA1 06b42ac0f045d28c494d2571cd56023cef6fab22 SHA256 1ca167e4f899dd91602b3b4b95cc53a07f0e28397427b94db0f29dcd49bbb798
 DIST ibm-java2-javacomm-5.0-7.0-linux-i386.tgz 119318 RMD160 c23219075308381be491c78fc68fd2f4c123bddf SHA1 e203dcbb28472373833612059b7a558b0bbbf4ce SHA256 7d2e7391d1a9d36153b207100d5bcd14d1de3b244976cc57395dae8a7abda938
 DIST ibm-java2-javacomm-5.0-7.0-linux-ppc.tgz 126105 RMD160 20af7ccd27dc053469171a76a71e4a8843d75661 SHA1 6ae2934cf0e301b1cd06de16c01b014b139bf33f SHA256 8132f920a090e8aa344136203e9524657db49095322716d2b7f7a459ea921eba
 DIST ibm-java2-javacomm-5.0-7.0-linux-ppc64.tgz 128329 RMD160 fd9e6b00f7b8d49d4863c6569daff27ab61731ec SHA1 962dbbe7378a48a6746e047df7d365979f9a7e45 SHA256 3e3c35f735ade7f7f7314a7f0f1a43b9fd6dc508bb32571437caff7794970280
 DIST ibm-java2-javacomm-5.0-7.0-linux-x86_64.tgz 121807 RMD160 785c868254dce2eaa3c3fd0ff459b03d1a89fe9b SHA1 a8a03cda62c9fe962c3a8a7e157e27c70256fbb5 SHA256 80fdc3ef640d42d2813044d2d8c2a6e1d8dd78a6f5b54693230143bc2b109fc9
-DIST ibm-java2-sdk-5.0-6.0-linux-i386.tgz 63445375 RMD160 49e496ccfc145f321bbb5b21624eba8a058123b2 SHA1 7cfd715f478312c07446c54d3ce2b9cd608464cd SHA256 b860d4c690f173d97d8c8d9a0289b2d7ced333f0b60ee4aa2dcf60881300488e
-DIST ibm-java2-sdk-5.0-6.0-linux-ppc.tgz 71512415 RMD160 e3f247e5b9b812426695d03debcee42fb7d2c7de SHA1 fbb02524845d6c2334e377b85d48ee5eee2b8250 SHA256 fb887c12443fec7ff8f2733231b7a117a36519769e7d40ef9e53d55cfcaabdee
-DIST ibm-java2-sdk-5.0-6.0-linux-ppc64.tgz 69246934 RMD160 643d26c304e7da6443c05ee325ff22151f507a6e SHA1 0c798347fe966dbc4817e14e9f91f597eea6b67e SHA256 827aecea96d0d3bf4fa757f9982732f5c8aa42a9e1586dd3dcdd5b9078a0270c
-DIST ibm-java2-sdk-5.0-6.0-linux-x86_64.tgz 65138260 RMD160 cea7a326a9e9b4e4df167b6af93c851c3226938b SHA1 83ef003603a5a13231fceb91502792b19732c60b SHA256 e669f594a2d5e420bd6c14f3c83fe6fe6903f60cb7123f535e9b82f4908802e2
 DIST ibm-java2-sdk-5.0-7.0-linux-i386.tgz 64221623 RMD160 bd78481686772174f2e20f8894f5f6775c5e5d6d SHA1 ec2dde70dddbe7e2ff3453078f6e8772aab3cf2a SHA256 d1b2c5fc04fb51e235c719cbf50a90e101c16e22fa3760dde686acc21289c863
 DIST ibm-java2-sdk-5.0-7.0-linux-ppc.tgz 71907612 RMD160 ead8e9a672479fe395ff4eb24b686400d2c2ab91 SHA1 a49072783e6d5cdda1e7509d1ee87e952922c602 SHA256 c280a4b1139cb3b7ff5cb8f2af13dd2191797f6ff67f9f603a17fc4a1ffeb6f6
 DIST ibm-java2-sdk-5.0-7.0-linux-ppc64.tgz 69849859 RMD160 017b71fd79e62d48d678b3cb4518a9b481dc2b32 SHA1 6df0a4914ef2b2b0972ef6a71726eaba07e01d40 SHA256 428b2cb19f54d3f65a01431f9d56da0483cf6172479857a36ff5616883030423
@@ -36,8 +32,8 @@ DIST ibm-javacomm-3.0-0.0-linux-ppc.tgz 403218 RMD160 b791c0b5a2f8dd8165bda31443
 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.10.ebuild 4877 RMD160 f2ba1214173d8527d7e5072de30b285faaf440e8 SHA1 f5e3df9fb7a1b9ffbb431a48e09d02c55286bdfa SHA256 29f44cdd556526769cbf435e491eebb2269d7effba733d7f2f60551d50c42d3c
-EBUILD ibm-jdk-bin-1.5.0.6-r1.ebuild 7299 RMD160 71c2f41cfdfc3b631da4b506f1f702cc09dfd116 SHA1 87ad9e6cb2c1b0b8a0a073ea112746c47a922ac8 SHA256 9058fba9a9b476170859ca2822f07bf45a3d6e96f1ec11d26773b9a8db53e53c
 EBUILD ibm-jdk-bin-1.5.0.7.ebuild 7300 RMD160 d3cbe1cd9d9f0a5b234c65ee288c15dac773a337 SHA1 e993f6d23d32e0f984b499384bf00c6dcb58509f SHA256 c684d1441c68c0551873f6d23f3d10d1f69a73ecb5c90dfa21cad3f14a0a28a4
 EBUILD ibm-jdk-bin-1.6.0.0.ebuild 6974 RMD160 84625cb36b4b366ed22169396229c8750141644a SHA1 2a77f60a72c8996d4b3e03756ea2f604b6dc2138 SHA256 c29aba6cce9d0f997006df201f366550e87f382f513bab8bb9ffffd93a3d18ba
-MISC ChangeLog 24690 RMD160 04639f3f5cc9ed8f88d92cec6cd9ce847bb8347b SHA1 5f4a23b5836aa7e6580b4ef282f6fa05d63827ba SHA256 6d61c523cc27b8581acf30e0e3541af76651011ada67e11543927c8c0ab894d4
+EBUILD ibm-jdk-bin-1.6.0.1.ebuild 7877 RMD160 5cf5b28b3972a26c4cf8914f38a2b00a7fa531e3 SHA1 dc3ff0986e18ac9e74f8841e60245d74ec46c1ca SHA256 d5a17c804a4b86d1a2e6a603de15c3529b2451264e09dfcfd32888c455c13b23
+MISC ChangeLog 24875 RMD160 9ac1a4995657ba260abeec7aa984748dfb2b16e4 SHA1 0e7615f4e42833c19e4c6dc46a7b91b2281b69eb SHA256 f40f2e321bbe263ed025e123b850ee12df35403526ea3062a955c119f8f4b904
 MISC metadata.xml 219 RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e SHA1 7f610c6c183a353d1969b4d9ac48e01629830026 SHA256 97628c0f582c0835c18b9ea2d722a316084d64ded80d4e1be2db984a2c292428
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.6-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.6-r1.ebuild
deleted file mode 100644
index f51afb50d100..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.6-r1.ebuild
+++ /dev/null
@@ -1,253 +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.5.0.6-r1.ebuild,v 1.3 2008/02/26 16:24:01 caster 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"
-
-SLOT="1.5"
-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.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 "(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 "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.1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.1.ebuild
new file mode 100644
index 000000000000..fcbc932cb104
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.1.ebuild
@@ -0,0 +1,235 @@
+# 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.6.0.1.ebuild,v 1.1 2008/05/01 22:46:46 caster 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="3.${JAVACOMM_RELEASE}-0.0"
+
+JDK_DIST_PREFIX="ibm-java-sdk-${TGZ_PV}-linux"
+JAVACOMM_DIST_PREFIX="ibm-javacomm-${JAVACOMM_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-java-i386-60"
+	LINK_ARCH="intel"
+elif use amd64; then
+	JDK_DIST=${AMD64_JDK_DIST}
+	JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
+	S="${WORKDIR}/ibm-java-x86_64-60"
+	LINK_ARCH="amd64"
+elif use ppc; then
+	JDK_DIST=${PPC_JDK_DIST}
+	JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
+	S="${WORKDIR}/ibm-java-ppc-60"
+	LINK_ARCH="ipseries32"
+elif use ppc64; then
+	JDK_DIST=${PPC64_JDK_DIST}
+	JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
+	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}&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="
+	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 GA for your arch:" #SR${SERVICE_RELEASE}
+	einfo "${JDK_DIST}"
+	if use javacomm ; then
+		einfo "${JAVACOMM_DIST}"
+	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 GA 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
+	java-vm_revdep-mask
+}