From: Petteri Räty <betelgeuse@gentoo.org>
Date: Thu, 25 Jan 2007 23:02:55 +0000 (+0000)
Subject: Added EANT_ANT_TASKS to pass ANT_TASKS to eant. ANT_TASKS is unset in java-pkg_init... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=70e0524714b388488150433d6b0e23fef55ee48b;p=gentoo.git

Added EANT_ANT_TASKS to pass ANT_TASKS to eant. ANT_TASKS is unset in java-pkg_init so it can't be used in global scope.
---

diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index 87f8568f48f2..276c98f29e74 100644
--- 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.16 2007/01/21 22:27:18 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.17 2007/01/25 23:02:55 betelgeuse Exp $
 
 inherit java-utils-2
 
@@ -69,6 +69,7 @@ java-pkg-2_pkg_setup() {
 #                   java-utils-2.eclass)
 # EANT_GENTOO_CLASSPATH - @see eant documention in java-utils-2.eclass
 # EANT_EXTRA_ARGS - extra arguments to pass to eant
+# EANT_ANT_TASKS - modifies the ANT_TASKS variable in the eant environment
 # param: Parameters are passed to ant verbatim
 # ------------------------------------------------------------------------------
 java-pkg-2_src_compile() {
@@ -78,7 +79,8 @@ java-pkg-2_src_compile() {
 
 		local antflags="${EANT_BUILD_TARGET:=jar}"
 		hasq doc ${IUSE} && antflags="${antflags} $(use_doc ${EANT_DOC_TARGET})"
-		eant ${antflags} -f "${EANT_BUILD_XML}" ${EANT_EXTRA_ARGS} "${@}"
+		ANT_TASKS="${ANT_TASKS} ${EANT_ANT_TASKS}" \
+			eant ${antflags} -f "${EANT_BUILD_XML}" ${EANT_EXTRA_ARGS} "${@}"
 	else
 		echo "${FUNCNAME}: No build.xml found so nothing to do."
 	fi