gentoo resync : 18.12.2020

19 files changed, 75 insertions, 91 deletions

diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r101.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
index 66c4e3131492..2fd5a1f8e262 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="http://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/LuaBitOp/Manifest b/dev-lua/LuaBitOp/Manifest
index 42ba42d60215..971f59fbbe04 100644
--- a/dev-lua/LuaBitOp/Manifest
+++ b/dev-lua/LuaBitOp/Manifest
@@ -1,4 +1,4 @@
 DIST LuaBitOp-1.0.2.tar.gz 23127 BLAKE2B 97b2ded135903f7bf2165a03d611fc2864336929706eb67097b5d67d0a0ec156c855a1637bc309d8dd03cb68beeda350b33eed7678b82540da54502cf981333a SHA512 a652050ea5c6fbeb8a28b05e2bc4a3550c854cc45f7f42c8c1b0a81f5b76773cdf061e6a839cdb339614118169e578b6e3efa5a3efbe59a2f01874b2fa2b4f2e
-EBUILD LuaBitOp-1.0.2-r101.ebuild 1631 BLAKE2B 2c52919195e7da8c81e2b6427fbb693af05318f8077f0272d12589d40bd806ef02e113d708df689c7bab9aa2aca036a6bfe8ed6006c40d203605a3ed31a4648c SHA512 f073997ad8187b8ae4594a12c37475d0923dec5b497354065648ef0ab35fef39f7b94945642224686f8b2974fbec72e349bb9be55a449cec0716e8b9170d94cc
+EBUILD LuaBitOp-1.0.2-r102.ebuild 1314 BLAKE2B c269057aea56127df9ee08cb46684933089116797df3dc110621a50fd389cdc15a7460fa84971ab839d7f78156ccb36867f4cb429cbf5baf43f423c15ce2cb2f SHA512 7c6856d1f1c484832398f6a1bfbbcc144c7474953e31eb069f8f4b5a20ee1062a1f3b67872f39d36be80dcf5d181fc58b27c07806e4910214d1afb6d5f5d1251
 EBUILD LuaBitOp-1.0.2-r2.ebuild 917 BLAKE2B 704b906d79e32b01ec82e5fddeb95cabd2edddc1fcb9069f893a34a088bb198c8b277b42e748bfcf5893f5cf6c8b39662b5548f5c0b01807e7c331dca74a6ed3 SHA512 b1cb3b831bc3a60f5dbb840158100c97b91c0cc9fc0f902f60921852c93296116b3977f1d197fa61aac0f562cc4c76f1290ba711e2ef03dadde8eef2336197fb
 MISC metadata.xml 359 BLAKE2B 79db34737be833f5be7d7cfcfbee74d93b016909b64a8cfeeac382b70f1ef9487630c5dc64dde58d37ae98a16d0ee96f4dbff8667d125f4d0af4a97275a72b78 SHA512 21a61aecfde180a1f2d721eefc332780f6fcabadcecf5d19a00534e65c84e8c538c988239bfc938e4c7c6a60a5915f6f685b882314067521f7c293f37197b96a
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index acc5743f111a..b431b8317fa0 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/inifile/Manifest b/dev-lua/inifile/Manifest
index 3cc7f2a0814a..fb322d02baf2 100644
--- a/dev-lua/inifile/Manifest
+++ b/dev-lua/inifile/Manifest
@@ -1,4 +1,4 @@
 DIST inifile-1.0.tar.gz 2611 BLAKE2B cdda6d9b2de45b4bec4695029018e37fe22a993afe5a54df4f4c519457d00267338de5aa3379a72dc7ab962260cd39f49674c2685799e4ad5544fed938c1080b SHA512 d0a9aa825cd5cf4a3b0b562853f3593141f537388c3e3a4334317b2536aa2dd695bdea37058d3d907aad10162bb71ef5b324c769e65cbd18e4526e37275cb970
 EBUILD inifile-1.0-r100.ebuild 645 BLAKE2B 56872cb0ccc71574d19ab5f44acf2eccd10f4ee2feb39e2c2bb409c5867a451a4abd965aca6e10c6045aefbff3e31ed406f07dbec63127112669d502e7b1f93a SHA512 8f5844e8aa6936a8c702ef8f1d1734895395346858f01983e0843895d4837f230350547aa331c58be9a20df589202184f2598e5a962cf04c1c67c0e1a46e47cc
-EBUILD inifile-1.0.ebuild 696 BLAKE2B 4f35c46a80b51447abb363ae09f1606865cb02c2abdfb418ea5f370826063c783234e4075728518f11c951423cf53c2fabf2a39b696aac0f7725484595bd5540 SHA512 5aff526d305006045861a5794b6d648553ceb14322d7976dd892a9f1568cf73e24071229de32224e6dbc49d169e24958cead64da07139d538812130ecc3437eb
+EBUILD inifile-1.0.ebuild 697 BLAKE2B 8d79f950528dd13fabb0407484ec3100d094346712801395fbad448068946d841427eaa28e4812f2d5e6375e614cc7219aa0e7df452742d120d0f3e0ec3a4188 SHA512 3a0ef75dd28985bf2234dad4d167c23665a2030eba4edc42128b37c46c55fec7fbc92211f657db2c01ded2d037b6670e9b453f170ff2692f1ed8d800271806ef
 MISC metadata.xml 330 BLAKE2B 950a8b8109efc12fe3c96d1a3a2d58371849a984e9894325b36155a3d734e8c2e644b974553e31e029d8622972d6f932a58879525e5179ad4eac9d19c0f70a6b SHA512 0bd7146b86660e03f10927c0a2efa7d6298d2345483a16dcad46fb8f2e0e8b9cdbceae2b8d9dc7c282987ee8e82210f2c27d01df4a958e6c981e807bcb4ce7c3
diff --git a/dev-lua/inifile/inifile-1.0.ebuild b/dev-lua/inifile/inifile-1.0.ebuild
index 05056d9afbd7..172de3e5af4f 100644
--- a/dev-lua/inifile/inifile-1.0.ebuild
+++ b/dev-lua/inifile/inifile-1.0.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
 	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( >=dev-lang/lua-5.1:= )
+	!luajit? ( >=dev-lang/lua-5.1:0= )
 "
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-lua/lua-argparse/Manifest b/dev-lua/lua-argparse/Manifest
index 95968685197d..bed742e12d8e 100644
--- a/dev-lua/lua-argparse/Manifest
+++ b/dev-lua/lua-argparse/Manifest
@@ -1,4 +1,4 @@
 DIST lua-argparse-0.6.0.tar.gz 36712 BLAKE2B 88882738453a894db68ef93557d870393eaec1fb2bf39b110bd2691678d26be64734d07c7f01f760d9c1d031e530707449ff2ca54a5cdd428cb8da3b1897a7e1 SHA512 7efdfab8ec563a9e7eddc7aff760fd4d3605df2896939af3f2c80e5ed4d4e5ba45a7815057e15446d242351a6fd139d6b8da802fe318d4a4bcd69918fece53d1
-EBUILD lua-argparse-0.6.0-r1.ebuild 1147 BLAKE2B 0f32e7c5dae1b3003b81d520ad5f4bb1c9c95489770ad8c1ac5f43be557081a44d24254ee47574f7e7a19c34bd73ccbbcf0ead203a1bad0768edd0a1833c1854 SHA512 3f9d982b3521430c5ed1ed63947cec4dc037de2e9fba6e86776b458f5e7cdd4bffe0027fa485539b22322d1be4dfd010c640cead899b23197d308f365781510e
+EBUILD lua-argparse-0.6.0-r1.ebuild 1146 BLAKE2B 9cfb9a258f818db4869c075bbe757361f3552b007900a1496699ebb901c316040c18ebe8eb05f5a4dd124de31c4f453a921a1f603138536939684a99bcd26863 SHA512 48412b9233c86bf6d88e89cb0f8625f9b702a1a80ee85b3d04befd8fe1a5afeedc1ad8e72f8821dde04fe31c8daf506ea87127686d5b1cb1e5f5e69029bc236f
 EBUILD lua-argparse-0.6.0-r100.ebuild 1138 BLAKE2B ada852b0d22da5c1dda57dca8042d65312785550c4e1e4210178f04f695d1a2e0eed1c89ffae1ae0b94167aea1a9b4b95325e51fd806e69c7f8d8bd4d48e5388 SHA512 b89d6782f57a4798b0efcf209853c9e9d9cc9c820f5d307260ccb9f84dd1475c27a554722a60d01c14cb9da6096fffd5b4f619d8040c8fee4436a073a7cfbfe4
 MISC metadata.xml 862 BLAKE2B c7ef04527672d2faaf171382d0a9860d94f881545141212212b55ab627e6ef0e681a0118fe9f92c5799578340b9a436de3fca41b47ae06bd998c5cb66ac85eb6 SHA512 53d6abef7c0a9085ad75ee1abfa079e6acbb3a9b9f69fb361e961f7e9cc0d294db1a35bbe33b05684888b782ec37609cb549a2f13c474c08949e0538d99ffa0d
diff --git a/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild b/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
index 0a45d921f67a..f17a8188bc05 100644
--- a/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
+++ b/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mpeterv/argparse/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="doc luajit test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/lua-utf8/Manifest b/dev-lua/lua-utf8/Manifest
index be47345b4118..6376c8c13e27 100644
--- a/dev-lua/lua-utf8/Manifest
+++ b/dev-lua/lua-utf8/Manifest
@@ -1,4 +1,4 @@
 DIST lua-utf8-0.1.3.tar.gz 41830 BLAKE2B 72982c7ec8d8837e391fa6bfb689c1e9f4a7746d0cbc058556f06027b4af00c936036f87baf58f45e1169fd3ea7e6d8174629d5a7279205622cf0710971ca29c SHA512 d0abe73fecbfeba36083c135d77962d953ad9e431721a2557669c912a2703e31c46f84f2ee9ee4ac966a5bcc88d4daef930f8d2d8e72106fa61010509c183e29
 EBUILD lua-utf8-0.1.3-r100.ebuild 1483 BLAKE2B b6a26a8189ccd3827be307d6be311fad82860c47c168cf382174933ed479071f359b046080fe4870076d87b7aeab3ab14c908749cc608d0dd17dc721065df19a SHA512 3c5666cc402e5f6fe71de35209d0ada6bb81ae1bd23d1c1bb753cfb76728c64c00fb4b755faed5c26fd52dd67348f3bd0a715f46db8d41a37862229865648e4e
-EBUILD lua-utf8-0.1.3.ebuild 1349 BLAKE2B 7a294e8656fec4bb7c97f54d097927c64d4696cb57d720de37ca191c9200baf13dc4cc938ca65ba1cc09bfc875bc6c13c522552c11be4aac41d7c5afe7b296d8 SHA512 32afd12f4c12dea25be60c0006058e78f9097598530eca2f01abc0a062e021fc1651c5a897336e287003b3e1d1db0898a3219e557a3061966679752d66c19d2d
+EBUILD lua-utf8-0.1.3.ebuild 1348 BLAKE2B e67ac408b457fa7b8d3228f63e62ccfbda4addaae4df8a4f4ce73bf30dc7a06aaa2c5ddf7706ef1edd24ebc5de8ec55f2ba7adac1db80ae32ff19f1d27a84d2b SHA512 eeeb848f9a1d5ce2e4f553005cd6f45ceed6c60eb93538167e22c0777d73deb94cdf1087db0167873b9844e2f6ab1bcb70e110e2a99e2d0d1cfcb1a791994935
 MISC metadata.xml 750 BLAKE2B 95215f3aed5389197a071e67411702a07102387343c568c02b48ada5b2f3c0f01b99bb895bd4f11e2c558fc7d352da1afece2b46ea6d63edbfa322ccc7c651cd SHA512 cf8fd4d207d9827fb1a7349f89fa0faf0d1ad38989ebc29dabde5dcee73e718183655a1b8c9f0074f16ea7878bd1d4dbf7e53f65f5003946fddf901c9568d4cd
diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild
index f41c166ac3aa..71e19b9f460a 100644
--- a/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild
+++ b/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN//-/}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="luajit test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/luacheck/Manifest b/dev-lua/luacheck/Manifest
index cc05c8ebe35e..95d5d9e03a33 100644
--- a/dev-lua/luacheck/Manifest
+++ b/dev-lua/luacheck/Manifest
@@ -2,6 +2,6 @@ AUX luacheck-0.23.0-disable-measuring-performance-test.patch 446 BLAKE2B 42c83ec
 DIST luacheck-0.20.0.tar.gz 132693 BLAKE2B d485ef841c00241023a9cb9bd0e1f994da3b5e79dad01281e0203e1561f788f8d1e8db97910d3a82ab3daafb3dceef1fe2897beee9f16e71350fdff27eba7fe0 SHA512 08b1a64849b329e6ad71b1d7011fac0833de068641270adaa009e9a17139968ab73add3786a508a8787ce1fcfe1f028a35b5434221e4f1f62bea56833e0e65dd
 DIST luacheck-0.23.0.tar.gz 158201 BLAKE2B c0780143a335b1deb7725819dbdac03446742fd459eed5a6de0cf3de5576f3be5379ff7086348b8880eba70dd5f7a1e719e9a09fdcc70abc293e1636f575ad57 SHA512 d76e4b22f1e9d868a8531ad51fb98607e5bfb1fbbd55053105d9978ba6c0455de99202c53d4e199733ea997863b26527fb84e7e9717209fd588f1d02db9db028
 EBUILD luacheck-0.20.0-r1.ebuild 1058 BLAKE2B 17d25640c64b9a53d97e8419636095121d5e95507ececa6872966c78e080c3eda19dce658122aebb65bba737a75c36de78599e3eb8a364eb03e452928599de31 SHA512 715beecb4032116aa52093df41e886159d1bf856ea05bbbf281926cdcb0631852ffe382f3ec387538f3f8daded32a2983d8bef29e66922c25a54296ed0e73d21
-EBUILD luacheck-0.23.0-r1.ebuild 1245 BLAKE2B 568fbade223112f4e081765806ab6a92ecc0f913627995a44b12734b978f0cbb8e6fbda427760735e713cc14a0748488957703bd1aeedf73b5f837854da20b99 SHA512 322e9564e864a389464010ab47ad8fa0f516e6efb3e463ad26714be7e4fa80352b57eb031216b402e5b976e40504310a2434dbf20bd6e4d2ef810c28794286a3
+EBUILD luacheck-0.23.0-r1.ebuild 1261 BLAKE2B b7f762328472e85f6e01348dfc8fe30e2d789d6e1ab7d1f8eb32814b17dcece44aa919ced3c9a2517f1e85917fc378abedb9f0a85085e0b2b30abe20b8c1f31f SHA512 980922963f9ad6579ede99b9fd991f7e8bc85c4e85ba0e892a617da875d6004c2804c0a2194f726121c01746dd0cdfa3d1981bbfe35464db7f74930569d3f940
 EBUILD luacheck-0.23.0-r100.ebuild 1233 BLAKE2B 0f0c4a4a006df2c9060edfb516f39523165f057b43fa2fa133344993a7221b1a247fe682893c858b7d31f21f5b81a6cbfc5049aa88b138c445832db2d144cfc4 SHA512 cbddb5dd61591e2caae6d78f4a4b5cf04625b809f7e0717cbdfa8f4cab311426bdba711e6d215f5d5f61c4959a6594e269279d5506ca185c84ee65498a019677
 MISC metadata.xml 829 BLAKE2B 76e2e67f3ea5dc70f37a6f3e54a6afc12de689026de589b9d644766c443b62cd66068db5c56d3e63312920adb1d2ecb74a1b2515c4f36790dda650a499a81589 SHA512 c27495f97fda460389d0cc74fa97839ea0837f62997ca3e1b5ae4b70bb7d78f15d81012fc151c1c11ec00079e2ebc1121c61bdd86cbaf137e7eeccf5207e63f6
diff --git a/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild b/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
index bad05ff91e43..65aafbf27635 100644
--- a/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
+++ b/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm ppc64"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~x86"
 IUSE="doc luajit test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index f79aa27f893f..db5ec3093f9f 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -3,8 +3,8 @@ AUX luaexpat-1.3.3_makefile.patch 621 BLAKE2B 8c04a2324668ab13e2279df8754c64d5ff
 AUX luaexpat-1.3.3_restore_functionality.patch 3944 BLAKE2B d6e502f44039110cfc8eabc3a83405b0c72522ec43628af16f72d21d0976d617e7280818259258c15cb8582f917e5fdadd81bc2ce35c052a951fec0ccd200e5c SHA512 f6e56fc84550af781c40d8bd004c3f840021a730cccd988f5547b83e2ccc89072ebd09f49631442b25fac8a81a4d7e7f5d4163d7f62dedc876356dee94d96b41
 DIST luaexpat-1.3.0.tar.gz 29567 BLAKE2B 176cb107e6047b15338ff45751af82389920e4210d40bd0b4400e549130a4983c843f7a64bb7b2fba37e36eb592e850d06efe196f8e837e79e50c8d135dbe763 SHA512 91884653310e2dc89ade6d1653875ac8607640a21853d3ccb1fd0f833812e41981fad5c40101732ec249104d2c50c9a332208d1e44423b8428065a223c60b4ae
 DIST luaexpat-1.3.3.tar.gz 32099 BLAKE2B 7fdec97932db4f7d582f651b9a7215f2ef0f6e23022d4013f37e62a0ba3e257e44211266ee4cbbc84d190bf9828e0e028ab3eecf9fc6e619ae3175fd5fe23ddb SHA512 aa3f730c64cae3791fc1125302178ec2398d2380e8ec0e65ca4b29f532f181f149baaf555bf687e502b28726d3fd0baafd4f73cf26f04f625d18bbaddb043d63
-EBUILD luaexpat-1.3.0-r101.ebuild 1581 BLAKE2B 816e833cbb778c2316bf85bb153113cb1d16ccbc820e2be64c17ea71d2c5467726d1e5e9cce7da19bb01b9608558befbb384e31dc20956201a4563efbfa22f70 SHA512 593005ef0cbea267297b0b9d124294b557392235e911b62ad3e34614874158e4b9b348b54a59196d5e0642e2e49100c35e808f1fb772c191f216324226b137b9
+EBUILD luaexpat-1.3.0-r102.ebuild 1307 BLAKE2B b6d868b911198feb7e43feb4ef33076315755c776f64953967efc0b8ef56405ba4acdbfa121d2a572a9ef00f1329182d7438378a2e720a7908b3a275d5314c45 SHA512 4b0ebeb8fe24b4644e3fab77972be0a51aaa4ecfb3b7bdc72d8b11ee7d268677bac2b42d219964a242c232ecad6cb6ae834588cf7f3afa6be7a7a8a6984e4b69
 EBUILD luaexpat-1.3.0-r2.ebuild 1174 BLAKE2B 43efb15693c8c75e115e8976d125a9fdf5c4b30250ac5dfdd9b4c1e5044a5545461203507077e4b8de9d2902808e130a5567e9b881cf22c2613327f16e387e6f SHA512 2b6e0ab5b3b71124b5441776e3be1531a14897ade4c956e68242bea53e21da375c010375471b942d1f1d6cf5e2f56c65ad1fa0bb408825bcae3644de6b8daf20
-EBUILD luaexpat-1.3.3-r101.ebuild 1695 BLAKE2B 7b1dfbc44dfef10261a7c29c6ee79ba746895acf18989c6a632f93e9b3679130192777eaf862fd0a782152165ff8310416fc76a32d1430df34d04453991ecce1 SHA512 5445507e3d85b63e7abfb716e62f7215bda602da4533070b5d97ad977a4a5d1c15df7bff20ac81bde1b1b1c6d0e7bbf049f7834a7e0c0c4940600855fa451010
+EBUILD luaexpat-1.3.3-r102.ebuild 1421 BLAKE2B 0738c3281a1c145b0d5f86e22721075767579a95ec47083db1d5e20d54cb9c391b482c4db403b5f0da10fac5e455e55437b3fc98889626e8e83b2e82478e8b29 SHA512 059396e7178f0d0ec9caedd1950d0995c3ccebdadf016c72afc034cd3dc2556d3fa1122c54827b49786a55c68a2aa5e8bf62826c4505cada30316db4028b164e
 EBUILD luaexpat-1.3.3-r2.ebuild 1265 BLAKE2B 3ddd7ae3f5a75fac07bbb465dc1477c59f6ac950b3cd3d2ef1171444122788d59b4e0e2d865590b52e4e6ecbcbbd0be67285b4137de3a41e3039344c1a6d764f SHA512 681d5ee8233e60ae96d84f6315c9886080dd211bd55c8e3ceb89b679221c0d3bc8871bf96ee8b91c24fa12feecca6f213e6e0f91de94b9b102e4308130ee208c
 MISC metadata.xml 575 BLAKE2B d4d3ac883ccfd199e985d1d78be584a14b0233550e41142bdfeda2243d514476daeef6b47d2ccba16525eccc58df0ec58215b810b995d0b83df53c6de58a2895 SHA512 5d1e6633bab522940d2461d230f3eff660d3c0088063ec82c7506aeca071a553d63893851968c20f4073bb2fb554e63deb2da54b405a4c75923e77f4286fe578
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/Manifest b/dev-lua/luasec/Manifest
index da68d007ab15..ea600f388075 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,5 +1,5 @@
 DIST luasec-0.9.tar.gz 52163 BLAKE2B fa95ae63b36f138f923dc412f527ff527e4f7562ad177ca7f450ef889e75c204d1bfec3773523fb68865c3846a0edc583cbf903db5233ff080074147f33bfb30 SHA512 ea601016328232ca0ff12be72897eeedac88a78834a63e1c36d2828a3187039665a2c60597b5af1fa6917b6fe87cd292fbcdfabcd67bab968f587e038d52a933
-EBUILD luasec-0.9-r102.ebuild 1569 BLAKE2B b1b658be0eea29ee65475958bc0de8460df7b2986322b37c71be4fba912d963dcc11e973dd891501fd2e1d596d10174e4289c5c7fa8a8575440a865e42c10ebd SHA512 02c167d22737553543c7a17cc5acc2fd256f4976185f371f15046ef46b8334576566b5dce7d3504bda8bb760c03b3c22dc7ade18b8c95d63f821efbcab5ab638
+EBUILD luasec-0.9-r102.ebuild 1579 BLAKE2B f92dab9a7a7823ae8c738dfc03449ac9f2f22434db28042ca823ebe79c94dc89a375d9ccbcd11bbe3da8b17d216150d3b71ea56594b0726c98855963589718c8 SHA512 3713916efb58a7989c9728322a9f5996f93d9aff1d87f47c9df7e15936ee50d532fe58b23a0f166e2512da13ab11bc8a3dfd8877b379561d8035f3483d9aedca
 EBUILD luasec-0.9.ebuild 997 BLAKE2B 5e7ce2c2a4a1168fb844890fc586b6ee5a3d87651910b8d5c70bd3309cd8ae8796b1b77f9ea3a6c42accd4c912048b9de7ed320c2e2147ed000d1aa9a70260af SHA512 ca19f37bc58becf4f8b592f223c5588146cec6821f6c5ca0c9689419ca57795b6fa4b636841bf9f44efaec4aa751230a9f695d9faabb20e1e9acc7f7d25764b2
 EBUILD luasec-9999.ebuild 1103 BLAKE2B 8d32013bb83b774b57beaeebcdd2687c769c34672be5cbf343155954417850592071591b985fd1771fa7633888a2977c0d92326f5e31732ff7ea141b43f55c3d SHA512 c6c9f13f1b8e62b3f1b4ae06374cdfdd6a99fedbcc61fb4bce8911254e9d295fbdd0f7637ef220a0acc2250a7658e29fb91e0182bc50542e49de51b03bc0cc60
 MISC metadata.xml 566 BLAKE2B 2a450b74b0f44833f841b701e215721f4055b44a66e43f649e69a4f1c9757985a09a99f8798e7f219349c190f2614733aad757d81e11f610885dbc0fe08b6e6e SHA512 f02b7d7234f4a6d93cd9c734c1b8a8a09b48fb73998d240925329357a6e9dac590aff6ccde697d18698fdbd6f2c69e4d6f5e983affba91b5a84f4f3108e3d660
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/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
 }