Fixes #28858.

6 files changed, 8 insertions, 100 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 4bd747a001ab..f1ac7d2555c7 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,9 @@
 # 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.55 2003/09/12 05:06:43 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.56 2003/09/17 01:30:39 strider Exp $
+
+  16 Sep 2003; Adrian Almenar <strider@gentoo.org> sun-jdk-1.4.2.01.ebuild:
+  Fixed homepage URL. #28858
 
   12 Sep 2003; Adrian Almenar <strider@gentoo.org> sun-jdk-1.4.2.01.ebuild,
   sun-jdk-1.4.2.ebuild:
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 885843d0fa90..4767d1cd4069 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,17 +1,14 @@
 MD5 a4bc4e8cada67b3447119752ac799a76 sun-jdk-1.3.1.09.ebuild 2462
-MD5 6d33a5f2037fbd75bb68549f6d311b23 sun-jdk-1.4.2.01.ebuild 3724
-MD5 671840585eb433c8dee7321cc2c95c82 sun-jdk-1.4.1.04.ebuild 1928
+MD5 03f3e235726ec3be30127d62e0cedf43 sun-jdk-1.4.2.01.ebuild 3707
 MD5 c469baf547f0faac8b149e7afc79d92f sun-jdk-1.4.2.ebuild 3701
-MD5 d30e1f0874079d196a77501d8b5065ae ChangeLog 12656
+MD5 770aa95558bdcfcf339a99462fe08d60 ChangeLog 12762
 MD5 3624458aaf058b4b4b2cf00e096c5c84 metadata.xml 382
 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 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 951b3321a6c971e8af7c5b12816f3db0 files/digest-sun-jdk-1.3.1.09 76
-MD5 ee8509b4c5246e7ef5e2ac67b206c15c files/digest-sun-jdk-1.4.1.04 76
 MD5 c79470c52b4a6023145cc947d213b59b files/digest-sun-jdk-1.4.1.05 76
 MD5 389f348934b4a924a337f7cf3dad6479 files/digest-sun-jdk-1.4.2.01 76
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
deleted file mode 100644
index ac99c0023593..000000000000
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.04
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8252f0f7b6a6736e0af8690b8405b2c6 j2sdk-1_4_1_04-linux-i586.bin 41573398
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.4.1.04 b/dev-java/sun-jdk/files/sun-jdk-1.4.1.04
deleted file mode 100644
index 564cefe337ed..000000000000
--- a/dev-java/sun-jdk/files/sun-jdk-1.4.1.04
+++ /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.04,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.04.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1.04.ebuild
deleted file mode 100644
index 99077c3a005c..000000000000
--- a/dev-java/sun-jdk/sun-jdk-1.4.1.04.ebuild
+++ /dev/null
@@ -1,77 +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.04.ebuild,v 1.4 2003/09/12 04:40:27 strider Exp $
-
-IUSE="doc"
-
-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/products/archive/j2se/1.4.1_04/index.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 626d7450b8d8..e3b56d330eea 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,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.2.01.ebuild,v 1.3 2003/09/12 05:06:43 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.01.ebuild,v 1.4 2003/09/17 01:30:39 strider Exp $
 
 IUSE="doc gnome kde mozilla"
 
@@ -9,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/products/archive/j2se/1.4.2/index.html"
+HOMEPAGE="http://java.sun.com/j2se/1.4.2/index.html"
 SRC_URI=${At}
 RESTRICT="fetch"
 SLOT="1.4"