fix deps

(Portage version: 2.0.51.22-r1)

4 files changed, 14 insertions, 20 deletions

diff --git a/dev-java/dom4j/ChangeLog b/dev-java/dom4j/ChangeLog
index 77c52dffc25e..6ebf25e4babb 100644
--- a/dev-java/dom4j/ChangeLog
+++ b/dev-java/dom4j/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/dom4j
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.21 2005/06/29 18:53:08 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.22 2005/07/09 16:01:48 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> dom4j-1.5.ebuild,
+  dom4j-1.6.1.ebuild:
+  fix deps
 
 *dom4j-1.6.1 (29 Jun 2005)
 
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index 9582d1168f01..b86d314d5bed 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 70adc8cfc4e8dad6a1c4418139d35686 dom4j-1.4-r1.ebuild 847
-MD5 dd91d7f7dbad698416537ea4ce0a8822 dom4j-1.6.1.ebuild 2184
-MD5 4d263e28892fb76a56792b659150407a dom4j-1.5.ebuild 932
-MD5 dac6f395ab64e68cc077b0f677d5d891 ChangeLog 2262
+MD5 d80d48f521815d9f916adb1cbc0fd3f5 dom4j-1.6.1.ebuild 2184
+MD5 e747d76622d2b25fe96d7fe60b95495a dom4j-1.5.ebuild 982
+MD5 bd562ac13c07a245c79a0bfc427bdb53 ChangeLog 2363
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 48544058c2c90c92b7e7a2bd9c9de6d0 files/digest-dom4j-1.4-r1 63
 MD5 d39295fd6f79fddbccc7d05723d49111 files/digest-dom4j-1.6.1 64
 MD5 08461e3c2f9380aa2a055cfb2f9865e1 files/digest-dom4j-1.5 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCwu4v/rLF9B432nYRAhyFAJwOSNlnES0XiwmqgO1z5lpuA3rl/QCgxo1q
-8rLJyV05U+yTaqd75Bvig6I=
-=o3J8
------END PGP SIGNATURE-----
diff --git a/dev-java/dom4j/dom4j-1.5.ebuild b/dev-java/dom4j/dom4j-1.5.ebuild
index 50dabe0567ec..61d354c0dff9 100644
--- a/dev-java/dom4j/dom4j-1.5.ebuild
+++ b/dev-java/dom4j/dom4j-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.5.ebuild,v 1.5 2005/05/29 15:55:30 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.5.ebuild,v 1.6 2005/07/09 16:01:48 axxo Exp $
 
 inherit java-pkg
 
@@ -11,8 +11,8 @@ LICENSE="Apache-1.1"
 SLOT="1"
 KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
 IUSE="doc"
-DEPEND=">=virtual/jdk-1.3"
-RDEPEND=">=virtual/jdk-1.3"
+DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.3* )"
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.3* )"
 
 src_compile() {
 	cd ${WORKDIR}/dom4j-${PV}
diff --git a/dev-java/dom4j/dom4j-1.6.1.ebuild b/dev-java/dom4j/dom4j-1.6.1.ebuild
index 28dbcf73277d..9aa006566a69 100644
--- a/dev-java/dom4j/dom4j-1.6.1.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1.ebuild,v 1.1 2005/06/29 18:53:08 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.6.1.ebuild,v 1.2 2005/07/09 16:01:48 axxo Exp $
 
 inherit java-pkg
 
@@ -11,7 +11,7 @@ LICENSE="Apache-1.1"
 SLOT="1"
 KEYWORDS="~x86"
 IUSE="doc jikes source"
-RDEPEND="|| ( =virtual/jre-1.3* =virtual/jre-1.4* )
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.3* )
 	dev-java/jaxme
 	dev-java/jsr173
 	dev-java/msv
@@ -20,7 +20,7 @@ RDEPEND="|| ( =virtual/jre-1.3* =virtual/jre-1.4* )
 	dev-java/relaxng-datatype
 	=dev-java/xerces-2*
 	dev-java/xsdlib"
-DEPEND="|| (  =virtual/jdk-1.3* =virtual/jdk-1.4* )
+DEPEND="|| (  =virtual/jdk-1.4* =virtual/jdk-1.3* )
 	jikes? ( dev-java/jikes )
 	dev-java/ant-core
 	${RDEPEND}"