Updating liguros repo21.1.1

6 files changed, 61 insertions, 77 deletions

diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r101.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
index 298e521fffc2..e05dc251e246 100644
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r101.ebuild
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..2} )
+LUA_COMPAT=( lua5-{1..2} luajit )
 
-inherit lua multilib-minimal toolchain-funcs
+inherit lua toolchain-funcs
 
 DESCRIPTION="Bit Operations Library for the Lua Programming Language"
 HOMEPAGE="https://bitop.luajit.org"
@@ -28,11 +28,10 @@ src_prepare() {
 	default
 
 	lua_copy_sources
-	lua_foreach_impl multilib_copy_sources
 }
 
-lua_multilib_src_compile() {
-	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
 
 	local myemakeargs=(
 		"CC=$(tc-getCC)"
@@ -45,12 +44,12 @@ lua_multilib_src_compile() {
 	popd
 }
 
-multilib_src_compile() {
-	lua_foreach_impl lua_multilib_src_compile
+src_compile() {
+	lua_foreach_impl lua_src_compile
 }
 
-lua_multilib_src_test() {
-	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_test() {
+	pushd "${BUILD_DIR}" || die
 
 	local mytests=(
 		"bitbench.lua"
@@ -66,12 +65,12 @@ lua_multilib_src_test() {
 	popd
 }
 
-multilib_src_test() {
-	multilib_is_native_abi && lua_foreach_impl lua_multilib_src_test
+src_test() {
+	lua_foreach_impl lua_src_test
 }
 
-lua_multilib_src_install() {
-	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
 
 	exeinto $(lua_get_cmod_dir)
 	doexe bit.so
@@ -79,10 +78,8 @@ lua_multilib_src_install() {
 	popd
 }
 
-multilib_src_install() {
-	lua_foreach_impl lua_multilib_src_install
-}
+src_install() {
+	lua_foreach_impl lua_src_install
 
-multilib_src_install_all() {
 	einstalldocs
 }
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r101.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild
index b062c42090b0..ce6096ca0c47 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r101.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild
@@ -3,10 +3,9 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} )
-LUA_REQ_USE="${MULTILIB_USEDEP}"
+LUA_COMPAT=( lua5-{1..3} luajit )
 
-inherit lua multilib-minimal toolchain-funcs
+inherit lua toolchain-funcs
 
 DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
 HOMEPAGE="https://matthewwild.co.uk/projects/luaexpat/"
@@ -18,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
+	dev-libs/expat
 	${LUA_DEPS}
 "
 DEPEND="${RDEPEND}"
@@ -34,11 +33,10 @@ src_prepare() {
 	sed -e 's/-O2/-DLUA_32BITS/g' -i Makefile || die
 
 	lua_copy_sources
-	lua_foreach_impl multilib_copy_sources
 }
 
-lua_multilib_src_compile() {
-	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
 
 	local myemakeargs=(
 		"CC=$(tc-getCC)"
@@ -50,12 +48,12 @@ lua_multilib_src_compile() {
 	popd
 }
 
-multilib_src_compile() {
-	lua_foreach_impl lua_multilib_src_compile
+src_compile() {
+	lua_foreach_impl lua_src_compile
 }
 
-lua_multilib_src_install() {
-	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
 
 	local myemakeargs=(
 		"DESTDIR=${ED}"
@@ -69,10 +67,8 @@ lua_multilib_src_install() {
 	popd
 }
 
-multilib_src_install() {
-	lua_foreach_impl lua_multilib_src_install
-}
+src_install() {
+	lua_foreach_impl lua_src_install
 
-multilib_src_install_all() {
 	einstalldocs
 }
diff --git a/dev-lua/luaexpat/luaexpat-1.3.3-r101.ebuild b/dev-lua/luaexpat/luaexpat-1.3.3-r102.ebuild
index 490ff8633d54..e1907b637e49 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.3-r101.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.3-r102.ebuild
@@ -3,10 +3,9 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} )
-LUA_REQ_USE="${MULTILIB_USEDEP}"
+LUA_COMPAT=( lua5-{1..3} luajit )
 
-inherit lua multilib-minimal toolchain-funcs
+inherit lua toolchain-funcs
 
 DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
 HOMEPAGE="https://github.com/tomasguisasola/luaexpat"
@@ -18,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
+	dev-libs/expat
 	${LUA_DEPS}
 "
 DEPEND="${RDEPEND}"
@@ -39,11 +38,10 @@ src_prepare() {
 	sed -e 's/-O2//g' -i makefile || die
 
 	lua_copy_sources
-	lua_foreach_impl multilib_copy_sources
 }
 
-lua_multilib_src_compile() {
-	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
 
 	local myemakeargs=(
 		"CC=$(tc-getCC) ${CFLAGS}"
@@ -55,12 +53,12 @@ lua_multilib_src_compile() {
 	popd
 }
 
-multilib_src_compile() {
-	lua_foreach_impl lua_multilib_src_compile
+src_compile() {
+	lua_foreach_impl lua_src_compile
 }
 
-lua_multilib_src_install() {
-	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
 
 	local myemakeargs=(
 		"LUA_DIR=${ED}/$(lua_get_lmod_dir)"
@@ -73,10 +71,8 @@ lua_multilib_src_install() {
 	popd
 }
 
-multilib_src_install() {
-	lua_foreach_impl lua_multilib_src_install
-}
+src_install() {
+	lua_foreach_impl lua_src_install
 
-multilib_src_install_all() {
 	einstalldocs
 }
diff --git a/dev-lua/luasec/luasec-0.9-r102.ebuild b/dev-lua/luasec/luasec-0.9-r102.ebuild
index dfaab7645f99..8e58a7be7084 100644
--- a/dev-lua/luasec/luasec-0.9-r102.ebuild
+++ b/dev-lua/luasec/luasec-0.9-r102.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} )
-LUA_REQ_USE="deprecated"
+LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_REQ_USE="deprecated(+)"
 
 inherit lua toolchain-funcs
 
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r1.ebuild
index 4591859cc608..b05a982025b9 100644
--- a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328.ebuild
+++ b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r1.ebuild
@@ -4,9 +4,8 @@
 EAPI=7
 
 EGIT_COMMIT="5b18e475f38fcf28429b1cc4b17baee3b9793a62"
-LUA_REQ_USE="${MULTILIB_USEDEP}"
 
-inherit flag-o-matic multilib multilib-minimal toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Networking support library for the Lua language"
 HOMEPAGE="
@@ -19,9 +18,13 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="luajit"
 RESTRICT="test"
 
-RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]"
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( dev-lang/lua:0 )
+"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
@@ -35,17 +38,15 @@ src_prepare() {
 
 	# Workaround for 32-bit systems
 	append-cflags -fno-stack-protector
-
-	multilib_copy_sources
 }
 
-multilib_src_compile() {
+src_compile() {
 	local myemakeargs=(
 		"CC=$(tc-getCC)"
 		"LD=$(tc-getCC)"
 		"LDFLAGS_linux=-O -fpic -shared -o"
-		"LUAINC_linux=$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)/lua$($(tc-getPKG_CONFIG) --variable V lua)"
-		"LUAV=$($(tc-getPKG_CONFIG) --variable V lua)"
+		"LUAINC_linux=$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
+		"LUAV=5.1"
 		"MYCFLAGS=${CFLAGS}"
 		"MYLDFLAGS=${LDFLAGS}"
 	)
@@ -53,21 +54,19 @@ multilib_src_compile() {
 	emake "${myemakeargs[@]}" all
 }
 
-multilib_src_install() {
+src_install() {
 	local myemakeargs=(
-		"CDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
+		"CDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
 		"DESTDIR=${ED}"
-		"LDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+		"LDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
 		"LUAPREFIX_linux="
 	)
 
 	emake "${myemakeargs[@]}" install
 	emake "${myemakeargs[@]}" install-unix
 
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)/$($(tc-getPKG_CONFIG) --variable V lua)"/luasocket
+	insinto "$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))/luasocket"
 	doins src/*.h
-}
 
-multilib_src_install_all() {
 	einstalldocs
 }
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r101.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild
index dab20430d3c6..7020672331fb 100644
--- a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r101.ebuild
+++ b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild
@@ -4,11 +4,10 @@
 EAPI=7
 
 EGIT_COMMIT="5b18e475f38fcf28429b1cc4b17baee3b9793a62"
-LUA_COMPAT=( lua5-{1..3} )
-LUA_REQ_USE="${MULTILIB_USEDEP}"
+LUA_COMPAT=( lua5-{1..3} luajit )
 MY_P="${PN}-${EGIT_COMMIT}"
 
-inherit flag-o-matic lua multilib-minimal toolchain-funcs
+inherit flag-o-matic lua toolchain-funcs
 
 DESCRIPTION="Networking support library for the Lua language"
 HOMEPAGE="
@@ -40,11 +39,10 @@ src_prepare() {
 	append-cflags -fno-stack-protector
 
 	lua_copy_sources
-	lua_foreach_impl multilib_copy_sources
 }
 
-lua_multilib_src_compile() {
-	pushd "${WORKDIR}/${MY_P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
 
 	local myemakeargs=(
 		"CC=$(tc-getCC)"
@@ -63,12 +61,12 @@ lua_multilib_src_compile() {
 	popd
 }
 
-multilib_src_compile() {
-	lua_foreach_impl lua_multilib_src_compile
+src_compile() {
+	lua_foreach_impl lua_src_compile
 }
 
-lua_multilib_src_install() {
-	pushd "${WORKDIR}/${MY_P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
 
 	local myemakeargs=(
 		"CDIR=$(lua_get_cmod_dir)"
@@ -88,10 +86,8 @@ lua_multilib_src_install() {
 	popd
 }
 
-multilib_src_install() {
-	lua_foreach_impl lua_multilib_src_install
-}
+src_install() {
+	lua_foreach_impl lua_src_install
 
-multilib_src_install_all() {
 	einstalldocs
 }