dep fixes

(Portage version: 2.0.51.22-r1)

3 files changed, 20 insertions, 19 deletions

diff --git a/dev-util/pmd/pmd-1.5-r1.ebuild b/dev-util/pmd/pmd-1.5-r1.ebuild
index b097f6d00910..81dd8c4f5043 100644
--- a/dev-util/pmd/pmd-1.5-r1.ebuild
+++ b/dev-util/pmd/pmd-1.5-r1.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-util/pmd/pmd-1.5-r1.ebuild,v 1.4 2005/04/21 14:47:32 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/pmd-1.5-r1.ebuild,v 1.5 2005/07/18 20:54:14 axxo Exp $
 
 inherit java-pkg
 
@@ -9,24 +9,24 @@ HOMEPAGE="http://pmd.sourceforge.net"
 SRC_URI="mirror://sourceforge/pmd/${PN}-src-${PV}.zip"
 LICENSE="pmd"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~sparc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="doc"
 
+RDEPEND=">=virtual/jre-1.3
+	=dev-java/jaxen-1.0*
+	dev-java/saxpath
+	>=dev-java/xerces-2.6.2-r1"
 DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
 	app-arch/unzip
-	>=dev-java/ant-1.5
-	>=dev-java/xerces-2.6.2-r1
-	dev-java/saxpath
-	=dev-java/jaxen-1.0*
+	dev-java/ant
 	>=dev-java/junit-3.8.1"
 
-RDEPEND="|| ( >=virtual/jdk-1.3 >=virtual/jre-1.3 )"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}/lib/
 	rm -f *.jar
-	java-pkg_jar-from saxpath saxpath.jar  saxpath-1.0-fcs.jar
+	java-pkg_jar-from saxpath saxpath.jar saxpath-1.0-fcs.jar
 	java-pkg_jar-from jaxen jaxen-full.jar jaxen-core-1.0-fcs.jar
 	java-pkg_jar-from xerces-2
 	cd ${S}
diff --git a/dev-util/pmd/pmd-1.5.ebuild b/dev-util/pmd/pmd-1.5.ebuild
index b7a711a010c7..87504364d7fd 100644
--- a/dev-util/pmd/pmd-1.5.ebuild
+++ b/dev-util/pmd/pmd-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-util/pmd/pmd-1.5.ebuild,v 1.8 2005/04/24 13:05:03 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/pmd-1.5.ebuild,v 1.9 2005/07/18 20:54:14 axxo Exp $
 
 inherit java-pkg
 
@@ -9,15 +9,15 @@ HOMEPAGE="http://pmd.sourceforge.net"
 SRC_URI="mirror://sourceforge/pmd/${PN}-src-${PV}.zip"
 LICENSE="pmd"
 SLOT="0"
-KEYWORDS="x86 ppc ~sparc"
+KEYWORDS="ppc ~sparc x86"
 IUSE="doc"
 
 DEPEND=">=virtual/jdk-1.3
 	app-arch/unzip
-	>=dev-java/ant-1.5
+	>=dev-java/ant-core
 	>=dev-java/junit-3.8.1"
 
-RDEPEND="|| ( >=virtual/jdk-1.3 >=virtual/jre-1.3 )"
+RDEPEND=">=virtual/jre-1.3"
 
 src_compile() {
 	cd etc
diff --git a/dev-util/pmd/pmd-3.1.ebuild b/dev-util/pmd/pmd-3.1.ebuild
index 70a328b0447e..68c9c08186f8 100644
--- a/dev-util/pmd/pmd-3.1.ebuild
+++ b/dev-util/pmd/pmd-3.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-util/pmd/pmd-3.1.ebuild,v 1.2 2005/05/20 18:49:28 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pmd/pmd-3.1.ebuild,v 1.3 2005/07/18 20:54:14 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -10,18 +10,19 @@ SRC_URI="mirror://sourceforge/pmd/${PN}-src-${PV}.zip"
 
 LICENSE="pmd"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~sparc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="doc jikes source"
 
-DEPEND=">=virtual/jdk-1.3
-	app-arch/unzip
-	dev-java/ant-core
-	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.3
 	=dev-java/jaxen-1.0*
 	dev-java/junit
 	dev-java/saxpath
 	=dev-java/xerces-2.6*"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	source? ( app-arch/zip )"
 
 src_unpack() {
 	unpack ${A}