Added doc useflag and updated SLOT to 1.3.

3 files changed, 17 insertions, 26 deletions

diff --git a/dev-java/ibm-jdk/ChangeLog b/dev-java/ibm-jdk/ChangeLog
index 555ed79c0f97..1eb1b91061aa 100644
--- a/dev-java/ibm-jdk/ChangeLog
+++ b/dev-java/ibm-jdk/ChangeLog
@@ -1,62 +1,56 @@
 # ChangeLog for dev-java/ibm-jdk
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ChangeLog,v 1.8 2002/08/01 17:26:54 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ChangeLog,v 1.9 2002/08/26 16:03:22 karltk Exp $
 
 *ibm-jdk-1.3.1-r1 (12 May 2002)
 
-  01 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ibm-jdk-1.3.1-r1.ebuild :
+  26 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ibm-jdk-1.3.1-r1.ebuild:
+  Added doc keyword to optionally install documentation. Set slot to 1.3, so
+  it can coexist with other IBM JDKs (if they come). Fixes #6668.
 
+  01 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ibm-jdk-1.3.1-r1.ebuild:
   Added LICENSE, KEYWORDS and SLOT.
 
   14 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ibm-jdk-1.3.1-r1.ebuild files/digest-ibm-jdk-1.3.1-r1:
-
   Fixed the creation of a spurious /usr/ibm-jdk-1.3.1/share.
 
-  12 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ibm-jdk-1.3.1-r1.ebuild files/digest-ibm-jdk-1.3.1-r1:
-
+  12 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ibm-jdk-1.3.1-r1.ebuild, files/digest-ibm-jdk-1.3.1-r1:
   Disabled browser plugin as it does not work.
-
-  Removed ibm-jdk-1.3.1.ebuild files/digest-ibm-jdk-1.3.1
+  Removed ibm-jdk-1.3.1.ebuild, files/digest-ibm-jdk-1.3.1
 
 *ibm-jdk-1.3.0-r4 (12 May 2002)
 
-  14 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ibm-jdk-1.3.0-r4.ebuild files/digest-ibm-jdk-1.3.0-r4:
+  26 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ibm-jdk-1.3.0-r4.ebuild:
+  Added doc keyword to optionally install documentation.
 
+  14 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ibm-jdk-1.3.0-r4.ebuild files/digest-ibm-jdk-1.3.0-r4:
   Fixed the creation of a spurious /usr/ibm-jdk-1.3.0/share.
 
   12 May 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ibm-jdk-1.3.0-r4.ebuild files/digest-ibm-jdk-1.3.0-r4:
-
   Disabled browser plugin as it does not work.
-
   Removed ibm-jdk-1.3.0-r3.ebuild files/digest-ibm-jdk-1.3.0-r3
 
 *ibm-jdk-1.3.1 (10 Apr 2002)
 
   10 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ibm-jdk-1.3.1.ebuild files/digest-ibm-jdk-1.3.1 files/ibm-jdk-1.3.1:
-
   New upstream version. Enhancement request submitted by Nuno Ferreira
   <nuno.m.r.f@mail.telepac.pt>.
 
 *ibm-jdk-1.3.0-r3 (09 Apr 2002)
 
   09 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> ibm-jdk-1.3.0-r3.ebuild files/digest-ibm-jdk-1.3.0-r3:
-
   Now sets proper ROOTPATH.
-
   Removed ibm-jdk-1.3.0-r2.ebuild files/digest-ibm-jdk-1.3.0-r2
 
 *ibm-jdk-1.3.0-r2 (18 Mar 2002)
 
   18 Mar 2002; G.Bevin <karkt@gentoo.org> files/digest-ibm-jdk-1.3.0-r2 ibm-jdk-1.3.0-r2.ebuild files/ibm-jdk-1.3.0 :
-
   Added support for JVM switching.
-
   Removed old revisions.
 
 *ibm-jdk-1.3.0-r1 (7 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> files/digest-ibm-jdk-1.3.0-r1 ibm-jdk-1.3.0-r1.ebuild :
-
   IBM JDK now tells Portage that it provides a virtual/jdk-1.3 and 
   virtual/jre-1.3. This means that is a proper Blackdown/Sun replacement for
   those who prefer the IBM JDK.
@@ -64,9 +58,4 @@
 *ibm-jdk-1.3.0 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+  Added initial ChangeLog.
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild
index 41aae0335e06..5f367a745949 100644
--- a/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild
+++ b/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild
@@ -1,6 +1,6 @@
 # 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/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild,v 1.5 2002/08/01 17:26:54 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild,v 1.6 2002/08/26 16:03:22 karltk Exp $
 
 At=IBMJava2-SDK-13.tgz
 S=${WORKDIR}/IBMJava2-13
@@ -9,7 +9,8 @@ SRC_URI=""
 HOMEPAGE="http://www6.software.ibm.com/dl/dklx130/dklx130-p"
 
 DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.1"
+	>=dev-java/java-config-0.2.1
+	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
 RDEPEND="$DEPEND"
 PROVIDE="virtual/jre-1.3
 	virtual/jdk-1.3
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild
index 9aab6a6080f9..af41c82701ed 100644
--- a/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild
+++ b/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild,v 1.5 2002/08/01 17:26:54 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild,v 1.6 2002/08/26 16:03:22 karltk Exp $
 
 At=IBMJava2-SDK-131.tgz
 S=${WORKDIR}/IBMJava2-131
@@ -9,7 +9,8 @@ SRC_URI=""
 HOMEPAGE="http://www6.software.ibm.com/dl/dklx130/dklx130-p"
 
 DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.1"
+	>=dev-java/java-config-0.2.1
+	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
 RDEPEND="$DEPEND"
 PROVIDE="virtual/jre-1.3
 	virtual/jdk-1.3