Fixed #1577

15 files changed, 46 insertions, 18 deletions

diff --git a/dev-java/ibm-jdk/ChangeLog b/dev-java/ibm-jdk/ChangeLog
index 7dd977defb15..4d24e9c4fd7c 100644
--- a/dev-java/ibm-jdk/ChangeLog
+++ b/dev-java/ibm-jdk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/ibm-jdk
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ChangeLog,v 1.3 2002/03/18 21:45:38 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ChangeLog,v 1.4 2002/04/09 22:08:45 karltk Exp $
+
+*ibm-jdk-1.3.0-r3 (09 Apr 2002)
+
+  09 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ibm-jdk-1.3.0-r3.ebuild files/digest-ibm-jdk-1.3.0-r3:
+
+  Now sets proper ROOTPATH.
+
+  Removed ibm-jdk-1.3.0-r2.ebuild files/digest-ibm-jdk-1.3.0-r2
 
 *ibm-jdk-1.3.0-r2 (18 Mar 2002)
 
diff --git a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r2 b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r3
index e69de29bb2d1..e69de29bb2d1 100644
--- a/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r2
+++ b/dev-java/ibm-jdk/files/digest-ibm-jdk-1.3.0-r3
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 741abf4549c3..32afbf4eda3e 100644
--- a/dev-java/ibm-jdk/files/ibm-jdk-1.3.0
+++ b/dev-java/ibm-jdk/files/ibm-jdk-1.3.0
@@ -2,15 +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-jdk/files/ibm-jdk-1.3.0,v 1.2 2002/03/20 21:50:04 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/files/ibm-jdk-1.3.0,v 1.3 2002/04/09 22:08:45 karltk Exp $
 
 VERSION="IBM JDK @PV@"
 JAVA_HOME=/opt/@P@
 CLASSPATH=/opt/@P@/lib/rt.jar
 JDK_HOME=/opt/@P@
 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 ROOTPATH"
+ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH"
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.3.0-r2.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.3.0-r3.ebuild
index dfc412b69bbf..d4c3825736c1 100644
--- a/dev-java/ibm-jdk/ibm-jdk-1.3.0-r2.ebuild
+++ b/dev-java/ibm-jdk/ibm-jdk-1.3.0-r3.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.0-r2.ebuild,v 1.2 2002/03/23 19:20:10 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.0-r3.ebuild,v 1.1 2002/04/09 22:08:45 karltk Exp $
 
 At=IBMJava2-SDK-13.tgz
 S=${WORKDIR}/IBMJava2-13
@@ -11,7 +11,7 @@ SRC_URI=""
 HOMEPAGE="http://www6.software.ibm.com/dl/dklx130/dklx130-p"
 
 DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.0"
+	>=dev-java/java-config-0.2.1"
 RDEPEND="$DEPEND"
 PROVIDE="virtual/jre-1.3
 	virtual/jdk-1.3
diff --git a/dev-java/ibm-jre/ChangeLog b/dev-java/ibm-jre/ChangeLog
index 3fc7fdb287c0..5f4ed706a73f 100644
--- a/dev-java/ibm-jre/ChangeLog
+++ b/dev-java/ibm-jre/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/ibm-jre
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ChangeLog,v 1.3 2002/03/18 21:45:38 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ChangeLog,v 1.4 2002/04/09 22:11:19 karltk Exp $
+
+*ibm-jre-1.3.0-r2 (09 Apr 2002)
+
+  09 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ibm-jre-1.3.0-r2.ebuild files/digest-ibm-jre-1.3.0-r2:
+
+  Fixed missing ROOTPATH.
+
+  Removed ibm-jre-1.3.0-r1.ebuild files/digest-ibm-jre-1.3.0-r1
 
 *ibm-jre-1.3.0-r1 (18 Mar 2002)
 
diff --git a/dev-java/ibm-jre/files/digest-ibm-jre-1.3.0-r1 b/dev-java/ibm-jre/files/digest-ibm-jre-1.3.0-r2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/dev-java/ibm-jre/files/digest-ibm-jre-1.3.0-r1
+++ b/dev-java/ibm-jre/files/digest-ibm-jre-1.3.0-r2
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 e8289d74a848..e7c93b1d1338 100644
--- a/dev-java/ibm-jre/files/ibm-jre-1.3.0
+++ b/dev-java/ibm-jre/files/ibm-jre-1.3.0
@@ -2,14 +2,13 @@
 # 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.2 2002/03/20 21:50:04 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/files/ibm-jre-1.3.0,v 1.3 2002/04/09 22:11:20 karltk Exp $
 
 VERSION="IBM JRE @PV@"
 JAVA_HOME=/opt/@P@
 CLASSPATH=/opt/@P@/lib/rt.jar
 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 ROOTPATH"
+ENV_VARS="JAVA_HOME CLASSPATH JRE_HOME ADDPATH ADDLDPATH"
diff --git a/dev-java/ibm-jre/ibm-jre-1.3.0-r1.ebuild b/dev-java/ibm-jre/ibm-jre-1.3.0-r2.ebuild
index d32cc055b934..16cf5b246112 100644
--- a/dev-java/ibm-jre/ibm-jre-1.3.0-r1.ebuild
+++ b/dev-java/ibm-jre/ibm-jre-1.3.0-r2.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-jre/ibm-jre-1.3.0-r1.ebuild,v 1.2 2002/03/23 19:20:10 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ibm-jre-1.3.0-r2.ebuild,v 1.1 2002/04/09 22:11:20 karltk Exp $
 
 At=IBMJava2-JRE-13.tgz
 S=${WORKDIR}/IBMJava2-13
@@ -11,7 +11,7 @@ SRC_URI=""
 HOMEPAGE="http://www6.software.ibm.com/dl/dklx130/dklx130-p"
 
 DEPEND="virtual/glibc
-	>=dev-java/java-config-0.1.3"
+	>=dev-java/java-config-0.2.1"
 RDEPEND="$DEPEND"
 
 PROVIDE="virtual/jre-1.3
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 2c8b36696e44..75d2db17a4e0 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.5 2002/03/18 21:45:38 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.6 2002/04/09 22:13:41 karltk Exp $
+
+*sun-jdk-1.4.0-r2 (09 Apr 2002)
+
+  09 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.4.0-r2.ebuild files/digest-sun-jdk-1.4.0-r2:
+
+  Fixed missing ROOTPATH.
+
+  Removed sun-jdk-1.4.0-r1.ebuild files/digest-sun-jdk-1.4.0-r1
+
+*sun-jdk-1.3.1-r3 (09 Apr 2002)
+
+  09 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.3.1-r3.ebuild files/digest-sun-jdk-1.3.1-r3:
+
+  Fixed missing ROOTPATH.
+
+  Removed sun-jdk-1.3.1-r2.ebuild files/digest-sun-jdk-1.3.1-r2
 
 *sun-jdk-1.3.1-r2 (18 Mar 2002)
 
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1-r2 b/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1-r3
index e69de29bb2d1..e69de29bb2d1 100644
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1-r2
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1-r3
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.0-r1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.0-r2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.0-r1
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.0-r2
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 40e1052804e8..43f597bfc088 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,13 @@
 # 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.2 2002/03/20 21:50:04 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.3.1,v 1.3 2002/04/09 22:13:41 karltk Exp $
 
 VERSION="Sun JDK @PV@"
 JAVA_HOME=/opt/@P@
 CLASSPATH=/opt/@P@/lib/rt.jar
 JDK_HOME=/opt/@P@
 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/"
 
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 86bfd8f9745d..f1bc7d7c321f 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,13 @@
 # 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.2 2002/03/20 21:50:04 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.4.0,v 1.3 2002/04/09 22:13:41 karltk Exp $
 
 VERSION="Sun JDK @PV@"
 JAVA_HOME=/opt/@P@
 CLASSPATH=/opt/@P@/lib/rt.jar
 JDK_HOME=/opt/@P@
 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/"
 
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1-r2.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1-r3.ebuild
index 276f9517ee57..93502918fd27 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1-r2.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1-r3.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-r2.ebuild,v 1.2 2002/03/23 19:20:10 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1-r3.ebuild,v 1.1 2002/04/09 22:13:41 karltk Exp $
 
 At="j2sdk-1_3_1_02-linux-i386.bin"
 S=${WORKDIR}/jdk1.3.1_02
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.0-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.0-r2.ebuild
index 25de1903c274..25de1903c274 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.0-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.0-r2.ebuild