hi,
as per bug https://bugs.gentoo.org/693022 we need to add dependency on
dev-java/gnu-jaf (or dev-java/sun-jaf) to the package. unfortunately
ant-tasks.eclass variable ANT_TASK_DEPNAME supports only single
dependency (it was sufficient till now), but we need one more in this
case. the introduced patch adds support for alternatively specifying
ANT_TASK_DEPNAME as an array and handle it correctly. i've tested the
patch and all seems to work fine.
please let me know if something can/should be improved.
thanks.
miroslav
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index 309df084d156..26df9de26f1a 100644
--- 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,17 @@ 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}
+ local array=$(declare -p ANT_TASK_DEPNAME | grep "^declare \-a")
+
+ if [[ -n "${array}" ]]; then
+ for depname in "${ANT_TASK_DEPNAME[@]}"; do
+ java-pkg_jar-from ${depname}
+ done
+ else
+ java-pkg_jar-from ${ANT_TASK_DEPNAME}
+ fi
fi;;
all)
ant-tasks_src_unpack base jar-dep;;
