Use WANT_ANT_TASKS if EANT_ANT_TASKS is not defined. Fixes bug #164315.

diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index 484d7126915c7a1be8641e305408c96b61135e7f..8f78577e2aaa158f7a3b7466dd4b1a535c080570 100644 (file)
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@@ -10,7 +10,7 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.14 2007/01/21 01:20:21 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.15 2007/01/28 21:42:24 betelgeuse Exp $
 
 inherit java-utils-2
 
@@ -27,8 +27,10 @@ inherit java-utils-2
 
 # We need some tools from javatoolkit. We also need portage 2.1 for phase hooks
 DEPEND=">=dev-java/javatoolkit-0.1.5 ${JAVA_PKG_PORTAGE_DEP}"
+
 # add ant-core into DEPEND, unless disabled
-[[ "${JAVA_ANT_DISABLE_ANT_CORE_DEP:-true}" ]] || DEPEND="${DEPEND} dev-java/ant-core"
+[[ "${JAVA_ANT_DISABLE_ANT_CORE_DEP}" ]] || DEPEND="${DEPEND} dev-java/ant-core"
+
 # add ant tasks specified in WANT_ANT_TASKS to DEPEND
 local ANT_TASKS_DEPEND;
 ANT_TASKS_DEPEND="$(java-pkg_ant-tasks-depend)"

diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index c8590ab12ddbcf6c6868a023dae541c1857f8185..5f7c5a64c4b5fddfd41c4b7d499d242c79993645 100644 (file)
--- a/eclass/java-pkg-2.eclass
+++ b/eclass/java-pkg-2.eclass
@@ -5,7 +5,7 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.19 2007/01/28 20:04:59 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.20 2007/01/28 21:42:24 betelgeuse Exp $
 
 inherit java-utils-2
 
@@ -79,7 +79,9 @@ java-pkg-2_src_compile() {
 
                local antflags="${EANT_BUILD_TARGET:=jar}"
                hasq doc ${IUSE} && antflags="${antflags} $(use_doc ${EANT_DOC_TARGET})"
-               ANT_TASKS="${ANT_TASKS} ${EANT_ANT_TASKS}" \
+               local tasks
+               [[ ${EANT_ANT_TASKS} ]] && tasks="${ANT_TASKS} ${EANT_ANT_TASKS}"
+               ANT_TASKS="${tasks}" \
                        eant ${antflags} -f "${EANT_BUILD_XML}" ${EANT_EXTRA_ARGS} "${@}"
        else
                echo "${FUNCNAME}: ${EANT_BUILD_XML} not found so nothing to do."