Removed old versions, Fixed bug 11555

8 files changed, 9 insertions, 179 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 1519327db3b8..3ce7edcedd02 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,6 @@
 # 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.31 2002/11/21 19:42:49 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.32 2002/12/04 02:59:30 strider Exp $
 
 *sun-jdk-1.4.1.01-r1 (21 Nov 2002)
 
@@ -10,12 +10,18 @@
 
 *sun-jdk-1.3.1.06-r1 (21 Nov 2002)
 
+  03 Dec 2002; Adrian Almenar <strider@gentoo.org> files/sun-jdk-1.3.1.06
+  Fixes Bug #11555
+
   21 Nov 2002; phoen][x <phoenix@gentoo.org> sun-jdk-1.3.1.06-r1.ebuild,
   files/digest-sun-jdk-1.3.1.06-r1 :
   Switched to the new nsplugins layout.
 
 *sun-jdk-1.3.1.06 (03 Nov 2002)
 
+  03 Dec 2002; Adrian Almenar <strider@gentoo.org> files/sun-jdk-1.3.1.06
+  Fixes Bug #11555
+
   03 Nov 2002; Adrian Almenar <strider@gentoo.org> sun-jdk-1.3.1.06.ebuild,
   files/digest-sun-jdk-1.3.1.06, files/sun-jdk-1.3.1.06:
   New Sun minor release. Resolves bug #9772.
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.04 b/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.04
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.04
+++ /dev/null
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.05 b/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.05
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.05
+++ /dev/null
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.3.1.04 b/dev-java/sun-jdk/files/sun-jdk-1.3.1.04
deleted file mode 100644
index d355e3d8f04e..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.3.1.04
+++ /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.04,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.05 b/dev-java/sun-jdk/files/sun-jdk-1.3.1.05
deleted file mode 100644
index fc5827eb5a21..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.3.1.05
+++ /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.05,v 1.1 2002/10/17 03:38:19 mkennedy 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.06 b/dev-java/sun-jdk/files/sun-jdk-1.3.1.06
index f0719875d4d5..9183a409210b 100644
--- a/dev-java/sun-jdk/files/sun-jdk-1.3.1.06
+++ b/dev-java/sun-jdk/files/sun-jdk-1.3.1.06
@@ -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.06,v 1.1 2002/11/04 03:37:13 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.3.1.06,v 1.2 2002/12/04 02:59:30 strider Exp $
 
 VERSION="Sun JDK @PV@"
 JAVA_HOME=/opt/@P@
-CLASSPATH=/opt/@P@/lib/rt.jar:.
+CLASSPATH=/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/sun-jdk-1.3.1.04.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.04.ebuild
deleted file mode 100644
index e020985d89af..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.04.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2002 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.04.ebuild,v 1.8 2002/10/17 14:35:42 blizzy Exp $
-
-IUSE="doc mozilla"
-
-inherit java
-
-At="j2sdk-1_3_1_04-linux-i586.bin"
-S=${WORKDIR}/jdk1.3.1_04
-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.5
-	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
-RDEPEND="$DEPEND"
-PROVIDE="virtual/jre-1.3.1
-	virtual/jdk-1.3.1
-	virtual/java-scheme-2"
-LICENSE="sun-bcla"
-SLOT="1.3"
-KEYWORDS="x86 -ppc -sparc -sparc64 -alpha"
-	
-src_unpack() {
-	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE}"
-	fi
-	tail +291 ${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
-		cp -a $i ${D}/opt/${P}/
-	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
-
-	if [ "`use mozilla`" ] ; then                                           
-		einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins/libjavaplugin_oji.so"
-	else                                                                    
-		einfo "To install the Java plugin for Mozilla manually, do:"
-		einfo "ln -s /opt/${P}/jre/plugin/i386/mozilla/libjavaplugin_oji.so /usr/lib/mozilla/plugins/"
-		einfo '(Make certain the directory /usr/lib/mozilla/plugins exists first)'
-	fi                                                                      
-}                                                                               
-                                                                            
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.05.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.05.ebuild
deleted file mode 100644
index 685d6a184576..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.05.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2002 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.05.ebuild,v 1.3 2002/10/17 14:35:42 blizzy Exp $
-
-IUSE="doc mozilla"
-
-inherit java
-
-At="j2sdk-1_3_1_05-linux-i586.bin"
-S=${WORKDIR}/jdk1.3.1_05
-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.5
-	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
-RDEPEND="$DEPEND"
-PROVIDE="virtual/jre-1.3.1
-	virtual/jdk-1.3.1
-	virtual/java-scheme-2"
-LICENSE="sun-bcla"
-SLOT="1.3"
-KEYWORDS="x86 -ppc -sparc -sparc64 -alpha"
-	
-src_unpack() {
-	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE}"
-	fi
-	tail +291 ${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
-		cp -a $i ${D}/opt/${P}/
-	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
-
-	if [ "`use mozilla`" ] ; then                                           
-		einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins/libjavaplugin_oji.so"
-	else                                                                    
-		einfo "To install the Java plugin for Mozilla manually, do:"
-		einfo "ln -s /opt/${P}/jre/plugin/i386/mozilla/libjavaplugin_oji.so /usr/lib/mozilla/plugins/"
-		einfo '(Make certain the directory /usr/lib/mozilla/plugins exists first)'
-	fi                                                                      
-}                                                                               
-