Also install javaws subdirectory, bug 115205

Package-Manager: portage-2.1_pre3-r1

4 files changed, 137 insertions, 2 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index 664549bf3fa4..c9d065c76fd8 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,12 @@
 # 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.4 2006/01/07 19:10:26 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.5 2006/01/17 14:02:10 herbs Exp $
+
+*emul-linux-x86-java-1.4.2.03-r1 (17 Jan 2006)
+
+  17 Jan 2006; Herbie Hopkins <herbs@gentoo.org>
+  +emul-linux-x86-java-1.4.2.03-r1.ebuild:
+  Also install javaws subdirectory, bug 118634
 
 *emul-linux-x86-java-1.4.2.03 (07 Jan 2006)
 
diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest
index 87eddffa93c5..a175bd5190fa 100644
--- a/app-emulation/emul-linux-x86-java/Manifest
+++ b/app-emulation/emul-linux-x86-java/Manifest
@@ -1,7 +1,19 @@
-MD5 20b4802b8ab13d9c775ac6d95b05c4c1 ChangeLog 900
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b97e1f91f9912d76d217243c28ab26b3 ChangeLog 1088
 MD5 7c1ba1a434a7c4fd986fce50482744bc emul-linux-x86-java-1.4.2.02.ebuild 3116
+MD5 ecbfbd4d9b7a4878f7e296f35626bb45 emul-linux-x86-java-1.4.2.03-r1.ebuild 3126
 MD5 041e4999abd978bc42c629f7e39df7af emul-linux-x86-java-1.4.2.03.ebuild 3116
 MD5 e2f091d8120733e38f13e98d7b2c9152 files/digest-emul-linux-x86-java-1.4.2.02 75
 MD5 2a55a901a16ac79c083cac89012ccca2 files/digest-emul-linux-x86-java-1.4.2.03 75
+MD5 2a55a901a16ac79c083cac89012ccca2 files/digest-emul-linux-x86-java-1.4.2.03-r1 75
 MD5 40fcbcc585ad443b5bf473228c8ef18d files/javasettings_Linux_x86.xml 1601
 MD5 ef1a1d0bbdb241725417e87002ec4d16 metadata.xml 223
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDzPjx2G5bA0cA/ScRAnTDAKDVUFjHJO2A0zeKX2Ddhg1CTNvk3ACfbT/h
+3eL1EvjTVucvwhkgpfmJdqA=
+=OH+s
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r1.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r1.ebuild
new file mode 100644
index 000000000000..912a2b799b6d
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r1.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/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r1.ebuild,v 1.1 2006/01/17 14:02:10 herbs Exp $
+
+inherit multilib java 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
+ABI="x86"
+
+# 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/`dirname $i`/`basename $i .jar`.pack" ]; then
+				einfo "Creating ${JAVAHOME}/${i}\n"
+				"$UNPACK_CMD" "$JAVAHOME/`dirname $i`/`basename $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/`dirname $i`/`basename $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
+}
+
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
new file mode 100644
index 000000000000..38e4c02be965
--- /dev/null
+++ b/app-emulation/emul-linux-x86-java/files/digest-emul-linux-x86-java-1.4.2.03-r1
@@ -0,0 +1 @@
+MD5 cf4f3c8c86f64fd532f074943b432285 j2re-1.4.2-03-linux-i586.bin 13541431