gentoo resync : 08.01.2021

6 files changed, 27 insertions, 74 deletions

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
 }