Fixes on all ebuild setting RESTRICT="fetch", Updated metadata.xml Added sun-jdk-1.4.1.04.

9 files changed, 132 insertions, 23 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 61ca96eb9aa1..f836825b9dbc 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.45 2003/07/29 06:01:42 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.46 2003/07/30 05:31:03 strider Exp $
+
+*sun-jdk-1.4.1_04 (30 Jul 2003)
+
+  30 Jul 2003; Adrian Almenar <strider@gentoo.org> sun-jdk-1.4.1.04.ebuild files/digest-sun-jdk-1.4.1.04 files/sun-jdk-1.4.1.04:
+  Version Bump Maintenance Release for 1.4.1 Tree.
 
 *sun-jdk-1.4.2 (29 Jul 2003)
 
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index f80d5ac56a88..8adaadce44d8 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,10 +1,14 @@
-MD5 ddf63ab506724620f31c5c0128f4d080 sun-jdk-1.3.1.08.ebuild 2252
-MD5 0284b20ff14061a56a1dc4856389656a sun-jdk-1.4.2.ebuild 3505
-MD5 1bd2e4f4e5f769fd99be1f2396e6ec9a sun-jdk-1.4.1.03.ebuild 1635
-MD5 298c8e9f1fdf68d5192e5e20a1dbf95b ChangeLog 10918
+MD5 b4cdf66c5fb9e83218c25a91d41f4d4d sun-jdk-1.4.1.04.ebuild 1845
+MD5 0085132514e437c68bdd9ec6c5173c7e sun-jdk-1.3.1.08.ebuild 2474
+MD5 776e4d7955446ca2f53a984714c77bd9 sun-jdk-1.4.2.ebuild 3607
+MD5 266e55d237c0112c1bb6a2fdf7423939 sun-jdk-1.4.1.03.ebuild 1844
+MD5 ae20fb6a467be72e1972f9ac5e6e64f5 ChangeLog 11132
 MD5 3624458aaf058b4b4b2cf00e096c5c84 metadata.xml 382
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.4.2 0
 MD5 8a81df1198a6df40e3b76b671c047f56 files/sun-jdk-1.3.1.08 625
 MD5 5a41bdc7140aa72827c82fbf14f08f9b files/sun-jdk-1.4.1.03 557
+MD5 884b603c04cb327d275a2a6dc0586097 files/sun-jdk-1.4.1.04 557
 MD5 367cc7adedddc6a6ff226179798d9d2e files/sun-jdk-1.4.2 495
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.3.1.08 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.4.1.03 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.4.1.04 0
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
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.04
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
new file mode 100644
index 000000000000..f8b2f2c3e50c
--- /dev/null
+++ b/dev-java/sun-jdk/files/sun-jdk-1.4.1.04
@@ -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.04,v 1.1 2003/07/30 05:31:03 strider Exp $
+
+VERSION="Sun JDK @PV@"
+JAVA_HOME=/opt/@P@
+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"
+ADDLDPATH="/opt/@P@/jre/lib"
+
+ENV_VARS="JAVA_HOME CLASSPATH JDK_HOME JAVAC ADDPATH ADDLDPATH"
diff --git a/dev-java/sun-jdk/metadata.xml b/dev-java/sun-jdk/metadata.xml
index b8b6f2eb6fd4..c5a8df8e8076 100644
--- a/dev-java/sun-jdk/metadata.xml
+++ b/dev-java/sun-jdk/metadata.xml
@@ -4,7 +4,8 @@
   <herd>java</herd>
   <maintainer>
     <email>strider@gentoo.org</email>
-    <description>Primary Maintainer</description>
+    <name>Adrian Almenar</name>
+    <description>Maintainer</description>
   </maintainer>
-  <longdescription/>
+  <longdescription>Sun Java Development Kit Package. AKA.J2SE</longdescription>
 </pkgmetadata>
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.08.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.08.ebuild
index c2b7905b9582..3422b6314e77 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.08.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.08.ebuild
@@ -1,6 +1,11 @@
 # 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.08.ebuild,v 1.1 2003/05/24 06:19:45 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.08.ebuild,v 1.2 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.3.1/download.html 
+# and copy it on your distfiles directory and emerge it again
 
 IUSE="doc"
 
@@ -14,13 +19,14 @@ 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* )"
-RDEPEND="$DEPEND"
+RDEPEND="sys-libs/lib-compat"
 PROVIDE="virtual/jre-1.3.1
 	virtual/jdk-1.3.1
 	virtual/java-scheme-2"
 LICENSE="sun-bcla-java-vm"
 SLOT="1.3"
 KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm"
+RESTRICT="fetch"
 
 src_unpack() {
 	if [ ! -f ${DISTDIR}/${At} ] ; then
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
index 3edd95b40946..c9fb684fb423 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.1.03.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1.03.ebuild
@@ -1,6 +1,11 @@
 # 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.2 2003/06/16 22:32:20 absinthe Exp $
+# $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"
 
@@ -11,7 +16,7 @@ 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"
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
new file mode 100644
index 000000000000..bfb6aefd8cc1
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1.04.ebuild
@@ -0,0 +1,72 @@
+# 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.1 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_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=""
+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 +437 ${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.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.ebuild
index 73e10b14bff7..a6b0b87718cf 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.ebuild
@@ -1,38 +1,40 @@
 # 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.1 2003/07/29 06:01:42 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.ebuild,v 1.2 2003/07/30 05:31:03 strider Exp $
 
-IUSE="doc gnome kde mozilla"
+# 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
 
 inherit java nsplugins
 
-At="j2sdk-1_4_2-linux-i586.bin"
+A="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=""
-SLOT="1.4"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa -arm"
-
 DEPEND=">=dev-java/java-config-0.2.5
 	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"
 
 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}"
+	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}/${At} > install.sfx
+	tail +507 ${DISTDIR}/${A} > install.sfx
 	chmod +x install.sfx
 	./install.sfx || die
 	rm install.sfx