new version of dev-java/sun-jdk

4 files changed, 126 insertions, 51 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 014370af2559..ea1f1a71086a 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,46 +1,46 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.17 2002/08/19 17:52:39 cybersystem Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.18 2002/08/23 00:00:17 blizzy Exp $
 
-*sun-jdk-1.4.1_beta (19 August 2002)
+*sun-jdk-1.4.1_rc1 (23 Aug 2002)
+
+  23 Aug 2002; Maik Schreiber <blizzy@gentoo.org> sun-jdk-1.4.1_rc1.ebuild,
+  ChangeLog, files/digest-sun-jdk-1.4.1_rc1: New version. Cleaned up ChangeLog
+  a bit.
 
-  19 August 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, sun-jdk-1.4.1_beta.ebuild :
+*sun-jdk-1.4.1_beta (19 August 2002)
 
-  Added -ppc to the keywords.
+  19 August 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog,
+  sun-jdk-1.4.1_beta.ebuild: Added -ppc to the keywords.
 
 *sun-jdk-1.4.1_beta (08 Aug 2002)
 
-  09 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.4.1_beta.ebuild : 
+  09 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.4.1_beta.ebuild:
   Fixed version typos in the ebuild. Fixed omissions in this ChangeLog. Fixes
   #6206.
 
-  08 Aug 2002; Maik Schreiber <blizzy@gentoo.org>  sun-jdk-1.4.1_beta.ebuild files/digest-sun-jdk-1.4.1.ebuild files/sun-jdk-1.4.1_beta : 
-  New upstream version.
+  08 Aug 2002; Maik Schreiber <blizzy@gentoo.org>  sun-jdk-1.4.1_beta.ebuild
+  files/digest-sun-jdk-1.4.1.ebuild files/sun-jdk-1.4.1_beta: New upstream version.
 
 *sun-jdk-1.3.1.04 (29 Jun 2002)
 
-  01 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.3.1.04.ebuild :
-
+  01 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.3.1.04.ebuild:
   Added proper LICENSE, SLOT and KEYWORDS. Removed older 1.3.1 versions.
 
-  29 Jun 2002; Matthew Kennedy <mkennedy@gentoo.org> sun-jdk-1.3.1.04.ebuild : 
-
+  29 Jun 2002; Matthew Kennedy <mkennedy@gentoo.org> sun-jdk-1.3.1.04.ebuild:
   Resolves bug #4319
 
 *sun-jdk-1.4.0-r5 (25 Jun 2002)
 
-  01 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.4.0-r5.ebuild :
-
+  01 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.4.0-r5.ebuild:
   Added proper LICENSE, SLOT and KEYWORDS. Removed old revisions.
 
-  25 Jun 2002; Matthew Kennedy <mkennedy@gentoo.org> sun-jdk-1.4.0-r5.ebuild : 
-
+  25 Jun 2002; Matthew Kennedy <mkennedy@gentoo.org> sun-jdk-1.4.0-r5.ebuild:
   Fixed documentation/manual symlink instuctions bug. Bug #3962
 
 *sun-jdk-1.4.0-r4 (19 Jun 2002)
 
-  19 Jun 2002; Doug Goldstein (Cardoe) <dougg@ufl.edu> sun-jdk-1.4.0-r4.ebuild :
-
+  19 Jun 2002; Doug Goldstein (Cardoe) <dougg@ufl.edu> sun-jdk-1.4.0-r4.ebuild:
   Updated the filename of the binary file used to install this as Sun has changed it.
   Also updated the symlink that all browsers use to use the Java Plugin from here because it was broke.
   
@@ -48,87 +48,77 @@
 
 *sun-jdk-1.3.1-r3 (15 Jun 2002)
 
-  15 May 2002; Ryan Phillips <rphillips@gentoo.org> sun-jdk-1.3.1-r3.ebuild :
-
+  15 May 2002; Ryan Phillips <rphillips@gentoo.org> sun-jdk-1.3.1-r3.ebuild:
   Sun changed the binary package of the current SDK... This fixes the tail + problem
   and the binary that is now provided is compiled for 586.
 
 *sun-jdk-1.3.1.02 (04 May 2002)
 
-  04 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> files/sun-jdk-1.3.1.02 :
-
+  04 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> files/sun-jdk-1.3.1.02:
   Added file.
 
 *sun-jdk-1.3.1.03 (04 May 2002)
 
-  04 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> files/sun-jdk-1.3.1.03 :
-
+  04 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> files/sun-jdk-1.3.1.03:
   Added file. Removed files/sun-jdk-1.3.1
 
 *sun-jdk-1.3.1.03 (24 Apr 2002)
 
-  24 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.3.1.03.ebuild files/digest-sun-jdk-1.3.1.03 :
-
-  New upstream version. Old revision (1.3.1-r3) renamed to 1.3.1.02.
+  24 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.3.1.03.ebuild
+  files/digest-sun-jdk-1.3.1.03: New upstream version. Old revision (1.3.1-r3)
+  renamed to 1.3.1.02.
 
 *sun-jdk-1.4.0-r2 (18 Apr 2002)
 
-  18 Apr 2002; Ryan Phillips <rphillips@gentoo.org> files/sun-jdk-1.4.0
-
+  18 Apr 2002; Ryan Phillips <rphillips@gentoo.org> files/sun-jdk-1.4.0:
   Fixed CLASSPATH; pointing to wrong directory. (#1927) 
 
 *sun-jdk-1.4.0-r2 (09 Apr 2002)
 
-  09 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.4.0-r2.ebuild files/digest-sun-jdk-1.4.0-r2:
-
-  Fixed missing ROOTPATH.
+  09 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.4.0-r2.ebuild
+  files/digest-sun-jdk-1.4.0-r2: Fixed missing ROOTPATH.
 
   Removed sun-jdk-1.4.0-r1.ebuild files/digest-sun-jdk-1.4.0-r1
 
 *sun-jdk-1.3.1-r3 (09 Apr 2002)
 
-  09 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.3.1-r3.ebuild files/digest-sun-jdk-1.3.1-r3:
-
-  Fixed missing ROOTPATH.
+  09 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.3.1-r3.ebuild
+  files/digest-sun-jdk-1.3.1-r3: Fixed missing ROOTPATH.
 
   Removed sun-jdk-1.3.1-r2.ebuild files/digest-sun-jdk-1.3.1-r2
 
 *sun-jdk-1.3.1-r2 (18 Mar 2002)
 
-  18 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.3.1-r2.ebuild files/digest-sun-jdk-1.3.1-r2 files/sun-jdk-1.3.1:
-
-  Added support for JVM switching.
+  18 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.3.1-r2.ebuild
+  files/digest-sun-jdk-1.3.1-r2 files/sun-jdk-1.3.1: Added support for JVM
+  switching.
 
   Removed old revisions.
 
 *sun-jdk-1.4.0-r1 (18 Mar 2002)
 
-  18 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.4.0-r1.ebuild files/digest-sun-jdk-1.4-r1 files/sun-jdk-1.4.0:
-
-  Added support for JVM switching.
+  18 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.4.0-r1.ebuild
+  files/digest-sun-jdk-1.4-r1 files/sun-jdk-1.4.0: Added support for JVM switching.
 
   Removed old revisions.
 
 *sun-jdk-1.4.0 (17 Feb 2002)
 
-  17 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ChangeLog digest/sun-jdk/sun-jdk-1.4 files/digest-sun-jdk-1.4 :
-  
-  Sun's JDK version 1.4, final release. Still with mmap and faster VM.
+  17 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ChangeLog
+  digest/sun-jdk/sun-jdk-1.4 files/digest-sun-jdk-1.4: Sun's JDK version 1.4,
+  final release. Still with mmap and faster VM.
 
   Ebuild submitted by Daniel Mettler <mettlerd@icu.unizh.ch>
 
-
 *sun-jdk-1.4.0_pre1 (10 Feb 2002)
 
-  10 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ChangeLog digest/sun-jdk/sun-jdk-1.4_pre1 files/digest-sun-jdk-1.4_pre1 :
-  
-  Sun's JDK version 1.4, pre-release 1. Now with mmap and faster VM.
+  10 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ChangeLog
+  digest/sun-jdk/sun-jdk-1.4_pre1 files/digest-sun-jdk-1.4_pre1: Sun's JDK
+  version 1.4, pre-release 1. Now with mmap and faster VM.
 
   Ebuild submitted by Luke Holden <alterself@prodigy.net>
 
-
 *sun-jdk-1.3.1-r1 (1 Feb 2002)
 
-  10 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> :
-
-  Sun's JDK version 1.3.1. Considered stable.  
+  10 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> : Sun's JDK version
+  1.3.1. Considered stable.
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1_rc1 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1_rc1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.1_rc1
diff --git a/dev-java/sun-jdk/files/sun-jdk-1.4.1_rc1 b/dev-java/sun-jdk/files/sun-jdk-1.4.1_rc1
new file mode 100644
index 000000000000..be731353641c
--- /dev/null
+++ b/dev-java/sun-jdk/files/sun-jdk-1.4.1_rc1
@@ -0,0 +1,15 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author: Karl Trygve Kalleberg
+# Maintainer: Tools Team <tools@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.4.1_rc1,v 1.1 2002/08/23 00:00:17 blizzy Exp $
+
+VERSION="Sun JDK @PV@"
+JAVA_HOME=/opt/@P@
+CLASSPATH=/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_rc1.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.ebuild
new file mode 100644
index 000000000000..741f5349aa44
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.ebuild,v 1.1 2002/08/23 00:00:17 blizzy Exp $
+
+At="j2sdk-1_4_1-rc-linux-i586.bin"
+S=${WORKDIR}/j2sdk1.4.1
+SRC_URI=""
+DESCRIPTION="Sun's J2SE Development Kit, version 1.4.1"
+HOMEPAGE="http://java.sun.com/j2se/1.4.1/download.html"
+LICENSE="sun-bcla"
+SLOT="0"
+KEYWORDS="x86 -ppc"
+DEPEND="virtual/glibc
+	>=dev-java/java-config-0.1.3"
+RDEPEND="$DEPEND"
+
+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 GNUZIP Tar shell script\" package format of the SDK) and move it to ${DISTDIR}"
+	fi
+	tail +276 ${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
+	
+	dodir /etc/env.d/java 
+	sed \
+		-e "s/@P@/${P}/g" \
+		-e "s/@PV@/${PV}/g" \
+		-e "s/@PF@/${PF}/g" \
+		< ${FILESDIR}/sun-jdk-${PV} \
+                > ${D}/etc/env.d/java/20sun-jdk-${PV} 
+}
+
+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
+}