commit: 92022b7fdc3c5de61fb93505d9c9befcec4ac307
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 17:14:11 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 11:13:36 2020 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=92022b7f
qmake-utils.eclass: Ban qmake-utils_find_pro_file() as well
Always marked as @INTERNAL and no remaining users in gentoo.git.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/qmake-utils.eclass | 33 +++------------------------------
1 file changed, 3 insertions(+), 30 deletions(-)
diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 79dbc8c0..0d49eb94 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -22,7 +22,7 @@ case ${EAPI} in
*) die "EAPI=${EAPI:-0} is not supported" ;;
esac
-inherit estack toolchain-funcs
+inherit toolchain-funcs
# @FUNCTION: _qmake-utils_banned_func
# @INTERNAL
@@ -109,38 +109,11 @@ qt5_get_plugindir() {
}
# @FUNCTION: qmake-utils_find_pro_file
-# @RETURN: zero or one qmake .pro file names
# @INTERNAL
# @DESCRIPTION:
-# Outputs a project file name that can be passed to eqmake.
-# 0 *.pro files found --> outputs null string;
-# 1 *.pro file found --> outputs its name;
-# 2 or more *.pro files found --> if "${PN}.pro" or
-# "$(basename ${S}).pro" are there, outputs one of them.
+# Banned.
qmake-utils_find_pro_file() {
- local dir_name=$(basename "${S}")
-
- # set nullglob to avoid expanding *.pro to the literal
- # string "*.pro" when there are no matching files
- eshopts_push -s nullglob
- local pro_files=(*.pro)
- eshopts_pop
-
- case ${#pro_files[@]} in
- 0)
- : ;;
- 1)
- echo "${pro_files}"
- ;;
- *)
- for pro_file in "${pro_files[@]}"; do
- if [[ ${pro_file%.pro} == ${dir_name} ||
${pro_file%.pro} == ${PN} ]]; then
- echo "${pro_file}"
- break
- fi
- done
- ;;
- esac
+ _qmake-utils_banned_func
}
# @FUNCTION: eqmake4
