Fixes, Putting ebuilds on stable.

13 files changed, 25 insertions, 258 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 5ccb1989f619..9bc4b664ebe9 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,12 +1,24 @@
 # 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.40 2003/04/23 06:16:50 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.41 2003/04/23 20:21:28 strider Exp $
  
   15 Dec 2002; Adrian Almenar <strider@gentoo.org>: Correct formating for all
   ebuilds so lintool doesnt complain. (Make them policy compliant).
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
 
+*sun-jdk-1.4.1.02-r1 (23 Apr 2003)
+
+  23 Apr 2003; Adrian Almenar <strider@gentoo.org> sun-jdk-1.4.1.02-r1.ebuild,
+  files/digest-sun-jdk-1.4.1.02-r1 files/sun-jdk-1.4.1.02:
+  Fixes #18067 #19722.
+
+*sun-jdk-1.3.1.07 (23 Mar 2003)
+
+  23 Mar 2003; Adrian Almenar <strider@gentoo.org> sun-jdk-1.3.1.07.ebuild:
+  Updated ebuild for latest 1.3 version.
+  Fixes #16088 #18067 #19722.
+
 *sun-jdk-1.4.1.02 (06 Mar 2003)
 
   17 Mar 2003; Adrian Almenar <strider@gentoo.org> sun-jdk-1.4.1.02.ebuild:
@@ -30,13 +42,6 @@
   files/digest-sun-jdk-1.4.1.01 :
   Switched to the new nsplugins layout.
 
-*sun-jdk-1.3.1.07 (23 Mar 2003)
-
-  23 Mar 2003; Adrian Almenar <strider@gentoo.org> sun-jdk-1.4.1.03.ebuild:
-  Updated ebuild for latest 1.3 version.
-  Fixes #16088 #18067 #19722.
-  Putting now in testing.
-
 *sun-jdk-1.3.1.06-r1 (21 Nov 2002)
 
   15 Dec 2002; Adrian Almenar <strider@gentoo.org> sun-jdk-1.3.1.06-r1.ebuild:
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.06-r1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.06-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.06-r1
+++ /dev/null
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.01 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.01
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.01
+++ /dev/null
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.01-r1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.01-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.01-r1
+++ /dev/null
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.06 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.02-r1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.3.1.06
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.02-r1
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
deleted file mode 100644
index 9183a409210b..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.3.1.06
+++ /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.06,v 1.2 2002/12/04 02:59:30 strider Exp $
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME=/opt/@P@
-CLASSPATH=/opt/@P@/jre/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.4.1.01 b/dev-java/sun-jdk/files/sun-jdk-1.4.1.01
deleted file mode 100644
index 1421ce3ebf8c..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.4.1.01
+++ /dev/null
@@ -1,15 +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.4.1.01,v 1.1 2002/10/17 14:37:08 blizzy Exp $
-
-VERSION="Sun JDK @PV@"
-JAVA_HOME=/opt/@P@
-CLASSPATH=/opt/@P@/jre/lib/rt.jar:.
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-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.1.02 b/dev-java/sun-jdk/files/sun-jdk-1.4.1.02
index 575ed6b3af6a..189d4c330164 100644
--- a/dev-java/sun-jdk/files/sun-jdk-1.4.1.02
+++ b/dev-java/sun-jdk/files/sun-jdk-1.4.1.02
@@ -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.4.1.02,v 1.1 2003/03/06 18:48:17 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.4.1.02,v 1.2 2003/04/23 20:21:29 strider Exp $
 
 VERSION="Sun JDK @PV@"
 JAVA_HOME=/opt/@P@
-CLASSPATH=/opt/@P@/jre/lib/rt.jar:.
+CLASSPATH=.:/opt/@P@/jre/lib:/opt/@P@/lib/tools.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/sun-jdk-1.3.1.06-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.06-r1.ebuild
deleted file mode 100644
index c98d463f886e..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.06-r1.ebuild
+++ /dev/null
@@ -1,64 +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.06-r1.ebuild,v 1.4 2003/02/13 10:23:02 vapier Exp $
-
-IUSE="doc"
-
-inherit java nsplugins
-
-At="j2sdk-1_3_1_06-linux-i586.bin"
-S="${WORKDIR}/jdk1.3.1_06"
-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 -alpha"
-
-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 +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
-
-	inst_plugin /opt/${P}/jre/plugin/i386/mozilla/libjavaplugin_oji.so
-}
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.06.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.06.ebuild
deleted file mode 100644
index 53a0d37bd8e5..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.06.ebuild
+++ /dev/null
@@ -1,70 +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.06.ebuild,v 1.4 2003/02/13 10:23:07 vapier Exp $
-
-IUSE="doc mozilla"
-
-inherit java
-
-At="j2sdk-1_3_1_06-linux-i586.bin"
-S="${WORKDIR}/jdk1.3.1_06"
-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 -alpha"
-
-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 +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.07.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.07.ebuild
index c03aee0b037d..6850189fa9e0 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.07.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.07.ebuild
@@ -1,6 +1,6 @@
 # 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.07.ebuild,v 1.1 2003/04/23 06:16:50 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.07.ebuild,v 1.2 2003/04/23 20:21:28 strider Exp $
 
 IUSE="doc"
 
@@ -9,8 +9,8 @@ inherit java nsplugins
 At="j2sdk-1_3_1_07-linux-i586.bin"
 S="${WORKDIR}/jdk1.3.1_07"
 SRC_URI=""
-DESCRIPTION="Sun Java Development Kit 1.3.1"
-HOMEPAGE="http://java.sun.com/j2se/1.3/download-linux.html"
+DESCRIPTION="Sun Java Development Kit 1.3.1_07"
+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* )"
@@ -20,7 +20,7 @@ PROVIDE="virtual/jre-1.3.1
 	virtual/java-scheme-2"
 LICENSE="sun-bcla"
 SLOT="1.3"
-KEYWORDS="~x86 -ppc -sparc -alpha"
+KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm"
 
 src_unpack() {
 	if [ ! -f ${DISTDIR}/${At} ] ; then
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.1.01.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1.01.ebuild
deleted file mode 100644
index 772d39cd8ad3..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.4.1.01.ebuild
+++ /dev/null
@@ -1,73 +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.4.1.01.ebuild,v 1.8 2003/03/17 15:26:09 strider Exp $
-
-IUSE="doc mozilla"
-
-inherit java
-
-At="j2sdk-1_4_1_01-linux-i586.bin"
-S="${WORKDIR}/j2sdk1.4.1_01"
-DESCRIPTION="Sun's J2SE Development Kit, version 1.4.1_01"
-HOMEPAGE="http://java.sun.com/products/archive/j2se/1.4.1_01/index.html"
-SRC_URI=""
-
-SLOT="1.4"
-LICENSE="sun-bcla"
-KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm"
-
-DEPEND=">=dev-java/java-config-0.2.5
-	doc? ( =dev-java/java-sdk-docs-1.4.1* )"
-
-RDEPEND="sys-libs/lib-compat"
-
-PROVIDE="virtual/jre-1.4
-	virtual/jdk-1.4
-	virtual/java-scheme-2"
-
-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}"
-	fi
-	tail +436 ${DISTDIR}/${At} > install.sfx
-	chmod +x install.sfx
-	./install.sfx || die
-	rm install.sfx
-}
-
-src_install () {
-	local dirs="bin include 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.zip ${D}/opt/${P}/share/
-
-	if [ "`use mozilla`" ] ; then
-		dodir /usr/lib/mozilla/plugins
-		dosym /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
-	fi
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-}
-
-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_oji140.so"
-	else
-		einfo "To install the Java plugin for Mozilla manually, do:"
-		einfo "ln -s /opt/${P}/jre/plugin/i386/ns610/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.4.1.01-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1.02-r1.ebuild
index 6cfcc0612098..0a7c169258b9 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.1.01-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1.02-r1.ebuild
@@ -1,20 +1,20 @@
 # 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.4.1.01-r1.ebuild,v 1.5 2003/03/09 14:26:38 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1.02-r1.ebuild,v 1.1 2003/04/23 20:21:29 strider Exp $
 
 IUSE="doc"
 
 inherit java nsplugins
 
-At="j2sdk-1_4_1_01-linux-i586.bin"
-S="${WORKDIR}/j2sdk1.4.1_01"
-DESCRIPTION="Sun's J2SE Development Kit, version 1.4.1_01"
+At="j2sdk-1_4_1_02-linux-i586.bin"
+S="${WORKDIR}/j2sdk1.4.1_02"
+DESCRIPTION="Sun's J2SE Development Kit, version 1.4.1_02"
 HOMEPAGE="http://java.sun.com/j2se/1.4.1/download.html"
 SRC_URI=""
 
 SLOT="1.4"
 LICENSE="sun-bcla"
-KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa -arm"
+KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm"
 
 DEPEND=">=dev-java/java-config-0.2.5
 	doc? ( =dev-java/java-sdk-docs-1.4.1* )"
@@ -29,7 +29,7 @@ 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}"
 	fi
-	tail +436 ${DISTDIR}/${At} > install.sfx
+	tail +430 ${DISTDIR}/${At} > install.sfx
 	chmod +x install.sfx
 	./install.sfx || die
 	rm install.sfx