Version bump. Fix building with Ant 1.8.0 (broken by basedir handling change) with a sed call, compatible with Ant 1.7.1 too. Bug #305929.

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

3 files changed, 20 insertions, 8 deletions

diff --git a/app-misc/freemind/ChangeLog b/app-misc/freemind/ChangeLog
index d1b8eb7b52a7..f848a41f2d4c 100644
--- a/app-misc/freemind/ChangeLog
+++ b/app-misc/freemind/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/freemind
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.50 2009/10/25 10:22:48 caster Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.51 2010/02/28 11:40:44 caster Exp $
+
+*freemind-0.9.0_rc7 (28 Feb 2010)
+
+  28 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+  -freemind-0.9.0_rc4-r1.ebuild, freemind-0.9.0_rc6.ebuild,
+  +freemind-0.9.0_rc7.ebuild:
+  Version bump. Fix building with Ant 1.8.0 (broken by basedir handling
+  change) with a sed call, compatible with Ant 1.7.1 too. Bug #305929.
 
 *freemind-0.9.0_rc6 (25 Oct 2009)
 
diff --git a/app-misc/freemind/freemind-0.9.0_rc6.ebuild b/app-misc/freemind/freemind-0.9.0_rc6.ebuild
index 2a5f637a5389..950a551228ec 100644
--- a/app-misc/freemind/freemind-0.9.0_rc6.ebuild
+++ b/app-misc/freemind/freemind-0.9.0_rc6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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_rc6.ebuild,v 1.1 2009/10/25 10:22:48 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.9.0_rc6.ebuild,v 1.2 2010/02/28 11:40:44 caster Exp $
 
 EAPI="2"
 
@@ -70,7 +70,7 @@ src_compile() {
 	fi
 	local gcp="$(java-pkg_getjars --with-dependencies ${gcp}):lib/bindings.jar"
 	ANT_TASKS="${WANT_ANT_TASKS} jibx xsd2jibx" eant -Djibxlibs="${jibxlibs}" \
-		-Dgentoo.classpath="${gcp}" dist browser $(use_doc doc)
+		-Dgentoo.classpath="${gcp}" -Dbasedir="${PWD}" dist browser $(use_doc doc)
 }
 
 src_install() {
diff --git a/app-misc/freemind/freemind-0.9.0_rc4-r1.ebuild b/app-misc/freemind/freemind-0.9.0_rc7.ebuild
index 0f36ba515796..6de926994811 100644
--- a/app-misc/freemind/freemind-0.9.0_rc4-r1.ebuild
+++ b/app-misc/freemind/freemind-0.9.0_rc7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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_rc4-r1.ebuild,v 1.2 2009/07/30 07:38:55 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.9.0_rc7.ebuild,v 1.1 2010/02/28 11:40:44 caster Exp $
 
 EAPI="2"
 
@@ -43,6 +43,10 @@ java_prepare() {
 	# kill the jarbundler taskdef
 	epatch "${FILESDIR}/${PN}-0.9.0_rc1-build.xml.patch"
 
+	# Ant 1.8.0 changed basedir handling in some subtle ways and probably
+	# correcly. This change does not break ant 1.7.1 builds. Bug #305929
+	sed -i 's/basedir="\."/basedir="\.\."/' plugins/build_*.xml || die
+
 	use groovy || rm plugins/build_scripting.xml || die
 	use latex || rm plugins/build_latex.xml || die
 	if ! use pdf && ! use svg ; then
@@ -70,7 +74,7 @@ src_compile() {
 	fi
 	local gcp="$(java-pkg_getjars --with-dependencies ${gcp}):lib/bindings.jar"
 	ANT_TASKS="${WANT_ANT_TASKS} jibx xsd2jibx" eant -Djibxlibs="${jibxlibs}" \
-		-Dgentoo.classpath="${gcp}" dist browser $(use_doc doc)
+		-Dgentoo.classpath="${gcp}" -Dbasedir="${PWD}" dist browser $(use_doc doc)
 }
 
 src_install() {