diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2007-05-08 20:27:04 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2007-05-08 20:27:04 +0000 |
| commit | 98b01871a8ef3c5d1e06ad4b288dddddad09f6ba (patch) | |
| tree | 854c4be966404a8bdca902b3c1379bb284fc213c /app-misc | |
| parent | Ebuild was missing virtual/ssh as runtime dependency. (diff) | |
| download | gentoo-2-98b01871a8ef3c5d1e06ad4b288dddddad09f6ba.tar.gz gentoo-2-98b01871a8ef3c5d1e06ad4b288dddddad09f6ba.tar.bz2 gentoo-2-98b01871a8ef3c5d1e06ad4b288dddddad09f6ba.zip | |
Patch out jarbundler taskdef and remove dependency on it.
(Portage version: 2.1.2.7)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/freemind/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/freemind/files/freemind-0.9.0_beta9-build.xml.patch | 16 | ||||
| -rw-r--r-- | app-misc/freemind/freemind-0.9.0_beta9.ebuild | 8 |
3 files changed, 26 insertions, 4 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/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) } |