Now installs javaws, fixing bug #147260

Package-Manager: portage-2.1.1

5 files changed, 155 insertions, 13 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/Manifest b/dev-java/blackdown-jre/Manifest
index ee8b9d6c6ce3..eaa95630f9b7 100644
--- a/dev-java/blackdown-jre/Manifest
+++ b/dev-java/blackdown-jre/Manifest
@@ -16,18 +16,22 @@ EBUILD blackdown-jre-1.4.2.03-r12.ebuild 3488 RMD160 025f9e2745eeb2658bc40cb50f4
 MD5 7889bb5e75e53c0b929fc24e85ca4a3f blackdown-jre-1.4.2.03-r12.ebuild 3488
 RMD160 025f9e2745eeb2658bc40cb50f4e5b08a7379603 blackdown-jre-1.4.2.03-r12.ebuild 3488
 SHA256 bfe6bd0d3dd4046fce52bd93d86073d4d9b0fecdbee122366e9539103a324d43 blackdown-jre-1.4.2.03-r12.ebuild 3488
-EBUILD blackdown-jre-1.4.2.03-r2.ebuild 4350 RMD160 bd56b42a625c9dbf810f5e2700a30f810318517c SHA1 4bdaf370d953c51da0a987383210c0a99128293a SHA256 6a7fc983232e13e9c4f840f000ced3bd2a13c51e58ef6dd825498811ed6e9145
-MD5 e9466777b8441b4d9c81e293ea4eef91 blackdown-jre-1.4.2.03-r2.ebuild 4350
-RMD160 bd56b42a625c9dbf810f5e2700a30f810318517c blackdown-jre-1.4.2.03-r2.ebuild 4350
-SHA256 6a7fc983232e13e9c4f840f000ced3bd2a13c51e58ef6dd825498811ed6e9145 blackdown-jre-1.4.2.03-r2.ebuild 4350
+EBUILD blackdown-jre-1.4.2.03-r13.ebuild 3495 RMD160 bf83af24061a8554dfd8b2d170d979274e140ea5 SHA1 9e20ae06c8e8cd25abcf877c16b56c48cede2556 SHA256 e79d56e976a8384c6f7baf6e726ee1a54487dd72414a3e01190fa439a61c3a06
+MD5 a7a290d100c32595bd7edee8ce6ec8b6 blackdown-jre-1.4.2.03-r13.ebuild 3495
+RMD160 bf83af24061a8554dfd8b2d170d979274e140ea5 blackdown-jre-1.4.2.03-r13.ebuild 3495
+SHA256 e79d56e976a8384c6f7baf6e726ee1a54487dd72414a3e01190fa439a61c3a06 blackdown-jre-1.4.2.03-r13.ebuild 3495
+EBUILD blackdown-jre-1.4.2.03-r2.ebuild 4336 RMD160 d13b40fd6286d5a1f43066aadb9851b4b99bf947 SHA1 9791768621b068bd8d38763f59510c44a88485ef SHA256 633acd729f16f77141f76cd0a426bbf6555bbdcc61e8095a9e898902a0423820
+MD5 1513738b7a694895e6b21eb82bbe81fd blackdown-jre-1.4.2.03-r2.ebuild 4336
+RMD160 d13b40fd6286d5a1f43066aadb9851b4b99bf947 blackdown-jre-1.4.2.03-r2.ebuild 4336
+SHA256 633acd729f16f77141f76cd0a426bbf6555bbdcc61e8095a9e898902a0423820 blackdown-jre-1.4.2.03-r2.ebuild 4336
 EBUILD blackdown-jre-1.4.2.03.ebuild 3971 RMD160 47fbb87f9deba0f9573c0d8ae73183e662ca5de6 SHA1 7c41eb13dee9266d12c77f5ee388a5c4104fee15 SHA256 5e9ef77ebfe2ca13279ef60a0f7181e07efc2776e3897a8233c0a0099ec169da
 MD5 40074b507b5abdabb141ba1b4bc280d6 blackdown-jre-1.4.2.03.ebuild 3971
 RMD160 47fbb87f9deba0f9573c0d8ae73183e662ca5de6 blackdown-jre-1.4.2.03.ebuild 3971
 SHA256 5e9ef77ebfe2ca13279ef60a0f7181e07efc2776e3897a8233c0a0099ec169da blackdown-jre-1.4.2.03.ebuild 3971
-MISC ChangeLog 14713 RMD160 8a96c4f1397c4bd519c1d2d38f643bf2e0492dc1 SHA1 ef38dff9387e26e4bf478b7433c31c9ab8e0a67d SHA256 48de3fb15ab0758e26899ee19686d587130ea1eee8096a2fb3324afb3d17ea26
-MD5 033e87d2ef4c52747a731f64f2a4a5c2 ChangeLog 14713
-RMD160 8a96c4f1397c4bd519c1d2d38f643bf2e0492dc1 ChangeLog 14713
-SHA256 48de3fb15ab0758e26899ee19686d587130ea1eee8096a2fb3324afb3d17ea26 ChangeLog 14713
+MISC ChangeLog 14887 RMD160 2d547f521d1fcad3c56a30fed8b18b50ddb84b72 SHA1 f359bfeff67ebd6bdab8e6fe0f6140daf87c3fa1 SHA256 e15ce215edfbe69108197baac328f35ee4190bf6dd09bf24be93a895d0856084
+MD5 8ff344114a310b6d5807c47a7f13671c ChangeLog 14887
+RMD160 2d547f521d1fcad3c56a30fed8b18b50ddb84b72 ChangeLog 14887
+SHA256 e15ce215edfbe69108197baac328f35ee4190bf6dd09bf24be93a895d0856084 ChangeLog 14887
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -41,6 +45,9 @@ SHA256 21bf4f2b62747876401ef3bcf50f15d0ba8d371cf9ed04e2528591c934282da8 files/di
 MD5 a4edfa2e2a6a20f2d7ed848170936fbd files/digest-blackdown-jre-1.4.2.03-r12 545
 RMD160 e1330992f66c365579792dee8b34907c422815dc files/digest-blackdown-jre-1.4.2.03-r12 545
 SHA256 21bf4f2b62747876401ef3bcf50f15d0ba8d371cf9ed04e2528591c934282da8 files/digest-blackdown-jre-1.4.2.03-r12 545
+MD5 a4edfa2e2a6a20f2d7ed848170936fbd files/digest-blackdown-jre-1.4.2.03-r13 545
+RMD160 e1330992f66c365579792dee8b34907c422815dc files/digest-blackdown-jre-1.4.2.03-r13 545
+SHA256 21bf4f2b62747876401ef3bcf50f15d0ba8d371cf9ed04e2528591c934282da8 files/digest-blackdown-jre-1.4.2.03-r13 545
 MD5 a4edfa2e2a6a20f2d7ed848170936fbd files/digest-blackdown-jre-1.4.2.03-r2 545
 RMD160 e1330992f66c365579792dee8b34907c422815dc files/digest-blackdown-jre-1.4.2.03-r2 545
 SHA256 21bf4f2b62747876401ef3bcf50f15d0ba8d371cf9ed04e2528591c934282da8 files/digest-blackdown-jre-1.4.2.03-r2 545
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