Bump to EAPI 4.

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

Package-Manager: portage-2.1.10.35/cvs/Linux x86_64

6 files changed, 452 insertions, 34 deletions

diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index ba49b12129d8..7e5fb0b199ff 100644
--- a/dev-java/ibm-jre-bin/ChangeLog
+++ b/dev-java/ibm-jre-bin/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-java/ibm-jre-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.170 2011/08/27 09:24:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.171 2011/11/23 19:00:00 sera Exp $
+
+*ibm-jre-bin-1.6.0.9_p2-r1 (23 Nov 2011)
+*ibm-jre-bin-1.5.0.12_p5-r1 (23 Nov 2011)
+
+  23 Nov 2011; Ralph Sennhauser <sera@gentoo.org>
+  +ibm-jre-bin-1.5.0.12_p5-r1.ebuild, files/ibm-jre-bin-1.5.env,
+  +ibm-jre-bin-1.6.0.9_p2-r1.ebuild, files/ibm-jre-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-jre-bin-1.5.0.12_p5.ebuild, ibm-jre-bin-1.6.0.9_p2.ebuild:
diff --git a/dev-java/ibm-jre-bin/Manifest b/dev-java/ibm-jre-bin/Manifest
index cb0ff8e55792..06c7091aa398 100644
--- a/dev-java/ibm-jre-bin/Manifest
+++ b/dev-java/ibm-jre-bin/Manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-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
+AUX ibm-jre-bin-1.5.env 1053 RMD160 d671fdbc76fb822f5a9bbe710feb9404aa98c5e0 SHA1 bdb379ff31546e5b03925976ef7138bb67babc5c SHA256 0322fdd73c3ff8c11255c952a3fb2bf8fdbdec47a82f84872752ce32da59fe60
+AUX ibm-jre-bin-1.6.env 1847 RMD160 056f4e1abbfa35b9c173abc37200b0c5c2432cf6 SHA1 a8608c66b1478ab995853f09d34171fe7767e4de SHA256 ab5062dd23ae245022320b2bd374b47bcc459b81e07304c9e86fe05796dacace
 DIST ibm-java-jre-6.0-9.1-linux-i386.tgz 64347993 RMD160 1854cc74a25c0b82ba857b9e2d566fdf0d497967 SHA1 db0a809c67d1b4d3c017feffdeae7419e365ed51 SHA256 6e2db98b14b192d82ce40e0930b3369c736f843d2bcda3a6f542ef6faf4c3da3
 DIST ibm-java-jre-6.0-9.1-linux-ppc.tgz 66562449 RMD160 fb784c1fe676241b7b73e7838400324838aa61b4 SHA1 c89798ff1f750e412dd817bfcddc11a9fb8729e8 SHA256 83b96b1689f0f473fa8aa55bcd98f44ba77470d05fcfcb81a097e74af435290d
 DIST ibm-java-jre-6.0-9.1-linux-ppc64.tgz 74578727 RMD160 ab5be9ddd8dabce39f864fcc52e104a4cdd19659 SHA1 8cea91f67570cc4ee72d925a2654e099e8396953 SHA256 12e46290968e595389ddaa3053e20a718674b699b796012e997c4737e484c579
@@ -20,25 +17,10 @@ DIST ibm-java2-jre-5.0-12.5-linux-ppc.tgz 52569222 RMD160 6cfa6a8160d9d3141a75e0
 DIST ibm-java2-jre-5.0-12.5-linux-ppc64.tgz 52287701 RMD160 1a7b63473120f46307a4f9ce2a3a9f8983788f30 SHA1 6ef6649322a9f9b494b0dd04ecb8c0b462f019ab SHA256 dd6439ef27777796ea29c92b89e3d8afb29a07a6827d8beb7d7da609a7c26ec9
 DIST ibm-java2-jre-5.0-12.5-linux-x86_64.tgz 48285616 RMD160 2dcdb907683bd520b953b3c90981155349b44d33 SHA1 cc48e8b3e5ce2fd5abd75e9eb5906be88eaa09b4 SHA256 fd5b5a3a3ae3f53258e0f7c4c8cf1a40d135bbb6bec50193c5b49e5a50bd3025
 EBUILD ibm-jre-bin-1.5.0.12_p4.ebuild 6388 RMD160 b005e3547e818d9f9023387c5d92d152c946b3fd SHA1 283cc6044f56f55cf2c2ae34bb0a5a939325a039 SHA256 e4399b24a37c013e7519ded969c89b4be7743c164f535be1ede471a97dc40efb
+EBUILD ibm-jre-bin-1.5.0.12_p5-r1.ebuild 6284 RMD160 c204f44b0fc5ce56c82bf3fb89cb25cc0bcf72a5 SHA1 5ccd73cba5aad9da7e96548d10ecda6627dffdb7 SHA256 fcf313bb0017de76be859ed9f8428d87835fa048c6ba5afb19f2d8bf0329ab97
 EBUILD ibm-jre-bin-1.5.0.12_p5.ebuild 6390 RMD160 9595635229abd5d92f29100942a7ebbef31ffe2b SHA1 4074dfa5ce6b025142bedb623d9c3370c4104f43 SHA256 caeef48270e17be70fb7b834478939b42d9e6efdb6df2a13be65fb5e28900719
 EBUILD ibm-jre-bin-1.6.0.9_p1.ebuild 6433 RMD160 c3eb8f646c81f1988f0dc73bb85c6ebddac82ecf SHA1 37dd4da3137af1a01eac3dd91f9146c15c3a8f2c SHA256 928a826443ea1bddb0b08c3263775697b43c8f89ffe4711b5a4065af7bf21f81
+EBUILD ibm-jre-bin-1.6.0.9_p2-r1.ebuild 6386 RMD160 8614323de316f0e730cce79bcfc76d5868198849 SHA1 0edba87e686cca0e633186451a786208b2e25d77 SHA256 4f33860b087fc86cfdb1415fffd69a62fe3363f96aa8cd2f603d469b8e9dbef4
 EBUILD ibm-jre-bin-1.6.0.9_p2.ebuild 6435 RMD160 5bbba046e77c1bcde41558baccdbebee7587ea29 SHA1 104d9b03a5d1c569f67c14ac7a2a266b8a959e38 SHA256 a4206c538af47afa709f13dc0ec489083f6bad1ae27a0e5dde80b4e513dd331c
-MISC ChangeLog 25940 RMD160 9275b166605d41620ecd20daba0ee6e06b4c7978 SHA1 56e6d093bdd97ce0eae2defc91580ccc9839e07a SHA256 c9071fc329aa009d57b40a2770ae8fd707013a341b850563f509c6359e2b54f4
+MISC ChangeLog 26339 RMD160 4ac13d491c809e5142848fdf51ddff47b5b90b97 SHA1 461b3a5c0a5c89853830c678c67f804e4ddb0f81 SHA256 204d9524bc31b5b1152f50f71fc6aa22d03488bfff8aa3ac95170e06e1c9ea55
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOWLerAAoJEPqDWhW0r/LC9xEQAMD4/vxt5VUftX1mIGMjQfTV
-UafpbNa0tKepB3ANNssV9IEZZ8jirybOt06DYPJkcE5eMOFq0hAFsbw+Z/yHk72l
-yWZww9eP7vH+2OaE6xqezw3dy1YBG8h2G6mASRwcEx0IV7RNK+mXLQjEFy0fnSEi
-JFJaRoB3iQIaawZRmD3wXzbNuVmUe7PGK6i3QD2dPhmPW7hNnA8dfYUv2aHNNe/Q
-soYi6TOsKsqaHhZp3KLXmCDLdLgTohZX56AuHiuow/+SHXIEkd/Tr20+R47/cnYY
-0EagsVDyNKxnbzIKxB/I+jDt7bzpnI+gt/H3JSFoGKJufam96tE5Pn9XN7BYJ35X
-UbOq9x+tCMZQzyaDGQGkgZeg7tRVnGfX95EG/OlQsNXrZ3my2zjPT+I0c9ZqUEs+
-tzeBafz+XJokfJUf2s39Nhw974/oZ4jjNjmU365Q3yy48He77zzt25PJpr3vfDDC
-TMcYmEndKIoFnoNWBAdJSFUpgx4C5/3l4WymEz0VnmI8YWgkoY7UV/ocK5s+jaa2
-2LShzOL/wSzUs5wauQ1EAJOOxAOsbnJlPjhhf79WxDm0c6gaPR/NhYUhq0mqM79V
-8T9OtUSt2JdoU+u+nBJWnjvy+xt08yXtc2CEHiwJ/jSJ2ZUSY7PjlyWBXJTWTEU3
-hFSe7GMEVyfu2OwD9RYd
-=4tfc
------END PGP SIGNATURE-----
diff --git a/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.5.env b/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.5.env
index 02a71e74d888..9225498df794 100644
--- a/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.5.env
+++ b/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.5.env
@@ -1,13 +1,13 @@
-# 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-jre-bin/files/ibm-jre-bin-1.5.env,v 1.3 2007/12/16 13:47:25 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.5.env,v 1.4 2011/11/23 19:00:00 sera Exp $
 
 VERSION="IBM JRE @PV@"
-JAVA_HOME=/opt/@P@
-JRE_HOME=/opt/@P@
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JRE_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
 PATH="${JAVA_HOME}/bin"
 ROOTPATH="${JAVA_HOME}/bin"
-LDPATH="/opt/@P@/bin/:/opt/@P@/bin/classic"
+LDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/bin/classic"
 PROVIDES_TYPE="JRE"
 PROVIDES_VERSION="1.5"
 BOOTCLASSPATH="${JAVA_HOME}/lib/vm.jar:${JAVA_HOME}/lib/core.jar:${JAVA_HOME}/lib/charsets.jar:${JAVA_HOME}/lib/graphics.jar:${JAVA_HOME}/lib/security.jar:${JAVA_HOME}/lib/ibmpkcs.jar:${JAVA_HOME}/lib/ibmorb.jar:${JAVA_HOME}/lib/ibmcfw.jar:${JAVA_HOME}/lib/ibmorbapi.jar:${JAVA_HOME}/lib/ibmjcefw.jar:${JAVA_HOME}/lib/ibmjgssprovider.jar:${JAVA_HOME}/lib/ibmjsseprovider2.jar:${JAVA_HOME}/lib/ibmjaaslm.jar:${JAVA_HOME}/lib/ibmcertpathprovider.jar:${JAVA_HOME}/lib/server.jar:${JAVA_HOME}/lib/xml.jar"
diff --git a/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.6.env b/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.6.env
index befe6481297a..8763875211a0 100644
--- a/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.6.env
+++ b/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.6.env
@@ -1,13 +1,13 @@
-# 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-jre-bin/files/ibm-jre-bin-1.6.env,v 1.1 2007/12/16 13:47:25 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.6.env,v 1.2 2011/11/23 19:00:00 sera Exp $
 
 VERSION="IBM JRE @PV@"
-JAVA_HOME=/opt/@P@
-JRE_HOME=/opt/@P@
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
+JRE_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@"
 PATH="${JAVA_HOME}/bin"
 ROOTPATH="${JAVA_HOME}/bin"
-LDPATH="/opt/@P@/lib/@PLATFORM@:/usr/lib"
+LDPATH="${JAVA_HOME}/lib/@PLATFORM@:@GENTOO_PORTAGE_EPREFIX@/usr/lib"
 PROVIDES_TYPE="JRE"
 PROVIDES_VERSION="1.6"
 BOOTCLASSPATH="${JAVA_HOME}/lib/vm.jar:/opt/ibm-jre-bin-1.6.0.0/lib/facilitators.jar:/opt/ibm-jre-bin-1.6.0.0/lib/annotation.jar:/opt/ibm-jre-bin-1.6.0.0/lib/beans.jar:/opt/ibm-jre-bin-1.6.0.0/lib/java.util.jar:/opt/ibm-jre-bin-1.6.0.0/lib/jndi.jar:/opt/ibm-jre-bin-1.6.0.0/lib/logging.jar:/opt/ibm-jre-bin-1.6.0.0/lib/security.jar:/opt/ibm-jre-bin-1.6.0.0/lib/sql.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmorb.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmorbapi.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmcfw.jar:/opt/ibm-jre-bin-1.6.0.0/lib/rt.jar:/opt/ibm-jre-bin-1.6.0.0/lib/charsets.jar:/opt/ibm-jre-bin-1.6.0.0/lib/resources.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmpkcs.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmcertpathfw.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmjgssfw.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmjssefw.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmsaslfw.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmjcefw.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmjgssprovider.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmjsseprovider2.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmcertpathprovider.jar:/opt/ibm-jre-bin-1.6.0.0/lib/ibmxmlcrypto.jar:/opt/ibm-jre-bin-1.6.0.0/lib/management-agent.jar:/opt/ibm-jre-bin-1.6.0.0/lib/xml.jar:/opt/ibm-jre-bin-1.6.0.0/lib/jlm.jar:/opt/ibm-jre-bin-1.6.0.0/lib/javascript.jar:/opt/ibm-jre-bin-1.6.0.0/lib/RACF.jar"
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.12_p5-r1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.12_p5-r1.ebuild
new file mode 100644
index 000000000000..a03197e2c5f7
--- /dev/null
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.12_p5-r1.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2011 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.12_p5-r1.ebuild,v 1.1 2011/11/23 19:00:00 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
+
+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"
+
+DESCRIPTION="IBM Java SE Runtime Environment"
+HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
+SRC_URI="x86? ( ${X86_JRE_DIST} )
+	amd64? ( ${AMD64_JRE_DIST} )
+	ppc? ( ${PPC_JRE_DIST} )
+	ppc64? ( ${PPC64_JRE_DIST} )"
+
+LICENSE="IBM-J1.5"
+SLOT="1.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 )"
+
+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/libj9ute23.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() {
+	if use x86; then
+		JRE_DIST=${X86_JRE_DIST}
+		LINK_ARCH="intel"
+	elif use amd64; then
+		JRE_DIST=${AMD64_JRE_DIST}
+		LINK_ARCH="amd64"
+	elif use ppc; then
+		JRE_DIST=${PPC_JRE_DIST}
+		LINK_ARCH="ipseries32"
+	elif use ppc64; then
+		JRE_DIST=${PPC64_JRE_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 "${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}${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_compile() { :; }
+
+src_install() {
+	# Copy all the files to the designated directory
+	dodir /opt/${P}
+	cp -pPR jre/* "${ED}"/opt/${P} || die
+
+	if use x86 || use ppc; then
+		local plugin=/opt/${P}/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
+}
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2-r1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2-r1.ebuild
new file mode 100644
index 000000000000..32f6920cb50b
--- /dev/null
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2-r1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2011 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.9_p2-r1.ebuild,v 1.1 2011/11/23 19:00:00 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
+
+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"
+
+DESCRIPTION="IBM Java SE Runtime Environment"
+HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
+SRC_URI="x86? ( ${X86_JRE_DIST} )
+	amd64? ( ${AMD64_JRE_DIST} )
+	ppc? ( ${PPC_JRE_DIST} )
+	ppc64? ( ${PPC64_JRE_DIST} )"
+
+LICENSE="IBM-J1.6"
+SLOT="1.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
+		x11-libs/libXt
+	)
+	alsa? ( media-libs/alsa-lib )
+	odbc? ( dev-db/unixODBC )"
+
+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/default/libj9ute24.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
+opt/${P}/lib/amd64/compressedrefs/libj9ute24.so"
+
+pkg_nofetch() {
+	if use x86; then
+		JRE_DIST=${X86_JRE_DIST}
+		LINK_ARCH="intel"
+	elif use amd64; then
+		JRE_DIST=${AMD64_JRE_DIST}
+		LINK_ARCH="amd64"
+	elif use ppc; then
+		JRE_DIST=${PPC_JRE_DIST}
+		LINK_ARCH="ipseries32"
+	elif use ppc64; then
+		JRE_DIST=${PPC64_JRE_DIST}
+		LINK_ARCH="ipseries64"
+	fi
+
+	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"
+
+	elog "Due to license restrictions, we cannot redistribute or fetch the distfiles"
+	elog "Please visit: ${DOWNLOADPAGE}"
+
+	elog "Under Java SE 6, download SR${SERVICE_RELEASE}${FP_WEB} for your arch:"
+	elog "${JRE_DIST}"
+
+	elog "You can use direct link to your arch download page:"
+	elog "${DIRECT_DOWNLOAD}"
+	elog "Place the file(s) in: ${DISTDIR}"
+	elog "Then restart emerge: 'emerge --resume'"
+
+	elog "Note: if SR${SERVICE_RELEASE}${FP_WEB} is not available at ${DOWNLOADPAGE}"
+	elog "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
+	elog "isn't updated, but the files should still available through the"
+	elog "direct link to arch download page. If it doesn't work, file a bug."
+}
+
+src_unpack() {
+	default
+
+	local sdir=( ibm-java-* )
+	S="${WORKDIR}/${sdir[0]}"
+}
+
+src_compile() { :; }
+
+src_install() {
+	# Copy all the files to the designated directory
+	dodir /opt/${P}
+	cp -pR jre/* "${ED}"/opt/${P} || die
+
+	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}"
+		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 JRE ${SLOT}/" \
+		-e "s#Exec=.*#Exec=${EPREFIX}/opt/${P}/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=${EPREFIX}/opt/${P}/plugin/desktop/sun_java.png#" \
+		"${ED}"/opt/${P}/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
+	java-vm_set-pax-markings "${ED}"/opt/${P}
+	java-vm_revdep-mask
+}