summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-03-31 16:48:51 +0000
committerMichał Górny <mgorny@gentoo.org>2014-03-31 16:48:51 +0000
commit220bd90c8323ac50ae4b2dcc998e586c3abdda66 (patch)
treef85b4b4f41fe6591b28701e89e6e65a46390943f /eclass/java-ant-2.eclass
parentMove the java-ant_remove-taskdefs function from the ebuild since this ebuild ... (diff)
downloadhistorical-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/java-ant-2.eclass')
-rw-r--r--eclass/java-ant-2.eclass8
1 files changed, 5 insertions, 3 deletions
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}"