Version bump, security bug #216112.

Package-Manager: portage-2.1.5_rc6

4 files changed, 194 insertions, 233 deletions

diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index 7844d0829ba7..bcd050888d02 100644
--- a/dev-java/ibm-jre-bin/ChangeLog
+++ b/dev-java/ibm-jre-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ibm-jre-bin
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.93 2008/04/07 20:54:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.94 2008/05/01 23:09:06 caster Exp $
+
+*ibm-jre-bin-1.6.0.1 (01 May 2008)
+
+  01 May 2008; Vlastimil Babka <caster@gentoo.org>
+  -ibm-jre-bin-1.5.0.6-r1.ebuild, +ibm-jre-bin-1.6.0.1.ebuild:
+  Version bump, security bug #216112.
 
   07 Apr 2008; Markus Meier <maekke@gentoo.org> ibm-jre-bin-1.5.0.7.ebuild:
   amd64/x86 stable, security bug #216112
diff --git a/dev-java/ibm-jre-bin/Manifest b/dev-java/ibm-jre-bin/Manifest
index ccc53895bb16..887c40f4ef3d 100644
--- a/dev-java/ibm-jre-bin/Manifest
+++ b/dev-java/ibm-jre-bin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ibm-jre-bin-1.4.env 976 RMD160 64fea85f255b474072a5633b34e087e00ab0ea2d SHA1 999b7d26a84f3ddbde787bffa62a2549b76da1fe SHA256 4d11de0d1018ab18f7f9e2e09748feab5f49e27f303d6c4d755cb6df0375ede2
 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
@@ -12,24 +9,17 @@ DIST ibm-java-jre-6.0-0.0-linux-i386.tgz 59585416 RMD160 6d85e42351a64330530f9c5
 DIST ibm-java-jre-6.0-0.0-linux-ppc.tgz 61777287 RMD160 eb53658709bd7153fe549a4b1a787b85caf9ddff SHA1 cb7b1cac3f8f7623ea918a1dedccfebd0e59891a SHA256 1353e0d6412f6bc5cd545ffbea057dade7a64a0f69f3fa6865c7e2c5833f020f
 DIST ibm-java-jre-6.0-0.0-linux-ppc64.tgz 63455903 RMD160 3d041835fd70ac716ddc58bf15a2e17e84b01817 SHA1 6422b295879e36cba6bf5c84f924103ff4520741 SHA256 126a9c424821e56eaf81822f3e1d975f4cbb49e8ea67cf40588fc2125f61161f
 DIST ibm-java-jre-6.0-0.0-linux-x86_64.tgz 57941136 RMD160 56643afe91ec2726878f0b75b872797acb8b7ca4 SHA1 3a3b0d7bf9f17c5b38694ce2dd924a36f90eb89c SHA256 aff47c49671e85984c2112d27429d5550d7415b94f3482cb26a9de7a3cdd10aa
-DIST ibm-java2-jre-5.0-6.0-linux-i386.tgz 43484118 RMD160 e07c82a30248f137285a7d7c24511e96421a3245 SHA1 4cff16ef0f8de582cbae3a9b124534a17d8f7a42 SHA256 bf9a89e4341a3f761519bf6d53b641b8c4abfa08655e655e1ecef61a8ca87099
-DIST ibm-java2-jre-5.0-6.0-linux-ppc.tgz 50320536 RMD160 ebc98dde508a1990e1c9745333509b6deecb9697 SHA1 d590eada559299194cc654721b5ae06400f06845 SHA256 740cc4610ffb5c9ec0c98146906976c1c37b7ed20d550e71cb318fb9d4541e58
-DIST ibm-java2-jre-5.0-6.0-linux-ppc64.tgz 49588981 RMD160 b8df215a3d69aa23a6672fa91ddc94915d3bb158 SHA1 19a4006d531525f090d4a1bdbe91cf05322bcf3b SHA256 1cbafb5bee54e5856330a479f72f7b997fd034745ede705e3926d2cb4c80538b
-DIST ibm-java2-jre-5.0-6.0-linux-x86_64.tgz 45671486 RMD160 f4f62cac048f118585d19181705338879f223351 SHA1 2354b5f17988fd750700b065390a79aaec6f51ee SHA256 1ddb9b2bfbb43359d33a9833bbf67523ee2be30f9c0f0f8894e5cf4b5635a37a
+DIST ibm-java-jre-6.0-1.0-linux-i386.tgz 61971968 RMD160 923f26267d9c9783c61f3b36df58049d3835ca9b SHA1 51323e52edcd62e0daf861ec7b34970d1c3b10df SHA256 6944ca6a3336e8a9ec58d9dab6dc22ff5ddf59449fdf03392df9e17ea9b2677a
+DIST ibm-java-jre-6.0-1.0-linux-ppc.tgz 64144858 RMD160 e7226eccf34653089f8c0bc59d931bc97f0d5d4c SHA1 87e2cf2516b71d000f6f9ff02b9886d181b7ec3a SHA256 81868124a696c765862f20c8e30a826c7299cded05144815ee06337585f805de
+DIST ibm-java-jre-6.0-1.0-linux-ppc64.tgz 73579214 RMD160 6c981c67eab41b348f99159aef3a38a25874b3d3 SHA1 bb2cc67933557139091cb5571ef15d29721015d6 SHA256 9a57afe0f86bc22d54b59eb23461b67df6d1714d4db42706e9c96a202489c7e3
+DIST ibm-java-jre-6.0-1.0-linux-x86_64.tgz 65515334 RMD160 311dec0fd99aa77f9f12225c4ad60c5ee7e38170 SHA1 c17988bf884088292009b75da8af6c9e29f006bc SHA256 d357dc22578da8302be8f1a1770600ec0351a71fe6a5492f50615d9b3b45c86e
 DIST ibm-java2-jre-5.0-7.0-linux-i386.tgz 44234576 RMD160 3adafd5cd3e56a3ee9929842f3aadd9aebc2b21f SHA1 ea4800be2f036e1c68b369fe906afe90b433b260 SHA256 5232fae2ecb6f4a39ccd9ea435271f0737fcd739539d7e88660f1d8577fb8c89
 DIST ibm-java2-jre-5.0-7.0-linux-ppc.tgz 50699174 RMD160 9e010521463e88181e1cdc122254345441cb2d25 SHA1 f78447a977c3f29133ffdb9176df128bf30dd882 SHA256 c0fc978a7be08ce4279cade7a148ffb83fb15621ceddc5de8495c109a9f07b32
 DIST ibm-java2-jre-5.0-7.0-linux-ppc64.tgz 50189122 RMD160 bae342dc3ede2000bd0b0e40f659a7f5ec2d1db3 SHA1 d3f21fdc43c4f6c8e5423aaddb59784e5c1843d2 SHA256 50b262750237dd8f11ae9a546d147121bccbd5a13a0a6a79751e1a35122d4431
 DIST ibm-java2-jre-5.0-7.0-linux-x86_64.tgz 46120819 RMD160 be4777f5efc5cac2f056c263b95a26e311c1791f SHA1 9e7b9c35df0a346c664d053f38628aabf8a44be8 SHA256 c85b331417492ff9994bdccd4c549170e83a78bc0d1ac29a324b8b88b3dd85f3
 EBUILD ibm-jre-bin-1.4.2.10.ebuild 3419 RMD160 17b1eafb78bcded35135900879a4b0d6115272c9 SHA1 b31e6a9888122179533eefa135466467b4b8ca0c SHA256 2011c223cb31ab98ca938729dcc99ac0e6f287282cbd36b5871a2b707d7f4cba
-EBUILD ibm-jre-bin-1.5.0.6-r1.ebuild 5989 RMD160 a62f89c5cf9421abc88a9ae6e64b00557e686e08 SHA1 d3c6739256d5ae2fed3da96b24378b461af08b12 SHA256 8493ec24a7a65e953bd4f9f707166ebd48fbca8746fc144316f7d40459dacf17
 EBUILD ibm-jre-bin-1.5.0.7.ebuild 5986 RMD160 7ee4302a71718890395dac5dbd44aa453dd59d79 SHA1 a8c5383ccd5ae07986b7190ee9fc04f4b0cb9322 SHA256 b86196a39c9e4a4e24f1ddcd505bb679bf177091381ec3a65ae2aab7d564dd37
 EBUILD ibm-jre-bin-1.6.0.0.ebuild 5191 RMD160 e7b917acbfd5d0c619f7269f166ca63f2a5763ff SHA1 ca0fef15263f1083d6c48513b51ae6e4517b6060 SHA256 cf11b6a7ac50f43caa3cc0d36f4818ad19ee103f2922f07c553308d10f1737f5
-MISC ChangeLog 14146 RMD160 431cfbd156056d7cb8d94bf020a62505f6194cc6 SHA1 06c9c59ab7b7957c49202042f22d5c2815172510 SHA256 9f7553458b7403f5eff06b9e47e25fd9efbe468127d107e6f515b27667a3e28f
+EBUILD ibm-jre-bin-1.6.0.1.ebuild 5962 RMD160 99680599c0300735260e67c087209c226a913b30 SHA1 f3ca5fe0294ba8be94dda9a764cebf73e3c40a41 SHA256 c5dae344d7354c2e5adc9f09dde8a97ba85820556411e0eb6511e1fc9bf679d4
+MISC ChangeLog 14335 RMD160 3841cf0a40d1c8be0253a020725bfb334a4a2cda SHA1 557079aebc9fd82ced9cf6d4ca37eb82ec07543b SHA256 c9714242d7e3eceb8e17ad0694433b075eaeb92c20bb7f692cdf36da78caa5e1
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkf6ilQACgkQkKaRLQcq0GLRUACglM6WSnP1CpOJqODqpLeaYnAM
-sowAnjb4hf1QkqYWBeyk3ejKcME4vARO
-=tgEG
------END PGP SIGNATURE-----
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild
deleted file mode 100644
index a15b3d222561..000000000000
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild
+++ /dev/null
@@ -1,216 +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-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild,v 1.3 2008/02/26 16:28:59 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"
-
-JRE_DIST_PREFIX="ibm-java2-jre-${TGZ_PV}-linux"
-
-X86_JRE_DIST="${JRE_DIST_PREFIX}-i386.tgz"
-AMD64_JRE_DIST="${JRE_DIST_PREFIX}-x86_64.tgz"
-PPC_JRE_DIST="${JRE_DIST_PREFIX}-ppc.tgz"
-PPC64_JRE_DIST="${JRE_DIST_PREFIX}-ppc64.tgz"
-
-if use x86; then
-	JRE_DIST=${X86_JRE_DIST}
-	S="${WORKDIR}/ibm-java2-i386-50"
-	LINK_ARCH="intel"
-elif use amd64; then
-	JRE_DIST=${AMD64_JRE_DIST}
-	S="${WORKDIR}/ibm-java2-x86_64-50"
-	LINK_ARCH="amd64"
-elif use ppc; then
-	JRE_DIST=${PPC_JRE_DIST}
-	S="${WORKDIR}/ibm-java2-ppc-50"
-	LINK_ARCH="ipseries32"
-elif use ppc64; then
-	JRE_DIST=${PPC64_JRE_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 Runtime Environment ${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_JRE_DIST} )
-	amd64? ( ${AMD64_JRE_DIST} )
-	ppc? ( ${PPC_JRE_DIST} )
-	ppc64? ( ${PPC64_JRE_DIST} )"
-LICENSE="IBM-J1.5"
-KEYWORDS="-* amd64 ppc ppc64 x86"
-RESTRICT="fetch"
-IUSE="X alsa 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 )
-		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}/bin/libjclscar_23.so
-	opt/${P}/bin/libj9vrb23.so
-	opt/${P}/bin/libj9vm23.so
-	opt/${P}/bin/libj9trc23.so
-	opt/${P}/bin/libj9thr23.so
-	opt/${P}/bin/libj9shr23.so
-	opt/${P}/bin/libj9prt23.so
-	opt/${P}/bin/libj9jvmti23.so
-	opt/${P}/bin/libj9jpi23.so
-	opt/${P}/bin/libj9jit23.so
-	opt/${P}/bin/libj9jextract.so
-	opt/${P}/bin/libj9hookable23.so
-	opt/${P}/bin/libj9gc23.so
-	opt/${P}/bin/libj9dyn23.so
-	opt/${P}/bin/libj9dmp23.so
-	opt/${P}/bin/libj9dbg23.so
-	opt/${P}/bin/libj9bcv23.so
-	opt/${P}/bin/libiverel23.so
-	opt/${P}/bin/classic/libjvm.so
-	opt/${P}/bin/j9vm/libjvm.so"
-
-QA_TEXTRELS_amd64="opt/${P}/bin/libjclscar_23.so
-	opt/${P}/bin/libj9jit23.so"
-
-QA_EXECSTACK_x86="opt/${P}/bin/j9vm/libjvm.so
-	opt/${P}/bin/libj9jvmti23.so
-	opt/${P}/bin/libj9hookable23.so
-	opt/${P}/bin/libj9vm23.so
-	opt/${P}/bin/libj9dyn23.so
-	opt/${P}/bin/libjclscar_23.so
-	opt/${P}/bin/libj9jpi23.so
-	opt/${P}/bin/libj9thr23.so
-	opt/${P}/bin/libj9dmp23.so
-	opt/${P}/bin/libj9prt23.so
-	opt/${P}/bin/libj9jit23.so
-	opt/${P}/bin/libiverel23.so
-	opt/${P}/bin/libj9trc23.so
-	opt/${P}/bin/libj9dbg23.so
-	opt/${P}/bin/libj9jextract.so
-	opt/${P}/bin/libj9shr23.so
-	opt/${P}/bin/libj9gc23.so
-	opt/${P}/bin/libj9vrb23.so
-	opt/${P}/bin/libj9bcv23.so
-	opt/${P}/bin/libj9aotrt23.so
-	opt/${P}/bin/classic/libjvm.so"
-
-QA_TEXTRELS_ppc="opt/${P}/bin/classic/libjvm.so
-	opt/${P}/bin/j9vm/libjvm.so
-	opt/${P}/bin/libj9aotrt23.so
-	opt/${P}/bin/libj9dbg23.so
-	opt/${P}/bin/libj9gc23.so
-	opt/${P}/bin/libj9gcchk23.so
-	opt/${P}/bin/libj9jextract.so
-	opt/${P}/bin/libj9jit23.so
-	opt/${P}/bin/libj9jitd23.so
-	opt/${P}/bin/libj9jpi23.so
-	opt/${P}/bin/libj9jvmti23.so
-	opt/${P}/bin/libj9prt23.so
-	opt/${P}/bin/libj9thr23.so
-	opt/${P}/bin/libj9thr23.so
-	opt/${P}/bin/libj9ute23.so
-	opt/${P}/bin/libj9vm23.so
-	opt/${P}/bin/libj9vm23.so
-	opt/${P}/bin/libjaas.so
-	opt/${P}/bin/libjclscar_23.so
-	opt/${P}/bin/libjsig.so
-"
-
-QA_TEXTRELS_ppc64="opt/${P}/bin/libj9jextract.so
-	opt/${P}/bin/libjsig.so
-	opt/${P}/bin/libj9jitd23.so
-	opt/${P}/bin/libj9ute23.so
-	opt/${P}/bin/classic/libjvm.so
-	opt/${P}/bin/libj9prt23.so
-	opt/${P}/bin/libjclscar_23.so
-	opt/${P}/bin/j9vm/libjvm.so
-	opt/${P}/bin/libj9gc23.so
-	opt/${P}/bin/libj9dbg23.so
-	opt/${P}/bin/libj9thr23.so
-	opt/${P}/bin/libj9jpi23.so
-	opt/${P}/bin/libj9gcchk23.so
-	opt/${P}/bin/libj9vm23.so
-	opt/${P}/bin/libj9jit23.so"
-
-QA_TEXTRELS_x86="opt/${P}/bin/lib*.so
-	opt/${P}/bin/j9vm/libjvm.so
-	opt/${P}/bin/xawt/libmawt.so
-	opt/${P}/bin/javaplugin.so
-	opt/${P}/bin/motif21/libmawt.so
-	opt/${P}/bin/headless/libmawt.so
-	opt/${P}/bin/classic/libjvm.so
-	opt/${P}/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 "${JRE_DIST}"
-
-	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_compile() { :; }
-
-src_install() {
-	# Copy all the files to the designated directory
-	dodir /opt/${P}
-	cp -pR "${S}"/jre/* "${D}/opt/${P}/"
-
-	local x86plugin=libjavaplugin_ojigtk2.so
-	local ppcplugin=libjavaplugin_oji.so
-	local jrebindest="${D}/opt/${P}/bin/"
-
-	local plugin
-	if use x86; then
-		plugin=${x86plugin}
-	elif use ppc; then
-		plugin=${ppcplugin}
-	fi
-
-	plugin=/opt/${P}/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 || die
-	dodoc "${S}/COPYRIGHT" || die
-
-	set_java_env
-	java-vm_revdep-mask
-}
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.1.ebuild
new file mode 100644
index 000000000000..bca193abac23
--- /dev/null
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.1.ebuild,v 1.1 2008/05/01 23:09:06 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"
+
+JRE_DIST_PREFIX="ibm-java-jre-${TGZ_PV}-linux"
+
+X86_JRE_DIST="${JRE_DIST_PREFIX}-i386.tgz"
+AMD64_JRE_DIST="${JRE_DIST_PREFIX}-x86_64.tgz"
+PPC_JRE_DIST="${JRE_DIST_PREFIX}-ppc.tgz"
+PPC64_JRE_DIST="${JRE_DIST_PREFIX}-ppc64.tgz"
+
+if use x86; then
+	JRE_DIST=${X86_JRE_DIST}
+	S="${WORKDIR}/ibm-java-i386-60"
+	LINK_ARCH="intel"
+elif use amd64; then
+	JRE_DIST=${AMD64_JRE_DIST}
+	S="${WORKDIR}/ibm-java-x86_64-60"
+	LINK_ARCH="amd64"
+elif use ppc; then
+	JRE_DIST=${PPC_JRE_DIST}
+	S="${WORKDIR}/ibm-java-ppc-60"
+	LINK_ARCH="ipseries32"
+elif use ppc64; then
+	JRE_DIST=${PPC64_JRE_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 Runtime Environment ${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_JRE_DIST} )
+	amd64? ( ${AMD64_JRE_DIST} )
+	ppc? ( ${PPC_JRE_DIST} )
+	ppc64? ( ${PPC64_JRE_DIST} )"
+LICENSE="IBM-J1.6"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+RESTRICT="fetch"
+IUSE="X alsa 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 )
+		odbc? ( dev-db/unixODBC )"
+DEPEND=""
+
+QA_TEXTRELS_x86="opt/${P}/lib/i386/libj9jvmti24.so
+opt/${P}/lib/i386/libj9vm24.so
+opt/${P}/lib/i386/libjclscar_24.so
+opt/${P}/lib/i386/motif21/libmawt.so
+opt/${P}/lib/i386/libj9thr24.so
+opt/${P}/lib/i386/libj9jit24.so
+opt/${P}/lib/i386/libj9dbg24.so
+opt/${P}/lib/i386/libj9gc24.so"
+
+QA_EXECSTACK_x86="opt/${P}/bin/classic/libjvm.so
+opt/${P}/lib/i386/j9vm/libjvm.so
+opt/${P}/lib/i386/libj9jvmti24.so
+opt/${P}/lib/i386/libj9hookable24.so
+opt/${P}/lib/i386/libj9vm24.so
+opt/${P}/lib/i386/libjclscar_24.so
+opt/${P}/lib/i386/libj9thr24.so
+opt/${P}/lib/i386/libj9dmp24.so
+opt/${P}/lib/i386/libj9prt24.so
+opt/${P}/lib/i386/libj9jit24.so
+opt/${P}/lib/i386/libiverel24.so
+opt/${P}/lib/i386/libj9trc24.so
+opt/${P}/lib/i386/libj9dbg24.so
+opt/${P}/lib/i386/libj9shr24.so
+opt/${P}/lib/i386/libj9gc24.so
+opt/${P}/lib/i386/libj9bcv24.so
+opt/${P}/lib/i386/classic/libjvm.so"
+
+QA_EXECSTACK_amd64="opt/${P}/lib/amd64/default/libjvm.so
+opt/${P}/lib/amd64/default/libj9jvmti24.so
+opt/${P}/lib/amd64/default/libj9hookable24.so
+opt/${P}/lib/amd64/default/libj9vm24.so
+opt/${P}/lib/amd64/default/libjclscar_24.so
+opt/${P}/lib/amd64/default/libj9jpi24.so
+opt/${P}/lib/amd64/default/libj9thr24.so
+opt/${P}/lib/amd64/default/libj9dmp24.so
+opt/${P}/lib/amd64/default/libj9prt24.so
+opt/${P}/lib/amd64/default/libj9jit24.so
+opt/${P}/lib/amd64/default/libiverel24.so
+opt/${P}/lib/amd64/default/libj9trc24.so
+opt/${P}/lib/amd64/default/libj9dbg24.so
+opt/${P}/lib/amd64/default/libj9shr24.so
+opt/${P}/lib/amd64/default/libj9gc24.so
+opt/${P}/lib/amd64/default/libj9bcv24.so
+opt/${P}/lib/amd64/compressedrefs/libjvm.so
+opt/${P}/lib/amd64/compressedrefs/libj9jvmti24.so
+opt/${P}/lib/amd64/compressedrefs/libj9hookable24.so
+opt/${P}/lib/amd64/compressedrefs/libj9vm24.so
+opt/${P}/lib/amd64/compressedrefs/libjclscar_24.so
+opt/${P}/lib/amd64/compressedrefs/libj9jpi24.so
+opt/${P}/lib/amd64/compressedrefs/libj9thr24.so
+opt/${P}/lib/amd64/compressedrefs/libj9dmp24.so
+opt/${P}/lib/amd64/compressedrefs/libj9prt24.so
+opt/${P}/lib/amd64/compressedrefs/libj9jit24.so
+opt/${P}/lib/amd64/compressedrefs/libiverel24.so
+opt/${P}/lib/amd64/compressedrefs/libj9trc24.so
+opt/${P}/lib/amd64/compressedrefs/libj9dbg24.so
+opt/${P}/lib/amd64/compressedrefs/libj9shr24.so
+opt/${P}/lib/amd64/compressedrefs/libj9gc24.so
+opt/${P}/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 "${JRE_DIST}"
+
+	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 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_compile() { :; }
+
+src_install() {
+	# Copy all the files to the designated directory
+	dodir /opt/${P}
+	cp -pR "${S}"/jre/* "${D}/opt/${P}/"
+
+	if use x86 || use ppc; then
+		if use nsplugin; then
+			local plugin="/opt/${P}/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
+			install_mozilla_plugin "${plugin}"
+		fi
+	fi
+
+	local desktop_in="${D}/opt/${P}/plugin/desktop/sun_java.desktop"
+	if [[ -f "${desktop_in}" ]]; then
+		local desktop_out="${T}/ibm_jre-${SLOT}.desktop"
+		# install control panel for Gnome/KDE
+		# The jdk 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 JRE ${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
+}