Now installs javaws, fixing bug #147260

(Portage version: 2.1.1)

4 files changed, 140 insertions, 5 deletions

diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index b41897d1fc27..b02188b1f028 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.81 2006/09/03 01:20:23 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.82 2006/09/15 02:41:11 nichoj Exp $
+
+*blackdown-jre-1.4.2.03-r13 (15 Sep 2006)
+
+  15 Sep 2006; Joshua Nichols <nichoj@gentoo.org>
+  +blackdown-jre-1.4.2.03-r13.ebuild:
+  Now installs javaws, fixing bug #147260
 
   03 Sep 2006; Joshua Nichols <nichoj@gentoo.org>
   -files/blackdown-jre-1.3.1, -files/blackdown-jre-1.3.env,
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2.03-r13.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2.03-r13.ebuild
new file mode 100644
index 000000000000..186773fd7011
--- /dev/null
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2.03-r13.ebuild
@@ -0,0 +1,123 @@
+# 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-r13.ebuild,v 1.1 2006/09/15 02:41:11 nichoj Exp $
+
+inherit java-vm-2 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="nsplugin"
+DEPEND=">=sys-apps/sed-4"
+JAVA_PROVIDE="jdbc-stdext"
+
+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,man,plugin,javaws} ${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; 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 ${JAVAHOME} -type f -name "*.so" -exec chmod +x \{\} \;
+
+	# install env into /etc/env.d
+	set_java_env
+
+	# 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/blackdown-jre-1.4.2.03-r2.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2.03-r2.ebuild
index 49dc1f241304..1f033349b521 100644
--- 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
@@ -1,6 +1,6 @@
 # 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.3 2006/07/06 11:19:53 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.03-r2.ebuild,v 1.4 2006/09/15 02:41:11 nichoj Exp $
 
 inherit java versionator
 
@@ -111,9 +111,9 @@ src_install() {
 	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
+	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" ;;
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2.03-r13 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2.03-r13
new file mode 100644
index 000000000000..3359453bf0ac
--- /dev/null
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2.03-r13
@@ -0,0 +1,6 @@
+MD5 0785ca638962dc85a31dd8a6dc40007a j2re-1.4.2-03-linux-amd64.bin 13198020
+RMD160 7ead3f8084060d689b91a65d2601d047c1ba2fb2 j2re-1.4.2-03-linux-amd64.bin 13198020
+SHA256 036c8595da3e6157971efe333db7d771bbc8eabae36b691341c2199172aa9439 j2re-1.4.2-03-linux-amd64.bin 13198020
+MD5 cf4f3c8c86f64fd532f074943b432285 j2re-1.4.2-03-linux-i586.bin 13541431
+RMD160 82c707956dc65e9640fda97587ac7426e4f7be98 j2re-1.4.2-03-linux-i586.bin 13541431
+SHA256 636c414583f22d7d9f12f56855bfcb84227cec100ed0108a2b8f0e5f6b7025ef j2re-1.4.2-03-linux-i586.bin 13541431