From 467e2131896a3030032cd5b0fab2094a045bf9d0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 18 Mar 2023 00:29:05 +0000 Subject: gentoo auto-resync : 18:03:2023 - 00:29:05 --- eclass/lua.eclass | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'eclass/lua.eclass') diff --git a/eclass/lua.eclass b/eclass/lua.eclass index 29b8b6ec6348..bb2e41ef1061 100644 --- a/eclass/lua.eclass +++ b/eclass/lua.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: lua.eclass @@ -52,21 +52,19 @@ # @CODE case ${EAPI} in - 7|8) - ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ ! ${_LUA_R0} ]]; then +if [[ -z ${_LUA_ECLASS} ]]; then +_LUA_ECLASS=1 -if [[ ${_LUA_SINGLE_R0} ]]; then +if [[ ${_LUA_SINGLE_ECLASS} ]]; then die 'lua.eclass cannot be used with lua-single.eclass.' fi inherit multibuild lua-utils -fi - # @ECLASS_VARIABLE: LUA_COMPAT # @REQUIRED # @PRE_INHERIT @@ -197,8 +195,6 @@ fi # lua_targets_lua5-1(-)?,lua_targets_lua5-3(-)? # @CODE -if [[ ! ${_LUA_R0} ]]; then - # @FUNCTION: _lua_validate_useflags # @INTERNAL # @DESCRIPTION: @@ -314,9 +310,6 @@ lua_foreach_impl() { multibuild_foreach_variant _lua_multibuild_wrapper "${@}" } -_LUA_R0=1 -fi - # @FUNCTION: _lua_set_globals # @INTERNAL # @DESCRIPTION: @@ -375,3 +368,5 @@ _lua_set_globals() { _lua_set_globals unset -f _lua_set_globals + +fi -- cgit v1.2.3