Updates and fixes

9 files changed, 148 insertions, 44 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 965f75357ae0..37d1cce398fa 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,13 @@
 # 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.53 2003/08/30 18:52:50 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.54 2003/09/12 04:40:27 strider Exp $
+
+*sun-jdk-1.4.1.05 (12 Sep 2003)
+
+  12 Sep 2003; Adrian Almenar <strider@gentoo.org> sun-jdk-1.3.1.09.ebuild,
+  sun-jdk-1.4.1.04.ebuild, sun-jdk-1.4.1.05.ebuild, sun-jdk-1.4.2.01.ebuild,
+  sun-jdk-1.4.2.ebuild, files/sun-jdk-1.4.1.05:
+  Updated sun-jdk 1.4.1.04 to 1.4.1.05, various fixes
 
   30 Aug 2003; Preston A. Elder <prez@gentoo.org> sun-jdk-1.4.2.01.ebuild:
   Version bump.  Made stable since the download page downloads this version.
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 1b5082e316cf..65e038dbc1eb 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,14 +1,14 @@
-MD5 223b1c84429ae4eefaef0dac2d8016d3 sun-jdk-1.3.1.09.ebuild 2462
-MD5 aba5032860c953e4f72eab0b9c1d4611 sun-jdk-1.4.2.01.ebuild 3720
-MD5 1922e2de3b0398bef442452fe299f1ad sun-jdk-1.4.1.04.ebuild 1928
-MD5 61bbd372a95c53b08c1ed7ee79e8d718 sun-jdk-1.4.2.ebuild 3700
-MD5 b0db7fae714a01f975fb60312c547189 ChangeLog 12533
+MD5 a4bc4e8cada67b3447119752ac799a76 sun-jdk-1.3.1.09.ebuild 2462
+MD5 94d890aa8317f5f7e3347c3b530b6399 sun-jdk-1.4.2.01.ebuild 3723
+MD5 671840585eb433c8dee7321cc2c95c82 sun-jdk-1.4.1.04.ebuild 1928
+MD5 4bcca2fe6e681fc8cb51e89a3696b8da sun-jdk-1.4.2.ebuild 3700
+MD5 852765e232dd774c5845f471030292af ChangeLog 12536
 MD5 3624458aaf058b4b4b2cf00e096c5c84 metadata.xml 382
-MD5 2ec8c79dd08e457b6886ff1d21c265d7 sun-jdk-1.4.1.05.ebuild 1808
+MD5 c02e3a50cf4f127d74f16e21dfd66f24 sun-jdk-1.4.1.05.ebuild 1912
 MD5 69eeb4e77dcdbda3b7efe07f9b3cab15 files/digest-sun-jdk-1.4.2 73
 MD5 20129e994188aa6a6f1b4690cbb91ca9 files/sun-jdk-1.3.1.09 648
 MD5 1bae7c0f1e414754754e6b5fb3c9e84b files/sun-jdk-1.4.1.04 581
-MD5 1bae7c0f1e414754754e6b5fb3c9e84b files/sun-jdk-1.4.1.05 581
+MD5 440220b7275afac3cce9a222d39a2fde files/sun-jdk-1.4.1.05 581
 MD5 ccd9bd0dbf7649c2e5681e9cda01f99c files/sun-jdk-1.4.2.01 519
 MD5 ccd9bd0dbf7649c2e5681e9cda01f99c files/sun-jdk-1.4.2 519
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.3.1.09 0
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.05 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.05
new file mode 100644
index 000000000000..61badf856287
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.05
@@ -0,0 +1 @@
+MD5 3192a50c6927cfef223dfc642e5109ab j2sdk-1_4_1_05-linux-i586.bin 41630774
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.4.1.05 b/dev-java/sun-jdk/files/sun-jdk-1.4.1.05
new file mode 100644
index 000000000000..24d04ad29858
--- /dev/null
+++ b/dev-java/sun-jdk/files/sun-jdk-1.4.1.05
@@ -0,0 +1,14 @@
+# 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.05,v 1.1 2003/09/12 04:40:28 strider Exp $
+
+VERSION="Sun JDK @PV@"
+JAVA_HOME=/opt/@P@
+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"
+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.09.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild
index b646f3068cc5..5d07637f2da5 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild
@@ -1,11 +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.09.ebuild,v 1.1 2003/08/10 21:17:58 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
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.09.ebuild,v 1.2 2003/09/12 04:40:27 strider Exp $
 
 IUSE="doc"
 
@@ -13,7 +8,7 @@ inherit java nsplugins
 
 At="j2sdk-1_3_1_09-linux-i586.bin"
 S="${WORKDIR}/jdk1.3.1_09"
-SRC_URI=""
+SRC_URI="${At}"
 DESCRIPTION="Sun Java Development Kit 1.3.1_09"
 HOMEPAGE="http://java.sun.com/j2se/1.3/download.html"
 DEPEND="virtual/glibc
@@ -28,11 +23,21 @@ SLOT="1.3"
 KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm"
 RESTRICT="fetch"
 
+pkg_nofetch() {
+	einfo "Please download ${At} from:"
+	einfo ${HOMEPAGE}
+	einfo "(select the \"Linux self-extracting file\" package format of the SDK)"
+	einfo "and move it to ${DISTDIR}"
+}
+
 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/"
+	if [ ! -r ${DISTDIR}/${At} ]; then
+		eerror "cannot read ${At}. Please check the permission and try again."
+		die
 	fi
-	tail +295 ${DISTDIR}/${At} > install.sfx
+	testExp=`echo -e "\0177\0105\0114\0106\0001\0001\0001"`
+	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
+	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
 	chmod +x install.sfx
 	./install.sfx
 	rm install.sfx
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.1.04.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1.04.ebuild
index e68d4d315157..99077c3a005c 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.1.04.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1.04.ebuild
@@ -1,11 +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.4.1.04.ebuild,v 1.3 2003/08/24 02:23:53 strider Exp $
-
-# Since This Ebuild Has FETCH restrictions:
-# You need to download this file from 
-# http://java.sun.com/j2se/1.4.1/download.html 
-# and copy it on your distfiles directory and emerge it again
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1.04.ebuild,v 1.4 2003/09/12 04:40:27 strider Exp $
 
 IUSE="doc"
 
@@ -14,7 +9,7 @@ inherit java nsplugins
 At="j2sdk-1_4_1_04-linux-i586.bin"
 S="${WORKDIR}/j2sdk1.4.1_04"
 DESCRIPTION="Sun's J2SE Development Kit, version 1.4.1_04"
-HOMEPAGE="http://java.sun.com/j2se/1.4.1/download.html"
+HOMEPAGE="http://java.sun.com/products/archive/j2se/1.4.1_04/index.html"
 SRC_URI=${At}
 RESTRICT="fetch"
 SLOT="1.4"
@@ -38,8 +33,13 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-	startAt=`grep -aonm 1 ELF ${DISTDIR}/${At} | cut -d: -f1`
-	tail +${startAt} ${DISTDIR}/${At} > install.sfx
+	if [ ! -r ${DISTDIR}/${At} ]; then
+		eerror "cannot read ${At}. Please check the permission and try again."
+		die
+	fi
+	testExp=`echo -e "\0177\0105\0114\0106\0001\0001\0001"`
+	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
+	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
 	chmod +x install.sfx
 	./install.sfx || die
 	rm install.sfx
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.1.05.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1.05.ebuild
new file mode 100644
index 000000000000..f15ed71a2e7a
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1.05.ebuild
@@ -0,0 +1,77 @@
+# 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.05.ebuild,v 1.1 2003/09/12 04:40:27 strider Exp $
+
+IUSE="doc"
+
+inherit java nsplugins
+
+At="j2sdk-1_4_1_05-linux-i586.bin"
+S="${WORKDIR}/j2sdk1.4.1_04"
+DESCRIPTION="Sun's J2SE Development Kit, version 1.4.1_04"
+HOMEPAGE="http://java.sun.com/j2se/1.4.1/download.html"
+SRC_URI=${At}
+RESTRICT="fetch"
+SLOT="1.4"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa -arm"
+
+DEPEND=">=dev-java/java-config-0.2.7
+	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"
+
+pkg_nofetch() {
+	einfo "Please download ${At} from:"
+	einfo ${HOMEPAGE}
+	einfo "(select the \"Linux self-extracting file\" package format of the SDK)"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+	if [ ! -r ${DISTDIR}/${At} ]; then
+		eerror "cannot read ${At}. Please check the permission and try again."
+		die
+	fi
+	testExp=`echo -e "\0177\0105\0114\0106\0001\0001\0001"`
+	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
+	tail -n +${startAt} ${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
+
+	inst_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so
+}
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.01.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.01.ebuild
index aa5088891e94..dbc043cf7bea 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.01.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.01.ebuild
@@ -1,11 +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.4.2.01.ebuild,v 1.1 2003/08/30 18:52:50 prez Exp $
-
-# Since This Ebuild Has FETCH restrictions:
-# You need to download this file from 
-# http://java.sun.com/j2se/1.4.2/download.html 
-# and copy it on your distfiles directory and emerge it again
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.01.ebuild,v 1.2 2003/09/12 04:40:27 strider Exp $
 
 IUSE="doc gnome kde mozilla"
 
@@ -14,7 +9,7 @@ inherit java nsplugins
 At="j2sdk-1_4_2_01-linux-i586.bin"
 S="${WORKDIR}/j2sdk1.4.2_01"
 DESCRIPTION="Sun's J2SE Development Kit, version 1.4.2"
-HOMEPAGE="http://java.sun.com/j2se/1.4.2/download.html"
+HOMEPAGE="http://java.sun.com/products/archive/j2se/1.4.2/index.html"
 SRC_URI=${At}
 RESTRICT="fetch"
 SLOT="1.4"
@@ -44,8 +39,13 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-	startAt=`grep -aonm 1 ELF  ${DISTDIR}/${At} | cut -d: -f1`
-	tail +${startAt} ${DISTDIR}/${At} > install.sfx
+	if [ ! -r ${DISTDIR}/${At} ]; then
+		eerror "cannot read ${At}. Please check the permission and try again."
+		die
+	fi
+	testExp=`echo -e "\0177\0105\0114\0106\0001\0001\0001"`
+	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
+	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
 	chmod +x install.sfx
 	./install.sfx || die
 	rm install.sfx
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.ebuild
index 3d2826909e56..6d7b18612a91 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.ebuild
@@ -1,11 +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.4.2.ebuild,v 1.4 2003/08/24 02:23:53 strider Exp $
-
-# Since This Ebuild Has FETCH restrictions:
-# You need to download this file from 
-# http://java.sun.com/j2se/1.4.2/download.html 
-# and copy it on your distfiles directory and emerge it again
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.ebuild,v 1.5 2003/09/12 04:40:27 strider Exp $
 
 IUSE="doc gnome kde mozilla"
 
@@ -44,8 +39,13 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-	startAt=`grep -aonm 1 ELF  ${DISTDIR}/${At} | cut -d: -f1`
-	tail +${startAt} ${DISTDIR}/${At} > install.sfx
+	if [ ! -r ${DISTDIR}/${At} ]; then
+		eerror "cannot read ${At}. Please check the permission and try again."
+		die
+	fi
+	testExp=`echo -e "\0177\0105\0114\0106\0001\0001\0001"`
+	startAt=`grep -aonm 1 ${testExp}  ${DISTDIR}/${At} | cut -d: -f1`
+	tail -n +${startAt} ${DISTDIR}/${At} > install.sfx
 	chmod +x install.sfx
 	./install.sfx || die
 	rm install.sfx