1 |
commit: 0dc4f9005b423257d938033424117c4b590d4f30 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 17 21:11:16 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 17 21:14:39 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0dc4f900 |
7 |
|
8 |
ecm.eclass: EAPI whitelist and EXPORT_FUNCTIONS ahead of inherit guard |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
|
12 |
eclass/ecm.eclass | 22 +++++++++++----------- |
13 |
1 file changed, 11 insertions(+), 11 deletions(-) |
14 |
|
15 |
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass |
16 |
index 5e541f8cf5..5f10a7caf7 100644 |
17 |
--- a/eclass/ecm.eclass |
18 |
+++ b/eclass/ecm.eclass |
19 |
@@ -20,6 +20,17 @@ |
20 |
# This eclass's phase functions are not intended to be mixed and matched, so if |
21 |
# any phase functions are overridden the version here should also be called. |
22 |
|
23 |
+case ${EAPI} in |
24 |
+ 7) ;; |
25 |
+ *) die "EAPI=${EAPI:-0} is not supported" ;; |
26 |
+esac |
27 |
+ |
28 |
+if [[ -v KDE_GCC_MINIMAL ]]; then |
29 |
+ EXPORT_FUNCTIONS pkg_pretend |
30 |
+fi |
31 |
+ |
32 |
+EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_test pkg_preinst pkg_postinst pkg_postrm |
33 |
+ |
34 |
if [[ -z ${_ECM_ECLASS} ]]; then |
35 |
_ECM_ECLASS=1 |
36 |
|
37 |
@@ -48,17 +59,6 @@ if [[ ${ECM_NONGUI} = false ]] ; then |
38 |
inherit xdg |
39 |
fi |
40 |
|
41 |
-case ${EAPI} in |
42 |
- 7) ;; |
43 |
- *) die "EAPI=${EAPI:-0} is not supported" ;; |
44 |
-esac |
45 |
- |
46 |
-if [[ -v KDE_GCC_MINIMAL ]]; then |
47 |
- EXPORT_FUNCTIONS pkg_pretend |
48 |
-fi |
49 |
- |
50 |
-EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_test pkg_preinst pkg_postinst pkg_postrm |
51 |
- |
52 |
# @ECLASS-VARIABLE: ECM_KDEINSTALLDIRS |
53 |
# @DESCRIPTION: |
54 |
# Assume the package is using KDEInstallDirs macro and switch |