6 files changed, 32 insertions, 26 deletions
diff --git a/dev-java/blackdown-jdk/files/blackdown-jdk-1.3.1 b/dev-java/blackdown-jdk/files/blackdown-jdk-1.3.1
index 03d42d9e819f..bc23299dfad1 100644
--- a/dev-java/blackdown-jdk/files/blackdown-jdk-1.3.1
+++ b/dev-java/blackdown-jdk/files/blackdown-jdk-1.3.1
@@ -2,14 +2,15 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Karl Trygve Kalleberg
 # Maintainer: Tools Team <tools@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/files/blackdown-jdk-1.3.1,v 1.1 2002/03/18 21:45:38 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/files/blackdown-jdk-1.3.1,v 1.2 2002/03/20 21:50:03 karltk Exp $
 
 VERSION="Blackdown JDK @PV@"
 JAVA_HOME=/opt/@P@
 CLASSPATH=/opt/@P@/lib/rt.jar
 JDK_HOME=/opt/@P@
-JAVAC=${JDK_HOME}/bin/javac
-ADDPATH="${JAVA_HOME}/bin"
-ADDLDPATH=/opt/@P@/jre/lib/rt.jar
+JAVAC=${JAVA_HOME}/bin/javac
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ADDLDPATH="/opt/@P@/jre/lib/"
 
-ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH"
+ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH ROOTPATH"
diff --git a/dev-java/blackdown-jre/files/blackdown-jre-1.3.1 b/dev-java/blackdown-jre/files/blackdown-jre-1.3.1
index a41aa1fdc117..e95369955138 100644
--- a/dev-java/blackdown-jre/files/blackdown-jre-1.3.1
+++ b/dev-java/blackdown-jre/files/blackdown-jre-1.3.1
@@ -2,13 +2,14 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Karl Trygve Kalleberg
 # Maintainer: Tools Team <tools@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/files/blackdown-jre-1.3.1,v 1.1 2002/03/18 21:45:38 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/files/blackdown-jre-1.3.1,v 1.2 2002/03/20 21:50:03 karltk Exp $
 
 VERSION="Blackdown JRE @PV@"
 JAVA_HOME=/opt/@P@
 CLASSPATH=/opt/@P@/lib/rt.jar
-JDK_HOME=/opt/@P@
-ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ADDLDPATH=/opt/@P@/jre/lib/rt.jar
+JRE_HOME=/opt/@P@
+ROOTPATH="${JAVA_HOME}/bin"
+ADDPATH="${JAVA_HOME}/bin"
+ADDLDPATH="/opt/@P@/lib/"
 
-ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH"
+ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH ROOTPATH"
diff --git a/dev-java/ibm-jdk/files/ibm-jdk-1.3.0 b/dev-java/ibm-jdk/files/ibm-jdk-1.3.0
index 5626eb5c211f..741abf4549c3 100644
--- a/dev-java/ibm-jdk/files/ibm-jdk-1.3.0
+++ b/dev-java/ibm-jdk/files/ibm-jdk-1.3.0
@@ -2,14 +2,15 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Karl Trygve Kalleberg
 # Maintainer: Tools Team <tools@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/files/ibm-jdk-1.3.0,v 1.1 2002/03/18 21:45:38 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/files/ibm-jdk-1.3.0,v 1.2 2002/03/20 21:50:04 karltk Exp $
 
 VERSION="IBM JDK @PV@"
 JAVA_HOME=/opt/@P@
 CLASSPATH=/opt/@P@/lib/rt.jar
 JDK_HOME=/opt/@P@
-JAVAC=${JDK_HOME}/bin/javac
-ADDPATH="${JAVA_HOME}/bin"
-ADDLDPATH=/opt/@P@/jre/lib/rt.jar
+JAVAC=${JAVA_HOME}/bin/javac
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ADDLDPATH="/opt/@P@/jre/lib/"
 
-ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH"
+ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH ROOTPATH"
diff --git a/dev-java/ibm-jre/files/ibm-jre-1.3.0 b/dev-java/ibm-jre/files/ibm-jre-1.3.0
index a75903bfd047..e8289d74a848 100644
--- a/dev-java/ibm-jre/files/ibm-jre-1.3.0
+++ b/dev-java/ibm-jre/files/ibm-jre-1.3.0
@@ -2,13 +2,14 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Karl Trygve Kalleberg
 # Maintainer: Tools Team <tools@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/files/ibm-jre-1.3.0,v 1.1 2002/03/18 21:45:38 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/files/ibm-jre-1.3.0,v 1.2 2002/03/20 21:50:04 karltk Exp $
 
 VERSION="IBM JRE @PV@"
 JAVA_HOME=/opt/@P@
 CLASSPATH=/opt/@P@/lib/rt.jar
-JDK_HOME=/opt/@P@
+JRE_HOME=/opt/@P@
+ROOTPATH="${JAVA_HOME}/bin"
 ADDPATH="${JAVA_HOME}/bin"
 ADDLDPATH=/opt/@P@/jre/lib/rt.jar
 
-ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH"
+ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH ROOTPATH"
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.3.1 b/dev-java/sun-jdk/files/sun-jdk-1.3.1
index 7dd032ae9d33..40e1052804e8 100644
--- a/dev-java/sun-jdk/files/sun-jdk-1.3.1
+++ b/dev-java/sun-jdk/files/sun-jdk-1.3.1
@@ -2,14 +2,15 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Karl Trygve Kalleberg
 # Maintainer: Tools Team <tools@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.3.1,v 1.1 2002/03/18 21:45:38 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.3.1,v 1.2 2002/03/20 21:50:04 karltk Exp $
 
 VERSION="Sun JDK @PV@"
 JAVA_HOME=/opt/@P@
 CLASSPATH=/opt/@P@/lib/rt.jar
 JDK_HOME=/opt/@P@
-JAVAC=${JDK_HOME}/bin/javac
-ADDPATH="${JAVA_HOME}/bin"
-ADDLDPATH=/opt/@P@/jre/lib/rt.jar
+JAVAC=${JAVA_HOME}/bin/javac
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ADDLDPATH="/opt/@P@/jre/lib/"
 
 ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH"
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.4.0 b/dev-java/sun-jdk/files/sun-jdk-1.4.0
index b6db3616bb09..86bfd8f9745d 100644
--- a/dev-java/sun-jdk/files/sun-jdk-1.4.0
+++ b/dev-java/sun-jdk/files/sun-jdk-1.4.0
@@ -2,14 +2,15 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Karl Trygve Kalleberg
 # Maintainer: Tools Team <tools@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.4.0,v 1.1 2002/03/18 21:45:38 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.4.0,v 1.2 2002/03/20 21:50:04 karltk Exp $
 
 VERSION="Sun JDK @PV@"
 JAVA_HOME=/opt/@P@
 CLASSPATH=/opt/@P@/lib/rt.jar
 JDK_HOME=/opt/@P@
-JAVAC=${JDK_HOME}/bin/javac
-ADDPATH="${JAVA_HOME}/bin"
-ADDLDPATH=/opt/@P@/jre/lib/rt.jar
+JAVAC=${JAVA_HOME}/bin/javac
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ADDLDPATH="/opt/@P@/jre/lib/"
 
 ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH"