diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-03-31 16:48:51 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-03-31 16:48:51 +0000 |
| commit | 220bd90c8323ac50ae4b2dcc998e586c3abdda66 (patch) | |
| tree | f85b4b4f41fe6591b28701e89e6e65a46390943f /eclass | |
| parent | Move the java-ant_remove-taskdefs function from the ebuild since this ebuild ... (diff) | |
| download | historical-220bd90c8323ac50ae4b2dcc998e586c3abdda66.tar.gz historical-220bd90c8323ac50ae4b2dcc998e586c3abdda66.tar.bz2 historical-220bd90c8323ac50ae4b2dcc998e586c3abdda66.zip | |
Ban the java-ant_remove-taskdefs() function and remove Python dependency, bug #479838.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/java-ant-2.eclass | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index c419d309c83e..0e81e1d7ba8f 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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 <mgorny@gentoo.org> java-ant-2.eclass: + Ban the java-ant_remove-taskdefs() function and remove Python dependency, bug + #479838. 31 Mar 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: Revert the introduction of ABI_PPC due to a lot of breakage, bug #506298 to diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index b4f43acc7ec6..f92fdf286463 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -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 @@ fi 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 @@ java-ant_rewrite-classpath() { # 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}" |