mgorny 14/03/31 16:48:51 Modified: ChangeLog java-ant-2.eclass Log: Ban the java-ant_remove-taskdefs() function and remove Python dependency, bug #479838.
Revision Changes Path 1.1191 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1191&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1191&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1190&r2=1.1191 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1190 retrieving revision 1.1191 diff -u -r1.1190 -r1.1191 --- ChangeLog 31 Mar 2014 15:32:22 -0000 1.1190 +++ ChangeLog 31 Mar 2014 16:48:51 -0000 1.1191 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1190 2014/03/31 15:32:22 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1191 2014/03/31 16:48:51 mgorny Exp $ + + 31 Mar 2014; Michał Górny <[email protected]> java-ant-2.eclass: + Ban the java-ant_remove-taskdefs() function and remove Python dependency, bug + #479838. 31 Mar 2014; Michał Górny <[email protected]> multilib-build.eclass: Revert the introduction of ABI_PPC due to a lot of breakage, bug #506298 to 1.58 eclass/java-ant-2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-ant-2.eclass?rev=1.58&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-ant-2.eclass?rev=1.58&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-ant-2.eclass?r1=1.57&r2=1.58 Index: java-ant-2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- java-ant-2.eclass 5 Oct 2013 13:40:57 -0000 1.57 +++ java-ant-2.eclass 31 Mar 2014 16:48:51 -0000 1.58 @@ -14,7 +14,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.57 2013/10/05 13:40:57 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.58 2014/03/31 16:48:51 mgorny Exp $ # @ECLASS: java-ant-2.eclass # @MAINTAINER: @@ -76,8 +76,7 @@ JAVA_ANT_E_DEPEND="${JAVA_ANT_E_DEPEND} ${ANT_TASKS_DEPEND} ${JAVA_PKG_PORTAGE_DEP} - >=dev-java/javatoolkit-0.3.0-r2 - >=dev-lang/python-2.4" + >=dev-java/javatoolkit-0.3.0-r2" # this eclass must be inherited after java-pkg-2 or java-pkg-opt-2 # if it's java-pkg-opt-2, ant dependencies are pulled based on USE flag @@ -429,6 +428,9 @@ # The file to rewrite defaults to build.xml when not specified. java-ant_remove-taskdefs() { debug-print-function ${FUNCNAME} $* + + die "${FUNCNAME} has been banned, see bug #479838." + local task_name if [[ "${1}" == --name ]]; then task_name="${2}"
