Fixed bug #51293

5 files changed, 79 insertions, 3 deletions

diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index f771238fc195..e23a9609036e 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.2 2004/05/01 08:26:28 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.3 2004/05/29 12:03:34 dholm Exp $
+
+*ibm-jre-bin-1.4.1-r1 (29 May 2004)
+
+  29 May 2004; David Holm <dholm@gentoo.org> +files/ibm-jre-bin-1.4.1,
+  +ibm-jre-bin-1.4.1-r1.ebuild:
+  Fixed bug #51293.
 
   01 May 2004; <SeJo@gentoo.org> ibm-jre-bin-1.4.1.ebuild:
   added ~x86 for karltk
diff --git a/dev-java/ibm-jre-bin/Manifest b/dev-java/ibm-jre-bin/Manifest
index 50d51b16fe40..67867399950e 100644
--- a/dev-java/ibm-jre-bin/Manifest
+++ b/dev-java/ibm-jre-bin/Manifest
@@ -1,4 +1,7 @@
-MD5 7b1220011b42863dc10d070e00dc7c6c ChangeLog 435
-MD5 d302b8447e5ffe3ee2c149fab7ff76a3 ibm-jre-bin-1.4.1.ebuild 1168
+MD5 c26b7cf4ed9fa163e95a91a80aca06ae ChangeLog 596
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 d302b8447e5ffe3ee2c149fab7ff76a3 ibm-jre-bin-1.4.1.ebuild 1168
+MD5 91dcea3e4d30941a45f3c26b61cd40b6 ibm-jre-bin-1.4.1-r1.ebuild 1198
 MD5 326caa9caaaba43ff9db04da0c8d30eb files/digest-ibm-jre-bin-1.4.1 138
+MD5 d260b21beff92c1abb1f698b6dcde751 files/ibm-jre-bin-1.4.1 705
+MD5 326caa9caaaba43ff9db04da0c8d30eb files/digest-ibm-jre-bin-1.4.1-r1 138
diff --git a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.1-r1 b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.1-r1
new file mode 100644
index 000000000000..c8d4bbdf2561
--- /dev/null
+++ b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.1-r1
@@ -0,0 +1,2 @@
+MD5 111805b43cc14fc2a7746da1b4fd02b8 IBMJava2-JRE-141.ppc.tgz 37508675
+MD5 b6680a76871727813f36cd87aa33d9ea IBMJava2-JRE-141.tgz 35198414
diff --git a/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.4.1 b/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.4.1
new file mode 100644
index 000000000000..995546c9da84
--- /dev/null
+++ b/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.4.1
@@ -0,0 +1,12 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.4.1,v 1.1 2004/05/29 12:03:34 dholm Exp $
+
+VERSION="IBM JRE @PV@"
+JAVA_HOME=/opt/@P@
+CLASSPATH=/opt/@P@/lib/xml.jar:/opt/@P@/lib/security.jar:/opt/@P@/lib/server.jar:/opt/@P@/lib/graphics.jar:/opt/@P@/lib/core.jar:/opt/@P@/lib/charsets.jar
+JRE_HOME=/opt/@P@
+ADDPATH="${JAVA_HOME}/bin"
+ADDLDPATH=/opt/@P@/lib/xml.jar:/opt/@P@/lib/security.jar:/opt/@P@/lib/server.jar:/opt/@P@/lib/graphics.jar:/opt/@P@/lib/core.jar:/opt/@P@/lib/charsets.jar
+
+ENV_VARS="JAVA_HOME CLASSPATH JRE_HOME ADDPATH ADDLDPATH"
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..1cd624d70a4b
--- /dev/null
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1-r1.ebuild,v 1.1 2004/05/29 12:03:34 dholm Exp $
+IUSE="doc"
+
+inherit java nsplugins
+
+S="${WORKDIR}/j2sdk${PV}"
+DESCRIPTION="IBM Java Development Kit ${PV}"
+SRC_URI="ppc?(mirror://IBMJava2-JRE-141.ppc.tgz)
+	x86?(mirror://IBMJava2-JRE-141.tgz)"
+PROVIDE="virtual/jre-1.4.1
+	virtual/java-scheme-2"
+SLOT="1.4"
+LICENSE="IBM-J1.4"
+KEYWORDS="ppc ~x86"
+
+
+DEPEND="virtual/glibc
+	>=dev-java/java-config-0.2.5"
+RDEPEND="${DEPEND}"
+
+
+if [ `use ppc` ]; then
+	S=${WORKDIR}/IBMJava2-ppc-141
+else
+	S=${WORKDIR}/IBMJava2-141
+fi;
+
+# No compilation needed!
+src_compile() { :; }
+
+src_install() {
+	# Copy all the files to the designated directory 
+	dodir /opt/${P}
+	cp -dpR ${S}/jre/* ${D}/opt/${P}/
+
+	dohtml -a html,htm,HTML -r docs
+	dodoc ${S}/docs/COPYRIGHT
+
+	dodir /etc/env.d/java
+	sed \
+		-e "s/@P@/${P}/g" \
+		-e "s/@PV@/${PV}/g" \
+		-e "s/@PF@/${PF}/g" \
+		< ${FILESDIR}/${P} \
+		> ${D}/etc/env.d/java/20${P} \
+		|| die "unable to install environment file"
+}
+src_postinst(){
+	inst_plugin /opt/${P}/bin/javaplugin.so
+	true
+}