Version bump.

Package-Manager: portage-2.2_rc27/cvs/Linux x86_64

6 files changed, 28 insertions, 135 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/Manifest b/app-misc/freemind/Manifest
index dc063bed214f..66b803096f7a 100644
--- a/app-misc/freemind/Manifest
+++ b/app-misc/freemind/Manifest
@@ -1,14 +1,10 @@
 AUX freemind-0.8.0-source.patch 707 RMD160 564bee084b34c484d36819b5ccfafd2691b3cd4a SHA1 0afdbf3b0a0e2ebecb3e3de00c4f4ed85816c5ea SHA256 95172076011a2b98eeaaa1d4267926abf0c2a9828ba27abf254450757b33fa8f
-AUX freemind-0.9.0_beta15-build.xml.patch 551 RMD160 61e8fde7772bb43100b7497f58594ae05588a86c SHA1 ad7760823b4ea946eea5558561cbd1189ac55f48 SHA256 cc70d4750c028db1e2a3beadba2d4bc678d09b12cdf56a7da8d26b01465cea04
-AUX freemind-0.9.0_beta9-build.xml.patch 551 RMD160 61e8fde7772bb43100b7497f58594ae05588a86c SHA1 ad7760823b4ea946eea5558561cbd1189ac55f48 SHA256 cc70d4750c028db1e2a3beadba2d4bc678d09b12cdf56a7da8d26b01465cea04
 AUX freemind-0.9.0_rc1-build.xml.patch 544 RMD160 719b67738a53478fa6467004a15d86adad079094 SHA1 c86c38eb1c2ffef25806c33653cc79c1d2cb69e2 SHA256 596923100e78e983b19890dd5e3c3c211c54fc0a91a9741f10bca9b20f5811b1
-DIST freemind-src-0.9.0_Beta_16_icon_butterfly.tar.gz 12644069 RMD160 4a7733d278c9742ae38616084fe470b2c250be32 SHA1 7c51cedccf80a28d33d4d132eac85afa8be3c247 SHA256 a7e129df1c0ae5169ee528f4a0095fb80c87f2214add190068752a1e6173d764
-DIST freemind-src-0.9.0_Beta_20.tar.gz 14043048 RMD160 71ea8c251207fdb0d94f9951b6e1750515e089d2 SHA1 c25f78956f75b5a21ec4fa9da88f9a4a7cc2193f SHA256 fb6a7f4e6e224666ca921d6dbda139373c6981d0f72d25696ef7a707ec3845c9
 DIST freemind-src-0.9.0_RC_1.tar.gz 14342001 RMD160 7836b795fca5d8cf9057fa8a8b86e2de62e89714 SHA1 2044d31b1bfcc81af5f75bbacd4923747d119fd7 SHA256 29b5b548bd76857d043a5ff294d1dd90b1ce481162bcf3bcfca08aab270c56b1
+DIST freemind-src-0.9.0_RC_3.tar.gz 15133756 RMD160 a0c6f209cac158bced4cf04ab302a99a3e85ba0f SHA1 423c9cabbc7e686151eba7af586c71428df69c47 SHA256 29bec08f1c252fe17efeb03b23d71bfc334dd2011b8c1d8e9f29b210f59f3058
 DIST freemind-src-0_8_0.zip 9857214 RMD160 df7f47aedef7b761c94f938f7c851f0b8ed32e04 SHA1 17c65bdc65b292d7d62fe7a8d633a24c2ad618df SHA256 c28902151f0089ddd1270c662820b6e33a85a686083c53dcfe6dd7205493da78
 EBUILD freemind-0.8.0-r3.ebuild 1283 RMD160 11986ad9bc8d8a2567f13bfcaee10efcd2b1f938 SHA1 37942f230701e445b855e49d680a316d5e171d9a SHA256 cb794f1bad8af6eaec891321547ddb12e307cb212927281d74ac26d4ccfb3e54
-EBUILD freemind-0.9.0_beta16.ebuild 2178 RMD160 a32ae6ebeb5ae13160984b0bd85b121cf519f4ee SHA1 53e19d7974cc896eb36c423d3efbee12a84edf3e SHA256 47c846adcdf7b6072e8f26b4fe627ed960e827c081b1c5364dc5844f5f9dd8f4
-EBUILD freemind-0.9.0_beta20.ebuild 2586 RMD160 742f3b42782af8a4c5fa6942a3a0011eb26d26c4 SHA1 eb0f302eb9f5260051441f4d2750a109492d59ad SHA256 e9b2b0019175975961c32f16555c7faa72069dc6cdc473606ea399992c696a6a
 EBUILD freemind-0.9.0_rc1.ebuild 2593 RMD160 74afac51f6062a4315a2bdfa16dd22e5b7369c67 SHA1 b82479dd5317ea4d0bdb985675aaba6bef6b0d5e SHA256 d962cd192e57d9359248102d1c4b8697b62a2bcd7504483bc7744ea1ab70b03e
-MISC ChangeLog 6722 RMD160 4a58550291971bb1589e1b7c01c313a3e98ec1aa SHA1 8c464d2bc2a690a6070f026adeef7a273df9817a SHA256 ca0d7cb25d8d34312c54df5f5a9433331d683a7e633809f76b713687ab4a777e
+EBUILD freemind-0.9.0_rc3.ebuild 2581 RMD160 6694404fa39b13a9a4dc14e2376662943f521a78 SHA1 0b151f6ebc7d25bce0370219b3101e5494298677 SHA256 ec5504fc008214c83e90391f9bdabb8cab147ec6c2b7bd95cab41fd1aa9df18e
+MISC ChangeLog 7014 RMD160 8c9a022edcaf3e47fbdcb8d4eb23f69ed4d512bb SHA1 80a5361ab8c8d41de92d8662dffd62d07ae8b99d SHA256 1399295feb0144176572c94d8f2da883f063a3dc1130a3b47c8bd2454d0096d7
 MISC metadata.xml 498 RMD160 3257462313db1947676502aee3f039f8885289b9 SHA1 0dfcc245809419a94c5399ecdccaec3429895ab6 SHA256 0fbff5fdf47275d3a532869de6e5064f613cf929bdbab2ed74ef9ff5fe1949a9
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() {