diff options
Diffstat (limited to 'dev-lua')
87 files changed, 124 insertions, 834 deletions
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild index e05dc251e246..d116e2b3dce4 100644 --- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild +++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..2} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua toolchain-funcs diff --git a/dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild b/dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild index 66a5ea1eca4a..cc744903e9cc 100644 --- a/dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild +++ b/dev-lua/busted-htest/busted-htest-1.0.0-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua diff --git a/dev-lua/busted/Manifest b/dev-lua/busted/Manifest index a71fcbc8e3b1..8e2afed14554 100644 --- a/dev-lua/busted/Manifest +++ b/dev-lua/busted/Manifest @@ -1,3 +1 @@ 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 diff --git a/dev-lua/busted/busted-2.0.0-r101.ebuild b/dev-lua/busted/busted-2.0.0-r101.ebuild index 135fe33e1228..fff79d6c80e1 100644 --- a/dev-lua/busted/busted-2.0.0-r101.ebuild +++ b/dev-lua/busted/busted-2.0.0-r101.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua toolchain-funcs diff --git a/dev-lua/busted/busted-2.0.0.ebuild b/dev-lua/busted/busted-2.0.0.ebuild index a7e721fa8d45..a967d06419b1 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 abe144275df7..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="https://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 a6ee52ccdf35..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="https://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/dkjson/dkjson-2.5-r100.ebuild b/dev-lua/dkjson/dkjson-2.5-r100.ebuild index 356fd0c66b8a..4e7132396c73 100644 --- a/dev-lua/dkjson/dkjson-2.5-r100.ebuild +++ b/dev-lua/dkjson/dkjson-2.5-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua toolchain-funcs diff --git a/dev-lua/inifile/inifile-1.0-r100.ebuild b/dev-lua/inifile/inifile-1.0-r100.ebuild index 89a8791ca127..b115a72d5d89 100644 --- a/dev-lua/inifile/inifile-1.0-r100.ebuild +++ b/dev-lua/inifile/inifile-1.0-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) MY_PV="${PV/_p/-}" inherit lua diff --git a/dev-lua/inifile/inifile-1.0.ebuild b/dev-lua/inifile/inifile-1.0.ebuild index 05056d9afbd7..172de3e5af4f 100644 --- a/dev-lua/inifile/inifile-1.0.ebuild +++ b/dev-lua/inifile/inifile-1.0.ebuild @@ -19,7 +19,7 @@ REQUIRED_USE="${LUA_REQUIRED_USE}" RDEPEND=" luajit? ( dev-lang/luajit:2 ) - !luajit? ( >=dev-lang/lua-5.1:= ) + !luajit? ( >=dev-lang/lua-5.1:0= ) " BDEPEND="virtual/pkgconfig" diff --git a/dev-lua/lanes/Manifest b/dev-lua/lanes/Manifest index 7ddec415417a..1cc7a0a7a5b1 100644 --- a/dev-lua/lanes/Manifest +++ b/dev-lua/lanes/Manifest @@ -1,2 +1 @@ -DIST lanes-3.10.0.tar.gz 231359 BLAKE2B beb1972a9b37097947fc673a644330fe8b66c826bc09967526b96d8e28838939516ee3ad4640fb8e5dca7061227c2844d55270c48f26416c7a7bd3613a83e648 SHA512 4a49f560623e291a8344ffef69f4f26fd422d21d3926d73dfee9c9ae9ebd4973e5ae2d307dfd42c5a3bf101bfcc277df54f0a46d89390c83483208e36d4e5d9b DIST lanes-3.13.0.tar.gz 247978 BLAKE2B e330f3648e865b8b7c1b77061b6a8210f46e1db650066736afe62040dbb20c7e31e0037b420fded8fb0931cc2ac59687e2039fb31f43c1bdf0cae8cd3c031307 SHA512 bb509181757fa2b4f07a55962015b35ca6bb867b18ec89dd655f333babe2e12f56479fa85bc98e0dacf5bec2a523265bbc3a978396dc332dc1fdda4df760b2e5 diff --git a/dev-lua/lanes/files/lanes-3.10.0-fix-makefile.patch b/dev-lua/lanes/files/lanes-3.10.0-fix-makefile.patch deleted file mode 100644 index 52549704248e..000000000000 --- a/dev-lua/lanes/files/lanes-3.10.0-fix-makefile.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Makefile b/Makefile -index fc44fac..6c87e89 100644 ---- a/Makefile -+++ b/Makefile -@@ -202,17 +202,17 @@ _perftest: - # - # LUA_LIBDIR and LUA_SHAREDIR are used by the .rockspec (don't change the names!) - # --DESTDIR=/usr/local --LUA_LIBDIR=$(DESTDIR)/lib/lua/5.1 --LUA_SHAREDIR=$(DESTDIR)/share/lua/5.1 -+PREFIX=/usr/local -+LUA_LIBDIR=$(PREFIX)/lib/lua/5.1 -+LUA_SHAREDIR=$(PREFIX)/share/lua/5.1 - - # - # AKa 17-Oct: changed to use 'install -m 644' and 'cp -p' - # - install: $(_TARGET_SO) src/lanes.lua -- mkdir -p $(LUA_LIBDIR) $(LUA_LIBDIR)/lanes $(LUA_SHAREDIR) -- install -m 644 $(_TARGET_SO) $(LUA_LIBDIR)/lanes -- cp -p src/lanes.lua $(LUA_SHAREDIR) -+ mkdir -p $(DESTDIR)$(LUA_LIBDIR)/lanes $(DESTDIR)$(LUA_SHAREDIR) -+ install -m 644 $(_TARGET_SO) $(DESTDIR)$(LUA_LIBDIR)/lanes -+ cp -p src/lanes.lua $(DESTDIR)$(LUA_SHAREDIR) - - - #--- Packaging --- diff --git a/dev-lua/lanes/lanes-3.10.0.ebuild b/dev-lua/lanes/lanes-3.10.0.ebuild deleted file mode 100644 index b801dd2bd239..000000000000 --- a/dev-lua/lanes/lanes-3.10.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="lightweight, native, lazy evaluating multithreading library" -HOMEPAGE="https://github.com/LuaLanes/lanes" -SRC_URI="https://github.com/LuaLanes/lanes/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -COMMON_DEPEND=">=dev-lang/lua-5.1:0=" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -src_prepare() { - tc-export CC - epatch "${FILESDIR}"/${P}-fix-makefile.patch - sed -i -e "s#/lib#/$(get_libdir)#" Makefile || die "sed failed" -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install - dodoc ABOUT BUGS CHANGES README TODO -dohtml -r docs/* -} diff --git a/dev-lua/lanes/lanes-3.13.0-r100.ebuild b/dev-lua/lanes/lanes-3.13.0-r100.ebuild index 3c7d429b112e..55ff51d69409 100644 --- a/dev-lua/lanes/lanes-3.13.0-r100.ebuild +++ b/dev-lua/lanes/lanes-3.13.0-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua toolchain-funcs diff --git a/dev-lua/lanes/lanes-3.13.0.ebuild b/dev-lua/lanes/lanes-3.13.0.ebuild index e3c4a87c18c9..0a88a310fdc2 100644 --- a/dev-lua/lanes/lanes-3.13.0.ebuild +++ b/dev-lua/lanes/lanes-3.13.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/LuaLanes/lanes/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="luajit test" RESTRICT="!test? ( test )" diff --git a/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild b/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild index 5486df73038a..07d7baa74b1b 100644 --- a/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild +++ b/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-1 luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua-single diff --git a/dev-lua/lgi/lgi-0.9.2-r100.ebuild b/dev-lua/lgi/lgi-0.9.2-r100.ebuild index 908e5804dfbd..60b13c030673 100644 --- a/dev-lua/lgi/lgi-0.9.2-r100.ebuild +++ b/dev-lua/lgi/lgi-0.9.2-r100.ebuild @@ -4,7 +4,7 @@ EAPI=7 VIRTUALX_REQUIRED="manual" -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua eutils toolchain-funcs flag-o-matic virtualx diff --git a/dev-lua/lpeg/lpeg-1.0.1.ebuild b/dev-lua/lpeg/lpeg-1.0.1.ebuild index 26ce06217421..b74481ef67f5 100644 --- a/dev-lua/lpeg/lpeg-1.0.1.ebuild +++ b/dev-lua/lpeg/lpeg-1.0.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86" +KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86" IUSE="debug doc luajit" RDEPEND=" diff --git a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild index 93857403fbda..1d83f5adf384 100644 --- a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild +++ b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua flag-o-matic toolchain-funcs diff --git a/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild b/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild index 0a45d921f67a..f17a8188bc05 100644 --- a/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild +++ b/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/mpeterv/argparse/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="doc luajit test" RESTRICT="!test? ( test )" diff --git a/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild b/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild index db9fce9d4ced..698189931892 100644 --- a/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild +++ b/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua toolchain-funcs diff --git a/dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild b/dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild index 6bb9594da9cc..f93eb369a127 100644 --- a/dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild +++ b/dev-lua/lua-bit32/lua-bit32-5.3.5-r101.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-1 luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) MY_PN="lua-compat-5.3" MY_PV="0.10" diff --git a/dev-lua/lua-bit32/lua-bit32-5.3.5-r2.ebuild b/dev-lua/lua-bit32/lua-bit32-5.3.5-r2.ebuild index 63a13ff6ed83..13ee16708513 100644 --- a/dev-lua/lua-bit32/lua-bit32-5.3.5-r2.ebuild +++ b/dev-lua/lua-bit32/lua-bit32-5.3.5-r2.ebuild @@ -7,8 +7,8 @@ inherit toolchain-funcs # Weird upstream version descisions... # Result tarball may be reused for future lua-compat53 package -LUA_COMPAT_PN="lua-compat-5.3" -LUA_COMPAT_PV="0.10" +LUA_COMPAT=( lua5-{1..4} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) DESCRIPTION="Backported Lua bit manipulation library" HOMEPAGE="https://github.com/keplerproject/lua-compat-5.3" diff --git a/dev-lua/lua-cjson/Manifest b/dev-lua/lua-cjson/Manifest index 71e8c4e78233..d81f4631b59f 100644 --- a/dev-lua/lua-cjson/Manifest +++ b/dev-lua/lua-cjson/Manifest @@ -1,3 +1 @@ -DIST lua-cjson-2.1.0.6.tar.gz 76820 BLAKE2B 1056fefc8d9c802e068e1e7801cc1eb3a0279371ab72e4e8517e22ad68224dd4892f4e4cbfe0a407af71f1008affded41d7bcc05d89c4ddb0c437d93d67708a7 SHA512 71d25f4ec82641d56e33e13c0ecd8c60186b3c4faf3d30de81706d1305d4e61691a1e84210462942674e50ca2ff19e126cb04025d9645d5d26ef3b3b0e46f64b -DIST lua-cjson-2.1.0.7.tar.gz 76949 BLAKE2B 9189890f24885191001e79cf0f48aaee74026572eda3e767b0e5e63d44634156fd2b972287cb23e243b3fd0f44f8e87a1fcb0c0b8e26197c63e5e0ff30cb3a94 SHA512 c66fbb608dcd1b7daef8c70ad9a60ab442bf8b851b8d8c5e3b11854ab476dff115e2eef31f171a40ce364778682ce351114caf36c995521ec589bd9dd94415c5 DIST lua-cjson-2.1.0.8.tar.gz 77211 BLAKE2B 227171576318939ab48abe26e87fa905cf9a15e6ff44065c0713b6a6fedac571f1dbbb88526b957836a4368e71c4d19a748b2a3250221572f580f1d32ccf50a0 SHA512 577278ccb58a23ea56ea9ad34c5fb0a07c13c6691a3b666f58fa6427bca269aaec26271d7400dcd253c922d1bb0b3b322915a2ce139880c1ed4c1d2c15437580 diff --git a/dev-lua/lua-cjson/files/sparse_array_test_fix.patch b/dev-lua/lua-cjson/files/sparse_array_test_fix.patch deleted file mode 100644 index 0c1d138cbadf..000000000000 --- a/dev-lua/lua-cjson/files/sparse_array_test_fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 75678e4b0d1b25fc15f0399f1496db6e0287b72f Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <gyakovlev@gentoo.org> -Date: Tue, 12 Feb 2019 13:32:38 -0800 -Subject: [PATCH] Fix Encode sparse array as object test - -Port of this commit from upstream -https://github.com/mpx/lua-cjson/commit/98eb1d01e952fc60a36f47846f905b86c92a4f58 ---- - tests/test.lua | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/tests/test.lua b/tests/test.lua -index d1bf7e4..be5e19c 100755 ---- a/tests/test.lua -+++ b/tests/test.lua -@@ -10,6 +10,17 @@ local json = require "cjson" - local json_safe = require "cjson.safe" - local util = require "cjson.util" - -+local function json_encode_output_type(value) -+ local text = json.encode(value) -+ if string.match(text, "{.*}") then -+ return "object" -+ elseif string.match(text, "%[.*%]") then -+ return "array" -+ else -+ return "scalar" -+ end -+end -+ - local function gen_raw_octets() - local chars = {} - for i = 0, 255 do chars[i + 1] = string.char(i) end -@@ -292,8 +303,8 @@ local cjson_tests = { - json.encode, { { [1] = "one", [4] = "sparse test" } }, - true, { '["one",null,null,"sparse test"]' } }, - { "Encode sparse array as object", -- json.encode, { { [1] = "one", [5] = "sparse test" } }, -- true, { '{"5":"sparse test","1":"one"}' } }, -+ json_encode_output_type, { { [1] = "one", [5] = "sparse test" } }, -+ true, { 'object' } }, - { "Encode table with numeric string key as object", - json.encode, { { ["2"] = "numeric string key test" } }, - true, { '{"2":"numeric string key test"}' } }, --- -2.20.1 - diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.6.ebuild b/dev-lua/lua-cjson/lua-cjson-2.1.0.6.ebuild deleted file mode 100644 index 7170add189d9..000000000000 --- a/dev-lua/lua-cjson/lua-cjson-2.1.0.6.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -DESCRIPTION="A fast JSON encoding/parsing module for Lua" -HOMEPAGE="https://www.kyne.com.au/~mark/software/lua-cjson.php https://github.com/openresty/lua-cjson" -SRC_URI="https://github.com/openresty/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+internal-fpconv luajit test +threads" -RESTRICT="!test? ( test )" - -REQUIRED_USE="threads? ( internal-fpconv )" - -RDEPEND=">=dev-lang/lua-5.1:0" -DEPEND="${RDEPEND}" -BDEPEND="test? ( dev-lang/perl )" - -DOCS=( NEWS README.md THANKS manual.txt performance.txt ) - -PATCHES=( - "${FILESDIR}"/sparse_array_test_fix.patch -) - -src_configure() { - local mycmakeargs=( - -DUSE_INTERNAL_FPCONV="$(usex internal-fpconv)" - -DMULTIPLE_THREADS="$(usex threads)" - ) - - cmake-utils_src_configure -} - -src_test() { - cd tests || die - ln -s "${BUILD_DIR}"/cjson.so ./ || die - ln -s "${S}"/lua/cjson ./ || die - ./genutf8.pl || die - ./test.lua || die -} diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.7.ebuild b/dev-lua/lua-cjson/lua-cjson-2.1.0.7.ebuild deleted file mode 100644 index 7170add189d9..000000000000 --- a/dev-lua/lua-cjson/lua-cjson-2.1.0.7.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -DESCRIPTION="A fast JSON encoding/parsing module for Lua" -HOMEPAGE="https://www.kyne.com.au/~mark/software/lua-cjson.php https://github.com/openresty/lua-cjson" -SRC_URI="https://github.com/openresty/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+internal-fpconv luajit test +threads" -RESTRICT="!test? ( test )" - -REQUIRED_USE="threads? ( internal-fpconv )" - -RDEPEND=">=dev-lang/lua-5.1:0" -DEPEND="${RDEPEND}" -BDEPEND="test? ( dev-lang/perl )" - -DOCS=( NEWS README.md THANKS manual.txt performance.txt ) - -PATCHES=( - "${FILESDIR}"/sparse_array_test_fix.patch -) - -src_configure() { - local mycmakeargs=( - -DUSE_INTERNAL_FPCONV="$(usex internal-fpconv)" - -DMULTIPLE_THREADS="$(usex threads)" - ) - - cmake-utils_src_configure -} - -src_test() { - cd tests || die - ln -s "${BUILD_DIR}"/cjson.so ./ || die - ln -s "${S}"/lua/cjson ./ || die - ./genutf8.pl || die - ./test.lua || die -} diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild b/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild index c7ff3172c0be..41c7ecba3c72 100644 --- a/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild +++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.8-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua toolchain-funcs diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild index f8e40f03140f..0162c1cdc347 100644 --- a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild +++ b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild @@ -4,7 +4,7 @@ EAPI=7 EGIT_COMMIT_AUX="8d09895473b73e4fb72b7573615f69c36e1860a2" -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) MY_PN_AUX="lua-auxiliar" MY_PN_COMPAT="lua-compat-5.3" MY_PV="${PV//_p/-}" @@ -46,6 +46,9 @@ DOCS=( "README.md" "samples/." ) src_prepare() { default + # Allow override of LUA* variables + sed -e '/LUA /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die + # Prepare needed dependencies (source code files only) rm -r deps/{auxiliar,lua-compat} || die mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die @@ -60,6 +63,7 @@ lua_src_compile() { local myemakeargs=( "AR=$(tc-getAR)" "CC=$(tc-getCC)" + "LUA=" "LUA_CFLAGS=${CFLAGS} $(lua_get_CFLAGS)" "LUA_LIBS=${LDFLAGS}" "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" @@ -80,6 +84,8 @@ lua_src_test() { local myemakeargs=( "LUA=${ELUA}" + "LUA_CFLAGS=" + "LUA_LIBS=" "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" "TARGET_SYS=${CTARGET:-${CHOST}}" ) @@ -97,7 +103,10 @@ lua_src_install() { pushd "${BUILD_DIR}" || die local myemakeargs=( + "LUA=" + "LUA_CFLAGS=" "LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)" + "LUA_LIBS=" "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" "TARGET_SYS=${CTARGET:-${CHOST}}" ) diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild index c8c126b8cb44..88652952c1f3 100644 --- a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild +++ b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild @@ -45,6 +45,9 @@ DOCS=( "README.md" "samples/." ) src_prepare() { default + # Allow override of LUA* variables + sed -e '/LUA /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die + # Prepare needed dependencies (source code files only) rm -r deps/{auxiliar,lua-compat} || die mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die @@ -55,6 +58,7 @@ src_compile() { local myemakeargs=( "AR=$(tc-getAR)" "CC=$(tc-getCC)" + "LUA=" "LUA_CFLAGS=${CFLAGS} -I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))" "LUA_LIBS=${LDFLAGS}" "LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))" @@ -67,6 +71,8 @@ src_compile() { src_test() { local myemakeargs=( "LUA=$(usex luajit 'luajit' 'lua')" + "LUA_CFLAGS=" + "LUA_LIBS=" "LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))" "TARGET_SYS=${CTARGET:-${CHOST}}" ) @@ -76,7 +82,10 @@ src_test() { src_install() { local myemakeargs=( + "LUA=" + "LUA_CFLAGS=" "LUA_LIBDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" + "LUA_LIBS=" "LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))" "TARGET_SYS=${CTARGET:-${CHOST}}" ) diff --git a/dev-lua/lua-term/Manifest b/dev-lua/lua-term/Manifest index cbd77ab2f28c..47939a9931a0 100644 --- a/dev-lua/lua-term/Manifest +++ b/dev-lua/lua-term/Manifest @@ -1,2 +1 @@ -DIST lua-term-0.3.tar.gz 3752 BLAKE2B 6d42129b60278a4bf756195bae28529a9a22688945ecf6c5648ea490645de363799e4fe5a188069e3739557c3b45ee83e28e315cdd69e987f022f28e3a673cb2 SHA512 e91585994c0337d4dbdc36f51cec9f66fe7319212e82c56752ed724bbbe273e4dc67977bd13e7963545bb075f23f69a448dfc4cc4d6c3c49e96af99cd3eb59e7 DIST lua-term-0.7.tar.gz 4365 BLAKE2B 8f4080d4cd3b620cb1f261d417744f112d42b776ab3f4cdb0e52d04b6d64fc4a1ddbd634570496c3bc12e6b10efe5af8025d1f124198ebb3946414679a65f7f4 SHA512 2046ba1861ff590c191bb651941c45eb8b6e9a1252b05e78daaeb31837ce1fc7da9ba124aec34dc7842fd304e945754c463ffd75941125ff952e911ba66efa31 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-r101.ebuild b/dev-lua/lua-term/lua-term-0.7-r101.ebuild index d9f090f2e7e8..c9628e46cdf3 100644 --- a/dev-lua/lua-term/lua-term-0.7-r101.ebuild +++ b/dev-lua/lua-term/lua-term-0.7-r101.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) MY_PV="0.07" inherit lua toolchain-funcs 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-utf8/lua-utf8-0.1.3-r100.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild index 48e0614d06d8..f91686dcdc7a 100644 --- a/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild +++ b/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua toolchain-funcs diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild index f41c166ac3aa..71e19b9f460a 100644 --- a/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild +++ b/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN//-/}-${PV}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 arm arm64 ppc ppc64 x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 x86" IUSE="luajit test" RESTRICT="!test? ( test )" diff --git a/dev-lua/lua-zlib/lua-zlib-1.2-r100.ebuild b/dev-lua/lua-zlib/lua-zlib-1.2-r100.ebuild index 1fbf98752889..ce12a552dab6 100644 --- a/dev-lua/lua-zlib/lua-zlib-1.2-r100.ebuild +++ b/dev-lua/lua-zlib/lua-zlib-1.2-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit cmake lua diff --git a/dev-lua/lua_cliargs/Manifest b/dev-lua/lua_cliargs/Manifest index 59c7b81278c1..dcb3ae88b9c8 100644 --- a/dev-lua/lua_cliargs/Manifest +++ b/dev-lua/lua_cliargs/Manifest @@ -1,3 +1 @@ -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 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-r100.ebuild b/dev-lua/lua_cliargs/lua_cliargs-3.0_p2-r100.ebuild index 471bebcf2aa6..ad54d766d6c0 100644 --- a/dev-lua/lua_cliargs/lua_cliargs-3.0_p2-r100.ebuild +++ b/dev-lua/lua_cliargs/lua_cliargs-3.0_p2-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) MY_PV="${PV/_p/-}" inherit lua toolchain-funcs 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/luacheck/luacheck-0.23.0-r1.ebuild b/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild index bad05ff91e43..a22daf625f58 100644 --- a/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild +++ b/dev-lua/luacheck/luacheck-0.23.0-r1.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 @@ -10,7 +10,7 @@ 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 ~arm64 ppc ppc64 x86" IUSE="doc luajit test" RESTRICT="!test? ( test )" diff --git a/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild b/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild index d39540a1c32e..19da4733b8a5 100644 --- a/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild +++ b/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua toolchain-funcs diff --git a/dev-lua/luacov/Manifest b/dev-lua/luacov/Manifest index 9f2bab83abc6..9f2cfe036bbe 100644 --- a/dev-lua/luacov/Manifest +++ b/dev-lua/luacov/Manifest @@ -1,2 +1 @@ DIST luacov-0.14.0.tar.gz 49571 BLAKE2B 2248fc00e1af0a1cdec923bbe6150ae682cc1ba814c77f21bc86269d723ea80542fb48fe62980de2527040598b7b9c87f92f146d6c62abde06651fa6733c75c5 SHA512 44ea158ce597f705d80b9768676e401804daea91b9c2afb146a8d25aae612e895e4f42a29c4b7b3438659c596fa500af5d23b66b7f3477459747ad06ca9b7ffa -DIST luacov-0.8.tar.gz 33613 BLAKE2B 942c47de25dbd53de445e1ed1fa924f1be278da4c3b134e4a603f4a5ab5090f87d762c48163cf82ed9bab585e35b0528c330b3dc849e0043ccc96532107c8a94 SHA512 03d6ee519a570ff0430bcc32f547b9beb01691bd8c7ad8655e78d732223c6c25e4a63d816fd99640568251b836d5e3cc736bd5d780f5ecd3986d855ed5edfa11 diff --git a/dev-lua/luacov/files/luacov-0.8-fix-makefile.patch b/dev-lua/luacov/files/luacov-0.8-fix-makefile.patch deleted file mode 100644 index 7a4ea6ba9ea7..000000000000 --- a/dev-lua/luacov/files/luacov-0.8-fix-makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/Makefile b/Makefile -index 477f9de..adad2cc 100644 ---- a/Makefile -+++ b/Makefile -@@ -6,13 +6,13 @@ BINDIR=$(PREFIX)/bin - LUADIR=$(PREFIX)/share/lua/5.1/ - - install: -- mkdir -p $(BINDIR) -- cp src/bin/luacov $(BINDIR) -- chmod +x $(BINDIR)/luacov -- mkdir -p $(LUADIR) -- cp src/luacov.lua $(LUADIR) -- mkdir -p $(LUADIR)/luacov -- cp src/luacov/*.lua $(LUADIR)/luacov -+ mkdir -p $(DESTDIR)$(BINDIR) -+ cp src/bin/luacov $(DESTDIR)$(BINDIR) -+ chmod +x $(DESTDIR)$(BINDIR)/luacov -+ mkdir -p $(DESTDIR)$(LUADIR) -+ cp src/luacov.lua $(DESTDIR)$(LUADIR) -+ mkdir -p $(DESTDIR)$(LUADIR)/luacov -+ cp src/luacov/*.lua $(DESTDIR)$(LUADIR)/luacov - - dist: - rm -rf $(PACKAGE)-$(VERSION) diff --git a/dev-lua/luacov/luacov-0.14.0-r100.ebuild b/dev-lua/luacov/luacov-0.14.0-r100.ebuild index 9f9d91d40d6d..b2f21c9afa04 100644 --- a/dev-lua/luacov/luacov-0.14.0-r100.ebuild +++ b/dev-lua/luacov/luacov-0.14.0-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua diff --git a/dev-lua/luacov/luacov-0.8.ebuild b/dev-lua/luacov/luacov-0.8.ebuild deleted file mode 100644 index 97c531edf6c9..000000000000 --- a/dev-lua/luacov/luacov-0.8.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 eutils - -DESCRIPTION="LuaCov is a simple coverage analyzer for Lua scripts" -HOMEPAGE="https://github.com/keplerproject/luacov" -SRC_URI="https://github.com/keplerproject/luacov/archive/v${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}" - -src_prepare() { - epatch "${FILESDIR}"/${PF}-fix-makefile.patch -} - -src_compile() { - return 0 -} - -src_install() { - emake DESTDIR="${ED}" \ - PREFIX=/usr \ - LUADIR="$(pkg-config --variable INSTALL_LMOD lua)" install -dohtml -r doc/* - dodoc -r examples -} diff --git a/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild index 03742f998777..0bd30f6db602 100644 --- a/dev-lua/luadbi/luadbi-0.7.2-r101.ebuild +++ b/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua toolchain-funcs @@ -75,6 +75,7 @@ lua_src_install() { local myemakeargs=( DESTDIR="${ED}" LUA_CDIR="$(lua_get_cmod_dir)" + LUA_INC="$(lua_get_CFLAGS)" LUA_LDIR="$(lua_get_lmod_dir)" ) diff --git a/dev-lua/luadoc/Manifest b/dev-lua/luadoc/Manifest deleted file mode 100644 index af6b1b70a67a..000000000000 --- a/dev-lua/luadoc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST luadoc-3.0.1.tar.gz 108824 BLAKE2B 52092feeb22cdcd7570ba5d54c57598d16688daba7c90d81dc975cfd2545c5e42e6f4b8f1bdc150c877f6b953cbb193d03d1a02f0ac48cfbc5cf1ec4a91b101c SHA512 413b40e72cc0699c00caf47fe3d7233c8619bfd6064eac001762bcb2ae0b21ccc6f800bd05566cd83924546e5616d1e5840d8bc20ec6d1f1c7a64910a9df6be2 diff --git a/dev-lua/luadoc/luadoc-3.0.1.ebuild b/dev-lua/luadoc/luadoc-3.0.1.ebuild deleted file mode 100644 index 66bf442e1914..000000000000 --- a/dev-lua/luadoc/luadoc-3.0.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="LuaDoc is a documentation tool for Lua source code" -HOMEPAGE="https://luadoc.luaforge.net/" -SRC_URI="http://luaforge.net/frs/download.php/3185/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86" -IUSE="" - -DEPEND="" -RDEPEND=">=dev-lang/lua-5.1.3 - dev-lua/luafilesystem" - -src_prepare() { - default - - sed -i \ - -e "s|/usr/local|\$(DESTDIR)/usr|" \ - -e "s|lib|$(get_libdir)|" \ - -e "s|lua5.1|lua|" \ - config || die - - # lua-5.1.3 - find . -name '*.lua' -exec sed -i -e "s/gfind/gmatch/g" {} + || die -} - -src_install() { - default - docinto html - dodoc -r doc/us/. -} diff --git a/dev-lua/luadoc/metadata.xml b/dev-lua/luadoc/metadata.xml deleted file mode 100644 index df76f4c3652f..000000000000 --- a/dev-lua/luadoc/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription lang="en"> - LuaDoc is a documentation generator tool for Lua source code. - It parses the declarations and documentation comments in a set of Lua - source files and produces a set of XHTML pages describing the commented - declarations and functions. - </longdescription> - <origin>gentoo-staging</origin> -</pkgmetadata> diff --git a/dev-lua/luaevent/luaevent-0.4.6-r100.ebuild b/dev-lua/luaevent/luaevent-0.4.6-r100.ebuild index 73dc2a0ca236..8eb563ba106b 100644 --- a/dev-lua/luaevent/luaevent-0.4.6-r100.ebuild +++ b/dev-lua/luaevent/luaevent-0.4.6-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua toolchain-funcs diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild index ce6096ca0c47..bce8fe95f6b8 100644 --- a/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild +++ b/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua toolchain-funcs diff --git a/dev-lua/luaexpat/luaexpat-1.3.3-r102.ebuild b/dev-lua/luaexpat/luaexpat-1.3.3-r102.ebuild index e1907b637e49..24defeaec8ce 100644 --- a/dev-lua/luaexpat/luaexpat-1.3.3-r102.ebuild +++ b/dev-lua/luaexpat/luaexpat-1.3.3-r102.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua toolchain-funcs diff --git a/dev-lua/luafilesystem/luafilesystem-1.8.0-r101.ebuild b/dev-lua/luafilesystem/luafilesystem-1.8.0-r101.ebuild index 0a5ee44a7d7c..51275e371fd4 100644 --- a/dev-lua/luafilesystem/luafilesystem-1.8.0-r101.ebuild +++ b/dev-lua/luafilesystem/luafilesystem-1.8.0-r101.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua toolchain-funcs diff --git a/dev-lua/luajson/luajson-1.3.4-r100.ebuild b/dev-lua/luajson/luajson-1.3.4-r100.ebuild index f06cd069d628..a0fadc395869 100644 --- a/dev-lua/luajson/luajson-1.3.4-r100.ebuild +++ b/dev-lua/luajson/luajson-1.3.4-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua diff --git a/dev-lua/lualdap/lualdap-1.2.5-r100.ebuild b/dev-lua/lualdap/lualdap-1.2.5-r100.ebuild index af582b86b150..b6375c88f3dc 100644 --- a/dev-lua/lualdap/lualdap-1.2.5-r100.ebuild +++ b/dev-lua/lualdap/lualdap-1.2.5-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua toolchain-funcs diff --git a/dev-lua/luaossl/luaossl-20200709-r100.ebuild b/dev-lua/luaossl/luaossl-20200709-r100.ebuild index f61c8526f83b..fa7abd071cd6 100644 --- a/dev-lua/luaossl/luaossl-20200709-r100.ebuild +++ b/dev-lua/luaossl/luaossl-20200709-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) MY_P="${PN}-rel-${PV}" inherit lua toolchain-funcs diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest index 6bc9964136da..80635d0e56e9 100644 --- a/dev-lua/luarocks/Manifest +++ b/dev-lua/luarocks/Manifest @@ -1,2 +1,2 @@ DIST luarocks-3.3.1.tar.gz 241636 BLAKE2B fd34d7a233bbf1c5f224bd04886a7f1382d63ffc014c8b78ae7924fb799d66a32e048298deed103686771263885c85c9173c013d1bbb3bad6a48e9fd99fdaac0 SHA512 0a695ceb30ae575cbca52abd2aad9675e33a234c53c5d1e125442d874c21e0e3cf6157431f07085e4311f81833680366adfe5c626a66cb5880380b48899a116a -DIST luarocks-3.4.0.tar.gz 244013 BLAKE2B 873c315ca3616179d20d665ceb09b8549c6f007d721581751bb4bb27d147547a52f5be1458541f9c0f936fcc3659c1d8eb253431ee0cf12530f3bef09aa838a3 SHA512 111ef93cbc4c0d79fdb26d9696b76e6b9e7fb1e30029db43feae9622cc6dd89991f1a62f87af0ca11f4043cb0d445ec73c5edf53e1af5f0d9bc4f756d4c18151 +DIST luarocks-3.5.0.tar.gz 244798 BLAKE2B 24ceead8953ad6d9eefbf471fd49e0bd82256cc00c201395770919a680873544db67f062a4af93ddd390985b0b74db55e37a95516287dfc1e077a25b67c9f264 SHA512 fda01b7149839adf7c0e1c05d0f1793e79575c5d378d96ee1e197828e9b9b6e89a635f8a26a5b71db5b48465ef74b219fac18ecdbd59962cbf9da613b05dd42a diff --git a/dev-lua/luarocks/luarocks-3.4.0.ebuild b/dev-lua/luarocks/luarocks-3.4.0.ebuild deleted file mode 100644 index 52063734ca52..000000000000 --- a/dev-lua/luarocks/luarocks-3.4.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="A package manager for the Lua programming language" -HOMEPAGE="https://luarocks.org" -SRC_URI="https://luarocks.org/releases/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="luajit libressl test" -REQUIRED_USE="${LUA_REQUIRED_USE}" -RESTRICT="test" - -RDEPEND=" - luajit? ( dev-lang/luajit:2 ) - !luajit? ( >=dev-lang/lua-5.1:0 ) -" - -DEPEND=" - net-misc/curl - libressl? ( dev-libs/libressl:0 ) - !libressl? ( dev-libs/openssl:0 ) - ${RDEPEND} -" - -BDEPEND=" - virtual/pkgconfig - test? ( - dev-lua/busted - dev-lua/busted-htest - ${RDEPEND} - ) -" - -src_prepare() { - default - - # If 'dev-lang/lua' is a new, fresh installation, no 'LUA_LIBDIR' exists, - # as no compiled modules are installed on a new, fresh installation, - # so this check must be disabled, otherwise 'configure' will fail. - sed -e '/LUA_LIBDIR is not a valid directory/d' -i configure || die -} - -src_configure() { - local myeconfargs=( - "--prefix=${EPREFIX}/usr" - "--rocks-tree=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))" - "--with-lua-include=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'includedir' 'INSTALL_INC') $(usex luajit 'luajit' 'lua'))" - "--with-lua-interpreter=$(usex luajit 'luajit' 'lua')" - "--with-lua-lib=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" - ) - - # Since the configure script is handcrafted, - # and yells at unknown options, do not use 'econf'. - ./configure "${myeconfargs[@]}" || die -} - -src_test() { - busted --lua=${ELUA} || die -} - -src_install() { - default - - { find "${D}" -type f -exec sed -i -e "s:${D}::g" {} \;; } || die -} diff --git a/dev-lua/luarocks/luarocks-3.4.0-r100.ebuild b/dev-lua/luarocks/luarocks-3.5.0.ebuild index 8075c2212cfd..1745da96355b 100644 --- a/dev-lua/luarocks/luarocks-3.4.0-r100.ebuild +++ b/dev-lua/luarocks/luarocks-3.5.0.ebuild @@ -1,9 +1,9 @@ -# 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 ) inherit lua-single diff --git a/dev-lua/luasec/luasec-0.9-r102.ebuild b/dev-lua/luasec/luasec-0.9-r102.ebuild index 8e58a7be7084..a815c1d73f60 100644 --- a/dev-lua/luasec/luasec-0.9-r102.ebuild +++ b/dev-lua/luasec/luasec-0.9-r102.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) LUA_REQ_USE="deprecated(+)" inherit lua toolchain-funcs diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r5.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r5.ebuild index 6cabaa4e7017..62473a95e3d8 100644 --- a/dev-lua/luasocket/luasocket-3.0_rc1-r5.ebuild +++ b/dev-lua/luasocket/luasocket-3.0_rc1-r5.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/diegonehab/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.t LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86" +KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86" IUSE="debug" RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]" diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild index 7020672331fb..e4ba4cb2d64f 100644 --- a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild +++ b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild @@ -4,7 +4,7 @@ EAPI=7 EGIT_COMMIT="5b18e475f38fcf28429b1cc4b17baee3b9793a62" -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) MY_P="${PN}-${EGIT_COMMIT}" inherit flag-o-matic lua toolchain-funcs diff --git a/dev-lua/luassert/Manifest b/dev-lua/luassert/Manifest index 1ad020a3037f..63ffa4b5bf01 100644 --- a/dev-lua/luassert/Manifest +++ b/dev-lua/luassert/Manifest @@ -1,3 +1 @@ -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 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 f937f4045552..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="https://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 f28101d3401d..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="https://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-r101.ebuild b/dev-lua/luassert/luassert-1.8.0-r101.ebuild index 83407a694550..420ef5a6d3db 100644 --- a/dev-lua/luassert/luassert-1.8.0-r101.ebuild +++ b/dev-lua/luassert/luassert-1.8.0-r101.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua toolchain-funcs diff --git a/dev-lua/luassert/luassert-1.8.0.ebuild b/dev-lua/luassert/luassert-1.8.0.ebuild index b869735ff9a4..3a41f1b3d91a 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/luasystem/luasystem-0.2.1_p0-r102.ebuild b/dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild index 2411804a12d5..d0ef7e850ab3 100644 --- a/dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild +++ b/dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) MY_PV="${PV/_p/-}" inherit lua toolchain-funcs 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..c841830919b4 100644 --- a/dev-lua/lutok/lutok-0.4-r10.ebuild +++ b/dev-lua/lutok/lutok-0.4-r10.ebuild @@ -1,8 +1,8 @@ -# Copyright 2017-2020 Gentoo Authors +# Copyright 2017-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -LUA_COMPAT=( lua5-{1..4} ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua-single @@ -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/luv/luv-1.32.0.0-r101.ebuild b/dev-lua/luv/luv-1.32.0.0-r102.ebuild index f45e0eee2820..48dbacfcb55b 100644 --- a/dev-lua/luv/luv-1.32.0.0-r101.ebuild +++ b/dev-lua/luv/luv-1.32.0.0-r102.ebuild @@ -5,7 +5,7 @@ EAPI=7 LUA_COMPAT=( lua5-{1..4} luajit ) -inherit cmake lua unpacker +inherit cmake lua-single unpacker # e.g. MY_PV = a.b.c-d MY_PV="$(ver_rs 3 -)" @@ -14,7 +14,7 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="Bare libuv bindings for lua" HOMEPAGE="https://github.com/luvit/luv" -LUA_COMPAT_PV="0.10" +LUA_COMPAT=( lua5-{1..4} luajit ) SRC_URI=" https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_PV}.tar.gz -> ${PN}-lua-compat-${LUA_COMPAT_PV}.tar.gz @@ -46,11 +46,16 @@ src_prepare() { cmake_src_prepare } -lua_src_configure() { +# This could in theory be multi-impl (and we have an ebuild in git history, +# 1.32.0.0-r101, which implements it) - the only revdep currently in the tree, +# app-editors/neovim, actually links against luv instead of trying to load it +# as a module. We could probably implement some sort of a hack for this +# - but given how messy it would be, don't bother unless someone actually requests +# luv multi-impl support. +src_configure() { lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_PV}" local mycmakeargs=( - -DINSTALL_LIB_DIR="$(lua_get_cmod_dir)" -DBUILD_MODULE=OFF -DLUA_BUILD_TYPE=System -DLUA_COMPAT53_DIR="${lua_compat_dir}" @@ -70,44 +75,8 @@ lua_src_configure() { cmake_src_configure } -lua_src_test() { - # We need to copy the implementation-specific library back so that the tests see it - rm -f ./luv.so +src_test() { + # We need to copy the library back so that the tests see it ln -s "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to symlink library for tests" ${ELUA} "tests/run.lua" || die "Tests failed" } - -lua_src_install() { - cmake_src_install - mkdir -p "${ED}"/usr/$(get_libdir)/pkgconfig && \ - mv "${ED}$(lua_get_cmod_dir)"/pkgconfig/libluv.pc \ - "${ED}"/usr/$(get_libdir)/pkgconfig/libluv-${ELUA}.pc || \ - die "Failed make pkgconfig file for ${ELUA} implementation-specific" - rmdir "${ED}$(lua_get_cmod_dir)"/pkgconfig || die -} - -src_configure() { - lua_foreach_impl lua_src_configure -} - -src_compile() { - lua_foreach_impl cmake_src_compile -} - -src_test() { - lua_foreach_impl lua_src_test -} - -src_install() { - lua_foreach_impl lua_src_install -} - -pkg_postinst() { - ewarn "Please note that in order to properly support multiple Lua implementations," - ewarn "this ebuild of ${PN} installs its library files into implementation-specific" - ewarn "module directories, as well as multiple .pc files named after implementations" - ewarn "(e.g. 'libluv-lua5.3.pc'). Since upstream by default only supports a single" - ewarn "Lua implementation at a time and thus only provides a single, unversioned" - ewarn ".pc file, projects depending on ${PN} might require changes in order to" - ewarn "support the multi-implementation approach." -} diff --git a/dev-lua/luv/luv-1.32.0.0.ebuild b/dev-lua/luv/luv-1.32.0.0.ebuild index 3d5ee15c180b..1165448262a6 100644 --- a/dev-lua/luv/luv-1.32.0.0.ebuild +++ b/dev-lua/luv/luv-1.32.0.0.ebuild @@ -12,7 +12,7 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="Bare libuv bindings for lua" HOMEPAGE="https://github.com/luvit/luv" -LUA_COMPAT_PV="0.7" +LUA_COMPAT=( lua5-{1..4} luajit ) SRC_URI=" https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_PV}.tar.gz -> ${PN}-lua-compat-${LUA_COMPAT_PV}.tar.gz diff --git a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild index b3a9b02e0355..f93de9eb9f36 100644 --- a/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild +++ b/dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r101.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) MY_PV="${PV/_p/-}" inherit lua toolchain-funcs diff --git a/dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild b/dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild index 4dc5d4b18fc3..048074fae841 100644 --- a/dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild +++ b/dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild @@ -4,7 +4,7 @@ EAPI=7 EGIT_COMMIT="18f316b3f62c02bf2b7a3096701780f78a4d2c67" -LUA_COMPAT=( lua5-{1..2} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) MY_PN="lua-MessagePack" MY_P="${MY_PN}-${EGIT_COMMIT}" diff --git a/dev-lua/mpack/mpack-1.0.8-r100.ebuild b/dev-lua/mpack/mpack-1.0.8-r100.ebuild index d9777b4051fb..8be71f717c4a 100644 --- a/dev-lua/mpack/mpack-1.0.8-r100.ebuild +++ b/dev-lua/mpack/mpack-1.0.8-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua toolchain-funcs 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 } diff --git a/dev-lua/say/say-1.3_p1-r101.ebuild b/dev-lua/say/say-1.3_p1-r101.ebuild index 05b75678fa0e..540a80d74c56 100644 --- a/dev-lua/say/say-1.3_p1-r101.ebuild +++ b/dev-lua/say/say-1.3_p1-r101.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) MY_PV="${PV/_p/-}" inherit lua toolchain-funcs diff --git a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild index 7e530101477e..0d852603facd 100644 --- a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild +++ b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild @@ -4,7 +4,7 @@ EAPI=7 # Newer Lua versions are NOT supported, see Bug #508222 -LUA_COMPAT=( lua5-1 ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit cmake lua-single |