gentoo resync : 14.12.2020

6 files changed, 96 insertions, 10 deletions

diff --git a/dev-lua/luacheck/Manifest b/dev-lua/luacheck/Manifest
index e41482e1b190..cc05c8ebe35e 100644
--- a/dev-lua/luacheck/Manifest
+++ b/dev-lua/luacheck/Manifest
@@ -1,5 +1,7 @@
+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.ebuild 1054 BLAKE2B 3e5aa98c7f3953c831904625dcbcaa24b662620b57a04f85d03c189330f44e305c33b578320aecefd1cd4fdd1aa70fbb839a8f7fbcb563bec6e4be77cb02adff SHA512 3e5c5bb402eb22c464c1d080f23dac3952bd5fbbcb7a21747badf01fb274295059c39ea33f560636be0100dca2fb55cfbdeff8d04703df9eb52c3264ba003834
-EBUILD luacheck-0.23.0.ebuild 1159 BLAKE2B 5e2f247d700f03f376f9cb6d8ed5143b35a084439c5e7ce5a7709476a4c5d27c79b2eec9b77018f2be99cb6fb113dfa3932470e29d87edd21809f4da516c7513 SHA512 11a5bc70bbcab18b03b6e4ea0060cfc8af8836d2cfefadcd851c145e81d4e30bf4a4928d04ca37c57ec3dde7f0b72f9b757506b2e2f74bd78479b6da6a827699
-MISC metadata.xml 718 BLAKE2B 6fa684f1c29b7ce764e08e6643404e461bb2def6a4e08bca778f81798147de4d1c924038d8a824276623aff9a34a5cd17c7296ccb2d3a57b5d1fe2cc1252bbb9 SHA512 2fe325b68e5bbf2977f1d6dc956080815b7cfcc54105f4138780394592f93c0b490ad21dce68cddbbb7678a62e8a79fda9795e1652e4ee72acdfd5a6650efe46
+EBUILD luacheck-0.20.0-r1.ebuild 1058 BLAKE2B 17d25640c64b9a53d97e8419636095121d5e95507ececa6872966c78e080c3eda19dce658122aebb65bba737a75c36de78599e3eb8a364eb03e452928599de31 SHA512 715beecb4032116aa52093df41e886159d1bf856ea05bbbf281926cdcb0631852ffe382f3ec387538f3f8daded32a2983d8bef29e66922c25a54296ed0e73d21
+EBUILD luacheck-0.23.0-r1.ebuild 1245 BLAKE2B 568fbade223112f4e081765806ab6a92ecc0f913627995a44b12734b978f0cbb8e6fbda427760735e713cc14a0748488957703bd1aeedf73b5f837854da20b99 SHA512 322e9564e864a389464010ab47ad8fa0f516e6efb3e463ad26714be7e4fa80352b57eb031216b402e5b976e40504310a2434dbf20bd6e4d2ef810c28794286a3
+EBUILD luacheck-0.23.0-r100.ebuild 1233 BLAKE2B 0f0c4a4a006df2c9060edfb516f39523165f057b43fa2fa133344993a7221b1a247fe682893c858b7d31f21f5b81a6cbfc5049aa88b138c445832db2d144cfc4 SHA512 cbddb5dd61591e2caae6d78f4a4b5cf04625b809f7e0717cbdfa8f4cab311426bdba711e6d215f5d5f61c4959a6594e269279d5506ca185c84ee65498a019677
+MISC metadata.xml 829 BLAKE2B 76e2e67f3ea5dc70f37a6f3e54a6afc12de689026de589b9d644766c443b62cd66068db5c56d3e63312920adb1d2ecb74a1b2515c4f36790dda650a499a81589 SHA512 c27495f97fda460389d0cc74fa97839ea0837f62997ca3e1b5ae4b70bb7d78f15d81012fc151c1c11ec00079e2ebc1121c61bdd86cbaf137e7eeccf5207e63f6
diff --git a/dev-lua/luacheck/files/luacheck-0.23.0-disable-measuring-performance-test.patch b/dev-lua/luacheck/files/luacheck-0.23.0-disable-measuring-performance-test.patch
new file mode 100644
index 000000000000..04d40ec958b6
--- /dev/null
+++ b/dev-lua/luacheck/files/luacheck-0.23.0-disable-measuring-performance-test.patch
@@ -0,0 +1,13 @@
+--- a/spec/cli_spec.lua
++++ b/spec/cli_spec.lua
+@@ -68,10 +68,6 @@
+       assert.equal(0, get_exitcode "spec/samples/good_code.lua --no-config")
+    end)
+ 
+-   it("allows measuring performance", function()
+-      assert.equal(0, get_exitcode "spec/samples/good_code.lua --no-config --profile")
+-   end)
+-
+    it("removes ./ in the beginnings of file names", function()
+       assert.equal([[
+ Checking spec/samples/good_code.lua               OK
diff --git a/dev-lua/luacheck/luacheck-0.20.0.ebuild b/dev-lua/luacheck/luacheck-0.20.0-r1.ebuild
index 070046152a0c..857d9ef215df 100644
--- a/dev-lua/luacheck/luacheck-0.20.0.ebuild
+++ b/dev-lua/luacheck/luacheck-0.20.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,8 +15,8 @@ IUSE="doc luajit test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-lua/luafilesystem[luajit=]
-	!luajit? ( >=dev-lang/lua-5.1:= )
+	dev-lua/luafilesystem[luajit(-)=]
+	!luajit? ( >=dev-lang/lua-5.1:0= )
 	luajit? ( dev-lang/luajit:2 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/dev-lua/luacheck/luacheck-0.23.0.ebuild b/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
index bfdbe93ecb29..bad05ff91e43 100644
--- a/dev-lua/luacheck/luacheck-0.23.0.ebuild
+++ b/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
@@ -10,15 +10,15 @@ SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64"
+KEYWORDS="~amd64 arm ppc64"
 IUSE="doc luajit test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-lua/lua-argparse[luajit=]
+	dev-lua/lua-argparse[luajit(-)=]
 	dev-lua/luafilesystem[luajit(-)=]
-	dev-lua/lua-utf8[luajit=]
-	!luajit? ( >=dev-lang/lua-5.1:= )
+	dev-lua/lua-utf8[luajit(-)=]
+	!luajit? ( >=dev-lang/lua-5.1:0= )
 	luajit? ( dev-lang/luajit:2 )"
 BDEPEND="
 	virtual/pkgconfig
@@ -29,6 +29,8 @@ BDEPEND="
 	)"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-0.23.0-disable-measuring-performance-test.patch" )
+
 src_compile() {
 	if use doc; then
 		sphinx-build docsrc html || die
diff --git a/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild b/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild
new file mode 100644
index 000000000000..d39540a1c32e
--- /dev/null
+++ b/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua 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 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lua/lua-argparse[${LUA_USEDEP}]
+	dev-lua/lua-utf8[${LUA_USEDEP}]
+	dev-lua/luafilesystem[${LUA_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	test? (
+		>=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}]
+		${RDEPEND}
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.23.0-disable-measuring-performance-test.patch" )
+
+src_compile() {
+	if use doc; then
+		sphinx-build docsrc html || die
+	fi
+}
+
+lua_src_test() {
+	busted --lua=${ELUA} || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	insinto "$(lua_get_lmod_dir)"
+	doins -r src/luacheck
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	newbin bin/luacheck.lua luacheck
+
+	use doc && local -a HTML_DOCS=( "html/." )
+	einstalldocs
+}
diff --git a/dev-lua/luacheck/metadata.xml b/dev-lua/luacheck/metadata.xml
index dcba9d1f5774..fa1113bb8edc 100644
--- a/dev-lua/luacheck/metadata.xml
+++ b/dev-lua/luacheck/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>vpayno+gentoo@gmail.com</email>
 		<name>Victor Payno</name>
 	</maintainer>