Patch out jarbundler taskdef and remove dependency on it.

Package-Manager: portage-2.1.2.7

4 files changed, 38 insertions, 12 deletions

diff --git a/app-misc/freemind/ChangeLog b/app-misc/freemind/ChangeLog
index ea0a6ea7a63d..9807d0417056 100644
--- a/app-misc/freemind/ChangeLog
+++ b/app-misc/freemind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/freemind
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.28 2007/05/07 12:57:35 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.29 2007/05/08 20:27:04 caster Exp $
+
+  08 May 2007; Vlastimil Babka <caster@gentoo.org>
+  +files/freemind-0.9.0_beta9-build.xml.patch, freemind-0.9.0_beta9.ebuild:
+  Patch out jarbundler taskdef and remove dependency on it.
 
 *freemind-0.9.0_beta9 (07 May 2007)
 
diff --git a/app-misc/freemind/Manifest b/app-misc/freemind/Manifest
index 2e06c76fb789..31fb3a783866 100644
--- a/app-misc/freemind/Manifest
+++ b/app-misc/freemind/Manifest
@@ -2,6 +2,10 @@ AUX freemind-0.8.0-source.patch 707 RMD160 564bee084b34c484d36819b5ccfafd2691b3c
 MD5 46a5acee95e2fde1f398d4f376ff7447 files/freemind-0.8.0-source.patch 707
 RMD160 564bee084b34c484d36819b5ccfafd2691b3cd4a files/freemind-0.8.0-source.patch 707
 SHA256 95172076011a2b98eeaaa1d4267926abf0c2a9828ba27abf254450757b33fa8f files/freemind-0.8.0-source.patch 707
+AUX freemind-0.9.0_beta9-build.xml.patch 551 RMD160 61e8fde7772bb43100b7497f58594ae05588a86c SHA1 ad7760823b4ea946eea5558561cbd1189ac55f48 SHA256 cc70d4750c028db1e2a3beadba2d4bc678d09b12cdf56a7da8d26b01465cea04
+MD5 e1b40b3e3951a98098522b0090b12bac files/freemind-0.9.0_beta9-build.xml.patch 551
+RMD160 61e8fde7772bb43100b7497f58594ae05588a86c files/freemind-0.9.0_beta9-build.xml.patch 551
+SHA256 cc70d4750c028db1e2a3beadba2d4bc678d09b12cdf56a7da8d26b01465cea04 files/freemind-0.9.0_beta9-build.xml.patch 551
 DIST freemind-src-0.9.0_Beta_9.tar.gz 11861490 RMD160 040a2f1e72d61cc5d3fea111cd14b59e68b86a51 SHA1 b361f7edbe108cf1ec5476d0ccd2797a90d902a5 SHA256 ceb1f01d6e3a714712c0493f40d60e52394c192bdeb8c35f58ef214be31008be
 DIST freemind-src-0_7_1.tar.gz 239660 RMD160 f1e919489d30823433d0ae698ea3a565f13255a8 SHA1 26ae7156a7c5e358d8589351bb9e2831f4d5851c SHA256 39bc7f6794c470060b4a639c014f913803059ab2e755defc9f6c886c4bdc7202
 DIST freemind-src-0_8_0.zip 9857214 RMD160 df7f47aedef7b761c94f938f7c851f0b8ed32e04 SHA1 17c65bdc65b292d7d62fe7a8d633a24c2ad618df SHA256 c28902151f0089ddd1270c662820b6e33a85a686083c53dcfe6dd7205493da78
@@ -13,14 +17,14 @@ EBUILD freemind-0.8.0-r3.ebuild 1390 RMD160 728b26ee3dcef79450b63bb50b7415121869
 MD5 bb0bf57ee44db406702f10afa0b04bad freemind-0.8.0-r3.ebuild 1390
 RMD160 728b26ee3dcef79450b63bb50b74151218691a4e freemind-0.8.0-r3.ebuild 1390
 SHA256 430f1c94a412d0677171274571900492c6661b6892dff602561a611caa297d21 freemind-0.8.0-r3.ebuild 1390
-EBUILD freemind-0.9.0_beta9.ebuild 2015 RMD160 1f3a5f011917888cd8049dd77cb9737ac1d671f5 SHA1 5e38b2e5e68dc28d527d8db9fc3da931815d88bc SHA256 7744d5f6904c4cf4d3c8e6472a49d2c8acf210535b02bb421faac6bb47e1ab02
-MD5 abbf7287728c04372246d08affb9bede freemind-0.9.0_beta9.ebuild 2015
-RMD160 1f3a5f011917888cd8049dd77cb9737ac1d671f5 freemind-0.9.0_beta9.ebuild 2015
-SHA256 7744d5f6904c4cf4d3c8e6472a49d2c8acf210535b02bb421faac6bb47e1ab02 freemind-0.9.0_beta9.ebuild 2015
-MISC ChangeLog 4378 RMD160 85535645ffa6a967e57cdbc47651d393da1e732a SHA1 ecf929dc1f4c9ede7b904473f4c308ca3c3d4367 SHA256 fbc8b8309c69cefc749126bfb1ad4657043956e1df21292feeff229faf883b4a
-MD5 21f64cc85bfcd904c7a19afa1c68a247 ChangeLog 4378
-RMD160 85535645ffa6a967e57cdbc47651d393da1e732a ChangeLog 4378
-SHA256 fbc8b8309c69cefc749126bfb1ad4657043956e1df21292feeff229faf883b4a ChangeLog 4378
+EBUILD freemind-0.9.0_beta9.ebuild 2058 RMD160 ea32e76b50f6f6e5d1620f71374152c77ef3b413 SHA1 849e0c451d7ee1c02beed3287fde5f618126cb7d SHA256 60378304d5bf0dfa05ed404c878d0011ac2f4ebf18edce72203aae58a80258fe
+MD5 9b0f01e89c9fcf1ffa5ac1caea9499f4 freemind-0.9.0_beta9.ebuild 2058
+RMD160 ea32e76b50f6f6e5d1620f71374152c77ef3b413 freemind-0.9.0_beta9.ebuild 2058
+SHA256 60378304d5bf0dfa05ed404c878d0011ac2f4ebf18edce72203aae58a80258fe freemind-0.9.0_beta9.ebuild 2058
+MISC ChangeLog 4566 RMD160 e3bff8d7809db52c0be1601446434345f8b76b69 SHA1 c8fda8b69fb387f966947200ee324f06283e892f SHA256 786df9847a7269c0cfc89b913ea6b56cf003249ecb4638226dc6570849213d88
+MD5 39e8efbd3aa68cf21dafd3907e8154e9 ChangeLog 4566
+RMD160 e3bff8d7809db52c0be1601446434345f8b76b69 ChangeLog 4566
+SHA256 786df9847a7269c0cfc89b913ea6b56cf003249ecb4638226dc6570849213d88 ChangeLog 4566
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
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
new file mode 100644
index 000000000000..291cea7d18ba
--- /dev/null
+++ b/app-misc/freemind/files/freemind-0.9.0_beta9-build.xml.patch
@@ -0,0 +1,16 @@
+--- 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_beta9.ebuild b/app-misc/freemind/freemind-0.9.0_beta9.ebuild
index 6a744f3ba805..178d6d32ef0a 100644
--- a/app-misc/freemind/freemind-0.9.0_beta9.ebuild
+++ b/app-misc/freemind/freemind-0.9.0_beta9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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_beta9.ebuild,v 1.1 2007/05/07 12:57:35 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.9.0_beta9.ebuild,v 1.2 2007/05/08 20:27:04 caster Exp $
 
 # will handle rewriting myself
 JAVA_PKG_BSFIX="off"
@@ -25,7 +25,6 @@ COMMON_DEP="dev-java/jgoodies-forms
 	=dev-java/batik-1.6*
 	>=dev-java/fop-0.93"
 DEPEND=">=virtual/jdk-1.4
-	dev-java/jarbundler
 	dev-java/xsd2jibx
 	app-arch/unzip
 	${COMMON_DEP}"
@@ -38,6 +37,9 @@ src_unpack() {
 	unpack "${A}"
 	cd "${S}"
 
+	# kill the jarbundler taskdef
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
 	local xml
 	for xml in $(find . -name 'build*.xml'); do
 		java-ant_rewrite-classpath ${xml}
@@ -49,7 +51,7 @@ src_unpack() {
 src_compile() {
 	local jibxlibs="$(java-pkg_getjars --build-only --with-dependencies xsd2jibx)"
 	local gcp="$(java-pkg_getjars jgoodies-forms,jibx,commons-lang,javahelp,groovy-1,batik-1.6,fop,simplyhtml):lib/bindings.jar"
-	ANT_TASKS="${WANT_ANT_TASKS} jarbundler jibx xsd2jibx" eant -Djibxlibs="${jibxlibs}" \
+	ANT_TASKS="${WANT_ANT_TASKS} jibx xsd2jibx" eant -Djibxlibs="${jibxlibs}" \
 		-Dgentoo.classpath="${gcp}" dist browser $(use_doc doc)
 }