Version bump, security bug #186277.

(Portage version: 2.1.3.5)

5 files changed, 317 insertions, 230 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index dceebc2286a9..d01e43a3c4e5 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.128 2007/08/13 09:11:54 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.129 2007/08/21 09:44:51 caster Exp $
+
+*ibm-jdk-bin-1.5.0.5a (21 Aug 2007)
+
+  21 Aug 2007; Vlastimil Babka <caster@gentoo.org>
+  -ibm-jdk-bin-1.4.2.8.ebuild, +ibm-jdk-bin-1.5.0.5a.ebuild:
+  Version bump, security bug #186277.
 
   13 Aug 2007; Vlastimil Babka <caster@gentoo.org>
   files/digest-ibm-jdk-bin-1.4.2.9, Manifest:
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.8 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.8
deleted file mode 100644
index fe288218246c..000000000000
--- a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.8
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 fc3a959a8c09b4c606593dfa6a633933 IBMJava2-JAVACOMM-1.4.2-8.0.ppc.tgz 124661
-RMD160 9bf42ed20ec6a55f936a16b9f9bebe6c28c04b18 IBMJava2-JAVACOMM-1.4.2-8.0.ppc.tgz 124661
-SHA256 a51d630a24343216a1df5a77fdb2cf0e1055b342b6f370ad9526f23c835e3456 IBMJava2-JAVACOMM-1.4.2-8.0.ppc.tgz 124661
-MD5 6f8825f699fc7d2e5c143ecdac4ecb5e IBMJava2-JAVACOMM-1.4.2-8.0.ppc64.tgz 127731
-RMD160 9d24e8acd2e5adda1a4b931d5295f71835943e80 IBMJava2-JAVACOMM-1.4.2-8.0.ppc64.tgz 127731
-SHA256 467ea13cf606eafcd8362e7996bee60c38eef20c0280beddf2f2881efdf37a94 IBMJava2-JAVACOMM-1.4.2-8.0.ppc64.tgz 127731
-MD5 0b2444077ef5afbc45cbccac80612737 IBMJava2-JAVACOMM-1.4.2-8.0.tgz 118351
-RMD160 04d030551eb0e4abf349ff6185c862ed6ee097b9 IBMJava2-JAVACOMM-1.4.2-8.0.tgz 118351
-SHA256 b1cab8c17752a7700e32511a6135aab291a6cf15eca123d3352d2609fc104090 IBMJava2-JAVACOMM-1.4.2-8.0.tgz 118351
-MD5 ab249cc262bc15e0d911f7898c66de8d IBMJava2-JAVACOMM-AMD64-1.4.2-8.0.x86_64.tgz 120223
-RMD160 cb5c905befefe8c465ffd25418cb1b2f7077ec02 IBMJava2-JAVACOMM-AMD64-1.4.2-8.0.x86_64.tgz 120223
-SHA256 4b1b7c5ef7cb1c63edbb3d4eeb6c0d294989713de2b7e6b51946f4d055b9e8f1 IBMJava2-JAVACOMM-AMD64-1.4.2-8.0.x86_64.tgz 120223
-MD5 6545eafe92e7001a79edc033c90b634c IBMJava2-SDK-1.4.2-8.0.ppc.tgz 66354541
-RMD160 e2bf580276a6b238b38d3bd279ba571fc38bd98c IBMJava2-SDK-1.4.2-8.0.ppc.tgz 66354541
-SHA256 4370724188f2e2ac549765d8d2e4bf0ef9e3a50d66657e0e7935dc9b4ecd1a97 IBMJava2-SDK-1.4.2-8.0.ppc.tgz 66354541
-MD5 4b054cb416db3784b84ef047ec89e89b IBMJava2-SDK-1.4.2-8.0.ppc64.tgz 64601721
-RMD160 d2a984e38cb6af844de7d9c5dbbbd09a38965636 IBMJava2-SDK-1.4.2-8.0.ppc64.tgz 64601721
-SHA256 aae5abd91f3bf1ed387e6affdd98323949d37e2709272b9139d9ff96627afa26 IBMJava2-SDK-1.4.2-8.0.ppc64.tgz 64601721
-MD5 d44d65a91667e4ad2cfe7d5b071817d0 IBMJava2-SDK-1.4.2-8.0.tgz 58613812
-RMD160 d20623a495b1a57f2457f0db3966210685b339fb IBMJava2-SDK-1.4.2-8.0.tgz 58613812
-SHA256 da63b0bd41baef600572ecd0514bfcc767757ba94839933909168bda2f62a8c3 IBMJava2-SDK-1.4.2-8.0.tgz 58613812
-MD5 389dc3881a2a3a3741785de66327457e IBMJava2-SDK-AMD64-1.4.2-8.0.x86_64.tgz 52926719
-RMD160 70028cc3089819ee9f7c532f48aebf1fd07c4756 IBMJava2-SDK-AMD64-1.4.2-8.0.x86_64.tgz 52926719
-SHA256 ce51e0634234674346b259bb8f47895769f8562575c9299507817fad045b5759 IBMJava2-SDK-AMD64-1.4.2-8.0.x86_64.tgz 52926719
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.5a b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.5a
new file mode 100644
index 000000000000..777833b9ada0
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.5a
@@ -0,0 +1,24 @@
+MD5 15b4a238f784c9eb99c58c413522feff ibm-java2-javacomm-5.0-5.1-linux-i386.tgz 119402
+RMD160 2d1133ed0a7b502663102a7254546976511340c7 ibm-java2-javacomm-5.0-5.1-linux-i386.tgz 119402
+SHA256 1aca5217fc8ddc845cf4935a29cb1dd3d0792cb5f85800a2818ff885fe37c893 ibm-java2-javacomm-5.0-5.1-linux-i386.tgz 119402
+MD5 560b8b3e1a03919c8654e346f6b33127 ibm-java2-javacomm-5.0-5.1-linux-ppc.tgz 125889
+RMD160 e5103e3e12b874f1fa3c3737b3408ccb2c5a0c7d ibm-java2-javacomm-5.0-5.1-linux-ppc.tgz 125889
+SHA256 eb7c89488d1a611e920bd8f21d5af8da0f0ab8055ea066c36c9436fe411658ac ibm-java2-javacomm-5.0-5.1-linux-ppc.tgz 125889
+MD5 49fd90aadae412d3afb166c9142ba5a3 ibm-java2-javacomm-5.0-5.1-linux-ppc64.tgz 128965
+RMD160 bae98119671fae827e9acc0756036d6802a5b480 ibm-java2-javacomm-5.0-5.1-linux-ppc64.tgz 128965
+SHA256 1529eceb94a704c52b4bebc0cde8f9d8caa2f6b5e79b7528bc6a01fc34cba73b ibm-java2-javacomm-5.0-5.1-linux-ppc64.tgz 128965
+MD5 e43d9192f0177702ed8bb60310520715 ibm-java2-javacomm-5.0-5.1-linux-x86_64.tgz 121952
+RMD160 9f7c3a25cf69fb577796eb40a8f8e72dc7c4b9b3 ibm-java2-javacomm-5.0-5.1-linux-x86_64.tgz 121952
+SHA256 c3a5ce4af0dcd65dbcaf4f36a07e90a6eadb79ce9e87da431f750579a1f1b7de ibm-java2-javacomm-5.0-5.1-linux-x86_64.tgz 121952
+MD5 96df02b951666022e25b366b00ba74ee ibm-java2-sdk-5.0-5.1-linux-i386.tgz 63088803
+RMD160 08f629f1dd5a198b79c8a40b0a12e366c2bd75dc ibm-java2-sdk-5.0-5.1-linux-i386.tgz 63088803
+SHA256 2f79a1fd8ae9328efc57cde3bd1b01b9bd9a9b8c46f8be57401c154dcb0d857f ibm-java2-sdk-5.0-5.1-linux-i386.tgz 63088803
+MD5 cc7abd5f5e6250ba388002cac5c1be91 ibm-java2-sdk-5.0-5.1-linux-ppc.tgz 70937401
+RMD160 688e72cf1ca9f9b2d72fa9856dc0906d2dd7c6b4 ibm-java2-sdk-5.0-5.1-linux-ppc.tgz 70937401
+SHA256 dfc62ac62d865cfcde6a455b9a8083a1adbbfc4652382d0716e2c4328c86d4bc ibm-java2-sdk-5.0-5.1-linux-ppc.tgz 70937401
+MD5 00dea82d1d115fffc1fedcc2e16479fd ibm-java2-sdk-5.0-5.1-linux-ppc64.tgz 69290510
+RMD160 ac28f693d146e6c2b4d8fc1c15ab85132d6fc4a2 ibm-java2-sdk-5.0-5.1-linux-ppc64.tgz 69290510
+SHA256 859252d068f703e2cba7b9d9b6dcbb496ac6224275fbe989c56b17ab5b5ec2f8 ibm-java2-sdk-5.0-5.1-linux-ppc64.tgz 69290510
+MD5 4a4ddec52f55472a88ca5abbe83249b8 ibm-java2-sdk-5.0-5.1-linux-x86_64.tgz 64871716
+RMD160 9681e115b7e1f725f0bd69127038f54af0146c05 ibm-java2-sdk-5.0-5.1-linux-x86_64.tgz 64871716
+SHA256 6b047947915c431a6e73b62160b490b302f9b36d221e7af8f4e181425f733f7a ibm-java2-sdk-5.0-5.1-linux-x86_64.tgz 64871716
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.8.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.8.ebuild
deleted file mode 100644
index a28cb4b901b5..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.8.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2007 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.8.ebuild,v 1.7 2007/07/22 20:48:15 philantrop 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 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/libXt
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXp
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXmu
-		)
-		x86? ( nsplugin? ( =x11-libs/gtk+-1* =dev-libs/glib-1* ) )
-		doc? ( =dev-java/java-sdk-docs-1.4.2* )"
-
-RESTRICT="fetch"
-
-QA_TEXTRELS_amd64="opt/${P}/jre/bin/libj9jit22.so
-	opt/${P}/jre/bin/libjclscar_22.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} ${D}opt/${P}/
-
-	dodir /opt/${P}/share
-	if use examples; then
-		cp -pPR ${S}/demo ${D}opt/${P}/share/
-	fi
-
-	cp -pPR ${S}/src.jar "${D}/opt/${P}/"
-	dosym "../src.jar" /opt/${P}/share
-
-	# setting the ppc stuff
-	if use ppc; then
-		dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc.so
-		dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc_g.so
-		insinto /etc
-		doins ${FILESDIR}/cpuinfo
-	fi
-
-	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}
-	elif use x86; then
-		rm ${D}/opt/${P}/jre/bin/libjavaplugin*.so
-	fi
-
-	if ! use alsa; then
-		rm ${D}/opt/${P}/jre/bin/libjsoundalsa.so \
-			|| eerror "${D}/opt/${P}/jre/bin/libjsoundalsa.so not found"
-	fi
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc ${S}/docs/COPYRIGHT
-
-	set_java_env
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if ! use X; then
-		ewarn
-		ewarn "You have not enabled the X useflag.  It is possible that"
-		ewarn "you do not have an X server installed.  Please note that"
-		ewarn "some parts of the IBM JDK require an X server to properly"
-		ewarn "function.  Be careful which Java libraries you attempt to"
-		ewarn "use with your installation."
-		ewarn
-	fi
-	elog ""
-	elog "Starting with 1.4.2.8 demos are installed only with USE=examples"
-	elog ""
-	elog "Starting with 1.4.2.8 the src.jar is installed to the standard"
-	elog "location. It is still symlinked to the old location (/opt/${P}/share)"
-	elog "but it will be removed if there will ever be a version bump."
-	elog "See https://bugs.gentoo.org/show_bug.cgi?id=2241"
-	elog "for more details."
-}
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.5a.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.5a.ebuild
new file mode 100644
index 000000000000..26311ad9afed
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.5a.ebuild
@@ -0,0 +1,286 @@
+	# Copyright 1999-2007 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.5a.ebuild,v 1.1 2007/08/21 09:44:51 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}a"
+RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.1"
+
+JDK_DIST_PREFIX="ibm-java2-sdk-${RPM_PV}-linux"
+JAVACOMM_DIST_PREFIX="ibm-java2-javacomm-${RPM_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"
+
+RDEPEND="
+		=virtual/libstdc++-3.3
+		X? ( x11-libs/libXt
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXp
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXmu
+			x11-libs/libXft
+			)
+		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* )
+		)"
+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} ${D}/opt/${P}/
+
+	dodir /opt/${P}/share
+	if use examples; then
+		cp -pPR ${S}/demo ${D}/opt/${P}/share/
+	fi
+
+	cp -pPR ${S}/src.jar "${D}/opt/${P}/"
+
+	# setting the ppc stuff
+	#if use ppc; then
+	#	dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc.so
+	#	dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc_g.so
+	#	insinto /etc
+	#	doins ${FILESDIR}/cpuinfo
+	#fi
+
+	local x86plugin=libjavaplugin_ojigtk2.so
+	local ppcplugin=libjavaplugin_oji.so
+	local jrebindest="${D}/opt/${P}/jre/bin/"
+
+	local plugin
+	if use x86; then
+		plugin=${x86plugin}
+	elif use ppc; then
+		plugin=${ppcplugin}
+	#	rm "${jrebindest}/${x86plugin}" "${jrebindest}/libjavaplugin_nscpgtk2.so" || \
+	#		eerror "Failed to delete gtk2 javaplugin."
+	fi
+
+	plugin=/opt/${P}/jre/bin/${plugin}
+
+	if use x86 || use ppc; then
+		if use nsplugin; then
+			install_mozilla_plugin ${plugin}
+		else
+			rm "${jrebindest}/*javaplugin*.so" || \
+				eerror "Failed to delete javaplugin shared libraries"
+		fi
+	fi
+
+	use !alsa && rm "${jrebindest}/libjsoundalsa.so"
+
+	dohtml -a html,htm,HTML -r docs
+	dodoc ${S}/COPYRIGHT
+
+	set_java_env
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+	if ! use X; then
+		echo
+		ewarn "You're not using X so its possible that you dont have"
+		ewarn "a X server installed, please read the following warning: "
+		ewarn "Some parts of IBM JDK require XFree86 to be installed."
+		ewarn "Be careful which Java libraries you attempt to use."
+	fi
+
+	elog ""
+	elog "Starting with 1.5.0.4-r1 demos are installed only with USE=examples"
+	elog ""
+	elog "Starting with 1.5.0.5 the src.jar is installed to the standard"
+	elog "location only (/opt/${P}/) and not /opt/${P}/share/"
+	elog "as we used to. See https://bugs.gentoo.org/show_bug.cgi?id=2241"
+	elog "for more details."
+}