dep fixes

Package-Manager: portage-2.0.51.22-r1

7 files changed, 6 insertions, 116 deletions

diff --git a/dev-util/jconfig/files/digest-jconfig-2.5 b/dev-util/jconfig/files/digest-jconfig-2.5
deleted file mode 100644
index 6831f074b419..000000000000
--- a/dev-util/jconfig/files/digest-jconfig-2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 91c9d45a56e9e64b82f98613f0cc51b3 jconfig-src-v2.5.tar.gz 974892
diff --git a/dev-util/jconfig/files/digest-jconfig-2.7 b/dev-util/jconfig/files/digest-jconfig-2.7
deleted file mode 100644
index bba216d7c4de..000000000000
--- a/dev-util/jconfig/files/digest-jconfig-2.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e0f744f5694c06d095d94e6fca6057b0 jconfig-src-v2.7.tar.gz 1128118
diff --git a/dev-util/jconfig/files/digest-jconfig-2.8 b/dev-util/jconfig/files/digest-jconfig-2.8
deleted file mode 100644
index 356f3862eaf4..000000000000
--- a/dev-util/jconfig/files/digest-jconfig-2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af96f65d8210491c8d764c534e44ba72 jconfig-src-v2.8.tar.gz 1155906
diff --git a/dev-util/jconfig/jconfig-2.5.ebuild b/dev-util/jconfig/jconfig-2.5.ebuild
deleted file mode 100644
index 2a6ca84b1505..000000000000
--- a/dev-util/jconfig/jconfig-2.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jconfig/jconfig-2.5.ebuild,v 1.5 2004/10/16 18:16:50 axxo Exp $
-
-inherit java-pkg
-
-DESCRIPTION="jConfig is an extremely helpful utility, providing a simple API for the management of properties."
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
-HOMEPAGE="http://www.jconfig.org/"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~amd64"
-IUSE="doc jikes"
-DEPEND=">=virtual/jdk-1.3
-		>=dev-java/ant-1.4.1
-		jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jre-1.3"
-
-S="${WORKDIR}/${PN/c/C}"
-
-src_compile() {
-	local antflags="jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} javadoc"
-	ant ${antflags}
-}
-
-src_install() {
-	java-pkg_dojar dist/jconfig.jar
-	insinto /usr/share/${PN}/lib
-	doins lib/*
-
-	use doc && java-pkg_dohtml -r javadoc/*
-
-	dodoc README
-}
diff --git a/dev-util/jconfig/jconfig-2.7.ebuild b/dev-util/jconfig/jconfig-2.7.ebuild
deleted file mode 100644
index b4a150667983..000000000000
--- a/dev-util/jconfig/jconfig-2.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jconfig/jconfig-2.7.ebuild,v 1.2 2004/10/16 18:16:50 axxo Exp $
-
-inherit java-pkg
-
-DESCRIPTION="jConfig is an extremely helpful utility, providing a simple API for the management of properties."
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
-HOMEPAGE="http://www.jconfig.org/"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~amd64"
-IUSE="doc jikes"
-DEPEND=">=virtual/jdk-1.3
-		>=dev-java/ant-1.4.1
-		jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jre-1.3"
-
-S="${WORKDIR}/${PN/c/C}"
-
-src_compile() {
-	local antflags="jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} javadoc"
-	ant ${antflags}
-}
-
-src_install() {
-	java-pkg_dojar dist/jconfig.jar
-	insinto /usr/share/${PN}/lib
-	doins lib/*
-
-	use doc && java-pkg_dohtml -r javadoc/*
-
-	dodoc README
-}
diff --git a/dev-util/jconfig/jconfig-2.8-r1.ebuild b/dev-util/jconfig/jconfig-2.8-r1.ebuild
index 2f73fe547d94..0cc84bcc1461 100644
--- a/dev-util/jconfig/jconfig-2.8-r1.ebuild
+++ b/dev-util/jconfig/jconfig-2.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jconfig/jconfig-2.8-r1.ebuild,v 1.1 2004/10/30 21:21:26 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jconfig/jconfig-2.8-r1.ebuild,v 1.2 2005/07/16 19:01:35 axxo Exp $
 
 inherit java-pkg
 
@@ -9,13 +9,14 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
 HOMEPAGE="http://www.jconfig.org/"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="doc jikes"
+RDEPEND=">=virtual/jre-1.3
+		dev-java/jmx"
 DEPEND=">=virtual/jdk-1.3
-		dev-java/jmx
-		>=dev-java/ant-1.4.1
+		${RDEPEND}
+		dev-java/ant-core
 		jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jre-1.3"
 
 S="${WORKDIR}/${PN/c/C}"
 
diff --git a/dev-util/jconfig/jconfig-2.8.ebuild b/dev-util/jconfig/jconfig-2.8.ebuild
deleted file mode 100644
index 9b7b4b0dd621..000000000000
--- a/dev-util/jconfig/jconfig-2.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jconfig/jconfig-2.8.ebuild,v 1.2 2004/10/16 18:16:50 axxo Exp $
-
-inherit java-pkg
-
-DESCRIPTION="jConfig is an extremely helpful utility, providing a simple API for the management of properties."
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
-HOMEPAGE="http://www.jconfig.org/"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~amd64"
-IUSE="doc jikes"
-DEPEND=">=virtual/jdk-1.3
-		>=dev-java/ant-1.4.1
-		jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jre-1.3"
-
-S="${WORKDIR}/${PN/c/C}"
-
-src_compile() {
-	local antflags="jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} javadoc"
-	ant ${antflags}
-}
-
-src_install() {
-	java-pkg_dojar dist/jconfig.jar
-	insinto /usr/share/${PN}/lib
-	doins lib/*
-
-	use doc && java-pkg_dohtml -r javadoc/*
-
-	dodoc README
-}