Fixed some erroneous versioning. Updated java-config to handle new env.d scheme and IBM JDK

9 files changed, 48 insertions, 75 deletions

diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r2.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r2.ebuild
index 77c17d59e3bf..306b1ec7bf6b 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r2.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-r2.ebuild,v 1.1 2002/01/28 23:00:28 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r2.ebuild,v 1.2 2002/01/29 14:12:46 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.2"
+	>=dev-java/java-config-0.1.3"
 	
 RDEPEND="$DEPEND"
 PROVIDE="virtual/jdk-1.3
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r4.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r4.ebuild
index 1760c143f76f..e01a6d98f640 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r4.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-r4.ebuild,v 1.1 2002/01/28 23:00:29 karltk Exp $
+# $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 $
 
 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.2"
+	>=dev-java/java-config-0.1.3"
 RDEPEND="$DEPEND"
 
 PROVIDE="virtual/jre-1.3"
diff --git a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.1 b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0
index e69de29bb2d1..e69de29bb2d1 100644
--- a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.1
+++ b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.3.1.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.3.0.ebuild
index ae15802365ef..264ba428bbed 100644
--- a/dev-java/ibm-jdk/ibm-jdk-1.3.1.ebuild
+++ b/dev-java/ibm-jdk/ibm-jdk-1.3.0.ebuild
@@ -2,7 +2,7 @@
 # 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/ibm-jdk/ibm-jdk-1.3.1.ebuild,v 1.1 2002/01/29 13:54:17 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.0.ebuild,v 1.1 2002/01/29 14:12:47 karltk Exp $
 
 At=IBMJava2-SDK-13.tgz
 S=${WORKDIR}/IBMJava2-13
@@ -10,7 +10,8 @@ DESCRIPTION="IBM JDK 1.3.1"
 SRC_URI=""
 HOMEPAGE="http://"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/glibc
+	>=dev-java/java-config-0.1.3"
 RDEPEND="$DEPEND"
 
 src_unpack() {
diff --git a/dev-java/ibm-jre/files/digest-ibm-jre-1.3 b/dev-java/ibm-jre/files/digest-ibm-jre-1.3.0
index e69de29bb2d1..e69de29bb2d1 100644
--- a/dev-java/ibm-jre/files/digest-ibm-jre-1.3
+++ b/dev-java/ibm-jre/files/digest-ibm-jre-1.3.0
diff --git a/dev-java/ibm-jre/ibm-jre-1.3.ebuild b/dev-java/ibm-jre/ibm-jre-1.3.ebuild
deleted file mode 100644
index 39342b0e2ef1..000000000000
--- a/dev-java/ibm-jre/ibm-jre-1.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# 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/ibm-jre/ibm-jre-1.3.ebuild,v 1.1 2002/01/29 13:54:17 karltk Exp $
-
-At=IBMJava2-JRE-13.tgz
-S=${WORKDIR}/IBMJava2-13
-DESCRIPTION="IBM JRE 1.3.1"
-SRC_URI=""
-HOMEPAGE="http://"
-
-DEPEND="virtual/glibc"
-RDEPEND="$DEPEND"
-
-PROVIDE="virtual/jre-1.3"
-
-src_unpack() {
-	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE}"
-	fi
-	unpack ${At} || die
-}
-
-
-src_install () {
-
-	dodir /opt/${P}
-	cp -dpR jre/* ${D}/opt/${P}/
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc docs/COPYRIGHT
-
-	if [ "`use mozilla`" ] ; then
-		dodir /usr/lib/mozilla/plugins
-		dosym /opt/${P}/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
-	fi
-	
-	dodir /etc/env.d
-	echo "PATH=/opt/${P}/bin" > /etc/env.d/20jre
-	echo "JRE_HOME=/opt/${P}" >> /etc/env.d/20jre
-	echo "JAVA_HOME=/opt/${P}" >> /etc/env.d/20jre
-	echo "ROOTPATH=/opt/${P}/bin" >> /etc/env.d/20jre
-	echo "CLASSPATH=/opt/${P}/lib/rt.jar" >> /etc/env.d/20jre
-	echo "LDPATH=/opt/${P}/bin" >> /etc/env.d/20jre
-}
-
-src_postinst() {
-	if [ -e /opt/netscape/plugins ] ; then
-		ln -sf /opt/${P}/bin/javaplugin.so /opt/netscape/plugins/
-		einfo "Netscape 4.x Java plugin installed"
-	fi
-
-	if [ "`use mozilla`" ] ; then
-                einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins/javaplugin_oji.so"
-        else
-                einfo "To install the browser plugin manually, do:"
-		einfo "ln -sf /opt/${P}/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/"
-        fi
-
-}
diff --git a/dev-java/java-config/files/java-config b/dev-java/java-config/files/java-config
index 6a7d554e424d..9536e96f0b71 100644
--- a/dev-java/java-config/files/java-config
+++ b/dev-java/java-config/files/java-config
@@ -4,14 +4,26 @@
 # 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.3 2002/01/28 23:00:29 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config,v 1.4 2002/01/29 14:12:47 karltk Exp $
 
-version=0.1.2
+version=0.1.3
 
-oldpath=$PATH
-. /etc/env.d/20java
-PATH=$oldpath:$PATH
+if [ -e /etc/env.d/20jre ] ; then
+	oldpath=$PATH
+	. /etc/env.d/20jre
+	PATH=$oldpath:$PATH
+fi
 
+
+if [ -e /etc/env.d/21jdk ] ; then
+	oldpath=$PATH
+	. /etc/env.d/21jdk
+	PATH=$oldpath:$PATH
+fi
+
+if [ -z $JAVA_HOME ] ; then
+	echo "No Java installation found!" > /dev/stderr
+fi
 usage() {
         cat <<EOF
 Usage: java-config [OPTIONS] [LIBRARIES]
@@ -27,6 +39,7 @@ Options:
 	[--exec=filename]
 	[--list-available-packages]
 EOF
+	echo "Using ${JAVA_HOME}"
 	exit $1
 }
 
@@ -57,6 +70,9 @@ classpathfor()
 }
 
 findpluginpath() {
+
+	# This covers Sun and Blackdown
+
 	rootpath=${JAVA_HOME}/jre/plugin/i386
 	
 	if [ $1 == "ns4" ] || [ $1 == "netscape4" ] ; then
@@ -74,6 +90,23 @@ findpluginpath() {
 	else
 		echo Browser "$1" unknow > /dev/stderr
 	fi
+
+	# This covers IBM
+
+	rootpath=${JAVA_HOME}
+	if [ $1 == "ns4" ] || [ $1 == "netscape4" ] ; then
+		for i in ${rootpath}/{,jre}/bin/javaplugin.so ; do
+			if [ -e $i ] ; then
+				echo $i
+			fi
+		done
+	elif [ $1 == "ns6" ] || [ $1 == "netscape6" ] || [ $1 == "moz" ] || [ $1 == "mozilla" ] ; then
+		for i in ${rootpath}/{,jre}/bin/libjavaplugin_oji.so ; do
+			if [ -e $i ] ; then
+				echo $i
+			fi
+		done
+	fi
 }
 
 while test $# -gt 0; do
diff --git a/dev-java/java-config/java-config-0.1.2.ebuild b/dev-java/java-config/java-config-0.1.3.ebuild
index 2661d12e5428..83546a8a7f2a 100644
--- a/dev-java/java-config/java-config-0.1.2.ebuild
+++ b/dev-java/java-config/java-config-0.1.3.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.2.ebuild,v 1.1 2002/01/28 23:00:29 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-0.1.3.ebuild,v 1.1 2002/01/29 14:12:47 karltk Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gentoo-specific configuration for Java"
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1-r1.ebuild
index 2ec27b408496..814e92910a06 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1-r1.ebuild
@@ -2,7 +2,7 @@
 # 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/sun-jdk/sun-jdk-1.3.1-r1.ebuild,v 1.1 2002/01/29 13:54:17 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1-r1.ebuild,v 1.2 2002/01/29 14:12:47 karltk Exp $
 
 At="j2sdk-1_3_1_02-linux-i386.bin"
 S=${WORKDIR}/jdk1.3.1_02
@@ -11,7 +11,7 @@ DESCRIPTION="Sun's J2EE Development Kit"
 HOMEPAGE="http://java.sun.com/j2se/1.3/download-linux.html"
 
 DEPEND="virtual/glibc
-	>=dev-java/java-config-0.1.2"
+	>=dev-java/java-config-0.1.3"
 RDEPEND="$DEPEND"
 
 PROVIDE="virtual/jre-1.3