Revision bump to support the new Java system.

(Portage version: 2.1.1)

5 files changed, 150 insertions, 1 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index e0ff4ffa7e77..6db9be70667f 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.10 2006/03/17 18:09:34 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.11 2006/09/12 05:04:21 nichoj Exp $
+
+*emul-linux-x86-java-1.4.2.03-r2 (12 Sep 2006)
+
+  12 Sep 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/emul-linux-x86-java-1.4.2.env,
+  +emul-linux-x86-java-1.4.2.03-r2.ebuild:
+  Revision bump to support the new Java system.
 
   17 Mar 2006; Herbie Hopkins <herbs@gentoo.org>
   -emul-linux-x86-java-1.4.2.02.ebuild,
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild
new file mode 100644
index 000000000000..288ac493f5b2
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild,v 1.1 2006/09/12 05:04:21 nichoj Exp $
+
+inherit multilib java-vm-2 versionator
+
+JREV="03"
+
+JV="${PV}"
+JV=$(get_version_component_range 1-3 ${JV})
+DESCRIPTION="32bit java emulation for amd64"
+J_URI="mirror://blackdown.org/JDK-${JV}"
+SRC_URI="${J_URI}/i386/${JREV}/j2re-${JV}-${JREV}-linux-i586.bin"
+
+HOMEPAGE="http://www.blackdown.org"
+
+SLOT="1.4.2"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="-* ~amd64"
+IUSE="nsplugin"
+DEPEND="virtual/libc
+	>=sys-apps/sed-4"
+RDEPEND="virtual/libc
+	app-emulation/emul-linux-x86-xlibs
+	app-emulation/emul-linux-x86-soundlibs"
+
+S="${WORKDIR}/j2re${JV}"
+
+JAVAHOME="${D}/opt/java32"
+
+# 32bit binary package
+pkg_setup() {
+	ABI="x86"
+}
+
+RESTRICT="nostrip"
+
+# Extract the 'skip' value (offset of tarball) we should pass to tail
+get_offset() {
+	[ ! -f "$1" ] && return
+
+	local offset="`gawk '
+		/^[[:space:]]*skip[[:space:]]*=/ {
+
+			sub(/^[[:space:]]*skip[[:space:]]*=/, "")
+			SKIP = $0
+		}
+
+		END { print SKIP }
+	' $1`"
+
+	eval echo $offset
+}
+
+src_unpack () {
+	local offset="`get_offset ${DISTDIR}/${A}`"
+
+	if [ -z "${offset}" ] ; then
+		eerror "Failed to get offset of tarball!"
+		die "Failed to get offset of tarball!"
+	fi
+
+	echo ">>> Unpacking ${A}..."
+	tail -n +${offset} ${DISTDIR}/${A} | tar --no-same-owner -jxpf -
+}
+
+unpack_jars() {
+	# New to 1.4.2
+	local PACKED_JARS="lib/tools.jar lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar"
+	local UNPACK_CMD=""
+	if [ -f "$JAVAHOME/lib/unpack" ]; then
+		UNPACK_CMD="$JAVAHOME/lib/unpack"
+		chmod +x "$UNPACK_CMD"
+		#packerror=""
+		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
+		for i in $PACKED_JARS; do
+			if [ -f "$JAVAHOME/${i%.jar}.pack" ]; then
+				einfo "Creating ${JAVAHOME}/${i}"
+				"$UNPACK_CMD" "$JAVAHOME/${i%.jar}.pack" "$JAVAHOME/$i"
+				if [ ! -f "$JAVAHOME/$i" ]; then
+					die "Failed to unpack jar files ${i}." # Please refer\n"
+					#ewarn "to the Troubleshooting section of the Installation\n"
+					#ewarn "Instructions on the download page for more information.n"
+					#packerror="1"
+				fi
+				rm -f "$JAVAHOME/${i%.jar}.pack"
+			fi
+		done
+	fi
+	rm -f "$UNPACK_CMD"
+}
+
+src_install() {
+	typeset platform
+
+	dodir /opt/java32
+
+	cp -pPR ${S}/{bin,lib,man,plugin,javaws} ${JAVAHOME} || die "failed to copy"
+
+	dodoc COPYRIGHT README
+	dohtml README.html
+
+	# Install mozilla plugin
+	if use nsplugin ; then
+		install_mozilla_plugin /opt/java32/plugin/i386/mozilla/libjavaplugin_oji.so
+	fi
+
+	sed -i "s/standard symbols l/symbol/g" ${D}/opt/java32/lib/font.properties
+
+	find ${JAVAHOME} -type f -name "*.so" -exec chmod +x \{\} \;
+
+	unpack_jars
+
+	# Install java settings file for openoffice so that it will not try
+	# to use the native 64bit jre and cause 2 minute startup...
+	dodir /usr/$(get_libdir)/openoffice/share/config
+	insinto /usr/$(get_libdir)/openoffice/share/config
+	doins ${FILESDIR}/javasettings_Linux_x86.xml
+
+	set_java_env
+}
diff --git a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r1 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r1
index 38e4c02be965..6903ab4b3355 100644
--- a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r1
+++ b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r1
@@ -1 +1,3 @@
 MD5 cf4f3c8c86f64fd532f074943b432285 j2re-1.4.2-03-linux-i586.bin 13541431
+RMD160 82c707956dc65e9640fda97587ac7426e4f7be98 j2re-1.4.2-03-linux-i586.bin 13541431
+SHA256 636c414583f22d7d9f12f56855bfcb84227cec100ed0108a2b8f0e5f6b7025ef j2re-1.4.2-03-linux-i586.bin 13541431
diff --git a/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r2 b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r2
new file mode 100644
index 000000000000..6903ab4b3355
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r2
@@ -0,0 +1,3 @@
+MD5 cf4f3c8c86f64fd532f074943b432285 j2re-1.4.2-03-linux-i586.bin 13541431
+RMD160 82c707956dc65e9640fda97587ac7426e4f7be98 j2re-1.4.2-03-linux-i586.bin 13541431
+SHA256 636c414583f22d7d9f12f56855bfcb84227cec100ed0108a2b8f0e5f6b7025ef j2re-1.4.2-03-linux-i586.bin 13541431
diff --git a/app-emulation/emul-linux-x86-java/files/emul-linux-x86-java-1.4.2.env b/app-emulation/emul-linux-x86-java/files/emul-linux-x86-java-1.4.2.env
new file mode 100644
index 000000000000..6770658e4a25
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/files/emul-linux-x86-java-1.4.2.env
@@ -0,0 +1,16 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/files/emul-linux-x86-java-1.4.2.env,v 1.1 2006/09/12 05:04:21 nichoj Exp $
+
+VERSION="Blackdown 32bit JRE @PV@"
+JAVA_HOME=/opt/java32
+JRE_HOME=/opt/java32
+PATH="${JAVA_HOME}/bin"
+ROOTPATH="${JAVA_HOME}/bin"
+LDPATH="/opt/java32lib/"
+MANPATH=/opt/java32/man
+PROVIDES_TYPE="JRE"
+PROVIDES_VERSION="1.4"
+BOOTCLASSPATH="${JAVA_HOME}/lib/rt.jar:${JAVA_HOME}/lib/i18n.jar:${JAVA_HOME}/lib/sunrsasign.jar:${JAVA_HOME}/lib/jsse.jar:${JAVA_HOME}/lib/jce.jar:${JAVA_HOME}/lib/charsets.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JRE_HOME PATH ROOTPATH LDPATH MANPATH"