| 1 |
commit: 0b0a3f9d0b305ce2b73a9d6ad30c874f19b8d5e3 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 25 17:14:11 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 26 20:16:22 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b0a3f9d |
| 7 |
|
| 8 |
qmake-utils.eclass: Ban qmake-utils_find_pro_file() as well |
| 9 |
|
| 10 |
Always marked as @INTERNAL and no remaining users in gentoo.git. |
| 11 |
|
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
eclass/qmake-utils.eclass | 33 +++------------------------------ |
| 15 |
1 file changed, 3 insertions(+), 30 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass |
| 18 |
index 79dbc8c0742..0d49eb94382 100644 |
| 19 |
--- a/eclass/qmake-utils.eclass |
| 20 |
+++ b/eclass/qmake-utils.eclass |
| 21 |
@@ -22,7 +22,7 @@ case ${EAPI} in |
| 22 |
*) die "EAPI=${EAPI:-0} is not supported" ;; |
| 23 |
esac |
| 24 |
|
| 25 |
-inherit estack toolchain-funcs |
| 26 |
+inherit toolchain-funcs |
| 27 |
|
| 28 |
# @FUNCTION: _qmake-utils_banned_func |
| 29 |
# @INTERNAL |
| 30 |
@@ -109,38 +109,11 @@ qt5_get_plugindir() { |
| 31 |
} |
| 32 |
|
| 33 |
# @FUNCTION: qmake-utils_find_pro_file |
| 34 |
-# @RETURN: zero or one qmake .pro file names |
| 35 |
# @INTERNAL |
| 36 |
# @DESCRIPTION: |
| 37 |
-# Outputs a project file name that can be passed to eqmake. |
| 38 |
-# 0 *.pro files found --> outputs null string; |
| 39 |
-# 1 *.pro file found --> outputs its name; |
| 40 |
-# 2 or more *.pro files found --> if "${PN}.pro" or |
| 41 |
-# "$(basename ${S}).pro" are there, outputs one of them. |
| 42 |
+# Banned. |
| 43 |
qmake-utils_find_pro_file() { |
| 44 |
- local dir_name=$(basename "${S}") |
| 45 |
- |
| 46 |
- # set nullglob to avoid expanding *.pro to the literal |
| 47 |
- # string "*.pro" when there are no matching files |
| 48 |
- eshopts_push -s nullglob |
| 49 |
- local pro_files=(*.pro) |
| 50 |
- eshopts_pop |
| 51 |
- |
| 52 |
- case ${#pro_files[@]} in |
| 53 |
- 0) |
| 54 |
- : ;; |
| 55 |
- 1) |
| 56 |
- echo "${pro_files}" |
| 57 |
- ;; |
| 58 |
- *) |
| 59 |
- for pro_file in "${pro_files[@]}"; do |
| 60 |
- if [[ ${pro_file%.pro} == ${dir_name} || ${pro_file%.pro} == ${PN} ]]; then |
| 61 |
- echo "${pro_file}" |
| 62 |
- break |
| 63 |
- fi |
| 64 |
- done |
| 65 |
- ;; |
| 66 |
- esac |
| 67 |
+ _qmake-utils_banned_func |
| 68 |
} |
| 69 |
|
| 70 |
# @FUNCTION: eqmake4 |
Archives