11 files changed, 61 insertions, 363 deletions
diff --git a/dev-lua/luacov/Manifest b/dev-lua/luacov/Manifest
index bf35ef5bb0e8..7e95425c3720 100644
--- a/dev-lua/luacov/Manifest
+++ b/dev-lua/luacov/Manifest
@@ -1 +1 @@
-DIST luacov-0.15.0.tar.gz 52571 BLAKE2B f9d12295739b1461a4b9d698990430a17b5e73608bec062bf614c5ed84d91b86e2de61031275e0c767f61fcb1da0747dc2587aa0d6ef5ec119f809bf947c74ab SHA512 cab02c540aad905db1fecd7f62545157c8ff9ea82f9ea602bff7b6093e3940a3a316e212a2efe30fa2439435dae6cd4005c2ee41de6b937d3e5f447bc2128a59
+DIST luacov-0.16.0.tar.gz 481029 BLAKE2B 7a5aee3b6b0f24636ea4bf8dddd5d3e1fc51c24f04e3db02b55737d193e9408e6e0fba7d99e95f184d47c5152c3eefc34ecbdc0ad2376903b6e228d666f4320d SHA512 a28112e7c0527246dc83edbb33d5dd072729ccfe8ade697830ba074426853e76edde3e0b58eb3f1dafba08749788f7058eaccb3f6d8f47caede41db11c4a779f
diff --git a/dev-lua/luacov/luacov-0.15.0.ebuild b/dev-lua/luacov/luacov-0.16.0.ebuild
index 2e2ad21f6de0..2e2ad21f6de0 100644
--- a/dev-lua/luacov/luacov-0.15.0.ebuild
+++ b/dev-lua/luacov/luacov-0.16.0.ebuild
diff --git a/dev-lua/luasystem/Manifest b/dev-lua/luasystem/Manifest
index 6cd86b09494e..9256b1a5a1cc 100644
--- a/dev-lua/luasystem/Manifest
+++ b/dev-lua/luasystem/Manifest
@@ -1,4 +1 @@
-DIST luasystem-0.2.1_p0.tar.gz 8162 BLAKE2B ad8a6009823ad8202ff3884a3167d0779405c2a6be460b7ef2939622eb4d0fc8edbc6b04aba5dec9dd5e4e38f11ae0dcd582b9c348d5b516aa411858d55c6d71 SHA512 9dc323d4d1914cfa4f278a49ef22e58569d5cd7e369fa17fa6006cd47f9d90c6dfd4404067ea2436aa46a27cfbdf91e4aa26e20b89aeeefdf2aa7252c51fb32b
-DIST luasystem-0.3.0.tar.gz 19607 BLAKE2B 82dd54dab61045d25d9d1dc074526c2443b9732adf27da052f65702f0941a04dce65582091b5ecb802e5aed9baa2f4dbd53e4cd1b624426341a83fbcb0109378 SHA512 1adf1167767d7d8233ed2c90c106b050dc2370e891465eeb13f16ebc96e8f467d67a89a40173064112117ac9db2451aa73fde0d11fab01f6d2c56bdef50cb6ac
-DIST luasystem-0.4.2.tar.gz 74837 BLAKE2B 09d307ab2764bc68eb0fe3aae2c556ca70490e738e3ffcd620f4b43d00c22f19d47c67014b7f14ae1d561a4a2bee8d4b79dee3a76a47c832af602cbe8f9186f0 SHA512 98681005dfcab3807a794eec78550903a2f39de59de39c92016bbd690215946f22c17fb802b40c7e12ad19ab846a118414ab082408b11559030c35fd69ac9314
-DIST luasystem-0.4.4.tar.gz 75423 BLAKE2B d38798fdc07bb5ee0c85832e17cb631820ce0cad88fd8d0c48b34c097c5280bdffa410adbfb6d97115c075891204b7a5609a423f5fa887f166597b8bcb50a52d SHA512 e2a5c1a242fcb8f50fe694d89a954a7d73d18507325fa316592289e25dbf8bcdff8f59ad5593937923def390962bb56046ef8d137869ad287a16c2b23534b032
+DIST luasystem-0.4.5.tar.gz 75630 BLAKE2B 3f269e4d45026e53f40dabee78e655e400a72312e5cdb3680027f1725e694e45d4cd313b2eb11224fe3901c240f50d94187bc8acb83de78bbf26b878e6915c2a SHA512 e7e8fe6aa09f625c0b97f48799f7b00d80e8ac0d00efedf258ae72f7d0f4283d43c285e09b32ab8707c228403eadda98727ce260d7fc9ed9dbd67877a55a6203
diff --git a/dev-lua/luasystem/files/luasystem-0.2.1_p0-fix-makefile.patch b/dev-lua/luasystem/files/luasystem-0.2.1_p0-fix-makefile.patch
deleted file mode 100644
index 373ef95c42fa..000000000000
--- a/dev-lua/luasystem/files/luasystem-0.2.1_p0-fix-makefile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 10fc31a..af5e4e4 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -144,8 +144,8 @@ O_linux=o
- CC_linux=gcc
- DEF_linux=
- CFLAGS_linux= -I$(LUAINC) $(DEF) -Wall -Wshadow -Wextra \
--	-Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden
--LDFLAGS_linux=-lrt -O -shared -fpic -o
-+	-Wimplicit -fpic -fvisibility=hidden
-+LDFLAGS_linux=-lrt -shared -fpic -o
- LD_linux=gcc
-
- #------
-@@ -208,7 +208,7 @@ SOLIB=core.$(SO)
- #
- CC=$(CC_$(PLAT))
- DEF=$(DEF_$(PLAT))
--CFLAGS=$(MYCFLAGS) $(CFLAGS_$(PLAT))
-+CFLAGS=$(CFLAGS_$(PLAT)) $(MYCFLAGS)
- LDFLAGS=$(MYLDFLAGS) $(LDFLAGS_$(PLAT))
- LD=$(LD_$(PLAT))
- LUAINC= $(LUAINC_$(PLAT))
-@@ -248,7 +248,7 @@ none:
- all: $(SOLIB)
-
- $(SOLIB): $(OBJS)
--	$(LD) $(OBJS) $(LDFLAGS)$@
-+	$(LD) $(OBJS) $(LDFLAGS) $@
-
- install: all
-	$(INSTALL_DIR) $(INSTALL_TOP_LDIR)
diff --git a/dev-lua/luasystem/files/luasystem-0.4.2-fix-makefile.patch b/dev-lua/luasystem/files/luasystem-0.4.2-fix-makefile.patch
deleted file mode 100644
index 2d930a29fe78..000000000000
--- a/dev-lua/luasystem/files/luasystem-0.4.2-fix-makefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -50,7 +50,7 @@
- # /usr/local/include/lua$(LUA_VERSION)
- # where lua headers are found for linux builds
- LUAINC_linux_base?=/usr/include
--LUAINC_linux?=$(LUAINC_linux_base)/lua/$(LUA_VERSION)
-+LUAINC_linux?=$(LUAINC_linux_base)/lua$(LUA_VERSION)
- LUAPREFIX_linux?=/usr/local
- CDIR_linux?=lib/lua/$(LUA_VERSION)
- LDIR_linux?=share/lua/$(LUA_VERSION)
-@@ -144,8 +144,8 @@
- CC_linux=gcc
- DEF_linux=
- CFLAGS_linux= -I$(LUAINC) $(DEF) -Wall -Wshadow -Wextra \
--	-Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden
--LDFLAGS_linux=-lrt -O -shared -fpic -o
-+	-Wimplicit -fpic -fvisibility=hidden
-+LDFLAGS_linux=-lrt -shared -fpic -o
- LD_linux=gcc
- 
- #------
-@@ -208,7 +208,7 @@
- #
- CC=$(CC_$(PLAT))
- DEF=$(DEF_$(PLAT))
--CFLAGS=$(MYCFLAGS) $(CFLAGS_$(PLAT))
-+CFLAGS=$(CFLAGS_$(PLAT)) $(MYCFLAGS)
- LDFLAGS=$(MYLDFLAGS) $(LDFLAGS_$(PLAT))
- LD=$(LD_$(PLAT))
- LUAINC= $(LUAINC_$(PLAT))
-@@ -217,7 +217,7 @@
- #------
- # Objects
- #
--OBJS=core.$(O) compat.$(O) time.$(O) environment.$(O) random.$(O) term.$(O)
-+OBJS=core.$(O) compat.$(O) time.$(O) environment.$(O) random.$(O) term.$(O) bitflags.$(O) wcwidth.$(O)
- 
- #------
- # Targets
-@@ -248,7 +248,7 @@
- all: $(SOLIB)
- 
- $(SOLIB): $(OBJS)
--	$(LD) $(OBJS) $(LDFLAGS)$@
-+	$(LD) $(OBJS) $(LDFLAGS) $@
- 
- install: all
- 	$(INSTALL_DIR) $(INSTALL_TOP_LDIR)
diff --git a/dev-lua/luasystem/luasystem-0.2.1_p0-r1.ebuild b/dev-lua/luasystem/luasystem-0.2.1_p0-r1.ebuild
deleted file mode 100644
index fa57a21f15e7..000000000000
--- a/dev-lua/luasystem/luasystem-0.2.1_p0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-MY_PV="${PV/_p/-}"
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="Platform independent system calls for Lua"
-HOMEPAGE="https://github.com/o-lim/luasystem/"
-SRC_URI="https://github.com/o-lim/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-IUSE="test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-lua/busted[${LUA_USEDEP}]
-		dev-lua/lua_cliargs[${LUA_USEDEP}]
-		${RDEPEND}
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-makefile.patch )
-
-src_prepare() {
-	default
-
-	lua_copy_sources
-}
-
-lua_src_test() {
-	busted --lua=${ELUA} || die
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LD=$(tc-getCC)"
-		"LUAINC_linux=$(lua_get_include_dir)"
-		"MYCFLAGS=${CFLAGS}"
-		"MYLDFLAGS=${LDFLAGS}"
-	)
-
-	emake "${myemakeargs[@]}" linux
-
-	popd
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_install () {
-	pushd "${BUILD_DIR}" || die
-
-	local emakeargs=(
-		"INSTALL_TOP_CDIR=${ED}/$(lua_get_cmod_dir)"
-		"INSTALL_TOP_LDIR=${ED}/$(lua_get_lmod_dir)"
-		"LUA_INC=${ED}/$(lua_get_include_dir)"
-	)
-
-	emake "${emakeargs[@]}" install
-
-	insinto $(lua_get_lmod_dir)/system
-	doins system/init.lua
-
-	popd
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/luasystem/luasystem-0.3.0.ebuild b/dev-lua/luasystem/luasystem-0.3.0.ebuild
deleted file mode 100644
index 278d38264b35..000000000000
--- a/dev-lua/luasystem/luasystem-0.3.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-MY_PV="${PV/_p/-}"
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="Platform independent system calls for Lua"
-HOMEPAGE="https://github.com/lunarmodules/luasystem"
-SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-lua/busted[${LUA_USEDEP}]
-		dev-lua/lua_cliargs[${LUA_USEDEP}]
-		${RDEPEND}
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.2.1_p0-fix-makefile.patch )
-
-src_prepare() {
-	default
-
-	lua_copy_sources
-}
-
-lua_src_test() {
-	busted --lua=${ELUA} || die
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LD=$(tc-getCC)"
-		"LUAINC_linux=$(lua_get_include_dir)"
-		"MYCFLAGS=${CFLAGS}"
-		"MYLDFLAGS=${LDFLAGS}"
-	)
-
-	emake "${myemakeargs[@]}" linux
-
-	popd
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_install () {
-	pushd "${BUILD_DIR}" || die
-
-	local emakeargs=(
-		"INSTALL_TOP_CDIR=${ED}/$(lua_get_cmod_dir)"
-		"INSTALL_TOP_LDIR=${ED}/$(lua_get_lmod_dir)"
-		"LUA_INC=${ED}/$(lua_get_include_dir)"
-	)
-
-	emake "${emakeargs[@]}" install
-
-	insinto $(lua_get_lmod_dir)/system
-	doins system/init.lua
-
-	popd
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/luasystem/luasystem-0.4.2-r1.ebuild b/dev-lua/luasystem/luasystem-0.4.2-r1.ebuild
deleted file mode 100644
index 32bcb22d5819..000000000000
--- a/dev-lua/luasystem/luasystem-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-MY_PV="${PV/_p/-}"
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="Platform independent system calls for Lua"
-HOMEPAGE="https://github.com/lunarmodules/luasystem"
-SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-lua/busted[${LUA_USEDEP}]
-		dev-lua/lua_cliargs[${LUA_USEDEP}]
-		${RDEPEND}
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.4.2-fix-makefile.patch )
-
-src_prepare() {
-	default
-
-	lua_copy_sources
-}
-
-lua_src_test() {
-	busted --lua=${ELUA} || die
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LD=$(tc-getCC)"
-		"LUAINC_linux=$(lua_get_include_dir)"
-		"MYCFLAGS=${CFLAGS}"
-		"MYLDFLAGS=${LDFLAGS}"
-	)
-
-	emake "${myemakeargs[@]}" linux
-
-	popd
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_install () {
-	pushd "${BUILD_DIR}" || die
-
-	local emakeargs=(
-		"INSTALL_TOP_CDIR=${ED}/$(lua_get_cmod_dir)"
-		"INSTALL_TOP_LDIR=${ED}/$(lua_get_lmod_dir)"
-		"LUA_INC=${ED}/$(lua_get_include_dir)"
-	)
-
-	emake "${emakeargs[@]}" install
-
-	insinto $(lua_get_lmod_dir)/system
-	doins system/init.lua
-
-	popd
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/luasystem/luasystem-0.4.4.ebuild b/dev-lua/luasystem/luasystem-0.4.5.ebuild
index 1ea1339bdc05..d567a1e90d29 100644
--- a/dev-lua/luasystem/luasystem-0.4.4.ebuild
+++ b/dev-lua/luasystem/luasystem-0.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
@@ -38,7 +38,7 @@ src_prepare() {
 }
 
 lua_src_test() {
-	busted --lua=${ELUA} || die
+	busted --exclude-tags=manual --lua=${ELUA} || die
 }
 
 src_test() {
diff --git a/dev-lua/lutok/Manifest b/dev-lua/lutok/Manifest
index 3e5ea1851b45..daf3fd0c8cab 100644
--- a/dev-lua/lutok/Manifest
+++ b/dev-lua/lutok/Manifest
@@ -1 +1,2 @@
 DIST lutok-0.4.tar.gz 489570 BLAKE2B b4bc26d9a4901901e6ca66a41bc42ccc2f82697ff14e64c1bea35b4a9ed08b6f13ecfa9aaabb54e25fb3e4f3aea03791c225c4c8fc6ed3e0387d34d933a228e9 SHA512 664f30099bfbb30978e24068a9232a4ff1b5b1839c601bf784f35f6bb1394558067495093a3b0343c94e756d2e4186a32a8227baf5934c15c45905f7c0a5d19c
+DIST lutok-0.6.tar.gz 47380 BLAKE2B 47f371dfa0cdc165398ad74b0d768d90c74c74ec4c7fa6fac747f915a5a35290a1e190950360c38d3f9165dcc1172aed0ababba3a84e33f54d52d83eea096e32 SHA512 b88d932ca151f72e48a0c6f3070418013e24083c142c745e35513406057686333f562e1fc159d5e35ca0e511b79e3c0b5dfd2431d050dc421b1e22283b88865d
diff --git a/dev-lua/lutok/lutok-0.6.ebuild b/dev-lua/lutok/lutok-0.6.ebuild
new file mode 100644
index 000000000000..3c7e1c9b70f8
--- /dev/null
+++ b/dev-lua/lutok/lutok-0.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2017-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+LUA_COMPAT=( lua5-{3..4} )
+
+inherit autotools lua-single
+
+DESCRIPTION="Lightweight C++ API library for Lua"
+HOMEPAGE="https://github.com/freebsd/lutok"
+SRC_URI="https://github.com/freebsd/lutok/archive/refs/tags/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-libs/atf
+		dev-util/kyua
+	)
+"
+DEPEND="${LUA_DEPS}"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	:
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	lua_setup
+	local myconf=(
+		--enable-shared
+		--disable-static
+		$(use_enable test atf)
+		LUA_VERSION="${ELUA#lua}"
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -rf "${ED}"/usr/tests || die
+	find "${ED}" -name '*.la' -type f -delete || die
+}