Major updates. #754

4 files changed, 34 insertions, 12 deletions

diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index 10c16f4175ec..29cd5ba0871b 100644
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/blackdown-jre
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.2 2002/03/18 21:45:38 karltk Exp $
+
+*blackdown-jre-1.3.1-r5 (18 Mar 2002)
+
+  18 Mar 2002; Karl Trygve Kalleberg <karltk@gentoo.org> blackdown-jre-1.3.1-r5.ebuild files/digest-blackdown-jre-1.3.1-r5 files/blackdown-jre-1.3.1 :
+
+  Added support for JVM switching.
+
+  Removed old revisions.
 
 *blackdown-jre-1.3.1-r4 (1 Feb 2002)
 
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r4.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r5.ebuild
index e01a6d98f640..9bb420db4785 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r4.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r5.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2001 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-jre/blackdown-jre-1.3.1-r4.ebuild,v 1.2 2002/01/29 14:12:47 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r5.ebuild,v 1.1 2002/03/18 21:45:38 karltk Exp $
 
 A=j2re-1.3.1-FCS-linux-i386.tar.bz2
 S=${WORKDIR}/j2re1.3.1
-DESCRIPTION="Java Runtime Environment"
+DESCRIPTION="Blackdown Java Runtime Environment 1.3.1"
 SRC_URI="ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.1/i386/FCS/${A}"
 HOMEPAGE="http://www.blackdown.org"
 
 DEPEND="virtual/glibc
-	>=dev-java/java-config-0.1.3"
+	>=dev-java/java-config-0.2.0"
 RDEPEND="$DEPEND"
 
-PROVIDE="virtual/jre-1.3"
+PROVIDE="virtual/jre-1.3-r1"
 
 src_install () {
 	insinto /opt/${P}
@@ -137,13 +137,13 @@ src_install () {
 		dosym /opt/${P}/plugin/i386/mozilla/javaplugin_oji.so /usr/lib/mozilla/plugins/javaplugin_oji.so
 	fi
 	
-	dodir /etc/env.d
-	echo "PATH=/opt/${P}/bin" > ${D}/etc/env.d/20jre
-	echo "JRE_HOME=/opt/${P}" >> ${D}/etc/env.d/20jre
-	echo "JAVA_HOME=/opt/${P}" >> ${D}/etc/env.d/20jre
-	echo "ROOTPATH=/opt/${P}/bin" >> ${D}/etc/env.d/20jre
-	echo "CLASSPATH=/opt/${P}/lib/rt.jar" >> ${D}/etc/env.d/20jre
-        echo "LDPATH=/opt/${P}/lib/i386:/opt/${P}/lib/i386/client" >> ${D}/etc/env.d/20jre
+        dodir /etc/env.d/java
+        sed \
+		-e "s/@P@/${P}/g" \
+		-e "s/@PV@/${PV}/g" \
+		-e "s/@PF@/${PF}/g" \
+		< ${FILESDIR}/blackdown-jre-${PV} \
+		> ${D}/etc/env.d/java/20blackdown-jre-${PV}
 }
 
 pkg_postinst () {
diff --git a/dev-java/blackdown-jre/files/blackdown-jre-1.3.1 b/dev-java/blackdown-jre/files/blackdown-jre-1.3.1
new file mode 100644
index 000000000000..a41aa1fdc117
--- /dev/null
+++ b/dev-java/blackdown-jre/files/blackdown-jre-1.3.1
@@ -0,0 +1,14 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author: Karl Trygve Kalleberg
+# Maintainer: Tools Team <tools@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/files/blackdown-jre-1.3.1,v 1.1 2002/03/18 21:45:38 karltk Exp $
+
+VERSION="Blackdown JRE @PV@"
+JAVA_HOME=/opt/@P@
+CLASSPATH=/opt/@P@/lib/rt.jar
+JDK_HOME=/opt/@P@
+ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ADDLDPATH=/opt/@P@/jre/lib/rt.jar
+
+ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH"
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r4 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r5
index 1420eb8dd2f7..1420eb8dd2f7 100644
--- a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r4
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r5