Bump to EAPI 4.

Prefixify.
Add sandbox controle file. Bug #388937
Set pax markings. Bug #389751
Dont call 'use' in global scope.

(Portage version: 2.1.10.35/cvs/Linux x86_64)

5 files changed, 568 insertions, 13 deletions

diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog
index 8f20df2b0f1f..696b53672839 100644
--- a/dev-java/ibm-jdk-bin/ChangeLog
+++ b/dev-java/ibm-jdk-bin/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.245 2011/08/27 09:26:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.246 2011/11/23 18:51:46 sera Exp $
+
+*ibm-jdk-bin-1.6.0.9_p2-r1 (23 Nov 2011)
+*ibm-jdk-bin-1.5.0.12_p5-r1 (23 Nov 2011)
+
+  23 Nov 2011; Ralph Sennhauser <sera@gentoo.org>
+  +ibm-jdk-bin-1.5.0.12_p5-r1.ebuild, files/ibm-jdk-bin-1.5.env,
+  +ibm-jdk-bin-1.6.0.9_p2-r1.ebuild, files/ibm-jdk-bin-1.6.env:
+  Bump to EAPI 4.
+  Prefixify.
+  Add sandbox controle file. Bug #388937
+  Set pax markings. Bug #389751
+  Dont call 'use' in global scope.
 
   27 Aug 2011; Markos Chandras <hwoarang@gentoo.org>
   ibm-jdk-bin-1.5.0.12_p5.ebuild, ibm-jdk-bin-1.6.0.9_p2.ebuild:
diff --git a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.5.env b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.5.env
index ceea34cd08b6..288753e74eff 100644
--- a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.5.env
+++ b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.5.env
@@ -1,14 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 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.5.env,v 1.2 2007/12/12 15:10:08 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.5.env,v 1.3 2011/11/23 18:51:46 sera Exp $
 
 VERSION="IBM JDK @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/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"
+LDPATH="${JAVA_HOME}/jre/bin/:${JAVA_HOME}/jre/bin/classic"
 PROVIDES_TYPE="JDK JRE"
 PROVIDES_VERSION="1.5"
 BOOTCLASSPATH="${JAVA_HOME}/jre/lib/vm.jar:${JAVA_HOME}/jre/lib/core.jar:${JAVA_HOME}/jre/lib/charsets.jar:${JAVA_HOME}/jre/lib/graphics.jar:${JAVA_HOME}/jre/lib/security.jar:${JAVA_HOME}/jre/lib/ibmpkcs.jar:${JAVA_HOME}/jre/lib/ibmorb.jar:${JAVA_HOME}/jre/lib/ibmcfw.jar:${JAVA_HOME}/jre/lib/ibmorbapi.jar:${JAVA_HOME}/jre/lib/ibmjcefw.jar:${JAVA_HOME}/jre/lib/ibmjgssprovider.jar:${JAVA_HOME}/jre/lib/ibmjsseprovider2.jar:${JAVA_HOME}/jre/lib/ibmjaaslm.jar:${JAVA_HOME}/jre/lib/ibmcertpathprovider.jar:${JAVA_HOME}/jre/lib/server.jar:${JAVA_HOME}/jre/lib/xml.jar"
diff --git a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.6.env b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.6.env
index 23e543d7aa8c..60c2e5a38dc3 100644
--- a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.6.env
+++ b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.6.env
@@ -1,14 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 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.6.env,v 1.2 2007/12/16 12:36:16 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.6.env,v 1.3 2011/11/23 18:51:46 sera Exp $
 
 VERSION="IBM JDK @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/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/lib/@PLATFORM@:/usr/lib"
+LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@:@GENTOO_PORTAGE_EPREFIX@/usr/lib"
 PROVIDES_TYPE="JDK JRE"
 PROVIDES_VERSION="1.6"
 BOOTCLASSPATH="${JAVA_HOME}/jre/lib/vm.jar:${JAVA_HOME}/jre/lib/facilitators.jar:${JAVA_HOME}/jre/lib/annotation.jar:${JAVA_HOME}/jre/lib/beans.jar:${JAVA_HOME}/jre/lib/java.util.jar:${JAVA_HOME}/jre/lib/jndi.jar:${JAVA_HOME}/jre/lib/logging.jar:${JAVA_HOME}/jre/lib/security.jar:${JAVA_HOME}/jre/lib/sql.jar:${JAVA_HOME}/jre/lib/ibmorb.jar:${JAVA_HOME}/jre/lib/ibmorbapi.jar:${JAVA_HOME}/jre/lib/ibmcfw.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/charsets.jar:${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/ibmpkcs.jar:${JAVA_HOME}/jre/lib/ibmcertpathfw.jar:${JAVA_HOME}/jre/lib/ibmjgssfw.jar:${JAVA_HOME}/jre/lib/ibmjssefw.jar:${JAVA_HOME}/jre/lib/ibmsaslfw.jar:${JAVA_HOME}/jre/lib/ibmjcefw.jar:${JAVA_HOME}/jre/lib/ibmjgssprovider.jar:${JAVA_HOME}/jre/lib/ibmjsseprovider2.jar:${JAVA_HOME}/jre/lib/ibmcertpathprovider.jar:${JAVA_HOME}/jre/lib/ibmxmlcrypto.jar:${JAVA_HOME}/jre/lib/management-agent.jar:${JAVA_HOME}/jre/lib/xml.jar:${JAVA_HOME}/jre/lib/jlm.jar:${JAVA_HOME}/jre/lib/javascript.jar:${JAVA_HOME}/jre/lib/RACF.jar"
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.12_p5-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.12_p5-r1.ebuild
new file mode 100644
index 000000000000..6c0be4c840c9
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.12_p5-r1.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2011 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.12_p5-r1.ebuild,v 1.1 2011/11/23 18:51:46 sera Exp $
+
+EAPI="4"
+
+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}"
+
+# versions ending with _pX translate to .X in distfile and fpX in SRC_URI
+if [[ $(get_version_component_count) == 5 ]]; then
+	FP_VERSION="$(get_version_component_range 5)"
+	FP_VERSION="${FP_VERSION#p}"
+	FP_WEB="-FP${FP_VERSION}"
+	FP_LINK="fp${FP_VERSION}"
+	TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.${FP_VERSION}"
+else
+	FP_WEB=""
+	FP_LINK=""
+	TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+fi
+
+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"
+
+DESCRIPTION="IBM Java SE Development Kit"
+HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
+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"
+SLOT="1.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 )"
+
+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/libj9ute23.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() {
+	if use x86; then
+		JDK_DIST=${X86_JDK_DIST}
+		JAVACOMM_DIST=${X86_JAVACOMM_DIST}
+		LINK_ARCH="intel"
+	elif use amd64; then
+		JDK_DIST=${AMD64_JDK_DIST}
+		JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
+		LINK_ARCH="amd64"
+	elif use ppc; then
+		JDK_DIST=${PPC_JDK_DIST}
+		JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
+		LINK_ARCH="ipseries32"
+	elif use ppc64; then
+		JDK_DIST=${PPC64_JDK_DIST}
+		JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
+		LINK_ARCH="ipseries64"
+	fi
+
+	DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=sdk5"
+	DIRECT_DOWNLOAD+="&S_PKG=${LINK_ARCH}5sr${SERVICE_RELEASE_LINK}${FP_LINK}&S_TACT=105AGX05&S_CMP=JDK"
+	DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
+	# bug #125178
+	ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
+
+	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}${FP_WEB} 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}${FP_WEB} 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() {
+	default
+
+	local sdir=( ibm-java2-* )
+	S="${WORKDIR}/${sdir[0]}"
+}
+
+src_prepare() {
+	# bug #126105
+	epatch "${FILESDIR}/${PN}-jawt.h.patch"
+}
+
+src_compile() { :; }
+
+src_install() {
+	# Copy all the files to the designated directory
+	dodir /opt/${P}
+	cp -pPR bin jre lib include src.jar "${ED}"/opt/${P} || die
+
+	if use examples; then
+		dodir /opt/${P}/share
+		cp -pPR demo "${ED}"/opt/${P}/share
+	fi
+
+	if use x86 || use ppc; then
+		local plugin=/opt/${P}/jre/bin/
+		use x86 && plugin+=libjavaplugin_ojigtk2.so
+		use ppc && plugin+=libjavaplugin_oji.so
+
+		if use nsplugin; then
+			install_mozilla_plugin ${plugin}
+		else
+			rm "${ED}${plugin}" || die
+		fi
+	fi
+
+	dohtml -a html,htm,HTML -r docs
+	dodoc COPYRIGHT
+
+	set_java_env
+	java-vm_set-pax-markings "${ED}"/opt/${P}
+	java-vm_revdep-mask
+	java-vm_sandbox-predict	/proc/cpuinfo /proc/self/coredump_filter /proc/self/maps
+}
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild
new file mode 100644
index 000000000000..e3cbe36c8757
--- /dev/null
+++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2-r1.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2011 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.9_p2-r1.ebuild,v 1.1 2011/11/23 18:51:46 sera Exp $
+
+EAPI="4"
+
+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}"
+
+# versions ending with _pX translate to .X in distfile and fpX in SRC_URI
+if [[ $(get_version_component_count) == 5 ]]; then
+	FP_VERSION="$(get_version_component_range 5)"
+	FP_VERSION="${FP_VERSION#p}"
+	FP_WEB="-FP${FP_VERSION}"
+	FP_LINK="fp${FP_VERSION}"
+	TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.${FP_VERSION}"
+else
+	FP_WEB=""
+	FP_LINK=""
+	TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+fi
+
+#JAVACOMM_PV="3.${JAVACOMM_RELEASE}-${SERVICE_RELEASE}.0"
+# looks like they don't bump javacomm in service releases anymore
+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"
+
+DESCRIPTION="IBM Java SE Development Kit"
+HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
+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"
+SLOT="1.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 )"
+
+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/default/libj9ute24.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
+opt/${P}/jre/lib/amd64/compressedrefs/libj9ute24.so"
+
+_init_at_vars() {
+	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
+}
+
+pkg_nofetch() {
+	_init_at_vars
+
+	DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6"
+	DIRECT_DOWNLOAD+="&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}${FP_LINK}&S_TACT=105AGX05&S_CMP=JDK"
+	DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
+	# bug #125178
+	ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
+
+	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}${FP_WEB} 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}${FP_WEB} 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() {
+	_init_at_vars
+
+	unpack ${JDK_DIST}
+	if use javacomm; then
+		mkdir "${WORKDIR}/javacomm/" || die
+		cd "${WORKDIR}/javacomm/"
+		unpack ${JAVACOMM_DIST}
+	fi
+}
+
+src_prepare() {
+	# bug #126105
+	epatch "${FILESDIR}/${PN}-jawt.h.patch"
+}
+
+src_compile() { :; }
+
+src_install() {
+	# Copy all the files to the designated directory
+	dodir /opt/${P}
+	cp -pPR bin jre lib include src.zip "${ED}/opt/${P}" || die
+
+	if use examples; then
+		cp -pPR demo "${ED}"/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 "${ED}"/opt/${P}/jre/lib/ext/ || die
+		cp -pR "${WORKDIR}"/javacomm/*/lib/*.properties "${ED}"/opt/${P}/jre/lib/ || die
+		cp -pR "${WORKDIR}"/javacomm/*/lib/*.so "${ED}"/opt/${P}/jre/lib/$(get_system_arch)/ || die
+		if use examples; then
+			cp -pPR "${WORKDIR}"/javacomm/*/examples "${ED}"/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}"
+		else
+			rm "${ED}${plugin}" || die
+		fi
+	fi
+
+	# Install desktop file for the Java Control Panel. Using VMHANDLE as file
+	# name to prevent file collision with jre and or other slots.
+	sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JDK ${SLOT}/" \
+		-e "s#Exec=.*#Exec=${EPREFIX}/opt/${P}/jre/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=${EPREFIX}/opt/${P}/jre/plugin/desktop/sun_java.png#" \
+		"${ED}"/opt/${P}/jre/plugin/desktop/sun_java.desktop \
+		> "${T}"/${VMHANDLE}.desktop || die
+	domenu "${T}"/${VMHANDLE}.desktop || die
+
+	dohtml -a html,htm,HTML -r docs
+	dodoc copyright notices.txt readmefirst.lnx.txt
+
+	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" "${ED}${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" "${ED}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
+	fi
+
+	java-vm_set-pax-markings "${ED}"/opt/${P}
+	java-vm_revdep-mask
+	java-vm_sandbox-predict	/proc/cpuinfo /proc/self/coredump_filter /proc/self/maps
+}