version bump

5 files changed, 184 insertions, 6 deletions

diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index dda76443ad9a..c38c8027e532 100644
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/blackdown-jre
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.26 2003/12/06 17:53:18 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.27 2003/12/24 02:52:29 brad_mssw Exp $
+
+*blackdown-jre-1.4.2_rc1 (23 Dec 2003)
+
+  23 Dec 2003; Brad House <brad_mssw@gentoo.org>
+  blackdown-jre-1.4.2_rc1.ebuild, files/blackdown-jre-1.4.2_rc1:
+  bump version to 1.4.2_rc1
 
   06 Dec 2003; Adrian Almenar <strider@gentoo.org> blackdown-jre-1.3.1-r7.ebuild,
   blackdown-jre-1.3.1-r8.ebuild, blackdown-jre-1.3.1-r9.ebuild:
diff --git a/dev-java/blackdown-jre/Manifest b/dev-java/blackdown-jre/Manifest
index 8c4502c5082d..72bcf8b9bc2f 100644
--- a/dev-java/blackdown-jre/Manifest
+++ b/dev-java/blackdown-jre/Manifest
@@ -1,12 +1,15 @@
+MD5 4a9f8f61e91fe73ab6a39c72b1b695c1 ChangeLog 4376
 MD5 2146ac98dcce4cc1a7f0b05f46d42e6e blackdown-jre-1.3.1-r7.ebuild 2039
-MD5 b6fc00dc86777badf57dbcd5b796b713 blackdown-jre-1.4.1.ebuild 2618
-MD5 ea6364a88c936c9c67b78f529ed97074 blackdown-jre-1.3.1-r9.ebuild 2080
 MD5 ea658b765396c5884d2fe8badd425f2e blackdown-jre-1.3.1-r8.ebuild 1869
-MD5 0068af173edfd05547d9d5a09c102502 ChangeLog 4191
+MD5 ea6364a88c936c9c67b78f529ed97074 blackdown-jre-1.3.1-r9.ebuild 2080
+MD5 b6fc00dc86777badf57dbcd5b796b713 blackdown-jre-1.4.1.ebuild 2618
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 71399e6fc1974ba609922f17904cec73 blackdown-jre-1.4.2_rc1.ebuild 3601
+MD5 60f9af5767a218c44dd128c4f4d4b0ab files/blackdown-jre-1.3.1 562
+MD5 62521a51904596cc001140b1067c3ce0 files/blackdown-jre-1.4.1 562
 MD5 87689b5c7a0f97a6571a10ac42cb3bac files/digest-blackdown-jre-1.3.1-r7 240
 MD5 87689b5c7a0f97a6571a10ac42cb3bac files/digest-blackdown-jre-1.3.1-r8 240
 MD5 44d855f52a687d922d2230b27bccad0f files/digest-blackdown-jre-1.3.1-r9 79
 MD5 99eadcd54ca327f0dacc2d0d33db3175 files/digest-blackdown-jre-1.4.1 248
-MD5 60f9af5767a218c44dd128c4f4d4b0ab files/blackdown-jre-1.3.1 562
-MD5 62521a51904596cc001140b1067c3ce0 files/blackdown-jre-1.4.1 562
+MD5 8cf05da3360f161e42c019159bccda1d files/digest-blackdown-jre-1.4.2_rc1 160
+MD5 c293db2f814af121d4053f4b4e260ff4 files/blackdown-jre-1.4.2_rc1 569
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild
new file mode 100644
index 000000000000..da70375a6dbe
--- /dev/null
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.ebuild,v 1.1 2003/12/24 02:52:29 brad_mssw Exp $
+
+IUSE="doc"
+
+inherit java nsplugins
+
+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 )"
+
+
+if [ "${ARCH}" = "amd64" ]
+then
+	A="j2re-${JV}-${JREV}-linux-amd64.bin"
+elif [ "${ARCH}" = "x86" ]
+then
+	A="j2re-${JV}-${JREV}-linux-i586-gcc3.2.bin"
+elif [ "${ARCH}" = "sparc" ]
+then
+	A="j2re-${JV}-${JREV}-linux-sparc.bin"
+elif [ "${ARCH}" = "ppc" ]
+then
+	A="j2re-${JV}-${JREV}-linux-ppc.bin"
+fi
+
+HOMEPAGE="http://www.blackdown.org"
+
+SLOT="1.4.2"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="-* amd64"
+
+DEPEND="virtual/glibc
+	>=dev-java/java-config-0.2.6
+	doc? ( =dev-java/java-sdk-docs-1.4.1* )"
+
+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 jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/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
+					ewarn "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 () {
+	local PLATFORM=
+
+	dodir /opt/${P}
+
+	cp -a ${S}/{bin,jre,lib,man} ${D}/opt/${P}
+
+
+	dodoc COPYRIGHT LICENSE README INSTALL
+	dohtml README.html
+
+	# Install mozilla plugin
+	if [ "${ARCH}" = "x86" ] ; then
+		PLATFORM="i386"
+	fi
+
+	if [ "${ARCH}" = "amd64" ] ; then
+		PLATFORM="amd64"
+	fi
+
+	if [ "${ARCH}" = "sparc" ] ; then
+		PLATFORM="sparc"
+	fi
+
+	inst_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
+
+	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
+
+	dosed "s/standard symbols l/symbol/g" \
+		/opt/${P}/jre/lib/font.properties
+
+	# install env into /etc/env.d
+	set_java_env ${FILESDIR}/${VMHANDLE} || die
+
+	# Fix for bug 26629
+	if [ "${PROFILE_ARCH}" = "sparc64" ]
+	then
+		dosym /opt/${P}/jre/lib/sparc /opt/${P}/jre/lib/sparc64
+	fi
+
+	unpack_jars
+}
+
+pkg_postinst () {
+	# Set as default system VM if none exists
+	java_pkg_postinst
+
+}
+
diff --git a/dev-java/blackdown-jre/files/blackdown-jre-1.4.2_rc1 b/dev-java/blackdown-jre/files/blackdown-jre-1.4.2_rc1
new file mode 100644
index 000000000000..ac8c63a514aa
--- /dev/null
+++ b/dev-java/blackdown-jre/files/blackdown-jre-1.4.2_rc1
@@ -0,0 +1,14 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author: Karl Trygve Kalleberg
+# Maintainer: Tools Team <tools@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/files/blackdown-jre-1.4.2_rc1,v 1.1 2003/12/24 02:52:29 brad_mssw Exp $
+
+VERSION="Blackdown JRE @PV@"
+JAVA_HOME=/opt/@P@
+CLASSPATH=/opt/@P@/lib/rt.jar
+JRE_HOME=/opt/@P@
+ADDPATH="${JAVA_HOME}/bin"
+ADDLDPATH="/opt/@P@/lib/"
+MANPATH=/opt/@P@/man
+ENV_VARS="JAVA_HOME CLASSPATH JRE_HOME ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2_rc1 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2_rc1
new file mode 100644
index 000000000000..c88b1f57e96d
--- /dev/null
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2_rc1
@@ -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