gentoo resync : 08.01.2021

26 files changed, 48 insertions, 374 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 3aae2705065c..f6e72c49dc56 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/busted/Manifest b/dev-lua/busted/Manifest
index 20cba9f03e6b..1b23e0a9fcd5 100644
--- a/dev-lua/busted/Manifest
+++ b/dev-lua/busted/Manifest
@@ -1,8 +1,4 @@
 DIST busted-2.0.0.tar.gz 55002 BLAKE2B 39a3b7bf156911e25f94020f9e56b3f43b9f02b910a9d1c1f288dbdb83e5d53253d5b40d73df655844ed683cff7959d42c330c0d061db918385df07870e16da3 SHA512 3151694b1fba1acc52e3bcfee0231008b14934e89da5885d7e063c6f023479c42040c42a8c0aa6ff1f8303ad6b2a70f0687c8a218830de7231007ef8748457bf
-DIST busted-2.0_rc11_p0.tar.gz 48368 BLAKE2B 3e4534795a4d6bd816b9879d447b82e144f738f3601856e5c9fc5419a6b8f3cb57a78a9ce6ad90990c1abe9fe0974b809d10a942b5f4930b4120f98d34de0dbe SHA512 f09cd5ad2be05b37254e9d602433639340b020e0670e8a435f1ee1d312eced37e284c2f5a398d7a0403fac0023851b74dbe659373e495c5354f48baed814c4b8
-DIST busted-2.0_rc12_p1.tar.gz 52404 BLAKE2B 51f12aea26d6b0909fdbf8953b316814ff8cd76d39358a26eb785ac7541acddbfde1b19d2e41c9e966a604f8f00b9517181f87264a76a4ac7f9f8d6008c87692 SHA512 0cb1f6a66110514dc3675b2e667cca676e6672e895b57ffba438e89a1e0a7f4f8f941cab54ead905758987be15e9885e1eeb82baabc9d18bf29ea56b832b89b1
 EBUILD busted-2.0.0-r101.ebuild 1164 BLAKE2B e9471ba350b1db8aa488505150e0b7ea2bba586fa212de7871a54460d64664100e72c2652f44570f2102c1a924ee42d38168cd76862812414ace79aef8f75b62 SHA512 30c5a0554dee9e3769c4444918271cdd69ff041cf483f7e204db09272d96111318d38a59e07d24be756f034953ee1e8b1f29289408d3ff4f172db1006fa89bd2
-EBUILD busted-2.0.0.ebuild 962 BLAKE2B deddc702374b94414eb66c06d89c843f694b27b4977c637ada2364168df3ecb5108cdc94ebca9d613349e8692ed009f60c079e1456aaccb0e53742c6003595b7 SHA512 dbb41ea8200cc809b862c8f4f054da35177d2c3cddfe1a1288423c8bfcf02d97624eea4c34f8e0da2f8614a4c3e8d0f2451d695c9f40b6b0dbd39f5b9ba35f4e
-EBUILD busted-2.0_rc11_p0.ebuild 1019 BLAKE2B 3d9d98c61e6d8565290db50d05403ef413072a672dfc89eedfc2ee496cff1cc6532098e8c44ec86174c47ca20319dc76c15a70fd42e2f4d387d5ac00ff9bd7e2 SHA512 d86da1777482c86b7bd51952cd4d8a1a5ba83d142c94b1b0989bdeb2569c8dd6c23c38ed5aba39a5ca4226c61fff503530f9faa74100e15de55f8f112a1d4753
-EBUILD busted-2.0_rc12_p1.ebuild 1038 BLAKE2B e6b56520879b1c9f7f1942e48dc9b2c2f7d77dbd740ac25058704b7700972a4e1b1fbdc716a5414d229832e655dfcda0bfdcf7b8e95253f8c4f167dc73416900 SHA512 8bf3f7fe65bb90793a552e2c4da52ef8b4a06303d1c3d9c46bb582ecb8bb079d7c2db8f214a366aa1a8f649f872b9739aabc0bd96b745ea17b401e6bfadacb69
+EBUILD busted-2.0.0.ebuild 959 BLAKE2B 7a770ecb161f7953e003b0bb40e6791d70e7e67b6c19c26f200f8f4eff75e8b0e401a619e79fd155c360d7f066e7af57eb6d3fad2e5cd3d27df3bddb56e4e57f SHA512 54a0170d9d2c6302a2c6630306f03be837f61832015d0574fc35776337ca88754180e3167abc6e576807e196073e3e7e43d7ebc1d942f815a2454ab2e290223e
 MISC metadata.xml 753 BLAKE2B cb7d80aca20864ef7d138d3834011f666775dfee6614f6d233675824c1715ef5f893402532b0d8b928cd7aa1ecb53e3216150c22fbc9d6a21abf3251a10905b4 SHA512 3bae03d1b27087507aa3b8b4b4365a607256c1c0b9cfccde4bd42c946674feb5325715c0dea925aebfd941ab62c6a2b4bc4bd7a5f0c0211f49c4e2fb45ead48c
diff --git a/dev-lua/busted/busted-2.0.0.ebuild b/dev-lua/busted/busted-2.0.0.ebuild
index 656795600611..69f13190ecd6 100644
--- a/dev-lua/busted/busted-2.0.0.ebuild
+++ b/dev-lua/busted/busted-2.0.0.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
@@ -11,7 +11,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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/busted/busted-2.0_rc11_p0.ebuild b/dev-lua/busted/busted-2.0_rc11_p0.ebuild
deleted file mode 100644
index 7a9e382fe5a1..000000000000
--- a/dev-lua/busted/busted-2.0_rc11_p0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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="2.0.rc11-0"
-
-DESCRIPTION="Elegant Lua unit testing"
-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"
-IUSE=""
-
-COMMON_DEPEND=">=dev-lang/lua-5.1:0="
-DEPEND="${COMMON_DEPEND}
-virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	~dev-lua/lua_cliargs-2.5_p5
-	>=dev-lua/luafilesystem-1.5.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
-	>=dev-lua/luasocket-2.0.1
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_install() {
-dobin bin/busted
-insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN}
-doins -r busted/*
-dodoc *.md
-}
diff --git a/dev-lua/busted/busted-2.0_rc12_p1.ebuild b/dev-lua/busted/busted-2.0_rc12_p1.ebuild
deleted file mode 100644
index 007ce37f4131..000000000000
--- a/dev-lua/busted/busted-2.0_rc12_p1.ebuild
+++ /dev/null
@@ -1,43 +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="2.0.rc12-1"
-
-DESCRIPTION="Elegant Lua unit testing"
-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 ppc ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-lang/lua-5.1:0="
-DEPEND="${COMMON_DEPEND}
-virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	>=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
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_install() {
-	dobin bin/busted
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN}
-	doins -r busted/*
-	dodoc *.md
-}
diff --git a/dev-lua/lua-term/Manifest b/dev-lua/lua-term/Manifest
index 0f4d8585ca3c..43df2b1168ab 100644
--- a/dev-lua/lua-term/Manifest
+++ b/dev-lua/lua-term/Manifest
@@ -1,6 +1,4 @@
-DIST lua-term-0.3.tar.gz 3752 BLAKE2B 6d42129b60278a4bf756195bae28529a9a22688945ecf6c5648ea490645de363799e4fe5a188069e3739557c3b45ee83e28e315cdd69e987f022f28e3a673cb2 SHA512 e91585994c0337d4dbdc36f51cec9f66fe7319212e82c56752ed724bbbe273e4dc67977bd13e7963545bb075f23f69a448dfc4cc4d6c3c49e96af99cd3eb59e7
 DIST lua-term-0.7.tar.gz 4365 BLAKE2B 8f4080d4cd3b620cb1f261d417744f112d42b776ab3f4cdb0e52d04b6d64fc4a1ddbd634570496c3bc12e6b10efe5af8025d1f124198ebb3946414679a65f7f4 SHA512 2046ba1861ff590c191bb651941c45eb8b6e9a1252b05e78daaeb31837ce1fc7da9ba124aec34dc7842fd304e945754c463ffd75941125ff952e911ba66efa31
-EBUILD lua-term-0.3.ebuild 1047 BLAKE2B 89ea5e2764d940d84af29fdffef96188bfb5fe63122ebcd23adb2d7ebae3bc3c38c915164822baff66f1b359bb8d152475e7dabd064f58c6c4766fec03ac6620 SHA512 bef1d40048b56a9b0c39a2a53c600ed3cab9961584909bfaa7ebcf57ad1ea8150fe25978f8ccedf93b45d869bae70728a5f008d483e6f3007d83a15618b8072e
 EBUILD lua-term-0.7-r101.ebuild 1176 BLAKE2B bdecbcf3fbdc5a3e2ccf3ea356bbc1745a3f0d44cdac82d520bd279dafd4d579ffbeb4213726c4d4d744b37b699fa5a13d6e354f2f94afae299f443c93fe6ea5 SHA512 1df0ee36917b1a03395c21bca99dea1e258dbe7ce48f2bbda71ae564df2ed0dd020e363c6fedefd484372ed340a667f43959473697ab7084e38b5c9e15ba642d
-EBUILD lua-term-0.7.ebuild 1025 BLAKE2B b73c52e43f438101faae494555e4c9b410cbd314a91c943b4bb89a2fb42d373f6a7985ca6e128f7d13253fdb88d4cf64b9c5e55c2de3e7be3ad36ffc44248770 SHA512 739cebf5b6713db406dc1d5ecd118769d329dee0eaad044c23143d6c70e45338cef96b4d88139aff8bfb680c2c14683b5c7311d1cc5af4dc1e108c1e214383e1
+EBUILD lua-term-0.7.ebuild 1024 BLAKE2B 0d71c0c7b4679f8e04729464ce393e8206e8ebcf938610bd96732c569326db366f456830a48ab69645e64a5e9b35f69025bdad0698bf77177d892403a7310a96 SHA512 7e1c81e838f80cbf163b5b94854f37f6d535bb6dc610d57a85b4c6e6d1d16644151c4df27f08c6d3d8050fb04b9de2bd998d3fdf9dac6ea5e42546f07cf216cf
 MISC metadata.xml 440 BLAKE2B 7578e30f2b7c2b37df1fd563325189efd987df03c42fdb06cfe334a74a7d596b2ef9bb3b1ed2adb9f6aae8aed072cb89df8898d57cab40db23933a54a0963612 SHA512 101ba9221fad8bed21cc6fa169d8063e58cb303f45177a355859e9d3dded2489e22082bfd3104763a5f92fc3d0325b344d4758b5afef7d50d22684fae752de43
diff --git a/dev-lua/lua-term/lua-term-0.3.ebuild b/dev-lua/lua-term/lua-term-0.3.ebuild
deleted file mode 100644
index ad390ac5cac6..000000000000
--- a/dev-lua/lua-term/lua-term-0.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-# Yes, upstream used different version numbers.
-# The rockspec version number is 0.3, but the version associated with
-# the tarball is 0.03.
-MY_PV=0.03
-
-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 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_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-term/lua-term-0.7.ebuild b/dev-lua/lua-term/lua-term-0.7.ebuild
index 73309626f4dc..854d2a4e4071 100644
--- a/dev-lua/lua-term/lua-term-0.7.ebuild
+++ b/dev-lua/lua-term/lua-term-0.7.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 @@ SRC_URI="https://github.com/hoelzro/lua-term/archive/${MY_PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE=""
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-lua/lua_cliargs/Manifest b/dev-lua/lua_cliargs/Manifest
index c500fec3be76..1af542206d0c 100644
--- a/dev-lua/lua_cliargs/Manifest
+++ b/dev-lua/lua_cliargs/Manifest
@@ -1,8 +1,4 @@
-DIST lua_cliargs-2.5_p5.tar.gz 19513 BLAKE2B 25cdfd9e96fd0cf5d600394c47ec53dd80e619dac8a37a40e22366e1090ffc9f9f250d71683140959fbd33b3983a759c931c3ac70a3f14e9556005fe5f82f72c SHA512 7c4d490f5d86b07bdf299c976b99bf83c9ba86fabeb321f348587f8ad207983292e3e9268ef72f3cc6ff9d6e32a43669de1d3c21c47499852f971c2cc2a4e746
-DIST lua_cliargs-3.0_p1.tar.gz 29904 BLAKE2B 4cb3e33c0d1331cb9c6cef9b8db67c12cfd3678277e11b6218d56ae38e4678dd48472d65dd959b59bb44d5c42c1e64697fe4e54b67e80933ab706d9d2b01c79f SHA512 2bdcd3c790a82351df598cb3d289de980fe771222ebd9715036678eecdbe51b7563d24629afa4d286b900d722bf844004d12f2330744a1e644d9286ac44b4dbe
 DIST lua_cliargs-3.0_p2.tar.gz 30435 BLAKE2B 8edf60870e0d91593064876a225ef7fbe638425da13b458d6356eaa0636482ca904f9355fd15314d4893e6f5346a6faa30fb6078d191a29aa14e26aa5d74a4be SHA512 e7a475f1d41249b0a35f021a6ccca46078f5b689c1927a4dd4cab80b2e4d291babaab35cf7d64fad3ebf68d871fb5177f030c7a2b28d9f55fbeb4dd26021d024
-EBUILD lua_cliargs-2.5_p5.ebuild 874 BLAKE2B 2584944e83c43a79113ff69476e94c16831695fe3fcb745fbec0efb51cc432032a2cc391a4e898e58e1caf706a4bf8a8fc9c970888049a05d8d066170330ddea SHA512 c7f3758ab7fd4e99e13e109b9a2d244471da037ee5b0a625c0578549d926ec7f67582f851d7520604fa1e06065e01e3d5d0b0394d998bb8de2632b6754987ff8
-EBUILD lua_cliargs-3.0_p1.ebuild 907 BLAKE2B 45f6593655405c628fb4396b76a37c5861f7612c34fec21dbf53fa390339486a371584590d5fc141e553c1e740932584445f371f9cd280672c0e91dea5588658 SHA512 c6da49a9e1e151072fdafcfe06ffd4613511e8ba401d4ddf992c40d6ce3626af85a4bb9f22097d1860389013b930e732c17fbef8a83f4445fca36d0c18193d58
 EBUILD lua_cliargs-3.0_p2-r100.ebuild 785 BLAKE2B 44f5b4d3515c9d84f989a4cb9d85d28118697fad315ea588986fcb71dacd41d61648af38c0fc7a9bb90ca976080ca1dff1ea4637a845918909eb793f90ec11b4 SHA512 c0547e4b6fa033cfee5d481af99850aa90edeb5225dd8213993c8347f2396ff0dbc608f31e00beda69b335ac7ad4508221cb72f6d12cacb3e038bc68ca10d04b
-EBUILD lua_cliargs-3.0_p2.ebuild 908 BLAKE2B 858e549f2e98ff055f328fb8b338209c84041956179e512546009e80a64af69bcf4430592cc30842e68a1aaf1b3c82c788a082860d52c07dcd546ac17c7a0cb9 SHA512 e45bdef0bf583aa712d4e85a0b6b3197faeb35051c8e9355dff939fb4b68e32ee4b0da6ce245c6a2f50356b8bc9612750641b50c3d9cee7faca502d9d8dc63c7
+EBUILD lua_cliargs-3.0_p2.ebuild 907 BLAKE2B d04176ed23866b5700c92e5909bc69d265737707861f1224c43f7212d6f07c974f1054fda803b8975bba3b6bae2456741ee1bd7d1a4b821bcf18472d735e3625 SHA512 5154f2098d54c3a5be57323337b4bce88ccf27ade1285e9411507ef0a95e68902281efc9bfa71b43c4aaf16c9833475b7b736d4c151c065e83f8df819eb42e88
 MISC metadata.xml 662 BLAKE2B f439daeab6ac235e0f754364c7a54ebb313df50fa96288a4f47f75e259809396c9668b216d2ee0bb930413af44ff181a026247db0be3d6f482e95507c3e5e3cd SHA512 f64fe9598875b158de72f71438193fa3558199f41d5981657481a8dd103d35dcd579cdfd10520e8e30e89a0b030c48ab81d358d5f8e363337d1ac6bedab6357a
diff --git a/dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild b/dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild
deleted file mode 100644
index 15cdc866d789..000000000000
--- a/dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild
+++ /dev/null
@@ -1,36 +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 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="2.5-5"
-
-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"
-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/cliargs.lua
-	dodoc README.md
-dodoc -r examples
-	docinto html
-	dodoc -r doc/*
-}
diff --git a/dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild b/dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild
deleted file mode 100644
index d60495be4e4f..000000000000
--- a/dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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-1"
-
-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 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 -r src/cliargs.lua src/cliargs
-	dodoc README.md
-	dodoc -r examples
-	docinto html
-	dodoc -r doc/*
-}
diff --git a/dev-lua/lua_cliargs/lua_cliargs-3.0_p2.ebuild b/dev-lua/lua_cliargs/lua_cliargs-3.0_p2.ebuild
index be2c348c046e..bc6b994535c6 100644
--- a/dev-lua/lua_cliargs/lua_cliargs-3.0_p2.ebuild
+++ b/dev-lua/lua_cliargs/lua_cliargs-3.0_p2.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 @@ 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"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="doc"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-lua/luassert/Manifest b/dev-lua/luassert/Manifest
index b47ac2852eaa..131a89f4d9f6 100644
--- a/dev-lua/luassert/Manifest
+++ b/dev-lua/luassert/Manifest
@@ -1,9 +1,5 @@
 AUX luassert-1.8.0-disable-highlightcolor-test.patch 2931 BLAKE2B dcf614b08aa0e89404d18e9bdc77ac5b723d577b8f5694f7fded74275c8ace59e938ddd2ad46b19a9ba7d8a36886d36db384d6fb439a2cccee77cf370e711060 SHA512 0bf9b3877e78183d5db3d33acb977f64e1aa7934f313838ffb5ec9b759283b21f071c619020ca4b8ec8aa36d9ea4e8082e3510d59d800fbd82fef74e0d8b9895
-DIST luassert-1.7.10.tar.gz 35789 BLAKE2B c9aaca445272957a5d67d09700f6dc4c1c6c191d3ea274b97afe874f2f5ea1dfda051bd5674d33b9c040e55aed05f2c7baf01431d762223db57cd05b1c4a68a5 SHA512 2d5ca354b5f7b971f0d3420c305d921143cd7f9e1a6f4559cb466b833886a00a045e7b7c594bd9ec3c929b3d5bb8a7a4a6de75a6599e5cba7614b7652061bf05
-DIST luassert-1.7.9.tar.gz 34803 BLAKE2B bcaacff85ddd1c85b39241dbd2c7eef28f3697318e2a942521dd60eade5dfc9da9f0c69d570f5a9556b49609f1bb79250cec9ba39a98e4a65627d6479f9e2f2a SHA512 4e1257bf7adaa9002af7c6ac15f2d042c9094ceeae9ce065c51296c663a99fa239ac8d37f106151100478cde8c68d3290b42588553ac681d183e7edef288414b
 DIST luassert-1.8.0.tar.gz 38874 BLAKE2B ebc4aab1de5dc830d0b9266726ca6bf361e03000f3a8acd27c04805a6c963373755c8e163b187714f64178acc5d755c05493d745b55c785e3254dd41aa4bef31 SHA512 18b296fececa6b0d5950b2a20c4d30da3bbf9b0932c568bbb8ca212b5c82a1047b73c52ee72b4505a41a393d41dd21321189367e038dd029152d177e11bafc93
-EBUILD luassert-1.7.10.ebuild 875 BLAKE2B f05b89fe8a3a8fff2ce5c67b2d31e49c7f159b0ebb19fe714ba13411a441b2a6175c73e2ec49f4ca1d4ccfb05f07e6a7c27c14d8f103db44cfadfe43f8ffec70 SHA512 1ef6a365904a3dbeaab7222c692da45bd471f29bb38dabb527b9a94b540b67fefc6c07a29f91bf20fd6f995b7319a90fee45f79797e2a42e4e395ba9dd341f6f
-EBUILD luassert-1.7.9.ebuild 607 BLAKE2B 4e921ee0a90ca2d1e6ab9e6ee40629b00af404721eb270fac78b8aa371fa4b2f9d499d1b3a19e09f3595eb84d3b7b25d9d7fe3d32b1aceba54a3a24610a3dc0b SHA512 ed12aaa3e48104c8f7574cb3ba1477bbb5caf9f1f4035086f8897155cd24bb4070e52fd288e0cc0fb50758d0a168103add7164e042e3acbba4f23af1d85c9c90
 EBUILD luassert-1.8.0-r101.ebuild 967 BLAKE2B 58fd29809bfd194ef2eb6356786761e5bd8d582df168a47918c299a95dbdd93df16107b441e1d0cba42ca3a0efb9f5e4f9fd46f7cca97df34fdf8484b01dd727 SHA512 c2e701ed993dca17e79a2cac7a902230e7895b4503e7169a3a3ad9469d38b00a894334a34459b908c3d1ea28cee200c76b683fd1c23dc895ee3ef4078dd65a9d
-EBUILD luassert-1.8.0.ebuild 962 BLAKE2B 56290a27afa992fbecd4f77e36f4b36f353315ec921a5e31d391f95101f62af95f7ff097bb03539b5eb7e241260bd85f3ab4ff3451003c49b88ffbc3975ee7ce SHA512 ae72d1f98447ae7482983f2e96132f6df2ca385b3f17c2b96137107634ec39fe0776ebf289dd52bdcfedc6a9dbd10f598191622c46d2e916f91cc06c2a37778e
+EBUILD luassert-1.8.0.ebuild 961 BLAKE2B 5bffb37793777f1980c802436c20de2248ac864d5848103ea46ab570ae2d88063592564af5b4a0c2e931c9b809d25a5a02d9c104271abcfa4995a91db5d584c1 SHA512 a21ac3ce2ebdd2e497eb29a370ce513ecccab92453d570807ef7a8e2f55a6771c661b080e777428b9bc4f1c753712941eb95242493a453c138b31f336a4db154
 MISC metadata.xml 598 BLAKE2B 44f0ff617e32241bc72db4da50d83f321cae964924c7dd6c12c46b356158d0ca4a99f228042b2c51e7bdbc0e4573b45cdc15814e5cf73e8a4e4fda450df58ab7 SHA512 d5d5330dba6b543ca5ec99235444ead2c736c2319689513767a27cc654837bb645ab60365e2dd96f9e7ffbd3dbc9c4b3ff5029ad59655bf88bec1f7faa50f80a
diff --git a/dev-lua/luassert/luassert-1.7.10.ebuild b/dev-lua/luassert/luassert-1.7.10.ebuild
deleted file mode 100644
index d94677537a77..000000000000
--- a/dev-lua/luassert/luassert-1.7.10.ebuild
+++ /dev/null
@@ -1,39 +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 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 ppc ppc64 x86"
-IUSE="luajit test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-	luajit? ( dev-lang/luajit:2 )"
-RDEPEND="${CDEPEND}
-	>=dev-lua/say-1.2_p1[luajit=]"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( dev-lua/busted )"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-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/*
-	einstalldocs
-}
diff --git a/dev-lua/luassert/luassert-1.7.9.ebuild b/dev-lua/luassert/luassert-1.7.9.ebuild
deleted file mode 100644
index ca2c53d951bc..000000000000
--- a/dev-lua/luassert/luassert-1.7.9.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="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 x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-lang/lua-5.1:0="
-DEPEND="${COMMON_DEPEND}
-virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-lua/say-1.2_p1"
-
-src_install() {
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN}
-	doins -r src/*
-	dodoc *.md
-}
diff --git a/dev-lua/luassert/luassert-1.8.0.ebuild b/dev-lua/luassert/luassert-1.8.0.ebuild
index 858f392054e9..5bb7cb40bbf8 100644
--- a/dev-lua/luassert/luassert-1.8.0.ebuild
+++ b/dev-lua/luassert/luassert-1.8.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Olivine-Labs/luassert/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="luajit test"
 RESTRICT="test" # Requires same version to be installed or busted will fail.
 
diff --git a/dev-lua/lutok/Manifest b/dev-lua/lutok/Manifest
index 62e2732885be..4fb091153f4f 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 754 BLAKE2B 3fe886271f7515a575d95112777472c40b32f700ae0191e6d284f8ba767567c4c8dc4ad155ed4e25474a71b73554ffed6127bdb102df3706a1121d987595df13 SHA512 a003eb9cb09759e8a467cf926e441e2583a78d730cfbe35d0dba66f64970a46928ff608a522b45c6bab0e2974bec7cc901a875f4f2465f1fec445bbb203c96ba
-EBUILD lutok-0.4-r10.ebuild 1025 BLAKE2B 6cc449e4de7d5b5b9e560248896c1eac8f8ee877ae269a389b2c7f0317803f25e6cba6fac802355a58d50734f93b2e5654aeb5488a6bac3f5e91846b90db3099 SHA512 f59b9a4140f7947a3d117e05d9e6208a8bf06867b71e442a7e8f02482a1e6d388cd9f934257debbf8fd29e7728c037d1f1a6aa76343ea65797d7528fccdbc186
-EBUILD lutok-0.4-r2.ebuild 837 BLAKE2B 3d3fe5fcbd35fe809def568aa4dfd4f75285534b52697d5d21bd873337dc4ddd830d7c28726cccd84edf16182bf19c7ccfbde070bbe9ad30f195c7a8374084fd SHA512 b46af7dc3a0ac47b394ec507ddaa162d3f75d3f11186ed99e0fcb2c393f776abe1eacb41313afdce1bfe3b4ee30ed429be60f5c68e99d711f9d4b425b2e7df2c
+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-r2.ebuild 826 BLAKE2B ccf9433d02deb2f67b523bb8a46139fcea4da8957d47f2a6f1bf65a2fc6b9f7f641371ad2b489230e0089e9ed1db4e754acfbef6b791c57f4495cb83e4807ff4 SHA512 327ec4a80919cae9504c165f384b0852147d47c66f89df6f5fc0f7cd213311b46c05ff554d0f12cb028c875080dd2c5d38fc100d41132f98a5ab835ba75c694a
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-lua/lutok/lutok-0.4-r1.ebuild b/dev-lua/lutok/lutok-0.4-r1.ebuild
index 1fcf61cf71a2..7d3823e9c241 100644
--- a/dev-lua/lutok/lutok-0.4-r1.ebuild
+++ b/dev-lua/lutok/lutok-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,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 ~x86-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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/lutok/lutok-0.4-r10.ebuild b/dev-lua/lutok/lutok-0.4-r10.ebuild
index 378ed963caf4..68f897e2a460 100644
--- a/dev-lua/lutok/lutok-0.4-r10.ebuild
+++ b/dev-lua/lutok/lutok-0.4-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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/lutok/lutok-0.4-r2.ebuild b/dev-lua/lutok/lutok-0.4-r2.ebuild
index f908ca91e0ad..1060307ceb2d 100644
--- a/dev-lua/lutok/lutok-0.4-r2.ebuild
+++ b/dev-lua/lutok/lutok-0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,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 ~x86-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="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/penlight/Manifest b/dev-lua/penlight/Manifest
index 039b5f140caf..e6c30efdcc6d 100644
--- a/dev-lua/penlight/Manifest
+++ b/dev-lua/penlight/Manifest
@@ -1,10 +1,6 @@
-DIST penlight-1.3.2-core.zip 116854 BLAKE2B c653a51cf8ea286c849e1a2c68968ed767c350b1461dd11d9a2e99c81295461c67044175c7bf99c31e8040118e6cfce85f8613d4b6c49e726d31393029abcbbf SHA512 01ba35e967e255f6f39afff9c2238f4921de9e52850ce0d2ec0c9068029fc61a241c82bede680a28fda46c4504582784fcd2241a2eef0bef95c7c389c4042d02
-DIST penlight-1.5.4.tar.gz 213938 BLAKE2B c6bba4fd7fc491d2e6ca464f71b897ba4b5dc8dc94e7340fd77d3add47a9b4a72ce48cea268f94fe55c2aef1edd850f96f00f2ba1ef7186e1e8d86a4e3155366 SHA512 c46e7875410a90390bfbf010a53f1d536475e2094668722618d03951caad0fcb0674c9bc7119a0753e4ed3df9e4d70fef828ba4c6c24e8ada4036948d2432519
 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.3.2.ebuild 654 BLAKE2B 6a4a4ea2f96ecff3e99bb5cfa257f8e7f2486f07a7d6105bf95d50d93547464dbbc53a67c32a4438708cae2b90f832521ba638554df62466438fd26b49db5c91 SHA512 b36305f96072b9276744a0bfb26de6767b6b5c1d62bd73a15cb19b0d430d5366ad230489e00437040e977b861ac83cebb237329760d037c19809bf69b4911fe8
-EBUILD penlight-1.5.4.ebuild 757 BLAKE2B 7d0870c6217f30ca5251d861dd7f13652f60557f2ad0929b5700bfcc0bceba0a7b833b4bdefa90807cb6d6e0390721202a4675a8ddd4375b0f2af112869a4e1b SHA512 9af992243a13d2713db63e967ce7135dbd28e4bff819f5f342b9f2adf8a115ff0eb8d9123089b1a58044666d5ec3e469e090b9cecee2206c6489b38a5e9521bd
-EBUILD penlight-1.7.0.ebuild 756 BLAKE2B ed56154e99092498eba825cc8a4ee8fe62527db3c4ef09c160b84c7aa05a3783a33334d6f4c4b9786da1abdec76847ef66b60c567e464da1a3f6c796553d8e63 SHA512 985bd3c2d2026ec5c0b782db708473bbe411f12ad8123d53e4901a3935ca8490b5bdc4180764edbdc2d76e5e432da5c2d33208063331613ab4863bd83ddcba4c
-EBUILD penlight-1.9.2-r101.ebuild 1032 BLAKE2B a59d65861871336e6f383bf7e2d36ae674cb012f9c62d5a7efa27a9d03a2096b51d79490ff67eaa7f75180310f12b31ce8e852cf4aba8dfeea5806335606773d SHA512 9d40f0941aa8980e7450fb07f416ca66bc65a6c124a2722e80bd49f589b05000e676f7fd5fa9e2a85eae62dca2cf024380d5fb85f4ff78166ee2392d7df176e9
-EBUILD penlight-1.9.2.ebuild 875 BLAKE2B a39e0fff4b7c3e90aa5f71b6ca89540422edc87cdb202c346e3bdd6d07e60e3a8ec1ac1736c7cafd730f119addb3966b5cddbf78b15176ef8271a9a14c08fe0a SHA512 aa78e5cbd272361d62048415c33c8040b1ea8d885b3e599d3adebb7566dbddca6c16c628de46ee961e67fe56a8c98cbe9eaed14396d813475fc77e4387db8d5e
+EBUILD penlight-1.7.0.ebuild 755 BLAKE2B 4b59a423eaa52e5d7cedfe144d9945b22acfb6799cf9cbe4dd0fa0240f45394ebf4b28ff7a55a6ff6b260a8ed793a8306472e4d02935584cc2727f243c233c74 SHA512 41536c7871828227326b2a3fce3a38392987c0a2c8335e09678fc8f2cc4a3bebdb2bdad7b6abf5771bfba48750f9404fc6970cf6c6f2634d742c713e2ba30330
+EBUILD penlight-1.9.2-r101.ebuild 1199 BLAKE2B 36e223801e174849f565fd65dac89a5329964485b24e9405855746b36fad0fcf0a5d34c91811cae30d0c28755fcc1a34d066d8f6f88654b74311bd8487bcaf4d SHA512 dfe40df1eb6b9bf155d28955bce9e4fb9f6e35f864e19957c3a75dc85726e3ea229254b0dfa6bf01beea2c98479537f96c67639c53583d3b37c0191b45b4d0e0
+EBUILD penlight-1.9.2.ebuild 1040 BLAKE2B 3dde8268d099872e713ccb888e5b9bf2da9dbace1a2b9832a8a9add0ca7122a5626aa1bcd62dea711528307c9f8ab44aa993dd47df01b5016348ac4569d291cf SHA512 aef2439d3bc44d56a27f12b0987df1748d7bc7d64356433bf9825b2fff26fb55d1def9e88e72afa4533e1856628307197412c90b6f42afef0ddb55710e0e81a4
 MISC metadata.xml 704 BLAKE2B 35e8f02d20c248a9b11efdc8b3e1ca81fa1cd8c355a02436f6cdcdeaf07d5a77026cd3053af1255a8fdcc603248f94b871d7432f43766c34766d0fa4f43a1795 SHA512 e64d04284f1bc1f3d2942b72d6077b401f74fb7f717b117c76e16a32f5ae87d7d97982cad6369aba4ebca369b480b6a89952c65cb06a5a7b3a5a6193c23831e3
diff --git a/dev-lua/penlight/penlight-1.3.2.ebuild b/dev-lua/penlight/penlight-1.3.2.ebuild
deleted file mode 100644
index 50461f6e6826..000000000000
--- a/dev-lua/penlight/penlight-1.3.2.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="Lua utility libraries loosely based on the Python standard libraries"
-HOMEPAGE="http://stevedonovan.github.com/Penlight",
-SRC_URI="http://stevedonovan.github.io/files/${PN}-1.3.2-core.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-lang/lua-5.1:0="
-DEPEND="${COMMON_DEPEND}
-app-arch/unzip
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	dev-lua/luafilesystem"
-
-src_install() {
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
-	doins -r lua/pl
-}
diff --git a/dev-lua/penlight/penlight-1.5.4.ebuild b/dev-lua/penlight/penlight-1.5.4.ebuild
deleted file mode 100644
index 453932d80233..000000000000
--- a/dev-lua/penlight/penlight-1.5.4.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="Lua utility libraries loosely based on the Python standard libraries"
-HOMEPAGE="http://stevedonovan.github.com/Penlight",
-SRC_URI="https://github.com/Tieske/Penlight/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~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 CHANGES.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.7.0.ebuild b/dev-lua/penlight/penlight-1.7.0.ebuild
index 55bb481ca8b9..14bec76de8dd 100644
--- a/dev-lua/penlight/penlight-1.7.0.ebuild
+++ b/dev-lua/penlight/penlight-1.7.0.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
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE=""
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-lua/penlight/penlight-1.9.2-r101.ebuild b/dev-lua/penlight/penlight-1.9.2-r101.ebuild
index 1b88d0b0c28f..8db997ae866e 100644
--- a/dev-lua/penlight/penlight-1.9.2-r101.ebuild
+++ b/dev-lua/penlight/penlight-1.9.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
@@ -34,14 +34,21 @@ BDEPEND="
 
 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
+}
+
 lua_src_test() {
-	${ELUA} run.lua || die
+	"${ELUA}" run.lua || die
 }
 
 src_test() {
-	# This is a demo app, not a real test
-	rm tests/test-app.lua
-
 	lua_foreach_impl lua_src_test
 }
 
diff --git a/dev-lua/penlight/penlight-1.9.2.ebuild b/dev-lua/penlight/penlight-1.9.2.ebuild
index fee4959b0eed..e334e61a7434 100644
--- a/dev-lua/penlight/penlight-1.9.2.ebuild
+++ b/dev-lua/penlight/penlight-1.9.2.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
@@ -32,10 +32,17 @@ BDEPEND="
 
 HTML_DOCS=( "docs/." )
 
-src_test() {
+src_prepare() {
+	default
+
 	# This is a demo app, not a real test
-	rm tests/test-app.lua
+	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
 }