Fixes #7412, and a CLASSPATH problem.

7 files changed, 19 insertions, 44 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index d88b660e85e4..69b00a8fa4ef 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,9 +1,16 @@
 # 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.20 2002/09/06 21:27:21 owen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.21 2002/09/07 13:13:01 karltk Exp $
 
 *sun-jdk-1.4.1_rc1 (23 Aug 2002)
-  06 Sep 2002; Owen Stampflee <owen@gentoo.org>:
+
+  07 Sep 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.4.1_rc1.ebuild files/sun-jdk-1.3.1.02 files/sun-jdk-1.3.1.03 sun-jdk-1.4.0-r5.ebuild sun-jdk-1.3.1.04.ebuild :
+  Now installs environment properly. Removed old environment files.
+  Fixed formatting of ebuilds. Added dep on improved java-config, to
+  avoid CLASSPATH problems caused by adding "." to it.
+
+  06 Sep 2002; Owen Stampflee <owen@gentoo.org> files/sun-jdk-1.3.1.04
+  files/sun-jdk-1.4.0 files/sun-jdk-1.4.1_beta files/sun-jdk-1.4.1_rc1:
   Added "." to CLASSPATH in the env.d scripts.
 
   26 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.4.1_rc1.ebuild:
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.3.1.02 b/dev-java/sun-jdk/files/sun-jdk-1.3.1.02
deleted file mode 100644
index 1aae485bcfc9..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.3.1.02
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# 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.02,v 1.2 2002/09/06 21:27:21 owen Exp $
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME=/opt/@P@
-CLASSPATH=/opt/@P@/lib/rt.jar:.
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-LD_ASSUME_KERNEL=2.2.5
-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.3.1.03 b/dev-java/sun-jdk/files/sun-jdk-1.3.1.03
deleted file mode 100644
index 88938340700b..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.3.1.03
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# 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.03,v 1.2 2002/09/06 21:27:21 owen Exp $
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME=/opt/@P@
-CLASSPATH=/opt/@P@/lib/rt.jar:.
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-LD_ASSUME_KERNEL=2.2.5
-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/sun-jdk-1.3.1.04.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.04.ebuild
index 1ab47d23dd46..02a317625c69 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.04.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.04.ebuild,v 1.3 2002/08/26 16:47:25 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.04.ebuild,v 1.4 2002/09/07 13:13:01 karltk Exp $
 
 . /usr/portage/eclass/inherit.eclass
 inherit java
@@ -11,7 +11,7 @@ SRC_URI=""
 DESCRIPTION="Sun Java Development Kit 1.3.1"
 HOMEPAGE="http://java.sun.com/j2se/1.3/download-linux.html"
 DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.2
+	>=dev-java/java-config-0.2.5
 	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
 RDEPEND="$DEPEND"
 PROVIDE="virtual/jre-1.3.1
@@ -48,7 +48,7 @@ src_install () {
 	dodir /opt/${P}/share/
 	cp -a demo src.jar ${D}/opt/${P}/share/
 
-        if [ "`use mozilla`" ] ; then                                           
+	if [ "`use mozilla`" ] ; then                                           
 		dodir /usr/lib/mozilla/plugins                                  
 		dosym /opt/${P}/jre/plugin/i386/ns600/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
 	fi                            
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.0-r5.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.0-r5.ebuild
index e8fa85e4e52b..32ea644bc187 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.0-r5.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.0-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# /space/gentoo/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.0-r3.ebuild,v 1.1 2002/06/16 00:24:09 rphillips Exp
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.0-r5.ebuild,v 1.6 2002/09/07 13:13:01 karltk Exp $
 
 . /usr/portage/eclass/inherit.eclass
 inherit java
@@ -14,7 +14,7 @@ LICENSE="sun-bcla"
 SLOT="1.4"
 KEYWORDS="x86 -ppc"
 DEPEND="virtual/glibc
-	>=dev-java/java-config-0.1.3
+	>=dev-java/java-config-0.2.5
 	doc? ( =dev-java/java-sdk-docs-1.4.0* )"
 RDEPEND="$DEPEND"
 
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.1_beta.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1_beta.ebuild
index 8cdfffe8e4bf..301121af9181 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.1_beta.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1_beta.ebuild,v 1.4 2002/08/26 16:47:25 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1_beta.ebuild,v 1.5 2002/09/07 13:13:01 karltk Exp $
 
 . /usr/portage/eclass/inherit.eclass
 inherit java
@@ -14,7 +14,7 @@ LICENSE="sun-bcla"
 SLOT="1.4"
 KEYWORDS="x86 -ppc"
 DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.3
+	>=dev-java/java-config-0.2.5
 	doc? ( =dev-java/java-sdk-docs-1.4.0* )"
 RDEPEND="$DEPEND"
 
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.ebuild
index 2e08aec4bdd4..91bfbf402097 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.ebuild,v 1.2 2002/08/26 16:47:25 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.ebuild,v 1.3 2002/09/07 13:13:01 karltk Exp $
 
 . /usr/portage/eclass/inherit.eclass
 inherit java
@@ -14,7 +14,7 @@ LICENSE="sun-bcla"
 SLOT="1.4"
 KEYWORDS="x86 -ppc"
 DEPEND="virtual/glibc
-	>=dev-java/java-config-0.1.3
+	>=dev-java/java-config-0.2.5
 	doc? ( =dev-java/java-sdk-docs-1.4.0* )"
 RDEPEND="$DEPEND"
 
@@ -54,7 +54,7 @@ src_install () {
 		dosym /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
 	fi
 
-	java_set_env ${FILESDIR}/${VMHANDLE}	
+	set_java_env ${FILESDIR}/${VMHANDLE}	
 }
 
 pkg_postinst () {