gentoo resync : 29.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-29 18:03:51 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-29 18:03:51 +0000
commit: d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch)
tree: 1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /dev-lua
parent: abaa75b10f899ada8dd05b23cc03205064394bc6 (diff)
125 files changed, 95 insertions, 2568 deletions
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
index 2fd5a1f8e262..617860f3937a 100644
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
@@ -72,7 +72,8 @@ src_test() {
 lua_src_install() {
 	pushd "${BUILD_DIR}" || die
 
-	exeinto $(lua_get_cmod_dir)
+	mycmoddir="$(lua_get_cmod_dir)"
+	exeinto "${mycmoddir#$EPREFIX}"
 	doexe bit.so
 
 	popd
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r2.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r2.ebuild
deleted file mode 100644
index 67165da21a3c..000000000000
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Bit Operations Library for the Lua Programming Language"
-HOMEPAGE="http://bitop.luajit.org"
-SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	multilib_copy_sources
-}
-
-multilib_src_compile()
-{
-	emake CC="$(tc-getCC)" INCLUDES= CCOPT=
-}
-
-multilib_src_test() {
-	# tests use native lua interpreter
-	multilib_is_native_abi && default
-}
-
-multilib_src_install()
-{
-	local instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
-	exeinto "${instdir#${EPREFIX}}"
-	doexe bit.so
-}
-
-multilib_src_install_all() {
-	dodoc README
-	dohtml -r doc/.
-}
diff --git a/dev-lua/LuaBitOp/Manifest b/dev-lua/LuaBitOp/Manifest
index 971f59fbbe04..97ed41ff1c84 100644
--- a/dev-lua/LuaBitOp/Manifest
+++ b/dev-lua/LuaBitOp/Manifest
@@ -1,4 +1,3 @@
 DIST LuaBitOp-1.0.2.tar.gz 23127 BLAKE2B 97b2ded135903f7bf2165a03d611fc2864336929706eb67097b5d67d0a0ec156c855a1637bc309d8dd03cb68beeda350b33eed7678b82540da54502cf981333a SHA512 a652050ea5c6fbeb8a28b05e2bc4a3550c854cc45f7f42c8c1b0a81f5b76773cdf061e6a839cdb339614118169e578b6e3efa5a3efbe59a2f01874b2fa2b4f2e
-EBUILD LuaBitOp-1.0.2-r102.ebuild 1314 BLAKE2B c269057aea56127df9ee08cb46684933089116797df3dc110621a50fd389cdc15a7460fa84971ab839d7f78156ccb36867f4cb429cbf5baf43f423c15ce2cb2f SHA512 7c6856d1f1c484832398f6a1bfbbcc144c7474953e31eb069f8f4b5a20ee1062a1f3b67872f39d36be80dcf5d181fc58b27c07806e4910214d1afb6d5f5d1251
-EBUILD LuaBitOp-1.0.2-r2.ebuild 917 BLAKE2B 704b906d79e32b01ec82e5fddeb95cabd2edddc1fcb9069f893a34a088bb198c8b277b42e748bfcf5893f5cf6c8b39662b5548f5c0b01807e7c331dca74a6ed3 SHA512 b1cb3b831bc3a60f5dbb840158100c97b91c0cc9fc0f902f60921852c93296116b3977f1d197fa61aac0f562cc4c76f1290ba711e2ef03dadde8eef2336197fb
+EBUILD LuaBitOp-1.0.2-r102.ebuild 1345 BLAKE2B 100654501e8d615cf556b467783a074eab04322728ba5062a59966316e23309fa18447d3cdd5b3a58450cc04d575efd6b504998c6da66f8ca21aec426c3a51d5 SHA512 8a6b78194136eb82c68fdc32b6c9c6fb7e09d0f7b4fbf385a04cd6240466655e8f22f28dd60fd74e1a55a6931b217869e5741e2e3e3fb5e13b87071e645ab4ae
 MISC metadata.xml 359 BLAKE2B 79db34737be833f5be7d7cfcfbee74d93b016909b64a8cfeeac382b70f1ef9487630c5dc64dde58d37ae98a16d0ee96f4dbff8667d125f4d0af4a97275a72b78 SHA512 21a61aecfde180a1f2d721eefc332780f6fcabadcecf5d19a00534e65c84e8c538c988239bfc938e4c7c6a60a5915f6f685b882314067521f7c293f37197b96a
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 218a27d07362..51fd104c6239 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/busted-htest/Manifest b/dev-lua/busted-htest/Manifest
index 1cb0951a258a..4093debd9c00 100644
--- a/dev-lua/busted-htest/Manifest
+++ b/dev-lua/busted-htest/Manifest
@@ -1,4 +1,3 @@
 DIST busted-htest-1.0.0.tar.gz 4347 BLAKE2B f1d30a305cb9691588b18f67842b536d3de9430d22c51ec292202e5aca5784447cd525ae8b1f1da42a3d3792344419efbfe1d03fe29823b445a7c1ead0fe577f SHA512 001f494949c04445004e8b06fde62727cab85a320673748d18714b82d7b2b9aea43316f6119e669c569f31578b787f4e5ca5d19da3f33fe28df572aaa41c75bd
-EBUILD busted-htest-1.0.0-r100.ebuild 660 BLAKE2B 99818fce2a5f16ecb7950ff57232deb71dac7cbceb238315e8ad6349cfff37b0662859e8c8907badaa7db38cb934b964ebbb6499050e98b40665fee875796f30 SHA512 64a307d432b249d0c63cc3d9fad42c384aa999888afb31e6c97359525a7e1b1f4ff545def8b5db7f4f22aaf945217931477af5feec0d4ec79287825c63148a86
-EBUILD busted-htest-1.0.0.ebuild 689 BLAKE2B a3b1e62aed5e4c9191e07c7a7c00833a4213002ecb5356c0de236b27223df40fe3d3acab2dfe328347932c617e94ae2b4f3f8ad137e173e29aa87eb09acb2e0c SHA512 e0f268246b55e23c144e992aea4033a94c66e78120e829c80222dd99706f7551cc346801d8955eb6c06df73dd7612da4d6ead4f439f6cd47c498fc09266b9283
+EBUILD busted-htest-1.0.0-r100.ebuild 656 BLAKE2B f4b84592a81765eeeeb11d93f8f497cafa912215ee044fea90a7b064958a109a015d6f1d303209dc80c1f747badaf3b4ac2e4d9a4db243664d45300108423606 SHA512 cd7de5d5f9c8b0d897607e72ba218ff546a6b072a11e77e2f4668a6cf2d120fa61c5ba18974cce54cbee0af430a0516bf07a93969a2201cd274cfcb7532552e2
 MISC metadata.xml 445 BLAKE2B d93949e732dacc208367a75c8a25a742a01e4c4f4fa489341ca788749164c34407f730c907629b85cf24df8d0f18840f5b7c65f9f215116987c287b850b58d96 SHA512 c1e94898a7dfc55ae498125a643dba08184f5d5cf0a8aa6cd935b90fee365cd5c59c21f3ac4918d12d2b805beb461248d061c9d2101ce561405e130e95177262
diff --git a/dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild b/dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild
index 66a5ea1eca4a..b10cc0779e3d 100644
--- a/dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild
+++ b/dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hishamhm/${PN}/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"
 
 RDEPEND="
 	dev-lua/busted[${LUA_USEDEP}]
diff --git a/dev-lua/busted-htest/busted-htest-1.0.0.ebuild b/dev-lua/busted-htest/busted-htest-1.0.0.ebuild
deleted file mode 100644
index 7007e6d3c37a..000000000000
--- a/dev-lua/busted-htest/busted-htest-1.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Pretty output handler for Busted"
-HOMEPAGE="https://github.com/hishamhm/busted-htest"
-SRC_URI="https://github.com/hishamhm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="luajit"
-
-RDEPEND="
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( >=dev-lang/lua-5.1:0 )
-	dev-lua/busted
-"
-
-BDEPEND="virtual/pkgconfig"
-
-src_install() {
-	insinto $($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))
-	doins src/busted/outputHandlers/htest.lua
-
-	einstalldocs
-}
diff --git a/dev-lua/busted/Manifest b/dev-lua/busted/Manifest
index 1b23e0a9fcd5..a64cfb7c20f9 100644
--- a/dev-lua/busted/Manifest
+++ b/dev-lua/busted/Manifest
@@ -1,4 +1,3 @@
 DIST busted-2.0.0.tar.gz 55002 BLAKE2B 39a3b7bf156911e25f94020f9e56b3f43b9f02b910a9d1c1f288dbdb83e5d53253d5b40d73df655844ed683cff7959d42c330c0d061db918385df07870e16da3 SHA512 3151694b1fba1acc52e3bcfee0231008b14934e89da5885d7e063c6f023479c42040c42a8c0aa6ff1f8303ad6b2a70f0687c8a218830de7231007ef8748457bf
-EBUILD busted-2.0.0-r101.ebuild 1164 BLAKE2B e9471ba350b1db8aa488505150e0b7ea2bba586fa212de7871a54460d64664100e72c2652f44570f2102c1a924ee42d38168cd76862812414ace79aef8f75b62 SHA512 30c5a0554dee9e3769c4444918271cdd69ff041cf483f7e204db09272d96111318d38a59e07d24be756f034953ee1e8b1f29289408d3ff4f172db1006fa89bd2
-EBUILD busted-2.0.0.ebuild 959 BLAKE2B 7a770ecb161f7953e003b0bb40e6791d70e7e67b6c19c26f200f8f4eff75e8b0e401a619e79fd155c360d7f066e7af57eb6d3fad2e5cd3d27df3bddb56e4e57f SHA512 54a0170d9d2c6302a2c6630306f03be837f61832015d0574fc35776337ca88754180e3167abc6e576807e196073e3e7e43d7ebc1d942f815a2454ab2e290223e
+EBUILD busted-2.0.0-r101.ebuild 1158 BLAKE2B a2600473a1d2000dec9f8ddf08b8a7f663e38dfa346a7041291c60abb780ba64f792dbb2d6efc8f9136da31c7feeb25a9e97fa3e8f8363557106b8d7e7c21064 SHA512 3a6f034c3466f4f57666a6e1fdce3fffe0897b64fc46bbc4716811b5fd503f66b359eee984a0c441d9a4f9845556363788dbbb1feae132acfd2526cf734de428
 MISC metadata.xml 753 BLAKE2B cb7d80aca20864ef7d138d3834011f666775dfee6614f6d233675824c1715ef5f893402532b0d8b928cd7aa1ecb53e3216150c22fbc9d6a21abf3251a10905b4 SHA512 3bae03d1b27087507aa3b8b4b4365a607256c1c0b9cfccde4bd42c946674feb5325715c0dea925aebfd941ab62c6a2b4bc4bd7a5f0c0211f49c4e2fb45ead48c
diff --git a/dev-lua/busted/busted-2.0.0-r101.ebuild b/dev-lua/busted/busted-2.0.0-r101.ebuild
index 4ccbce376e4f..b5ae27eba597 100644
--- a/dev-lua/busted/busted-2.0.0-r101.ebuild
+++ b/dev-lua/busted/busted-2.0.0-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/busted/busted-2.0.0.ebuild b/dev-lua/busted/busted-2.0.0.ebuild
deleted file mode 100644
index 69f13190ecd6..000000000000
--- a/dev-lua/busted/busted-2.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Elegant Lua unit testing"
-HOMEPAGE="http://olivinelabs.com/busted/"
-SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/lua-5.1:0=
-	>=dev-lua/lua_cliargs-3.0
-	>=dev-lua/luafilesystem-1.5.0
-	>=dev-lua/luasystem-0.2.0
-	>=dev-lua/dkjson-2.1.0
-	>=dev-lua/say-1.3
-	>=dev-lua/luassert-1.7.8
-	>=dev-lua/lua-term-0.1_p1
-	>=dev-lua/penlight-1.3.2
-	>=dev-lua/mediator_lua-1.1.1_p0
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		>=dev-lua/busted-2.0.0
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	busted ./spec || die
-}
-
-src_install() {
-	dobin bin/busted
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN}
-	doins -r busted/*
-	dodoc *.md
-}
diff --git a/dev-lua/dkjson/Manifest b/dev-lua/dkjson/Manifest
index 53617a49ef29..dd894dbe72a2 100644
--- a/dev-lua/dkjson/Manifest
+++ b/dev-lua/dkjson/Manifest
@@ -1,4 +1,3 @@
 DIST dkjson-2.5.tar.gz 15799 BLAKE2B 25cf9aa3d00d87b367096dc793984766d7777c98ec9e97c5bd72961fb0141bb1ae94682f3719d11bde52104a755636de546fe8aece0fbf7147045175ad8bcea9 SHA512 ec9a226c3a94d7561f8f51bb0e6c92a64385b0d8baf83de862cce7e1c302d900bff723be23e4b5b4c3c2accafaf8d75d4b0842e14b2e41390a3f9761d46a38af
-EBUILD dkjson-2.5-r100.ebuild 902 BLAKE2B 9ddb8a911be85a491e9ecc5d429a78660ff456a635c5db1187c15ca8ad54508bc660cecacd8cd3b96b5dc4e48804648207cb0808be3c32db414b09531cd8cba6 SHA512 f5e74c8bdd4b2551893e95fed020346ac03bd3caf19e656309ba55a3dc671fb5bb98a2e5f0a87632053591067f3a1eed7e1dca87e0b1cec4b0d7cd08eb1ea0fb
-EBUILD dkjson-2.5.ebuild 649 BLAKE2B 7aa8243692aae910814ea3f563f38f935a155003a5dedb4c4f12ccdd9777a63bfb0a1107ef630e26883da05e229f1a436afb948f5a369e9a6985738534f48572 SHA512 4df3da6f64024447e403d1f9e930d0390ab78e6f766ef0261efaa7524d01c76312d7d4d1710258169c27d7409ed80174cc93c206a4c95e7c54b75a8c2ee7f2d4
+EBUILD dkjson-2.5-r100.ebuild 896 BLAKE2B 4ef449b4cc0b72fe50d3a66be8cbd7b58f6d1a23b8b6baa41a68832be06af8ce18ebc6ec7a65277d14f6576516ad709b5d863306417efdd3df0463dad6059b2c SHA512 6de2036313857160060e69bee03f271a9f39492fb2891a1fbcadd08b96919b90cb85b5738a74712dfe2d1227914cb6c31e3e7767ac870a2988ca1883923b1c6e
 MISC metadata.xml 721 BLAKE2B db84f905a38fcc1a3b8a19a2fd94dcf66858fe34e0f751bffc0163e4011a3457a8064d36d5cf84366f98e63e2f6b1a0fbe49846412318caed9a37c5c1651910e SHA512 01b562a7ecb7f86455a1934d85ebadd6932f69ae22c642517bbbf6abcd5d6ae28596be99ad4909588d9f22831c834b1c638ba33ec4ec24b4fdeabfe71a215eff
diff --git a/dev-lua/dkjson/dkjson-2.5-r100.ebuild b/dev-lua/dkjson/dkjson-2.5-r100.ebuild
index 6c81b1358241..655686d2b1d9 100644
--- a/dev-lua/dkjson/dkjson-2.5-r100.ebuild
+++ b/dev-lua/dkjson/dkjson-2.5-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://dkolf.de/src/dkjson-lua.fsl/tarball/${P}.tar.gz?uuid=release_2_5
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/dkjson/dkjson-2.5.ebuild b/dev-lua/dkjson/dkjson-2.5.ebuild
deleted file mode 100644
index d39eb62708c8..000000000000
--- a/dev-lua/dkjson/dkjson-2.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="David Kolf's JSON module for Lua"
-HOMEPAGE="http://dkolf.de/src/dkjson-lua.fsl/"
-SRC_URI="http://dkolf.de/src/dkjson-lua.fsl/tarball/${P}.tar.gz?uuid=release_2_5 -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-lang/lua-5.1:0=
-	!>=dev-lang/lua-5.4"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}"
-
-src_install() {
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
-doins dkjson.lua
-dodoc readme.txt
-}
diff --git a/dev-lua/inifile/Manifest b/dev-lua/inifile/Manifest
index fb322d02baf2..7de104358b62 100644
--- a/dev-lua/inifile/Manifest
+++ b/dev-lua/inifile/Manifest
@@ -1,4 +1,3 @@
 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 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
deleted file mode 100644
index 172de3e5af4f..000000000000
--- a/dev-lua/inifile/inifile-1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="${PV/_p/-}"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A simple and complete ini parser for Lua"
-HOMEPAGE="https://github.com/bartbes/inifile/"
-SRC_URI="https://github.com/bartbes/inifile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="luajit"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-"
-
-BDEPEND="virtual/pkgconfig"
-
-src_install() {
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
-	doins inifile.lua
-}
diff --git a/dev-lua/lanes/Manifest b/dev-lua/lanes/Manifest
index f0742d39db51..5e9473926e63 100644
--- a/dev-lua/lanes/Manifest
+++ b/dev-lua/lanes/Manifest
@@ -1,5 +1,4 @@
 AUX lanes-3.13.0-makefile.patch 2909 BLAKE2B e2325494fdf3f54923ed29cc66e80443a22be26cb7352b1fcbe46d0df7983bda958874e5a8a4156a65c9f2cc019fb7a6b6ed8da8652aa6d45af63f787ccf828e SHA512 ad3b7456a6c68043974ffcc1e1955b96364461b90b1edfa32f50ad48a3aeae9755ec8f756303f5e7c009f6c3e07f2d2c6bcfadc7e484d7a6e140b59e55b5d5a7
 DIST lanes-3.13.0.tar.gz 247978 BLAKE2B e330f3648e865b8b7c1b77061b6a8210f46e1db650066736afe62040dbb20c7e31e0037b420fded8fb0931cc2ac59687e2039fb31f43c1bdf0cae8cd3c031307 SHA512 bb509181757fa2b4f07a55962015b35ca6bb867b18ec89dd655f333babe2e12f56479fa85bc98e0dacf5bec2a523265bbc3a978396dc332dc1fdda4df760b2e5
-EBUILD lanes-3.13.0-r100.ebuild 1404 BLAKE2B b96e9fa333fb440ac806e6213b210d77e74c7cfdc56d537f36f2f147ae5a8bef0ee74bedbfcb0b9f0a04e7895d4b14d38c44ed658818e022755f8f4a3fbb1379 SHA512 d1b9b4f665b87796b4b7219668955965587ea94c568c43e4ca8e15c87eee7abddca000b628cb735fbac6e200f8ac89d856f93746a8ec21afa3ea228aaf7f9172
-EBUILD lanes-3.13.0.ebuild 1311 BLAKE2B 78623115fcfa991661de738f2ae04b4edc92013017df7fb9808c7033f259ddfde50fdb5400a2a7942ac258ff70990d3eff4a738e5d653788d28fb530c103dc4d SHA512 56465683cb4e4cb005e5bab98e8b91cc8303dca9b1cf574608fa9d466e30d562c80c3e10e4ca7b131849cdd1ba50ebc524b92034fd13be4a39ba0e4c3c2cd16c
+EBUILD lanes-3.13.0-r100.ebuild 1403 BLAKE2B 0db71b93278a1b1aea97c9170e926eba64c23d9934137f1ff28e8370a0adf5d8907e3082860ba02268b091739d8778386530f46f11bcde49fd73bd8e6b266245 SHA512 cb270d5a0d2624a15098f9ab7d71e8f06fca17923ebb6aee92513df573fbf73429a1b5fc87844b658011e218f806068f7fd633e67501f388f95a22fbdae8470f
 MISC metadata.xml 438 BLAKE2B 7edf60b96d12fe2b577ca5665bbfe053830e53f4821f50b14467e025472db68cdb0d7c4874ff03c882d710d9180ac170beb9f5b07e1f021dc9c576645d2606a7 SHA512 d9258d0d00639649436ae8877e4856309332ad07cc765f228f17b1be79fd2c876fab0bd5a303e1a77f64b9951d5e109126dc6baa5cd92da197202895d9528138
diff --git a/dev-lua/lanes/lanes-3.13.0-r100.ebuild b/dev-lua/lanes/lanes-3.13.0-r100.ebuild
index 3c7d429b112e..c84c439e91ad 100644
--- a/dev-lua/lanes/lanes-3.13.0-r100.ebuild
+++ b/dev-lua/lanes/lanes-3.13.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/LuaLanes/lanes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/lanes/lanes-3.13.0.ebuild b/dev-lua/lanes/lanes-3.13.0.ebuild
deleted file mode 100644
index 0a88a310fdc2..000000000000
--- a/dev-lua/lanes/lanes-3.13.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lightweight, native, lazy evaluating multithreading library"
-HOMEPAGE="https://github.com/LuaLanes/lanes"
-SRC_URI="https://github.com/LuaLanes/lanes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:0 )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${RDEPEND} )
-"
-
-HTML_DOCS=( "docs/." )
-
-PATCHES=( "${FILESDIR}/${PN}-3.13.0-makefile.patch" )
-
-src_compile() {
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LUA=$(usex luajit 'luajit' 'lua')"
-		"LUA_FLAGS=-I$($(tc-getPKG_CONFIG) --variable $(usex luajit 'includedir' 'INSTALL_INC') $(usex luajit 'luajit' 'lua'))"
-		"LUA_LIBS="
-		"OPT_FLAGS=${CFLAGS}"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_test() {
-	emake LUA=$(usex luajit 'luajit' 'lua') test
-}
-
-src_install() {
-	local myemakeargs=(
-		"LUA_LIBDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
-		"LUA_SHAREDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	einstalldocs
-}
diff --git a/dev-lua/ldoc/Manifest b/dev-lua/ldoc/Manifest
index 033ca44ae979..3681dd271374 100644
--- a/dev-lua/ldoc/Manifest
+++ b/dev-lua/ldoc/Manifest
@@ -1,6 +1,5 @@
 AUX ldoc-1.4.6-mkdir.patch 230 BLAKE2B 672617f3a20ff6f74be02db5402288b4900f2d9d52a433ec9085f2fd2ce629609b9803732c50da6da252287efc7280895c2d3ce64ad4a30cf017e893ea2c5638 SHA512 5c047b48c987d107cf810dffc615ce29e5f2192b927fa91260dacbd2daee92c9aac5eeee0bfbccd9972d47d57928c37a867b9c2d453a7c845793cab0ac01385a
 AUX ldoc-1.4.6-slotted_lua.patch 732 BLAKE2B 52bfd5770b47a082d8f4d0706050bc75766af92d120ab1b95c5359e13c85fe9a0131a40b20cbebe318b0eab42c6f7877749248687c3bc8570c81df08c5af8f51 SHA512 5b226521e5c3af4b23e6f0ffd74cd332a214f1d4bfcef14c1fab170149b669045ec1439d6f2a3bfd40ff3699cbdfb3981e9641d6a44a88d2210f83fa2c5a2cba
 DIST ldoc-1.4.6.tar.gz 126080 BLAKE2B c43a79141ce557a54b9aed3c7523b206bec85602d858c72373d650a70e1741b545b2b9bdd462856c7e16af97f6a5eeeeea26375832f678b52d9e9153547076be SHA512 bcaddba4e462a4fb0aa0d8fcff390de3f195fa5cc569d8f05b84ad0fff900f5ac945be7a2eb15cf5ca60cc462f02c874579e4a19e33776178a04104ef9d944af
-EBUILD ldoc-1.4.6-r100.ebuild 805 BLAKE2B 07ed739e790470030de9de95adc29263beedd1447d6e22859d8a6c4c705d6953d78a469204a6c99622bac432177c19e656a9b1fba0201b0b3341d4ccb5770d45 SHA512 1b98caa30dd79bae63662983c7541b74f509a3f257337a71a9cf1a545d048bde695eafb61b9429bffe7768b7c66b564ab0816c22430fe89eb892f5b4c434d2a1
-EBUILD ldoc-1.4.6.ebuild 519 BLAKE2B ec1a59beaba803f512cc892c6856dc5b09c71ab48ebd9c093f8592bf3822e3ee16836db7abc6dac67360171b4d4ee56727c482fe0398621d61b95c7a6e296e13 SHA512 1638c24f53578d1bca5253a32e8f761b4a1cebf2297495568349e5f95b459b680a2896e9c390259a52738f9c81361de69c971a4d2335d871412e35b0c4c02df6
+EBUILD ldoc-1.4.6-r100.ebuild 800 BLAKE2B a276ee3c27203fb6c646aeda17a9b238ec96499f8c22c6bd4bc44848e2cfecff000bde6f9622be664e4304f013cbf91fce749209300fb9f1ee8eb54e333627b2 SHA512 3786cea335d01398e58919b212a1097b6872e4cca6b497106d47b5c9240e83a227bdb9b22de4301ca6e6cee75a7d8e068bbb85778940e57907d3423ebaa96e2c
 MISC metadata.xml 247 BLAKE2B b8d9d5b8d0cd042320e566bfe90f610a133b5c5ebd712026f81661caccfb4bffea14e1d1256b363c9ab422404a65bac2ef9b265f7489129d0bca46067022e73e SHA512 4dd0700f6354ffd28980a6782be85efd6d47a505029f6a781d7679ec2bad2bfe86e218a48ae8e197c3db00dc6d5b222d08197d35ddc7271752510b61cb3dc959
diff --git a/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild b/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild
index 5486df73038a..0e0946f47379 100644
--- a/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild
+++ b/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/stevedonovan/LDoc/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/dev-lua/ldoc/ldoc-1.4.6.ebuild b/dev-lua/ldoc/ldoc-1.4.6.ebuild
deleted file mode 100644
index 191d469dd2e1..000000000000
--- a/dev-lua/ldoc/ldoc-1.4.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A LuaDoc-compatible documentation generation system"
-HOMEPAGE="https://stevedonovan.github.io/ldoc/"
-SRC_URI="https://github.com/stevedonovan/LDoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="dev-lua/penlight"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.4.6-mkdir.patch" )
-
-S="${WORKDIR}/LDoc-${PV}"
-RESTRICT="test"
diff --git a/dev-lua/lgi/Manifest b/dev-lua/lgi/Manifest
index a6ec2e4f3c69..c24cb7d195de 100644
--- a/dev-lua/lgi/Manifest
+++ b/dev-lua/lgi/Manifest
@@ -1,4 +1,4 @@
 DIST lgi-0.9.2.tar.gz 291463 BLAKE2B d89752e7c56f9a695f97f90680515fd9acab57991121ec3455fcd88aa0b64828f060d9bf222fb1ab14bdfc956ec3ad296af848168532d09694a0cacbb55dac71 SHA512 755a96b78530f42da6d4e2664f8e37cb07a356419e7e6448003c3f841c9d98ad18b851715d9eb203ea7eb27b13ec46223fa8a1c90a99fd12960ce85b0a695335
-EBUILD lgi-0.9.2-r100.ebuild 2551 BLAKE2B 8ac666e9640fe20642da7e0abff1ccd9279e6789db1d70fdedd8fe8941afc785ee60734398aeedee8051154947b1879ba2441cb9c1d34af850487c810c83e1a7 SHA512 fc2ba268ce95582ba7d81c917d3723cf3d097a6d2aa5ca5094b877916746592267a8a52670cb793e3ca3cac366b9e0d89635fe275effaae26dd3292862484a55
+EBUILD lgi-0.9.2-r100.ebuild 2546 BLAKE2B 8bca9901581a952620ca8448976ce0f70d168c47d996bf404dd668b92e57727daadb8f8efd752d058e21455a1525cd01bcc2cd466c1de531ff1146f509555fe8 SHA512 c8a4a4165ffa7bccd783ae739e79b431c1d909736e030e2c641f3276b3ca55fb8b757e51f149c46625ec19a2e0ca85767e4d75f7f8e615eb485d3a4e45b9280d
 EBUILD lgi-0.9.2.ebuild 1374 BLAKE2B f5133eb162c385d7c00e5bc037219781329449abeaa09bec7ddd9990f6f18f4f72df7d98f8b62cf30019f947ff81f165bdbb21c4030d285afb1b57179907b5af SHA512 f7ceabdf5190a744af5e5325e04d205f3782756493849d234b7ede4cda5af8019fa816cf780d1125137404b8b91fe8f8a3e508716e6bf5217f215a18a847cc85
 MISC metadata.xml 301 BLAKE2B 972432d1e9e34193df27c31d01aa620d72350b1bbcf383894e65aa0fdf207bc5ad4064f289c4feb7cbe7522aefa157b5cf2d25d00df09fd62c1ffa45db9ce377 SHA512 295eba832f4a3e1c9bd1ff7349fadff65a0d887ec4df25fcd7ce975504ddaf7efe5789492bdd54f3c6e077e8612dab3f3b8abba710bbabeb2ead89d60f0370f3
diff --git a/dev-lua/lgi/lgi-0.9.2-r100.ebuild b/dev-lua/lgi/lgi-0.9.2-r100.ebuild
index 908e5804dfbd..285de59e5aff 100644
--- a/dev-lua/lgi/lgi-0.9.2-r100.ebuild
+++ b/dev-lua/lgi/lgi-0.9.2-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pavouk/lgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
index 340fb5552a5f..161055585cab 100644
--- a/dev-lua/lpeg/Manifest
+++ b/dev-lua/lpeg/Manifest
@@ -1,8 +1,4 @@
-AUX lpeg-0.12.1-makefile.patch 820 BLAKE2B 8706c3ee0588efc0c3d072d713cf1a8b0ca7653c6701eafe9ec9b3e5284a2ff8b7f989fb65425840da0513e719fe5fa820deb4814d3e838dd5b33651eb4e3c4e SHA512 8f49c6c3b1575cc77d0d9d6c8b75098889af1f8fda58fee1f58150669909e6c4ecbd953738e9c917adcbb1bddc16debe5564b70694d6983295439e06e26782d6
 AUX lpeg-1.0.2-makefile.patch 671 BLAKE2B 4ed03dc08e737fe6cc45f4fe9c53657a71341cac69a3ec6fa52d124dbf5c3b58bcf1077d255598f98952eb2329905a25b45e4c031ab9fb82700d919d7f264452 SHA512 0d17351cda382ddb5574f7d14bc6479439cc703ac0c360b2b0f043288427beda9aea1f229fd2e0ea8b604bd935bce2fc959a2410804bfd82bb2c2e128ab501ac
-DIST lpeg-1.0.1.tar.gz 71527 BLAKE2B 5f19d308572f2d7a5ff11d7aa33f437ec682994d0a396a322764cf12a4cb659c66ce6ffaf0c76f6a250a7d767b6545478dd3bb760150b9f88be41fac9dafde0d SHA512 7b43fbee7eff443000986684bc56bba6d2796a31cf860740746c70e155bdea1b62a46b93f97e2747e3ef0f63e965148778ac2985d0f2d83e1e37ec4ebbabf4aa
 DIST lpeg-1.0.2.tar.gz 71840 BLAKE2B e0d8fb4e9d17c9018f0b206cd3f7c9c0e21398c119600b5b0705c8df19e0956347bea795c7c3ded8e62e0c09802dd8eab931a5e3769fcacf44c35aa2b17fa8d6 SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814
-EBUILD lpeg-1.0.1.ebuild 1251 BLAKE2B a9953b0ab65db25c93ca81715be990d28d85fabd606805e851b5edc0657cb4e65c583bc0b2ff198a4e7cb34a36704e562f5b48ef6b3474fab38f30c0829833cf SHA512 cb09ec82058114e33601825d6d95e17ebc5b59e4ac586cfcaed5d0bb2994eb21e211c87a2dceeb5a9abec8fe99aa2962ef75b8a56525c2b2d112f93a2a41a0de
-EBUILD lpeg-1.0.2-r101.ebuild 1537 BLAKE2B b75e317be864dccaa694d84d141b8239012786a141269daf2d780f511a00c3c2ddedd1fa5d4417c63aec5f87156a3ec537e1579a68a2e35171cfa73cf7603080 SHA512 c2a13abc6c681af638cb783c2395544629ff7c28cc1cb1d9ceb20d6bbd22f3d556b15eec28e2fb2f073aafd4a8c0cc7227ee3c3e9888eeaffc529445e98c713d
-EBUILD lpeg-1.0.2.ebuild 1249 BLAKE2B eaad9865b67b3dca0b873cbb489ef0dde90b858c4bd715db88a0fdd3dec3f20aa7a08c520e88dde44a17c7a0689160e8cafa265f3c2d8649cac0b204dbe2b159 SHA512 0c8fb8c38a73ae74159962d08a4586377b5746545f49cbc065086a823775fd3c07feedc17341580d3bc05a354f65e19312aa65fb453fbd522f4903d0180ca279
+EBUILD lpeg-1.0.2-r101.ebuild 1530 BLAKE2B 0fe58fe3706822574f08a2bbc99020fc289c8ea1adfdf7c309d89f9c32148f27dbed129eeb26eb9926454a5e29187e0eb73b33d9d994563e96c346a40f682487 SHA512 2b5ebb56873364594d494ec70696c231a298ad291e9ca86d64e0933082fced7068ec96182bc21bf3ea15c133e00dde988279f2a1614a2d42368db3fbf96b2ad7
 MISC metadata.xml 257 BLAKE2B fd30d59ebbc18529dbfe65cbec91247e5ad57a53f834d3abc85cbc18af964033e42dda00052b47281a9a85964b190a83c2c8a6eb30f4a9d38894de51d41d9de8 SHA512 06c87d68775d3b524abb426701b16341156bd54f2553b7a0f14a62ca5492c20bf9ff1719084e225ae5fc44c5b518a71258e1138e19551bfcfe828a11dffb12c4
diff --git a/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch b/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch
deleted file mode 100644
index a0be0558aa97..000000000000
--- a/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- lpeg-0.12.1/makefile
-+++ lpeg-0.12.1/makefile
-@@ -1,7 +1,7 @@
- LIBNAME = lpeg
- LUADIR = ../lua/
- 
--COPT = -O2
-+#COPT = -O2
- # COPT = -DLPEG_DEBUG -g
- 
- CWARNS = -Wall -Wextra -pedantic \
-@@ -22,21 +22,21 @@
- # -Wunreachable-code \
- 
- 
--CFLAGS = $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
-+CFLAGS += $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
- CC = gcc
- 
- FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
- 
- # For Linux
- linux:
--	make lpeg.so "DLLFLAGS = -shared -fPIC"
-+	$(MAKE) lpeg.so "DLLFLAGS = -shared -fPIC"
- 
- # For Mac OS
- macosx:
--	make lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
-+	$(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
- 
- lpeg.so: $(FILES)
--	env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
-+	env $(CC) $(DLLFLAGS) $(LDFLAGS) $(FILES) -o lpeg.so
- 
- $(FILES): makefile
- 
diff --git a/dev-lua/lpeg/lpeg-1.0.1.ebuild b/dev-lua/lpeg/lpeg-1.0.1.ebuild
deleted file mode 100644
index 063616f2b42a..000000000000
--- a/dev-lua/lpeg/lpeg-1.0.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Parsing Expression Grammars for Lua"
-HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/"
-SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
-IUSE="debug doc luajit"
-
-RDEPEND="
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-	luajit? ( dev-lang/luajit:2= )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( "HISTORY" )
-HTML_DOCS=( "lpeg.html"  "re.html"  )
-PATCHES=( "${FILESDIR}"/${PN}-0.12.1-makefile.patch )
-
-src_prepare() {
-	default
-	use debug && append-cflags -DLPEG_DEBUG
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		LUADIR="$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
-}
-
-src_test() {
-	$(usex luajit 'luajit' 'lua') test.lua || die
-}
-
-src_install() {
-	local instdir
-	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
-	exeinto "${instdir#${EPREFIX}}"
-	doexe lpeg.so
-	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
-	insinto "${instdir#${EPREFIX}}"
-	doins re.lua
-
-	use doc && einstalldocs
-}
diff --git a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
index 10a6b94a1b47..769fbe86123a 100644
--- a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
+++ b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="test debug doc"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/dev-lua/lpeg/lpeg-1.0.2.ebuild b/dev-lua/lpeg/lpeg-1.0.2.ebuild
deleted file mode 100644
index 3297c2ab4fa5..000000000000
--- a/dev-lua/lpeg/lpeg-1.0.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Parsing Expression Grammars for Lua"
-HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/"
-SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc luajit"
-
-RDEPEND="
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-	luajit? ( dev-lang/luajit:2= )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( HISTORY )
-HTML_DOCS=( lpeg.html re.html )
-PATCHES=( "${FILESDIR}"/${PN}-1.0.2-makefile.patch )
-
-src_prepare() {
-	default
-	use debug && append-cflags -DLPEG_DEBUG
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		LUADIR="$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
-}
-
-src_test() {
-	$(usex luajit 'luajit' 'lua') test.lua || die
-}
-
-src_install() {
-	local instdir
-	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
-	exeinto "${instdir#${EPREFIX}}"
-	doexe lpeg.so
-	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
-	insinto "${instdir#${EPREFIX}}"
-	doins re.lua
-
-	use doc && einstalldocs
-}
diff --git a/dev-lua/lua-argparse/Manifest b/dev-lua/lua-argparse/Manifest
index bed742e12d8e..a3b8994d7a86 100644
--- a/dev-lua/lua-argparse/Manifest
+++ b/dev-lua/lua-argparse/Manifest
@@ -1,4 +1,3 @@
 DIST lua-argparse-0.6.0.tar.gz 36712 BLAKE2B 88882738453a894db68ef93557d870393eaec1fb2bf39b110bd2691678d26be64734d07c7f01f760d9c1d031e530707449ff2ca54a5cdd428cb8da3b1897a7e1 SHA512 7efdfab8ec563a9e7eddc7aff760fd4d3605df2896939af3f2c80e5ed4d4e5ba45a7815057e15446d242351a6fd139d6b8da802fe318d4a4bcd69918fece53d1
-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
+EBUILD lua-argparse-0.6.0-r100.ebuild 1132 BLAKE2B c5ca703ac1dbad353f6f5890c1d2888f355675b5b504a1980b44a587f07d1317c340a8e9f89c43d535f45d2e73967f88a66af9c41837d30195e9d2578819c955 SHA512 de2b9d414d6a1906e061bc1d1447b8dbf46b648366905db56521cd39202e872f1b6d6087259b160e03ee2235869eab4c06308b924bfc0ff0fdf7e0f668096859
 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
deleted file mode 100644
index f17a8188bc05..000000000000
--- a/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Command line argument parser for the Lua Programming Language"
-HOMEPAGE="https://github.com/mpeterv/argparse"
-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"
-IUSE="doc luajit test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/lua-5.1:0=
-	luajit? ( dev-lang/luajit:2 )"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	test? (
-		${RDEPEND}
-		dev-lua/busted
-	)"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN//lua-/}-${PV}"
-
-src_compile() {
-	if use doc; then
-		sphinx-build docsrc html || die
-		rm -rf "${S}"/html/{.doctrees,_sources} || die
-	fi
-}
-
-src_test() {
-	busted -o gtest --exclude-tags="unsafe" || die
-}
-
-src_install() {
-	use doc && local -a HTML_DOCS=( html/. )
-	local -a DOCS=( README.md CHANGELOG.md )
-	einstalldocs
-
-	local instdir
-	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
-
-	insinto "${instdir#${EPREFIX}}"
-	doins src/argparse.lua
-}
diff --git a/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild b/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild
index db9fce9d4ced..d331efad3b86 100644
--- a/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild
+++ b/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN//lua-/}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/lua-bit32/Manifest b/dev-lua/lua-bit32/Manifest
index 86395c21f024..74db2409eb92 100644
--- a/dev-lua/lua-bit32/Manifest
+++ b/dev-lua/lua-bit32/Manifest
@@ -1,4 +1,3 @@
 DIST lua-compat53-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
-EBUILD lua-bit32-5.3.5-r101.ebuild 1408 BLAKE2B 309e52e5d3486baf442d6a28dab9ba44a89e4d31ae21625482adaa68c5bc501e1d2dc0e9bfbc995baadf9b6e6681314bdbd53d61b926c01b1481a84ebf8b89d8 SHA512 91e678e50e096ed9d2c5695acc1295faa5b96446b72ca405ec820279666539455020c6ad81ede6059ca7ce4372d54a41f8adb156cf90db7f5fbd91acdd4ffd44
-EBUILD lua-bit32-5.3.5-r2.ebuild 1297 BLAKE2B 3ea7275a36d083f34af99f3f6f6b885e0bf71c7d57e1546d668b774fb834f7d33f291aae3a223f871d79996a624128da4e7a8830af43f3393967e0852ba20869 SHA512 6e0e3a642662e49f5af9f2c01a47c4eccc7a019ed3633ff3976484f6afeae683e90f9ec4ab0c9f5381aacddf27fa69be3c2f0a9b98ab46a2d5a556ba15f67ed8
+EBUILD lua-bit32-5.3.5-r101.ebuild 1404 BLAKE2B 908f6e77daa1e6b31fcf6766571a5b311eefafaed5b8366287dc10b1dade7ece225185b6eab9c7e1650f4fbb0082ba59ba78d81f2596e8b280ebba7b65968ee4 SHA512 46a26358f9f8dca8a88c46f2e7b680afde1a704fcb52bae74f52da568442fe5fbfd94b87598fdb3a664be784d016d685cf12c14fb4f65b7f5f09d5de1c63b11d
 MISC metadata.xml 580 BLAKE2B 4499d47fae3cbc26be9bbaf4cf8db719b6ec28989fb4c583e6c16006378b6161a6a32062638df6bc41743e271bf395abf5e348e39a9419b496ba6b834ed71a95 SHA512 eefe4c553c1dc03173b7662969c8bc56cc6be18b879d199c20ade33b4043fe71cec065e71fbc2bdba9a35ea88eab6f8a41b834d433159fbced2e743e663d6974
diff --git a/dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild b/dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild
index 6bb9594da9cc..4c1d071b29b5 100644
--- a/dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild
+++ b/dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/lua-bit32/lua-bit32-5.3.5-r2.ebuild b/dev-lua/lua-bit32/lua-bit32-5.3.5-r2.ebuild
deleted file mode 100644
index 63a13ff6ed83..000000000000
--- a/dev-lua/lua-bit32/lua-bit32-5.3.5-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-# Weird upstream version descisions...
-# Result tarball may be reused for future lua-compat53 package
-LUA_COMPAT_PN="lua-compat-5.3"
-LUA_COMPAT_PV="0.10"
-
-DESCRIPTION="Backported Lua bit manipulation library"
-HOMEPAGE="https://github.com/keplerproject/lua-compat-5.3"
-SRC_URI="https://github.com/keplerproject/${LUA_COMPAT_PN}/archive/v${LUA_COMPAT_PV}.tar.gz -> lua-compat53-${LUA_COMPAT_PV}.tar.gz"
-
-S="${WORKDIR}/${LUA_COMPAT_PN}-${LUA_COMPAT_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-lang/lua:0="
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_compile() {
-	# TODO maybe sometime there will be luarocks eclass...
-	compile="$(tc-getCC) ${CFLAGS} ${LDFLAGS} -fPIC -I/usr/include -c lbitlib.c -o lbitlib.o -DLUA_COMPAT_BITLIB -Ic-api"
-	einfo "${compile}"
-	eval "${compile}" || die
-
-	link="$(tc-getCC) -shared ${LDFLAGS} -o bit32.so lbitlib.o"
-	einfo "${link}"
-	eval "${link}" || die
-}
-
-src_test() {
-	LUA_CPATH=./?.so lua tests/test-bit32.lua || die
-}
-
-src_install() {
-	exeinto $($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)
-	doexe bit32.so
-	dodoc README.md
-}
diff --git a/dev-lua/lua-cjson/Manifest b/dev-lua/lua-cjson/Manifest
index 09017617bc96..ac917dd340e1 100644
--- a/dev-lua/lua-cjson/Manifest
+++ b/dev-lua/lua-cjson/Manifest
@@ -2,5 +2,4 @@ AUX lua-cjson-2.1.0.8-lua52.patch 3588 BLAKE2B 989bd667dd62cf7b39c0188c1fcf94d68
 AUX lua-cjson-2.1.0.8-sparse_array_test_fix.patch 1084 BLAKE2B 3f6e439b54602a8fb07badb87bd53ce8affbb53f7434a32677b1de0cfc92b6f9f75f21a7c09763649c5cbadf59a8647d704cce1e0e98207e72bb696c9cb8ddbe SHA512 31358192ecff4a06ef045cf8b3d8f717e65674752e1ae70a8e87a487e89a4819448285c537ef5393b05bbb285a0708be37bd7dafa9b8bacbf4bb0e8bdd9fdb67
 DIST lua-cjson-2.1.0.8.tar.gz 77211 BLAKE2B 227171576318939ab48abe26e87fa905cf9a15e6ff44065c0713b6a6fedac571f1dbbb88526b957836a4368e71c4d19a748b2a3250221572f580f1d32ccf50a0 SHA512 577278ccb58a23ea56ea9ad34c5fb0a07c13c6691a3b666f58fa6427bca269aaec26271d7400dcd253c922d1bb0b3b322915a2ce139880c1ed4c1d2c15437580
 EBUILD lua-cjson-2.1.0.8-r100.ebuild 2011 BLAKE2B 5aafff2cd5201a5db81f1ba16f22f2a7e60a8ec94f352231d34fa0ff04b63f0e90b0714f42084ee9bfbdffba27f045eeec21319ac586b95833ebf17b7b9646de SHA512 08abb466a3e4fdf7a07ac8e64d9c86f76a99ccad21b7cacae3c13b1db0c09b832c1017589423dcfa2fc20ad1092982ea9c525d9703cd94a5be793adbb1a68fa2
-EBUILD lua-cjson-2.1.0.8.ebuild 1660 BLAKE2B 601d00a060462cafbc1107947387fd73c9ceefcb1aa8e901e16ee63d526192459ec900bdcea19a8f25aae3c87d53915c6a846bbaf5cc564ae15f14f0a352ca6e SHA512 2cacc3460386d732aa9be52ba12a165166d0634a2c8e74bf26c6dba156eccefe060bbe9648256c2dd7b1c0e664e4ccf5b2d3f1ed979ab9b565a400478c78ec0a
 MISC metadata.xml 779 BLAKE2B 605a71234ea6e3f8eb770b56cdd725cdc244b643c9676afa4552b3f2ef24d6a1c6d96c0468768b16412a8bbaf5ba29b177a57aec6c7a3c006f16da955d952dd7 SHA512 be9492a64cd4be16f395ec49aa031fed8dcddf844df243cd8456452f002098a2cb47ce1e99dffa0843661986ec5352f4feb749578ee5a63a8b47624c3ffae022
diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.8.ebuild b/dev-lua/lua-cjson/lua-cjson-2.1.0.8.ebuild
deleted file mode 100644
index 2b1199417496..000000000000
--- a/dev-lua/lua-cjson/lua-cjson-2.1.0.8.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A fast JSON encoding/parsing module for Lua"
-HOMEPAGE="https://www.kyne.com.au/~mark/software/lua-cjson.php https://github.com/openresty/lua-cjson"
-SRC_URI="https://github.com/openresty/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+internal-fpconv luajit test +threads"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="threads? ( internal-fpconv )"
-
-RDEPEND="
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:0 )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-lang/perl )"
-
-DOCS=( "manual.txt" "NEWS" "performance.txt" "README.md" "THANKS" )
-
-PATCHES=( "${FILESDIR}/${PN}-2.1.0.8-sparse_array_test_fix.patch" )
-
-src_prepare() {
-	default
-
-	# Don't install tests
-	sed -e '/cd tests/d' -i Makefile || die
-}
-
-src_compile() {
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"CFLAGS=${CFLAGS}"
-		"LDFLAGS=${LDFLAGS}"
-		"LUA_INCLUDE_DIR=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'includedir' 'INSTALL_INC') $(usex luajit 'luajit' 'lua'))"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_test() {
-	cd tests || die
-
-	ln -s "${S}"/cjson.so ./ || die
-	ln -s "${S}"/lua/cjson ./ || die
-
-	./genutf8.pl || die
-	./test.lua || die
-}
-
-src_install() {
-	local myemakeargs=(
-		"DESTDIR=${D}"
-		"LUA_CMODULE_DIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
-		"LUA_MODULE_DIR=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
-		"PREFIX=${EPREFIX}/usr"
-	)
-
-	emake "${myemakeargs[@]}" install install-extra
-
-	einstalldocs
-}
diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
index c07258a805d4..0f163a961d3d 100644
--- a/dev-lua/lua-openssl/Manifest
+++ b/dev-lua/lua-openssl/Manifest
@@ -2,5 +2,4 @@ DIST lua-auxiliar-8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz 3690 BLAKE2B 8
 DIST lua-compat-5.3-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
 DIST lua-openssl-0.7.8_p0.tar.gz 397072 BLAKE2B 048ae34c195f6f0ff252f33d14a7151b629d5b9ba828c331459e58f23f0ee62e66f00b8fdbe5665eb7f247d4bb97986e158ea89107189aba4199fcb878f2d724 SHA512 a23b5010633aec70639903fe4d0473101e42c2690456ff2d730c45ef4710134058bc6b3e364c79d3cf3dd4c323a89bd98f07a17d23f226b0bb7e0bb1f2be32c5
 EBUILD lua-openssl-0.7.8_p0-r101.ebuild 2638 BLAKE2B 462c64e0d256afcf119406a7a64e9acf0dccf84b933469a683633d850cc685f08ae299bc46b42477a1714eb76129996262ca0229562192d892280784690f35bb SHA512 2d9153f2a0edac78c06a40e60212c1828547df2cd446a0befad8d3fcd44e751ae4173b963cf5ef7b1326c9764e513f8973c31f5f020271e53369723a47f56d0c
-EBUILD lua-openssl-0.7.8_p0-r3.ebuild 2699 BLAKE2B 6493cd72c0100cf0d398c830fdf267eea082c255e43b8ffcd857c052ace9862755c1b8545c1b1a8cfbb8f69573aa3789f363cd54711e7472458055b8ff70bf60 SHA512 83db54985fb38adfde94305bcfea5a7f3c717c150fb42b86316652f8de75268d0cb8c8ed7b38e03f76dc44575748c770327f4876da50686936be3abdbfaf96f8
 MISC metadata.xml 555 BLAKE2B 3f448f76d768881d14d1ec6514ee525aac2acffa168943bab1b72f9f86889b5ba434d53e774ef296ec76cfa689f86935e40ad752617cdf43b3b534c4a74350ff SHA512 235a3193b4ced9f5515bd89ed60f32e06d32dbfced30cc05f9c67dd46ab3521cd916da1a46e96457abf2f9e1fd11df1d4d2874775ffeea3ad156db8cef118202
diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild
deleted file mode 100644
index 88652952c1f3..000000000000
--- a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT_AUX="8d09895473b73e4fb72b7573615f69c36e1860a2"
-MY_PN_AUX="lua-auxiliar"
-MY_PN_COMPAT="lua-compat-5.3"
-MY_PV="${PV//_p/-}"
-MY_PV_COMPAT="0.10"
-
-inherit toolchain-funcs
-
-DESCRIPTION="OpenSSL binding for Lua"
-HOMEPAGE="https://github.com/zhaozg/lua-openssl"
-SRC_URI="
-	https://github.com/zhaozg/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/zhaozg/${MY_PN_AUX}/archive/${EGIT_COMMIT_AUX}.tar.gz -> ${MY_PN_AUX}-${EGIT_COMMIT_AUX}.tar.gz
-	https://github.com/keplerproject/${MY_PN_COMPAT}/archive/v${MY_PV_COMPAT}.tar.gz -> ${MY_PN_COMPAT}-${MY_PV_COMPAT}.tar.gz
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT openssl PHP-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="libressl luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!dev-lua/luaossl
-	!dev-lua/luasec
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( >=dev-lang/lua-5.1:0 )
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${RDEPEND} )
-"
-
-DOCS=( "README.md" "samples/." )
-
-src_prepare() {
-	default
-
-	# Allow override of LUA* variables
-	sed -e '/LUA  /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die
-
-	# Prepare needed dependencies (source code files only)
-	rm -r deps/{auxiliar,lua-compat} || die
-	mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die
-	mv "${WORKDIR}/${MY_PN_COMPAT}-${MY_PV_COMPAT}" deps/lua-compat || die
-}
-
-src_compile() {
-	local myemakeargs=(
-		"AR=$(tc-getAR)"
-		"CC=$(tc-getCC)"
-		"LUA="
-		"LUA_CFLAGS=${CFLAGS} -I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
-		"LUA_LIBS=${LDFLAGS}"
-		"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
-		"TARGET_SYS=${CTARGET:-${CHOST}}"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_test() {
-	local myemakeargs=(
-		"LUA=$(usex luajit 'luajit' 'lua')"
-		"LUA_CFLAGS="
-		"LUA_LIBS="
-		"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
-		"TARGET_SYS=${CTARGET:-${CHOST}}"
-	)
-
-	emake "${myemakeargs[@]}" test
-}
-
-src_install() {
-	local myemakeargs=(
-		"LUA="
-		"LUA_CFLAGS="
-		"LUA_LIBDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
-		"LUA_LIBS="
-		"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
-		"TARGET_SYS=${CTARGET:-${CHOST}}"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
-	doins -r "lib/."
-
-	einstalldocs
-}
diff --git a/dev-lua/lua-term/Manifest b/dev-lua/lua-term/Manifest
index 43df2b1168ab..a2bad7c552c4 100644
--- a/dev-lua/lua-term/Manifest
+++ b/dev-lua/lua-term/Manifest
@@ -1,4 +1,3 @@
 DIST lua-term-0.7.tar.gz 4365 BLAKE2B 8f4080d4cd3b620cb1f261d417744f112d42b776ab3f4cdb0e52d04b6d64fc4a1ddbd634570496c3bc12e6b10efe5af8025d1f124198ebb3946414679a65f7f4 SHA512 2046ba1861ff590c191bb651941c45eb8b6e9a1252b05e78daaeb31837ce1fc7da9ba124aec34dc7842fd304e945754c463ffd75941125ff952e911ba66efa31
-EBUILD lua-term-0.7-r101.ebuild 1176 BLAKE2B bdecbcf3fbdc5a3e2ccf3ea356bbc1745a3f0d44cdac82d520bd279dafd4d579ffbeb4213726c4d4d744b37b699fa5a13d6e354f2f94afae299f443c93fe6ea5 SHA512 1df0ee36917b1a03395c21bca99dea1e258dbe7ce48f2bbda71ae564df2ed0dd020e363c6fedefd484372ed340a667f43959473697ab7084e38b5c9e15ba642d
-EBUILD lua-term-0.7.ebuild 1024 BLAKE2B 0d71c0c7b4679f8e04729464ce393e8206e8ebcf938610bd96732c569326db366f456830a48ab69645e64a5e9b35f69025bdad0698bf77177d892403a7310a96 SHA512 7e1c81e838f80cbf163b5b94854f37f6d535bb6dc610d57a85b4c6e6d1d16644151c4df27f08c6d3d8050fb04b9de2bd998d3fdf9dac6ea5e42546f07cf216cf
+EBUILD lua-term-0.7-r101.ebuild 1170 BLAKE2B 0a56b5313d8f61ae12996034f6b4b64733a4596a799684e1cb0dac907e5a32da36f14fd2c79ead162745ed075536ec10b42451004eaa3468e774df15955a839c SHA512 e3b3418da5e8007c907382231221f500ca101e49e1c6c36d7fcf0cd3244bc302420e3240c0f0ca0cd0f7bdfc56fd679284c18b4d62b8f137f2cf639994d5994e
 MISC metadata.xml 440 BLAKE2B 7578e30f2b7c2b37df1fd563325189efd987df03c42fdb06cfe334a74a7d596b2ef9bb3b1ed2adb9f6aae8aed072cb89df8898d57cab40db23933a54a0963612 SHA512 101ba9221fad8bed21cc6fa169d8063e58cb303f45177a355859e9d3dded2489e22082bfd3104763a5f92fc3d0325b344d4758b5afef7d50d22684fae752de43
diff --git a/dev-lua/lua-term/lua-term-0.7-r101.ebuild b/dev-lua/lua-term/lua-term-0.7-r101.ebuild
index d9f090f2e7e8..80e99ed40888 100644
--- a/dev-lua/lua-term/lua-term-0.7-r101.ebuild
+++ b/dev-lua/lua-term/lua-term-0.7-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="${LUA_DEPS}"
diff --git a/dev-lua/lua-term/lua-term-0.7.ebuild b/dev-lua/lua-term/lua-term-0.7.ebuild
deleted file mode 100644
index 854d2a4e4071..000000000000
--- a/dev-lua/lua-term/lua-term-0.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-# Yes, upstream used different version numbers.
-# The rockspec version number is 0.7, but the version associated with
-# the tarball is 0.07.
-MY_PV=0.07
-
-DESCRIPTION="Terminal functions for Lua"
-HOMEPAGE="https://github.com/hoelzro/lua-term"
-SRC_URI="https://github.com/hoelzro/lua-term/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE=""
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND=">=dev-lang/lua-5.1:0="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_compile() {
-	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -fPIC -shared \
-		-o core.so core.c"
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -fPIC -shared \
-		-o core.so core.c || die
-}
-
-src_install() {
-	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"/term
-	doexe core.so
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
-	doins -r term
-}
diff --git a/dev-lua/lua-utf8/Manifest b/dev-lua/lua-utf8/Manifest
index 6376c8c13e27..624583a0bc78 100644
--- a/dev-lua/lua-utf8/Manifest
+++ b/dev-lua/lua-utf8/Manifest
@@ -1,4 +1,3 @@
 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 1348 BLAKE2B e67ac408b457fa7b8d3228f63e62ccfbda4addaae4df8a4f4ce73bf30dc7a06aaa2c5ddf7706ef1edd24ebc5de8ec55f2ba7adac1db80ae32ff19f1d27a84d2b SHA512 eeeb848f9a1d5ce2e4f553005cd6f45ceed6c60eb93538167e22c0777d73deb94cdf1087db0167873b9844e2f6ab1bcb70e110e2a99e2d0d1cfcb1a791994935
+EBUILD lua-utf8-0.1.3-r100.ebuild 1482 BLAKE2B bb0709fa672e87b89ff1f5f946f2da6d80ee16720ea9abae8d6925cac29aeda06e400a0844dfdb0ccb6e2c94a7505cc0141de946a8e982a3ddbccd49b81233aa SHA512 f775e8a27d98709383deefedb51d2a3d601d8c6b5ba099267a595a079d5fa04886326644f27d86eef99756292000c38fa723f8a1d8b90ff4eff59b67deca3df0
 MISC metadata.xml 750 BLAKE2B 95215f3aed5389197a071e67411702a07102387343c568c02b48ada5b2f3c0f01b99bb895bd4f11e2c558fc7d352da1afece2b46ea6d63edbfa322ccc7c651cd SHA512 cf8fd4d207d9827fb1a7349f89fa0faf0d1ad38989ebc29dabde5dcee73e718183655a1b8c9f0074f16ea7878bd1d4dbf7e53f65f5003946fddf901c9568d4cd
diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild
index 48e0614d06d8..9b4ced69dc39 100644
--- a/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild
+++ b/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN//-/}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild
deleted file mode 100644
index 71e19b9f460a..000000000000
--- a/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A UTF-8 support module for Lua and LuaJIT"
-HOMEPAGE="https://github.com/starwing/luautf8"
-SRC_URI="https://github.com/starwing/luautf8/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN//-/}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_compile() {
-	local compiler=(
-		"$(tc-getCC)"
-		"${CFLAGS}"
-		"-fPIC"
-		"${LDFLAGS}"
-		"-I/usr/include"
-		"-c lutf8lib.c"
-		"-o lutf8lib.o"
-	)
-	einfo "${compiler[@]}"
-	${compiler[@]} || die
-
-	local linker=(
-		"$(tc-getCC)"
-		"-shared"
-		"${LDFLAGS}"
-		"-o lutf8lib.so"
-		"lutf8lib.o"
-	)
-	einfo "${linker[@]}"
-	${linker[@]} || die
-}
-
-src_test() {
-	local mytests=(
-		"test.lua"
-		"test_compat.lua"
-		"test_pm.lua"
-	)
-
-	for mytest in ${mytests[@]}; do
-		LUA_CPATH="${S}/lutf8lib.so" $(usex luajit 'luajit' 'lua') ${mytest} || die
-	done
-}
-
-src_install() {
-	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
-	newexe "lutf8lib.so" "lua-utf8.so"
-
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
-	doins parseucd.lua
-
-	einstalldocs
-}
diff --git a/dev-lua/lua-zlib/Manifest b/dev-lua/lua-zlib/Manifest
index 877f8aa662b7..8b76151c5696 100644
--- a/dev-lua/lua-zlib/Manifest
+++ b/dev-lua/lua-zlib/Manifest
@@ -1,4 +1,3 @@
 DIST lua-zlib-1.2.tar.gz 16612 BLAKE2B ca2ff51c97929fac0918de3902a175eda583da3ca415f9eff5e68a9c3ba0414827c3a96b968e9fcbccbe9612b1ade3fdc4498e50c4df53b0fa768912f428a287 SHA512 da13239089c1027b0bfb4ee463043b326ef5586206c5d76af8707736da3c03622b2fc38e732761a5b7a6422ad81a09557abc8548f37fef07ada0d4064eabfcf4
-EBUILD lua-zlib-1.2-r100.ebuild 905 BLAKE2B 293c3d92f72dd30b850da97df405ee7f3356b415cab9495bd6dc7ca2b9a7f33760b10b904ecfcae8b8b8bf4abf98b6a628b12268f8636a90bbbeab010d948092 SHA512 09523f5bc1c99db7aabbeffe29c6e59d27cba440e141b9185fd2de98c1fed5b312156abee303ab28b7034678709a025238c3c0308d32bea0a692f80005134ac2
-EBUILD lua-zlib-1.2.ebuild 669 BLAKE2B ee74b9e5ae1a0fa181a577918d8068a1ea833322aaeced3ea0f6a4f1e1adc71e8abed2fc38f5ce10cdfdd7e331976170b42c2e7bbfda812b7e62cc0e4c9f0e71 SHA512 dd59320eac58f73c6e632bca41cd680c77d2a236a74adbddff13380a2a076a97da879bc78b821ac6fd737bb0e6c9fcdd7db9c8d8a98e3584cb57d6ab38571276
+EBUILD lua-zlib-1.2-r100.ebuild 901 BLAKE2B dbffe90f5e5d66234817e72c22509bf8607ae3385381d473ab8b34fe870ae3c836c4478b45227b2fd12faa494ed7aa7af97fa6755c13b2b7854f49d0cd2e2ff3 SHA512 64cc788ed2e6412be37db92d219242f352f55c71c14836b1fd72d1610a585abd1c75831c83a53865a5462c863853f9909ad0d8c89737987a685cdea22d601c01
 MISC metadata.xml 333 BLAKE2B f65699b0f49f67c857500010ae12d8416cdb0c7d5817b445aed9de46000bc80186ff7d84f8eafcc63d760c8b95713561eedfe24f0500781866b294f9086ba30e SHA512 9473337d43cd76c8d23c3d4c300412f06b296afa9ca59d51b46d4c880a0b5e36523f71eb86a5d0bb856b29aa1cb936ee611aceae81a9d2d4907b9392e51b282b
diff --git a/dev-lua/lua-zlib/lua-zlib-1.2-r100.ebuild b/dev-lua/lua-zlib/lua-zlib-1.2-r100.ebuild
index 1fbf98752889..4c146701d986 100644
--- a/dev-lua/lua-zlib/lua-zlib-1.2-r100.ebuild
+++ b/dev-lua/lua-zlib/lua-zlib-1.2-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/brimworks/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-lua/lua-zlib/lua-zlib-1.2.ebuild b/dev-lua/lua-zlib/lua-zlib-1.2.ebuild
deleted file mode 100644
index 6c5c6083b3af..000000000000
--- a/dev-lua/lua-zlib/lua-zlib-1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Lua bindings to zlib"
-HOMEPAGE="https://github.com/brimworks/lua-zlib"
-SRC_URI="https://github.com/brimworks/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-RDEPEND="dev-lang/lua:0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local lua_version="$(pkg-config --modversion lua)"
-	local mycmakeargs=(
-		-DINSTALL_CMOD="$(pkg-config --variable INSTALL_CMOD lua)"
-		-DUSE_LUA_VERSION="$(ver_cut 1-2 ${lua_version})"
-	)
-	cmake_src_configure
-}
diff --git a/dev-lua/lua_cliargs/Manifest b/dev-lua/lua_cliargs/Manifest
index 1af542206d0c..38e143247639 100644
--- a/dev-lua/lua_cliargs/Manifest
+++ b/dev-lua/lua_cliargs/Manifest
@@ -1,4 +1,3 @@
 DIST lua_cliargs-3.0_p2.tar.gz 30435 BLAKE2B 8edf60870e0d91593064876a225ef7fbe638425da13b458d6356eaa0636482ca904f9355fd15314d4893e6f5346a6faa30fb6078d191a29aa14e26aa5d74a4be SHA512 e7a475f1d41249b0a35f021a6ccca46078f5b689c1927a4dd4cab80b2e4d291babaab35cf7d64fad3ebf68d871fb5177f030c7a2b28d9f55fbeb4dd26021d024
-EBUILD lua_cliargs-3.0_p2-r100.ebuild 785 BLAKE2B 44f5b4d3515c9d84f989a4cb9d85d28118697fad315ea588986fcb71dacd41d61648af38c0fc7a9bb90ca976080ca1dff1ea4637a845918909eb793f90ec11b4 SHA512 c0547e4b6fa033cfee5d481af99850aa90edeb5225dd8213993c8347f2396ff0dbc608f31e00beda69b335ac7ad4508221cb72f6d12cacb3e038bc68ca10d04b
-EBUILD lua_cliargs-3.0_p2.ebuild 907 BLAKE2B d04176ed23866b5700c92e5909bc69d265737707861f1224c43f7212d6f07c974f1054fda803b8975bba3b6bae2456741ee1bd7d1a4b821bcf18472d735e3625 SHA512 5154f2098d54c3a5be57323337b4bce88ccf27ade1285e9411507ef0a95e68902281efc9bfa71b43c4aaf16c9833475b7b736d4c151c065e83f8df819eb42e88
+EBUILD lua_cliargs-3.0_p2-r100.ebuild 779 BLAKE2B 34ec9803794683e7974315b093cf0d49b9ebb371dc4fdbb8a8da32dfa9704fdccb9f61e71506b8c7817eae021c2fc7479da0f4b139245419e5ffcc3aaaec0842 SHA512 bb5287a62a98ce29a690e31f1c7ed28c15eb0a2d4f8348f713b15797d6f3b5d103a40429dc4dd58b336e1964286a6d7280f6268e1ca0675f333e58dcbfcf4f62
 MISC metadata.xml 662 BLAKE2B f439daeab6ac235e0f754364c7a54ebb313df50fa96288a4f47f75e259809396c9668b216d2ee0bb930413af44ff181a026247db0be3d6f482e95507c3e5e3cd SHA512 f64fe9598875b158de72f71438193fa3558199f41d5981657481a8dd103d35dcd579cdfd10520e8e30e89a0b030c48ab81d358d5f8e363337d1ac6bedab6357a
diff --git a/dev-lua/lua_cliargs/lua_cliargs-3.0_p2-r100.ebuild b/dev-lua/lua_cliargs/lua_cliargs-3.0_p2-r100.ebuild
index 471bebcf2aa6..9445a72e1802 100644
--- a/dev-lua/lua_cliargs/lua_cliargs-3.0_p2-r100.ebuild
+++ b/dev-lua/lua_cliargs/lua_cliargs-3.0_p2-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="examples"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/dev-lua/lua_cliargs/lua_cliargs-3.0_p2.ebuild b/dev-lua/lua_cliargs/lua_cliargs-3.0_p2.ebuild
deleted file mode 100644
index bc6b994535c6..000000000000
--- a/dev-lua/lua_cliargs/lua_cliargs-3.0_p2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-# Below is the upstream package version.
-# The final component of the version number has been mapped to the _px
-# component of the version number in portage so should be kept in sync.
-MY_PV="3.0-2"
-
-DESCRIPTION="A command-line argument parser."
-HOMEPAGE="https://github.com/amireh/lua_cliargs"
-SRC_URI="https://github.com/amireh/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="doc"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND=">=dev-lang/lua-5.1:0="
-RDEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_install() {
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
-	doins -r src/cliargs.lua src/cliargs
-
-	if use doc; then
-		local HTML_DOCS=( doc/. )
-		dodoc -r examples
-	fi
-
-	einstalldocs
-}
diff --git a/dev-lua/luacheck/Manifest b/dev-lua/luacheck/Manifest
index 61846dd96d7d..5e44e61ebacd 100644
--- a/dev-lua/luacheck/Manifest
+++ b/dev-lua/luacheck/Manifest
@@ -1,7 +1,4 @@
 AUX luacheck-0.23.0-disable-measuring-performance-test.patch 446 BLAKE2B 42c83ec5eb3d073a5e907c6285a6a2a26f1563940435a111d74274dcdff76f7662d8b623c86658fa0a0b568e150cfa059d2100d82b7f65fcd293b361ec6c45bf SHA512 046cc3ad7e74435b3c6df1a5d271e82cd90a3c02c9228c5a632b13378a8b17c3cde21b00fdc84ab350493b64ec36beb10591a32d52b96010481b7d6a08655392
-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 1259 BLAKE2B 1e61496ba8b232db59e9b57e16a5edc9e9b9d6a3645acb0fe96f4b679205e0665099133eee68a3d6a653126c33e91419f2d51cdd920b1169866a8b03abe2d5ab SHA512 2b3a828f18fb1a717a66267f0202bb367e064b6ffd3bb20861dea0dedd60ddc8868d9927a72c3599b496c175ade9ef40e225cef152b94f6aba1254d8b35ee3fa
-EBUILD luacheck-0.23.0-r100.ebuild 1233 BLAKE2B 0f0c4a4a006df2c9060edfb516f39523165f057b43fa2fa133344993a7221b1a247fe682893c858b7d31f21f5b81a6cbfc5049aa88b138c445832db2d144cfc4 SHA512 cbddb5dd61591e2caae6d78f4a4b5cf04625b809f7e0717cbdfa8f4cab311426bdba711e6d215f5d5f61c4959a6594e269279d5506ca185c84ee65498a019677
+EBUILD luacheck-0.23.0-r100.ebuild 1228 BLAKE2B 257bb63e73c83bbb411362f8693607bebf4bf3653a45459258d071f6b50635203afd6974604fc3b5a540f27e72ba5a19fcd6a223b76e7aa0aa22da198d9a9a0d SHA512 1fbf725a4bdd8e767c3d5dad1861dc1705808c67a144755ea8b33a9f42ba5bf7b71c38b0d5522a0fea261c55c2c5375f8c32308e2f4706d6d5a99827e57482cd
 MISC metadata.xml 829 BLAKE2B 76e2e67f3ea5dc70f37a6f3e54a6afc12de689026de589b9d644766c443b62cd66068db5c56d3e63312920adb1d2ecb74a1b2515c4f36790dda650a499a81589 SHA512 c27495f97fda460389d0cc74fa97839ea0837f62997ca3e1b5ae4b70bb7d78f15d81012fc151c1c11ec00079e2ebc1121c61bdd86cbaf137e7eeccf5207e63f6
diff --git a/dev-lua/luacheck/luacheck-0.20.0-r1.ebuild b/dev-lua/luacheck/luacheck-0.20.0-r1.ebuild
deleted file mode 100644
index 857d9ef215df..000000000000
--- a/dev-lua/luacheck/luacheck-0.20.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A tool for linting and static analysis of Lua code"
-HOMEPAGE="https://github.com/mpeterv/luacheck"
-SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="doc luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lua/luafilesystem[luajit(-)=]
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-	luajit? ( dev-lang/luajit:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	test? ( dev-lua/busted )"
-
-DOCS=( CHANGELOG.md README.md )
-
-src_compile() {
-	if use doc; then
-		sphinx-build docsrc html || die
-	fi
-}
-
-src_test() {
-	busted -o gtest || die
-}
-
-src_install() {
-	local instdir
-	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
-	insinto "${instdir#${EPREFIX}}"
-	doins -r src/luacheck
-
-	newbin bin/luacheck.lua luacheck
-
-	use doc && HTML_DOCS+=( html/. )
-
-	einstalldocs
-}
diff --git a/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild b/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
deleted file mode 100644
index a22daf625f58..000000000000
--- a/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="A tool for linting and static analysis of Lua code"
-HOMEPAGE="https://github.com/mpeterv/luacheck"
-SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
-IUSE="doc luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lua/lua-argparse[luajit(-)=]
-	dev-lua/luafilesystem[luajit(-)=]
-	dev-lua/lua-utf8[luajit(-)=]
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-	luajit? ( dev-lang/luajit:2 )"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-	test? (
-		${RDEPEND}
-		dev-lua/busted
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.23.0-disable-measuring-performance-test.patch" )
-
-src_compile() {
-	if use doc; then
-		sphinx-build docsrc html || die
-	fi
-}
-
-src_test() {
-	busted -o gtest || die
-}
-
-src_install() {
-	local instdir
-	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
-	insinto "${instdir#${EPREFIX}}"
-	doins -r src/luacheck
-
-	newbin bin/luacheck.lua luacheck
-
-	use doc && local HTML_DOCS=( html/. )
-
-	local -a DOCS=( CHANGELOG.md LICENSE README.md )
-	einstalldocs
-}
diff --git a/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild b/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild
index d39540a1c32e..c6355186b786 100644
--- a/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild
+++ b/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mpeterv/luacheck/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 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/luacov/Manifest b/dev-lua/luacov/Manifest
index bcd30882bb93..9164bb9c2a0e 100644
--- a/dev-lua/luacov/Manifest
+++ b/dev-lua/luacov/Manifest
@@ -1,4 +1,3 @@
 DIST luacov-0.14.0.tar.gz 49571 BLAKE2B 2248fc00e1af0a1cdec923bbe6150ae682cc1ba814c77f21bc86269d723ea80542fb48fe62980de2527040598b7b9c87f92f146d6c62abde06651fa6733c75c5 SHA512 44ea158ce597f705d80b9768676e401804daea91b9c2afb146a8d25aae612e895e4f42a29c4b7b3438659c596fa500af5d23b66b7f3477459747ad06ca9b7ffa
 EBUILD luacov-0.14.0-r100.ebuild 926 BLAKE2B ae2b4f00201d9a4d17ffabd7ea0d070fded35bc937a8104a4fd9c197911be780cb1c1026498bc9f5d02e4d85b1c4014ea6fa9b4ea4013bbe9bdf9839289672ca SHA512 85d48dead19eca935b1953c3765ef71095a59c05bb3dfee2ee1d4c024e68e9312fb47c343ea0834ac6adab6e8278e0f0f9daba055c10a3f49808a6e6356742ca
-EBUILD luacov-0.14.0.ebuild 918 BLAKE2B ba1ac686f6c27cd20c60305d033871a32ced04a14568d964c0e0218ded7bdde382bd21c3dd27708518f3d7a5394305c369313830f59d56c9c597d2a751dcf28e SHA512 dffd8fe81badd34b30f934f920db250d5de56ce9ae4c41d3ce79b1ce0a0e588f0394dbc13c5210bd5edeb581984ba71f5a08ed14a0127ab9b698d00a3a092a84
 MISC metadata.xml 444 BLAKE2B df7d267a7898a881b15602c91495029c54b064d8a3415ed44d404cad9425ed78269470f632df654291838bfa10e0f34a3dc0deec6f3bae979d6495ea4b4b14c1 SHA512 d9238e357035e46dbb66af1ff1a7a5e1c552b31f5c9cc526183dea163637fb94058a1345cdf73682d49494d9eb9995d802c4b7bcbac54787dbbe6c2a5de42ae1
diff --git a/dev-lua/luacov/luacov-0.14.0.ebuild b/dev-lua/luacov/luacov-0.14.0.ebuild
deleted file mode 100644
index ab0c2bbc60d2..000000000000
--- a/dev-lua/luacov/luacov-0.14.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A simple coverage analyzer for Lua scripts"
-HOMEPAGE="https://github.com/keplerproject/luacov"
-SRC_URI="https://github.com/keplerproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="luajit test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-lua/busted
-		${RDEPEND}
-	)
-"
-
-HTML_DOCS=( "doc/." )
-
-src_test() {
-	busted --lua="$(usex luajit 'luajit' 'lua')" || die
-}
-
-src_install() {
-	dobin src/bin/luacov
-
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
-	doins src/luacov.lua
-	doins -r src/luacov
-
-	einstalldocs
-}
diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index a6b08d26a6d0..8b8f35218b70 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -1,5 +1,4 @@
 AUX luadbi-0.7.2-mysql-8.patch 1920 BLAKE2B 5b8f65c9a6966df0bd18487e09effc073fb4ce9ed7913e1b9397ae722a2fe8cc04bcd8f5dce403fc5181fef8f95bdf71bffd00cb5b99932c6cf48e00daa49175 SHA512 436aa613eb420126f158103bc7c36cb3cc2a680c76d32e6239c2b310b7367bd5275c85640645d904ffee059b970095e8176df23dbca8b54aa13f436a619e2f6f
 DIST luadbi-0.7.2.tar.gz 36462 BLAKE2B 581c7353bfa36b3f6cabed2df78372f8810300bf4525bf8d370e61d469f9daa5a5c40c58916164a8d0a621a61e983e85c67b23ef03f51212be79f09ad8512047 SHA512 891f99cbc8f1b5327ef820641a1608abf41410f2f28584b975cc3cf65154b9bebf6f1b9ca7d1818b9c965738ad700dd17ae042dfd2a7146cf755871ebae535b9
-EBUILD luadbi-0.7.2-r102.ebuild 1814 BLAKE2B c84609d6d3948eed4f5f90685fdd7f04f740fd24e8f3217c24e559209292f6d639eed9dc5399ca3cddc13b8ea8f28689c3e6787d3ba74b7757272d50ec1c6359 SHA512 05cc330aab3d196130f87730d10d1c79199953ee7a1f1b5071d9a087232e0d89cab3bc2b99dfabf7c4b8c95fd62f1b9080abf0efccdb8315ba0673905ac0bea6
-EBUILD luadbi-0.7.2.ebuild 1580 BLAKE2B c496005647a4783c57f2a7cd7482a46dc92e5efbc8e1760e26255270f04d2bfa5947b8d7792bc8a8d3f6ac75d2db89ce36841e3f5a8094670f95a31da60ec513 SHA512 135ad359cf5c5e4a3ad2cec2c436f624d52e49954f6fd44f2b28a58733c14a63eb145574f1a5677cf3063c737a21cb25648fcfe32a01e2ca7ca6707b89b65eba
+EBUILD luadbi-0.7.2-r102.ebuild 1810 BLAKE2B 4edccbc8bef8ce374a5ed067f3765e6cb0e43059526d8c9c5dd72c9ff32b3cdf11c4500e749038bf72d75b44a2842f446a1084c61634e3c8589b9790e763ea82 SHA512 7890e40014646c6d52973caf0035705ee5a87c063c7d278744708f49d288bd502aa8c6500adc5820c73b1abf79589d3b6034346004f82d44e743a0050c40bc4b
 MISC metadata.xml 328 BLAKE2B c167ea2fe2bc0e9d84453ad1e1d7b703b862d927ea1ed775b68f6928f35d02f0d5b08ba5a910ae666fd826003dea923de1dfc7970d3a349943b6eb7a977cd137 SHA512 bfed24b1441ac6dad0a42125d1e3077e5f78a080bc6a495b9ef3447f423ea248b794650583a96681e7ad42802517309feabd268eb65af63e1c101503b418c030
diff --git a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
index 8958edd4d2c1..178c82c225c6 100644
--- a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mwild1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="mysql postgres +sqlite test"
 REQUIRED_USE="
 	${LUA_REQUIRED_USE}
diff --git a/dev-lua/luadbi/luadbi-0.7.2.ebuild b/dev-lua/luadbi/luadbi-0.7.2.ebuild
deleted file mode 100644
index 2ddcc6056bdc..000000000000
--- a/dev-lua/luadbi/luadbi-0.7.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A database interface library for Lua"
-HOMEPAGE="https://github.com/mwild1/luadbi"
-SRC_URI="https://github.com/mwild1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="mysql postgres +sqlite test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-lang/lua-5.1:0=
-	mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-0.7.2-mysql-8.patch" )
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-g //' -e 's/-O2 //g' -i Makefile || die
-}
-
-src_compile() {
-	tc-export AR CC
-
-	local myemakeargs=(
-		"LUA_INC=-I$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)/lua5.1"
-	)
-
-	use mysql && emake ${myemakeargs} MYSQL_INC="-I$(mariadb_config --libs)" mysql
-	use postgres && emake ${myemakeargs} PSQL_INC="-I$(pg_config --libdir)" psql
-	use sqlite emake ${myemakeargs} SQLITE3_INC="-I/usr/include" sqlite
-}
-
-src_test() {
-	cd "${S}"/tests && lua run_tests.lua || die
-}
-
-src_install() {
-	local myemakeargs=(
-		DESTDIR="${ED}"
-		LUA_CDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
-		LUA_LDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
-	)
-
-	use mysql && emake ${myemakeargs[@]} install_mysql
-	use postgres && emake ${myemakeargs[@]} install_psql
-	use sqlite && emake ${myemakeargs[@]} install_sqlite3
-}
diff --git a/dev-lua/luaevent/Manifest b/dev-lua/luaevent/Manifest
index d5ae4e2fbc09..e38d99879399 100644
--- a/dev-lua/luaevent/Manifest
+++ b/dev-lua/luaevent/Manifest
@@ -1,4 +1,3 @@
 DIST luaevent-0.4.6.tar.gz 22599 BLAKE2B 2f70ef105ce43d6b48e69bcc896e20a64ca49e124ad979f5191606d10bb61de1664782016b55cc9f2bc32a704d8f0b4d664eebd8176905f72f9a4e3d1e8b0fdd SHA512 21e222d5bba75fd2e623a8abf20fc3cd38505bf7d3fe94d8781ed626556c398a8501775eb423f0567918cc75f2d846026d4aa559ac5129eca8261f0c73427913
-EBUILD luaevent-0.4.6-r100.ebuild 1124 BLAKE2B 83ccd533dab8c8879348399e1b5cc96beedabe533c62372d762df569f0da6960bbdef183921bc3fb166f4fb4b0411948420ea661120691f9f013c01fe901c420 SHA512 1f7bb7ba0a56bf031500f745d2fb2b5e0f97e3240e9435368fcadd22670f8a826c31c73438aa7905bd8d57a47d5408b15a4dee0d029c786c3fe67ded2242488d
-EBUILD luaevent-0.4.6.ebuild 1167 BLAKE2B 3e5e1ea99cd1fc2a008c9a5c981e0a21d667b0bc29df7fe27c256382ca9952f1bf2bf721728f388a4b1a37add6557c8c49d016756108a339324129638524ae9b SHA512 5d97a433958bd4f49f1100a6b8200ccdac6b6fb240c4115cd63f304dfc910943734db01a0b8708f7b77a495c6ad36bd0218a387c8f091220bd910c81f4fd7d88
+EBUILD luaevent-0.4.6-r100.ebuild 1120 BLAKE2B 89bb62212fa7786bc76c6a4f62bfd17cc791f549f9ba81b44fd44bb0f8f3e60460ef4bfc8fa90bbed4a02a51ebd3e9313ca8ebdc200794f2d80b80f9fe56e254 SHA512 94955aa252f829b67237ec3b3a0fdf4a4e0d34f09db18d4c6ef6cbac0ecf6e1f1f31064722770c3b57521f7dcc28a000616e1fe967dd1f6688c6b0d0cf116bf0
 MISC metadata.xml 412 BLAKE2B d38a312a6841ec1c241efdfd7582fc6059578291015bbf4a90fa669864d2e831099c24dd2bd46c73d946613a5440ad52d4cdf1bd87ca468e25bbb259e1495aa4 SHA512 63aafaff1b4115b3f1f530563e417dd6c6cfad2a62e8be3deaeb1b49a2154efc9756073636c2efa11d534c3019c33bdda0cf9c420f6d0713790f26206ccb2d19
diff --git a/dev-lua/luaevent/luaevent-0.4.6-r100.ebuild b/dev-lua/luaevent/luaevent-0.4.6-r100.ebuild
index 3ada51666ed5..419459bc671d 100644
--- a/dev-lua/luaevent/luaevent-0.4.6-r100.ebuild
+++ b/dev-lua/luaevent/luaevent-0.4.6-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/harningt/luaevent/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-lua/luaevent/luaevent-0.4.6.ebuild b/dev-lua/luaevent/luaevent-0.4.6.ebuild
deleted file mode 100644
index 1e2debab47c3..000000000000
--- a/dev-lua/luaevent/luaevent-0.4.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="libevent bindings for Lua"
-HOMEPAGE="http://luaforge.net/projects/luaevent"
-SRC_URI="https://github.com/harningt/luaevent/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-RDEPEND="dev-lang/lua:0
-	dev-libs/libevent:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i "s:^CFLAGS =:CFLAGS +=:" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "s:^LDFLAGS =:LDFLAGS +=:" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "/^LDFLAGS/a CC = $(tc-getCC)" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "s:^LUA_INC_DIR ?=.*:LUA_INC_DIR ?= $(pkg-config --variable INSTALL_INC lua):" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "s:^INSTALL_DIR_LUA ?=.*:INSTALL_DIR_LUA ?= $(pkg-config --variable INSTALL_LMOD lua):" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "s:^INSTALL_DIR_BIN ?=.*:INSTALL_DIR_BIN ?= $(pkg-config --variable INSTALL_CMOD lua):" "${S}/Makefile" \
-		|| die "sed failed"
-	eapply_user
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index db5ec3093f9f..61cb7a6e1981 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -3,8 +3,6 @@ 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-r102.ebuild 1307 BLAKE2B b6d868b911198feb7e43feb4ef33076315755c776f64953967efc0b8ef56405ba4acdbfa121d2a572a9ef00f1329182d7438378a2e720a7908b3a275d5314c45 SHA512 4b0ebeb8fe24b4644e3fab77972be0a51aaa4ecfb3b7bdc72d8b11ee7d268677bac2b42d219964a242c232ecad6cb6ae834588cf7f3afa6be7a7a8a6984e4b69
-EBUILD luaexpat-1.3.0-r2.ebuild 1174 BLAKE2B 43efb15693c8c75e115e8976d125a9fdf5c4b30250ac5dfdd9b4c1e5044a5545461203507077e4b8de9d2902808e130a5567e9b881cf22c2613327f16e387e6f SHA512 2b6e0ab5b3b71124b5441776e3be1531a14897ade4c956e68242bea53e21da375c010375471b942d1f1d6cf5e2f56c65ad1fa0bb408825bcae3644de6b8daf20
+EBUILD luaexpat-1.3.0-r102.ebuild 1300 BLAKE2B 6b1cbe312b3f721730da4560691a19da06d508da6b1bcd2bb2f0430e6cec8e38827221c4b8bc1e0e6b68c0755b9f3f564597160501e46480ce239d1fb60364ff SHA512 9d330f301ff36ab144add129c9f4106e84231b1e5f38b328e7e4d2cf827e4d5c7c4de9060ab22d3c69ba2d19421d788a4a1e356e0a7efa1ec88c6fa32388025f
 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-r102.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild
index ce6096ca0c47..a3ddb21e5619 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://matthewwild.co.uk/projects/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r2.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r2.ebuild
deleted file mode 100644
index 37600917577e..000000000000
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
-HOMEPAGE="http://www.keplerproject.org/luaexpat/"
-SRC_URI="http://matthewwild.co.uk/projects/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
-
-RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i -e 's:-g::' -e 's:-O2::' Makefile || die "sed failed"
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" \
-		LUA_INC="-I$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)"
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LUA_LDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" \
-		LUA_CDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)" \
-		LUA_INC="-I$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)" \
-		install
-}
-
-multilib_src_install_all() {
-	dodoc -r README doc/*
-}
diff --git a/dev-lua/luaexpat/luaexpat-1.3.3-r2.ebuild b/dev-lua/luaexpat/luaexpat-1.3.3-r2.ebuild
deleted file mode 100644
index 5b99b5d96bac..000000000000
--- a/dev-lua/luaexpat/luaexpat-1.3.3-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
-HOMEPAGE="https://matthewwild.co.uk/projects/luaexpat/ https://github.com/tomasguisasola/luaexpat"
-SRC_URI="https://github.com/tomasguisasola/luaexpat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}_makefile.patch"
-	"${FILESDIR}/${P}_getcurrentbytecount.patch"
-	"${FILESDIR}/${P}_restore_functionality.patch"
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" \
-		LUA_INC="$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)"
-}
-
-multilib_src_install() {
-	emake \
-		LUA_DIR="${D}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" \
-		LUA_LIBDIR="${D}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)" \
-		install
-}
-
-multilib_src_install_all() {
-	dodoc -r README.md doc/*
-}
diff --git a/dev-lua/luafilesystem/Manifest b/dev-lua/luafilesystem/Manifest
index 1b5621a0b987..c08b2375ae11 100644
--- a/dev-lua/luafilesystem/Manifest
+++ b/dev-lua/luafilesystem/Manifest
@@ -1,4 +1,3 @@
 DIST luafilesystem-1.8.0.tar.gz 30374 BLAKE2B 396dc1a4604b88d9a0cfccf252623a65bcd45859547a56d3d860efd2b960329696ff92cb63064c12ee56ed234e04d881b5ca876154b3bd714d39f6ed9da79986 SHA512 79d964f13ae43716281dc8521d2f128b22f2261234c443e242b857cfdf621e208bdf4512f8ba710baa113e9b3b71e2544609de65e2c483f569c243a5cf058247
-EBUILD luafilesystem-1.8.0-r1.ebuild 1074 BLAKE2B 5fb971448dfb2fd52e15d05dccbed4a685eee4501d23ae260ea42747dcfe8923c22153f3bc9d8cd3fca4051477d2721b8e050607c2ef287592c55f460f8f5105 SHA512 0a7636dd88865d9b0139a376e0129e48ca83f422401ac598b47c118fe3fb7eb79a87280f5f8fb8963d2fb88145155180521e0519b58fb580c0a5a8b078c1a94b
-EBUILD luafilesystem-1.8.0-r101.ebuild 1515 BLAKE2B 31bf46921da517929e7039756a21d1bdf38a3a2ad8324a3304fbbe5aac787f0cd210f053557c2e3144733c707f62e03ac11bcda484f79f22dff1bc58a5138a53 SHA512 cbfb607b3513b63a98d82ae77422e78b9732b68b1ccb886e32af68e2d8c63866a9fb8f755110623ee816924cf352a5eb73e2e7dc70a4cd8780b49d2fd34348a0
+EBUILD luafilesystem-1.8.0-r101.ebuild 1508 BLAKE2B 970f0ad484ed999d371adad1e38191953a2d7eb65384ba3a2faf9c67dac232d45db71b482cfec1a44db757c6b5b71c0c3ba979b420c5415a7123a0b4be129db0 SHA512 38652c0cb65a820257ccb051486e584830b846b2bdaeff693aa7d9a896214fda285d7f79f3745ed091599fb850b61b7654ccd1db193a5098e97d46640e31d1d2
 MISC metadata.xml 858 BLAKE2B 6f50e96acfa2b1aa606c616eda03ac35c214902a2d39dee101ecc32a3f1fe91980d4f735e4ecf066133d573910b10dda51ca1e57421f9f5327148e74fde3212f SHA512 6816a7b67fd5c7cab8cf90b2e096877e360e482644b339214becbc47dcd6b1b6a3e49470a481493dc31fe611d8c8ff7470b7c4eb5080bcd201e6543dbf3f2a7a
diff --git a/dev-lua/luafilesystem/luafilesystem-1.8.0-r1.ebuild b/dev-lua/luafilesystem/luafilesystem-1.8.0-r1.ebuild
deleted file mode 100644
index 0366ccae8958..000000000000
--- a/dev-lua/luafilesystem/luafilesystem-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV=${PV//./_}
-
-DESCRIPTION="File System Library for the Lua programming language"
-HOMEPAGE="https://keplerproject.github.io/luafilesystem/"
-SRC_URI="https://github.com/keplerproject/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
-IUSE="luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/lua-5.1:0
-	luajit? ( dev-lang/luajit:2 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${RDEPEND} )
-"
-
-HTML_DOCS=( "doc/us/." )
-
-src_prepare() {
-	default
-
-	cat > "config" <<-EOF
-		CC=$(tc-getCC)
-		CFLAGS=${CFLAGS} -I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua')) -fPIC
-		DESTDIR=${ED}
-		LIB_OPTION=${LDFLAGS} -shared
-		LUA_LIBDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))
-	EOF
-}
-
-src_test() {
-	LUA_CPATH="src/lfs.so" lua tests/test.lua || die
-}
diff --git a/dev-lua/luafilesystem/luafilesystem-1.8.0-r101.ebuild b/dev-lua/luafilesystem/luafilesystem-1.8.0-r101.ebuild
index 0a5ee44a7d7c..d3ff6e739573 100644
--- a/dev-lua/luafilesystem/luafilesystem-1.8.0-r101.ebuild
+++ b/dev-lua/luafilesystem/luafilesystem-1.8.0-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/luajson/Manifest b/dev-lua/luajson/Manifest
index 64377feac181..79680a243c18 100644
--- a/dev-lua/luajson/Manifest
+++ b/dev-lua/luajson/Manifest
@@ -1,6 +1,3 @@
-DIST luajson-1.3.3.tar.gz 42653 BLAKE2B 2bc7310317a1279906681c2de284dc7b9d50766c0c21c606da746d0e709168e5364c3a821798f3ce423dfdd246162212525c1fee7c13cb5f0999db56d1e5e3c3 SHA512 9b507148afaf59871f97e7cf78ad35dc01497d553699d1d1a928543fad6a375aebc3852da86d51d744f10ab2ec24c7b1d7c380852da8134ae05f2f22f6f200c2
 DIST luajson-1.3.4.tar.gz 46941 BLAKE2B 50c8c20c487f92fd19b3e080a87eec58c2cb30d83dfc6acd7aca3f155a04f85a194c069f735a2881e14b0eb3fd3b16e4a75ea625ac81c65b9e25cb1c3601673c SHA512 d24dc8399337b96cde3254a83e5cc1fa995b76f0e1fae54ad91a490f0a6f4c5d0927919320f99d7bc4238ac5529d0ea57435c6be2519fb52e2a83f5005fbc4f7
-EBUILD luajson-1.3.3-r1.ebuild 717 BLAKE2B 2979a988cec939d66bda0326af0f50c0cae2e70b546289a014966025deb3ad7e896a347ac18d518e2d6554a0e480ff2be0eef0fc516e72af2a1be3600394f649 SHA512 e932872553f077207e134bbd6c9e524984b7b80c38780ff0b61d1957e8820ddb4a97a849d614845d20c53ee58f5e0c8ab3f9f1db899728834bc349c89edc925b
-EBUILD luajson-1.3.4-r100.ebuild 829 BLAKE2B 9ea935a008b6c54953e9c7588de28b93f1fb2f2bdccc36cb5ed005b34ebb58caa6271d722f566ed69e41c104eb1218e893559d13d45b2351e5373391cab8ccb4 SHA512 d5aa6b0af940b30ca1439537f886ee4597e42e12c110cbcc947edc1e78ca41dd3b86039667db1c45b85f4ef99c0609e22e1184b87ef9394600f0e19aa9f52bfe
-EBUILD luajson-1.3.4.ebuild 883 BLAKE2B f979c521af83e134b7773dfab4b90f3738e72fe9d5b402db2a4c6124109c0db98003b13d80916519b2616c7f2825c4bc123f642c11c19aab9d263d96d3ecfd43 SHA512 f6c7695856cf28abf436e2177f58b1d084d08a8d94144594bb50ed1b5ca210e9af0783a4f4a9123e8ce3838f373ab2a417998e4e2b210a3c05df40528ce8d86a
+EBUILD luajson-1.3.4-r100.ebuild 824 BLAKE2B 0bfe6927b00504384070d8c0a71df0b6c929078354dfc807fc421622bcce8667db235395ddc6b31a17e6a1e645062ae5baf82dbb0aa03ee4bdebd1ccb4bd61be SHA512 822c2f3c8bb6710a429b0342502a45f102466400ce2b5b5e4cb81adf6a9de0bb38ba03590a1e2cfdcd1ace11b53ceb74dcace5043c99336cde73dcdc2ec9f36a
 MISC metadata.xml 253 BLAKE2B 9a21f2ec285f683bc6766396dc836716c6cb52b0b6829a18144d50010d199b93bd0e47216e958f08e23e7c047b11446f4aa127a8b8ca425ce61b247b0593b6d9 SHA512 0ffb4892273cb493c3afaa3adebb9757669fce7e4135ebbefe066511f4319f1e1b60f306e9a9a2a7ea64bcab53515cd342f8e677c232c1966e02c04599bfb75c
diff --git a/dev-lua/luajson/luajson-1.3.3-r1.ebuild b/dev-lua/luajson/luajson-1.3.3-r1.ebuild
deleted file mode 100644
index 48f67efbcaae..000000000000
--- a/dev-lua/luajson/luajson-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="JSON Parser/Constructor for Lua"
-HOMEPAGE="https://www.eharning.us/wiki/luajson/"
-SRC_URI="https://github.com/harningt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
-IUSE="test"
-
-RDEPEND="|| ( >=dev-lang/lua-5.1:0 dev-lang/luajit:2 )
-	dev-lua/lpeg"
-DEPEND="test? ( dev-lua/luafilesystem )"
-
-# lunit not in the tree yet
-RESTRICT="test"
-
-# nothing to compile
-src_compile() { :; }
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-	dodoc README docs/ReleaseNotes-${PV}.txt docs/LuaJSON.txt
-}
diff --git a/dev-lua/luajson/luajson-1.3.4-r100.ebuild b/dev-lua/luajson/luajson-1.3.4-r100.ebuild
index f06cd069d628..2fe781e7093e 100644
--- a/dev-lua/luajson/luajson-1.3.4-r100.ebuild
+++ b/dev-lua/luajson/luajson-1.3.4-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/harningt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/dev-lua/luajson/luajson-1.3.4.ebuild b/dev-lua/luajson/luajson-1.3.4.ebuild
deleted file mode 100644
index 23394e143028..000000000000
--- a/dev-lua/luajson/luajson-1.3.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="JSON Parser/Constructor for Lua"
-HOMEPAGE="https://www.eharning.us/wiki/luajson/"
-SRC_URI="https://github.com/harningt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="luajit test"
-
-# lunit not in the tree yet
-RESTRICT="test"
-
-RDEPEND="
-	dev-lua/lpeg
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:0 )
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( dev-lua/luafilesystem )
-"
-
-DOCS=( README.md docs/ReleaseNotes-${PV}.txt docs/LuaJSON.txt )
-
-# nothing to compile
-src_compile() { :; }
-
-src_install() {
-	emake DESTDIR="${ED}" INSTALL_LMOD="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))" install
-
-	einstalldocs
-}
diff --git a/dev-lua/lualdap/Manifest b/dev-lua/lualdap/Manifest
index 70b16ed6468e..974d59fe44e1 100644
--- a/dev-lua/lualdap/Manifest
+++ b/dev-lua/lualdap/Manifest
@@ -1,4 +1,3 @@
 DIST lualdap-1.2.5.tar.gz 85920 BLAKE2B 14015fe258fa391e08fc9b6bdb7a71dae10fbd84636cc3d84c446d67f9d0ea925c0086343a29ce21b81f77c87da37040560c631cdf3df7c8d3c255e5913fd985 SHA512 4fbd7bcea2e55a3b165a7316e4f6c45aee22506915c4cc204d1b5006adbf95611ebf4558c1ef1511f90d7142571cff37ea24952072dc7ecb13bbbe06aef32e72
 EBUILD lualdap-1.2.5-r100.ebuild 1445 BLAKE2B 83928ee3e5d1f7fb97ac5687c8d01a4c22eb8422d9de089492dc8b217a009e6610d8c1104f90d98f1718e75bcdcc3b4e8d9ae52c90652710606051c0c8c93994 SHA512 3b4b758d7a9b1bb436b2bdb59de6f8f7804217b14edefe9575ad77610cf729e8ef0b07f2cb5ac7987a88b00e2dea35eae90dc8b2ea5445c463a98d524e13d148
-EBUILD lualdap-1.2.5.ebuild 1292 BLAKE2B 6a7d2f6dbdcab3305591b316ed8bf5d52bdbd6c46dee9b543cb49c04c53b4c32b504553ee0e60e31166d8f1a38036891bd9f336cfa84a2955992a9a0d3de3e2f SHA512 d6d0cb3ae13eb7b562b515805b3bcc5bdf1fdc17b50aadd000bd8fbb2d6cf4363d72d242ddf944cd05d93620e3e5dcbea5a5d0c8499767e4c4865efc4d8cb5a8
 MISC metadata.xml 547 BLAKE2B eac91a6aa0723c8442142daad10af992c7142bafbe29f9ec748418b49eac2dc4bbd034ae4994026238eb8f7339f9d86e7c823f3c33a54a4fbde13e8f2fe8ddff SHA512 d893b983ca2b1bba4de32a90f9b0df79fdb30ee937d978ae506b2c07c7ae6d9d0d8c4e9ecbf09f6e2b4d54e95bef8482035b63672a41119e30d74244674c3f10
diff --git a/dev-lua/lualdap/lualdap-1.2.5.ebuild b/dev-lua/lualdap/lualdap-1.2.5.ebuild
deleted file mode 100644
index 9d530b5b471e..000000000000
--- a/dev-lua/lualdap/lualdap-1.2.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A lua binding for the OpenLDAP client libraries"
-HOMEPAGE="https://github.com/lualdap/lualdap"
-SRC_URI="https://github.com/lualdap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="luajit test"
-RESTRICT="test"
-
-RDEPEND="
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:0 )
-	net-nds/openldap
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${RDEPEND} )
-"
-
-HTML_DOCS=( "doc/us/." )
-
-src_compile() {
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LBER_LIBDIR=/usr/$(get_libdir)"
-		"LDAP_LIBDIR=/usr/$(get_libdir)"
-		"LUA_INCDIR=$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_test() {
-	LUA_CPATH="${S}/src/?.so" $(usex luajit 'luajit' 'lua') tests/test.lua
-}
-
-src_install() {
-	# Workaround, as 'make install' does not create this directory
-	dodir "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
-
-	local myemakeargs=(
-		"DESTDIR=${ED}"
-		"INST_LIBDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	einstalldocs
-}
diff --git a/dev-lua/luaossl/Manifest b/dev-lua/luaossl/Manifest
index da10c2b107a2..5162e791934a 100644
--- a/dev-lua/luaossl/Manifest
+++ b/dev-lua/luaossl/Manifest
@@ -1,4 +1,3 @@
 DIST luaossl-rel-20200709.tar.gz 352960 BLAKE2B f4cd53937d7a9c724ab9f2f6a13f1da8fa54216f01fe2af7e65cf7ebdad1f8740491ba1fc6bcc2bf4ac377bde0d2e370433e76a5105c6226e0d9745e12bec0ea SHA512 324175f65e9d292ecb1343cfa9e111f1fd17f15e67037bd705d3db95d32b859c039a6e70620d649f446a8e7043a125a75c64de1714f0fe18e077fb9c017bea34
 EBUILD luaossl-20200709-r100.ebuild 2041 BLAKE2B 81332442754a17ecb826e254429301da076efa0240ebfae352c9ce8ef086f86d12b92dfe63dbec77b94584285fe792003c6ddd83e2cc3169cafd1a18be9bccd4 SHA512 faa5b11b60218854f01711cf80821f3ba4ef25d73916349d95ef32b4fed15383286e95872543cf065ea9518efaf55fbdcdacee8a8c5e7815bc1eecf82c6edaba
-EBUILD luaossl-20200709.ebuild 1628 BLAKE2B 91b398e34cf60bf13b8dbe644a8de5aa46579bbf6ca457d8d4a16674d25fbc880151e353de0b53d633eda307c0b85461a4d7341015cea5fda89e0288de600610 SHA512 cb1fcaf7d2a9cbcd5cc58dab5acb4a6e0b083b8ed674088fddd2442aef442b669c9f6325bffd4c2dc5ad5b85cdef376838e1717a97eed7b72061d95313805a94
 MISC metadata.xml 557 BLAKE2B e42a835d0d6ed6481cd2be9a1c102c949f1d4a01526eba3c4634e3d28f9aa9d1ef67e0d82601c19869e7bf8db08167d3207834eb01d56111c50b8934102a8a0f SHA512 ea4a1248a41fa80097fb715819eec012c1e0b0f020397e548579d56e3ad2eea6a606b82d60a2df5c6acca7a4dbd91138cccd379fa59c1c9325456852eb4d018a
diff --git a/dev-lua/luaossl/luaossl-20200709.ebuild b/dev-lua/luaossl/luaossl-20200709.ebuild
deleted file mode 100644
index 0e4aeb687ec1..000000000000
--- a/dev-lua/luaossl/luaossl-20200709.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-rel-${PV}"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Most comprehensive OpenSSL module in the Lua universe"
-HOMEPAGE="https://github.com/wahern/luaossl"
-SRC_URI="https://github.com/wahern/${PN}/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="examples luajit"
-
-RDEPEND="
-	dev-libs/openssl:0[-bindist]
-	!dev-lua/lua-openssl
-	!dev-lua/luasec
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "doc/." )
-
-src_prepare() {
-	default
-
-	# Remove Lua autodetection
-	# Respect users CFLAGS
-	sed -e '/LUAPATH :=/d' -e '/LUAPATH_FN =/d' -e '/HAVE_API_FN =/d' -e '/WITH_API_FN/d' -e 's/-O2//g' -i GNUmakefile || die
-
-	# Set LUA version
-	LUA_VERSION=$($(tc-getPKG_CONFIG) --variable=$(usex luajit abiver V) $(usex luajit luajit lua))
-}
-
-src_compile() {
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"ALL_CPPFLAGS=${CPPFLAGS} -I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
-		"libdir="
-	)
-
-	emake "${myemakeargs[@]}" openssl${LUA_VERSION}
-}
-
-src_install() {
-	local myemakeargs=(
-		"DESTDIR=${D}"
-		"lua${LUA_VERSION/./}cpath=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
-		"lua${LUA_VERSION/./}path=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
-		"prefix=${EPREFIX}/usr"
-	)
-
-	emake "${myemakeargs[@]}" install${LUA_VERSION}
-
-	use examples && dodoc -r "examples/."
-
-	einstalldocs
-}
diff --git a/dev-lua/luaposix/Manifest b/dev-lua/luaposix/Manifest
index 7af9d95253d2..344079e90aff 100644
--- a/dev-lua/luaposix/Manifest
+++ b/dev-lua/luaposix/Manifest
@@ -1,4 +1,3 @@
 DIST luaposix-35.0.tar.gz 178091 BLAKE2B b2d2ca01f18f0e98b45008919fc886e05d2cad034c84e870900c33891dd5867d9bc7aa8deae06c3f3f0852db902c1e766e693162b32ed474eb710b379bf9e3ed SHA512 4bb61892b78d9e59418a9a6360b9f611fb9b5438b9261a2c6672f053a1b21dfd9a2060b8d2f0d3eac6185773cf84672c1769c081c4ab53d2ddae2232e4a9269b
 EBUILD luaposix-35.0-r101.ebuild 1732 BLAKE2B 4b1e5602401ad2322ea394813f2ca4e6e271d7d941b2564e81f873493b2d8781571d1f1e4f1be7b3243e51f160b88bc85e6cc02f17a710239aa4c18c7d11f0f1 SHA512 8c5b28c3ecdc79777dea414cf0707e79af558221e8b61c2c50bd5461c6a7c534780cd822c2781b1be67cd9cf19b3ea05150e1954128ced63262c95b7223a7d78
-EBUILD luaposix-35.0.ebuild 1266 BLAKE2B 49d1d6db7709ae309d926c96ddbd75b2e60aa49005c256dacb57813399e81bbe3350694f308b62b097d723c5f696c1093ab28984e9ea16c50c7eded815a1d2d3 SHA512 a8048912aab2aac73f0f21e56c7fc3a6a05af3d97dc14472ffd92ce50c94d78d80ca87ddd3fed41b4c4bf54d1908c767155c84750d018f1e660c3f5f522a1b21
 MISC metadata.xml 474 BLAKE2B c2297ba4eae7fdfaf22dd9f93fe1f41a48ed085a3493fd30dc23e186bc89c5b6f0dc535fad0e15af24f8d9498c38ee8e99f7fafae0ac2969d91cca96fefe4ba6 SHA512 b0acb936e00d9668b5cad5478243d3067677ee015451cc06d0a7165a0e87035d23347f8dd40f481088be178d0ca6d06486b8984910021171903a37be970519e4
diff --git a/dev-lua/luaposix/luaposix-35.0.ebuild b/dev-lua/luaposix/luaposix-35.0.ebuild
deleted file mode 100644
index efcbfd7161c0..000000000000
--- a/dev-lua/luaposix/luaposix-35.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Bindings for POSIX APIs"
-HOMEPAGE="https://luaposix.github.io/luaposix/ https://github.com/luaposix/luaposix"
-SRC_URI="https://github.com/luaposix/luaposix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="dev-lang/lua:0="
-RDEPEND="${DEPEND}
-	dev-lua/lua-bit32"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	# Temporary fix for respect LDFLAGS (#739050)
-	# Fixed in luke 0.2.1
-	sed -i -e "s:c_module,libdirs:c_module,'\$LDFLAGS',libdirs:g" \
-		build-aux/luke || die
-}
-
-src_compile() {
-	./build-aux/luke package="${PN}" version="${PV}" \
-		PREFIX="${ED}/usr" \
-		INST_LIBDIR="${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)" \
-		INST_LUADIR="${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" \
-		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	./build-aux/luke install \
-		PREFIX="${ED}/usr" \
-		INST_LIBDIR="${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)" \
-		INST_LUADIR="${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" \
-		|| die
-	dodoc -r doc NEWS.md README.md
-}
diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
index b5ef14c52baf..c78b6af9a343 100644
--- a/dev-lua/luarocks/Manifest
+++ b/dev-lua/luarocks/Manifest
@@ -1,5 +1,3 @@
-DIST luarocks-3.3.1.tar.gz 241636 BLAKE2B fd34d7a233bbf1c5f224bd04886a7f1382d63ffc014c8b78ae7924fb799d66a32e048298deed103686771263885c85c9173c013d1bbb3bad6a48e9fd99fdaac0 SHA512 0a695ceb30ae575cbca52abd2aad9675e33a234c53c5d1e125442d874c21e0e3cf6157431f07085e4311f81833680366adfe5c626a66cb5880380b48899a116a
 DIST luarocks-3.5.0.tar.gz 244798 BLAKE2B 24ceead8953ad6d9eefbf471fd49e0bd82256cc00c201395770919a680873544db67f062a4af93ddd390985b0b74db55e37a95516287dfc1e077a25b67c9f264 SHA512 fda01b7149839adf7c0e1c05d0f1793e79575c5d378d96ee1e197828e9b9b6e89a635f8a26a5b71db5b48465ef74b219fac18ecdbd59962cbf9da613b05dd42a
-EBUILD luarocks-3.3.1.ebuild 897 BLAKE2B 11b7a1565b1dc071de54d8f8e0756b754ec65404db51c384e5b60ec506145bbf7cb69314ac04bd5ae83df25b169275a83ffefb627044a44da876144b4652c7ea SHA512 9de5f55078432880ad6e749bf50f150588ae322a1fed21c66bc5c331d1f9dcec85fb6f62ec48c11ec982c232b5beba7039e7e0473825f3871530f82ec58abb5e
-EBUILD luarocks-3.5.0.ebuild 2076 BLAKE2B b598d09243e6ad9e2e9ee2a2780bce7f6f09a06fc479c910c5314783746b9f9c43938426e99481596b0d5ba4933b5d1c6fd0e27436e7e3dfdeec016e6ceb766d SHA512 24272732993ae8a2b3095ecadc3fa26fc2c1308513aac0be91b902a5156c641799a8c90c32b4c4ed7afc609ac460bd9e13ad4ac1e69467372b892ac3a60ceb2b
+EBUILD luarocks-3.5.0.ebuild 2072 BLAKE2B 51e11591cb4656216c89e631ed6ba210e4d332c01a445c9dac8894b6e64425496967dcf154273e5fc8d4aada69fe306d358f486c42611c12f86ac19d7f5131fc SHA512 f18eb188101c8e944c1a84aa5e5687fb8d21f4a82739399aad429dcc17bc1117e7084b13010c837d1ad4afcab9f08cd6ac775d41afa916111f96b461b38e9ac5
 MISC metadata.xml 724 BLAKE2B 690486dab66b070c7ec5f7e71db2cced3d1c191acbbcc3d86bc7b4dcb90796c5b1cb712a4cad42462dc9bedecfd5de330b02447bd7ccf89b89b57905871a555f SHA512 7d8d58c931e5134bd261a05539d3d2e54648fe538a4c65397b78be325feeb4da04d93fc1ff81e2d3b6fd062cc2d94f8cf9958865ca968c1805fc915bcf287edb
diff --git a/dev-lua/luarocks/luarocks-3.3.1.ebuild b/dev-lua/luarocks/luarocks-3.3.1.ebuild
deleted file mode 100644
index 921f56440198..000000000000
--- a/dev-lua/luarocks/luarocks-3.3.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A deployment and management system for Lua modules"
-HOMEPAGE="http://www.luarocks.org"
-SRC_URI="http://luarocks.org/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="libressl"
-
-DEPEND="dev-lang/lua:0="
-RDEPEND="${DEPEND}
-	net-misc/curl
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:0 )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	# econf doesn't work b/c it passes variables the custom configure can't
-	# handle
-	./configure \
-			--prefix="${EPREFIX}/usr" \
-			--with-lua-lib="${EPREFIX}/usr/$(get_libdir)" \
-			--rocks-tree="${EPREFIX}/usr/$(get_libdir)/lua/luarocks" \
-			|| die "configure failed"
-}
-
-src_install() {
-	default
-	{ find "${D}" -type f -exec sed -i -e "s:${D}::g" {} \;; } || die "sed failed"
-}
diff --git a/dev-lua/luarocks/luarocks-3.5.0.ebuild b/dev-lua/luarocks/luarocks-3.5.0.ebuild
index b1b19713672d..c8e7bde648ff 100644
--- a/dev-lua/luarocks/luarocks-3.5.0.ebuild
+++ b/dev-lua/luarocks/luarocks-3.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://luarocks.org/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="libressl test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="test"
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
index ea600f388075..76ec4e957356 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,5 +1,3 @@
 DIST luasec-0.9.tar.gz 52163 BLAKE2B fa95ae63b36f138f923dc412f527ff527e4f7562ad177ca7f450ef889e75c204d1bfec3773523fb68865c3846a0edc583cbf903db5233ff080074147f33bfb30 SHA512 ea601016328232ca0ff12be72897eeedac88a78834a63e1c36d2828a3187039665a2c60597b5af1fa6917b6fe87cd292fbcdfabcd67bab968f587e038d52a933
-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
+EBUILD luasec-0.9-r102.ebuild 1575 BLAKE2B 5d0bdebd7099966838f9c2942dd08796494808c7560221fcac4ba4245979d04848e960391c71a4bcb63724ea344d0958ce0ee07884c3dfbf2c49149319610045 SHA512 9cf0b05c9bacd5e6ac07c02ff87ab770c31d872d9ded6871927a62b091045689c889891b27d4fbbc2f752ed0116c9102b16c8aa3ca95e1c142a8456bdae8d7a7
 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 8e58a7be7084..a723b870e963 100644
--- a/dev-lua/luasec/luasec-0.9-r102.ebuild
+++ b/dev-lua/luasec/luasec-0.9-r102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="libressl"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/dev-lua/luasec/luasec-0.9.ebuild b/dev-lua/luasec/luasec-0.9.ebuild
deleted file mode 100644
index 49603d3ef4c2..000000000000
--- a/dev-lua/luasec/luasec-0.9.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
-HOMEPAGE="https://github.com/brunoos/luasec"
-SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 arm arm64 x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="libressl"
-
-RDEPEND="
-	>=dev-lang/lua-5.1:0[deprecated]
-	dev-lua/luasocket
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i -e "s/-O2//" src/Makefile || die
-	lua src/options.lua -g /usr/include/openssl/ssl.h > src/options.c || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" LD="$(tc-getCC)" LIB_PATH="" \
-		linux
-}
-
-src_install() {
-	emake \
-		LUAPATH="${D}/$(pkg-config --variable INSTALL_LMOD lua)" \
-		LUACPATH="${D}/$(pkg-config --variable INSTALL_CMOD lua)" \
-		install
-}
diff --git a/dev-lua/luasec/luasec-9999.ebuild b/dev-lua/luasec/luasec-9999.ebuild
deleted file mode 100644
index 0023fbd9de48..000000000000
--- a/dev-lua/luasec/luasec-9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
-HOMEPAGE="https://github.com/brunoos/luasec"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/brunoos/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/brunoos/luasec/archive/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	S=${WORKDIR}/${PN}-${P}
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="libressl"
-
-RDEPEND="
-	>=dev-lang/lua-5.1:0[deprecated]
-	dev-lua/luasocket
-	!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i -e "s/-O2//" src/Makefile || die
-	lua src/options.lua -g /usr/include/openssl/ssl.h > src/options.h || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		linux
-}
-
-src_install() {
-	emake \
-		LUAPATH="${D}/$(pkg-config --variable INSTALL_LMOD lua)" \
-		LUACPATH="${D}/$(pkg-config --variable INSTALL_CMOD lua)" \
-		install
-}
diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index 578050f4790e..9a16fb02a001 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -1,7 +1,3 @@
-AUX proxy-fix.patch 1026 BLAKE2B 6dde53833c9b35e059a4c1e7052cb494b4e1ceb2dc496a2d090e80fc2a1bfd1a30d014bb4c9f04425665cc00faa29fd434077a13e54cb73af0699363602e3aab SHA512 8b1b440936eceea4352876b24099bd9250c28c78a104f3722a65690a756f831f025257d940f1d9189e8ac023ab4b226b16c901214de59306bac96353a5adfe12
-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 1270 BLAKE2B 2d74a3680d7de27f80653123f87bfc9f3536bb31d30b374cc3960ba3ce6a89e59704ccddc004ea3cfaed4613bd7c4f8f0344760935ba2f090cff95805bcd7df4 SHA512 1c3e9b9033f5bb2fe1d1f27edd1cd33b9a6126b28615750bc29e2b9460dd13f2f1fe684de270f899b6b75460abd54640530c16d1641061d44b7f53d9ee7fc740
-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
+EBUILD luasocket-3.0_rc1_p20200328-r102.ebuild 1823 BLAKE2B 222a273319783288ad5f234aee4099bbaf20f40569997bf74df8a9d0872f37645a5370c818187139cc1986b30ade7cb99b5d6d47249b34f3d50100087eb74ca5 SHA512 e56d3e7f80cedd2aa648d5eca7fed0914554b7fe72e2e78057ad2c359066aed9bbe826d11bee767472842a59da21a2c005310f34700f87e8bb4adf62aba898db
 MISC metadata.xml 572 BLAKE2B 22a011f8d4e4f921389561208866b4740ac3d16bd8868958ec3aa06cded706d3444b9cb24fa79f2ecedd1d315ce6f2e6b95853eada6abe404cc49225ed291ef0 SHA512 6a4010f7f130b00f9819677e701496b056fbd9ee382881f2efe61877dcefae594cc8dbeab688ed99822e9335e0b484d4774a0209f47aa8527f6f95a134382b0c
diff --git a/dev-lua/luasocket/files/proxy-fix.patch b/dev-lua/luasocket/files/proxy-fix.patch
deleted file mode 100644
index 302e63663ff7..000000000000
--- a/dev-lua/luasocket/files/proxy-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1f9ccb2b586c3a7e29db3c99a23ac1cee6907cf2 Mon Sep 17 00:00:00 2001
-From: Pierre Chapuis <catwell@archlinux.us>
-Date: Fri, 5 Jul 2013 18:00:29 +0200
-Subject: [PATCH] http: look for PROXY in _M, not as a global
-
----
- src/http.lua | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/http.lua b/src/http.lua
-index 5f70a374..f83dcc55 100644
---- a/src/http.lua
-+++ b/src/http.lua
-@@ -186,7 +186,7 @@ end
- local function adjusturi(reqt)
-     local u = reqt
-     -- if there is a proxy, we need the full url. otherwise, just a part.
--    if not reqt.proxy and not PROXY then
-+    if not reqt.proxy and not _M.PROXY then
-         u = {
-            path = socket.try(reqt.path, "invalid path 'nil'"),
-            params = reqt.params,
-@@ -198,7 +198,7 @@ local function adjusturi(reqt)
- end
- 
- local function adjustproxy(reqt)
--    local proxy = reqt.proxy or PROXY
-+    local proxy = reqt.proxy or _M.PROXY
-     if proxy then
-         proxy = url.parse(proxy)
-         return proxy.host, proxy.port or 3128
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r5.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r5.ebuild
deleted file mode 100644
index 8a12093b847f..000000000000
--- a/dev-lua/luasocket/luasocket-3.0_rc1-r5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib multilib-minimal flag-o-matic toolchain-funcs
-
-DESCRIPTION="Networking support library for the Lua language"
-HOMEPAGE="http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
-	https://github.com/diegonehab/luasocket"
-SRC_URI="https://github.com/diegonehab/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
-IUSE="debug"
-
-RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${PV/_/-}
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/proxy-fix.patch
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		CC="$(tc-getCC) ${CFLAGS}" \
-		LD="$(tc-getCC) ${LDFLAGS}"\
-		$(usex debug DEBUG="DEBUG" "")
-}
-
-multilib_src_install() {
-	local luav=$($(tc-getPKG_CONFIG) --variable V lua)
-	emake \
-		DESTDIR="${D}" \
-		LUAPREFIX_linux="${EPREFIX}/usr" \
-		LUAV=${luav} \
-		CDIR_linux=$(get_libdir)/lua/${luav} \
-		install-unix
-	insinto /usr/include/lua${luav}/luasocket
-	doins src/*.h
-}
-
-multilib_src_install_all() {
-	dodoc NEW README
-	docinto html
-	dodoc -r doc/.
-}
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r1.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r1.ebuild
deleted file mode 100644
index b05a982025b9..000000000000
--- a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="5b18e475f38fcf28429b1cc4b17baee3b9793a62"
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Networking support library for the Lua language"
-HOMEPAGE="
-	http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
-	https://github.com/diegonehab/luasocket
-"
-SRC_URI="https://github.com/diegonehab/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="luajit"
-RESTRICT="test"
-
-RDEPEND="
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-HTML_DOCS="doc/."
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-O2 -ggdb3//g' -i src/makefile || die
-
-	# Workaround for 32-bit systems
-	append-cflags -fno-stack-protector
-}
-
-src_compile() {
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LD=$(tc-getCC)"
-		"LDFLAGS_linux=-O -fpic -shared -o"
-		"LUAINC_linux=$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
-		"LUAV=5.1"
-		"MYCFLAGS=${CFLAGS}"
-		"MYLDFLAGS=${LDFLAGS}"
-	)
-
-	emake "${myemakeargs[@]}" all
-}
-
-src_install() {
-	local myemakeargs=(
-		"CDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
-		"DESTDIR=${ED}"
-		"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 includedir $(usex luajit 'luajit' 'lua'))/luasocket"
-	doins src/*.h
-
-	einstalldocs
-}
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild
index 7020672331fb..75b81365cf96 100644
--- a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild
+++ b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="test"
 
diff --git a/dev-lua/luassert/Manifest b/dev-lua/luassert/Manifest
index 131a89f4d9f6..be257fa88d8e 100644
--- a/dev-lua/luassert/Manifest
+++ b/dev-lua/luassert/Manifest
@@ -1,5 +1,4 @@
 AUX luassert-1.8.0-disable-highlightcolor-test.patch 2931 BLAKE2B dcf614b08aa0e89404d18e9bdc77ac5b723d577b8f5694f7fded74275c8ace59e938ddd2ad46b19a9ba7d8a36886d36db384d6fb439a2cccee77cf370e711060 SHA512 0bf9b3877e78183d5db3d33acb977f64e1aa7934f313838ffb5ec9b759283b21f071c619020ca4b8ec8aa36d9ea4e8082e3510d59d800fbd82fef74e0d8b9895
 DIST luassert-1.8.0.tar.gz 38874 BLAKE2B ebc4aab1de5dc830d0b9266726ca6bf361e03000f3a8acd27c04805a6c963373755c8e163b187714f64178acc5d755c05493d745b55c785e3254dd41aa4bef31 SHA512 18b296fececa6b0d5950b2a20c4d30da3bbf9b0932c568bbb8ca212b5c82a1047b73c52ee72b4505a41a393d41dd21321189367e038dd029152d177e11bafc93
-EBUILD luassert-1.8.0-r101.ebuild 967 BLAKE2B 58fd29809bfd194ef2eb6356786761e5bd8d582df168a47918c299a95dbdd93df16107b441e1d0cba42ca3a0efb9f5e4f9fd46f7cca97df34fdf8484b01dd727 SHA512 c2e701ed993dca17e79a2cac7a902230e7895b4503e7169a3a3ad9469d38b00a894334a34459b908c3d1ea28cee200c76b683fd1c23dc895ee3ef4078dd65a9d
-EBUILD luassert-1.8.0.ebuild 961 BLAKE2B 5bffb37793777f1980c802436c20de2248ac864d5848103ea46ab570ae2d88063592564af5b4a0c2e931c9b809d25a5a02d9c104271abcfa4995a91db5d584c1 SHA512 a21ac3ce2ebdd2e497eb29a370ce513ecccab92453d570807ef7a8e2f55a6771c661b080e777428b9bc4f1c753712941eb95242493a453c138b31f336a4db154
+EBUILD luassert-1.8.0-r101.ebuild 961 BLAKE2B 665a4e5694872ca41c486155a383fb1ff168c39ba4ec6f1b81a4f63f194d4dd783727729a45d50412152ee7b95af5c50656614d8489822ead801e49a84a1ab59 SHA512 36d28270964034de772032ad8e836a2582ddde0a7912e4c545a01e1e951650a7f0ac04a28100e95329a865dc141d2a6e24ef494c1a634b56d5eec0c1dcb6ac26
 MISC metadata.xml 598 BLAKE2B 44f0ff617e32241bc72db4da50d83f321cae964924c7dd6c12c46b356158d0ca4a99f228042b2c51e7bdbc0e4573b45cdc15814e5cf73e8a4e4fda450df58ab7 SHA512 d5d5330dba6b543ca5ec99235444ead2c736c2319689513767a27cc654837bb645ab60365e2dd96f9e7ffbd3dbc9c4b3ff5029ad59655bf88bec1f7faa50f80a
diff --git a/dev-lua/luassert/luassert-1.8.0-r101.ebuild b/dev-lua/luassert/luassert-1.8.0-r101.ebuild
index 3237001fdadc..6012657e591e 100644
--- a/dev-lua/luassert/luassert-1.8.0-r101.ebuild
+++ b/dev-lua/luassert/luassert-1.8.0-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/luassert/luassert-1.8.0.ebuild b/dev-lua/luassert/luassert-1.8.0.ebuild
deleted file mode 100644
index 5bb7cb40bbf8..000000000000
--- a/dev-lua/luassert/luassert-1.8.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lua Assertions Extension"
-HOMEPAGE="http://olivinelabs.com/busted/"
-SRC_URI="https://github.com/Olivine-Labs/luassert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="luajit test"
-RESTRICT="test" # Requires same version to be installed or busted will fail.
-
-RDEPEND="
-	>=dev-lua/say-1.3_p1[luajit(-)=]
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-	luajit? ( dev-lang/luajit:2 )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-lua/busted
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-src_test() {
-	busted -o gtest || die
-}
-
-src_install() {
-	local instdir
-	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"/${PN}
-	insinto "${instdir#${EPREFIX}}"
-	doins -r src/*
-	local -a DOCS=( CONTRIBUTING.md LICENSE README.md )
-	einstalldocs
-}
diff --git a/dev-lua/luasystem/Manifest b/dev-lua/luasystem/Manifest
index 86aec4cff939..f1665829f137 100644
--- a/dev-lua/luasystem/Manifest
+++ b/dev-lua/luasystem/Manifest
@@ -1,8 +1,4 @@
-AUX luasystem-0.2.0_p0-fix-makefile.patch 829 BLAKE2B 03d7eae8746d38837056b2d990491da070a6ff24a78c6eb1bb86ac583e93a32c4576b956fd06836e0088dafcffba155ae254eb3273230bf84cfaa90e70464d45 SHA512 7123c427527788034cd2a5f759f5924bd00dc2ca7a2071d986152f535a4da641887e75131ae7d6afe39d82b4c71c84796cf52a451603db50a21ad99f061c746e
 AUX luasystem-0.2.1_p0-fix-makefile.patch 825 BLAKE2B 1732876603d8b5560bda1644de832d611e851bbe8c8edb7c1861c43b5496d47306a2f61d29087b83a0b8d87ecb2731572c2c3d149a19000c7173161bd0f326fd SHA512 980ee1089e4b2b45c54e0ac953bb441e5c31164417e64dbf3fd8f75010d50ddda84572fa0b8ed6101f1924a96a64de0ce31d4e24cf69f9f15d5c59b8f5ef8e3e
-DIST luasystem-0.2.0_p0.tar.gz 8058 BLAKE2B fd29eaec7fe2f49e933932a436be75678400fc55a275e412379e05ab5b9cfe2036dfc9e61f960caa29d3c4ab1d439f9ede7ff3cbe14a61287270cc3707660636 SHA512 b8c7ba30470cbf100cc3f14df31729778cfb0aabebe4d27ce42c19581a2585f878d86a29a2f73fd1bef4e5861e2a604d3c396a73f131fa99ae14a17cba52c336
 DIST luasystem-0.2.1_p0.tar.gz 8162 BLAKE2B ad8a6009823ad8202ff3884a3167d0779405c2a6be460b7ef2939622eb4d0fc8edbc6b04aba5dec9dd5e4e38f11ae0dcd582b9c348d5b516aa411858d55c6d71 SHA512 9dc323d4d1914cfa4f278a49ef22e58569d5cd7e369fa17fa6006cd47f9d90c6dfd4404067ea2436aa46a27cfbdf91e4aa26e20b89aeeefdf2aa7252c51fb32b
-EBUILD luasystem-0.2.0_p0.ebuild 1045 BLAKE2B a79cd0fb2a4adac392a0a1d1669838e4cf21279cfaef42f2e2ffefa67117058096685988d622a35e0b8539e30978cda40a2ea6bdae720a4efeab771a24420f52 SHA512 4325ae337413822bf75705b987548eac51b22fcd8a11fd4e680d603c97b132f983bc0df9d22f9e397c0387f44502a43bb46fdad333fea22bb41149e39fc9d9d4
-EBUILD luasystem-0.2.1_p0-r102.ebuild 1522 BLAKE2B e4ec725c41c42528f8370e4b3a011fa6d5db4f6461dd06d5427ac9a9792566e688ed7e846c44e7ae889b9f13f77fb7d7145c44b880fd2608bd18d31eaaa34f52 SHA512 2f0fc6e801991809357edd2a67052962e653ba6c7b25589fd218501542acb28f8c56fc58f914cfb51c3399e541714787f912122c7ea00e44f5cf7e0d895d0a7a
-EBUILD luasystem-0.2.1_p0.ebuild 1190 BLAKE2B 310ef682388b1e8094064312fe6928cdf61b4328d2b4a65c95bd4345d0cba8c6dd756ec06d70870ea4fec7420aebbd2d5a56605f61e1c4e7b5d5adebade49341 SHA512 a0b661d31c520fd30eee72aafb90e46507ac9ad54f3d56d7857bd176647aea74328221e0a3d492e7487efcec2ad66caa7baf6dcb3a36a0e4866ef65f89969034
+EBUILD luasystem-0.2.1_p0-r102.ebuild 1516 BLAKE2B 0ba42db6c32e1cf7bc70fafe3568805aff7e52ce6ef66c90f2fd225bd125859719546618be953b15b9387e14a46e4ed7bf1127afb856f7abcf0e2173a8fa0429 SHA512 ad05466bb80c45b86fc02ae2eda9bd6636ee1ba266370b90e0fa3f2f474225f740d1c7753e66c7f370bb1e46768672b9c3c8c2401122a3600856bb20a63b0e74
 MISC metadata.xml 591 BLAKE2B 9e8a3ce4bfe3031b55f3aa5193c124a8aa3da8907e6dfd97e60c59e4bb846a1aec0f1e2319f43178840a9b9e7517362d654a95c2f0871494482a70a20131e535 SHA512 23828de621a5ac7168e256b201af36343de97edbeb898d6d5e4f882bca88fe345914fc98f70d5e997d8b191dcf446f62250e4309cc2d3f84b9830b023088fa0e
diff --git a/dev-lua/luasystem/files/luasystem-0.2.0_p0-fix-makefile.patch b/dev-lua/luasystem/files/luasystem-0.2.0_p0-fix-makefile.patch
deleted file mode 100644
index 803d2835c37f..000000000000
--- a/dev-lua/luasystem/files/luasystem-0.2.0_p0-fix-makefile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 10fc31a..af5e4e4 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -144,8 +144,8 @@ O_linux=o
- CC_linux=gcc
- DEF_linux=
- CFLAGS_linux= -I$(LUAINC) $(DEF) -Wall -Wshadow -Wextra \
--	-Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden
--LDFLAGS_linux=-lrt -O -shared -fpic -o
-+	-Wimplicit -fpic -fvisibility=hidden
-+LDFLAGS_linux=-lrt -shared -fpic -o
- LD_linux=gcc
- 
- #------
-@@ -208,7 +208,7 @@ SOLIB=core.$(SO)
- #
- CC=$(CC_$(PLAT))
- DEF=$(DEF_$(PLAT))
--CFLAGS=$(MYCFLAGS) $(CFLAGS_$(PLAT))
-+CFLAGS=$(CFLAGS_$(PLAT)) $(MYCFLAGS)
- LDFLAGS=$(MYLDFLAGS) $(LDFLAGS_$(PLAT))
- LD=$(LD_$(PLAT))
- LUAINC= $(LUAINC_$(PLAT))
-@@ -248,7 +248,7 @@ none:
- all: $(SOLIB)
- 
- $(SOLIB): $(OBJS)
--	$(LD) $(OBJS) $(LDFLAGS)$@
-+	$(LD) $(OBJS) $(LDFLAGS) $@
- 
- install: all
- 	$(INSTALL_DIR) $(INSTALL_TOP_LDIR)
diff --git a/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild b/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild
deleted file mode 100644
index 6446cfc61d64..000000000000
--- a/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-# The below is the upstream version number. The -x suffix should be kept
-# in sync with the _px suffix in the ebuild version.
-MY_PV="0.2.0-0"
-
-DESCRIPTION="platform independent system calls for lua"
-HOMEPAGE="https://github.com/LuaDist2/luasystem"
-SRC_URI="https://github.com/LuaDist2/luasystem/archive/${MY_PV}.tar.gz ->
-	${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-lang/lua-5.1:0="
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-makefile.patch
-)
-
-src_compile() {
-	emake CC="$(tc-getCC)" MYCFLAGS="${CFLAGS}" \
-		LD="$(tc-getCC)" MYLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
-	doins -r system
-	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"/system
-	doexe src/core.so
-dodoc README.md
-}
diff --git a/dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild b/dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild
index 2411804a12d5..82a70e635227 100644
--- a/dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild
+++ b/dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild b/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild
deleted file mode 100644
index 5b23c11d98c5..000000000000
--- a/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-# The below is the upstream version number. The -x suffix should be kept
-# in sync with the _px suffix in the ebuild version.
-MY_PV="0.2.1-0"
-
-DESCRIPTION="platform independent system calls for lua"
-HOMEPAGE="https://github.com/LuaDist2/luasystem"
-SRC_URI="https://github.com/LuaDist2/luasystem/archive/${MY_PV}.tar.gz ->
-	${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 x86"
-IUSE="luajit test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-lua/busted
-	)"
-RDEPEND="
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-	luajit? ( dev-lang/luajit:2 )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-makefile.patch
-)
-
-src_test() {
-	busted -o gtest || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" MYCFLAGS="${CFLAGS}" \
-		LD="$(tc-getCC)" MYLDFLAGS="${LDFLAGS}"
-}
-
-src_install () {
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
-	doins -r system
-	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"/system
-	doexe src/core.so
-	einstalldocs
-}
diff --git a/dev-lua/lutok/Manifest b/dev-lua/lutok/Manifest
index 4fb091153f4f..df22b4c98065 100644
--- a/dev-lua/lutok/Manifest
+++ b/dev-lua/lutok/Manifest
@@ -1,5 +1,5 @@
 DIST lutok-0.4.tar.gz 489570 BLAKE2B b4bc26d9a4901901e6ca66a41bc42ccc2f82697ff14e64c1bea35b4a9ed08b6f13ecfa9aaabb54e25fb3e4f3aea03791c225c4c8fc6ed3e0387d34d933a228e9 SHA512 664f30099bfbb30978e24068a9232a4ff1b5b1839c601bf784f35f6bb1394558067495093a3b0343c94e756d2e4186a32a8227baf5934c15c45905f7c0a5d19c
 EBUILD lutok-0.4-r1.ebuild 743 BLAKE2B 039c1b6be42b9b53bc0b9fc5fbce9db09acb333d71c6d95ad79fadf32c08c0bd205b4917d7300f8f81d4b556e34a6a0919b98020c3fe9a4f8cd051a3ed4df1f1 SHA512 2ee4b75dc6c354ed6e6333edc161f2cb80e8d1f7916747635b50c3468275c70fe193ec896a7071ac069ac042c2060d8bf323df0d2b520073cbc2390e83a010b2
-EBUILD lutok-0.4-r10.ebuild 1014 BLAKE2B b75109b8dbfa5d0c89a4b7beefea602761138ee7e86e465684e31f2def07ba5cd8938e28e0e8e267d03c06f6e5004d51e82045211e97d7c5ca3133cbf390e0de SHA512 365c28c8723f771239481045e1fe68e8629f12bd190c06355cc5440db9d814ac2f5823bbadf75e591672df395c7bd7001c10911910f730aabe655d5d4a274011
+EBUILD lutok-0.4-r10.ebuild 1007 BLAKE2B ba21b06e3aca46523f3dd30936720ce6e2ae361151f33b5e1015a2f9fed8b6c1b1c3f47dee2f386c2a2dd145697838c932e03b0d8acc1a21ed931b1facea333c SHA512 2b307a06605962503c46d9c9f0993c2b9ae6b48aa0a8ce1d32aeb30417648e98186f3b066f878062af58c07b3aa14917fb77c1feee3070871a1a369e5741819e
 EBUILD lutok-0.4-r2.ebuild 826 BLAKE2B ccf9433d02deb2f67b523bb8a46139fcea4da8957d47f2a6f1bf65a2fc6b9f7f641371ad2b489230e0089e9ed1db4e754acfbef6b791c57f4495cb83e4807ff4 SHA512 327ec4a80919cae9504c165f384b0852147d47c66f89df6f5fc0f7cd213311b46c05ff554d0f12cb028c875080dd2c5d38fc100d41132f98a5ab835ba75c694a
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-lua/lutok/lutok-0.4-r10.ebuild b/dev-lua/lutok/lutok-0.4-r10.ebuild
index 68f897e2a460..3952247930d1 100644
--- a/dev-lua/lutok/lutok-0.4-r10.ebuild
+++ b/dev-lua/lutok/lutok-0.4-r10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jmmv/lutok/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/luv/Manifest b/dev-lua/luv/Manifest
index 54722912720a..bb785f9e31fc 100644
--- a/dev-lua/luv/Manifest
+++ b/dev-lua/luv/Manifest
@@ -1,7 +1,5 @@
 AUX luv-1.32.0.0-cmake_lua_version.patch 342 BLAKE2B f4b6b5d45ed4b39ba0a1ed0ae60708583be04cb9a2e785c1ba09a171c7cdeb3cb18e1baf9dba976c429d6f7a5737c0c8ca803b3241d170f395f6045da03ece03 SHA512 6e8341db5eeb5c1e51cc9c812ffc99c2a15a18467456fa20c7dc37c100ac269ef4b416a311f7d435b89c824171218193b00e8e7dccf7506eaf789a88121866bd
 DIST luv-1.32.0.0.tar.gz 91349 BLAKE2B e4a90b3241e2fe650f62e34439ed75f9ba53168d6bd96b8685fc5600d6f9cbb1bb598a7d40d918ab9123cf4bad99f872a79d0664056d35caba52d1eda9046020 SHA512 7db52afc1ca79052e349be7a37deb67066ee9005f8d7f7d0dae62bd83a93b4140103ee6dddeca2e02a3fc37b3880a5c18904429886af1d441f8de0cfabf5bd8c
 DIST luv-lua-compat-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
-DIST luv-lua-compat-0.7.tar.gz 51383 BLAKE2B ae86f314de971fcd7d8706009d59d684c035fb661ecf392c581a3c317cc1a396321ef7af0418d8f23151c52c66613a0749e8fa9ac889a183c2ffe749091dae35 SHA512 665ece98422a105b818cffd96eea5788696fbb854d2ba41d2d387e8bd25c1fa9de601468e55e22e9e749979a66d4d2e0f7dfd656e5bf27b489d37bb07c96f48d
-EBUILD luv-1.32.0.0-r102.ebuild 2185 BLAKE2B d1b5b1ee9148f625cbc2f6fff926c530768ec1f9e6fec78250f98ea8638804a3f26ba1914717cc95b73c5f61e0b1dd5f25070ccd8af6651374924a2f246ba95d SHA512 727d7d98a012b6510005a633661672640eda2e0ce381e74621615114e5d6386761a3e2b00e6b9df87d1bb633b1c296a0226c310cf39c2b55bd535aafe9987c5e
-EBUILD luv-1.32.0.0.ebuild 1565 BLAKE2B b3cb0bc8ef2eb95e6b78ef0203feaa19b825b21f323599039da197715d829f3af596fa0489051a43c4d84ed62744e4cfef44ab7f2989494124a28f8ac05d522c SHA512 91bfaef1b5efb7bbb38707dff7a81baa620dad9d7d97c787adb233387e225f9b193ecc9419e5eaa6b0e02e0cbf5e9a225e8e01dcddc6869ddeae2bfe193c3716
+EBUILD luv-1.32.0.0-r102.ebuild 2183 BLAKE2B 76d88767f5494c469557da85f09e5ba0cec37b529f88c4b8300d8b80d69ad9486547cb7a72bf117be2e7a679c17af22caa6033cad2c344e0636a72f845851ebc SHA512 b0437489b69efee65f690f2dbcd266188ff34736c2a196e51bfb57ff10a10c94f42383151d1ad7cea751e4a7b4ffa0d0676a63710926d7ba1993522fb8e48de8
 MISC metadata.xml 478 BLAKE2B 922ac075f7e73e4e72b831c95ae3341a37d107111f05bd685e6a10d6ef93fa332a7bd1078e559c31b8a0686c86edca7d3dd015f1cadb50fad4eaabc311ff8e55 SHA512 80486058a108d2a2568652c49e26b067f5ab7908cf0edf6ae0073a7e139e47b5821e9b959e01ab7a4be82d2614291d4fe16cac29778c88090690494760d85430
diff --git a/dev-lua/luv/luv-1.32.0.0-r102.ebuild b/dev-lua/luv/luv-1.32.0.0-r102.ebuild
index 7b4e0feb5b76..ee469f396b9d 100644
--- a/dev-lua/luv/luv-1.32.0.0-r102.ebuild
+++ b/dev-lua/luv/luv-1.32.0.0-r102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/luv/luv-1.32.0.0.ebuild b/dev-lua/luv/luv-1.32.0.0.ebuild
deleted file mode 100644
index 3d5ee15c180b..000000000000
--- a/dev-lua/luv/luv-1.32.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake unpacker
-
-# e.g. MY_PV = a.b.c-d
-MY_PV="$(ver_rs 3 -)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Bare libuv bindings for lua"
-HOMEPAGE="https://github.com/luvit/luv"
-
-LUA_COMPAT_PV="0.7"
-SRC_URI="
-	https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_PV}.tar.gz -> ${PN}-lua-compat-${LUA_COMPAT_PV}.tar.gz
-"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="luajit test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	>=dev-libs/libuv-1.32.0:=
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:0 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Fix libdir
-	# Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir
-	sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt"
-	cmake_src_prepare
-}
-
-src_configure() {
-	lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_PV}"
-	local mycmakeargs=(
-		-DBUILD_MODULE=OFF
-		-DLUA_BUILD_TYPE=System
-		-DLUA_COMPAT53_DIR="${lua_compat_dir}"
-		-DWITH_LUA_ENGINE=$(usex luajit LuaJIT Lua)
-		-DWITH_SHARED_LIBUV=ON
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local elua="$(usex luajit luajit lua)"
-	# We need to copy the library back so that the tests see it
-	ln -s "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to symlink library for tests"
-	${elua} "tests/run.lua" || die "Tests failed"
-}
diff --git a/dev-lua/mediator_lua/Manifest b/dev-lua/mediator_lua/Manifest
index c5bc771da05e..88857a41dd2e 100644
--- a/dev-lua/mediator_lua/Manifest
+++ b/dev-lua/mediator_lua/Manifest
@@ -1,4 +1,3 @@
 DIST mediator_lua-1.1.2_p0.tar.gz 5809 BLAKE2B a14cbe043cef72cdff35f92c5e6e420e94ab9930235ef71c31749f6371ef3a9a55c104ebe0a82ad86a95ddb5913ebe69f600e16393b6c5ff532802ace7bd7597 SHA512 116d08a96fa0bd540ac4d3cac61a529a634cba3621c6f2e917b405462bbc0e2ab5b170dc6819e470105cdedf958a382945819eaff4affa63bc057824c163c8a0
-EBUILD mediator_lua-1.1.2_p0-r101.ebuild 928 BLAKE2B 0bafb164dee41f87eba8e47a61cc8e161e206ddff0b77f55cca23b8021f157bdd2cfaf05608aff2a42af711f3c42448b39bfcce8a07407537c84ba938f6aebcd SHA512 b3074810fcdf9409a1e03a4568b4d08114f5b649ab7e576b2dbb5acd3ebccd93c84b16c8abfaa6d3c2b6cb9f55a240536c66e506fff86717c5bd0de7b92d9aa2
-EBUILD mediator_lua-1.1.2_p0.ebuild 796 BLAKE2B d5f09eae4950d302560a4ee0731bafd07831fbf08e6f97812b3bbce7fb872a56327e309e6f94e8349ad5194801b70c9a20c2b539044625ba57ec9077ec0807ac SHA512 1637038c2635b7e22640f9e3957de4138c20c56484307186fcad183df7e6c7fa11a264be7199a665097fa709067c8eb10897a8d780393de38b658f1dda10d9ec
+EBUILD mediator_lua-1.1.2_p0-r101.ebuild 922 BLAKE2B 6f2cfae5751957175b4770ed6e4d6007ea190637f1b82b25d6f192b356b139f3c40d3b49b9bb03af7f11f3ef9fbaae8a3a18c82df7d807e4a33f1647817dcb7e SHA512 579034dbeaffc381f4cfafd7819431abb82efa4c521aca536296772b5669241c7f12a56a329e853c60e58a5f15efc856b72e081d276c43cb6161d9bc76ee464f
 MISC metadata.xml 724 BLAKE2B 8dca2534d29b63479b715a665b9f3cb785d7818e9cb467e38b4a69a958826507f286760d43ed6e5645296199ebf94b7562ab5e0c0b8a5e17729637b363e6a8c2 SHA512 a0c40bea247859b28e85de1c00535882a562329973c15899493303b095da0ba1434cf4f01ae68dd027eba3ce9fc46c419b0568187cf3cf851c258aefce6b8220
diff --git a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild
index 1bbd855a34b4..3ea28bb20902 100644
--- a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild
+++ b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild
deleted file mode 100644
index b95c7f74bc77..000000000000
--- a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-# Below is the upstream version number. The"-0" suffix should be kept in
-# sync with the _p0 suffix of the ebuild version.
-MY_PV=1.1.2-0
-
-DESCRIPTION="Event handling through channels"
-HOMEPAGE="http://olivinelabs.com/mediator_lua/",
-SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-lang/lua-5.1:0="
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_install() {
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
-	doins src/mediator.lua
-	dodoc README.md
-}
diff --git a/dev-lua/messagepack/Manifest b/dev-lua/messagepack/Manifest
index 7fd0fe08532c..1e0298c861d9 100644
--- a/dev-lua/messagepack/Manifest
+++ b/dev-lua/messagepack/Manifest
@@ -1,4 +1,3 @@
 DIST messagepack-0.5.2_p20201025.tar.gz 19652 BLAKE2B 5f85081daf2ab7f57399cb47782fbde0dfd2afe9514fdb652da1ba0eacd832e5c0924258b788d919b0a07e227f37ee58a239004086e7d6759b4727922ea57d76 SHA512 245790163ec819438fd3426f59ab2e5672864be647748dace35155be712ad4eaf78f8d7228d5a0ce94bfb92f6a1d1071cf871483bf99e02ba18872c31b3d0682
 EBUILD messagepack-0.5.2_p20201025-r100.ebuild 1035 BLAKE2B cc6fc3be86d52ef63e8871467423d3a3b1c27f04dc7eed5c910a258f46bef374beb8b595b2b7641db1b30c4a1c9c7376c3cd7f5e0f6eeea6bf8c304f476b1603 SHA512 6683df3932390ee71dd39f5c848f8711886196460bca3dda811ca2c7c21b7c2a4c1c10946e50042fc78dbc38068ceb2dae6dd5f5cd213ea317e6147a924a6659
-EBUILD messagepack-0.5.2_p20201025.ebuild 1078 BLAKE2B 40c3b240f43d96fb2252f1b4d349e42dd1584ccb6b2d919f8003006b0c038bb403920c4938a1f679352ed39c4950b4d1ceb7c26a552d4486707967fbcc99adb9 SHA512 32d44465f023e5c3f98f255d9639d47e4aa2db82ed0dd9a38b52fbeba7bc4b47ba704a75580471894b41d323f3ce6dff52aa88b2d78b57e9e33af7dbce20b7f7
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-lua/messagepack/messagepack-0.5.2_p20201025.ebuild b/dev-lua/messagepack/messagepack-0.5.2_p20201025.ebuild
deleted file mode 100644
index a4f23657c074..000000000000
--- a/dev-lua/messagepack/messagepack-0.5.2_p20201025.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="18f316b3f62c02bf2b7a3096701780f78a4d2c67"
-MY_PN="lua-MessagePack"
-MY_P="${MY_PN}-${EGIT_COMMIT}"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A pure Lua implementation of the MessagePack serialization format"
-HOMEPAGE="https://fperrad.frama.io/lua-MessagePack"
-SRC_URI="https://framagit.org/fperrad/${MY_PN}/-/archive/${EGIT_COMMIT}/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="luajit test"
-
-# Needed 'lua-TestMore' Lua module not in tree
-RESTRICT="test"
-
-RDEPEND="
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:0 )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${RDEPEND} )
-"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	local myemakeargs=(
-		"LIBDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
-		"LUAVER=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	einstalldocs
-}
diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
index 063b499e8c28..ac6318dd78d3 100644
--- a/dev-lua/mpack/Manifest
+++ b/dev-lua/mpack/Manifest
@@ -1,6 +1,3 @@
-DIST mpack-1.0.4.tar.gz 46382 BLAKE2B 5092830e1a970ad96686ede4d96833a210543418cb23f218ba774bfd724267344f9e44e367490bb33dae8023e1145202ea6e457be7753a426eae990df906547d SHA512 8e40a562faf8b62137dec0733cbb9006fa7054e5a47bdd128fb4dfd676fac4e4385a23c3d908a4ce2edd65d673db25916695fa74bc08c5316b0c80e571a7442c
 DIST mpack-1.0.8.tar.gz 15616 BLAKE2B 06593296d1d36459127bf35eaeb37c894a0c0c6ccff0969cd0a82bee1920a715801db26f0ba0bc54a56399d07efc262666ee4ce79878288a5c0221fd27febea1 SHA512 6d21cc6bbdee583a1d808742991459e4b1796f347b2f4eaa747b576f5bb1ca989123339120e43246bac859c20e6f46ac57116ce9f135157256fecbd8cf817f75
-EBUILD mpack-1.0.4.ebuild 1059 BLAKE2B 5263060e57633db082186e660d2fcdc16c0066a6a19c8ce87d7ce0db81fbb0ee20d4efd2975d955cca1ac097bff2aaf8c39555031d0d91481fa33a40243f3386 SHA512 1b94169795a9154cc152269af3aa56f5aadd4a50362284aec09524ecbeacb13298d91ff4fc716c9867cc6a590d02ad1debaac7bda042fc03a466fa5d2f1c7549
-EBUILD mpack-1.0.8-r1.ebuild 1647 BLAKE2B a6c7f72ec35b5da574823bb14129f8695170630545cf9f66bd66e714236d7f3758a260f60788524188c01dfecbbb544f924941ea84e2424aab9a9b337b8866a0 SHA512 fa5305fd83c17b7d20040a363afff06a2b58243b8cd8e4c0f299086ef594159539fb9c355f41e171446c37ae60294d56003644369be828d822d5ac300e4d6c7e
-EBUILD mpack-1.0.8-r100.ebuild 1776 BLAKE2B d9d38dfc62cde85a87e7865e52ceff66762b4878e2a8e9d363d73162f4881e274652f99b86fd5ec7b2e72d6a2d6698e88a2a09268af958a607236d357f493947 SHA512 689bad3022e350a3e2de2132ead2bb2d139ae3a492cffb68353f139b855d1cdc1540b8bd684173b35ec40db8e8e1772dfbb93f6967643169fe622f6e88aa98e9
+EBUILD mpack-1.0.8-r100.ebuild 1774 BLAKE2B 04e4e3be618daa59a679b4e9cb70970e4e0236c14aafa21ce3ca89bc3fa95d7995f2069c021b28cf44080a723054789dd6395a7d62a99da28c685ecc47fbe8d2 SHA512 608da9dfded1fae07c21a5a66b4186a5406d48e2b91b34c959a24b2631168610f57637dc988135faea7442a3acc0e0bbc325743d17210caa7c1b36d8cbeabf3f
 MISC metadata.xml 336 BLAKE2B d2eb682d5c161942105aea7b4d1801cb98478b9c19876563ea921cf0cedaaf04a02cf756c8a5f595d52e710436e6f73e2dfe3acc10a4c9cd080415f4e1bb305a SHA512 a1ab89e3b9f01ff9112240a0a9ac945ed7391e98f5dfd4bd1ea518e0f228ae09109cd8f39fc29b36fe6ecc252dca7e0819693ce35be564421684de705dc8a4a1
diff --git a/dev-lua/mpack/mpack-1.0.4.ebuild b/dev-lua/mpack/mpack-1.0.4.ebuild
deleted file mode 100644
index 0ad6a94afedf..000000000000
--- a/dev-lua/mpack/mpack-1.0.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lua bindings for libmpack"
-HOMEPAGE="https://github.com/libmpack/libmpack/"
-SRC_URI="https://github.com/libmpack/libmpack/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/libmpack-${PV}/binding/lua"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-	luajit? ( dev-lang/luajit:2= )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-lua/busted )"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		USE_SYSTEM_LUA=yes \
-		LUA_INCLUDE="$($(tc-getPKG_CONFIG) --cflags $(usex luajit 'luajit' 'lua'))" \
-		LUA_LIB="$($(tc-getPKG_CONFIG) --libs $(usex luajit 'luajit' 'lua'))"
-}
-
-src_test() {
-	busted -o gtest test.lua || die
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		USE_SYSTEM_LUA=yes \
-		LUA_CMOD_INSTALLDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" \
-		install
-}
diff --git a/dev-lua/mpack/mpack-1.0.8-r1.ebuild b/dev-lua/mpack/mpack-1.0.8-r1.ebuild
deleted file mode 100644
index 6a4b3afa624e..000000000000
--- a/dev-lua/mpack/mpack-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PN="lib${PN}-lua"
-
-DESCRIPTION="Lua bindings for libmpack"
-HOMEPAGE="https://github.com/libmpack/libmpack/"
-SRC_URI="https://github.com/${MY_PN/-lua/}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libmpack
-	luajit? ( dev-lang/luajit:2= )
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-lua/busted
-		${RDEPEND}
-	)
-"
-
-src_compile() {
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LUA_INCLUDE=$($(tc-getPKG_CONFIG) --cflags $(usex luajit 'luajit' 'lua'))"
-		"LUA_LIB=$($(tc-getPKG_CONFIG) --libs $(usex luajit 'luajit' 'lua'))"
-		"USE_SYSTEM_MPACK=yes"
-		"USE_SYSTEM_LUA=yes"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_test() {
-	if use luajit; then
-		# "[  FAILED  ] test.lua @ 279: mpack should not leak memory"
-		# It doesn't seem upstream actually support LuaJIT so were this up to me
-		# I would drop it from LUA_COMPAT, unfortunately there are packages in the
-		# tree which currently expect it to be supported.
-		ewarn "Not running tests under ${ELUA} because they are known to fail"
-		return
-	else
-		busted --lua=lua test.lua || die
-	fi
-}
-
-src_install() {
-	local myemakeargs=(
-		"DESTDIR=${ED}"
-		"LUA_CMOD_INSTALLDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
-		"USE_SYSTEM_MPACK=yes"
-		"USE_SYSTEM_LUA=yes"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	einstalldocs
-}
diff --git a/dev-lua/mpack/mpack-1.0.8-r100.ebuild b/dev-lua/mpack/mpack-1.0.8-r100.ebuild
index d9777b4051fb..e64d78d190ef 100644
--- a/dev-lua/mpack/mpack-1.0.8-r100.ebuild
+++ b/dev-lua/mpack/mpack-1.0.8-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/penlight/Manifest b/dev-lua/penlight/Manifest
index 6cf3f5ec8922..51ab28c1e1fb 100644
--- a/dev-lua/penlight/Manifest
+++ b/dev-lua/penlight/Manifest
@@ -1,6 +1,3 @@
-DIST penlight-1.7.0.tar.gz 384917 BLAKE2B 153660f5029509611265399aad8b92d82b266ac470414c06e9d7f01b37225834f98488f30f9bbdfdc3a6714edfe2edc0fccd0356ebb966d964be633bff38eb25 SHA512 edeb09307c9feb5da6bccd82216a6ad71db988c433245d72d28abb6c555004f77eebba556928b0912937b29ef93e065ad491368041e17730610813de8e595d7d
 DIST penlight-1.9.2.tar.gz 396248 BLAKE2B 2bbbece6e9855e8fc54f22f01e516cdf886782ec9a007a4ffac8ac980d7e0836cd19b8a7659ab1e05331e12b11bdb1c9c7df5e2f03c39965532c381298017035 SHA512 8df26e74f73ccf6dc73546640e1537b63e40357072855f9409e96b2ef8251c25b4653456d1237d5142573618af242e885490aa9750dffb387e4670ed9f3cfa91
-EBUILD penlight-1.7.0.ebuild 754 BLAKE2B 242c02c16d662ca3a4173f291724d10c4ad1fcb2f8b918c014109a4c58a0a89dc0b26f0893ee5a148e17082925ba4d403230a2b2958cf007521539ed3d431987 SHA512 23f2316ea7e2ef1c745e5732da67c70fde6f0918a0fb3f74b2d2c28e897f8976c917abdda3597ee195c32b4a9db5ed83fdea7c52ffeeb8ce7871671b2e2090e4
-EBUILD penlight-1.9.2-r101.ebuild 1198 BLAKE2B 60f5f9f1b77e65e75c0578b90b8fe04ef748629e2d183b5ba64d46dce354ae9fcabf169c9b09f632ca0b7047a4f84dea03eee0645379c60dde5464917fe192ac SHA512 d0449b5aaef2577b6e683c171a0366275c3943479dbf5ae0c7e6ccd159c6a333d9dd8c53a533088ec2f58c26fd3842cd39c0fabeb6e0f8c43445c23d8600d6e9
-EBUILD penlight-1.9.2.ebuild 1039 BLAKE2B e6d1a1d617d4e613e25182c1ed88d0118dcec92ac4abe4feed4050424c95b8582330ae5b635071317c896b18a52c7ddd807363cb891c55963edc8c2439456ab5 SHA512 dab115e670594ba42650cb6edc0bc725b38946746d69551c4631349609b890d295a27aa2412de0825da79fe9492e97c8cbb2225c3be73f3e544bc582cd7a8ece
+EBUILD penlight-1.9.2-r101.ebuild 1192 BLAKE2B 189a55a942251e3d15cbf74b08054097153d4bac6bf04098fa6460a530046d1cb36d5a514f823112ec96223ec7cb5c9afedf796271283ad7f978c9d97dfd3974 SHA512 4ba07b3d679b20ce3b4ae14c8278076450bd18f5f6e4502fa2d6605a62a2e344458bb9ff815607d20cd6abd2bf97b7a2c32043f85c5d2b974fab45269a51c276
 MISC metadata.xml 704 BLAKE2B 35e8f02d20c248a9b11efdc8b3e1ca81fa1cd8c355a02436f6cdcdeaf07d5a77026cd3053af1255a8fdcc603248f94b871d7432f43766c34766d0fa4f43a1795 SHA512 e64d04284f1bc1f3d2942b72d6077b401f74fb7f717b117c76e16a32f5ae87d7d97982cad6369aba4ebca369b480b6a89952c65cb06a5a7b3a5a6193c23831e3
diff --git a/dev-lua/penlight/penlight-1.7.0.ebuild b/dev-lua/penlight/penlight-1.7.0.ebuild
deleted file mode 100644
index 6e8f0eb19419..000000000000
--- a/dev-lua/penlight/penlight-1.7.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lua utility libraries loosely based on the Python standard libraries"
-HOMEPAGE="https://github.com/Tieske/Penlight"
-SRC_URI="https://github.com/Tieske/Penlight/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE=""
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND=">=dev-lang/lua-5.1:0=
-	dev-lua/luafilesystem"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN//penlight/Penlight}-${PV}"
-
-src_install() {
-	local -a DOCS=( README.md CHANGELOG.md LICENSE.md CONTRIBUTING.md )
-	einstalldocs
-
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
-	doins -r lua/pl
-}
diff --git a/dev-lua/penlight/penlight-1.9.2-r101.ebuild b/dev-lua/penlight/penlight-1.9.2-r101.ebuild
index 99191c9eceb3..8f870898379e 100644
--- a/dev-lua/penlight/penlight-1.9.2-r101.ebuild
+++ b/dev-lua/penlight/penlight-1.9.2-r101.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/penlight/penlight-1.9.2.ebuild b/dev-lua/penlight/penlight-1.9.2.ebuild
deleted file mode 100644
index c68250b22759..000000000000
--- a/dev-lua/penlight/penlight-1.9.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="Penlight"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lua utility libraries loosely based on the Python standard libraries"
-HOMEPAGE="https://github.com/Tieske/Penlight"
-SRC_URI="https://github.com/Tieske/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-lang/lua-5.1:0="
-
-RDEPEND="
-	dev-lua/luafilesystem
-	${DEPEND}
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${DEPEND} )
-"
-
-HTML_DOCS=( "docs/." )
-
-src_prepare() {
-	default
-
-	# This is a demo app, not a real test
-	rm tests/test-app.lua || die
-
-	# Remove test for executing a non-existent command
-	sed -e '/most-likely-nonexistent-command/d' -i tests/test-utils3.lua || die
-}
-
-src_test() {
-	lua run.lua || die
-}
-
-src_install() {
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
-	doins -r lua/pl
-
-	einstalldocs
-}
diff --git a/dev-lua/say/Manifest b/dev-lua/say/Manifest
index 5b9a631bc506..6a3a4b51351f 100644
--- a/dev-lua/say/Manifest
+++ b/dev-lua/say/Manifest
@@ -1,5 +1,3 @@
 DIST say-1.3_p1.tar.gz 3667 BLAKE2B bd99687a71129c5038749b0a2ea48411a411cf05559793cc0c4802a5b7aa620fbf4fd15ed9ab661b33c7b9f94468aaf9e292d177aca4d1c7cd29009601d015f0 SHA512 8d4a360bf0731c2a70c23edb9e6e81cab1e7d9b861aa35103a5c6e521633410860d76c46dc2ea62a06ac8ab3b522bc71c11143d6fe7e26e7fa24dd3f5ea1e5f6
-EBUILD say-1.3_p1-r1.ebuild 887 BLAKE2B 4657c5a3f5297703c44844d9182bc5547debb804a7a396c578922ded64da590852f88afbceb669a38eabe7b144ea975b026dd87c8f05d4e0d75f62317915424b SHA512 391dced871507f9295f3ed665101d88b8f114950724fe2f80d5cd04700b628d06fffa9324e0fb5b5d21590342cb361a5ad5be3673a92f37afc0d93fa3651d919
-EBUILD say-1.3_p1-r101.ebuild 899 BLAKE2B 261cd20f01cf361b633ad173ede70056da681372eff359f25d25bf013977b3a626b3dcc5b61e961b276881b8f1eee13d61bcc752bf4f38adcf578343717d22a3 SHA512 a137ce27fb4c01dbdf93ed1ddc9ce62cffd0a5e7c7c718e2bc3c05bcb25ce1bb08efdd0c4c7c5d66d838c07800b085efd86fe1d8d527dfb45de4ce5911cfbe75
-EBUILD say-1.3_p1.ebuild 662 BLAKE2B 1a37fa0b7df12661bf1c46560f114cfd02ddbd7b10e927d92dbda902ef8c8749c703f01d226b577b360383e1e4e32d4fd6cec38d9dede3e346475adcc93f1fe0 SHA512 37e8abc4018eee12be258abb9ad0d6663b77526d1ffb35e647da09e202b5eb6232f7a1006bc08914d683a33dd7a09f9a674d1a0d6323a0cb276faeaa25f6307d
+EBUILD say-1.3_p1-r101.ebuild 893 BLAKE2B 4f016c02e8417b0f198db1907ec8a77499220529e69f991ad23b3b42dec8b724a6ed221a604a9a4594f43e6b20d0c70ec882fd75073787c182b172f03ac20990 SHA512 2be86768c7c91f4416ae458e7857d6a5aa35e1392fb96f76b71ed104e187ce3332aa81a57998017ea8a0734e1bea071b4cf22f282f18c64b227a55a9c6a15217
 MISC metadata.xml 440 BLAKE2B 436e12385108634e35113c2cfa87d1fc7702e577f3da3242e575ba2c4d64c076ebd05e96e628db472c59957db600c244a14d72537c3728a83cb3125547c789be SHA512 15db0d85172a05831440854135278061e1240e287e36c367ba98cab7f98505450db8d770dbb7612a21a3468f079328bc074102d067e1c5f5f86e18b8d6794392
diff --git a/dev-lua/say/say-1.3_p1-r1.ebuild b/dev-lua/say/say-1.3_p1-r1.ebuild
deleted file mode 100644
index b73175d9b818..000000000000
--- a/dev-lua/say/say-1.3_p1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MY_PV=1.3-1
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lua String Hashing/Indexing Library"
-HOMEPAGE="http://olivinelabs.com/busted/"
-SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-	luajit? ( dev-lang/luajit:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-lua/busted )"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_test() {
-	busted -o gtest || die
-}
-
-src_install() {
-	local instdir
-	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"/${PN}
-	insinto "${instdir#${EPREFIX}}"
-	doins src/init.lua
-	einstalldocs
-}
diff --git a/dev-lua/say/say-1.3_p1-r101.ebuild b/dev-lua/say/say-1.3_p1-r101.ebuild
index 422d9926960f..2d9756fef117 100644
--- a/dev-lua/say/say-1.3_p1-r101.ebuild
+++ b/dev-lua/say/say-1.3_p1-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/say/say-1.3_p1.ebuild b/dev-lua/say/say-1.3_p1.ebuild
deleted file mode 100644
index 243583660466..000000000000
--- a/dev-lua/say/say-1.3_p1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_PV=1.3-1
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lua String Hashing/Indexing Library"
-HOMEPAGE="http://olivinelabs.com/busted/"
-SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-lang/lua-5.1:0="
-DEPEND="${COMMON_DEPEND}
-virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_install() {
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN}
-doins src/init.lua
-dodoc CONTRIBUTING.md README.md
-}
diff --git a/dev-lua/toluapp/Manifest b/dev-lua/toluapp/Manifest
index 3dba6143b270..f823278789a2 100644
--- a/dev-lua/toluapp/Manifest
+++ b/dev-lua/toluapp/Manifest
@@ -1,7 +1,5 @@
 AUX toluapp-1.0.93_p20190513-fix-multilib.patch 1435 BLAKE2B cdcfa5e194dafa466cca5fb05d8cdfc285b97ff3a91c81fe71159601245576527a2f3d8539c3a3f15be745eab14cfe084a3fc90042e141b503dcee8063c85f8f SHA512 2cf6c341e3749aff13a89cc5894b900132b78b423a3b3c858d0235735c2c237b5503ea5a187ddcb851c12a69d42400da1e7556081e178edaafd406b84fb6e893
 AUX toluapp-1.0.93_p20190513-lua-version.patch 288 BLAKE2B c98560e520abbc9106be46a28e604f1436a110de9fb267ec106c9ad00241dcb849861ef195e9344d785520e78d821b7a2750685778746eefc6c4d3619c81043f SHA512 cad6055a6fd10af78f068abbcc6921f22119206cca190d41010182edd4805b38b595b33bb7fe6ed3e90cca19b9ae944dfde8910ba14d284bca0fbf20f9a4ee1b
 DIST toluapp-1.0.93_p20190513.tar.gz 248043 BLAKE2B 08db9f86f224c95532ede354d93317680beeacb7ab8c0e41ddd8ed785a682ab4a3664265d10fae7d36fab33864442fcb403985176a9c01797e29c72708500968 SHA512 5750f9d4bbb39832650ac6874c2933f4ed3ff5f6a40a2345ab795f6fea841ccdbc93cd1fee53ffc93db3cee43bfdb367fa1ec19cf0cd1f75edf6bdb8ee269442
-EBUILD toluapp-1.0.93_p20190513-r1.ebuild 685 BLAKE2B 06aa98e3cd20a07fdb5a2ddfebf8920040fea5c45f0a16a8b10e2043912ce60ac7c0cdde0f389720c6e019082682c9569d533ce6dd0a83e61e374be335fdfeb0 SHA512 bebbd6357816c05b37bd5c530601f37d4c34d20cbabea8ae7907f33b959142525a6b3f317a75d5192253589eddca798c020697b99c5e748b3eda647a9c47e84a
-EBUILD toluapp-1.0.93_p20190513-r100.ebuild 952 BLAKE2B 3f63b1e4c8ca3d25b4c194d7147c6bff96ad55b1d2953869aa62876d6f8222a5e6d4e3c244706c235e8ca56bb17ac5ce724ea6bfe0a102d7359fcd3fcb318fd2 SHA512 b31afa40219f9d01143bfab7f621b591e23ec6199af0a149d369cf3c8e0bdc3ce38add9b4e978bb21fdc394924ef882ec73a514aa017a0eb003667b282e93ba1
-EBUILD toluapp-1.0.93_p20190513-r2.ebuild 661 BLAKE2B 7e6695ed18eae8e4fa419db1f86f0419fe1d20c700031cd31a45ebf5bc711f72e3d75766f21c6cfa2708cddf493ffb7cf39c4e96aaea04b39143e70d142c5e12 SHA512 a024454626e003749b95ff330c7e1339da259698ff46dcd9d959a2ac402e48eee5c36d158240c61928895f7c8d013f7c0e7e077e5e96c5244a77e900feb54a68
+EBUILD toluapp-1.0.93_p20190513-r100.ebuild 947 BLAKE2B 89a03f6527442da15fdd59d249c1135a5f18881d2d87f8a5c59d20e0a4af9c58f7b0fb4b966c74fab1d27a57423c7963aa6183b02220aa42db9e0b7d89acbcf4 SHA512 f83eb137cbb7e6ad654ce73f9a1017370d7554f890f7808bd38fc6e6ce45659945bb63a18069caffb63c815c120622ae970c0ffdfb33da43c8571903f1f497bf
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild
deleted file mode 100644
index 66740e80284c..000000000000
--- a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-MY_PN=${PN/pp/++}
-COMMIT_ID="b34075b76835b778bb6b2ce0aa224afd9d182887"
-
-DESCRIPTION="A tool to integrate C/C++ code with Lua"
-HOMEPAGE="https://github.com/LuaDist/toluapp"
-SRC_URI="https://github.com/LuaDist/toluapp/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="=dev-lang/lua-5.1*:0=[deprecated]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${COMMIT_ID}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.93_p20190513-fix-multilib.patch
-)
-CMAKE_REMOVE_MODULES_LIST="dist lua FindLua"
diff --git a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild
index 7e530101477e..c921edc57500 100644
--- a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild
+++ b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/LuaDist/toluapp/archive/${COMMIT_ID}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r2.ebuild b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r2.ebuild
deleted file mode 100644
index b717b9263fe0..000000000000
--- a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_PN=${PN/pp/++}
-COMMIT_ID="b34075b76835b778bb6b2ce0aa224afd9d182887"
-
-DESCRIPTION="A tool to integrate C/C++ code with Lua"
-HOMEPAGE="https://github.com/LuaDist/toluapp"
-SRC_URI="https://github.com/LuaDist/toluapp/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/lua:0="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${COMMIT_ID}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.93_p20190513-fix-multilib.patch
-)
-CMAKE_REMOVE_MODULES_LIST="dist lua FindLua"
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-29 18:03:51 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-29 18:03:51 +0000
commit	d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch)
tree	1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /dev-lua
parent	abaa75b10f899ada8dd05b23cc03205064394bc6 (diff)