Version bump.

(Portage version: 2.2_rc27/cvs/Linux x86_64)

5 files changed, 25 insertions, 128 deletions

diff --git a/app-misc/freemind/ChangeLog b/app-misc/freemind/ChangeLog
index ffa25a892b50..6926249393b4 100644
--- a/app-misc/freemind/ChangeLog
+++ b/app-misc/freemind/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/freemind
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.44 2008/12/22 19:18:00 caster Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.45 2009/03/28 11:17:59 caster Exp $
+
+*freemind-0.9.0_rc3 (28 Mar 2009)
+
+  28 Mar 2009; Vlastimil Babka <caster@gentoo.org>
+  -files/freemind-0.9.0_beta15-build.xml.patch,
+  -files/freemind-0.9.0_beta9-build.xml.patch,
+  -freemind-0.9.0_beta16.ebuild, -freemind-0.9.0_beta20.ebuild,
+  +freemind-0.9.0_rc3.ebuild:
+  Version bump.
 
 *freemind-0.9.0_rc1 (22 Dec 2008)
 
diff --git a/app-misc/freemind/files/freemind-0.9.0_beta15-build.xml.patch b/app-misc/freemind/files/freemind-0.9.0_beta15-build.xml.patch
deleted file mode 100644
index 291cea7d18ba..000000000000
--- a/app-misc/freemind/files/freemind-0.9.0_beta15-build.xml.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- build.xml.orig	2007-05-08 22:13:58.000000000 +0200
-+++ build.xml	2007-05-08 22:19:19.000000000 +0200
-@@ -31,11 +31,11 @@
- 	<property name="java_target_version" value="1.4" />
- 	<property name="build.compiler" value="modern" />
- 	<property name="jarbundler.jar" value = "jarbundler-1.8.1.jar"/>
--
-+	<!--
- 	<taskdef name="jarbundler"
-                classpath="${src}/lib/${jarbundler.jar}"
-                classname="net.sourceforge.jarbundler.JarBundler" />
--
-+	-->
- 
- 	<!-- begin generator part -->
- 	<property name="jibxhome" value="lib/jibx"/>
diff --git a/app-misc/freemind/files/freemind-0.9.0_beta9-build.xml.patch b/app-misc/freemind/files/freemind-0.9.0_beta9-build.xml.patch
deleted file mode 100644
index 291cea7d18ba..000000000000
--- a/app-misc/freemind/files/freemind-0.9.0_beta9-build.xml.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- build.xml.orig	2007-05-08 22:13:58.000000000 +0200
-+++ build.xml	2007-05-08 22:19:19.000000000 +0200
-@@ -31,11 +31,11 @@
- 	<property name="java_target_version" value="1.4" />
- 	<property name="build.compiler" value="modern" />
- 	<property name="jarbundler.jar" value = "jarbundler-1.8.1.jar"/>
--
-+	<!--
- 	<taskdef name="jarbundler"
-                classpath="${src}/lib/${jarbundler.jar}"
-                classname="net.sourceforge.jarbundler.JarBundler" />
--
-+	-->
- 
- 	<!-- begin generator part -->
- 	<property name="jibxhome" value="lib/jibx"/>
diff --git a/app-misc/freemind/freemind-0.9.0_beta16.ebuild b/app-misc/freemind/freemind-0.9.0_beta16.ebuild
deleted file mode 100644
index 23ea85430503..000000000000
--- a/app-misc/freemind/freemind-0.9.0_beta16.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.9.0_beta16.ebuild,v 1.1 2008/03/09 17:38:30 betelgeuse Exp $
-
-EAPI=1
-
-# will handle rewriting myself
-JAVA_PKG_BSFIX="off"
-WANT_ANT_TASKS="ant-nodeps ant-trax"
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PV=${PV//beta/Beta_}
-
-DESCRIPTION="Mind-mapping software written in Java"
-HOMEPAGE="http://freemind.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${MY_PV}_icon_butterfly.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-COMMON_DEP="dev-java/jgoodies-forms
-	dev-java/jibx
-	>=dev-java/simplyhtml-0.12.2_pre20071101
-	dev-java/commons-lang:2.1
-	dev-java/javahelp
-	dev-java/groovy
-	=dev-java/batik-1.6*
-	>=dev-java/fop-0.93
-	dev-java/hoteqn"
-DEPEND=">=virtual/jdk-1.4
-	dev-java/xsd2jibx
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# kill the jarbundler taskdef
-	epatch "${FILESDIR}/${PN}-0.9.0_beta15-build.xml.patch"
-
-	local xml
-	for xml in $(find . -name 'build*.xml'); do
-		java-ant_rewrite-classpath ${xml}
-		java-ant_bsfix_one ${xml}
-	done
-	rm -v lib/*.jar lib/*.zip lib/*/*.jar \
-		plugins/*/*.jar plugins/*/*/*.jar || die
-}
-
-src_compile() {
-	local jibxlibs="$(java-pkg_getjars --build-only --with-dependencies xsd2jibx)"
-	local gcp="$(java-pkg_getjars jgoodies-forms,jibx,commons-lang-2.1,javahelp,groovy-1,batik-1.6,fop,simplyhtml,hoteqn):lib/bindings.jar"
-	ANT_TASKS="${WANT_ANT_TASKS} jibx xsd2jibx" eant -Djibxlibs="${jibxlibs}" \
-		-Dgentoo.classpath="${gcp}" dist browser $(use_doc doc)
-}
-
-src_install() {
-	cd "${WORKDIR}/bin/dist"
-	local dest="/usr/share/${PN}/"
-
-	java-pkg_dojar lib/*.jar
-
-	insinto "${dest}"
-	doins -r accessories browser/ doc/ plugins/ patterns.xml || die
-
-	use doc && java-pkg_dojavadoc doc/javadoc
-
-	java-pkg_dolauncher ${PN} --java_args "-Dfreemind.base.dir=${dest}" \
-		--pwd "${dest}" --main freemind.main.FreeMindStarter
-
-	newicon "${S}/images/FreeMindWindowIcon.png" freemind.png
-
-	make_desktop_entry freemind Freemind freemind Utility
-}
diff --git a/app-misc/freemind/freemind-0.9.0_beta20.ebuild b/app-misc/freemind/freemind-0.9.0_rc3.ebuild
index 83934006f452..4f6d21b1a0ad 100644
--- a/app-misc/freemind/freemind-0.9.0_beta20.ebuild
+++ b/app-misc/freemind/freemind-0.9.0_rc3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.9.0_beta20.ebuild,v 1.1 2008/12/20 22:40:05 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.9.0_rc3.ebuild,v 1.1 2009/03/28 11:17:59 caster Exp $
 
-EAPI=1
+EAPI=2
 
 # will handle rewriting myself
 JAVA_PKG_BSFIX="off"
@@ -10,6 +10,7 @@ WANT_ANT_TASKS="ant-nodeps ant-trax"
 inherit java-pkg-2 java-ant-2 eutils
 
 MY_PV=${PV//beta/Beta_}
+MY_PV=${MY_PV//rc/RC_}
 
 DESCRIPTION="Mind-mapping software written in Java"
 HOMEPAGE="http://freemind.sourceforge.net"
@@ -20,7 +21,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc groovy latex pdf svg"
 COMMON_DEP="dev-java/jgoodies-forms:0
 	dev-java/jibx:0
-	>=dev-java/simplyhtml-0.12.3:0
+	>=dev-java/simplyhtml-0.12.5:0
 	dev-java/commons-lang:2.1
 	dev-java/javahelp:0
 	groovy? ( dev-java/groovy:1 )
@@ -38,26 +39,24 @@ RDEPEND=">=virtual/jre-1.4
 
 S="${WORKDIR}/${PN}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+java_prepare() {
 	# kill the jarbundler taskdef
-	epatch "${FILESDIR}/${PN}-0.9.0_beta15-build.xml.patch"
+	epatch "${FILESDIR}/${PN}-0.9.0_rc1-build.xml.patch"
+
+	use groovy || rm plugins/build_scripting.xml || die
+	use latex || rm plugins/build_latex.xml || die
+	if ! use pdf && ! use svg ; then
+		rm plugins/build_svg.xml || die
+	fi
 
 	local xml
 	for xml in $(find . -name 'build*.xml'); do
 		java-ant_rewrite-classpath ${xml}
 		java-ant_bsfix_one ${xml}
 	done
+
 	rm -v lib/*.jar lib/*.zip lib/*/*.jar \
 		plugins/*/*.jar plugins/*/*/*.jar || die
-
-	use groovy || rm plugins/build_scripting.xml || die
-	use latex || rm plugins/build_latex.xml || die
-	if ! use pdf && ! use svg ; then
-		rm plugins/build_svg.xml || die
-	fi
 }
 
 src_compile() {