dep fixes

Package-Manager: portage-2.0.51.22-r1

5 files changed, 11 insertions, 58 deletions

diff --git a/app-misc/freemind/Manifest b/app-misc/freemind/Manifest
index 20befac89ffb..aedc5b3f1efb 100644
--- a/app-misc/freemind/Manifest
+++ b/app-misc/freemind/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 334e7776237031e2afd8ba41709614fe freemind-0.8.0_rc2.ebuild 1279
-MD5 5a179740f25fca845490650178174b42 freemind-0.7.1.ebuild 1060
-MD5 fe5c4ee4bca337712045056c63177302 freemind-0.7.1-r1.ebuild 1254
+MD5 38c029232018c4ab238b446f794c4926 freemind-0.8.0_rc2.ebuild 1284
+MD5 7f0d22f70b499a40a1dd5b89fb7bef66 freemind-0.7.1-r1.ebuild 1259
 MD5 d983460f677666f1d6a1a92078b084cb ChangeLog 2615
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 615ccb469eb93e22c5e84358d55e6c0f files/digest-freemind-0.7.1-r1 70
-MD5 615ccb469eb93e22c5e84358d55e6c0f files/digest-freemind-0.7.1 70
 MD5 4aa9844e77246a548def155d68fd8395 files/digest-freemind-0.8.0_rc2 72
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCxt0q/rLF9B432nYRAk3yAKCN1kah0tIAw7GcopD/xNUFGDmytgCeNQTB
-Bo6NUMsv/nGzwKqTr86fh3Q=
-=uCPx
+iD8DBQFC2j+q/rLF9B432nYRAujlAJ44ABqfsPNApqKRSY5HdCnVilBMLgCeJthH
+L55/NXvUcGmu/3Ie6tSfelE=
+=AJ57
 -----END PGP SIGNATURE-----
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"