Fixes to bug 21735

9 files changed, 18 insertions, 122 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 6632babae7d6..0a7f67aadabb 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.50 2003/08/11 16:26:52 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.51 2003/08/15 05:56:19 strider Exp $
+
+  15 Aug 2003; Adrian Almenar <strider@gentoo.org> sun-jdk-1.3.1.08.ebuild,
+  files/sun-jdk-1.3.1.09, files/sun-jdk-1.4.1.03 files/sun-jdk-1.4.1.04,
+  files/sun-jdk-1.4.2:
+  Updated files to fix bug 21735.
 
   11 Aug 2003; Adrian Almenar <strider@gentoo.org> sun-jdk-1.4.2.ebuild:
   Updated to stable since works better than 1.4.1 and have a lot of bug fixes,
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 48d05e9afe33..4e9d2f905cd3 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,17 +1,14 @@
 MD5 b4810fbd963d544b113a822a570baec5 sun-jdk-1.3.1.09.ebuild 2474
 MD5 6388d2a7670d86193047e8e8033803d6 sun-jdk-1.4.1.04.ebuild 1844
-MD5 0085132514e437c68bdd9ec6c5173c7e sun-jdk-1.3.1.08.ebuild 2474
 MD5 af57241e2b36e8c11a7604f6c3b86899 sun-jdk-1.4.2.ebuild 3606
 MD5 266e55d237c0112c1bb6a2fdf7423939 sun-jdk-1.4.1.03.ebuild 1844
-MD5 eb123850fc827f6aa7bfe2e3df692d4e ChangeLog 11671
+MD5 d8eb7004c7bd1db9761c707158bff383 ChangeLog 11878
 MD5 3624458aaf058b4b4b2cf00e096c5c84 metadata.xml 382
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.4.2 0
-MD5 8a81df1198a6df40e3b76b671c047f56 files/sun-jdk-1.3.1.08 625
-MD5 2480c610e566cb1247657ed2becc9881 files/sun-jdk-1.3.1.09 624
-MD5 5a41bdc7140aa72827c82fbf14f08f9b files/sun-jdk-1.4.1.03 557
-MD5 884b603c04cb327d275a2a6dc0586097 files/sun-jdk-1.4.1.04 557
-MD5 367cc7adedddc6a6ff226179798d9d2e files/sun-jdk-1.4.2 495
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.3.1.08 0
+MD5 20129e994188aa6a6f1b4690cbb91ca9 files/sun-jdk-1.3.1.09 648
+MD5 8ff81386c2a15622badd3483b88664bb files/sun-jdk-1.4.1.03 581
+MD5 1bae7c0f1e414754754e6b5fb3c9e84b files/sun-jdk-1.4.1.04 581
+MD5 ccd9bd0dbf7649c2e5681e9cda01f99c files/sun-jdk-1.4.2 519
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.3.1.09 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.4.1.03 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.4.1.04 0
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.08 b/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.08
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.08
+++ /dev/null
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.3.1.08 b/dev-java/sun-jdk/files/sun-jdk-1.3.1.08
deleted file mode 100644
index 85abfe739487..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.3.1.08
+++ /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.08,v 1.1 2003/05/24 06:19:45 absinthe Exp $
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME=/opt/@P@
-CLASSPATH=.:/opt/@P@/jre/lib:/opt/@P@/lib/tools.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.09 b/dev-java/sun-jdk/files/sun-jdk-1.3.1.09
index 324f2732ff86..e7b1efe4bf2e 100644
--- a/dev-java/sun-jdk/files/sun-jdk-1.3.1.09
+++ b/dev-java/sun-jdk/files/sun-jdk-1.3.1.09
@@ -2,11 +2,11 @@
 # 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.09,v 1.1 2003/08/10 21:17:58 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.3.1.09,v 1.2 2003/08/15 05:56:19 strider Exp $
 
 VERSION="Sun JDK @PV@"
 JAVA_HOME=/opt/@P@
-CLASSPATH=.:/opt/@P@/jre/lib:/opt/@P@/lib/tools.jar
+CLASSPATH=.:/opt/@P@/jre/lib:/opt/@P@/lib/tools.jar:/opt/@P@/jre/lib/rt.jar
 JDK_HOME=/opt/@P@
 JAVAC=${JAVA_HOME}/bin/javac
 LD_ASSUME_KERNEL=2.2.5
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.4.1.03 b/dev-java/sun-jdk/files/sun-jdk-1.4.1.03
index cd1efd3beb27..aec0aa116dda 100644
--- a/dev-java/sun-jdk/files/sun-jdk-1.4.1.03
+++ b/dev-java/sun-jdk/files/sun-jdk-1.4.1.03
@@ -1,11 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Karl Trygve Kalleberg
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.4.1.03,v 1.1 2003/06/07 03:21:47 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.4.1.03,v 1.2 2003/08/15 05:56:19 strider Exp $
 
 VERSION="Sun JDK @PV@"
 JAVA_HOME=/opt/@P@
-CLASSPATH=.:/opt/@P@/jre/lib:/opt/@P@/lib/tools.jar
+CLASSPATH=.:/opt/@P@/jre/lib:/opt/@P@/lib/tools.jar:/opt/@P@/jre/lib/rt.jar
 JDK_HOME=/opt/@P@
 JAVAC=${JAVA_HOME}/bin/javac
 ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.4.1.04 b/dev-java/sun-jdk/files/sun-jdk-1.4.1.04
index f8b2f2c3e50c..564cefe337ed 100644
--- a/dev-java/sun-jdk/files/sun-jdk-1.4.1.04
+++ b/dev-java/sun-jdk/files/sun-jdk-1.4.1.04
@@ -1,11 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Karl Trygve Kalleberg
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.4.1.04,v 1.1 2003/07/30 05:31:03 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.4.1.04,v 1.2 2003/08/15 05:56:19 strider Exp $
 
 VERSION="Sun JDK @PV@"
 JAVA_HOME=/opt/@P@
-CLASSPATH=.:/opt/@P@/jre/lib:/opt/@P@/lib/tools.jar
+CLASSPATH=.:/opt/@P@/jre/lib:/opt/@P@/lib/tools.jar:/opt/@P@/jre/lib/rt.jar
 JDK_HOME=/opt/@P@
 JAVAC=${JAVA_HOME}/bin/javac
 ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.4.2 b/dev-java/sun-jdk/files/sun-jdk-1.4.2
index b21d743b0d73..ea03125e02f4 100644
--- a/dev-java/sun-jdk/files/sun-jdk-1.4.2
+++ b/dev-java/sun-jdk/files/sun-jdk-1.4.2
@@ -4,7 +4,7 @@
 
 VERSION="Sun JDK @PV@"
 JAVA_HOME=/opt/@P@
-CLASSPATH=.:/opt/@P@/jre/lib:/opt/@P@/lib/tools.jar
+CLASSPATH=.:/opt/@P@/jre/lib:/opt/@P@/lib/tools.jar:/opt/@P@/jre/lib/rt.jar
 JDK_HOME=/opt/@P@
 JAVAC=${JAVA_HOME}/bin/javac
 ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin:${JAVA_HOME}/jre/javaws"
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.08.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.08.ebuild
deleted file mode 100644
index 3422b6314e77..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.08.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.08.ebuild,v 1.2 2003/07/30 05:31:03 strider Exp $
-
-# Since This Ebuild Has FETCH restrictions:
-# You need to download this file from 
-# http://java.sun.com/j2se/1.3.1/download.html 
-# and copy it on your distfiles directory and emerge it again
-
-IUSE="doc"
-
-inherit java nsplugins
-
-At="j2sdk-1_3_1_08-linux-i586.bin"
-S="${WORKDIR}/jdk1.3.1_08"
-SRC_URI=""
-DESCRIPTION="Sun Java Development Kit 1.3.1_08"
-HOMEPAGE="http://java.sun.com/j2se/1.3/download.html"
-DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.7
-	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
-RDEPEND="sys-libs/lib-compat"
-PROVIDE="virtual/jre-1.3.1
-	virtual/jdk-1.3.1
-	virtual/java-scheme-2"
-LICENSE="sun-bcla-java-vm"
-SLOT="1.3"
-KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm"
-RESTRICT="fetch"
-
-src_unpack() {
-	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE} (select the \"Linux self-extracting file\" package format of the SDK) and move it to ${DISTDIR}. Note: You can find archived releases from http://java.sun.com/products/archive/"
-	fi
-	tail +296 ${DISTDIR}/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx
-	rm install.sfx
-}
-
-src_install () {
-	local dirs="bin include include-old jre lib"
-	dodir /opt/${P}
-
-	for i in ${dirs} ; do
-		if [ "${i}" == "bin" ] ; then
-			dodir /opt/${P}/${i}
-			cp -a ${i}/.java_wrapper ${D}/opt/${P}/bin/
-			cp -a ${i}/* ${D}/opt/${P}/bin/
-		elif [ "${i}" == "jre" ] ; then
-			dodir /opt/${P}/${i}
-			dodir /opt/${P}/${i}/bin
-			cp -a ${i}/bin/.java_wrapper ${D}/opt/${P}/${i}/bin/
-			cp -a ${i}/bin/* ${D}/opt/${P}/${i}/bin/
-			cp -a 	${i}/CHANGES \
-				${i}/COPYRIGHT \
-				${i}/ControlPanel.html \
-				${i}/LICENSE \
-				${i}/README \
-				${i}/Welcome.html \
-				${i}/lib \
-				${i}/plugin \
-				${D}/opt/${P}/${i}/
-		else
-			cp -a ${i} ${D}/opt/${P}/
-		fi
-	done
-
-	dodoc COPYRIGHT README LICENSE
-	dohtml README.html
-
-	doman man/man1/*.1
-
-	dodir /opt/${P}/share/
-	cp -a demo src.jar ${D}/opt/${P}/share/
-
-	if [ "`use mozilla`" ] ; then
-		dodir /usr/lib/mozilla/plugins
-		dosym /opt/${P}/jre/plugin/i386/ns600/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
-	fi
-
-	set_java_env ${FILESDIR}/${VMHANDLE} || die
-}
-
-pkg_postinst () {
-	# Set as default VM if none exists
-	java_pkg_postinst
-
-	inst_plugin /opt/${P}/jre/plugin/i386/mozilla/libjavaplugin_oji.so
-}