Tweaked concept of JDK/JRE duality, removed outdated ebuilds

4 files changed, 8 insertions, 53 deletions

diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r2.ebuild
index ed59fcb90515..77c17d59e3bf 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r1.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r2.ebuild
@@ -1,7 +1,7 @@
 # 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-r1.ebuild,v 1.2 2002/01/23 20:06:16 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r2.ebuild,v 1.1 2002/01/28 23:00:28 karltk Exp $
 
 A=j2sdk-1.3.1-FCS-linux-i386.tar.bz2
 S=${WORKDIR}/j2sdk1.3.1
@@ -10,7 +10,7 @@ SRC_URI="ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.1
 HOMEPAGE="http://www.blackdown.org"
 
 DEPEND="virtual/glibc
-	>=dev-java/java-config-0.1.1"
+	>=dev-java/java-config-0.1.2"
 	
 RDEPEND="$DEPEND"
 PROVIDE="virtual/jdk-1.3
@@ -35,11 +35,12 @@ src_install () {
 	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
 	
 	dodir /etc/env.d	
-	echo "PATH=/opt/${P}/bin" > ${D}/etc/env.d/20java
-	echo "JAVA_HOME=/opt/${P}" >> ${D}/etc/env.d/20java
-	echo "ROOTPATH=/opt/${P}/bin" >> ${D}/etc/env.d/20java
-	echo "CLASSPATH=/opt/${P}/jre/lib/rt.jar" >> ${D}/etc/env.d/20java
-	echo "LDPATH=/opt/${P}/jre/lib/i386:/opt/${P}/jre/lib/i386/client" >> ${D}/etc/env.d/20java
+	echo "PATH=/opt/${P}/bin" > ${D}/etc/env.d/21jdk
+	echo "JDK_HOME=/opt/${P}" >> ${D}/etc/env.d/21jdk
+	echo "JAVA_HOME=/opt/${P}" >> ${D}/etc/env.d/21jdk
+	echo "ROOTPATH=/opt/${P}/bin" >> ${D}/etc/env.d/21jdk
+	echo "CLASSPATH=/opt/${P}/jre/lib/rt.jar" >> ${D}/etc/env.d/21jdk
+	echo "LDPATH=/opt/${P}/jre/lib/i386:/opt/${P}/jre/lib/i386/client" >> ${D}/etc/env.d/21jdk
 }
 
 pkg_postinst () {
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1.ebuild
deleted file mode 100644
index df7f9006f1a1..000000000000
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.ebuild,v 1.2 2001/12/30 04:06:13 karltk Exp $
-
-A=j2sdk-1.3.1-FCS-linux-i386.tar.bz2
-S=${WORKDIR}/j2sdk1.3.1
-DESCRIPTION="Java Runtime Environment"
-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"
-
-PROVIDE="virtual/jdk-1.3
-	 virtual/jre-1.3"
-
-src_install () {
-
-	dodir /opt/${P}
-
-	cp -R ${S}/{bin,jre,lib,man,include,include-old} ${D}/opt/${P}
-
-	dodir /opt/${P}/share/java
-	cp -R ${S}/{demo,src.jar} ${D}/opt/${P}/share
-	
-	dodoc COPYRIGHT LICENSE README INSTALL README.html
-
-	if [ "`use mozilla`" ] ; then
-		dodir /usr/lib/mozilla/plugins
-		dosym /opt/${P}/jre/plugin/i386/mozilla/javaplugin_oji.so /usr/lib/mozilla/plugins/javaplugin_oji.so
-	fi	
-
-	dodir /etc/env.d	
-	echo "JAVA_HOME=/opt/${P}" > ${D}/etc/env.d/20java
-	echo "CLASSPATH=/opt/${P}/jre/lib/rt.jar" >> ${D}/etc/env.d/20java
-}
-
-pkg_postinst () {
-	if [ "`use mozilla`" ] ; then
-		einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins/javaplugin_oji.so"
-	else 
-		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-r1 b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.3.1-r1
deleted file mode 100644
index 47d6ea0a8ce6..000000000000
--- a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.3.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 142ddf0a54a06ad81a5df9a31e28431a j2sdk-1.3.1-FCS-linux-i386.tar.bz2 24563712
diff --git a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.3.1 b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.3.1-r2
index 47d6ea0a8ce6..47d6ea0a8ce6 100644
--- a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.3.1
+++ b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.3.1-r2