Clean up. Docs fix. Closes #47118. Marking stable on x86.

4 files changed, 13 insertions, 39 deletions

diff --git a/app-misc/freemind/ChangeLog b/app-misc/freemind/ChangeLog
index ec59bfe61189..b7f012b33101 100644
--- a/app-misc/freemind/ChangeLog
+++ b/app-misc/freemind/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/freemind
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.6 2004/03/26 10:32:30 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.7 2004/04/10 16:07:59 zx Exp $
+
+  10 Apr 2004; Chris Aniszczyk <zx@gentoo.org> freemind-0.6.7.ebuild,
+  freemind-0.7.1.ebuild:
+  Marking stable on x86
+
+  10 Apr 2004; Chris Aniszczyk <zx@gentoo.org> freemind-0.6.7.ebuild,
+  freemind-0.7.1.ebuild:
+  Clean up, docs are fixed. Closes #47118
 
   26 Mar 2004; David Holm <dholm@gentoo.org> freemind-0.7.1.ebuild:
   Backed out of ~ppc while waiting for portage upgrade.
diff --git a/app-misc/freemind/files/digest-freemind-0.6.7 b/app-misc/freemind/files/digest-freemind-0.6.7
deleted file mode 100644
index b592fd7c30a3..000000000000
--- a/app-misc/freemind/files/digest-freemind-0.6.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0a1011d229da306cd9dd1d3696664c39 freemind-src-0_6_7.tar.gz 249518
diff --git a/app-misc/freemind/freemind-0.6.7.ebuild b/app-misc/freemind/freemind-0.6.7.ebuild
deleted file mode 100644
index dff612210daa..000000000000
--- a/app-misc/freemind/freemind-0.6.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.6.7.ebuild,v 1.1 2004/02/15 04:16:10 zx Exp $
-
-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"
-IUSE="doc"
-DEPEND=""
-DEPEND="dev-java/ant
-		>=virtual/jdk-1.4*"
-
-S=${WORKDIR}/src
-
-src_install() {
-	ant -Ddist="${D}/opt/${PN}" jar browser
-	use doc && ant -Ddist="${D}/usr/share/doc/${P}" doc
-	echo "#!/bin/sh" > ${PN}.sh
-	echo "cd /opt/${PN}" >> ${PN}.sh
-	echo "'${JAVA_HOME}'/bin/java -jar lib/${PN}.jar" >> ${PN}.sh
-
-	insinto /opt/${PN}
-	doins html/*
-
-	insinto /opt/${PN}/accessories
-	doins accessories/*
-
-	into /opt
-	newbin ${PN}.sh ${PN}
-}
-
diff --git a/app-misc/freemind/freemind-0.7.1.ebuild b/app-misc/freemind/freemind-0.7.1.ebuild
index 3033d89148ed..f0ae4f5d9423 100644
--- a/app-misc/freemind/freemind-0.7.1.ebuild
+++ b/app-misc/freemind/freemind-0.7.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.5 2004/03/26 10:32:30 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.7.1.ebuild,v 1.6 2004/04/10 16:08:00 zx Exp $
 
 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"
+KEYWORDS="x86 ~sparc"
 IUSE="doc jikes"
 DEPEND="dev-java/ant
 		>=virtual/jdk-1.4*
@@ -33,7 +33,8 @@ src_install() {
 	echo "cd /opt/${PN}" >> ${PN}.sh
 	echo "'${JAVA_HOME}'/bin/java -jar lib/${PN}.jar" >> ${PN}.sh
 
-	use doc && dohtml -r doc/*
+	cp -R ${S}/doc ${D}/opt/${PN}
+	use doc && dohtml -r doc/
 
 	into /opt
 	newbin ${PN}.sh ${PN}