| 1 |
mgorny 14/03/31 16:48:09 |
| 2 |
|
| 3 |
Modified: freemind-0.9.0-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
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. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.6 app-misc/freemind/freemind-0.9.0-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/freemind/freemind-0.9.0-r1.ebuild?rev=1.6&view=markup |
| 13 |
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 |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/freemind/freemind-0.9.0-r1.ebuild?r1=1.5&r2=1.6 |
| 15 |
|
| 16 |
Index: freemind-0.9.0-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.9.0-r1.ebuild,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- freemind-0.9.0-r1.ebuild 5 Sep 2013 19:22:45 -0000 1.5 |
| 23 |
+++ freemind-0.9.0-r1.ebuild 31 Mar 2014 16:48:09 -0000 1.6 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2013 Gentoo Foundation |
| 26 |
+# Copyright 1999-2014 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $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 $ |
| 29 |
+# $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 $ |
| 30 |
|
| 31 |
EAPI="4" |
| 32 |
|
| 33 |
@@ -26,7 +26,8 @@ |
| 34 |
latex? ( dev-java/hoteqn:0 ) |
| 35 |
pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) |
| 36 |
svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 )" |
| 37 |
-DEPEND=">=virtual/jdk-1.4 |
| 38 |
+DEPEND="dev-lang/python |
| 39 |
+ >=virtual/jdk-1.4 |
| 40 |
pdf? ( dev-java/avalon-framework:4.2 ) |
| 41 |
svg? ( dev-java/avalon-framework:4.2 ) |
| 42 |
${COMMON_DEP}" |
| 43 |
@@ -35,6 +36,33 @@ |
| 44 |
|
| 45 |
S="${WORKDIR}/${PN}" |
| 46 |
|
| 47 |
+# Moved from the eclass to clean it up from python and this ebuild is |
| 48 |
+# the last consumer. Additionally, the newer version no longer requires |
| 49 |
+# it so it will die along with this one. |
| 50 |
+java-ant_remove-taskdefs() { |
| 51 |
+ debug-print-function ${FUNCNAME} $* |
| 52 |
+ local task_name |
| 53 |
+ if [[ "${1}" == --name ]]; then |
| 54 |
+ task_name="${2}" |
| 55 |
+ shift 2 |
| 56 |
+ fi |
| 57 |
+ local file="${1:-build.xml}" |
| 58 |
+ echo "Removing taskdefs from ${file}" |
| 59 |
+ python <<EOF |
| 60 |
+import sys |
| 61 |
+from xml.dom.minidom import parse |
| 62 |
+dom = parse("${file}") |
| 63 |
+for elem in dom.getElementsByTagName('taskdef'): |
| 64 |
+ if (len("${task_name}") == 0 or elem.getAttribute("name") == "${task_name}"): |
| 65 |
+ elem.parentNode.removeChild(elem) |
| 66 |
+ elem.unlink() |
| 67 |
+f = open("${file}", "w") |
| 68 |
+dom.writexml(f) |
| 69 |
+f.close() |
| 70 |
+EOF |
| 71 |
+ [[ $? != 0 ]] && die "Removing taskdefs failed" |
| 72 |
+} |
| 73 |
+ |
| 74 |
java_prepare() { |
| 75 |
# someone got it all wrong (set/unset vs. bool) |
| 76 |
sed -i -e 's|<property name="include_latex" value="false"/>||' plugins/build.xml || die |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.65 app-misc/freemind/ChangeLog |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/freemind/ChangeLog?rev=1.65&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/freemind/ChangeLog?rev=1.65&content-type=text/plain |
| 84 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/freemind/ChangeLog?r1=1.64&r2=1.65 |
| 85 |
|
| 86 |
Index: ChangeLog |
| 87 |
=================================================================== |
| 88 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v |
| 89 |
retrieving revision 1.64 |
| 90 |
retrieving revision 1.65 |
| 91 |
diff -u -r1.64 -r1.65 |
| 92 |
--- ChangeLog 22 Mar 2014 16:42:04 -0000 1.64 |
| 93 |
+++ ChangeLog 31 Mar 2014 16:48:09 -0000 1.65 |
| 94 |
@@ -1,6 +1,10 @@ |
| 95 |
# ChangeLog for app-misc/freemind |
| 96 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 97 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.64 2014/03/22 16:42:04 tomwij Exp $ |
| 98 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/ChangeLog,v 1.65 2014/03/31 16:48:09 mgorny Exp $ |
| 99 |
+ |
| 100 |
+ 31 Mar 2014; Michał Górny <mgorny@g.o> freemind-0.9.0-r1.ebuild: |
| 101 |
+ Move the java-ant_remove-taskdefs function from the ebuild since this ebuild |
| 102 |
+ is the last consumer of it. This is least-change way of fixing the eclass. |
| 103 |
|
| 104 |
22 Mar 2014; Tom Wijsman <TomWij@g.o> freemind-1.0.0-r1.ebuild: |
| 105 |
Add missing die; for bug #501728, discovered by Chema Alonso (nimiux). |
Archives