| 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 | 8 ++++---- |
| 5 |
eclass/lua-utils.eclass | 8 ++++---- |
| 6 |
eclass/lua.eclass | 8 ++++---- |
| 7 |
3 files changed, 12 insertions(+), 12 deletions(-) |
| 8 |
|
| 9 |
diff --git a/eclass/lua-single.eclass b/eclass/lua-single.eclass |
| 10 |
index ab4fdb3c75a..8b3692b2f18 100644 |
| 11 |
--- a/eclass/lua-single.eclass |
| 12 |
+++ b/eclass/lua-single.eclass |
| 13 |
@@ -68,9 +68,9 @@ 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 |
|
| 20 |
-if [[ ${_LUA_R0} ]]; then |
| 21 |
+if [[ ${_LUA_ECLASS} ]]; then |
| 22 |
die 'lua-single.eclass cannot be used with lua.eclass.' |
| 23 |
fi |
| 24 |
|
| 25 |
@@ -275,7 +275,7 @@ _lua_single_set_globals() { |
| 26 |
_lua_single_set_globals |
| 27 |
unset -f _lua_single_set_globals |
| 28 |
|
| 29 |
-if [[ ! ${_LUA_SINGLE_R0} ]]; then |
| 30 |
+if [[ ! ${_LUA_SINGLE_ECLASS} ]]; then |
| 31 |
|
| 32 |
# @FUNCTION: _lua_gen_usedep |
| 33 |
# @USAGE: [<pattern>...] |
| 34 |
@@ -531,5 +531,5 @@ lua-single_pkg_setup() { |
| 35 |
[[ ${MERGE_TYPE} != binary ]] && lua_setup |
| 36 |
} |
| 37 |
|
| 38 |
-_LUA_SINGLE_R0=1 |
| 39 |
+_LUA_SINGLE_ECLASS=1 |
| 40 |
fi |
| 41 |
diff --git a/eclass/lua-utils.eclass b/eclass/lua-utils.eclass |
| 42 |
index 278bbca58a3..52ba290e544 100644 |
| 43 |
--- a/eclass/lua-utils.eclass |
| 44 |
+++ b/eclass/lua-utils.eclass |
| 45 |
@@ -23,7 +23,7 @@ case ${EAPI} in |
| 46 |
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 47 |
esac |
| 48 |
|
| 49 |
-if [[ ! ${_LUA_UTILS_R0} ]]; then |
| 50 |
+if [[ ! ${_LUA_UTILS_ECLASS} ]]; then |
| 51 |
|
| 52 |
inherit toolchain-funcs |
| 53 |
|
| 54 |
@@ -376,7 +376,7 @@ lua_enable_tests() { |
| 55 |
busted) |
| 56 |
test_directory="${2:-spec}" |
| 57 |
test_pkg="dev-lua/busted" |
| 58 |
- if [[ ! ${_LUA_SINGLE_R0} ]]; then |
| 59 |
+ if [[ ! ${_LUA_SINGLE_ECLASS} ]]; then |
| 60 |
eval "lua_src_test() { |
| 61 |
busted --lua=\"\${ELUA}\" --output=\"plainTerminal\" \"${test_directory}\" || die \"Tests fail with \${ELUA}\" |
| 62 |
}" |
| 63 |
@@ -395,7 +395,7 @@ lua_enable_tests() { |
| 64 |
|
| 65 |
local test_deps=${RDEPEND} |
| 66 |
if [[ -n ${test_pkg} ]]; then |
| 67 |
- if [[ ! ${_LUA_SINGLE_R0} ]]; then |
| 68 |
+ if [[ ! ${_LUA_SINGLE_ECLASS} ]]; then |
| 69 |
test_deps+=" ${test_pkg}[${LUA_USEDEP}]" |
| 70 |
else |
| 71 |
test_deps+=" $(lua_gen_cond_dep " |
| 72 |
@@ -528,5 +528,5 @@ lua_get_version() { |
| 73 |
echo "${LUA_VERSION}" |
| 74 |
} |
| 75 |
|
| 76 |
-_LUA_UTILS_R0=1 |
| 77 |
+_LUA_UTILS_ECLASS=1 |
| 78 |
fi |
| 79 |
diff --git a/eclass/lua.eclass b/eclass/lua.eclass |
| 80 |
index e9a5c117560..d6fe7201779 100644 |
| 81 |
--- a/eclass/lua.eclass |
| 82 |
+++ b/eclass/lua.eclass |
| 83 |
@@ -56,9 +56,9 @@ case ${EAPI} in |
| 84 |
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 85 |
esac |
| 86 |
|
| 87 |
-if [[ ! ${_LUA_R0} ]]; then |
| 88 |
+if [[ ! ${_LUA_ECLASS} ]]; then |
| 89 |
|
| 90 |
-if [[ ${_LUA_SINGLE_R0} ]]; then |
| 91 |
+if [[ ${_LUA_SINGLE_ECLASS} ]]; then |
| 92 |
die 'lua.eclass cannot be used with lua-single.eclass.' |
| 93 |
fi |
| 94 |
|
| 95 |
@@ -196,7 +196,7 @@ fi |
| 96 |
# lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)? |
| 97 |
# @CODE |
| 98 |
|
| 99 |
-if [[ ! ${_LUA_R0} ]]; then |
| 100 |
+if [[ ! ${_LUA_ECLASS} ]]; then |
| 101 |
|
| 102 |
# @FUNCTION: _lua_validate_useflags |
| 103 |
# @INTERNAL |
| 104 |
@@ -313,7 +313,7 @@ lua_foreach_impl() { |
| 105 |
multibuild_foreach_variant _lua_multibuild_wrapper "${@}" |
| 106 |
} |
| 107 |
|
| 108 |
-_LUA_R0=1 |
| 109 |
+_LUA_ECLASS=1 |
| 110 |
fi |
| 111 |
|
| 112 |
# @FUNCTION: _lua_set_globals |
| 113 |
-- |
| 114 |
2.31.1 |
Archives