6 files changed, 28 insertions, 73 deletions
diff --git a/dev-lua/penlight/Manifest b/dev-lua/penlight/Manifest
index 6ea12b1323bc..208e07680d13 100644
--- a/dev-lua/penlight/Manifest
+++ b/dev-lua/penlight/Manifest
@@ -1,4 +1,2 @@
-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
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 f26edc6d2b68..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="https://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 b5d7a09d4024..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="https://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..6e8f0eb19419 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
@@ -6,12 +6,12 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Lua utility libraries loosely based on the Python standard libraries"
-HOMEPAGE="https://github.com/Tieske/Penlight",
+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"
+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..c5b522708fb4 100644
--- a/dev-lua/penlight/penlight-1.9.2-r101.ebuild
+++ b/dev-lua/penlight/penlight-1.9.2-r101.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 MY_PN="Penlight"
 
 inherit lua toolchain-funcs
 
 DESCRIPTION="Lua utility libraries loosely based on the Python standard libraries"
-HOMEPAGE="https://github.com/Tieske/Penlight",
+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}"
 
@@ -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..c68250b22759 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
@@ -8,7 +8,7 @@ MY_PN="Penlight"
 inherit toolchain-funcs
 
 DESCRIPTION="Lua utility libraries loosely based on the Python standard libraries"
-HOMEPAGE="https://github.com/Tieske/Penlight",
+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}"
 
@@ -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
 }