Fixes for bug #26683

9 files changed, 46 insertions, 114 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 0a7f67aadabb..a038ab4e8ba6 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.51 2003/08/15 05:56:19 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.52 2003/08/24 02:23:53 strider Exp $
+
+  23 Aug 2003; Adrian Almenar <strider@gentoo.org> sun-jdk-1.4.1.04.ebuild,
+  sun-jdk-1.4.2.ebuild:
+  Fixes for bug #26683. Thanks to Tom Fredrik Blenning Klaussen
+  <bfg-dev@blenning.no> for great part of the fix.
 
   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,
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 3c6e093b41b5..ec3921bc9c3b 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,16 +1,11 @@
 MD5 b4810fbd963d544b113a822a570baec5 sun-jdk-1.3.1.09.ebuild 2474
-MD5 617b01df8358ccedb486e2845a0cabfe .sun-jdk-1.4.1.04.ebuild.swp 12288
-MD5 44f80de430c3cab979595ec39d8f27d5 sun-jdk-1.4.1.04.ebuild 1813
-MD5 852799fdc34e6ccf6a9288e96514ec85 sun-jdk-1.4.2.ebuild 3606
-MD5 310930830667808c14bc491fc677423c .sun-jdk-1.4.2.ebuild.swp 20480
-MD5 266e55d237c0112c1bb6a2fdf7423939 sun-jdk-1.4.1.03.ebuild 1844
-MD5 d8eb7004c7bd1db9761c707158bff383 ChangeLog 11878
+MD5 3af3156ce8d88baf5c15cdf7b65ba848 sun-jdk-1.4.1.04.ebuild 1918
+MD5 c256b2973117dd7882070c0000bfc325 sun-jdk-1.4.2.ebuild 3708
+MD5 de78baca2b0a67839608437954d46b44 ChangeLog 12094
 MD5 3624458aaf058b4b4b2cf00e096c5c84 metadata.xml 382
 MD5 69eeb4e77dcdbda3b7efe07f9b3cab15 files/digest-sun-jdk-1.4.2 73
 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 ee8509b4c5246e7ef5e2ac67b206c15c files/digest-sun-jdk-1.4.1.04 76
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.03 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.03
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.03
+++ /dev/null
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.04 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.04
index e69de29bb2d1..ac99c0023593 100644
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.04
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.04
@@ -0,0 +1 @@
+MD5 8252f0f7b6a6736e0af8690b8405b2c6 j2sdk-1_4_1_04-linux-i586.bin 41573398
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2
index e69de29bb2d1..8be320c6c7a2 100644
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2
@@ -0,0 +1 @@
+MD5 9697495d4145b8e05ea888e03d03a3b6 j2sdk-1_4_2-linux-i586.bin 35761623
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
deleted file mode 100644
index aec0aa116dda..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.4.1.03
+++ /dev/null
@@ -1,14 +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
-# $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:/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.4.1.03.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1.03.ebuild
deleted file mode 100644
index c9fb684fb423..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.4.1.03.ebuild
+++ /dev/null
@@ -1,72 +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.03.ebuild,v 1.3 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.4.1/download.html 
-# and copy it on your distfiles directory and emerge it again
-
-IUSE="doc"
-
-inherit java nsplugins
-
-At="j2sdk-1_4_1_03-linux-i586.bin"
-S="${WORKDIR}/j2sdk1.4.1_03"
-DESCRIPTION="Sun's J2SE Development Kit, version 1.4.1_03"
-HOMEPAGE="http://java.sun.com/j2se/1.4.1/download.html"
-SRC_URI=""
-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.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 +438 ${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.1.04.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1.04.ebuild
index 3417dab9bde6..e68d4d315157 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,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.4.1.04.ebuild,v 1.2 2003/08/08 22:38:24 strider Exp $
+# $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 
@@ -15,13 +15,13 @@ 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"
-SRC_URI=""
+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.5
+DEPEND=">=dev-java/java-config-0.2.7
 	doc? ( =dev-java/java-sdk-docs-1.4.1* )"
 
 RDEPEND="sys-libs/lib-compat"
@@ -30,11 +30,16 @@ 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 [ ! -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 +437 ${DISTDIR}/${At} > install.sfx
+	startAt=`grep -aonm 1 ELF ${DISTDIR}/${At} | cut -d: -f1`
+	tail +${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 37b5b3fd67f1..3d2826909e56 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.ebuild
@@ -1,40 +1,51 @@
 # 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.3 2003/08/11 16:26:52 strider Exp $
+# $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
 
+IUSE="doc gnome kde mozilla"
+
 inherit java nsplugins
 
-A="j2sdk-1_4_2-linux-i586.bin"
+At="j2sdk-1_4_2-linux-i586.bin"
 S="${WORKDIR}/j2sdk1.4.2"
 DESCRIPTION="Sun's J2SE Development Kit, version 1.4.2"
 HOMEPAGE="http://java.sun.com/j2se/1.4.2/download.html"
-SRC_URI=""
-DEPEND=">=dev-java/java-config-0.2.5
+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
 	sys-apps/sed
 	doc? ( =dev-java/java-sdk-docs-1.4.2* )"
+
 RDEPEND="sys-libs/lib-compat"
+
 PROVIDE="virtual/jre-1.4.2
 	virtual/jdk-1.4.2
 	virtual/java-scheme-2"
-LICENSE="sun-bcla-java-vm"
-SLOT="1.4"
-KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm"
-IUSE="doc gnome kde mozilla"
+
 RESTRICT="fetch"
 
 PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar
 jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar"
 
+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}/${A} ]; then
-		die "Please download ${A} from ${HOMEPAGE} (select the \"Linux self-extracting file\" package format of the SDK) and move it to ${DISTDIR}"
-	fi
-	tail +507 ${DISTDIR}/${A} > install.sfx
+	startAt=`grep -aonm 1 ELF  ${DISTDIR}/${At} | cut -d: -f1`
+	tail +${startAt} ${DISTDIR}/${At} > install.sfx
 	chmod +x install.sfx
 	./install.sfx || die
 	rm install.sfx