Fix the dependencies for jre at runtime

5 files changed, 38 insertions, 25 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 5dc3524f4f4b..729c426863ba 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-libs/db
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.81 2004/02/09 21:18:01 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.82 2004/02/10 13:14:32 pauldv Exp $
 
   09 Feb 2004; <gustavoz@gentoo.org> db-4.1.25_p1-r3.ebuild:
   stable on sparc
@@ -8,6 +8,10 @@
   06 Feb 2004; Martin Schlemmer <azarah@gentoo.org> db-4.1.25_p1-r3.ebuild:
   Bump to stable for x86 (needed by pam-0.77).
 
+  10 Feb 2004; Paul de Vrieze <pauldv@gentoo.org> db-4.0.14-r3.ebuild,
+  db-4.1.25_p1-r3.ebuild, db-4.2.52_p1.ebuild:
+  Change the runtime dependency to a java runtime environment only
+
   22 Jan 2004; Luca Barbato <lu_zero@gentoo.org> db-4.0.14-r3.ebuild:
   Marked ppc
 
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 36f06befaf5a..677a3c7f4b2d 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,29 +1,29 @@
-MD5 7c180e627ffb289502cbb308c407e8eb ChangeLog 13391
-MD5 1d544f8cb29411b42ba43bb16c215fba db-1.85-r1.ebuild 1411
-MD5 1ba706c35b864bef5606564922a1f7e7 db-3.2.9-r10.ebuild 4158
-MD5 03f9a0dfd0e3437b167f7b84c18c5cd5 db-3.2.9-r7.ebuild 4375
-MD5 75469e2c4c582f3270fd3c19d8781400 db-3.2.9-r9.ebuild 3513
 MD5 f117a860d52d6ef3604024a5ff3a7d2c db-3.3.11.ebuild 2404
 MD5 fb0407cc3c53e542368bf63735ac9ce7 db-4.0.14-r2.ebuild 2136
-MD5 b0f481837e35a64ed9c262488b318e57 db-4.0.14-r3.ebuild 2327
-MD5 e090d1efadb2a6f17833a2583bf95dbe db-4.1.25_p1-r3.ebuild 2532
-MD5 b2d58ab33f25832b7ab6334fe9c33ed4 db-4.2.52_p1.ebuild 2694
+MD5 6289ea834dd56b7c36783c6027a68454 db-4.0.14-r3.ebuild 2383
+MD5 e0a8d434b1ad38cb940b3fc6061be4a3 db-4.2.52_p1.ebuild 2752
+MD5 1ba706c35b864bef5606564922a1f7e7 db-3.2.9-r10.ebuild 4158
+MD5 1d544f8cb29411b42ba43bb16c215fba db-1.85-r1.ebuild 1411
+MD5 75469e2c4c582f3270fd3c19d8781400 db-3.2.9-r9.ebuild 3513
 MD5 5c921197970cd970a8fbb4cad2d7df7b metadata.xml 1457
+MD5 15f7a47c93ad45449dcf7e02fcf5fe73 ChangeLog 13575
+MD5 058b6c5985e66079553b53e730ab5aa1 db-4.1.25_p1-r3.ebuild 2588
+MD5 03f9a0dfd0e3437b167f7b84c18c5cd5 db-3.2.9-r7.ebuild 4375
+MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
+MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
 MD5 194200b3295b95b46b4564980af27f1f files/db-3.2.9-fix-dep-link.patch 1005
-MD5 6eb8be5f7803acaa5bcfd4ed5ffabf83 files/db-3.2.9-jarlocation.patch 492
-MD5 eb9b0f2c1d8440c6c49fc1d916c2dc0e files/db-4.0.14-fix-dep-link.patch 1119
-MD5 0101200dac8a9299fc1578081ac72b71 files/db-4.0.14-jarlocation.patch 565
-MD5 2bb2a5dbe8d16f858d177e1193639b70 files/db-4.1.25_p1-jarlocation.patch 626
-MD5 3c47ce6ed92e948fbde232c1e3571f16 files/db-4.2-jarlocation.patch 599
-MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
-MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
+MD5 35fa694f3db327e4fb015728aca6a082 files/digest-db-4.2.52_p1 118
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r10 61
-MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r7 61
+MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r3 118
+MD5 3057fcc117c33a02bd4c092586a58e49 files/digest-db-1.85-r1 59
 MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r9 61
 MD5 214b855f6996d3dca754f6606beff672 files/digest-db-3.3.11 62
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r2 62
+MD5 0101200dac8a9299fc1578081ac72b71 files/db-4.0.14-jarlocation.patch 565
+MD5 44c6041ae9527bfa8a4ff4cec7cf4a9a files/digest-db-3.2.9-r7 61
+MD5 6eb8be5f7803acaa5bcfd4ed5ffabf83 files/db-3.2.9-jarlocation.patch 492
+MD5 3c47ce6ed92e948fbde232c1e3571f16 files/db-4.2-jarlocation.patch 599
+MD5 ecd81fa9868ec49c61306444144d44a9 files/db.1.85.patch 55584
+MD5 eb9b0f2c1d8440c6c49fc1d916c2dc0e files/db-4.0.14-fix-dep-link.patch 1119
 MD5 068fc523df1ee6f36b5de8516ab7739f files/digest-db-4.0.14-r3 62
-MD5 f029f70f531ca67c16b62573d61de49e files/digest-db-4.1.25_p1-r3 118
-MD5 35fa694f3db327e4fb015728aca6a082 files/digest-db-4.2.52_p1 118
-MD5 9cf113248f29b1e319ae73b266df4986 files/patch.3.2.9.1 2139
-MD5 f8edd1cf6535cd62f9b8ff81e0474273 files/patch.3.2.9.2 495
+MD5 2bb2a5dbe8d16f858d177e1193639b70 files/db-4.1.25_p1-jarlocation.patch 626
diff --git a/sys-libs/db/db-4.0.14-r3.ebuild b/sys-libs/db/db-4.0.14-r3.ebuild
index d5153f8ad730..129e9ef7c175 100644
--- a/sys-libs/db/db-4.0.14-r3.ebuild
+++ b/sys-libs/db/db-4.0.14-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.0.14-r3.ebuild,v 1.4 2004/01/22 23:31:21 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.0.14-r3.ebuild,v 1.5 2004/02/10 13:14:32 pauldv Exp $
 
 IUSE="tcltk java doc"
 
@@ -12,11 +12,14 @@ SRC_URI="http://www.sleepycat.com/update/snapshot/${P}.tar.gz"
 HOMEPAGE="http://www.sleepycat.com"
 SLOT="4"
 LICENSE="DB"
-KEYWORDS="~x86 ppc ~sparc ~alpha ~mips ~hppa ~arm amd64 ia64 ppc64"
+KEYWORDS="x86 ppc ~sparc ~alpha ~mips ~hppa ~arm amd64 ia64 ppc64"
 
 DEPEND="tcltk? ( dev-lang/tcl )
 	java? ( virtual/jdk )"
 
+RDEPEND="tcltk? ( dev-lang/tcl )
+	java? ( virtual/jre )"
+
 src_unpack() {
 	unpack ${A}
 
diff --git a/sys-libs/db/db-4.1.25_p1-r3.ebuild b/sys-libs/db/db-4.1.25_p1-r3.ebuild
index e840c69d6bfa..64b2318e440b 100644
--- a/sys-libs/db/db-4.1.25_p1-r3.ebuild
+++ b/sys-libs/db/db-4.1.25_p1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r3.ebuild,v 1.13 2004/02/09 21:18:01 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r3.ebuild,v 1.14 2004/02/10 13:14:32 pauldv Exp $
 
 IUSE="tcltk java doc"
 
@@ -36,6 +36,9 @@ KEYWORDS="ia64 x86 ppc ~alpha amd64 sparc ~mips ppc64 hppa"
 DEPEND="tcltk? ( dev-lang/tcl )
 	java? ( virtual/jdk )"
 
+RDEPEND="tcltk? ( dev-lang/tcl )
+	java? ( virtual/jre )"
+
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	cd ${WORKDIR}/${MY_P}
diff --git a/sys-libs/db/db-4.2.52_p1.ebuild b/sys-libs/db/db-4.2.52_p1.ebuild
index 1f8ad571bc27..2aec18b38b4e 100644
--- a/sys-libs/db/db-4.2.52_p1.ebuild
+++ b/sys-libs/db/db-4.2.52_p1.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/sys-libs/db/db-4.2.52_p1.ebuild,v 1.1 2003/12/22 11:20:31 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p1.ebuild,v 1.2 2004/02/10 13:14:32 pauldv Exp $
 
 IUSE="tcltk java doc"
 
@@ -35,6 +35,9 @@ KEYWORDS="~x86"
 DEPEND="tcltk? ( >=dev-lang/tcl-8.4 )
 	java? ( virtual/jdk )"
 
+RDEPEND="tcltk? ( dev-lang/tcl )
+	java? ( virtual/jre )"
+
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	cd ${WORKDIR}/${MY_P}