[gentoo-commits] proj/lua:master commit in: dev-lua/luacheck/, dev-lua/lua-cmsgpack/

[Vadim A. Misbakh-Soloviov]

commit:     4344f33422e0b0aaf1d6a5517df31f4b597089e4
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Sat Jul 14 19:17:21 2018 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sat Jul 14 19:17:21 2018 +0000
URL:        https://gitweb.gentoo.org/proj/lua.git/commit/?id=4344f334

cmsgpack: fix, luacheck: bump

 dev-lua/lua-cmsgpack/lua-cmsgpack-9999.ebuild      |  2 +-
 dev-lua/luacheck/Manifest                          |  2 +-
 ...acheck-0.21.1.ebuild => luacheck-0.22.0.ebuild} | 26 +++++++++-------------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/dev-lua/lua-cmsgpack/lua-cmsgpack-9999.ebuild b/dev-lua/lua-cmsgpack/lua-cmsgpack-9999.ebuild
index 525b675..14ede13 100644
--- a/dev-lua/lua-cmsgpack/lua-cmsgpack-9999.ebuild
+++ b/dev-lua/lua-cmsgpack/lua-cmsgpack-9999.ebuild
@@ -21,7 +21,7 @@ IUSE="doc test"
 
 each_lua_compile() {
 	_lua_setFLAGS
-	local MY_PN="lua_${PN}"
+	local MY_PN="${PN//-/_}"
 
 	${CC} ${CFLAGS} -c -o ${MY_PN}.o ${MY_PN}.c || die
 	${CC} ${LDFLAGS} -o ${PN}.so ${MY_PN}.o || die

diff --git a/dev-lua/luacheck/Manifest b/dev-lua/luacheck/Manifest
index 77f3950..113f882 100644
--- a/dev-lua/luacheck/Manifest
+++ b/dev-lua/luacheck/Manifest
@@ -1 +1 @@
-DIST luacheck-0.21.1.tar.gz 136483 SHA256 88e0c1c9106a4f8c2995b1ee6e83ce8b02ec2796557e8603235dd160b2fb5eb4 SHA512 c34d72374ecf3a3c994588d34a325099a7f2f28c7f0e921952eaabaf13372db2c456e92ac174b8f3724b412da6025d83a41836594480d21d3f6973668eca5f0c WHIRLPOOL 8f2fa6768d207962ef17eba303813ac8b18cc6876f181c65d09a6a3e73114c480703886f123c451d7a87d88e64f4928bf32b1958aa7a5d242e285a9e5af06a7c
+DIST luacheck-0.22.0.tar.gz 150685 SHA256 a71806b8ae68f14bd7a40542623fe2377b1184d2972567180f1706254a3bcc72 SHA512 8264000711214e8451307e7f51a45b06d2fcd5da0d3cb49952d54b07a9448431ae3fd68a8cd0a27c73c3b03e6de74e8ae786c139707e16cf938921ab582d3bfd WHIRLPOOL bf00433322f9286e8cbad90606ec80541c7c21da5c2e554c7b1ae206b2ccb9f8cb8d273eaa63ebcda95b2d197f283f7b2cfe6fca98e415d8ee2e26bac1f845e1

diff --git a/dev-lua/luacheck/luacheck-0.21.1.ebuild b/dev-lua/luacheck/luacheck-0.22.0.ebuild
similarity index 65%
rename from dev-lua/luacheck/luacheck-0.21.1.ebuild
rename to dev-lua/luacheck/luacheck-0.22.0.ebuild
index b45c1fc..29203ab 100644
--- a/dev-lua/luacheck/luacheck-0.21.1.ebuild
+++ b/dev-lua/luacheck/luacheck-0.22.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs
+LUA_COMPAT="lua51 luajit2"
+inherit lua
 
 DESCRIPTION="A tool for linting and static analysis of Lua code"
 HOMEPAGE="https://github.com/mpeterv/luacheck"
@@ -11,12 +12,11 @@ SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="doc luajit test"
+IUSE="doc test"
 
 RDEPEND="
-	dev-lua/luafilesystem[luajit=]
-	!luajit? ( >=dev-lang/lua-5.1:= )
-	luajit? ( dev-lang/luajit:2 )"
+	dev-lua/luafilesystem
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( dev-python/sphinx )
@@ -24,25 +24,21 @@ DEPEND="${RDEPEND}
 
 DOCS=( CHANGELOG.md README.md )
 
-src_compile() {
+all_lua_compile() {
 	if use doc; then
 		sphinx-build docsrc html || die
 	fi
 }
 
-src_test() {
+each_lua_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
-
+each_lua_install() {
+	dolua src/luacheck
+}
+all_lua_install() {
 	newbin bin/luacheck.lua luacheck
-
 	use doc && HTML_DOCS+=( html/. )
-
 	einstalldocs
 }