Partial fix for #3029.

3 files changed, 24 insertions, 33 deletions

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index 044364fce1cc..d1368711d0ca 100644
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/blackdown-jdk
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.8 2002/05/26 20:04:17 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.9 2002/06/25 01:35:16 karltk Exp $
+
+*blackdown-jdk-1.3.1-r7 (25 Jun 2002)
+
+  25 Jun 2002; Karl Trygve Kalleberg <karltk@gentoo.org> blackdown-jdk-1.3.1-r7.ebuild files/digest-blackdown-jdk-1.3.1-r7:
+ 
+  Now Blackdown JDK is set to be the default VM if none are set on install.
+
+  Removed blackdown-jdk-1.3.1-r6.ebuild files/digest-blackdown-jdk-1.3.1-r6
 
 *blackdown-jdk-1.3.1-r6 (26 May 2002)
 
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r6.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild
index f209e0f951ab..8cbe1cecb843 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r6.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild
@@ -1,21 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r6.ebuild,v 1.1 2002/05/26 20:04:17 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild,v 1.1 2002/06/25 01:35:16 karltk Exp $
 
-SYSTEM_ARCH=`echo $ARCH |\
-  sed -e s/[i]*.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/`
-if [ -z "$SYSTEM_ARCH" ]
-then
-	SYSTEM_ARCH=`uname -m |\
-    sed -e s/[i]*.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/`
-fi 
+. /usr/portage/eclass/inherit.eclass
+inherit java
 
-PLATFORM="i386"
-FCS="FCS"
-MY_P="j2sdk-1.3.1-FCS-linux-i386.tar.bz2"
-
-case $SYSTEM_ARCH in
+case `system_arch` in
 	ppc)
 		PLATFORM="ppc"
 		FCS="FCS-02b"
@@ -24,11 +15,9 @@ case $SYSTEM_ARCH in
 
 	i386)
 		PLATFORM="i386"
-		#Change FCS if you want to use a beta version
 		FCS="FCS"
 		MY_P="j2sdk-1.3.1-FCS-linux-i386.tar.bz2"
 		;;
-
 	sparc)
 		;;
 
@@ -40,21 +29,21 @@ S=${WORKDIR}/j2sdk1.3.1
 DESCRIPTION="Blackdown Java Development Kit 1.3.1"
 SRC_URI="ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.1/${PLATFORM}/${FCS}/${MY_P}"
 HOMEPAGE="http://www.blackdown.org"
-
 DEPEND="virtual/glibc
 	>=dev-java/java-config-0.2.0"
-	
 RDEPEND="$DEPEND"
 PROVIDE="virtual/jdk-1.3
 	virtual/jre-1.3
 	virtual/java-scheme-2"
+SLOT="0"
+LICENSE=""
 
 src_unpack () {
 	if [ $PLATFORM = "ppc" ]; then
 		tail +400 ${DISTDIR}/${MY_P} > j2sdk-1.3.1-ppc.tar.bz2
 		tar -xjf j2sdk-1.3.1-ppc.tar.bz2
 	else
-	unpack ${MY_P}
+		unpack ${MY_P}
 	fi
 }
 
@@ -71,10 +60,8 @@ src_install () {
 	dodoc COPYRIGHT LICENSE README INSTALL
 	dohtml README.html
 
-	if [ "`use mozilla`" ] ; then
-		dodir /usr/lib/mozilla/plugins
-		dosym /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so /usr/lib/mozilla/plugins/javaplugin_oji.so
-	fi	
+	# Install mozilla plugin
+	install_mozilla_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so 
 
 	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
 
@@ -84,19 +71,15 @@ src_install () {
 		> ${D}/opt/${P}/jre/lib/font.properties
 	rm ${D}/opt/${P}/jre/lib/font.properties.orig
 	
-	dodir /etc/env.d/java
-	sed \
-		-e "s/@P@/${P}/g" \
-		-e "s/@PV@/${PV}/g" \
-		-e "s/@PF@/${PF}/g" \
-		< ${FILESDIR}/blackdown-jdk-${PV} \
-		> ${D}/etc/env.d/java/20blackdown-jdk-${PV}
+	# install env into /etc/env.d
+	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
 
 pkg_postinst () {
-	if [ "`use mozilla`" ] ; then
-		einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins/javaplugin_oji.so"
-	else 
+	# Set as default system VM if none exists
+	java_pkg_postinst
+
+	if [ -z "`use mozilla`" ] ; then
 		einfo "For instructions on installing the ${P} browser plugin for"
 		einfo "Netscape and Mozilla, see /usr/share/doc/${P}/INSTALL."
 	fi
diff --git a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.3.1-r6 b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.3.1-r7
index 0171077cc4b5..0171077cc4b5 100644
--- a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.3.1-r6
+++ b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.3.1-r7