Revbump to fix bug #147259.

(Portage version: 2.1.2_pre1)

3 files changed, 139 insertions, 1 deletions

diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index 79b7bf8951b6..0e03343c6c39 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.45 2006/09/17 11:24:35 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.46 2006/09/19 16:29:05 caster Exp $
+
+*ibm-jre-bin-1.4.2.6-r4 (19 Sep 2006)
+
+  19 Sep 2006; Vlastimil Babka <caster@gentoo.org>
+  -ibm-jre-bin-1.4.2.6-r3.ebuild, +ibm-jre-bin-1.4.2.6-r4.ebuild:
+  Revbump to fix bug #147259.
 
   17 Sep 2006; Petteri Räty <betelgeuse@gentoo.org>
   -ibm-jre-bin-1.4.2.03.ebuild, -ibm-jre-bin-1.4.2.04.ebuild,
diff --git a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.6-r4 b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.6-r4
new file mode 100644
index 000000000000..68999c66f02c
--- /dev/null
+++ b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.6-r4
@@ -0,0 +1,12 @@
+MD5 3916a809439943c4e579cb6db98f69d6 IBMJava2-142-ia32-JRE-1.4.2-6.0.i386.rpm 39863762
+RMD160 578184c83e1a5218ac660747e5d8f068dd786fbd IBMJava2-142-ia32-JRE-1.4.2-6.0.i386.rpm 39863762
+SHA256 524313f234f962c28c320da65309b4bdc234c021b09ba825140aa33fa434d5eb IBMJava2-142-ia32-JRE-1.4.2-6.0.i386.rpm 39863762
+MD5 94d3411fd9a9fe62bb7d0cc04c7325fd IBMJava2-142-ppc32-JRE-1.4.2-6.0.ppc.rpm 43065108
+RMD160 1f062e1b2037aaf1faf09b8aa541ec969b9cd371 IBMJava2-142-ppc32-JRE-1.4.2-6.0.ppc.rpm 43065108
+SHA256 b5836f3a011b9935750d8a03b5176d65b0e2819d0ed55611764b2d3ce0438322 IBMJava2-142-ppc32-JRE-1.4.2-6.0.ppc.rpm 43065108
+MD5 87d03b888918c1311ace20abdbf56f52 IBMJava2-142-ppc64-JRE-1.4.2-6.0.ppc64.rpm 40218069
+RMD160 45adc2239fb81c89e1871d25aaa79c8e670559cb IBMJava2-142-ppc64-JRE-1.4.2-6.0.ppc64.rpm 40218069
+SHA256 a6ff07257ce9729409b49add9fd164412acb08fbcf8833826610f8e1578046bf IBMJava2-142-ppc64-JRE-1.4.2-6.0.ppc64.rpm 40218069
+MD5 7c05bc506f9f7c33059922af729c39d0 IBMJava2-AMD64-142-JRE-1.4.2-6.0.x86_64.rpm 34624859
+RMD160 cacd2c9e0ee7d05e682f0a79973f018be2784289 IBMJava2-AMD64-142-JRE-1.4.2-6.0.x86_64.rpm 34624859
+SHA256 e0854e6fc44931bef3a6b9e8860d67c8538c604667dd01e43a0baab4530226f3 IBMJava2-AMD64-142-JRE-1.4.2-6.0.x86_64.rpm 34624859
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r4.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r4.ebuild
new file mode 100644
index 000000000000..ef3a2ed6be04
--- /dev/null
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r4.ebuild
@@ -0,0 +1,120 @@
+# 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.6-r4.ebuild,v 1.1 2006/09/19 16:29:05 caster 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"
+	S="${WORKDIR}/opt/IBMJava2-142"
+elif use amd64 ; then
+	JRE_DIST="IBMJava2-AMD64-142-JRE-${RPM_PV}.x86_64.rpm"
+	S="${WORKDIR}/opt/IBMJava2-amd64-142"
+elif use ppc ; then
+	JRE_DIST="IBMJava2-142-ppc32-JRE-${RPM_PV}.ppc.rpm"
+	S="${WORKDIR}/opt/IBMJava2-ppc-142"
+elif use ppc64 ; then
+	JRE_DIST="IBMJava2-142-ppc64-JRE-${RPM_PV}.ppc64.rpm"
+	S="${WORKDIR}/opt/IBMJava2-ppc64-142"
+fi
+
+DESCRIPTION="IBM Java Development Kit"
+HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
+DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
+ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_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"
+
+RDEPEND="!ppc64? ( !amd64? ( sys-libs/lib-compat ) )
+	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
+	)"
+DEPEND=""
+
+RESTRICT="fetch"
+
+QA_TEXTRELS_x86="opt/${P}/bin/lib*.so
+	opt/${P}/bin/javaplugin.so
+	opt/${P}/bin/classic/libjvm.so
+	opt/${P}/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 "${JRE_DIST}"
+	einfo "Place the file 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}"
+}
+
+src_compile() { :; }
+
+src_install() {
+	# 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
+
+	# 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 ../javaws/javaws /opt/${P}/bin/javaws
+	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
+}