Tweaked concept of JDK/JRE duality, removed outdated ebuilds

22 files changed, 29 insertions, 555 deletions

diff --git a/dev-java/ant/ant-1.3.ebuild b/dev-java/ant/ant-1.3.ebuild
deleted file mode 100644
index 0f9c8ad6812d..000000000000
--- a/dev-java/ant/ant-1.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.3.ebuild,v 1.4 2001/08/06 20:57:20 achim Exp $
-
-A="jakarta-ant-1.3-src.tar.gz"
-S=${WORKDIR}/jakarta-ant-1.3
-DESCRIPTION="Build system for java"
-SRC_URI="http://jakarta.apache.org/builds/jakarta-ant/release/v1.3/src/jakarta-ant-1.3-src.tar.gz"
-HOMEPAGE="http://jakarta.apache.org"
-
-DEPEND="virtual/glibc
-	>=dev-lang/jdk-1.3
-    >=dev-java/jaxp-1.0.1"
-
-src_unpack() {
-    unpack ${A}
-    cd ${S}/src/script
-    cp antRun antRun.orig
-    tr -d '\r' < antRun.orig > antRun
-}
-src_compile() {
-
-  CLASSPATH=/opt/java/src.jar:/opt/java/lib/tools.jar
-
-  export CLASSPATH
-  export JAVA_HOME=/opt/java
-
-  echo "Building ant..."
-  ./bootstrap.sh
-  mv bootstrap/bin .
-
-}
-
-src_install() {
-    exeinto /usr/bin
-    doexe bin/ant bin/antRun bin/runant.pl
-    insinto /usr/lib/java
-    doins build/lib/*.jar
-
-    dodoc LICENSE README TODO WHATSNEW
-    docinto html
-    cd docs
-    dodoc ant_in_anger.html
-    docinto html/ant2
-    dodoc ant2/*.html
-    docinto txt
-    dodoc ant2/*.txt
-    cp -a manual ${D}/usr/share/doc/${PF}/html
-    prepalldocs
-}
-
-
-
diff --git a/dev-java/ant/ant-1.4.1-r1.ebuild b/dev-java/ant/ant-1.4.1-r1.ebuild
index 4bfb1f833fba..ace59292b664 100644
--- a/dev-java/ant/ant-1.4.1-r1.ebuild
+++ b/dev-java/ant/ant-1.4.1-r1.ebuild
@@ -1,7 +1,7 @@
 # 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/ant/ant-1.4.1-r1.ebuild,v 1.3 2002/01/23 20:06:16 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.4.1-r1.ebuild,v 1.4 2002/01/28 23:00:28 karltk Exp $
 
 A="jakarta-ant-${PV}-src.tar.gz"
 S=${WORKDIR}/jakarta-ant-${PV}
@@ -13,6 +13,7 @@ DEPEND="virtual/glibc
         >=virtual/jdk-1.3"
 
 src_compile() {
+	export JAVA_HOME=${JDK_HOME}
 	./build.sh -Ddist.dir=${D}/usr/share/ant || die
 }
 
diff --git a/dev-java/ant/ant-1.4.ebuild b/dev-java/ant/ant-1.4.ebuild
deleted file mode 100644
index 9621d006451c..000000000000
--- a/dev-java/ant/ant-1.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.4.ebuild,v 1.1 2001/10/07 16:05:20 achim Exp $
-
-A="jakarta-ant-${PV}-src.tar.gz ant-optional-gentoo-${PV}.tgz"
-S=${WORKDIR}/jakarta-ant-${PV}
-DESCRIPTION="Build system for java"
-SRC_URI="http://jakarta.apache.org/builds/jakarta-ant/release/v${PV}/src/jakarta-ant-${PV}-src.tar.gz"
-HOMEPAGE="http://jakarta.apache.org"
-
-DEPEND="virtual/glibc
-	>=dev-lang/jdk-1.3"
-
-src_unpack() {
-    unpack jakarta-ant-${PV}-src.tar.gz
-    cd ${S}/src/script
-    cp antRun antRun.orig
-    tr -d '\r' < antRun.orig > antRun
-    cd ../..
-    mkdir lib/opt
-    cd lib/opt
-    unpack ant-optional-gentoo-${PV}.tgz
-}
-src_compile() {
-
-  CLASSPATH="/opt/java/lib/tools.jar"
-  for i in ${S}/lib/opt 
-  do
-    CLASSPATH=$CLASSPATH:$i
-  done
-  export CLASSPATH
-  export JAVA_HOME=/opt/java
-
-  echo "Building ant..."
-  ./bootstrap.sh
-  mv bootstrap/bin .
-
-}
-
-src_install() {
-    exeinto /usr/bin
-    doexe bin/ant bin/antRun bin/runant.pl
-    insinto /usr/lib/java
-    doins build/lib/*.jar lib/*.jar
-    insinto /usr/lib/java/ant
-    doins lib/opt/*.jar
-
-    dodoc LICENSE README WHATSNEW
-    docinto html
-    cd docs
-    dodoc ant_in_anger.html
-    docinto html/ant2
-    dodoc ant2/*.html
-    docinto txt
-    dodoc ant2/*.txt
-    cp -a manual ${D}/usr/share/doc/${PF}/html
-    prepalldocs
-}
-
-
-
diff --git a/dev-java/ant/files/digest-ant-1.3 b/dev-java/ant/files/digest-ant-1.3
deleted file mode 100644
index 0826ac662004..000000000000
--- a/dev-java/ant/files/digest-ant-1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f2b85000ad4b65c04e735b08bc4ef06 jakarta-ant-1.3-src.tar.gz 1019904
diff --git a/dev-java/ant/files/digest-ant-1.4 b/dev-java/ant/files/digest-ant-1.4
deleted file mode 100644
index 0e98330c1862..000000000000
--- a/dev-java/ant/files/digest-ant-1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e2d549dcaee6167c9e9937df8ed781e8 jakarta-ant-1.4-src.tar.gz 1314816
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
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r2.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r2.ebuild
deleted file mode 100644
index 5e72272fa937..000000000000
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# 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-r2.ebuild,v 1.2 2001/12/30 04:06:13 karltk Exp $
-
-A=j2re-1.3.1-FCS-linux-i386.tar.bz2
-S=${WORKDIR}/j2re1.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/jre-1.3"
-
-src_install () {
-	insinto /opt/${P}
-	doins JavaPluginControlPanel.html
-
-	exeinto /opt/${P}/bin
-	doexe bin/.java_wrapper bin/awt_robot bin/JavaPluginControlPanel
-	doexe bin/j2sdk-config bin/realpath
-
-	dosym /opt/${P}/bin/.java_wrapper /opt/${P}/bin/java
-	dosym /opt/${P}/bin/.java_wrapper /opt/${P}/bin/keytool
-	dosym /opt/${P}/bin/.java_wrapper /opt/${P}/bin/policytool
-	dosym /opt/${P}/bin/.java_wrapper /opt/${P}/bin/rmid
-	dosym /opt/${P}/bin/.java_wrapper /opt/${P}/bin/rmiregistry
-	dosym /opt/${P}/bin/.java_wrapper /opt/${P}/bin/tnameserv
-
-	exeinto /opt/${P}/bin/i386
-	doexe bin/i386/realpath
-
-	exeinto /opt/${P}/bin/i386/green_threads
-	doexe bin/i386/green_threads/*
-
-	exeinto /opt/${P}/bin/i386/native_threads
-	doexe bin/i386/native_threads/*
-
-	insinto /opt/${P}/lib
-	doins lib/*
-
-	dodir /opt/${P}/lib/applet
-
-	insinto /opt/${P}/lib/audio
-	doins lib/audio/*
-
-	insinto /opt/${P}/lib/cmm
-	doins lib/cmm/*
-
-	dodir /opt/${P}/lib/ext
-
-	insinto /opt/${P}/lib/fonts
-	doins lib/fonts/*
-
-	insinto /opt/${P}/lib/i386
-	doins lib/i386/*
-
-	insinto /opt/${P}/lib/i386/classic
-	doins lib/i386/classic/*
-
-	insinto /opt/${P}/lib/i386/client
-	doins lib/i386/client/*
-
-	insinto /opt/${P}/lib/i386/green_threads
-	doins lib/i386/green_threads/*
-
-	insinto /opt/${P}/lib/i386/native_threads
-	doins lib/i386/native_threads/*
-
-	insinto /opt/${P}/lib/i386/server
-	doins lib/i386/server/*
-
-	insinto /opt/${P}/lib/images/cursors
-	doins lib/images/cursors/*
-
-	insinto /opt/${P}/lib/locale/de/LC_MESSAGES
-	doins lib/locale/de/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/es/LC_MESSAGES
-	doins lib/locale/es/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/fr/LC_MESSAGES
-	doins lib/locale/fr/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/it/LC_MESSAGES
-	doins lib/locale/ja/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/ko/LC_MESSAGES
-	doins lib/locale/ko/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/ko.UTF-8/LC_MESSAGES
-	doins lib/locale/ko.UTF-8/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/sv/LC_MESSAGES
-	doins lib/locale/sv/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/zh/LC_MESSAGES
-	doins lib/locale/zh/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/zh.GBK/LC_MESSAGES
-	doins lib/locale/zh.GBK/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/zh_TW/LC_MESSAGES
-	doins lib/locale/zh_TW/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/zh_TW.BIG5/LC_MESSAGES
-	doins lib/locale/zh_TW.BIG5/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/de/LC_MESSAGES
-	doins lib/locale/de/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/security
-	doins lib/security/*
-
-	insinto /opt/${P}/man/ja/man1
-	doins man/ja/man1/*
-
-	insinto /opt/${P}/man/man1
-	doins man/man1/*
-
-	insinto /opt/${P}/plugin/i386/mozilla
-	doins plugin/i386/mozilla/*
-
-	dosym /opt/${P}/plugin/i386/mozilla /opt/${P}/plugin/i386/netscape6
-
-	insinto /opt/${P}/plugin/i386/netscape4
-	doins plugin/i386/netscape4/*
-
-	dodir /usr/share
-	dodoc COPYRIGHT LICENSE README INSTALL
-
-	if [ "`use mozilla`" ] ; then
-		dodir /usr/lib/mozilla/plugins
-		dosym /opt/${P}/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}/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-jre/blackdown-jre-1.3.1-r3.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r4.ebuild
index 034f1e4951e9..1760c143f76f 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r3.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r4.ebuild
@@ -1,7 +1,7 @@
 # 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-r3.ebuild,v 1.2 2002/01/23 20:06:16 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r4.ebuild,v 1.1 2002/01/28 23:00:29 karltk Exp $
 
 A=j2re-1.3.1-FCS-linux-i386.tar.bz2
 S=${WORKDIR}/j2re1.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/jre-1.3"
@@ -138,11 +138,12 @@ src_install () {
 	fi
 	
 	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}/lib/rt.jar" >> ${D}/etc/env.d/20java
-        echo "LDPATH=/opt/${P}/lib/i386:/opt/${P}/lib/i386/client"      
+	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
 }
 
 pkg_postinst () {
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1.ebuild
deleted file mode 100644
index 641ad99a1eb5..000000000000
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Damon Conway <damon@3jane.net> 
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1.ebuild,v 1.1 2001/10/22 04:28:57 kabau Exp $
-
-A=j2re-1.3.1-FCS-linux-i386.tar.bz2
-S=${WORKDIR}/j2re1.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/java"
-
-src_install () {
-	insinto /opt/${P}
-	doins JavaPluginControlPanel.html
-
-	exeinto /opt/${P}/bin
-	doexe bin/.java_wrapper bin/awt_robot bin/JavaPluginControlPanel
-	doexe bin/j2sdk-config bin/realpath
-
-	dosym /opt/${P}/bin/.java_wrapper /opt/${P}/bin/java
-	dosym /opt/${P}/bin/.java_wrapper /opt/${P}/bin/keytool
-	dosym /opt/${P}/bin/.java_wrapper /opt/${P}/bin/policytool
-	dosym /opt/${P}/bin/.java_wrapper /opt/${P}/bin/rmid
-	dosym /opt/${P}/bin/.java_wrapper /opt/${P}/bin/rmiregistry
-	dosym /opt/${P}/bin/.java_wrapper /opt/${P}/bin/tnameserv
-
-	exeinto /opt/${P}/bin/i386
-	doexe bin/i386/realpath
-
-	exeinto /opt/${P}/bin/i386/green_threads
-	doexe bin/i386/green_threads/*
-
-	exeinto /opt/${P}/bin/i386/native_threads
-	doexe bin/i386/native_threads/*
-
-	insinto /opt/${P}/lib
-	doins lib/*
-
-	dodir /opt/${P}/lib/applet
-
-	insinto /opt/${P}/lib/audio
-	doins lib/audio/*
-
-	insinto /opt/${P}/lib/cmm
-	doins lib/cmm/*
-
-	dodir /opt/${P}/lib/ext
-
-	insinto /opt/${P}/lib/fonts
-	doins lib/fonts/*
-
-	insinto /opt/${P}/lib/i386
-	doins lib/i386/*
-
-	insinto /opt/${P}/lib/i386/classic
-	doins lib/i386/classic/*
-
-	insinto /opt/${P}/lib/i386/client
-	doins lib/i386/client/*
-
-	insinto /opt/${P}/lib/i386/green_threads
-	doins lib/i386/green_threads/*
-
-	insinto /opt/${P}/lib/i386/native_threads
-	doins lib/i386/native_threads/*
-
-	insinto /opt/${P}/lib/i386/server
-	doins lib/i386/server/*
-
-	insinto /opt/${P}/lib/images/cursors
-	doins lib/images/cursors/*
-
-	insinto /opt/${P}/lib/locale/de/LC_MESSAGES
-	doins lib/locale/de/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/es/LC_MESSAGES
-	doins lib/locale/es/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/fr/LC_MESSAGES
-	doins lib/locale/fr/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/it/LC_MESSAGES
-	doins lib/locale/ja/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/ko/LC_MESSAGES
-	doins lib/locale/ko/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/ko.UTF-8/LC_MESSAGES
-	doins lib/locale/ko.UTF-8/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/sv/LC_MESSAGES
-	doins lib/locale/sv/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/zh/LC_MESSAGES
-	doins lib/locale/zh/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/zh.GBK/LC_MESSAGES
-	doins lib/locale/zh.GBK/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/zh_TW/LC_MESSAGES
-	doins lib/locale/zh_TW/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/zh_TW.BIG5/LC_MESSAGES
-	doins lib/locale/zh_TW.BIG5/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/locale/de/LC_MESSAGES
-	doins lib/locale/de/LC_MESSAGES/*
-
-	insinto /opt/${P}/lib/security
-	doins lib/security/*
-
-	insinto /opt/${P}/man/ja/man1
-	doins man/ja/man1/*
-
-	insinto /opt/${P}/man/man1
-	doins man/man1/*
-
-	insinto /opt/${P}/plugin/i386/mozilla
-	doins plugin/i386/mozilla/*
-
-	dosym /opt/${P}/plugin/i386/mozilla /opt/${P}/plugin/i386/netscape6
-
-	insinto /opt/${P}/plugin/i386/netscape4
-	doins plugin/i386/netscape4/*
-
-	dodir /usr/share
-	dodoc COPYRIGHT LICENSE README INSTALL
-}
-
-pkg_postinst () {
-	einfo "For instructions on installing the ${P} browser plugin for"
-	einfo "Netscape and Mozilla, see /usr/share/doc/${P}/INSTALL."
-}
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r1 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r1
deleted file mode 100644
index bd64d8789f7a..000000000000
--- a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 951d59730ceaf5fddf2f6ec0a74e302b j2re-1.3.1-FCS-linux-i386.tar.bz2
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r2 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r2
deleted file mode 100644
index 660d2525c329..000000000000
--- a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 951d59730ceaf5fddf2f6ec0a74e302b j2re-1.3.1-FCS-linux-i386.tar.bz2 13246464
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r3 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r3
deleted file mode 100644
index 660d2525c329..000000000000
--- a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 951d59730ceaf5fddf2f6ec0a74e302b j2re-1.3.1-FCS-linux-i386.tar.bz2 13246464
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r4
index 660d2525c329..660d2525c329 100644
--- a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r4
diff --git a/dev-java/java-config/files/java-config b/dev-java/java-config/files/java-config
index b7dc661198b6..6a7d554e424d 100644
--- a/dev-java/java-config/files/java-config
+++ b/dev-java/java-config/files/java-config
@@ -4,9 +4,9 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Tools Team <tools@gentoo.org>
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config,v 1.2 2002/01/23 20:06:16 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config,v 1.3 2002/01/28 23:00:29 karltk Exp $
 
-version=0.1.1
+version=0.1.2
 
 oldpath=$PATH
 . /etc/env.d/20java
@@ -19,7 +19,8 @@ Options:
 	[--javac]
 	[--java]
 	[--jar]
-	[--java-home]
+	[--jdk-home]
+	[--jre-home]
 	[--java-version]
 	[--classpath[=package-name]]
 	[--full-classpath=package-name]
@@ -106,8 +107,11 @@ while test $# -gt 0; do
 		--full-classpath=*)
 			echo "${CLASSPATH}:`classpathfor $optarg`."
 		;;
-		--java-home)
-			echo ${JAVA_HOME}
+		--jdk-home)
+			echo ${JDK_HOME}
+		;;
+		--jre-home)
+			echo ${JRE_HOME}
 		;;
 		--javac)
 			find_exec javac
@@ -138,4 +142,4 @@ while test $# -gt 0; do
 		;;
 	esac
 	shift
-done
\ No newline at end of file
+done
diff --git a/dev-java/java-config/java-config-0.1.1.ebuild b/dev-java/java-config/java-config-0.1.2.ebuild
index 1f85da57ebb5..2661d12e5428 100644
--- a/dev-java/java-config/java-config-0.1.1.ebuild
+++ b/dev-java/java-config/java-config-0.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Karl Trygve Kalleberg <karltk@gentoo.org>
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-0.1.1.ebuild,v 1.1 2002/01/20 22:30:04 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-0.1.2.ebuild,v 1.1 2002/01/28 23:00:29 karltk Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gentoo-specific configuration for Java"
diff --git a/dev-java/jndi/files/digest-jndi-1.2.1-r1 b/dev-java/jndi/files/digest-jndi-1.2.1-r1
deleted file mode 100644
index c69cedae5056..000000000000
--- a/dev-java/jndi/files/digest-jndi-1.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 53b63aa68b14cda5722c56d081f56d06 jndi1_2_1.zip 102400
diff --git a/dev-java/jndi/jndi-1.2.1-r1.ebuild b/dev-java/jndi/jndi-1.2.1-r1.ebuild
deleted file mode 100644
index 716743de602f..000000000000
--- a/dev-java/jndi/jndi-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jndi/jndi-1.2.1-r1.ebuild,v 1.4 2000/11/02 08:31:50 achim Exp $
-
-P=jndi-1.2.1
-A=jndi1_2_1.zip
-S=${WORKDIR}/${P}
-DESCRIPTION="Java Naming and Directory Interface"
-SRC_URI="ftp://"${A}
-HOMEPAGE="http://java.sun.com/products/jndi/"
-
-DEPEND=">=dev-lang/jdk-1.2.2"
-
-#Please download the sources from sun
-
-src_unpack() {
-  mkdir ${S}
-  cd ${S}
-  jar -xf ${DISTDIR}/${A}
-}
-
-src_compile() {                           
-  cd ${S}
-}
-
-src_install() {                               
-  cd ${S}
-  insinto /usr/lib/java
-  doins lib/jndi.jar
-  dodoc COPYRIGHT README.txt 
-  docinto html
-  dodoc doc/*.html
-}
-
-
-
diff --git a/dev-java/jsse/files/digest-jsse-1.0.2 b/dev-java/jsse/files/digest-jsse-1.0.2
deleted file mode 100644
index 7ed7e7b93483..000000000000
--- a/dev-java/jsse/files/digest-jsse-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 62eb1883d349d5684525694f2fb24c8f jsse-1_0_2-gl.zip 626688
diff --git a/dev-java/jsse/jsse-1.0.2.ebuild b/dev-java/jsse/jsse-1.0.2.ebuild
deleted file mode 100644
index 7ebb76e7690d..000000000000
--- a/dev-java/jsse/jsse-1.0.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsse/jsse-1.0.2.ebuild,v 1.1 2001/07/10 01:34:16 achim Exp $
-
-A=jsse-1_0_2-gl.zip
-S=${WORKDIR}/jsse1.0.2
-DESCRIPTION="Java API for XML parsing"
-SRC_URI="ftp://${A}"
-HOMEPAGE="http://java.sun.com/products/jsse/"
-
-# Get the global version !
-
-DEPEND=">=dev-lang/jdk-1.3.0
-	>=app-arch/unzip-5.41"
-RDEPEND=">=dev-lang/jdk-1.3.0"
-
-#Please download the sources from sun
-
-src_unpack() {
-  jar -xf ${DISTDIR}/${A}
-}
-
-src_compile() {                           
-  cd ${S}
-}
-
-src_install() {                               
-  cd ${S}
-  insinto /usr/lib/java
-  doins lib/*.jar
-  dodoc *.txt 
-  docinto html
-  dodoc *.html
-  mv doc ${D}/usr/share/doc/${PF}/html/
-}
-
-
-