9 files changed, 56 insertions, 192 deletions
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 1a9e0282b498..dbad45695205 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lanes/Manifest b/dev-lua/lanes/Manifest
index 47b538ed3275..3d16675e3332 100644
--- a/dev-lua/lanes/Manifest
+++ b/dev-lua/lanes/Manifest
@@ -1,6 +1,4 @@
 AUX lanes-3.13.0-makefile.patch 2719 BLAKE2B 2ee48812f971a3ed9d6425b115fa7415fb4c47596f25a32efd4c3d5fb8eb7f70839ae21d4970fa2120c5f16847d6bb10a417a228594a7f6eedb6d53a7bd062c8 SHA512 6a511ad7cf2dac9abff275c01c885adac04b40de46fe7d776ebea1663291e9a043d9ced6f470931cafdddc200895006e389a6fb6a2e5164bdef6b6acd2f1d38c
-DIST lanes-3.17.0.tar.gz 449193 BLAKE2B 110c05bdf46b9e5faf7e4ebf52992799fc2d1a993411a9488c75fc8134a267650348152299e91f94d1af8378a0e8a06c5485a364aad3cf246d7339006c89a924 SHA512 b9866cf1af54c758c840d2f6df3e14e6231f952b651d1196262a4b14d1361dd55697cba467998e90a69d876bcde5beffd25f3f8b53c387534b292650c25c357d
 DIST lanes-3.17.1.tar.gz 448968 BLAKE2B 9e0d8931f361b9e6a47df0e0d4d710458bc0f62a0aaab4fdafab94ab213273789fc54ecef2c22731baae563cca841eeed35135c1d4598be4e2a45d61e116a4a4 SHA512 0e541ce394a06cad291663f618f953fe94c1eb60531c6e25311ef90318d31dfcebab75ee94f5e4f5441e344035701f4c47d578d949cb8a0c20c88b534333d0ba
-EBUILD lanes-3.17.0.ebuild 1579 BLAKE2B 2b3941569bd570ae93db92151c1698c5a27faf3fcea28dfbedba236caf56ce4b814436eed916f4393027733075727b6995ccdf5603dd9ff71726cbdbff4767df SHA512 b66165935e89927621c3bd5f9a224bb5d9f7df45794588f5c8b9f1f21b1fbebc3d91d5a6f1f766ea692f0cec67b8efcbbaf4554f4fa503d676051d07eab295f7
-EBUILD lanes-3.17.1.ebuild 1580 BLAKE2B c154b76d31c74ec2db28f9eab0417c051e2d03937ab4c1aa286bc7718844eb42e1ef1f73baeb7b9bce87a31d5514125f0b5d84d4a36fa245677a19046f3d3e15 SHA512 5cd9db0c404943efb28f4843a2c172d801068c05c226e8511d716e55b40fc9f799c126bf86edb1c68b2628aed4c9389fd553a576b1a4fd55a9c45e74958f267a
+EBUILD lanes-3.17.1.ebuild 1579 BLAKE2B c7362fe477371b8b74a16a7c3893625014b8b442ccd2f1a9de70e4b2ba35fe5dfa0b6df90f6c5c984dc89c15fb63214564e71b4befbc6e553905d3c057b1f63d SHA512 3ecddc565feb7fecc523a7973d27ee5111d2bc850a9054fd0cb830ee352361e528321d761dfce479d33472a48782a0486387298413f089f649a10d18937fb602
 MISC metadata.xml 330 BLAKE2B cb2f24eead09cf3fe595a17006db96618148122db27c56176a358b13c5b37141f550b83a870a18660ca4b472b56c8eb7df65824085d5ff3878131a5ad70ea280 SHA512 16d1e0f1fac5602d1f49243058de0b124d8690e05c01232693971d496ebece2a42ff6ba96e4cd50d8173a55188b8d71dce433bec4799e29063dafe7c910402fc
diff --git a/dev-lua/lanes/lanes-3.17.0.ebuild b/dev-lua/lanes/lanes-3.17.0.ebuild
deleted file mode 100644
index ed3010624451..000000000000
--- a/dev-lua/lanes/lanes-3.17.0.ebuild
+++ /dev/null
@@ -1,95 +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 )
-
-inherit lua 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 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-# Tests are currently somehow problematic.
-# https://github.com/LuaLanes/lanes/issues/197
-# https://github.com/LuaLanes/lanes/issues/198
-RESTRICT="test"
-
-RDEPEND="${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${RDEPEND} )
-"
-
-HTML_DOCS=( "docs/." )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.13.0-makefile.patch"
-)
-
-src_prepare() {
-	default
-
-	lua_copy_sources
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LUA=${ELUA}"
-		"LUA_FLAGS=$(lua_get_CFLAGS)"
-		"LUA_LIBS="
-		"OPT_FLAGS=${CFLAGS}"
-	)
-
-	tc-export PKG_CONFIG
-
-	emake "${myemakeargs[@]}"
-
-	popd
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_test() {
-	pushd "${BUILD_DIR}" || die
-
-	emake LUA="${ELUA}" test
-
-	popd
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_install() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)"
-		"LUA_SHAREDIR=${ED}/$(lua_get_lmod_dir)"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	popd
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/lanes/lanes-3.17.1.ebuild b/dev-lua/lanes/lanes-3.17.1.ebuild
index abfb133d2be1..6665053acfc8 100644
--- a/dev-lua/lanes/lanes-3.17.1.ebuild
+++ b/dev-lua/lanes/lanes-3.17.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/LuaLanes/lanes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/dev-lua/lua-zlib/Manifest b/dev-lua/lua-zlib/Manifest
index 78f3fa28e324..3dd2a8afd609 100644
--- a/dev-lua/lua-zlib/Manifest
+++ b/dev-lua/lua-zlib/Manifest
@@ -1,3 +1,5 @@
 DIST lua-zlib-1.2.tar.gz 16612 BLAKE2B ca2ff51c97929fac0918de3902a175eda583da3ca415f9eff5e68a9c3ba0414827c3a96b968e9fcbccbe9612b1ade3fdc4498e50c4df53b0fa768912f428a287 SHA512 da13239089c1027b0bfb4ee463043b326ef5586206c5d76af8707736da3c03622b2fc38e732761a5b7a6422ad81a09557abc8548f37fef07ada0d4064eabfcf4
+DIST lua-zlib-1.3.tar.gz 18840 BLAKE2B b273d5475b97d8eb25dae60e80091bf3d62093be4e7721e906e1974f3acf640e095f2f953d9a2ef48343e74c192a16d435c2a8b6d3f9ca3064dc5710eaa2fdd2 SHA512 e65ddb4e4361a9594c9dd96bb649f0c274369fb18e1e8a25ae38a08a2d534069e669e29d15fa486d003598988fb642503ad9062c8abd7739b9f03b5f345d03e4
 EBUILD lua-zlib-1.2-r1.ebuild 971 BLAKE2B 7ded75aaa4443ca6028f6c10c9554b0ced93e66917d0a335f39edce5124764ca86726454abeb9ba2340be4c5fed95a6501026b8cc50ac718d14fe240460be910 SHA512 30a5f4f54e98288dc482b679fcf7297e5b4b741b054e66210bf7f09aeb416d7c6602ffdb35c0e52e09b9c28aa31318352d3db173dc8a3817a81c2e34bdab8d7d
+EBUILD lua-zlib-1.3.ebuild 975 BLAKE2B 40f076626d586ebff24e52d993fd612bea1fc8137db7836f2cd5cdf5b37081cf3574fbb669727045ef77da6d57a442cd468f556433fd607f791fe67f24aa1aa7 SHA512 7b02965a5c9c466bd528894512c3b2248bedbd6f7326ee83a505caf6609f30548f8d7b89142da75bf62d7da8f6e65dbc4f8ca4f1f31790e77904a8d53fdc3ac7
 MISC metadata.xml 334 BLAKE2B 226d34153f3f9d56a0140dead5a3049ab7a1383fdcf06dffd036b4b929c0b6612c283a00491acd16671b9879964eb6e2b6c9e8c5ade5e530147e1aa66da8729c SHA512 d1817084afea4a047e5c09ced17aa711b39893a58dd4d208e5b9c94f4f88d69a5de4604b137471bc8e7686d9919d9ed083224d258f1a677a00b079aa5c6b08a5
diff --git a/dev-lua/lua-zlib/lua-zlib-1.3.ebuild b/dev-lua/lua-zlib/lua-zlib-1.3.ebuild
new file mode 100644
index 000000000000..5a6c368aeb9e
--- /dev/null
+++ b/dev-lua/lua-zlib/lua-zlib-1.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake lua
+
+DESCRIPTION="Simple streaming interface to zlib for Lua"
+HOMEPAGE="https://github.com/brimworks/lua-zlib"
+SRC_URI="https://github.com/brimworks/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	sys-libs/zlib
+	${LUA_DEPS}
+
+"
+DEPEND="${RDEPEND}"
+
+lua_src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_CMOD="$(lua_get_cmod_dir)"
+		-DLUA_INCLUDE_DIR="$(lua_get_include_dir)"
+		-DUSE_LUA_VERSION="$(lua_get_version)"
+	)
+
+	if [[ ${ELUA} == luajit ]]; then
+		mycmakeargs+=( -DUSE_LUAJIT="ON" )
+	fi
+
+	cmake_src_configure
+}
+
+src_configure() {
+	lua_foreach_impl lua_src_configure
+}
+
+src_compile() {
+	lua_foreach_impl cmake_src_compile
+}
+
+src_install() {
+	lua_foreach_impl cmake_src_install
+}
diff --git a/dev-lua/luasystem/Manifest b/dev-lua/luasystem/Manifest
index 19e2a9bd68fd..d297bff373d2 100644
--- a/dev-lua/luasystem/Manifest
+++ b/dev-lua/luasystem/Manifest
@@ -1,7 +1,5 @@
-DIST luasystem-0.4.5.tar.gz 75630 BLAKE2B 3f269e4d45026e53f40dabee78e655e400a72312e5cdb3680027f1725e694e45d4cd313b2eb11224fe3901c240f50d94187bc8acb83de78bbf26b878e6915c2a SHA512 e7e8fe6aa09f625c0b97f48799f7b00d80e8ac0d00efedf258ae72f7d0f4283d43c285e09b32ab8707c228403eadda98727ce260d7fc9ed9dbd67877a55a6203
-DIST luasystem-0.5.0.tar.gz 77366 BLAKE2B a6825c193e54c0e879f988b33a50732fbc79579948463d96b7b2c552e12b2efd31bd4f8e6c9f918bed9911131509131208d1c1ca93e4d1e50f767d69889040d6 SHA512 c701e2dd3588c06fe66ca2fe55ecf61244cc82bd41d976873f3dbf9b5938cea0bfcd9b0196455c8db6a9cb0c4911785d1de5e30f51c8ef398d2fe1e93443c069
 DIST luasystem-0.5.1.tar.gz 77785 BLAKE2B 30cb0333f2c5c8671122e45af16998e01fddd916c12c7139be64fb3747640125a5984fe799cdbe126bdac0fc10786d635b82129def160f830cf6be3be0fa5faf SHA512 2e55cec79429aad45e1609c29b0e1d5b3d954f2daccac23435e718ec50471cfd87d21455eb398f2ffbec91cb639164b236c9025a302c8a49470de3d361983535
-EBUILD luasystem-0.4.5.ebuild 1602 BLAKE2B 3cac04e5a41a4730dcc9e306d37eeb4e5835f267d58bac910fca703e202d1fe1910a61e9c1f320a99c665298a3ec6b65a1d4da78c76d967739c3deed3fa57571 SHA512 6112f0683d6cbb438f90e71b1801751b5d8583a592b5268f3644150dc9412faf8f03c7d308e539668950ef7b4b8c1eaa86843e4328cb870f166ac38d7850f936
-EBUILD luasystem-0.5.0.ebuild 1608 BLAKE2B 777ecd81736eb2cb2588b60f383b38f9768279ef26d728750c063ef715ca4b1d1b925a37b9b0dbadb5291d963dd43f7131653090912bd4deb1160971fa8617f6 SHA512 68ddfbe6abee88b5b8a5dd55f69e85e3238229aaaad9848a0051aef43a79209d71ceee928cc86b93420fdac829ef21f684c53f02b7531e80af9f636ca8e15ee7
+DIST luasystem-0.6.2.tar.gz 80513 BLAKE2B 32d64634deb7f36d55e7522bd8389661f1fc306864c62837f978b0f90e12ea64d925e53c160ea535ce60856454642b7f8c8d8c5b1eca56e82bf9d51bfa7d351c SHA512 b5cce8448b382537101a1126e9c11af718b40b475e3c8ec1ff32975759c3e93214708491ac94fce61049e5316cce24efb8ad750912cd6e4e77a0c6fdcefc1d0c
 EBUILD luasystem-0.5.1.ebuild 1602 BLAKE2B 3cac04e5a41a4730dcc9e306d37eeb4e5835f267d58bac910fca703e202d1fe1910a61e9c1f320a99c665298a3ec6b65a1d4da78c76d967739c3deed3fa57571 SHA512 6112f0683d6cbb438f90e71b1801751b5d8583a592b5268f3644150dc9412faf8f03c7d308e539668950ef7b4b8c1eaa86843e4328cb870f166ac38d7850f936
+EBUILD luasystem-0.6.2.ebuild 1608 BLAKE2B 777ecd81736eb2cb2588b60f383b38f9768279ef26d728750c063ef715ca4b1d1b925a37b9b0dbadb5291d963dd43f7131653090912bd4deb1160971fa8617f6 SHA512 68ddfbe6abee88b5b8a5dd55f69e85e3238229aaaad9848a0051aef43a79209d71ceee928cc86b93420fdac829ef21f684c53f02b7531e80af9f636ca8e15ee7
 MISC metadata.xml 551 BLAKE2B 230312b7c2fb4bc059c507e538a5a0e6b257b7dafc6cfb90fe05dc10d8af44b3e90a7002d9566b8c73d30e3c1ce4276191e2c5ae0b78683b0f1c5b4553fbd3b5 SHA512 e19e38de42e6c0672e143b7aaf24b7a1ca01897851645720098fd6426eb5a3d4346a4cc9534a2bacfba98457160dc7f4421ceb767111688031c13e26f9a25a82
diff --git a/dev-lua/luasystem/luasystem-0.4.5.ebuild b/dev-lua/luasystem/luasystem-0.4.5.ebuild
deleted file mode 100644
index d567a1e90d29..000000000000
--- a/dev-lua/luasystem/luasystem-0.4.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2025 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}
-	)
-"
-
-src_prepare() {
-	default
-
-	lua_copy_sources
-}
-
-lua_src_test() {
-	busted --exclude-tags=manual --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.5.0.ebuild b/dev-lua/luasystem/luasystem-0.6.2.ebuild
index 4adf80f55257..4adf80f55257 100644
--- a/dev-lua/luasystem/luasystem-0.5.0.ebuild
+++ b/dev-lua/luasystem/luasystem-0.6.2.ebuild