mgorny 14/03/31 16:48:09 Modified: freemind-0.9.0-r1.ebuild ChangeLog Log: Move the java-ant_remove-taskdefs function from the ebuild since this ebuild is the last consumer of it. This is least-change way of fixing the eclass. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.6 app-misc/freemind/freemind-0.9.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/freemind/freemind-0.9.0-r1.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/freemind/freemind-0.9.0-r1.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/freemind/freemind-0.9.0-r1.ebuild?r1=1.5&r2=1.6 Index: freemind-0.9.0-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.9.0-r1.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- freemind-0.9.0-r1.ebuild 5 Sep 2013 19:22:45 -0000 1.5 +++ freemind-0.9.0-r1.ebuild 31 Mar 2014 16:48:09 -0000 1.6 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 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-r1.ebuild,v 1.5 2013/09/05 19:22:45 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.9.0-r1.ebuild,v 1.6 2014/03/31 16:48:09 mgorny Exp $ EAPI="4" @@ -26,7 +26,8 @@ latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 )" -DEPEND=">=virtual/jdk-1.4 +DEPEND="dev-lang/python + >=virtual/jdk-1.4 pdf? ( dev-java/avalon-framework:4.2 ) svg? ( dev-java/avalon-framework:4.2 ) ${COMMON_DEP}" @@ -35,6 +36,33 @@ S="${WORKDIR}/${PN}" +# Moved from the eclass to clean it up from python and this ebuild is +# the last consumer. Additionally, the newer version no longer requires +# it so it will die along with this one. +java-ant_remove-taskdefs() { + debug-print-function ${FUNCNAME} $* + local task_name + if [[ "${1}" == --name ]]; then + task_name="${2}" + shift 2 + fi + local file="${1:-build.xml}" + echo "Removing taskdefs from ${file}" + python <<EOF +import sys +from xml.dom.minidom import parse +dom = parse("${file}") +for elem in dom.getElementsByTagName('taskdef'): + if (len("${task_name}") == 0 or elem.getAttribute("name") == "${task_name}"): + elem.parentNode.removeChild(elem) + elem.unlink() +f = open("${file}", "w") +dom.writexml(f) +f.close() +EOF + [[ $? != 0 ]] && die "Removing taskdefs failed" +} + java_prepare() { # someone got it all wrong (set/unset vs. bool) sed -i -e 's|<property name="include_latex" value="false"/>||' plugins/build.xml || die 1.65 app-misc/freemind/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/freemind/ChangeLog?rev=1.65&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/freemind/ChangeLog?rev=1.65&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/freemind/ChangeLog?r1=1.64&r2=1.65 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- ChangeLog 22 Mar 2014 16:42:04 -0000 1.64 +++ ChangeLog 31 Mar 2014 16:48:09 -0000 1.65 @@ -1,6 +1,10 @@ # ChangeLog for app-misc/freemind # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.64 2014/03/22 16:42:04 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.65 2014/03/31 16:48:09 mgorny Exp $ + + 31 Mar 2014; Michał Górny <[email protected]> freemind-0.9.0-r1.ebuild: + Move the java-ant_remove-taskdefs function from the ebuild since this ebuild + is the last consumer of it. This is least-change way of fixing the eclass. 22 Mar 2014; Tom Wijsman <[email protected]> freemind-1.0.0-r1.ebuild: Add missing die; for bug #501728, discovered by Chema Alonso (nimiux).
