Version bump, security bug #252416. This SR9-SSU release uses same distfile version as the previous SR9 (1.5.0.9). To prevent the need for user renaming of the new version's files, the old ebuild was updated to expect distfiles with .old.tgz scheme.

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

4 files changed, 295 insertions, 20 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index b73014a75587..15e9aa0ebcb2 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,15 @@
 # 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.197 2009/04/21 19:11:10 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.198 2009/04/22 12:46:56 caster Exp $
+
+*ibm-jdk-bin-1.5.0.9-r1 (22 Apr 2009)
+
+  22 Apr 2009; Vlastimil Babka <caster@gentoo.org> ibm-jdk-bin-1.5.0.9,
+  +ibm-jdk-bin-1.5.0.9-r1.ebuild:
+  Version bump, security bug #252416. This SR9-SSU release uses same
+  distfile version as the previous SR9 (1.5.0.9). To prevent the need for
+  user renaming of the new version's files, the old ebuild was updated to
+  expect distfiles with .old.tgz scheme.
 
   21 Apr 2009; Vlastimil Babka <caster@gentoo.org>
   -ibm-jdk-bin-1.4.2.12.ebuild, -ibm-jdk-bin-1.6.0.3.ebuild:
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index e0e02b595ce1..c1cc80b3c00a 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -23,21 +23,30 @@ DIST ibm-java-sdk-6.0-4.0-linux-i386.tgz 90258217 RMD160 21b739c30ffcbfbd1fc552a
 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
-DIST ibm-java2-javacomm-5.0-9.0-linux-x86_64.tgz 121864 RMD160 7e34461c733d24fa45bc42d2c574464b82263f8e SHA1 3a24ad8a2798f7f80fcaca93c48c419e37edc16a SHA256 7627e781d6ca6f7507d1481c27aaa24cbbe97350a1de93bf2f48ddd9a438bf95
-DIST ibm-java2-sdk-5.0-9.0-linux-i386.tgz 65197700 RMD160 81130f591c2414cfe254028d1a45de3f2a26d320 SHA1 0da04cd774430cb319cd7c36153a07c1b57810dc SHA256 7fd29399bed4bc6aec5ad951e3e58fa53dd5d8e3e7d1bb46dfef49022c769415
-DIST ibm-java2-sdk-5.0-9.0-linux-ppc.tgz 72836266 RMD160 d926f7dea7c3ca42d007028e8da48057255b30f9 SHA1 e6ce5f8543b0192c57e29d047f98f8cfa89bdcfe SHA256 04944dde6b637cc6cdeaaf377fd747433c1d22b5e2d0f0a92e83acb399d358c0
-DIST ibm-java2-sdk-5.0-9.0-linux-ppc64.tgz 71168649 RMD160 0e480cd6a6617086caa7778ba57c52bafa068e34 SHA1 1dabe87a31ce06ba7aa088c122ba6dbacae2274e SHA256 44bc8260ec3d5d5ecf839a9962dd49a284264e625cc6ff79a4584798077539b6
-DIST ibm-java2-sdk-5.0-9.0-linux-x86_64.tgz 66525937 RMD160 3ac93c72dc6713d698c3bb3b7d683e3de18dda8c SHA1 aa1ba81ed8d6ead702258bbd39ea057b8f47f0fe SHA256 66e300fb7ac8a6a35585a65605eaaf8ac4a25d4e5289454ee766e64d4ca29973
+DIST ibm-java2-javacomm-5.0-9.0-linux-i386.old.tgz 119995 RMD160 10958d53babfe5fbb6f9a18e32ffa39b1f55d8c7 SHA1 d44816f749d80d3675a6f01cf093ad5b4d722f60 SHA256 9c307b88477d64a439375324cdea98668d3dd3e31c16ca75598506379e814711
+DIST ibm-java2-javacomm-5.0-9.0-linux-i386.tgz 120024 RMD160 08e537b7c652147070dac5fe8398ca56f15651f0 SHA1 3369eba1a5a75bea8485f6599e75e2903005151e SHA256 f8004ce4634497cfa1a1043629b16a2b04508b45817a5d9d2fc1780b4493240d
+DIST ibm-java2-javacomm-5.0-9.0-linux-ppc.old.tgz 124739 RMD160 54c0f94fdec50d01a8ebede4ff8ab966f5d593a9 SHA1 09a4541ddc3c5a589272e21430112514d13d21c7 SHA256 53a819c6ad568f57f5053375a645856cc989d27d38245b0a6c35f3c50a258054
+DIST ibm-java2-javacomm-5.0-9.0-linux-ppc.tgz 124745 RMD160 866426abe87a107e4160adf7c4aee1cbba2e39d8 SHA1 9af1d1a1f75868a31564f4f112185731effc7c06 SHA256 fe5ddf4a6aa6ea95d7b44104e27f05a9a382d31c1192753108fb8f76f72d7fa5
+DIST ibm-java2-javacomm-5.0-9.0-linux-ppc64.old.tgz 128501 RMD160 f44b83175c7b4e4205d007132ce8e90d6cc2ef44 SHA1 4ecc456c4e02a21210d7d76821056c3d6cc8d260 SHA256 5e475e7df63189814bc70b5976978c699c897cdba64819bb6d4019c0a57882bd
+DIST ibm-java2-javacomm-5.0-9.0-linux-ppc64.tgz 128252 RMD160 5e7eb81d883ed4f2a5e92ac3484129a6ed361e99 SHA1 715a98e91903693a2b9190e9ad100d0f78cdd315 SHA256 e9e940ace0e2d42ab269002f6296947f3b83e82d836d85abd8d3450dea2e52eb
+DIST ibm-java2-javacomm-5.0-9.0-linux-x86_64.old.tgz 121864 RMD160 7e34461c733d24fa45bc42d2c574464b82263f8e SHA1 3a24ad8a2798f7f80fcaca93c48c419e37edc16a SHA256 7627e781d6ca6f7507d1481c27aaa24cbbe97350a1de93bf2f48ddd9a438bf95
+DIST ibm-java2-javacomm-5.0-9.0-linux-x86_64.tgz 121807 RMD160 fe6fa07d8791cf47729a3f1dabcb68e5a9ebaa87 SHA1 c5d74dec2494f5ca6020d5966a83673304b5921c SHA256 99f9b77096f02ca789e7ef74fd980ae601cb467f5de6647a8cdf93ac4ad2f09c
+DIST ibm-java2-sdk-5.0-9.0-linux-i386.old.tgz 65197700 RMD160 81130f591c2414cfe254028d1a45de3f2a26d320 SHA1 0da04cd774430cb319cd7c36153a07c1b57810dc SHA256 7fd29399bed4bc6aec5ad951e3e58fa53dd5d8e3e7d1bb46dfef49022c769415
+DIST ibm-java2-sdk-5.0-9.0-linux-i386.tgz 65023960 RMD160 55821a14427ad8494f31755b1b5e0c35693cda10 SHA1 83558182b0e7ab23da62a7bbdc67ec8b04db4ed8 SHA256 873c8b26d5e096e258c34aad0f83b526975f232370b6b90722815fa9672a1432
+DIST ibm-java2-sdk-5.0-9.0-linux-ppc.old.tgz 72836266 RMD160 d926f7dea7c3ca42d007028e8da48057255b30f9 SHA1 e6ce5f8543b0192c57e29d047f98f8cfa89bdcfe SHA256 04944dde6b637cc6cdeaaf377fd747433c1d22b5e2d0f0a92e83acb399d358c0
+DIST ibm-java2-sdk-5.0-9.0-linux-ppc.tgz 72849470 RMD160 745bfae794ecc9fdfa0a5d98782699e499e068fe SHA1 9688a553e4687171c8f3f9ca1840928f7c9e04b2 SHA256 5399d02e7d63272f609c94189a31dd39f67633d62525422e402905d95782cbe8
+DIST ibm-java2-sdk-5.0-9.0-linux-ppc64.old.tgz 71168649 RMD160 0e480cd6a6617086caa7778ba57c52bafa068e34 SHA1 1dabe87a31ce06ba7aa088c122ba6dbacae2274e SHA256 44bc8260ec3d5d5ecf839a9962dd49a284264e625cc6ff79a4584798077539b6
+DIST ibm-java2-sdk-5.0-9.0-linux-ppc64.tgz 70883997 RMD160 783260752b670a709b431586635412f1ee7db9a9 SHA1 5ef4657bdda2d65486978515ea578d74d4366570 SHA256 4654a4d6ced5a7e0503c41e54cd25f2c5c9823acd4f6b213f224c04b02b064d5
+DIST ibm-java2-sdk-5.0-9.0-linux-x86_64.old.tgz 66525937 RMD160 3ac93c72dc6713d698c3bb3b7d683e3de18dda8c SHA1 aa1ba81ed8d6ead702258bbd39ea057b8f47f0fe SHA256 66e300fb7ac8a6a35585a65605eaaf8ac4a25d4e5289454ee766e64d4ca29973
+DIST ibm-java2-sdk-5.0-9.0-linux-x86_64.tgz 66597248 RMD160 7cf8f8349a0e551cc39e02d6d7d914dbcef500ef SHA1 cac186135ac63c8efa2f0ac54a1eda1cfec5a34b SHA256 db370edb5197c5308ab5c667c27aebf5d780ef53724338666eaea6400601ee5f
 DIST ibm-javacomm-3.0-0.0-linux-i386.tgz 398689 RMD160 ef72d2210532f8534184b9c578705edd41ed7741 SHA1 a8a00d1110a172a47da2c6c9e4dd2664db3acb6d SHA256 6f438ec0a13e00645ba6e68ee0b16cc85df9f0295cab3479b107765b17a8c836
 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.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.5.0.9-r1.ebuild 7622 RMD160 bb15d8568735f3df5daeebd237dca9516755b373 SHA1 8c2fc60acb37f903bee1749a13fdb71c444e135e SHA256 a753d5c5c6303dafca6b0246c16a53a489f3b0537fd4062cd55755c969dae29c
+EBUILD ibm-jdk-bin-1.5.0.9.ebuild 7385 RMD160 b4599f2f5b2676f4fbd1eafe302e2a16195a7cce SHA1 0092f5129faffe52b910216fcbdb9358ca640f9b SHA256 6cb74ed1f160db23bed87528d218d5f122135829039ab33dafe084caa626ed65
 EBUILD ibm-jdk-bin-1.6.0.0.ebuild 6974 RMD160 84625cb36b4b366ed22169396229c8750141644a SHA1 2a77f60a72c8996d4b3e03756ea2f604b6dc2138 SHA256 c29aba6cce9d0f997006df201f366550e87f382f513bab8bb9ffffd93a3d18ba
 EBUILD ibm-jdk-bin-1.6.0.4.ebuild 8977 RMD160 8e7392a09c0f1fe5fc9773f7ff05eab88ca83aa8 SHA1 58b2e1d70faf053e3c7e44ffd992f04d8d1f977d SHA256 ccbe3fede29fab434c5bd434bbe127a8a05e90a8ad0e22fc1cff592fc1b3702d
-MISC ChangeLog 30624 RMD160 5f5449b2e1ecb671553c3186268645d39a36091a SHA1 c27e7d4c54d703938a8d454c340084e2132524f2 SHA256 b335c6e5b08ad93f837f23a84ffa13e42ed4aebc2bd7a75451e1b48ab15591a7
+MISC ChangeLog 31028 RMD160 84338d7d3c01934ed7a133ec435dbdcfcd7784da SHA1 89daf2b893d87a45c7e044268b38c664c90877f8 SHA256 efb189b3524f43863a807ba60be375fa2020c6dfb0f41713a9df25431b285072
 MISC metadata.xml 310 RMD160 ac3496cf91b69c0bab3ab8fb6656fbcbf8845f8d SHA1 c8bca85a871e8f7c11481456b490a0fd09175884 SHA256 ffd62e0957318b6c4f3308be446258eae8ce7b8436075f231a30e2ae4691fabf
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.9-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.9-r1.ebuild
new file mode 100644
index 000000000000..48e885692a25
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.9-r1.ebuild
@@ -0,0 +1,256 @@
+# 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.9-r1.ebuild,v 1.1 2009/04/22 12:46:56 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"
+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 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 "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.5.0.9.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.9.ebuild
index fb031932aec7..1ebc104167f2 100644
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.9.ebuild
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.9.ebuild
@@ -1,6 +1,6 @@
 # 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.9.ebuild,v 1.4 2009/01/06 17:05:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.9.ebuild,v 1.5 2009/04/22 12:46:56 caster Exp $
 
 inherit java-vm-2 versionator eutils
 
@@ -12,17 +12,17 @@ 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"
+X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.old.tgz"
+X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.old.tgz"
 
-AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.tgz"
-AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-x86_64.tgz"
+AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.old.tgz"
+AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-x86_64.old.tgz"
 
-PPC_JDK_DIST="${JDK_DIST_PREFIX}-ppc.tgz"
-PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc.tgz"
+PPC_JDK_DIST="${JDK_DIST_PREFIX}-ppc.old.tgz"
+PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc.old.tgz"
 
-PPC64_JDK_DIST="${JDK_DIST_PREFIX}-ppc64.tgz"
-PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc64.tgz"
+PPC64_JDK_DIST="${JDK_DIST_PREFIX}-ppc64.old.tgz"
+PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc64.old.tgz"
 
 if use x86; then
 	JDK_DIST=${X86_JDK_DIST}
@@ -198,6 +198,7 @@ pkg_nofetch() {
 	einfo "You can use direct link to your arch download page:"
 	einfo "${DIRECT_DOWNLOAD}"
 	einfo "Place the file(s) in: ${DISTDIR}"
+	einfo "And rename them by replacing .tgz with .old.tgz"
 	einfo "Then restart emerge: 'emerge --resume'"
 
 	einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}"