1 |
Move EAPI check and EXPORT_FUNCTIONS on top, before include guard. |
2 |
Standardise include guard. |
3 |
|
4 |
Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
5 |
--- |
6 |
eclass/check-reqs.eclass | 20 ++++++++++---------- |
7 |
1 file changed, 10 insertions(+), 10 deletions(-) |
8 |
|
9 |
diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass |
10 |
index 5c4a420ee06..70c740d0363 100644 |
11 |
--- a/eclass/check-reqs.eclass |
12 |
+++ b/eclass/check-reqs.eclass |
13 |
@@ -7,7 +7,7 @@ |
14 |
# @AUTHOR: |
15 |
# Bo Ørsted Andresen <zlin@g.o> |
16 |
# Original Author: Ciaran McCreesh <ciaranm@g.o> |
17 |
-# @SUPPORTED_EAPIS: 4 5 6 7 |
18 |
+# @SUPPORTED_EAPIS: 4 5 6 7 8 |
19 |
# @BLURB: Provides a uniform way of handling ebuild which have very high build requirements |
20 |
# @DESCRIPTION: |
21 |
# This eclass provides a uniform way of handling ebuilds which have very high |
22 |
@@ -38,7 +38,15 @@ |
23 |
# These checks should probably mostly work on non-Linux, and they should |
24 |
# probably degrade gracefully if they don't. Probably. |
25 |
|
26 |
-if [[ ! ${_CHECK_REQS_ECLASS_} ]]; then |
27 |
+case ${EAPI:-0} in |
28 |
+ 4|5|6|7|8) ;; |
29 |
+ *) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;; |
30 |
+esac |
31 |
+ |
32 |
+EXPORT_FUNCTIONS pkg_pretend pkg_setup |
33 |
+ |
34 |
+if [[ ! ${_CHECK_REQS_ECLASS} ]]; then |
35 |
+_CHECK_REQS_ECLASS=1 |
36 |
|
37 |
# @ECLASS-VARIABLE: CHECKREQS_MEMORY |
38 |
# @DEFAULT_UNSET |
39 |
@@ -60,13 +68,6 @@ if [[ ! ${_CHECK_REQS_ECLASS_} ]]; then |
40 |
# @DESCRIPTION: |
41 |
# How much space is needed in /var? Eg.: CHECKREQS_DISK_VAR=3000M |
42 |
|
43 |
-case ${EAPI:-0} in |
44 |
- 4|5|6|7) ;; |
45 |
- *) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;; |
46 |
-esac |
47 |
- |
48 |
-EXPORT_FUNCTIONS pkg_pretend pkg_setup |
49 |
- |
50 |
# Obsolete function executing all the checks and printing out results |
51 |
check_reqs() { |
52 |
eerror "Package calling old ${FUNCNAME} function." |
53 |
@@ -357,5 +358,4 @@ check-reqs_unsatisfied() { |
54 |
CHECKREQS_FAILED="true" |
55 |
} |
56 |
|
57 |
-_CHECK_REQS_ECLASS_=1 |
58 |
fi |
59 |
-- |
60 |
2.32.0 |