From 5a165c60b9b8c4847067cb83b4be7da785d01f93 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 28 Sep 2019 08:17:07 +0100
Subject: gentoo resync : 28.09.2019

---
 eclass/Manifest.gz         | Bin 37489 -> 37480 bytes
 eclass/ant-tasks.eclass    |  12 ++++++++----
 eclass/flag-o-matic.eclass |   6 +++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'eclass')

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index e926bc25f3b3..16780d2deda3 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index 309df084d156..04c6fb5b7d67 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,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;;
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 3b32bd9d6319..89b259cc222f 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -435,8 +435,12 @@ test-flag-PROG() {
 
 	[[ -z ${comp} || -z $1 ]] && return 1
 
+	# verify selected compiler exists before using it
+	comp=$(tc-get${comp})
+	type -p ${comp} >/dev/null || return 1
+
 	local cmdline=(
-		$(tc-get${comp})
+		${comp}
 		# Clang will warn about unknown gcc flags but exit 0.
 		# Need -Werror to force it to exit non-zero.
 		-Werror
-- 
cgit v1.2.3