Version bump.

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

3 files changed, 194 insertions, 2 deletions

diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index daa5c02352b8..928129bc4945 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 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.127 2009/05/29 20:39:13 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.128 2009/06/19 21:10:47 caster Exp $
+
+*ibm-jre-bin-1.6.0.5 (19 Jun 2009)
+
+  19 Jun 2009; Vlastimil Babka <caster@gentoo.org>
+  +ibm-jre-bin-1.6.0.5.ebuild:
+  Version bump.
 
   29 May 2009; Vlastimil Babka <caster@gentoo.org>
   -ibm-jre-bin-1.4.2.12.ebuild, ibm-jre-bin-1.4.2.13.ebuild,
diff --git a/dev-java/ibm-jre-bin/Manifest b/dev-java/ibm-jre-bin/Manifest
index 6d80a9b3fbc2..8b7eb3780c48 100644
--- a/dev-java/ibm-jre-bin/Manifest
+++ b/dev-java/ibm-jre-bin/Manifest
@@ -9,6 +9,10 @@ DIST ibm-java-jre-6.0-4.0-linux-i386.tgz 60771049 RMD160 1cf6cdb1a3652fb98082c44
 DIST ibm-java-jre-6.0-4.0-linux-ppc.tgz 62853950 RMD160 d7187d6eeba41eb6f4033678a6baf055ed1340d3 SHA1 0782bdeacfbcb717bb9d6d73d0d02329543ff183 SHA256 2c40acfbec305ea94680c81961c11112088a1616938adaa9582bca1f4dd1ccc2
 DIST ibm-java-jre-6.0-4.0-linux-ppc64.tgz 72413048 RMD160 18a7f3e2d6a8d506f9cfe6097cc4f27578250627 SHA1 ea0c2711c2de64398eaba0f97fd8ec57df82187e SHA256 d3026e26b80b5677a793e3b76dfa2b3a24d7709c1cf956e7a897606404271c11
 DIST ibm-java-jre-6.0-4.0-linux-x86_64.tgz 64267013 RMD160 7ec3f41448dbc350e5b51d61244dad9b8aa6a497 SHA1 71c0bec0f29ad1f8779a7453ac4f588d25900c00 SHA256 0d134d3ab344686abfc86aeee15aa458934f258bffe6037a31407e156fc9113f
+DIST ibm-java-jre-6.0-5.0-linux-i386.tgz 62076643 RMD160 9bcf8b12847913e3d12980c8f92f0c5c761d1935 SHA1 76181ecf978753733126421fe941c4d46530b8aa SHA256 8b6e4f10cab411bdaf52cb613dab484318526d3b43fbe42976d6cb7bf5a804f7
+DIST ibm-java-jre-6.0-5.0-linux-ppc.tgz 64190693 RMD160 ef6fd528d7aa41ec7a9a1eb592c9a664832f10a0 SHA1 735d98c65f4c8e8fb548b97c51625dfa5a4e09fd SHA256 d0648da42d9a745eb1e2afbc2d9bcd28656fd702c51cf4257ff142853b68a60d
+DIST ibm-java-jre-6.0-5.0-linux-ppc64.tgz 73634048 RMD160 e3c65399d8705603a2de0aabcb40e5e57a6998c9 SHA1 7fc2a2b196b4dc7828f7a6c365e56af588928868 SHA256 6f1513077486c7e0109c786955b3e55b7d01865a37ea49162e0d94aa272b3f05
+DIST ibm-java-jre-6.0-5.0-linux-x86_64.tgz 65269740 RMD160 6db8964795d264ebd0b52152610327f37408000d SHA1 d26e36c94f3aa649d246c9a05f940d11dc1e6451 SHA256 2a3ee6e89ec1138541c39a6c892d13b1c87fb505e8a190dbafec6e1efcee4c36
 DIST ibm-java2-jre-5.0-9.0-linux-i386.tgz 44551455 RMD160 e38176081cd34d3e3e2773ed023213cf8b298257 SHA1 38f1fedcaad972755506ad9ea36ae63360139720 SHA256 52e984b69a74a216eec5fbee073c70b55d2e9faf1348a8d942d85ecb77a1e68c
 DIST ibm-java2-jre-5.0-9.0-linux-ppc.tgz 51158978 RMD160 d3f53b1640d2df81b9c227b2f59e9d71b420a2bd SHA1 e1d4a2f46ea36fcf9dad5d725a3142abbb03903d SHA256 2ba311d3ca10165f7385866c1a501fe65649ae2de072f6212b260ec70e7325f8
 DIST ibm-java2-jre-5.0-9.0-linux-ppc64.tgz 50718662 RMD160 590e471cee2e60350c3eee09279534d52acab0cc SHA1 9c6df0016a05bbeeabb75600639d9300bcb3d7c7 SHA256 af779c837408141a3b28b4eb279a690fe14c91a059cb525f4cd480dc2eb30b4f
@@ -16,5 +20,6 @@ DIST ibm-java2-jre-5.0-9.0-linux-x86_64.tgz 46619220 RMD160 7aa44e2aadc5218ffa6b
 EBUILD ibm-jre-bin-1.4.2.13.ebuild 3493 RMD160 780e128191ae82fb82f639b81aef33bb80c89dd9 SHA1 398d719ca7ecdc0b44d0f161052cecef9ef971f1 SHA256 d50062d478dfb0ad2046c4453b679ad0393141fa7f545dacfa257737de98a0f4
 EBUILD ibm-jre-bin-1.5.0.9-r1.ebuild 6303 RMD160 ff889ebeb426ff12a30ce7524bf85a2a32fa29d4 SHA1 ab34fe36373c53a98441cf534b934ffc273a196d SHA256 01850eff38f78c383988b54eaa2add9b58263a8d9121131e6ac0e4290e547189
 EBUILD ibm-jre-bin-1.6.0.4.ebuild 5991 RMD160 d85aa30c291bfc209c696ef8b08e7b1fe5f9e7c3 SHA1 9919c274c166a647deaac36781eae870fe910dc1 SHA256 3cdf938b6c90e80085871ecfefcb04e252f4a469e0d9c4f6301d55f88ef569ec
-MISC ChangeLog 19329 RMD160 44e253623e8278cc8df83ad4f83d20e798c8a161 SHA1 0a929e2900fb0de990229af14a52cb0c86938a5c SHA256 6930182cbd7c89bee20cabdb08884cb57d61f33f24fb74aa172376f17c1815d3
+EBUILD ibm-jre-bin-1.6.0.5.ebuild 5993 RMD160 315949e87130562b1768342d8b0f0a577252300e SHA1 7637d2eafcb694d12e6f49f65e7f725501f0210d SHA256 9dc3fed5b52b18d2104e257eb2f78637924610e953404a9383cc78b6d5f2bde8
+MISC ChangeLog 19464 RMD160 284a4f88cf3f0fab4286d3d9492782900c973f4b SHA1 cfe35bc724a1ba853270681ff51c78436a2a949a SHA256 06fbc978109245cfa0fcecbe82a7f41c14022791f20460a6cc07a83121677a40
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.5.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.5.ebuild
new file mode 100644
index 000000000000..b40bea7ca554
--- /dev/null
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.5.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2009 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.5.ebuild,v 1.1 2009/06/19 21:10:47 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}_6sr${SERVICE_RELEASE}&S_TACT=105AGX05&S_CMP=JDK"
+
+SLOT="1.6"
+DESCRIPTION="IBM Java SE Runtime Environment"
+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 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}/"
+
+	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
+}