1.3.1 JDK now provides jdk-1.3.1 and jre-1.3.1 virtual packages.

5 files changed, 78 insertions, 66 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index ea1f1a71086a..ec4260fc37b6 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,29 +1,39 @@
 # 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.18 2002/08/23 00:00:17 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.19 2002/08/26 16:47:25 karltk Exp $
 
 *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.
+  26 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.4.1_rc1.ebuild:
+  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: 
+  New version. Cleaned up ChangeLog a bit.
 
 *sun-jdk-1.4.1_beta (19 August 2002)
 
-  19 August 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog,
-  sun-jdk-1.4.1_beta.ebuild: Added -ppc to the keywords.
+  26 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.4.1_beta.ebuild:
+  SLOT is now 1.4. If no VM is installed, it becomes default system VM. Added
+  doc keyword to optionally install documentation.
 
-*sun-jdk-1.4.1_beta (08 Aug 2002)
+  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: 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)
 
+  26 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.3.1.04.ebuild:
+  SLOT is now 1.3. If no VM is installed, it becomes default system VM. Added
+  doc keyword to optionally install documentation. Now provides JRE
+  1.3.1 and JDK 1.3.1.
+
   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.
 
@@ -32,6 +42,10 @@
 
 *sun-jdk-1.4.0-r5 (25 Jun 2002)
 
+  26 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-jdk-1.4.0-r5.ebuild:
+  SLOT is now 1.4. If no VM is installed, it becomes default system VM. Added
+  doc keyword to optionally install documentation.
+
   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.
 
@@ -62,8 +76,6 @@
   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.
@@ -73,8 +85,6 @@
   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.
 
@@ -104,21 +114,19 @@
 
 *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-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/sun-jdk-1.3.1.04.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.04.ebuild
index 4fbb78c060fb..1ab47d23dd46 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.04.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.04.ebuild
@@ -1,6 +1,9 @@
 # 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.3.1.04.ebuild,v 1.2 2002/08/01 18:50:56 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.04.ebuild,v 1.3 2002/08/26 16:47:25 karltk Exp $
+
+. /usr/portage/eclass/inherit.eclass
+inherit java
 
 At="j2sdk-1_3_1_04-linux-i586.bin"
 S=${WORKDIR}/jdk1.3.1_04
@@ -8,13 +11,14 @@ SRC_URI=""
 DESCRIPTION="Sun Java Development Kit 1.3.1"
 HOMEPAGE="http://java.sun.com/j2se/1.3/download-linux.html"
 DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.2"
+	>=dev-java/java-config-0.2.2
+	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
 RDEPEND="$DEPEND"
-PROVIDE="virtual/jre-1.3
-	virtual/jdk-1.3
+PROVIDE="virtual/jre-1.3.1
+	virtual/jdk-1.3.1
 	virtual/java-scheme-2"
 LICENSE="sun-bcla"
-SLOT="0"
+SLOT="1.3"
 KEYWORDS="x86 -ppc -sparc -sparc64"
 	
 src_unpack() {
@@ -48,17 +52,14 @@ src_install () {
 		dodir /usr/lib/mozilla/plugins                                  
 		dosym /opt/${P}/jre/plugin/i386/ns600/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} 
+
+	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
 
 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_oji.so"
 	else                                                                    
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.0-r5.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.0-r5.ebuild
index 222d6536c730..e8fa85e4e52b 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.0-r5.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.0-r5.ebuild
@@ -2,16 +2,20 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # /space/gentoo/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.0-r3.ebuild,v 1.1 2002/06/16 00:24:09 rphillips Exp
 
+. /usr/portage/eclass/inherit.eclass
+inherit java
+
 At="j2sdk-1_4_0_01-linux-i586.bin"
 S=${WORKDIR}/j2sdk1.4.0_01
 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="0"
+SLOT="1.4"
 KEYWORDS="x86 -ppc"
 DEPEND="virtual/glibc
-	>=dev-java/java-config-0.1.3"
+	>=dev-java/java-config-0.1.3
+	doc? ( =dev-java/java-sdk-docs-1.4.0* )"
 RDEPEND="$DEPEND"
 
 PROVIDE="virtual/jre-1.4
@@ -49,17 +53,14 @@ src_install () {
 		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} 
+
+	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                                                                    
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.1_beta.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1_beta.ebuild
index 9b52d8f9e6af..8cdfffe8e4bf 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.1_beta.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1_beta.ebuild
@@ -1,6 +1,9 @@
 # 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_beta.ebuild,v 1.3 2002/08/19 17:52:39 cybersystem Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1_beta.ebuild,v 1.4 2002/08/26 16:47:25 karltk Exp $
+
+. /usr/portage/eclass/inherit.eclass
+inherit java
 
 At="j2sdk-1_4_1-beta-linux-i586.bin"
 S=${WORKDIR}/j2sdk1.4.1
@@ -8,10 +11,11 @@ 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"
+SLOT="1.4"
 KEYWORDS="x86 -ppc"
 DEPEND="virtual/glibc
-	>=dev-java/java-config-0.1.3"
+	>=dev-java/java-config-0.2.3
+	doc? ( =dev-java/java-sdk-docs-1.4.0* )"
 RDEPEND="$DEPEND"
 
 PROVIDE="virtual/jre-1.4
@@ -50,16 +54,13 @@ src_install () {
 		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} 
+	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
 
-pkg_postinst () {                                                               
+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                                                                    
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
index 741f5349aa44..2e08aec4bdd4 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.ebuild
@@ -1,6 +1,9 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1_rc1.ebuild,v 1.2 2002/08/26 16:47:25 karltk Exp $
+
+. /usr/portage/eclass/inherit.eclass
+inherit java
 
 At="j2sdk-1_4_1-rc-linux-i586.bin"
 S=${WORKDIR}/j2sdk1.4.1
@@ -8,10 +11,11 @@ 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"
+SLOT="1.4"
 KEYWORDS="x86 -ppc"
 DEPEND="virtual/glibc
-	>=dev-java/java-config-0.1.3"
+	>=dev-java/java-config-0.1.3
+	doc? ( =dev-java/java-sdk-docs-1.4.0* )"
 RDEPEND="$DEPEND"
 
 PROVIDE="virtual/jre-1.4
@@ -49,17 +53,14 @@ src_install () {
 		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} 
+
+	java_set_env ${FILESDIR}/${VMHANDLE}	
 }
 
 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