Version Bump, Maintenance Release of sun-jdk 1.4.1

5 files changed, 36 insertions, 19 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 3b2a0ad540fb..ffe029840fcf 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,14 @@
 # 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.42 2003/05/24 06:19:45 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.43 2003/06/07 03:21:46 strider Exp $
+
+*sun-jdk-1.4.1.02-r1 (06 Jun 2003)
+  06 Jun 2003;  Adrian Almenar <strider@gentoo.org> sun-jdk-1.4.1.03.ebuild, files/digest-sun-jdk-1.4.1.03 files/sun-jdk-1.4.1.03:
+  Version Bump -- 1.4.1.03 maintenance release.
+
+  Release notes:
+  http://java.sun.com/j2se/1.4.1/ReleaseNotes.html
+
 
 *sun-jdk-1.3.1.08 (24 May 2003)
 
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index bf4879a1c69e..5959a7bf2ba4 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,9 +1,10 @@
-MD5 c8c85ae5ea7c90b74058b3161a7d113e sun-jdk-1.4.1.02.ebuild 1951
 MD5 ddf63ab506724620f31c5c0128f4d080 sun-jdk-1.3.1.08.ebuild 2252
+MD5 e6a84feb29e2b277e7e233e8dc66b39c sun-jdk-1.4.1.03.ebuild 1635
 MD5 497bb12bcd594ebfe5f7237849a4d2db sun-jdk-1.4.1.02-r1.ebuild 1638
-MD5 74aa29cb477cc9b92b7a0b38547de4e3 ChangeLog 10349
+MD5 f9ee120eebe2b448bca523b4d952fe18 ChangeLog 10633
 MD5 8a81df1198a6df40e3b76b671c047f56 files/sun-jdk-1.3.1.08 625
 MD5 99a2cedb79eb346bcb0829f06628ed67 files/sun-jdk-1.4.1.02 601
+MD5 5a41bdc7140aa72827c82fbf14f08f9b files/sun-jdk-1.4.1.03 557
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.4.1.02-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.3.1.08 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.4.1.02 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-jdk-1.4.1.03 0
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.02 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.03
index e69de29bb2d1..e69de29bb2d1 100644
--- a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.02
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1.03
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
new file mode 100644
index 000000000000..cd1efd3beb27
--- /dev/null
+++ b/dev-java/sun-jdk/files/sun-jdk-1.4.1.03
@@ -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.03,v 1.1 2003/06/07 03:21:47 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/sun-jdk-1.4.1.02.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1.03.ebuild
index 50340760c780..352e038abff9 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.1.02.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1.03.ebuild
@@ -1,20 +1,20 @@
 # 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.02.ebuild,v 1.4 2003/05/24 06:19:45 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1.03.ebuild,v 1.1 2003/06/07 03:21:47 strider Exp $
 
-IUSE="doc mozilla"
+IUSE="doc"
 
-inherit java
+inherit java nsplugins
 
-At="j2sdk-1_4_1_02-linux-i586.bin"
-S="${WORKDIR}/j2sdk1.4.1_02"
-DESCRIPTION="Sun's J2SE Development Kit, version 1.4.1_02"
+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=""
 
 SLOT="1.4"
 LICENSE="sun-bcla-java-vm"
-KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm"
+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* )"
@@ -29,7 +29,7 @@ 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 +430 ${DISTDIR}/${At} > install.sfx
+	tail +438 ${DISTDIR}/${At} > install.sfx
 	chmod +x install.sfx
 	./install.sfx || die
 	rm install.sfx
@@ -63,11 +63,5 @@ 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
+	inst_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so
 }