summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2015-08-16 00:18:34 +0100
committerJames Le Cuirot <chewi@gentoo.org>2015-08-16 15:22:04 +0100
commit376d26baf99c396be6c12a9c4d95addf932427a6 (patch)
tree51039b986072a91dbdcc357e83ec4dfaab2fa468 /eclass
parentwww-servers/tomcat: Remove orphaned patch (diff)
downloadgentoo-376d26baf99c396be6c12a9c4d95addf932427a6.tar.gz
gentoo-376d26baf99c396be6c12a9c4d95addf932427a6.tar.bz2
gentoo-376d26baf99c396be6c12a9c4d95addf932427a6.zip
java-ant-2.eclass: Add explicit ant-core SLOT for QA
Diffstat (limited to 'eclass')
-rw-r--r--eclass/java-ant-2.eclass7
1 files changed, 4 insertions, 3 deletions
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index 982e3eef7659..ea0f3e05fa90 100644
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@@ -1,7 +1,7 @@
# eclass for ant based Java packages
#
# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org>
-# Copyright (c) 2004-2011, Gentoo Foundation
+# Copyright (c) 2004-2015, Gentoo Foundation
# Changes:
# May 2007:
# Made bsfix make one pass for all things and add some glocal targets for
@@ -58,7 +58,8 @@ inherit java-utils-2 multilib
# Setting this variable non-empty before inheriting java-ant-2 disables adding
# dev-java/ant-core into DEPEND.
if [[ -z "${JAVA_ANT_DISABLE_ANT_CORE_DEP}" ]]; then
- JAVA_ANT_E_DEPEND="${JAVA_ANT_E_DEPEND} >=dev-java/ant-core-1.8.2"
+ JAVA_ANT_E_DEPEND+=" >=dev-java/ant-core-1.8.2"
+ [[ "${EAPI:-0}" != 0 ]] && JAVA_ANT_E_DEPEND+=":0"
fi
# add ant tasks specified in WANT_ANT_TASKS to DEPEND
@@ -371,7 +372,7 @@ java-ant_bsfix_files() {
# @USAGE: <path/to/build.xml>
# @DESCRIPTION:
# Attempts to fix named build file.
-#
+#
# @CODE
# Affected by variables:
# JAVA_PKG_BSFIX_SOURCE_TAGS