No longer installs libjsoundalsa.so with USE=-alsa, to fix bug #115734.

(Portage version: 2.1_pre3-r1)

4 files changed, 189 insertions, 11 deletions

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index e9c2f99f9cdd..9edf75b3cc6b 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.96 2006/01/14 21:46:11 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.97 2006/01/16 03:44:56 nichoj Exp $
+
+*blackdown-jdk-1.4.2.03-r1 (16 Jan 2006)
+
+  16 Jan 2006; Joshua Nichols <nichoj@gentoo.org>
+  +blackdown-jdk-1.4.2.03-r1.ebuild:
+  No longer installs libjsoundalsa.so with USE=-alsa, to fix bug #115734.
 
   14 Jan 2006; Joshua Nichols <nichoj@gentoo.org>
   blackdown-jdk-1.3.1-r8.ebuild, blackdown-jdk-1.3.1-r10.ebuild,
diff --git a/dev-java/blackdown-jdk/Manifest b/dev-java/blackdown-jdk/Manifest
index bf0b14261c84..f185af5727ed 100644
--- a/dev-java/blackdown-jdk/Manifest
+++ b/dev-java/blackdown-jdk/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 797b9ee08783c52e9a6e92b25dfdac56 ChangeLog 17192
 MD5 46e75bc29c3dc1323d312881586f2c5a blackdown-jdk-1.3.1-r10.ebuild 2578
 MD5 4a1ff4237b5dfdc5b3b6a86d76347fc2 blackdown-jdk-1.3.1-r8.ebuild 2713
 MD5 892952a720241e492fa97686a7316dc5 blackdown-jdk-1.4.1-r1.ebuild 4376
 MD5 b63fe3473976c09db2dcc0a517eb7276 blackdown-jdk-1.4.2.02.ebuild 4749
+MD5 606ee7b922f09d209fafdf5f90a1dceb blackdown-jdk-1.4.2.03-r1.ebuild 5086
 MD5 dc481f899be1d3576599da0dedf267da blackdown-jdk-1.4.2.03.ebuild 5027
 MD5 4180217fbbedc728995047569e9bd581 files/blackdown-jdk-1.3.1 594
 MD5 b553ff878f45505a9285c3a9612c7584 files/blackdown-jdk-1.4.1 589
@@ -16,11 +14,5 @@ MD5 f150863fcc96f4ca2d2bdd75f1c0a1c5 files/digest-blackdown-jdk-1.3.1-r8 243
 MD5 8009bc4bb09e243860795380d025f0e5 files/digest-blackdown-jdk-1.4.1-r1 167
 MD5 c36468f22832c3157f0fcda9b03b3bff files/digest-blackdown-jdk-1.4.2.02 153
 MD5 74c533f60298d5a44d0c7a38ab1606e0 files/digest-blackdown-jdk-1.4.2.03 153
+MD5 74c533f60298d5a44d0c7a38ab1606e0 files/digest-blackdown-jdk-1.4.2.03-r1 153
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDyXE5ndWRXhKOboURAsKrAKDOMHAWsZAYzH1rTd+8D+9PfsnUEgCfTyiX
-4uaGbBwhfMtp9PpbeJOB2k4=
-=PgHm
------END PGP SIGNATURE-----
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r1.ebuild
new file mode 100644
index 000000000000..6ea21cb9230a
--- /dev/null
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2006 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.03-r1.ebuild,v 1.1 2006/01/16 03:44:56 nichoj Exp $
+
+inherit java versionator
+
+JREV=$(get_version_component_range 4- )
+JV=$(get_version_component_range 1-3 )
+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="-* ~amd64 ~x86"
+IUSE="X alsa doc browserplugin nsplugin mozilla"
+
+DEPEND="doc? ( =dev-java/java-sdk-docs-1.4.2* )"
+
+RDEPEND="${DEPEND}
+	sys-libs/glibc
+	alsa? ( media-libs/alsa-lib )
+	X? ( || ( (
+				x11-libs/libICE
+				x11-libs/libSM
+				x11-libs/libX11
+				x11-libs/libXext
+				x11-libs/libXi
+				x11-libs/libXp
+				x11-libs/libXt
+				x11-libs/libXtst
+			  )
+			  virtual/x11
+			)
+		)"
+
+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 -pPR ${S}/{bin,jre,lib,man,include} ${D}/opt/${P} || die "failed to copy"
+
+	dodir /opt/${P}/share/java
+	cp -pPR ${S}/{demo,src.zip} ${D}/opt/${P}/share || die "failed to copy"
+
+	dodoc README
+	dohtml README.html
+
+	if use nsplugin ||       # global useflag for netscape-compat plugins
+	   use browserplugin ||  # deprecated but honor for now
+	   use mozilla; then     # wrong but used to honor it
+		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
+
+
+	use !alsa && java_remove-libjsoundalsa /opt/${P}/jre/
+
+	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/${P}/bin/$paxkills
+		done
+
+		# /opt/blackdown-jdk-1.4.1/jre/bin/java_vm
+		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/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 + hardened@gentoo.org"
+	fi
+	if ! use nsplugin && ( use browserplugin || use mozilla ); then
+		echo
+		ewarn "The 'browserplugin' and 'mozilla' useflags will not be honored in"
+		ewarn "future jdk/jre ebuilds for plugin installation.  Please"
+		ewarn "update your USE to include 'nsplugin'."
+	fi
+}
diff --git a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.03-r1 b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.03-r1
new file mode 100644
index 000000000000..9f25e6feb6e4
--- /dev/null
+++ b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.03-r1
@@ -0,0 +1,2 @@
+MD5 fa1add887128fb01d255356680a09445 j2sdk-1.4.2-03-linux-amd64.bin 33997205
+MD5 357e1b2c22abcef2db561a338f7dbfe3 j2sdk-1.4.2-03-linux-i586.bin 34375872