Version bump

5 files changed, 178 insertions, 5 deletions

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index 4f6ec4e02b49..e7da03312d94 100644
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/blackdown-jdk
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.58 2004/10/01 04:40:56 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.59 2004/10/09 09:39:11 axxo Exp $
+
+*blackdown-jdk-1.4.2 (09 Oct 2004)
+
+  09 Oct 2004; Thomas Matthijs <axxo@gentoo.org> +files/blackdown-jdk-1.4.2,
+  +blackdown-jdk-1.4.2.ebuild:
+  Version bump
 
   01 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
   blackdown-jdk-1.4.2_rc1-r1.ebuild, blackdown-jdk-1.4.2_rc1.ebuild:
diff --git a/dev-java/blackdown-jdk/Manifest b/dev-java/blackdown-jdk/Manifest
index c526222d719e..4f1ffcb6b857 100644
--- a/dev-java/blackdown-jdk/Manifest
+++ b/dev-java/blackdown-jdk/Manifest
@@ -2,25 +2,28 @@
 Hash: SHA1
 
 MD5 9188a678adcbcb490e9a8f2084f9d4fc blackdown-jdk-1.4.2_rc1.ebuild 4225
+MD5 f5a30e1dc6d6bb9d53815d5cdde57d99 blackdown-jdk-1.4.2.ebuild 4183
 MD5 e9d0a60a1cfb2dfc50c81394805b8494 blackdown-jdk-1.4.2_rc1-r1.ebuild 4233
 MD5 0052da924a28441c6378160ecf4a58f9 blackdown-jdk-1.3.1-r8.ebuild 2310
 MD5 c3a1674a9be9f34f261b9e0613a76680 blackdown-jdk-1.3.1-r10.ebuild 2164
 MD5 e99ca75fa6b43db00511d8e515f2a2e0 blackdown-jdk-1.4.1.ebuild 3502
-MD5 614d3f7cbb189a9b9e5659cd6829c42b ChangeLog 10589
+MD5 163bc8d937ef8fe2649785cff37b9550 ChangeLog 10749
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 a61878251515677261fbc5607b6e5a4b files/digest-blackdown-jdk-1.4.2_rc1-r1 162
 MD5 4180217fbbedc728995047569e9bd581 files/blackdown-jdk-1.3.1 594
 MD5 984b14608fd00915095caceed8bc3e00 files/blackdown-jdk-1.4.1 593
+MD5 e0dbef65973e09094b82b9293c2edbfe files/blackdown-jdk-1.4.2 589
 MD5 df9f7a9474494654fa07776f1e4054c9 files/blackdown-jdk-1.4.2_rc1 597
 MD5 729ed4be8a29fe7d7c3d946b8f14d8d4 files/digest-blackdown-jdk-1.3.1-r10 80
 MD5 0a02494663d4bc5af49ce0092ba238a8 files/blackdown-jdk-1.4.2_rc1-r1 600
 MD5 f150863fcc96f4ca2d2bdd75f1c0a1c5 files/digest-blackdown-jdk-1.3.1-r8 243
 MD5 a61878251515677261fbc5607b6e5a4b files/digest-blackdown-jdk-1.4.2_rc1 162
 MD5 8009bc4bb09e243860795380d025f0e5 files/digest-blackdown-jdk-1.4.1 167
+MD5 28c197e72ead945fc266905d593c5fc7 files/digest-blackdown-jdk-1.4.2 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBXN/z/rLF9B432nYRAhB8AKDD/ilnRjN9xp1KqtnqlRDuoN2r3gCeLzTl
-YF2YtjzyiNDI4Gj/TnWVI8I=
-=F8fM
+iD8DBQFBZ7HM/rLF9B432nYRAgLxAJ9hGEaGIclxrdy7SvkPS31Py7+5NQCgl3QH
+dafHNAr+igjdok4JbqaNgRQ=
+=fqkI
 -----END PGP SIGNATURE-----
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.ebuild
new file mode 100644
index 000000000000..40988e43847f
--- /dev/null
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.ebuild,v 1.1 2004/10/09 09:39:11 axxo Exp $
+
+inherit java
+
+JREV="fcs"
+JV=${PV%_*}
+J_URI="mirror://blackdown.org/JDK-${JV}"
+
+DESCRIPTION="Blackdown Java Development Kit"
+SRC_URI="amd64? ( ${J_URI}/amd64/${JREV}/j2sdk-${JV}-${JREV}-linux-amd64.bin )
+	x86? ( ${J_URI}/i386/${JREV}/j2sdk-${JV}-${JREV}-linux-i586-gcc3.2.bin )"
+
+HOMEPAGE="http://www.blackdown.org"
+
+SLOT="1.4.2"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="-* ~x86 ~amd64"
+IUSE="doc mozilla"
+
+DEPEND="virtual/libc
+	>=dev-java/java-config-0.2.6
+	doc? ( =dev-java/java-sdk-docs-1.4.2* )"
+
+PROVIDE="virtual/jdk-1.4.2
+	virtual/jre-1.4.2
+	virtual/java-scheme-2"
+
+S="${WORKDIR}/j2sdk${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)
+
+	echo $offset
+}
+
+src_unpack() {
+	local offset=$(get_offset ${DISTDIR}/${A})
+
+	if [ -z "${offset}" ] ; then
+		die "Failed to get offset of tarball!"
+	fi
+
+	echo ">>> Unpacking ${A}..."
+	tail -n +${offset} ${DISTDIR}/${A} | tar --no-same-owner -jxpf - || die
+}
+
+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() {
+	typeset platform
+
+	dodir /opt/${P}
+
+	cp -a ${S}/{bin,jre,lib,man,include} ${D}/opt/${P} || die "failed to copy"
+
+	dodir /opt/${P}/share/java
+	cp -a ${S}/{demo,src.zip} ${D}/opt/${P}/share || die "failed to copy"
+
+	dodoc COPYRIGHT LICENSE README INSTALL
+	dohtml README.html
+
+	# Install mozilla plugin if mozilla use flag is set
+	if use mozilla; then
+		case ${ARCH} in
+			amd64) platform="amd64" ;;
+			x86) platform="i386" ;;
+			ppc) platform="ppc" ;;
+			sparc*) platform="sparc" ;;
+		esac
+
+		install_mozilla_plugin /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so
+	fi
+
+	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
+
+	sed -i "s/standard symbols l/symbol/g" ${D}/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
+
+	# if chpax is on the target system, set the appropriate PaX flags
+	# this will not hurt the binary, it modifies only unused ELF bits
+	# but may confuse things like AV scanners and automatic tripwire
+	if has_version "sys-apps/chpax"
+	then
+		echo
+		einfo "setting up conservative PaX flags for jar and javac"
+
+		for paxkills in "jar" "javac" "java"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills
+		done
+
+		# /opt/blackdown-jdk-1.4.1/jre/bin/java_vm
+		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/jre/bin/java_vm
+
+		einfo "you should have seen lots of chpax output above now"
+		ewarn "make sure the grsec ACL contains those entries also"
+		ewarn "because enabling it will override the chpax setting"
+		ewarn "on the physical files - help for PaX and grsecurity"
+		ewarn "can be given by #gentoo-hardened + pappy@gentoo.org"
+	fi
+}
diff --git a/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2 b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2
new file mode 100644
index 000000000000..b65e150c49c9
--- /dev/null
+++ b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2
@@ -0,0 +1,12 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2,v 1.1 2004/10/09 09:39:11 axxo Exp $
+
+VERSION="Blackdown JDK @PV@"
+JAVA_HOME=/opt/@P@
+JDK_HOME=/opt/@P@
+JAVAC=${JAVA_HOME}/bin/javac
+ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ADDLDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/classic/"
+MANPATH=/opt/@P@/man
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2 b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2
new file mode 100644
index 000000000000..7eeae8b0d5dc
--- /dev/null
+++ b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2
@@ -0,0 +1,2 @@
+MD5 9c5514598e43ff20cd6e5de47e59bb5e j2sdk-1.4.2-fcs-linux-amd64.bin 34026066
+MD5 686e62731595eb843413402912e185e2 j2sdk-1.4.2-fcs-linux-i586-gcc3.2.bin 34299933