Version bump, plus support for new Java system.

(Portage version: 2.1.1_pre1)

6 files changed, 154 insertions, 7 deletions

diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index 358300548818..eae34aff1c27 100644
--- a/dev-java/ibm-jre-bin/ChangeLog
+++ b/dev-java/ibm-jre-bin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.30 2006/03/19 11:19:27 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.31 2006/06/25 18:57:05 nichoj Exp $
+
+  25 Jun 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/ibm-jre-bin-1.4.env:
+  Version bump, plus support for new Java system.
 
   19 Mar 2006; Markus Rothe <corsair@gentoo.org>
   ibm-jre-bin-1.4.2.03.ebuild:
diff --git a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.03 b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.03
index 6d66c09ea9a8..7d9382578367 100644
--- a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.03
+++ b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.03
@@ -1,9 +1,9 @@
 MD5 e31831ecb1dc308f176f0bcd9d7d95ce IBMJava2-JRE-142-SR3.tgz 38733463
 RMD160 c6904d05bc612af3db8adc92e299b8cd95f6a47e IBMJava2-JRE-142-SR3.tgz 38733463
 SHA256 6c012a40f5495461677ac98fea86c453c7efa3bb4969624fb98cc4d1122d20df IBMJava2-JRE-142-SR3.tgz 38733463
-MD5 28e686f5c45d3c946edfa5ca9393dd0c IBMJava2-JRE-142.ppc-SR3.tgz 41878932
-RMD160 7f32eee25de17b1e1d23eb5fd2de57a87aee70c6 IBMJava2-JRE-142.ppc-SR3.tgz 41878932
-SHA256 be70a2126cf45bb1f09e455ccb5495ca3b16b3983bcd2ad8b26f34e7abdd85a6 IBMJava2-JRE-142.ppc-SR3.tgz 41878932
+MD5 64d3e5ad88121ad1eae03963d59c283b IBMJava2-JRE-142.ppc-SR3.tgz 41878932
+RMD160 7eb9078cb44fb4a3d76b819aa8c9743f7706817e IBMJava2-JRE-142.ppc-SR3.tgz 41878932
+SHA256 8e3a98ac186457ff60ec9838c4e4072db1f6577fd7216cc04419844b6f6e1d72 IBMJava2-JRE-142.ppc-SR3.tgz 41878932
 MD5 c0895e6da29fc9836f3bb1397d067f6d IBMJava2-JRE-142.ppc64-SR3.tgz 39136112
 RMD160 d372a4bcef0c375bbbcd11a2657cbf184b21f044 IBMJava2-JRE-142.ppc64-SR3.tgz 39136112
 SHA256 912b98eee21d641068b8b6055352b306502ce8d4e56643b51dc9d16cc8411ffd IBMJava2-JRE-142.ppc64-SR3.tgz 39136112
diff --git a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.04 b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.04
index b2f795b48c85..4421e89c0533 100644
--- a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.04
+++ b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.04
@@ -7,6 +7,6 @@ SHA256 28464184f482ac72ff7fbee700e116f44a916e7bde1775970e7274265238c508 IBMJava2
 MD5 12675c48c2c3df9d14b877788cc83168 IBMJava2-JRE-142.ppc64-SR4.tgz 40683882
 RMD160 8095f1851401deaeb3f26f9dc5092627feb069fa IBMJava2-JRE-142.ppc64-SR4.tgz 40683882
 SHA256 dc122e7346d89b1072fc69364ecc3531f6f5e8e9fa633b6830ae109ca819507c IBMJava2-JRE-142.ppc64-SR4.tgz 40683882
-MD5 80b81da60b0445a0d52c4b7c42cd3ff3 IBMJava2-JRE-AMD64-142.x86_64-SR4.tgz 33899987
-RMD160 3e90583ba07eecc32453b60ac9051cd10dc54e9f IBMJava2-JRE-AMD64-142.x86_64-SR4.tgz 33899987
-SHA256 42d562302d2d0545526b1c6b6ce16058402dfc4efcedd6106cb71d2f58e1cc6e IBMJava2-JRE-AMD64-142.x86_64-SR4.tgz 33899987
+MD5 d41d8cd98f00b204e9800998ecf8427e IBMJava2-JRE-AMD64-142.x86_64-SR4.tgz 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 IBMJava2-JRE-AMD64-142.x86_64-SR4.tgz 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 IBMJava2-JRE-AMD64-142.x86_64-SR4.tgz 0
diff --git a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.05 b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.05
new file mode 100644
index 000000000000..f68d92c76b3b
--- /dev/null
+++ b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.05
@@ -0,0 +1,12 @@
+MD5 0ee56a87dd0eacb96f2cbc63dbda007a IBMJava2-JRE-142-SR5.tgz 39793292
+RMD160 e23d1c0c3b56719537420342b05a4553b1d8d38d IBMJava2-JRE-142-SR5.tgz 39793292
+SHA256 942440678caf5b77df6d959d91840a58d780c54faceec25da677266651c9af1a IBMJava2-JRE-142-SR5.tgz 39793292
+MD5 76d02791cb0085192d92b49c5d8e65d8 IBMJava2-JRE-142.ppc-SR5.tgz 47953143
+RMD160 aa6153e71f20568fdbcbb831531199ec7359607c IBMJava2-JRE-142.ppc-SR5.tgz 47953143
+SHA256 64d5a838e584d9a2ead6eba94cec7cac3020f52db13dc13b4b7ff2f631252761 IBMJava2-JRE-142.ppc-SR5.tgz 47953143
+MD5 c5b278e00613538b03373a2896378b86 IBMJava2-JRE-142.ppc64-SR5.tgz 46294846
+RMD160 9360b41c3ee30a30abd5c7be56b16c52e4312194 IBMJava2-JRE-142.ppc64-SR5.tgz 46294846
+SHA256 d78557b179aa8412ddc398b827556b48b8168b2bf6b82e312ee10eed26999b0d IBMJava2-JRE-142.ppc64-SR5.tgz 46294846
+MD5 fbc679b5c548e62dff2f716a9ea3073c IBMJava2-JRE-AMD64-142.x86_64-SR5.tgz 34481202
+RMD160 a8122df2eaeab177bc038f560aefa88533d483b5 IBMJava2-JRE-AMD64-142.x86_64-SR5.tgz 34481202
+SHA256 56c006940e619836da0b012c3e4ad1907af3334c3047ee93a5a08995115e79a3 IBMJava2-JRE-AMD64-142.x86_64-SR5.tgz 34481202
diff --git a/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.4.env b/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.4.env
new file mode 100644
index 000000000000..2f07a5fc11b3
--- /dev/null
+++ b/dev-java/ibm-jre-bin/files/ibm-jre-bin-1.4.env
@@ -0,0 +1,15 @@
+# Copyright 1999-2004 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.4.env,v 1.1 2006/06/25 18:57:05 nichoj Exp $
+
+VERSION="IBM JRE @PV@"
+JAVA_HOME=/opt/@P@
+JRE_HOME=/opt/@P@
+PATH="${JAVA_HOME}/bin"
+ROOTPATH="${JAVA_HOME}/bin"
+LDPATH="/opt/@P@/bin/:/opt/@P@/bin/classic"
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="1.4"
+BOOTCLASSPATH="${JAVA_HOME}/lib/core.jar:${JAVA_HOME}/lib/graphics.jar:${JAVA_HOME}/lib/security.jar:${JAVA_HOME}/lib/server.jar:${JAVA_HOME}/lib/xml.jar:${JAVA_HOME}/lib/charsets.jar:${JAVA_HOME}/lib/ibmjgssprovider.jar:${JAVA_HOME}/lib/ibmjaaslm.jar:${JAVA_HOME}/lib/ibmorbapi.jar:${JAVA_HOME}/lib/ibmorb.jar:${JAVA_HOME}/lib/ibmjcefw.jar:${JAVA_HOME}/lib/ibmjssefips.jar:${JAVA_HOME}/lib/ibmjsseprovider.jar:${JAVA_HOME}/lib/ibmpkcs.jar:${JAVA_HOME}/lib/ibmcertpathprovider.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JRE_HOME PATH ROOTPATH LDPATH"
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.05.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.05.ebuild
new file mode 100644
index 000000000000..9dfb60968d5a
--- /dev/null
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.05.ebuild
@@ -0,0 +1,116 @@
+# 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.05.ebuild,v 1.1 2006/06/25 18:57:05 nichoj Exp $
+
+inherit java-vm-2 eutils
+
+UPSTREAM_SR="SR5"
+
+if use x86 ; then
+	JRE_DIST="IBMJava2-JRE-142"
+elif use amd64 ; then
+	JRE_DIST="IBMJava2-JRE-AMD64-142.x86_64"
+elif use ppc ; then
+	JRE_DIST="IBMJava2-JRE-142.ppc"
+elif use ppc64 ; then
+	JRE_DIST="IBMJava2-JRE-142.ppc64"
+fi
+
+JRE_DIST_GENTOO="${JRE_DIST}-${UPSTREAM_SR}.tgz"
+JRE_DIST+=".tgz"
+
+DESCRIPTION="IBM Java Development Kit"
+HOMEPAGE="http://www-106.ibm.com/developerworks/java/jdk/"
+SRC_URI="x86? ( IBMJava2-JRE-142-${UPSTREAM_SR}.tgz )
+		 amd64? ( IBMJava2-JRE-AMD64-142.x86_64-${UPSTREAM_SR}.tgz )
+		 ppc? ( IBMJava2-JRE-142.ppc-${UPSTREAM_SR}.tgz )
+		 ppc64? ( IBMJava2-JRE-142.ppc64-${UPSTREAM_SR}.tgz )"
+
+LICENSE="IBM-J1.4"
+SLOT="1.4"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X nsplugin"
+
+DEPEND="virtual/libc
+		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 ) )"
+
+PROVIDE="virtual/jre"
+
+RESTRICT="fetch"
+
+if use ppc; then
+	S="${WORKDIR}/IBMJava2-ppc-142"
+elif use ppc64; then
+	S="${WORKDIR}/IBMJava2-ppc64-142"
+elif use amd64; then
+	S="${WORKDIR}/IBMJava2-amd64-142"
+else
+	S="${WORKDIR}/IBMJava2-142"
+fi
+
+pkg_nofetch() {
+	einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
+	einfo "Please visit: ${HOMEPAGE}linux/download.html"
+	einfo "Under J2SE 1.4.2 for your platform, download ${UPSTREAM_SR}: ${JRE_DIST}"
+	einfo "Rename ${JRE_DIST} to ${JRE_DIST_GENTOO}"
+	einfo "Place the file(s) in: ${DISTDIR}"
+	einfo "Then run emerge ${PN}"
+}
+
+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
+}