dep fixes

(Portage version: 2.0.51.22-r1)

4 files changed, 6 insertions, 51 deletions

diff --git a/app-misc/freemind/files/digest-freemind-0.7.1 b/app-misc/freemind/files/digest-freemind-0.7.1
deleted file mode 100644
index 5f4e8561322a..000000000000
--- a/app-misc/freemind/files/digest-freemind-0.7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 45bab60d1c9de145661b82650ad09951 freemind-src-0_7_1.tar.gz 239660
diff --git a/app-misc/freemind/freemind-0.7.1-r1.ebuild b/app-misc/freemind/freemind-0.7.1-r1.ebuild
index 9ed25bd2594a..3ee9815160ec 100644
--- a/app-misc/freemind/freemind-0.7.1-r1.ebuild
+++ b/app-misc/freemind/freemind-0.7.1-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/app-misc/freemind/freemind-0.7.1-r1.ebuild,v 1.3 2005/07/02 18:29:21 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.7.1-r1.ebuild,v 1.4 2005/07/17 11:23:01 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -11,8 +11,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc ppc amd64"
 IUSE="doc jikes"
-DEPEND="dev-java/ant
-		>=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.4
+		dev-java/ant-core
 		jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.4"
 
diff --git a/app-misc/freemind/freemind-0.7.1.ebuild b/app-misc/freemind/freemind-0.7.1.ebuild
deleted file mode 100644
index 3986c958307a..000000000000
--- a/app-misc/freemind/freemind-0.7.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.7.1.ebuild,v 1.16 2005/07/02 18:29:21 axxo Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Mind-mapping software written in Java"
-HOMEPAGE="http://freemind.sf.net"
-SRC_URI="mirror://sourceforge/freemind/${PN}-src-${PV//./_}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc amd64"
-IUSE="doc jikes"
-DEPEND="dev-java/ant
-		>=virtual/jdk-1.4
-		jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jre-1.4"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	local antflags="jar browser"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} doc"
-	ant ${antflags}
-}
-
-src_install() {
-	cd ${WORKDIR}/bin/dist
-
-	insinto /opt/${PN}/lib
-	doins lib/*.jar browser/*.jar
-
-	echo "#!/bin/sh" > ${PN}.sh
-	echo "cd /opt/${PN}" >> ${PN}.sh
-	echo "java -jar lib/${PN}.jar" >> ${PN}.sh
-
-	cp -R ${S}/doc ${D}/opt/${PN}
-	use doc && java-pkg_dohtml -r doc/
-
-	into /opt
-	newbin ${PN}.sh ${PN}
-}
-
diff --git a/app-misc/freemind/freemind-0.8.0_rc2.ebuild b/app-misc/freemind/freemind-0.8.0_rc2.ebuild
index 08261a3a0393..70a5ed86f11a 100644
--- a/app-misc/freemind/freemind-0.8.0_rc2.ebuild
+++ b/app-misc/freemind/freemind-0.8.0_rc2.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/app-misc/freemind/freemind-0.8.0_rc2.ebuild,v 1.3 2005/07/02 18:29:21 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.8.0_rc2.ebuild,v 1.4 2005/07/17 11:23:01 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -13,8 +13,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="doc jikes"
-DEPEND="dev-java/ant
-	>=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
 	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.4"
 RESTRICT="nomirror"