Fixes #2577.

4 files changed, 43 insertions, 9 deletions

diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index d3dfe882fc5f..627d2726c2ec 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-java/java-config
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.4 2002/04/10 15:46:20 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.5 2002/05/13 22:24:47 karltk Exp $
+
+*java-config-0.2.3 (14 May 2002)
+
+  14 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> java-config-0.2.3.ebuild files/java-config:
+
+  Now java-config sources $HOME/.gentoo/java-env before trying to source 
+  /etc/env.d/20java.
+
+  A warning is no longer output when running --set-user-vm or --set-system-vm
+  for the first time.
+
+  Also, some platform accomodations seem to have snuck in without any notice 
+  in this ChangeLog nor any version bump. 
 
 *java-config-0.2.2 (10 Apr 2002)
 
diff --git a/dev-java/java-config/files/digest-java-config-0.2.3 b/dev-java/java-config/files/digest-java-config-0.2.3
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/dev-java/java-config/files/digest-java-config-0.2.3
diff --git a/dev-java/java-config/files/java-config b/dev-java/java-config/files/java-config
index 3bdf8b87a5ac..cc3d250a5508 100644
--- a/dev-java/java-config/files/java-config
+++ b/dev-java/java-config/files/java-config
@@ -4,17 +4,17 @@
 # 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.8 2002/04/27 12:11:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config,v 1.9 2002/05/13 22:24:47 karltk Exp $
 
 version=0.2.0
 all_params="$*"
 
 SYSTEM_ARCH=`echo $ARCH |\
-  sed -e s/[i]*.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/`
-if [ -z "$SYSTEM_ARCH" ]
-then
+	sed -e s/[i]*.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/`
+
+if [ -z "$SYSTEM_ARCH" ] ; then
 	SYSTEM_ARCH=`uname -m |\
-     sed -e s/[i]*.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/`
+	sed -e s/[i]*.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/`
 fi 
 
 PFORM="i386"
@@ -27,16 +27,20 @@ case $SYSTEM_ARCH in
 	arm)    PFORM="arm";;
 esac
 
-if [ -e /etc/env.d/20java ] ; then
+if [ -f $HOME/.gentoo/java-env ] ; then
+	. $HOME/.gentoo/java-env
+elif  [ -f /etc/env.d/20java ] ; then
 	oldpath=$PATH
 	. /etc/env.d/20java
 	PATH=$oldpath:$PATH
 fi
 
-
-if [ -z "$JAVA_HOME" ] ; then
+svm=`echo $1|egrep "\-\-set-(system|user)-vm"`
+if [ -z "$JAVA_HOME" ] && [ -z "$svm" ] && [ "$1" != "--help" ]; then
 	echo "!!! No Java installation found" > /dev/stderr
 	echo "!!! Use --set-system-vm to select default system JVM" > /dev/stderr
+	echo "!!! Alternatively, use --set-user-vm to select default system JVM" > /dev/stderr
+	exit 1
 fi
 
 usage() {
diff --git a/dev-java/java-config/java-config-0.2.3.ebuild b/dev-java/java-config/java-config-0.2.3.ebuild
new file mode 100644
index 000000000000..1e46906adaec
--- /dev/null
+++ b/dev-java/java-config/java-config-0.2.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# 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.2.3.ebuild,v 1.1 2002/05/13 22:24:47 karltk Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Gentoo-specific configuration for Java"
+SRC_URI=""
+HOMEPAGE="http://www.gentoo.org/~karltk/java-config"
+DEPEND=""
+#RDEPEND=""
+
+src_install () {
+	dobin ${FILESDIR}/java-config
+	doman ${FILESDIR}/java-config.1
+}