Fixed bug 54242

4 files changed, 142 insertions, 7 deletions

diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index 19a5587972a1..2abd1b4f83e5 100644
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/blackdown-jre
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.44 2004/10/03 02:12:31 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.45 2004/10/05 21:15:51 axxo Exp $
+
+*blackdown-jre-1.4.2_rc1-r2 (05 Oct 2004)
+
+  05 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
+  +blackdown-jre-1.4.2_rc1-r2.ebuild:
+  Fixed bug 54242, and enabled the mozilla plugin again, it does have it!
+  Direct to amd64 since the previous version was plain broken.
 
   02 Oct 2004; Travis Tilley <lv@gentoo.org>
   blackdown-jre-1.4.2_rc1-r1.ebuild:
diff --git a/dev-java/blackdown-jre/Manifest b/dev-java/blackdown-jre/Manifest
index 7632fc7bdbe3..f8e11f57ac9f 100644
--- a/dev-java/blackdown-jre/Manifest
+++ b/dev-java/blackdown-jre/Manifest
@@ -1,12 +1,14 @@
-MD5 890c6066d8cbb8ba9974ceab5616551b ChangeLog 7055
-MD5 ba7a0a5afe09b6aba7eb272554806e4d blackdown-jre-1.3.1-r9.ebuild 1726
 MD5 a08a19a36bcbc231440fe02887dd7f58 blackdown-jre-1.4.1.ebuild 2351
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 9ec7b727169989b9a2e2dca0839935d3 blackdown-jre-1.4.2_rc1-r2.ebuild 3261
+MD5 ba7a0a5afe09b6aba7eb272554806e4d blackdown-jre-1.3.1-r9.ebuild 1726
 MD5 4500461c6cd7d20d40cbf7f468b17f55 blackdown-jre-1.4.2_rc1-r1.ebuild 3392
-MD5 3facc5cbb2965471e9b1986926221552 files/blackdown-jre-1.3.1 429
-MD5 c1a405150b814133a77c5a7c249517b9 files/blackdown-jre-1.4.1 429
-MD5 2fc6969da09d5d87a161f71b371141e4 files/blackdown-jre-1.4.2_rc1 433
+MD5 9e290a3a4437e2a501fa3a01bc2d8cfe ChangeLog 7323
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 4d1e4299a9d265e31c10498f5457dc1c files/blackdown-jre-1.4.2_rc1-r1 436
+MD5 2fc6969da09d5d87a161f71b371141e4 files/blackdown-jre-1.4.2_rc1 433
 MD5 44d855f52a687d922d2230b27bccad0f files/digest-blackdown-jre-1.3.1-r9 79
 MD5 773e3dae29edd26397f43c1e1ab99dae files/digest-blackdown-jre-1.4.1 248
 MD5 8cf05da3360f161e42c019159bccda1d files/digest-blackdown-jre-1.4.2_rc1-r1 160
+MD5 8cf05da3360f161e42c019159bccda1d files/digest-blackdown-jre-1.4.2_rc1-r2 160
+MD5 3facc5cbb2965471e9b1986926221552 files/blackdown-jre-1.3.1 429
+MD5 c1a405150b814133a77c5a7c249517b9 files/blackdown-jre-1.4.1 429
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r2.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r2.ebuild
new file mode 100644
index 000000000000..f2b5cf64656b
--- /dev/null
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r2.ebuild,v 1.1 2004/10/05 21:15:51 axxo Exp $
+
+inherit java
+
+JREV="rc1"
+
+JV="${PV}"
+JV="${JV/_rc1/}"
+
+S="${WORKDIR}/j2re${JV}"
+DESCRIPTION="Blackdown Java Runtime Environment ${PV}"
+J_URI="ftp://ftp.tux.org/pub/java/JDK-${JV}"
+SRC_URI="amd64? ( ${J_URI}/amd64/${JREV}/j2re-${JV}-${JREV}-linux-amd64.bin )
+	x86? ( ${J_URI}/i386/${JREV}/j2re-${JV}-${JREV}-linux-i586-gcc3.2.bin )"
+#	sparc? ( ${J_URI}/sparc/${JREV}/j2re-${JV}-${JREV}-linux-sparc.bin )"
+#	ppc? ( ${J_URI}/ppc/${JREV}j2re-${JV}-${JREV}-linux-ppc.bin )"
+
+HOMEPAGE="http://www.blackdown.org"
+
+SLOT="1.4.2"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="-* amd64 ~x86"
+IUSE="mozilla"
+DEPEND="virtual/libc
+	>=dev-java/java-config-0.2.6
+	>=sys-apps/sed-4
+	>=sys-devel/gcc-3.2"
+
+PROVIDE="virtual/jre-1.4.2
+	virtual/java-scheme-2"
+
+# 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 -jxp
+}
+
+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 JAVAHOME="${D}/opt/${P}"
+	local UNPACK_CMD=""
+	if [ -f "$JAVAHOME/lib/unpack" ]; then
+		UNPACK_CMD="$JAVAHOME/lib/unpack"
+		chmod +x "$UNPACK_CMD"
+		#packerror=""
+		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/${P}
+
+	cp -a ${S}/{bin,lib,man,plugin} ${D}/opt/${P} || die "failed to copy"
+
+	dodoc COPYRIGHT LICENSE README INSTALL
+	dohtml README.html
+
+	# Install mozilla plugin
+	if use mozilla; then
+		case ${ARCH} in
+			x86) platform="i386" ;;
+			ppc) platform="ppc" ;;
+			sparc*) platform="sparc" ;;
+			amd64) platform="amd64" ;;
+		esac
+		install_mozilla_plugin /opt/${P}/plugin/${platform}/mozilla/libjavaplugin_oji.so
+	fi
+
+	sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/lib/font.properties
+
+	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
+
+	# install env into /etc/env.d
+	set_java_env ${FILESDIR}/${VMHANDLE} || die
+
+	# Fix for bug 26629
+	if [ "${PROFILE_ARCH}" = "sparc64" ]
+	then
+		dosym /opt/${P}/lib/sparc /opt/${P}/lib/sparc64
+	fi
+
+	unpack_jars
+}
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2_rc1-r2 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2_rc1-r2
new file mode 100644
index 000000000000..c88b1f57e96d
--- /dev/null
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2_rc1-r2
@@ -0,0 +1,2 @@
+MD5 db7acfb2ef3f1f9e9193ffe44b3a1d8e j2re-1.4.2-rc1-linux-amd64.bin 13121741
+MD5 50c0faa2d536b09a48eb0584df84e32a j2re-1.4.2-rc1-linux-i586-gcc3.2.bin 13315794