Some Changes, Please see ChangeLog

13 files changed, 87 insertions, 260 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index f6b5662a33f3..d46a10a16af8 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,9 +1,12 @@
 # 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.34 2002/12/13 10:56:24 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.35 2002/12/15 17:13:16 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.01-r1 (21 Nov 2002)
 
   21 Nov 2002; phoen][x <phoenix@gentoo.org> sun-jdk-1.4.1.01.ebuild,
@@ -12,6 +15,9 @@
 
 *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:
+  Fixes #11116.
+
   03 Dec 2002; Adrian Almenar <strider@gentoo.org> files/sun-jdk-1.3.1.06
   Fixes Bug #11555
 
@@ -21,6 +27,9 @@
 
 *sun-jdk-1.3.1.06 (03 Nov 2002)
 
+  15 Dec 2002; Adrian Almenar <strider@gentoo.org> sun-jdk-1.3.1.06-r1.ebuild:
+  Fixes #11116.    
+
   03 Dec 2002; Adrian Almenar <strider@gentoo.org> files/sun-jdk-1.3.1.06
   Fixes Bug #11555
 
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1_beta b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1_beta
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1_beta
+++ /dev/null
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1_rc1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1_rc1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1_rc1
+++ /dev/null
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.4.1_beta b/dev-java/sun-jdk/files/sun-jdk-1.4.1_beta
deleted file mode 100644
index 97ed74d3ef6a..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.4.1_beta
+++ /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_beta,v 1.2 2002/09/06 21:27:21 owen 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_rc1 b/dev-java/sun-jdk/files/sun-jdk-1.4.1_rc1
deleted file mode 100644
index e81f73d38baf..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.4.1_rc1
+++ /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_rc1,v 1.2 2002/09/06 21:27:21 owen 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/sun-jdk-1.3.1.06-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.06-r1.ebuild
index aa32f43e5311..e7cdf0bd6a61 100644
--- 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
@@ -1,13 +1,13 @@
 # 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.06-r1.ebuild,v 1.2 2002/12/09 04:20:57 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.06-r1.ebuild,v 1.3 2002/12/15 17:13:16 strider Exp $
 
 IUSE="doc"
 
 inherit java nsplugins
 
 At="j2sdk-1_3_1_06-linux-i586.bin"
-S=${WORKDIR}/jdk1.3.1_06
+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"
@@ -20,11 +20,11 @@ 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"
+
 src_unpack() {
 	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE}"
+		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
@@ -35,8 +35,7 @@ src_unpack() {
 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
@@ -49,18 +48,17 @@ src_install () {
 	dodir /opt/${P}/share/
 	cp -a demo src.jar ${D}/opt/${P}/share/
 
-	if [ "`use mozilla`" ] ; then                                           
-		dodir /usr/lib/mozilla/plugins                                  
+	if [ "`use mozilla`" ] ; then
+		dodir /usr/lib/mozilla/plugins
 		dosym /opt/${P}/jre/plugin/i386/ns600/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
-	fi                            
+	fi
 
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
 
-pkg_postinst () {                                                               
+pkg_postinst () {
 	# Set as default VM if none exists
 	java_pkg_postinst
 
-	inst_plugin /opt/${P}/jre/plugin/i386/mozilla/libjavaplugin_oji.so  
-}                                                                             
-                                                                            
+	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
index 149e02bd1625..5dffc604baf3 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.06.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.06.ebuild
@@ -1,13 +1,13 @@
 # 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.06.ebuild,v 1.2 2002/12/09 04:20:57 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.06.ebuild,v 1.3 2002/12/15 17:13:16 strider Exp $
 
 IUSE="doc mozilla"
 
 inherit java
 
 At="j2sdk-1_3_1_06-linux-i586.bin"
-S=${WORKDIR}/jdk1.3.1_06
+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"
@@ -20,11 +20,11 @@ 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"
+
 src_unpack() {
 	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE}"
+		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
@@ -35,8 +35,7 @@ src_unpack() {
 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
@@ -49,24 +48,23 @@ src_install () {
 	dodir /opt/${P}/share/
 	cp -a demo src.jar ${D}/opt/${P}/share/
 
-	if [ "`use mozilla`" ] ; then                                           
-		dodir /usr/lib/mozilla/plugins                                  
+	if [ "`use mozilla`" ] ; then
+		dodir /usr/lib/mozilla/plugins
 		dosym /opt/${P}/jre/plugin/i386/ns600/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
-	fi                            
+	fi
 
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
 
-pkg_postinst () {                                                               
+pkg_postinst () {
 	# Set as default VM if none exists
 	java_pkg_postinst
 
-	if [ "`use mozilla`" ] ; then                                           
+	if [ "`use mozilla`" ] ; then
 		einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins/libjavaplugin_oji.so"
-	else                                                                    
+	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                                                                      
-}                                                                               
-                                                                            
+	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 56a0f0944c0b..e4bd5b59ee61 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,19 +1,19 @@
 # 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.4.0-r5.ebuild,v 1.11 2002/12/09 04:20:57 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.0-r5.ebuild,v 1.12 2002/12/15 17:13:16 strider Exp $
 
 IUSE="doc mozilla"
 
 inherit java
 
 At="j2sdk-1_4_0_01-linux-i586.bin"
-S=${WORKDIR}/j2sdk1.4.0_01
+S="${WORKDIR}/j2sdk1.4.0_01"
 SRC_URI=""
 DESCRIPTION="Sun's J2SE Development Kit, version 1.4.0"
 HOMEPAGE="http://java.sun.com/j2se/1.4/download.html"
 LICENSE="sun-bcla"
 SLOT="1.4"
-KEYWORDS="x86 -ppc -sparc  -alpha"
+KEYWORDS="x86 -ppc -sparc -alpha"
 DEPEND="virtual/glibc
 	>=dev-java/java-config-0.2.5
 	doc? ( =dev-java/java-sdk-docs-1.4.0* )"
@@ -22,7 +22,7 @@ RDEPEND="$DEPEND"
 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 GNUZIP Tar shell script\" package format of the SDK) and move it to ${DISTDIR}"
@@ -36,35 +36,34 @@ src_unpack() {
 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}	
+	set_java_env ${FILESDIR}/${VMHANDLE}
 }
 
-pkg_postinst () {                                                               
+pkg_postinst () {
 	# Set as default system VM if none exists
 	java_pkg_postinst
 
-	if [ "`use mozilla`" ] ; then                                           
+	if [ "`use mozilla`" ] ; then
 		einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins/libjavaplugin_oji140.so"
-	else                                                                    
+	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)"
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.0-r6.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.0-r6.ebuild
index 6c38f3f46b91..192ca4b427e7 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.0-r6.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.0-r6.ebuild
@@ -1,19 +1,19 @@
 # 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.4.0-r6.ebuild,v 1.7 2002/12/09 04:20:57 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.0-r6.ebuild,v 1.8 2002/12/15 17:13:16 strider Exp $
 
 IUSE="doc mozilla"
 
 inherit java
 
 At="j2sdk-1_4_0_02-linux-i586.bin"
-S=${WORKDIR}/j2sdk1.4.0_02
+S="${WORKDIR}/j2sdk1.4.0_02"
 SRC_URI=""
 DESCRIPTION="Sun's J2SE Development Kit, version 1.4.0"
 HOMEPAGE="http://java.sun.com/j2se/1.4/download.html"
 LICENSE="sun-bcla"
 SLOT="1.4"
-KEYWORDS="x86 -ppc -sparc  -alpha"
+KEYWORDS="x86 -ppc -sparc -alpha"
 DEPEND="virtual/glibc
 	>=dev-java/java-config-0.2.5
 	doc? ( =dev-java/java-sdk-docs-1.4.0* )"
@@ -22,7 +22,7 @@ RDEPEND="$DEPEND"
 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}. Note: You can find archived releases from http://java.sun.com/products/archive/"
@@ -36,35 +36,34 @@ src_unpack() {
 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}	
+	set_java_env ${FILESDIR}/${VMHANDLE}
 }
 
-pkg_postinst () {                                                               
+pkg_postinst () {
 	# Set as default system VM if none exists
 	java_pkg_postinst
 
-	if [ "`use mozilla`" ] ; then                                           
+	if [ "`use mozilla`" ] ; then
 		einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins/libjavaplugin_oji140.so"
-	else                                                                    
+	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)"
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.01-r1.ebuild
index e51ab2dc4673..ebd0df6927f9 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.1.01-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1.01-r1.ebuild
@@ -1,19 +1,19 @@
 # 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.4.1.01-r1.ebuild,v 1.2 2002/12/09 04:20:57 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1.01-r1.ebuild,v 1.3 2002/12/15 17:13:16 strider Exp $
 
 IUSE="doc"
 
 inherit java nsplugins
 
 At="j2sdk-1_4_1_01-linux-i586.bin"
-S=${WORKDIR}/j2sdk1.4.1_01
+S="${WORKDIR}/j2sdk1.4.1_01"
 SRC_URI=""
 DESCRIPTION="Sun's J2SE Development Kit, version 1.4.1_01"
 HOMEPAGE="http://java.sun.com/j2se/1.4.1/download.html"
 LICENSE="sun-bcla"
 SLOT="1.4"
-KEYWORDS="~x86 -ppc -sparc  -alpha"
+KEYWORDS="~x86 -ppc -sparc -alpha"
 DEPEND="virtual/glibc
 	>=dev-java/java-config-0.2.5
 	doc? ( =dev-java/java-sdk-docs-1.4.1* )"
@@ -21,7 +21,7 @@ DEPEND="virtual/glibc
 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}"
@@ -35,29 +35,28 @@ src_unpack() {
 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}	
+	set_java_env ${FILESDIR}/${VMHANDLE}
 }
 
-pkg_postinst () {                                                               
+pkg_postinst () {
 	# Set as default VM if none exists
 	java_pkg_postinst
 
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
index 890d3accbb2f..be50778386ea 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.1.01.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1.01.ebuild
@@ -1,19 +1,19 @@
 # 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.4.1.01.ebuild,v 1.4 2002/12/09 04:20:57 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1.01.ebuild,v 1.5 2002/12/15 17:13:16 strider Exp $
 
 IUSE="doc mozilla"
 
 inherit java
 
 At="j2sdk-1_4_1_01-linux-i586.bin"
-S=${WORKDIR}/j2sdk1.4.1_01
+S="${WORKDIR}/j2sdk1.4.1_01"
 SRC_URI=""
 DESCRIPTION="Sun's J2SE Development Kit, version 1.4.1_01"
 HOMEPAGE="http://java.sun.com/j2se/1.4.1/download.html"
 LICENSE="sun-bcla"
 SLOT="1.4"
-KEYWORDS="x86 -ppc -sparc  -alpha"
+KEYWORDS="x86 -ppc -sparc -alpha"
 DEPEND="virtual/glibc
 	>=dev-java/java-config-0.2.5
 	doc? ( =dev-java/java-sdk-docs-1.4.1* )"
@@ -21,7 +21,7 @@ DEPEND="virtual/glibc
 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}"
@@ -35,35 +35,34 @@ src_unpack() {
 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}	
+	set_java_env ${FILESDIR}/${VMHANDLE}
 }
 
-pkg_postinst () {                                                               
+pkg_postinst () {
 	# Set as default VM if none exists
 	java_pkg_postinst
 
-	if [ "`use mozilla`" ] ; then                                           
+	if [ "`use mozilla`" ] ; then
 		einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins/libjavaplugin_oji140.so"
-	else                                                                    
+	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)"
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
deleted file mode 100644
index e9735a701aa5..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.4.1_beta.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.4.1_beta.ebuild,v 1.11 2002/12/09 04:20:57 manson Exp $
-
-IUSE="doc mozilla"
-
-inherit java
-
-At="j2sdk-1_4_1-beta-linux-i586.bin"
-S=${WORKDIR}/j2sdk1.4.1
-SRC_URI=""
-DESCRIPTION="Sun's J2SE Development Kit, version 1.4.1"
-HOMEPAGE="http://java.sun.com/j2se/1.4.1/download.html"
-LICENSE="sun-bcla"
-SLOT="1.4"
-KEYWORDS="~x86 -ppc -sparc  -alpha"
-DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.5
-	doc? ( =dev-java/java-sdk-docs-1.4.0* )"
-RDEPEND="$DEPEND"
-
-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 GNUZIP Tar shell script\" package format of the SDK) and move it to ${DISTDIR}"
-	fi
-	tail +273 ${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} || die
-}
-
-pkg_postinst () {        
-	# Set as default system 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_rc1.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.ebuild
deleted file mode 100644
index 92c410ec84ff..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.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.4.1_rc1.ebuild,v 1.10 2002/12/09 04:20:57 manson Exp $
-
-IUSE="doc mozilla"
-
-inherit java
-
-At="j2sdk-1_4_1-rc-linux-i586.bin"
-S=${WORKDIR}/j2sdk1.4.1
-SRC_URI=""
-DESCRIPTION="Sun's J2SE Development Kit, version 1.4.1"
-HOMEPAGE="http://java.sun.com/j2se/1.4.1/download.html"
-LICENSE="sun-bcla"
-SLOT="1.4"
-KEYWORDS="~x86 -ppc -sparc  -alpha"
-DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.5
-	doc? ( =dev-java/java-sdk-docs-1.4.0* )"
-RDEPEND="$DEPEND"
-
-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 +276 ${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
-}