gentoo resync : 18.12.2020

3 files changed, 25 insertions, 30 deletions

diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index 1505bfd67933..c16ae40d99ac 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -2,6 +2,6 @@ AUX proxy-fix.patch 1026 BLAKE2B 6dde53833c9b35e059a4c1e7052cb494b4e1ceb2dc496a2
 DIST luasocket-3.0_rc1.tar.gz 328598 BLAKE2B 9cc382d909cfa018edec237ac901220cccb0cf0e3a775b9cd8083487ace42a94dfd280f9423097f677f37ee9f85afcfff844250cd49c0f813b7c50c3adc532c5 SHA512 f6efce259aaacaa11472911471f8a13b118fe009b8953a82c6aa18b9ec829cd1293180904e56935cb130d36d267e3f27c91db2d78e03f7488f3e100571ed0540
 DIST luasocket-3.0_rc1_p20200328.tar.gz 335628 BLAKE2B 9e5d3e415337903b689705669b586c4481179a319b4e3428823c8f442d04f26db86bfeca66db7e58d157e31431c31e4f687403f7163b75f57d6f87cdb934717f SHA512 bdf7086a0504b0072b9cfd1266fc4ae89504053801722859a426f567fca00ed76f4c295c2a3a968e93f0036d9b792cf97561e9baa82c09ea23999cfd473227eb
 EBUILD luasocket-3.0_rc1-r5.ebuild 1269 BLAKE2B 2d68f6772b9b9b64f6e4a7019fe0fbb0d1b06853b22dbf6b25df7e1009fc9cadf71d011ce25192533b2327e9c9a0e696922da36e37e979ebcb684c385fc38be3 SHA512 e26279b51433c160b3eeed4891684ef339c711986ffd6bce5f0b89b714bcdaac792b033cf6a28558be8c5660dd12258e513a7025465a34be53e07e4130bbae39
-EBUILD luasocket-3.0_rc1_p20200328-r101.ebuild 2090 BLAKE2B b05de5f8feb553e4a58c446d016a2bebb66ccac4c2d5927f246856a2b4b055c8a0c5e6e003a3e77ed19ca51871028b06436c94cabb21be6981a316b52ce6979c SHA512 eeca0edc2aa3c3e9d5a940c78610e45c56705ef55e0659120f2643b350cc00d8f5eb7ccca9f372d2493838e39adfcdac40a2593ad4cf3ddfe972652f47bd5df6
-EBUILD luasocket-3.0_rc1_p20200328.ebuild 1824 BLAKE2B acd961363bba7bd85d0437f2b81712863becfefef7cb76172b9ae88a189065ee5a5ae5035a35923df1a9de96ab2df04fa624ef8fefae3a952d27ae13f1e86309 SHA512 afc8bf466ffcd25e15899e043a7fa5fd9cad9d3025abb8931c14471b53a12b8262d3f714ed3b611f4216c131d5cf2cff9ba0790642bb2cd8199d42d729f13b98
+EBUILD luasocket-3.0_rc1_p20200328-r1.ebuild 1705 BLAKE2B 3c9c666610b0d006f64b0fca2e97caee983915d2fd5917e7dd3c24bb929697c67da5f119268155c49ab535583fc5bb1956c2124d45125afeb83f81edc2bbfc43 SHA512 8413d461a44ae989bf472af6fbfac1f36f9b0874afb3907f289672d086fec07d54e49ea2722e1c45bbdee1fb5c81bb9d41fde0ee5cf988678cdf44f8a9316ae9
+EBUILD luasocket-3.0_rc1_p20200328-r102.ebuild 1830 BLAKE2B bf5471461ab92b86d143b0d3b5ca3be0e45dc9bd1a6ecc7d9d203bdd4ffc2d29c5d0fd47682397e0183bd54d4ae199f649f0c5668700ba500cf762ea9925e6f5 SHA512 c47d74f85d6826ce541194ab01276440d269a45cb8cefb1009a92dc8957dd93188f7520c9f3e5c993b28ca4952f3881ca45b96436dfe2581cbde81e7aaac3160
 MISC metadata.xml 572 BLAKE2B 22a011f8d4e4f921389561208866b4740ac3d16bd8868958ec3aa06cded706d3444b9cb24fa79f2ecedd1d315ce6f2e6b95853eada6abe404cc49225ed291ef0 SHA512 6a4010f7f130b00f9819677e701496b056fbd9ee382881f2efe61877dcefae594cc8dbeab688ed99822e9335e0b484d4774a0209f47aa8527f6f95a134382b0c
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
 }