Revision bump, to ensure that it no longer installs generation-1 compatibility.

(Portage version: 2.1.1_rc1-r2)

3 files changed, 138 insertions, 1 deletions

diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index cc93b02492aa..a5e063b9c822 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.36 2006/07/15 11:05:23 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.37 2006/09/01 03:35:33 nichoj Exp $
+
+*ibm-jre-bin-1.4.2.5-r1 (01 Sep 2006)
+
+  01 Sep 2006; Joshua Nichols <nichoj@gentoo.org>
+  +ibm-jre-bin-1.4.2.5-r1.ebuild:
+  Revision bump, to ensure that it no longer installs generation-1 compatibility.
 
   15 Jul 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove SeJo from metadata.xml as he's retired.
diff --git a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.5-r1 b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.5-r1
new file mode 100644
index 000000000000..9d14f6e0aa5c
--- /dev/null
+++ b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.5-r1
@@ -0,0 +1,12 @@
+MD5 e3b121956068754553687cf6c2009ade IBMJava2-142-ia32-JRE-1.4.2-5.0.i386.rpm 39794008
+RMD160 d07227dc2247d72ec6207aadc9e163dc668f5bc0 IBMJava2-142-ia32-JRE-1.4.2-5.0.i386.rpm 39794008
+SHA256 cbd4742063cffdddad8489f199a107807301f17100c986308ace6498aea5019a IBMJava2-142-ia32-JRE-1.4.2-5.0.i386.rpm 39794008
+MD5 cab61b46fa3f3ec86bd8348019e46f4e IBMJava2-142-ppc32-JRE-1.4.2-5.0.ppc.rpm 47855121
+RMD160 1787aae2a9533bc79aebb5d4f4b4c8fd8bb08ca4 IBMJava2-142-ppc32-JRE-1.4.2-5.0.ppc.rpm 47855121
+SHA256 fa42929106fb98ed1681d6f0bcb977801278a67ea7f0b0be774936a52924c788 IBMJava2-142-ppc32-JRE-1.4.2-5.0.ppc.rpm 47855121
+MD5 b1368ec0a5b6adb59355133593fc1e18 IBMJava2-142-ppc64-JRE-1.4.2-5.0.ppc64.rpm 46118362
+RMD160 98d76e261778b10ba91f3235232705dc22f3d78e IBMJava2-142-ppc64-JRE-1.4.2-5.0.ppc64.rpm 46118362
+SHA256 80355f7eb1f423c397165a9b0427136df2ab9ecb25f1da12a1d18cb3584e0fc6 IBMJava2-142-ppc64-JRE-1.4.2-5.0.ppc64.rpm 46118362
+MD5 897c2ee14b8aed7a67032394753fabd7 IBMJava2-AMD64-142-JRE-1.4.2-5.0.x86_64.rpm 34468578
+RMD160 41907a48c67666c9861a5a4a4126a7170a4cd206 IBMJava2-AMD64-142-JRE-1.4.2-5.0.x86_64.rpm 34468578
+SHA256 98503e22f4f7cb63f28d740841430b634b0300513fdcb23b7084cbb3cc41a7d7 IBMJava2-AMD64-142-JRE-1.4.2-5.0.x86_64.rpm 34468578
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.5-r1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.5-r1.ebuild
new file mode 100644
index 000000000000..3de33d030eb4
--- /dev/null
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.5-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2006 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.4.2.5-r1.ebuild,v 1.1 2006/09/01 03:35:33 nichoj Exp $
+
+inherit java-vm-2 eutils versionator rpm
+
+JDK_RELEASE=$(get_version_component_range 1-3)
+SERVICE_RELEASE=$(get_version_component_range 4)
+RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+
+if use x86 ; then
+	JRE_DIST="IBMJava2-142-ia32-JRE-${RPM_PV}.i386.rpm"
+elif use amd64 ; then
+	JRE_DIST="IBMJava2-AMD64-142-JRE-${RPM_PV}.x86_64.rpm"
+elif use ppc ; then
+	JRE_DIST="IBMJava2-142-ppc32-JRE-${RPM_PV}.ppc.rpm"
+elif use ppc64 ; then
+	JRE_DIST="IBMJava2-142-ppc64-JRE-${RPM_PV}.ppc64.rpm"
+fi
+
+DESCRIPTION="IBM Java Development Kit"
+HOMEPAGE="http://www-106.ibm.com/developerworks/java/jdk/"
+DOWNLOADPAGE="${HOMEPAGE}/linux/download.html"
+
+SRC_URI="x86? ( IBMJava2-142-ia32-JRE-${RPM_PV}.i386.rpm )
+		 amd64? ( IBMJava2-AMD64-142-JRE-${RPM_PV}.x86_64.rpm )
+		 ppc? ( IBMJava2-142-ppc32-JRE-${RPM_PV}.ppc.rpm )
+		 ppc64? ( IBMJava2-142-ppc64-JRE-${RPM_PV}.ppc64.rpm )"
+
+LICENSE="IBM-J1.4"
+SLOT="1.4"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X nsplugin"
+
+DEPEND="X? ( || (
+					(
+						x11-libs/libXt
+						x11-libs/libX11
+						x11-libs/libXtst
+						x11-libs/libXp
+						x11-libs/libXext
+						x11-libs/libSM
+						x11-libs/libICE
+						x11-libs/libXau
+						x11-libs/libXdmcp
+						x11-libs/libXi
+						x11-libs/libXmu
+					)
+					virtual/x11
+				)
+			)"
+RDEPEND="${DEPEND}
+		 !ppc64? ( !amd64? ( sys-libs/lib-compat ) )"
+
+
+RESTRICT="fetch"
+
+if use ppc; then
+	S="${WORKDIR}/opt/IBMJava2-ppc-142"
+elif use ppc64; then
+	S="${WORKDIR}/opt/IBMJava2-ppc64-142"
+elif use amd64; then
+	S="${WORKDIR}/opt/IBMJava2-amd64-142"
+else
+	S="${WORKDIR}/opt/IBMJava2-142"
+fi
+
+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}:"
+	einfo "${JRE_DIST}"
+	einfo "Place the file(s) in: ${DISTDIR}"
+	einfo "Then run emerge =${VMHANDLE}*"
+
+	einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}"
+	einfo "it may have been moved to ${ALT_DOWNLOADPAGE}"
+}
+
+src_compile() { :; }
+
+src_install() {
+	# The javaws execution script is 777 why?
+	chmod 0755 ${S}/jre/javaws/javaws
+
+	# Copy all the files to the designated directory
+	dodir /opt/${P}
+	cp -pR ${S}/jre/* ${D}opt/${P}/
+
+	if use nsplugin && ! use ppc && ! use amd64 && ! use ppc64; then
+		local plugin="libjavaplugin_oji.so"
+
+		if has_version '>=sys-devel/gcc-3' ; then
+			plugin="libjavaplugin_ojigcc3.so"
+		fi
+
+		install_mozilla_plugin /opt/${P}/bin/${plugin}
+	fi
+
+	dohtml -a html,htm,HTML -r docs
+	dodoc ${S}/docs/COPYRIGHT
+
+	set_java_env ${FILESDIR}/${VMHANDLE}
+}
+
+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 JRE require an X server to properly"
+		ewarn "function.  Be careful which Java libraries you attempt to"
+		ewarn "use with your installation."
+		ewarn
+	fi
+}