eclass/ant-tasks.eclass: added support for multiple deps

Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index 309df084d156da45085d561e9ac861949a8b9280..04c6fb5b7d678974ec721af582c8a07caffe32b8 100644 (file)
--- a/eclass/ant-tasks.eclass
+++ b/eclass/ant-tasks.eclass
@@ -54,7 +54,9 @@ ANT_TASK_NAME="${PN#ant-}"
 # @DESCRIPTION:
 # Specifies JAVA_PKG_NAME (PN{-SLOT} used with java-pkg_jar-from) of the package
 # that this one depends on. Defaults to the name of ant task, ebuild can
-# override it before inheriting this eclass.
+# override it before inheriting this eclass. In case there is more than one
+# dependency, the variable can be specified as bash array with multiple strings,
+# one for each dependency.
 ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}}
 
 # @ECLASS-VARIABLE: ANT_TASK_DISABLE_VM_DEPS
@@ -105,7 +107,7 @@ S="${WORKDIR}/${MY_P}"
 # base: performs the unpack, build.xml replacement and symlinks ant.jar from
 #      ant-core
 #
-# jar-dep: symlinks the jar file(s) from dependency package
+# jar-dep: symlinks the jar file(s) from dependency package(s)
 ant-tasks_src_unpack() {
        [[ -z "${1}" ]] && ant-tasks_src_unpack all
 
@@ -129,9 +131,11 @@ ant-tasks_src_unpack() {
                                # ant.jar to build against
                                java-pkg_jar-from --build-only ant-core ant.jar;;
                        jar-dep)
-                               # get jar from the dependency package
+                               # get jar from the dependency package(s)
                                if [[ -n "${ANT_TASK_DEPNAME}" ]]; then
-                                       java-pkg_jar-from ${ANT_TASK_DEPNAME}
+                                       for depname in "${ANT_TASK_DEPNAME[@]}"; do
+                                               java-pkg_jar-from ${depname}
+                                       done
                                fi;;
                        all)
                                ant-tasks_src_unpack base jar-dep;;