version bump

(Portage version: 2.0.51.22-r1)

5 files changed, 178 insertions, 11 deletions

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index bd29fffb183d..59e6da54ea18 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.82 2005/06/06 18:37:22 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.83 2005/06/16 09:37:33 axxo Exp $
+
+*blackdown-jdk-1.4.2.02 (16 Jun 2005)
+
+  16 Jun 2005; Thomas Matthijs <axxo@gentoo.org>
+  +files/blackdown-jdk-1.4.2.02, +blackdown-jdk-1.4.2.02.ebuild:
+  version bump
 
   06 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>
   blackdown-jdk-1.3.1-r8.ebuild, blackdown-jdk-1.4.1-r1.ebuild,
diff --git a/dev-java/blackdown-jdk/Manifest b/dev-java/blackdown-jdk/Manifest
index e160fa862914..f4f1e239f792 100644
--- a/dev-java/blackdown-jdk/Manifest
+++ b/dev-java/blackdown-jdk/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 d6321ee09f62d93fcd8ff7bbba3b2578 blackdown-jdk-1.4.2.02.ebuild 4423
 MD5 80d61f3f665a5eda1912150ee129bd4c blackdown-jdk-1.3.1-r8.ebuild 2281
 MD5 b94383a5c2ad33d0734b6b4c2eb89e5d blackdown-jdk-1.4.1-r1.ebuild 3790
 MD5 1cc80baa11ea4623795c4462b727c260 blackdown-jdk-1.3.1-r10.ebuild 2138
@@ -8,16 +6,11 @@ MD5 a35654e86d32c3b136d11e7a05226187 ChangeLog 14636
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 bd3214c971f08ff72c5b0274f49a3d33 blackdown-jdk-1.4.2.01-r2.ebuild 4421
 MD5 c9852c72bb83b5f0d4b48f1dd3ca4459 files/blackdown-jdk-1.4.2.01 637
+MD5 c9852c72bb83b5f0d4b48f1dd3ca4459 files/blackdown-jdk-1.4.2.02 637
 MD5 4180217fbbedc728995047569e9bd581 files/blackdown-jdk-1.3.1 594
 MD5 b553ff878f45505a9285c3a9612c7584 files/blackdown-jdk-1.4.1 589
 MD5 4e91fa8beedb2d7c135e05318b097702 files/digest-blackdown-jdk-1.4.2.01-r2 153
 MD5 729ed4be8a29fe7d7c3d946b8f14d8d4 files/digest-blackdown-jdk-1.3.1-r10 80
 MD5 f150863fcc96f4ca2d2bdd75f1c0a1c5 files/digest-blackdown-jdk-1.3.1-r8 243
 MD5 8009bc4bb09e243860795380d025f0e5 files/digest-blackdown-jdk-1.4.1-r1 167
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCpJf+06ebR+OMO78RAruKAJ0VTftqjOmQplNPpWSdaCtQpuZKQgCglaa8
-saTcQQ8WLRW9+ImUVPGIK6M=
-=BJS+
------END PGP SIGNATURE-----
+MD5 d34d50bd7f4e62450f61638150494283 files/digest-blackdown-jdk-1.4.2.02 151
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.02.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.02.ebuild
new file mode 100644
index 000000000000..d29732ef82fd
--- /dev/null
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.02.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2005 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.02.ebuild,v 1.1 2005/06/16 09:37:33 axxo Exp $
+
+inherit java versionator
+
+JREV="02"
+JV=${PV%_*}
+JV=$(get_version_component_range 1-3 ${JV})
+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.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-1.2.11
+	doc? ( =dev-java/java-sdk-docs-1.4.2* )"
+
+PROVIDE="virtual/jdk
+	virtual/jre"
+
+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=""
+		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
+					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
+	else
+		rm -f ${D}/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"
+
+		CHPAX_CONSERVATIVE_FLAGS="pemrxs"
+
+		for paxkills in "jar" "javac" "java" "javah" "javadoc"
+		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.02 b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.02
new file mode 100644
index 000000000000..356cb4502dae
--- /dev/null
+++ b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.02
@@ -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.02,v 1.1 2005/06/16 09:37:33 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/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
+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.02 b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.02
new file mode 100644
index 000000000000..b54e4e6a074b
--- /dev/null
+++ b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.02
@@ -0,0 +1,2 @@
+MD5 057595edab392e0cb3621c3454c0c2f5 j2sdk-1.4.2-02-linux-amd64.bin 576872
+MD5 a65733528562794b7838407084cabd9a j2sdk-1.4.2-02-linux-i586.bin 34361479