dep fixes

Package-Manager: portage-2.0.51.22-r1

6 files changed, 12 insertions, 89 deletions

diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index bbef883cc91d..f0065517b417 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 34126defe89f8ad9a6abd3410cefe7fb ant-contrib-1.0_beta2.ebuild 1211
-MD5 fb6e1cb5c397c8dddad8102414f8a84c ant-contrib-1.0_beta1-r2.ebuild 1170
-MD5 501ed4b9d1a10dd7929cac680478df54 ant-contrib-1.0_beta1-r1.ebuild 1197
+MD5 af034ae0685a7e377d73fd0aa2ee7697 ant-contrib-1.0_beta2.ebuild 1267
 MD5 4ae94471f92c7fc6fdb81d1003b77af1 ChangeLog 1170
 MD5 4dad079a28768d183022cff420f01281 metadata.xml 220
-MD5 ceb92d92286af34135f5d0bdcb5c67db files/digest-ant-contrib-1.0_beta1-r1 74
-MD5 ceb92d92286af34135f5d0bdcb5c67db files/digest-ant-contrib-1.0_beta1-r2 74
 MD5 f471a8f4c9465649733f1dcc7708669d files/digest-ant-contrib-1.0_beta2 74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCiyvz/rLF9B432nYRAocnAKCA6PPIkr3duh/jVC0sWlU7YqxC4gCghB99
-l3Z1GvJ79LEYqrLkhI0JbUw=
-=fxNB
+iD8DBQFC2SGX/rLF9B432nYRAte3AJ9z8dWz7kj6Hpcoa4rLzml4gdcXmACgkLuW
+7eBqwI+7OR3jQjT6y8BWRWA=
+=rgl0
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta1-r1.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta1-r1.ebuild
deleted file mode 100644
index 5598c09e7c04..000000000000
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ant-contrib-1.0_beta1-r1.ebuild,v 1.4 2005/01/01 18:06:55 eradicator Exp $
-
-inherit java-pkg
-
-DESCRIPTION="The Ant-Contrib project is a collection of tasks (and at one point maybe types and other tools) for Apache Ant."
-HOMEPAGE="http://ant-contrib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE="jikes doc"
-DEPEND=">=dev-java/ant-1.6.2
-	>=virtual/jdk-1.4
-	dev-java/xerces
-	jikes? ( dev-java/jikes )"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	local antflags="jar -Dversion=${PV} -lib $(java-config -p xerces-2)"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} docs"
-	ant ${antflags} || die "failed to compile"
-}
-
-src_install() {
-	java-pkg_dojar build/lib/${PN}-${PV}.jar || die "pkg jar not found"
-
-	dodir /usr/share/ant-core/lib
-	dosym /usr/share/${PN}/lib/${PN}-${PV}.jar /usr/share/ant-core/lib/
-
-	dodoc README.txt
-	use doc && java-pkg_dohtml -r build/docs
-	java-pkg_dohtml -r manual
-}
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta1-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta1-r2.ebuild
deleted file mode 100644
index 5186dbbada20..000000000000
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta1-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ant-contrib-1.0_beta1-r2.ebuild,v 1.1 2005/05/18 11:39:29 axxo Exp $
-
-inherit java-pkg
-
-DESCRIPTION="The Ant-Contrib project is a collection of tasks (and at one point maybe types and other tools) for Apache Ant."
-HOMEPAGE="http://ant-contrib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="jikes doc"
-DEPEND=">=dev-java/ant-1.6.2
-	>=virtual/jdk-1.4
-	dev-java/xerces
-	jikes? ( dev-java/jikes )"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	local antflags="jar -Dversion=${PV} -lib $(java-config -p xerces-2)"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} docs"
-	ant ${antflags} || die "failed to compile"
-}
-
-src_install() {
-	java-pkg_newjar build/lib/${PN}-${PV}.jar ${PN}.jar
-
-	dodir /usr/share/ant-core/lib
-	dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/ant-core/lib/
-
-	dodoc README.txt
-	use doc && java-pkg_dohtml -r build/docs
-	java-pkg_dohtml -r manual
-}
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta2.ebuild
index 0ed28ff3f1a1..88ba9f9fd51c 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta2.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta2.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/ant-contrib/ant-contrib-1.0_beta2.ebuild,v 1.1 2005/05/18 11:49:37 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ant-contrib-1.0_beta2.ebuild,v 1.2 2005/07/16 15:02:23 axxo Exp $
 
 inherit java-pkg
 
@@ -9,12 +9,15 @@ HOMEPAGE="http://ant-contrib.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 x86"
 IUSE="jikes doc"
-DEPEND=">=dev-java/ant-1.6.2
-	>=virtual/jdk-1.4
-	>=dev-java/bcel-5.1
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	>=dev-java/ant-1.6.2
 	jikes? ( dev-java/jikes )"
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/bcel-5.1
+	dev-java/xerces"
 
 S=${WORKDIR}/${PN}
 
diff --git a/dev-java/ant-contrib/files/digest-ant-contrib-1.0_beta1-r1 b/dev-java/ant-contrib/files/digest-ant-contrib-1.0_beta1-r1
deleted file mode 100644
index 8678e3405e57..000000000000
--- a/dev-java/ant-contrib/files/digest-ant-contrib-1.0_beta1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7e28c322f6fdfaed1cf01e89fb29ae91 ant-contrib-1.0b1-src.tar.bz2 243105
diff --git a/dev-java/ant-contrib/files/digest-ant-contrib-1.0_beta1-r2 b/dev-java/ant-contrib/files/digest-ant-contrib-1.0_beta1-r2
deleted file mode 100644
index 8678e3405e57..000000000000
--- a/dev-java/ant-contrib/files/digest-ant-contrib-1.0_beta1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7e28c322f6fdfaed1cf01e89fb29ae91 ant-contrib-1.0b1-src.tar.bz2 243105