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

2 files changed, 39 insertions, 6 deletions

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"