version bump

5 files changed, 147 insertions, 12 deletions

diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index cad0204147c0..43f08f4e6b96 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.46 2004/10/05 21:58:02 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.47 2004/10/09 09:52:58 axxo Exp $
+
+*blackdown-jre-1.4.2 (09 Oct 2004)
+
+  09 Oct 2004; Thomas Matthijs <axxo@gentoo.org> +files/blackdown-jre-1.4.2,
+  +blackdown-jre-1.4.2.ebuild:
+  Version bump
 
 *blackdown-jre-1.4.2_rc1-r2 (05 Oct 2004)
 
diff --git a/dev-java/blackdown-jre/Manifest b/dev-java/blackdown-jre/Manifest
index 3e2f7e820cfd..aa437bdca949 100644
--- a/dev-java/blackdown-jre/Manifest
+++ b/dev-java/blackdown-jre/Manifest
@@ -1,24 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a08a19a36bcbc231440fe02887dd7f58 blackdown-jre-1.4.1.ebuild 2351
 MD5 6cef0129aa702d492e901f2acf3267c2 blackdown-jre-1.4.2_rc1-r2.ebuild 3263
 MD5 ba7a0a5afe09b6aba7eb272554806e4d blackdown-jre-1.3.1-r9.ebuild 1726
 MD5 4500461c6cd7d20d40cbf7f468b17f55 blackdown-jre-1.4.2_rc1-r1.ebuild 3392
-MD5 2f9fc02f303d7b75fe3ca8090a464279 ChangeLog 7326
+MD5 632cc371b43d41d7df99bb4643d6a1b7 blackdown-jre-1.4.2.ebuild 3242
+MD5 2b07f13935fcf6c87c0b7dd92b367909 ChangeLog 7486
 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 59321a1d883e9a72002841f77c68a3fb files/digest-blackdown-jre-1.4.2 160
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBYxkt/rLF9B432nYRAgfpAJ4lPw9CiCxTnpkeD+mOWT3hyHUi5QCfcPou
-uTVxP6WI4PFNICr+vBcOzho=
-=az63
------END PGP SIGNATURE-----
+MD5 4d1e4299a9d265e31c10498f5457dc1c files/blackdown-jre-1.4.2 436
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2.ebuild
new file mode 100644
index 000000000000..47e5a5a7d69d
--- /dev/null
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2.ebuild
@@ -0,0 +1,123 @@
+# 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.ebuild,v 1.1 2004/10/09 09:52:58 axxo Exp $
+
+inherit java
+
+JREV="fcs"
+
+JV="${PV}"
+
+DESCRIPTION="Blackdown Java Runtime Environment ${PV}"
+J_URI="mirror://blackdown.org/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"
+
+S="${WORKDIR}/j2re${JV}"
+# 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/blackdown-jre-1.4.2 b/dev-java/blackdown-jre/files/blackdown-jre-1.4.2
new file mode 100644
index 000000000000..83a9651a10db
--- /dev/null
+++ b/dev-java/blackdown-jre/files/blackdown-jre-1.4.2
@@ -0,0 +1,11 @@
+# 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/files/blackdown-jre-1.4.2,v 1.1 2004/10/09 09:52:58 axxo Exp $
+
+VERSION="Blackdown JRE @PV@"
+JAVA_HOME=/opt/@P@
+JRE_HOME=/opt/@P@
+ADDPATH="${JAVA_HOME}/bin"
+ADDLDPATH="/opt/@P@/lib/"
+MANPATH=/opt/@P@/man
+ENV_VARS="JAVA_HOME JRE_HOME ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2
new file mode 100644
index 000000000000..a96ba1b3185a
--- /dev/null
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2
@@ -0,0 +1,2 @@
+MD5 1a1b34303d4fe19b715e54ca2a84845f j2re-1.4.2-fcs-linux-amd64.bin 13128030
+MD5 e56d10391bc31f660147392a09fc4de6 j2re-1.4.2-fcs-linux-i586-gcc3.2.bin 13495414