1 |
Change the _R0 suffix on these variable names to _ECLASS. |
2 |
Signed-off-by: William Hubbs <williamh@g.o> |
3 |
--- |
4 |
eclass/lua-single.eclass | 10 +++------- |
5 |
eclass/lua-utils.eclass | 8 ++++---- |
6 |
eclass/lua.eclass | 12 +++++------- |
7 |
3 files changed, 12 insertions(+), 18 deletions(-) |
8 |
|
9 |
diff --git a/eclass/lua-single.eclass b/eclass/lua-single.eclass |
10 |
index ab4fdb3c75a..5e1ee936c12 100644 |
11 |
--- a/eclass/lua-single.eclass |
12 |
+++ b/eclass/lua-single.eclass |
13 |
@@ -68,16 +68,15 @@ case ${EAPI} in |
14 |
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
15 |
esac |
16 |
|
17 |
-if [[ ! ${_LUA_SINGLE_R0} ]]; then |
18 |
+if [[ ! ${_LUA_SINGLE_ECLASS} ]]; then |
19 |
+_LUA_SINGLE_ECLASS=1 |
20 |
|
21 |
-if [[ ${_LUA_R0} ]]; then |
22 |
+if [[ ${_LUA_ECLASS} ]]; then |
23 |
die 'lua-single.eclass cannot be used with lua.eclass.' |
24 |
fi |
25 |
|
26 |
inherit lua-utils |
27 |
|
28 |
-fi |
29 |
- |
30 |
EXPORT_FUNCTIONS pkg_setup |
31 |
|
32 |
# @ECLASS-VARIABLE: LUA_COMPAT |
33 |
@@ -275,8 +274,6 @@ _lua_single_set_globals() { |
34 |
_lua_single_set_globals |
35 |
unset -f _lua_single_set_globals |
36 |
|
37 |
-if [[ ! ${_LUA_SINGLE_R0} ]]; then |
38 |
- |
39 |
# @FUNCTION: _lua_gen_usedep |
40 |
# @USAGE: [<pattern>...] |
41 |
# @INTERNAL |
42 |
@@ -531,5 +528,4 @@ lua-single_pkg_setup() { |
43 |
[[ ${MERGE_TYPE} != binary ]] && lua_setup |
44 |
} |
45 |
|
46 |
-_LUA_SINGLE_R0=1 |
47 |
fi |
48 |
diff --git a/eclass/lua-utils.eclass b/eclass/lua-utils.eclass |
49 |
index 278bbca58a3..52ba290e544 100644 |
50 |
--- a/eclass/lua-utils.eclass |
51 |
+++ b/eclass/lua-utils.eclass |
52 |
@@ -23,7 +23,7 @@ case ${EAPI} in |
53 |
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
54 |
esac |
55 |
|
56 |
-if [[ ! ${_LUA_UTILS_R0} ]]; then |
57 |
+if [[ ! ${_LUA_UTILS_ECLASS} ]]; then |
58 |
|
59 |
inherit toolchain-funcs |
60 |
|
61 |
@@ -376,7 +376,7 @@ lua_enable_tests() { |
62 |
busted) |
63 |
test_directory="${2:-spec}" |
64 |
test_pkg="dev-lua/busted" |
65 |
- if [[ ! ${_LUA_SINGLE_R0} ]]; then |
66 |
+ if [[ ! ${_LUA_SINGLE_ECLASS} ]]; then |
67 |
eval "lua_src_test() { |
68 |
busted --lua=\"\${ELUA}\" --output=\"plainTerminal\" \"${test_directory}\" || die \"Tests fail with \${ELUA}\" |
69 |
}" |
70 |
@@ -395,7 +395,7 @@ lua_enable_tests() { |
71 |
|
72 |
local test_deps=${RDEPEND} |
73 |
if [[ -n ${test_pkg} ]]; then |
74 |
- if [[ ! ${_LUA_SINGLE_R0} ]]; then |
75 |
+ if [[ ! ${_LUA_SINGLE_ECLASS} ]]; then |
76 |
test_deps+=" ${test_pkg}[${LUA_USEDEP}]" |
77 |
else |
78 |
test_deps+=" $(lua_gen_cond_dep " |
79 |
@@ -528,5 +528,5 @@ lua_get_version() { |
80 |
echo "${LUA_VERSION}" |
81 |
} |
82 |
|
83 |
-_LUA_UTILS_R0=1 |
84 |
+_LUA_UTILS_ECLASS=1 |
85 |
fi |
86 |
diff --git a/eclass/lua.eclass b/eclass/lua.eclass |
87 |
index e9a5c117560..3b0816f9834 100644 |
88 |
--- a/eclass/lua.eclass |
89 |
+++ b/eclass/lua.eclass |
90 |
@@ -56,9 +56,10 @@ case ${EAPI} in |
91 |
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
92 |
esac |
93 |
|
94 |
-if [[ ! ${_LUA_R0} ]]; then |
95 |
+if [[ ! ${_LUA_ECLASS} ]]; then |
96 |
+_LUA_ECLASS=1 |
97 |
|
98 |
-if [[ ${_LUA_SINGLE_R0} ]]; then |
99 |
+if [[ ${_LUA_SINGLE_ECLASS} ]]; then |
100 |
die 'lua.eclass cannot be used with lua-single.eclass.' |
101 |
fi |
102 |
|
103 |
@@ -196,8 +197,6 @@ fi |
104 |
# lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)? |
105 |
# @CODE |
106 |
|
107 |
-if [[ ! ${_LUA_R0} ]]; then |
108 |
- |
109 |
# @FUNCTION: _lua_validate_useflags |
110 |
# @INTERNAL |
111 |
# @DESCRIPTION: |
112 |
@@ -313,9 +312,6 @@ lua_foreach_impl() { |
113 |
multibuild_foreach_variant _lua_multibuild_wrapper "${@}" |
114 |
} |
115 |
|
116 |
-_LUA_R0=1 |
117 |
-fi |
118 |
- |
119 |
# @FUNCTION: _lua_set_globals |
120 |
# @INTERNAL |
121 |
# @DESCRIPTION: |
122 |
@@ -374,3 +370,5 @@ _lua_set_globals() { |
123 |
|
124 |
_lua_set_globals |
125 |
unset -f _lua_set_globals |
126 |
+ |
127 |
+fi |
128 |
-- |
129 |
2.31.1 |