Added X and alsa USE flags. Also fixes bug #23579.

(Portage version: 2.1_pre3-r1)

4 files changed, 167 insertions, 11 deletions

diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index 6b9f96bdf5bc..c20cf2466119 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.73 2006/01/19 00:21:32 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.74 2006/01/20 00:27:07 nichoj Exp $
+
+*blackdown-jre-1.4.2.03-r2 (20 Jan 2006)
+
+  20 Jan 2006; Joshua Nichols <nichoj@gentoo.org>
+  +blackdown-jre-1.4.2.03-r2.ebuild:
+  Added X and alsa USE flags. Also fixes bug #23579.
 
 *blackdown-jre-1.4.2.03-r1 (19 Jan 2006)
 
diff --git a/dev-java/blackdown-jre/Manifest b/dev-java/blackdown-jre/Manifest
index 4240fb252fcd..568ca361113c 100644
--- a/dev-java/blackdown-jre/Manifest
+++ b/dev-java/blackdown-jre/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4cbd35d0bc517a7de573fa7512ce7cec ChangeLog 12227
 MD5 0551cd0e289fdeb3c1e4a9669e52295b blackdown-jre-1.3.1-r9.ebuild 2110
 MD5 82e23551209a3a7e209e964266e73441 blackdown-jre-1.4.1-r1.ebuild 3296
@@ -8,6 +5,7 @@ MD5 8283580d64653ee645bf1efbf08c8411 blackdown-jre-1.4.2.01-r1.ebuild 3780
 MD5 9dadda9e4d4d251288aa15d5521ed9b0 blackdown-jre-1.4.2.02-r1.ebuild 4022
 MD5 e4ef632da5c249807746a4236cab9406 blackdown-jre-1.4.2.02.ebuild 3778
 MD5 715ef607c82067d7687aa94c95bf3dcc blackdown-jre-1.4.2.03-r1.ebuild 4017
+MD5 57f83eb457a82c41d3cd89f07dd9ac1a blackdown-jre-1.4.2.03-r2.ebuild 4382
 MD5 4d4c3d9287340f69e9f95b78b52da040 blackdown-jre-1.4.2.03.ebuild 4005
 MD5 3facc5cbb2965471e9b1986926221552 files/blackdown-jre-1.3.1 429
 MD5 271b1f89b9f0f70dd5154090978263b1 files/blackdown-jre-1.4.1 425
@@ -21,11 +19,5 @@ MD5 71bbb04601fe32e845c98fab7f732ae4 files/digest-blackdown-jre-1.4.2.02 151
 MD5 71bbb04601fe32e845c98fab7f732ae4 files/digest-blackdown-jre-1.4.2.02-r1 151
 MD5 04af3df8c78a9249bbe79570db1fefea files/digest-blackdown-jre-1.4.2.03 151
 MD5 04af3df8c78a9249bbe79570db1fefea files/digest-blackdown-jre-1.4.2.03-r1 151
+MD5 04af3df8c78a9249bbe79570db1fefea files/digest-blackdown-jre-1.4.2.03-r2 151
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDztvWndWRXhKOboURAklsAJ4s1aaD/PHr5OgvordTcy1nrQ4BqQCfQx6O
-Fyo/1xK+WBtBYcnAZPMan1Y=
-=l6hW
------END PGP SIGNATURE-----
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2.03-r2.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2.03-r2.ebuild
new file mode 100644
index 000000000000..d4dfc3fdd69b
--- /dev/null
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2.03-r2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2006 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.03-r2.ebuild,v 1.1 2006/01/20 00:27:07 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 Runtime Environment"
+SRC_URI="amd64? ( ${J_URI}/amd64/${JREV}/j2re-${JV}-${JREV}-linux-amd64.bin )
+	x86? ( ${J_URI}/i386/${JREV}/j2re-${JV}-${JREV}-linux-i586.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="X alsa browserplugin nsplugin mozilla"
+DEPEND="virtual/libc
+	>=sys-apps/sed-4
+	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/jre"
+
+S="${WORKDIR}/j2re${JV}"
+
+JAVAHOME="${D}/opt/${P}"
+
+# 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 -jxpf -
+}
+
+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 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
+					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 -pPR ${S}/{bin,lib,javaws,man,plugin} ${JAVAHOME} || die "failed to copy"
+
+	newicon ${JAVAHOME}/plugin/desktop/sun_java.png ${PN}-${SLOT}.png || die "failed to install icon"
+	rm -fr ${JAVAHOME}/plugin/desktop
+	make_desktop_entry "ControlPanel" "Java Control Panel" "${PN}-${SLOT}.png" "Settings" \
+		|| die "failed to make desktop entry"
+
+	dodoc COPYRIGHT README
+
+	# Install mozilla plugin
+	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
+			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 ${JAVAHOME} -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
+
+	# Fix bug #115734
+	use !alsa && java_remove-libjsoundalsa /opt/${P}/jre/
+
+	# Fix bug #23579
+	fix-i386-dir /opt/${P}/lib/
+}
+
+pkg_postinst() {
+	java_pkg_postinst
+	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-jre/files/digest-blackdown-jre-1.4.2.03-r2 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2.03-r2
new file mode 100644
index 000000000000..864b6ea3cefc
--- /dev/null
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2.03-r2
@@ -0,0 +1,2 @@
+MD5 0785ca638962dc85a31dd8a6dc40007a j2re-1.4.2-03-linux-amd64.bin 13198020
+MD5 cf4f3c8c86f64fd532f074943b432285 j2re-1.4.2-03-linux-i586.bin 13541431