1 |
mgorny 14/03/31 16:48:51 |
2 |
|
3 |
Modified: ChangeLog java-ant-2.eclass |
4 |
Log: |
5 |
Ban the java-ant_remove-taskdefs() function and remove Python dependency, bug #479838. |
6 |
|
7 |
Revision Changes Path |
8 |
1.1191 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1191&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1191&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1190&r2=1.1191 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1190 |
18 |
retrieving revision 1.1191 |
19 |
diff -u -r1.1190 -r1.1191 |
20 |
--- ChangeLog 31 Mar 2014 15:32:22 -0000 1.1190 |
21 |
+++ ChangeLog 31 Mar 2014 16:48:51 -0000 1.1191 |
22 |
@@ -1,6 +1,10 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1190 2014/03/31 15:32:22 mgorny Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1191 2014/03/31 16:48:51 mgorny Exp $ |
27 |
+ |
28 |
+ 31 Mar 2014; Michał Górny <mgorny@g.o> java-ant-2.eclass: |
29 |
+ Ban the java-ant_remove-taskdefs() function and remove Python dependency, bug |
30 |
+ #479838. |
31 |
|
32 |
31 Mar 2014; Michał Górny <mgorny@g.o> multilib-build.eclass: |
33 |
Revert the introduction of ABI_PPC due to a lot of breakage, bug #506298 to |
34 |
|
35 |
|
36 |
|
37 |
1.58 eclass/java-ant-2.eclass |
38 |
|
39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-ant-2.eclass?rev=1.58&view=markup |
40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-ant-2.eclass?rev=1.58&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-ant-2.eclass?r1=1.57&r2=1.58 |
42 |
|
43 |
Index: java-ant-2.eclass |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v |
46 |
retrieving revision 1.57 |
47 |
retrieving revision 1.58 |
48 |
diff -u -r1.57 -r1.58 |
49 |
--- java-ant-2.eclass 5 Oct 2013 13:40:57 -0000 1.57 |
50 |
+++ java-ant-2.eclass 31 Mar 2014 16:48:51 -0000 1.58 |
51 |
@@ -14,7 +14,7 @@ |
52 |
# |
53 |
# Licensed under the GNU General Public License, v2 |
54 |
# |
55 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.57 2013/10/05 13:40:57 caster Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.58 2014/03/31 16:48:51 mgorny Exp $ |
57 |
|
58 |
# @ECLASS: java-ant-2.eclass |
59 |
# @MAINTAINER: |
60 |
@@ -76,8 +76,7 @@ |
61 |
JAVA_ANT_E_DEPEND="${JAVA_ANT_E_DEPEND} |
62 |
${ANT_TASKS_DEPEND} |
63 |
${JAVA_PKG_PORTAGE_DEP} |
64 |
- >=dev-java/javatoolkit-0.3.0-r2 |
65 |
- >=dev-lang/python-2.4" |
66 |
+ >=dev-java/javatoolkit-0.3.0-r2" |
67 |
|
68 |
# this eclass must be inherited after java-pkg-2 or java-pkg-opt-2 |
69 |
# if it's java-pkg-opt-2, ant dependencies are pulled based on USE flag |
70 |
@@ -429,6 +428,9 @@ |
71 |
# The file to rewrite defaults to build.xml when not specified. |
72 |
java-ant_remove-taskdefs() { |
73 |
debug-print-function ${FUNCNAME} $* |
74 |
+ |
75 |
+ die "${FUNCNAME} has been banned, see bug #479838." |
76 |
+ |
77 |
local task_name |
78 |
if [[ "${1}" == --name ]]; then |
79 |
task_name="${2}" |