resolves bug 7707. new upstream version b0rkage

3 files changed, 111 insertions, 10 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 69b00a8fa4ef..6f27b19498ae 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,10 +1,23 @@
 # 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.21 2002/09/07 13:13:01 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.22 2002/09/11 16:56:09 mkennedy Exp $
+
+*sun-jdk-1.4.0-r6 (11 Sep 2002)
+
+  11 Sep 2002; Matthew Kennedy <mkennedy@gentoo.org>
+  sun-jdk-1.4.0-r6.ebuild, ChangeLog, files/digest-sun-jdk-1.4.0-r6 :
+
+  New Sun minor version release. Resolves bug #7707. Added note in
+  download message on where to find archived releases. ChangeLog clean
+  up for 80 column display.
 
 *sun-jdk-1.4.1_rc1 (23 Aug 2002)
 
-  07 Sep 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.4.1_rc1.ebuild files/sun-jdk-1.3.1.02 files/sun-jdk-1.3.1.03 sun-jdk-1.4.0-r5.ebuild sun-jdk-1.3.1.04.ebuild :
+  07 Sep 2002; Karl Trygve Kalleberg <karltk@gentoo.org>
+  sun-jdk-1.4.1_rc1.ebuild files/sun-jdk-1.3.1.02
+  files/sun-jdk-1.3.1.03 sun-jdk-1.4.0-r5.ebuild
+  sun-jdk-1.3.1.04.ebuild :
+
   Now installs environment properly. Removed old environment files.
   Fixed formatting of ebuilds. Added dep on improved java-config, to
   avoid CLASSPATH problems caused by adding "." to it.
@@ -17,7 +30,9 @@
   SLOT is now 1.4. If no VM is installed, it becomes default system VM. Added
   doc keyword to optionally install documentation.
 
-  23 Aug 2002; Maik Schreiber <blizzy@gentoo.org> sun-jdk-1.4.1_rc1.ebuild, ChangeLog, files/digest-sun-jdk-1.4.1_rc1: 
+  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.
 
 *sun-jdk-1.4.1_beta (19 August 2002)
@@ -26,14 +41,19 @@
   SLOT is now 1.4. If no VM is installed, it becomes default system VM. Added
   doc keyword to optionally install documentation.
 
-  19 August 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, sun-jdk-1.4.1_beta.ebuild: 
+  19 August 2002; Sascha Schwabbauer <cybersystem@gentoo.org>
+  ChangeLog, sun-jdk-1.4.1_beta.ebuild:
+
   Added -ppc to the keywords.
 
   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: 
+  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)
@@ -64,8 +84,12 @@
 *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:
-  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.
+
+  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.
   
   Also updated the ebuild to conform to lintool.
 
@@ -123,19 +147,25 @@
 
 *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: 
+  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: 
+  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-jdk-1.3.1-r1 files/digest-sun-jdk-1.3.1-r1 : 
+  10 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org>
+  sun-jdk-1.3.1-r1 files/digest-sun-jdk-1.3.1-r1 :
+
   Sun's JDK version 1.3.1. Considered stable.
diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.0-r6 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.0-r6
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.0-r6
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.0-r6.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.0-r6.ebuild
new file mode 100644
index 000000000000..13bb48cfc3f8
--- /dev/null
+++ b/dev-java/sun-jdk/sun-jdk-1.4.0-r6.ebuild
@@ -0,0 +1,71 @@
+# 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.0-r6.ebuild,v 1.1 2002/09/11 16:56:09 mkennedy Exp $
+
+. /usr/portage/eclass/inherit.eclass
+inherit java
+
+At="j2sdk-1_4_0_02-linux-i586.bin"
+S=${WORKDIR}/j2sdk1.4.0_02
+SRC_URI=""
+DESCRIPTION="Sun's J2SE Development Kit, version 1.4.0"
+HOMEPAGE="http://java.sun.com/j2se/1.4/download.html"
+LICENSE="sun-bcla"
+SLOT="1.4"
+KEYWORDS="x86 -ppc"
+DEPEND="virtual/glibc
+	>=dev-java/java-config-0.2.5
+	doc? ( =dev-java/java-sdk-docs-1.4.0* )"
+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}. Note: You can find archived releases from http://java.sun.com/products/archive/"
+	fi
+	tail +336 ${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 system 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
+}