lib-compat to RDEPEND

6 files changed, 52 insertions, 33 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 36a98dc484e1..c878a4bb6db6 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,6 @@
 # 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.37 2003/03/06 18:48:17 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.38 2003/03/09 14:26:38 seemant Exp $
  
   15 Dec 2002; Adrian Almenar <strider@gentoo.org>: Correct formating for all
   ebuilds so lintool doesnt complain. (Make them policy compliant).
@@ -9,6 +9,12 @@
 
 *sun-jdk-1.4.1.02 (06 Mar 2003)
 
+  09 Mar 2003; Seemant Kulleen <seemant@gentoo.org> sun-jdk-1.4.0-r5.ebuild,
+  sun-jdk-1.4.0-r6.ebuild, sun-jdk-1.4.1.01-r1.ebuild,
+  sun-jdk-1.4.1.01.ebuild, sun-jdk-1.4.1.02.ebuild:
+  added lib-compat to RDEPEND, closing bug #15855 by Andrew Aylett
+  <gentoo@aylett.co.uk>; and added -arch for mips, hppa and arm
+
   06 Mar 2003; Adrian Almenar <strider@gento.org> sun-jdk-1.4.1.02.ebuild, files/digest-sun-jdk-1.4.1.02, files/sun-jdk-1.4.1.02 :
   New bugfix release for sun-jdk.  Fixes bug #16855 & #16932.
 
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 1e8ce187e809..7064ea16dc7d 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
@@ -1,6 +1,6 @@
 # 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.0-r5.ebuild,v 1.13 2003/02/13 10:23:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.0-r5.ebuild,v 1.14 2003/03/09 14:26:38 seemant Exp $
 
 IUSE="doc mozilla"
 
@@ -8,16 +8,18 @@ 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"
+SRC_URI=""
+
 SLOT="1.4"
-KEYWORDS="x86 -ppc -sparc -alpha"
-DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.5
+LICENSE="sun-bcla"
+KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm"
+
+DEPEND=">=dev-java/java-config-0.2.5
 	doc? ( =dev-java/java-sdk-docs-1.4.0* )"
-RDEPEND="$DEPEND"
+
+RDEPEND="sys-libs/lib-compat"
 
 PROVIDE="virtual/jre-1.4
 	virtual/jdk-1.4
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
index d8851b5cf2e4..4b8afd8503f9 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.0-r6.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.0-r6.ebuild
@@ -1,6 +1,6 @@
 # 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.0-r6.ebuild,v 1.9 2003/02/13 10:23:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.0-r6.ebuild,v 1.10 2003/03/09 14:26:38 seemant Exp $
 
 IUSE="doc mozilla"
 
@@ -8,16 +8,18 @@ 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"
+SRC_URI=""
+
 SLOT="1.4"
-KEYWORDS="x86 -ppc -sparc -alpha"
-DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.5
+LICENSE="sun-bcla"
+KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm"
+
+DEPEND=">=dev-java/java-config-0.2.5
 	doc? ( =dev-java/java-sdk-docs-1.4.0* )"
-RDEPEND="$DEPEND"
+
+RDEPEND="sys-libs/lib-compat"
 
 PROVIDE="virtual/jre-1.4
 	virtual/jdk-1.4
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.1.01-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1.01-r1.ebuild
index 96a9afcc7660..6cfcc0612098 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.1.01-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1.01-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.01-r1.ebuild,v 1.4 2003/02/13 10:23:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1.01-r1.ebuild,v 1.5 2003/03/09 14:26:38 seemant Exp $
 
 IUSE="doc"
 
@@ -8,16 +8,19 @@ inherit java nsplugins
 
 At="j2sdk-1_4_1_01-linux-i586.bin"
 S="${WORKDIR}/j2sdk1.4.1_01"
-SRC_URI=""
 DESCRIPTION="Sun's J2SE Development Kit, version 1.4.1_01"
 HOMEPAGE="http://java.sun.com/j2se/1.4.1/download.html"
-LICENSE="sun-bcla"
+SRC_URI=""
+
 SLOT="1.4"
-KEYWORDS="~x86 -ppc -sparc -alpha"
-DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.5
+LICENSE="sun-bcla"
+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* )"
 
+RDEPEND="sys-libs/lib-compat"
+
 PROVIDE="virtual/jre-1.4
 	virtual/jdk-1.4
 	virtual/java-scheme-2"
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.1.01.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1.01.ebuild
index 434fbf23ec6f..1b11daa10157 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.1.01.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1.01.ebuild
@@ -1,6 +1,6 @@
 # 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.01.ebuild,v 1.6 2003/02/13 10:23:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1.01.ebuild,v 1.7 2003/03/09 14:26:38 seemant Exp $
 
 IUSE="doc mozilla"
 
@@ -8,16 +8,19 @@ inherit java
 
 At="j2sdk-1_4_1_01-linux-i586.bin"
 S="${WORKDIR}/j2sdk1.4.1_01"
-SRC_URI=""
 DESCRIPTION="Sun's J2SE Development Kit, version 1.4.1_01"
 HOMEPAGE="http://java.sun.com/j2se/1.4.1/download.html"
-LICENSE="sun-bcla"
+SRC_URI=""
+
 SLOT="1.4"
-KEYWORDS="x86 -ppc -sparc -alpha"
-DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.5
+LICENSE="sun-bcla"
+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* )"
 
+RDEPEND="sys-libs/lib-compat"
+
 PROVIDE="virtual/jre-1.4
 	virtual/jdk-1.4
 	virtual/java-scheme-2"
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.1.02.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.1.02.ebuild
index bc5c3bf78cd1..5f320477f4d7 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.1.02.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.1.02.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2003/03/06 18:48:17 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.1.02.ebuild,v 1.2 2003/03/09 14:26:38 seemant Exp $
 
 IUSE="doc mozilla"
 
@@ -8,16 +8,19 @@ inherit java
 
 At="j2sdk-1_4_1_02-linux-i586.bin"
 S="${WORKDIR}/j2sdk1.4.1_02"
-SRC_URI=""
 DESCRIPTION="Sun's J2SE Development Kit, version 1.4.1_02"
 HOMEPAGE="http://java.sun.com/j2se/1.4.1/download.html"
-LICENSE="sun-bcla"
+SRC_URI=""
+
 SLOT="1.4"
-KEYWORDS="~x86 -ppc -sparc -alpha"
-DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.5
+LICENSE="sun-bcla"
+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* )"
 
+RDEPEND="sys-libs/lib-compat"
+
 PROVIDE="virtual/jre-1.4
 	virtual/jdk-1.4
 	virtual/java-scheme-2"