gentoo resync : 06.04.2022

24 files changed, 341 insertions, 118 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 7d08a28b30f1..faff469b67d8 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lanes/Manifest b/dev-lua/lanes/Manifest
index 05084ef0ab97..71d6cb535450 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.15.1.tar.gz 252057 BLAKE2B 36de0b85d6d7f43406249e4463c6560d3d539791700d4bd77cd366dd04b8cb672c5aff68c4409dd4e6b5df8ab93f6841c2168ecea9f4ea60768e42f3ffc543e9 SHA512 110528e3ffda5e721046f52a31d9cc707db4b7cca1a706d8c2e35b54d26375855f8ba52f4568c42caa2707da7c05ac1278460af185346bfd4fafdd7c237d256a
 DIST lanes-3.16.0.tar.gz 257945 BLAKE2B aecc0bd551f10b29791acdde8da30fb83591395eac4d152999a0e92fe9738a6171b13363edae2d94b1db47398a01e011833ccee7a7f234033d3230605423c0b6 SHA512 ffd935baae8af752591251bbb1a7f936034ad281870d453e6e1b4291c175c91537ccae23ec25a616b45e8ab601222f323e05e938d7887091ba7e132b0cd5e449
-EBUILD lanes-3.15.1-r1.ebuild 1584 BLAKE2B d1ec0f298770de80c4530a1946ae0b8c0392556e2cfff75005fbd82582a97e058721a36a19ec62a675f4f698071cdf62449ea492e38b0c339d4f6895f0fdfcea SHA512 74c40ce0d417d7967d38ac86b811cb35329965047b9b02d1f7ed90ffd8c6b0b34e7c885720b26d62ce95d74f89f1e3dcb0552d11a4f1d570a2ab3c17c2963735
-EBUILD lanes-3.16.0.ebuild 1585 BLAKE2B f6fb98139e1abcd8830577765bb8a8840df5bb9ccf4b3d5ec1603ae5809679f2d5a3692d687a2b0782b1cbd861f48d0238478d9fd889ec2500d518f4044fae04 SHA512 6c96f870a8dd1d2e61f811faf207e294a9d7ba69be578580e447892266c6cc51db29657738e705e9409d362712a922445cc7a052b2ee967d0ae7976e3b652a5a
+EBUILD lanes-3.16.0.ebuild 1584 BLAKE2B d1ec0f298770de80c4530a1946ae0b8c0392556e2cfff75005fbd82582a97e058721a36a19ec62a675f4f698071cdf62449ea492e38b0c339d4f6895f0fdfcea SHA512 74c40ce0d417d7967d38ac86b811cb35329965047b9b02d1f7ed90ffd8c6b0b34e7c885720b26d62ce95d74f89f1e3dcb0552d11a4f1d570a2ab3c17c2963735
 MISC metadata.xml 439 BLAKE2B 64ca90f83e145d31acd41464d9661aa5ad164df3a9050084d4d272f7a834455bc6a9b7657bf34a3829927208a14ad8fb409a2e12f890be90008d858392f5065a SHA512 a55de988fd5da55fc51cbc3750361b95a7aa1c98e343725416eeaf8fe5c09c12c80f736593abd3bf08840b66602e6087094d9748ea238135de1f08a324a92c0a
diff --git a/dev-lua/lanes/lanes-3.15.1-r1.ebuild b/dev-lua/lanes/lanes-3.15.1-r1.ebuild
deleted file mode 100644
index f31509f4e45e..000000000000
--- a/dev-lua/lanes/lanes-3.15.1-r1.ebuild
+++ /dev/null
@@ -1,93 +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 )
-
-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 ~ia64 ~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.16.0.ebuild b/dev-lua/lanes/lanes-3.16.0.ebuild
index da2c983695a2..f31509f4e45e 100644
--- a/dev-lua/lanes/lanes-3.16.0.ebuild
+++ b/dev-lua/lanes/lanes-3.16.0.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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/dev-lua/ldoc/Manifest b/dev-lua/ldoc/Manifest
index 45a6c84decfe..71c383d894f7 100644
--- a/dev-lua/ldoc/Manifest
+++ b/dev-lua/ldoc/Manifest
@@ -1,5 +1,5 @@
 AUX ldoc-1.4.6-mkdir.patch 230 BLAKE2B 672617f3a20ff6f74be02db5402288b4900f2d9d52a433ec9085f2fd2ce629609b9803732c50da6da252287efc7280895c2d3ce64ad4a30cf017e893ea2c5638 SHA512 5c047b48c987d107cf810dffc615ce29e5f2192b927fa91260dacbd2daee92c9aac5eeee0bfbccd9972d47d57928c37a867b9c2d453a7c845793cab0ac01385a
 AUX ldoc-1.4.6-slotted_lua.patch 732 BLAKE2B 52bfd5770b47a082d8f4d0706050bc75766af92d120ab1b95c5359e13c85fe9a0131a40b20cbebe318b0eab42c6f7877749248687c3bc8570c81df08c5af8f51 SHA512 5b226521e5c3af4b23e6f0ffd74cd332a214f1d4bfcef14c1fab170149b669045ec1439d6f2a3bfd40ff3699cbdfb3981e9641d6a44a88d2210f83fa2c5a2cba
 DIST ldoc-1.4.6.tar.gz 126080 BLAKE2B c43a79141ce557a54b9aed3c7523b206bec85602d858c72373d650a70e1741b545b2b9bdd462856c7e16af97f6a5eeeeea26375832f678b52d9e9153547076be SHA512 bcaddba4e462a4fb0aa0d8fcff390de3f195fa5cc569d8f05b84ad0fff900f5ac945be7a2eb15cf5ca60cc462f02c874579e4a19e33776178a04104ef9d944af
-EBUILD ldoc-1.4.6-r100.ebuild 807 BLAKE2B 27643f6dd59888dc2af4102027f0f04c2da6ae5f4c6a178dbaf7044d74c1e4e1082b15a4bde281d6705d5bcdd0297e95a7f63a77f468c449dfbd43822126795e SHA512 b373643448535b9f30750612506e86ad9da2cedf8d504be73fea211783f6d1a19a457c11d68e7c1a34192e285b7d4c5e436f4f5fc7bac56ca3f140c458316ee9
-MISC metadata.xml 248 BLAKE2B 772437eb2ebab71bd3e23383c8939492d12862e9679d52f5a4945e5efe2399464c1416f4dfd5269084d80d4e2ff1f69602e03986afb08dfe90a909333fa99343 SHA512 0c5b9c6f177aef538211efb21c6ed9878207c8ca5d88936755f6b30cc6b985dc6d2ba6c439677d083a2c9260193429ae0b76d7b8261c7cb2088b325e19becc4c
+EBUILD ldoc-1.4.6-r100.ebuild 807 BLAKE2B a9a16367f96c4842309e4d4e15bb262d29645af5da464bf9f70d2ac2c4fd6f90201709b0353deddbfed4b390e3e2c4eb1a44bf252d19ae0ec97473ffb4411d80 SHA512 9a71cf0ce7c461393aabda1043a76da20d17fb46681c9c8ae9f2b2f19352e3de41dea51b13332cef4c17bb7a589405e0cc402ba7f6f1e37d4fb7e85b33fab280
+MISC metadata.xml 248 BLAKE2B 46e7b46dc9019f9be749617a5246c7fde1306a573433c682192da5c1d889fb89d86a7a4f4e4095a131acbeb4b3661d9aad0e7ebf28d07e960752a52be96ce16e SHA512 d4b0afce32856f5778476521c2aac76edf7b0bf78b367ab3c5536f3c3f754df27925c37b36f53b7d6848e2548da5c79948b3497bdbc445c44f91cda6b51c204c
diff --git a/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild b/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild
index 7b2af871e537..ce9c78636578 100644
--- a/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild
+++ b/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild
@@ -9,7 +9,7 @@ inherit lua-single
 
 DESCRIPTION="A LuaDoc-compatible documentation generation system"
 HOMEPAGE="https://stevedonovan.github.io/ldoc/"
-SRC_URI="https://github.com/stevedonovan/LDoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/lunarmodules/LDoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-lua/ldoc/metadata.xml b/dev-lua/ldoc/metadata.xml
index 205e76858046..c1081af2656f 100644
--- a/dev-lua/ldoc/metadata.xml
+++ b/dev-lua/ldoc/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<!--maintainer-needed-->
 	<upstream>
-		<remote-id type="github">stevedonovan/LDoc</remote-id>
+		<remote-id type="github">lunarmodules/LDoc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/luacheck/Manifest b/dev-lua/luacheck/Manifest
index 096aef29d41c..1bd8ca5618a3 100644
--- a/dev-lua/luacheck/Manifest
+++ b/dev-lua/luacheck/Manifest
@@ -1,4 +1,4 @@
 AUX luacheck-0.23.0-disable-measuring-performance-test.patch 446 BLAKE2B 42c83ec5eb3d073a5e907c6285a6a2a26f1563940435a111d74274dcdff76f7662d8b623c86658fa0a0b568e150cfa059d2100d82b7f65fcd293b361ec6c45bf SHA512 046cc3ad7e74435b3c6df1a5d271e82cd90a3c02c9228c5a632b13378a8b17c3cde21b00fdc84ab350493b64ec36beb10591a32d52b96010481b7d6a08655392
 DIST luacheck-0.25.0.tar.gz 162675 BLAKE2B 143de767f004cb485abc4952eafc4d02c16ca4d421397d0179113ddaeacc2cd7ba2b4b8eed48f9a05169c5e20ae53aaef8c5253ab1d7c7e4b178218fab0e03d6 SHA512 7f9f02464cb40462c321dd23e32263913ead2bf4eace6907d51a5b570a6a19a378b12660c98e63ca447cfc507dfb491d54b093af3962f12596a7c6088c8dc867
-EBUILD luacheck-0.25.0.ebuild 1279 BLAKE2B a10baa2a3746e113a329d3153d72f55d7e41d7f257514db9ae19698698e7971c68ba5984e6dba04be2f6f3142818d18cd10ef7fd6f5d3cbf8c5083dc5307b95b SHA512 5264873987a4023ab7fcfeb21321807bf2d8875fe2d658c459b1534268f47c07987dd6a97c93d0a26b6a2797d6f7ebb0798411e0e0c73b5dcebe3de50880a272
-MISC metadata.xml 699 BLAKE2B 7f254ecfaa118904be8a66528d43bcac83b818e52ceb1cab564ae148d40d38b885c54ab334919136706da5fa8ac6db2d2423f4fbaf366930aab20b51cacbf9ed SHA512 d6c4190bdf53bb4313443df4204a815a2bacecc21df5393dc0b9cb0dbc1e47b924c4a601bea2d3162c7ace6e2d620cec779ea02594952fa8e7b2dfe06f21d066
+EBUILD luacheck-0.25.0.ebuild 1287 BLAKE2B f06d97ffd95bad2949aa19d3657dda75beec08ceac5aee584db94e34397cc31ae2672805b76f85893cea9135c7cc2e6f3794ead53a6f8a350321a22f4b42cb81 SHA512 bfbe4fdd54def16d6a33484a4e877d4430e3fb1aee6f5dabbc805d47eaacd3c7b62cc09df4b4a8c5ceda3131e6c609ae3ae7662d450e819b149099ffc183a90a
+MISC metadata.xml 703 BLAKE2B d86d4b639e4b5372f4756da449210438737e4609772ac5263b8956e5b78dc6fe198d341303442f6ef68e92b4a78c2f03356e010c3a204d79e420070e4aca13d4 SHA512 ed140f75ba4460fdf0a0ffbf2a7541a655a43e02168386b6a3de6adcc9a978bcb403d81a7696c4d6fcfe0f0e4827a7ad421123de0e53c614904eb341e86a2cc3
diff --git a/dev-lua/luacheck/luacheck-0.25.0.ebuild b/dev-lua/luacheck/luacheck-0.25.0.ebuild
index 672738fabba4..8bf057261d25 100644
--- a/dev-lua/luacheck/luacheck-0.25.0.ebuild
+++ b/dev-lua/luacheck/luacheck-0.25.0.ebuild
@@ -8,8 +8,8 @@ LUA_COMPAT=( lua5-{1..4} luajit )
 inherit lua toolchain-funcs
 
 DESCRIPTION="A tool for linting and static analysis of Lua code"
-HOMEPAGE="https://github.com/luarocks/luacheck"
-SRC_URI="https://github.com/luarocks/luacheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/lunarmodules/luacheck"
+SRC_URI="https://github.com/lunarmodules/luacheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-lua/luacheck/metadata.xml b/dev-lua/luacheck/metadata.xml
index 3f07ff7de23a..8bc8d9434e33 100644
--- a/dev-lua/luacheck/metadata.xml
+++ b/dev-lua/luacheck/metadata.xml
@@ -13,7 +13,7 @@
 		Luacheck itself is written in Lua and runs on all of mentioned Lua versions.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">luarocks/luacheck</remote-id>
+		<remote-id type="github">lunarmodules/luacheck</remote-id>
 		<remote-id type="github">mpeterv/luacheck</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index d234566156ce..00e0af709b0b 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -1,3 +1,7 @@
 DIST luaexpat-1.3.0.tar.gz 29567 BLAKE2B 176cb107e6047b15338ff45751af82389920e4210d40bd0b4400e549130a4983c843f7a64bb7b2fba37e36eb592e850d06efe196f8e837e79e50c8d135dbe763 SHA512 91884653310e2dc89ade6d1653875ac8607640a21853d3ccb1fd0f833812e41981fad5c40101732ec249104d2c50c9a332208d1e44423b8428065a223c60b4ae
+DIST luaexpat-1.4.0.tar.gz 51890 BLAKE2B 6e2cda190e7b2ebe2bda64398a447155df3ccdb83f1b4ff78aead981c38cf6705f896ba31ac0d557ec55f750919b6b2b07205c533339d7aa8e0f88ee6b0991fd SHA512 ba1a98267757ec5f2464b8d5e903f69102ca991c4034939d02d871d014463a8e29815d1294edc7fa3a1c4b679c5e42fdc1a19b2a1c1654ed1f382f779a213375
+DIST luaexpat-1.4.1.tar.gz 52159 BLAKE2B dd870d2d2db8bc1e399a306eff91138752f346f50ec1283a611c3ef42591e5176beab59aa96b87c772ba0320d98fc8a5907048e539cde6c14757e9a026aacc81 SHA512 fbc03287a237c13f395574ddf08a931ded0f457728b01bdc0a0533d212a0c908d74230be3c9e7f85a54ac244043cd853be3bf13d284185ad3e3ce6818d157635
 EBUILD luaexpat-1.3.0-r1.ebuild 1347 BLAKE2B 647d033a4ae2963495c0b76207ed283a251c1ddd9f45b2358b9217c9782ac229637a464cbcbd02bed57e171035078312e130eeef900ec48ced1460a26047a04a SHA512 17c200d4663c50ebfc51cb6aff441ccc82df162d45f041d900a5547a4e9b9794dae2ca421c62ea2aa062b932b858a6160efbaa34326be070c5105fc7feae86c5
-MISC metadata.xml 518 BLAKE2B 911cdf26cf72e7401be75ddc92cc3d859937a8b17ebae92526cbeba4cf997f13ce8789198fd1051c74e08c2a8a7f55f681cfd9605dd8d874bf696977755046cf SHA512 df25c5531e8ca2ba7c1212bf4b5c59b02c91512fdd52ed92e2f8155efa9b82ae21d62486bde7285768a955ba4e57636bcf56c256249dcec92cf1e32b8d6f4ccc
+EBUILD luaexpat-1.4.0.ebuild 1257 BLAKE2B 3566ca5fc1e101daa7dcf146e52cdaa3a23b10d95126e4ce57ece79e8037afaae682f84f04509f63294a5adc838ec28ce86f8c970b26d68e5cb5a9a9c8c7c700 SHA512 20a12db581401cd4d8650a703ce220c6edf756cdc478ae20061b84e2a45be447660d0c840f1412c0b3ab86c67123c8b2ecfdbbd79cbfa0e6a514ea00236c6f5a
+EBUILD luaexpat-1.4.1.ebuild 1257 BLAKE2B 3566ca5fc1e101daa7dcf146e52cdaa3a23b10d95126e4ce57ece79e8037afaae682f84f04509f63294a5adc838ec28ce86f8c970b26d68e5cb5a9a9c8c7c700 SHA512 20a12db581401cd4d8650a703ce220c6edf756cdc478ae20061b84e2a45be447660d0c840f1412c0b3ab86c67123c8b2ecfdbbd79cbfa0e6a514ea00236c6f5a
+MISC metadata.xml 667 BLAKE2B 5efd48f296044b9a01c80274ca8fa4ccee0d03a2e6758020d98e123438c13074ec95de3635bbe9abe0838db6f7c65aed8b351b90d1f670ffc331cbf29299d2d7 SHA512 72f967617a90fe28048ab9c128d86daaf360c13333ed8a27eb5628d4f9c39b91f15213b1459631f3eb147429917bb1500047116b4a8c6a7c91f4002b1670bf31
diff --git a/dev-lua/luaexpat/luaexpat-1.4.0.ebuild b/dev-lua/luaexpat/luaexpat-1.4.0.ebuild
new file mode 100644
index 000000000000..b0c2791bf0e6
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.4.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 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="A SAX XML parser based on the Expat library"
+HOMEPAGE="https://github.com/lunarmodules/luaexpat"
+SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/expat
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS=( "docs/." )
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-O2//g' -i Makefile || die
+
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LUA_INC=$(lua_get_CFLAGS)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"DESTDIR=${ED}"
+		"LUA_CDIR=$(lua_get_cmod_dir)"
+		"LUA_INC=$(lua_get_include_dir)"
+		"LUA_LDIR=$(lua_get_lmod_dir)"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/luaexpat/luaexpat-1.4.1.ebuild b/dev-lua/luaexpat/luaexpat-1.4.1.ebuild
new file mode 100644
index 000000000000..b0c2791bf0e6
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.4.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 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="A SAX XML parser based on the Expat library"
+HOMEPAGE="https://github.com/lunarmodules/luaexpat"
+SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/expat
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS=( "docs/." )
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-O2//g' -i Makefile || die
+
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LUA_INC=$(lua_get_CFLAGS)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"DESTDIR=${ED}"
+		"LUA_CDIR=$(lua_get_cmod_dir)"
+		"LUA_INC=$(lua_get_include_dir)"
+		"LUA_LDIR=$(lua_get_lmod_dir)"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/luaexpat/metadata.xml b/dev-lua/luaexpat/metadata.xml
index a9d447e11be2..dbe425b3b348 100644
--- a/dev-lua/luaexpat/metadata.xml
+++ b/dev-lua/luaexpat/metadata.xml
@@ -13,4 +13,8 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/lunarmodules/luaexpat/issues</bugs-to>
+		<remote-id type="github">luaexpat/issues</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index 8687ed10e69d..c9a99cd3fce0 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -1,5 +1,8 @@
+AUX luasocket-3.0.0_makefile.patch 2322 BLAKE2B cf9d871de75145812ebdce00bf7839e8f1f019658410eb38bd724cf9ce919d021ff2362d072c611c85d280eca2c0c6e485f608eba3f61fd612ae6ff5bde6d917 SHA512 43b6951d2a834ff88088bc6bf16e0ee3b7c28e602b06f66e1476bd4cf840f0d43328fe3eaaa7e4f0360b406525d213d12d4b97984de37c3381f8c1e85fe518fd
 AUX luasocket-3.0_rc1_p20200328_makefile.patch 2886 BLAKE2B df7b5a9c060cfa3516207c4b652c467c490fe3821ca21f709bb9fe1cafe8a41815874074857498fe073913820646c1fb627060d61267d57a2278b06b5ed731ce SHA512 3abb11d0f32e8f1a4cd95b8eec706b871600e1cbfd55288c26aa2975662000dd3393b865a7a293f5dc6b51bc703dba3844cfb4e83cdbbc753e4ea697f9b8901a
 AUX luasocket-3.0_rc1_p20200328_publish_API.patch 10781 BLAKE2B 783e223732aec39b4c7a7b6c49f051d6c3e9c8f1c8b1e91df68265598b9d1a5929f7dff21642d0ea4aba6a2d5ebda6cdf0eb2e567b6f996d260e8119da704952 SHA512 697d37344684bf6943ca360d1b25440e7b678b12e7cf0735c62985deb32862351ec63d8a6192dc732fd832dc16a9172e3ff13ccce52aeca4f4665bcf4555ef2c
+DIST luasocket-3.0.0.tar.gz 336231 BLAKE2B 71b87041a1edb2616ba269160382ac5cea6ba9b623281e8069e8adf97b6898d7836add7eff949010a1bc890bff8d2e4797a2ff5c619b45f8ee3adee5d6633843 SHA512 4f93d6c0b602333df50ee4f939cd0419243f6de333472ffebf99334e301143e8cdee3bc1655c29f81608622d6e7850a9bcf6929a6d4748210a70cdb8218a1ec6
 DIST luasocket-3.0_rc1_p20200328.tar.gz 335628 BLAKE2B 9e5d3e415337903b689705669b586c4481179a319b4e3428823c8f442d04f26db86bfeca66db7e58d157e31431c31e4f687403f7163b75f57d6f87cdb934717f SHA512 bdf7086a0504b0072b9cfd1266fc4ae89504053801722859a426f567fca00ed76f4c295c2a3a968e93f0036d9b792cf97561e9baa82c09ea23999cfd473227eb
-EBUILD luasocket-3.0_rc1_p20200328-r103.ebuild 1719 BLAKE2B 18d04f607f605218e58163e96b6eaf0592039957173ea5724c8c763b5b8130838cfe4ed80da51ca9e7d1e2abfb7562cc5257a565e71398bf0311002880d5e074 SHA512 bb1c8925541bdaa0008c75e7f8c9b0d2d58148e944e308eecf82b27e659931aa0a6e2c0649a7093a0cef07e3fd75d83e1b0b8a2984e245a84b3223a82ff48cc2
-MISC metadata.xml 603 BLAKE2B 594c4454fadefcc94e1697d28300a12ccd373f365543fab2cdc3b9a90a6fd4d614b13705026a2a9956aaeab78e88ca10ef608e96c968b20825340503e5675537 SHA512 03612e81cc1d8e9279a16270d5eb391917798fca0148616e2e99aa2994f109d34ac657a89d0d3cfd853af372d7fdc14703f97c1cbc5ca7f8a63f07f0eee93259
+EBUILD luasocket-3.0.0.ebuild 1669 BLAKE2B f8ed71c04a819fe6dd400b10eefba00d84251def83563dddc98885257568669e870fdb02431afcd0c89878d4f2bf16c245a31c8508a9168f092689c0a5145c9d SHA512 8afec405096da58e1e74b90105c4e9f887cdb4f90f5b317ea77802419448e737022faa96a390ac3604861332f52d1e085200acb7017687d7c0503a55224e489f
+EBUILD luasocket-3.0_rc1_p20200328-r103.ebuild 1723 BLAKE2B bb2ee9c0268399453f03ebfdeabb1f58a6f9d572b9c960fc03df049de3a149af71e399c70e28739983d2ecccc732e65e00d920e43ea0e2acfc673a106c0331b8 SHA512 14d6239f9eea43a746372b6668a28ca04489aedad9cd5727a160a5263caa1664bbf530c38885391aaba0d89607e8d4241261f66a17f84cc5354da411048be656
+MISC metadata.xml 605 BLAKE2B 2358c705cc7a8345cd8975154db2074b70682ae723ad265ed350a49e3958959ea8402405b6a0827d9d7debfcd7bf2d7814211d282492ffea21017dced0b7d5dd SHA512 25b09ed61b7256d5db22ca630ae9067f90491142ff5c3810ab41dadd537cbfc41b08cf6bce55b8c03910b221fefcda72a34afc996184d238af0323a8ac9a5474
diff --git a/dev-lua/luasocket/files/luasocket-3.0.0_makefile.patch b/dev-lua/luasocket/files/luasocket-3.0.0_makefile.patch
new file mode 100644
index 000000000000..8f6c9de42697
--- /dev/null
+++ b/dev-lua/luasocket/files/luasocket-3.0.0_makefile.patch
@@ -0,0 +1,73 @@
+--- a/src/makefile
++++ b/src/makefile
+@@ -162,7 +162,7 @@
+ O_macosx=o
+ CC_macosx=gcc
+ DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
+-CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
++CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -fno-common
+ LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o
+ LD_macosx=gcc
+ SOCKET_macosx=usocket.o
+@@ -174,8 +174,7 @@
+ O_linux=o
+ CC_linux=gcc
+ DEF_linux=-DLUASOCKET_$(DEBUG)
+-CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
+-	-Wimplicit -O2 -ggdb3 -fpic
++CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra -Wimplicit -fpic
+ LDFLAGS_linux=-O -shared -fpic -o
+ LD_linux=gcc
+ SOCKET_linux=usocket.o
+@@ -187,8 +186,7 @@
+ O_freebsd=o
+ CC_freebsd=gcc
+ DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
+-CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
+-	-Wimplicit -O2 -ggdb3 -fpic
++CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra -Wimplicit -fpic
+ LDFLAGS_freebsd=-O -shared -fpic -o
+ LD_freebsd=gcc
+ SOCKET_freebsd=usocket.o
+@@ -200,8 +198,7 @@
+ O_solaris=o
+ CC_solaris=gcc
+ DEF_solaris=-DLUASOCKET_$(DEBUG)
+-CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
+-	-Wimplicit -O2 -ggdb3 -fpic
++CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra -Wimplicit -fpic
+ LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o
+ LD_solaris=gcc
+ SOCKET_solaris=usocket.o
+@@ -214,7 +211,7 @@
+ CC_mingw=gcc
+ DEF_mingw= -DLUASOCKET_$(DEBUG) \
+ 	-DWINVER=0x0501
+-CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
++CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -fno-common
+ LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o
+ LD_mingw=gcc
+ SOCKET_mingw=wsocket.o
+@@ -396,18 +393,18 @@
+ all: $(SOCKET_SO) $(MIME_SO)
+ 
+ $(SOCKET_SO): $(SOCKET_OBJS)
+-	$(LD) $(SOCKET_OBJS) $(LDFLAGS)$@
++	$(LD) $(SOCKET_OBJS) -Wl,-soname,socket/core.so $(LDFLAGS)$@
+ 
+ $(MIME_SO): $(MIME_OBJS)
+-	$(LD) $(MIME_OBJS) $(LDFLAGS)$@
++	$(LD) $(MIME_OBJS) -Wl,-soname,mime/core.so $(LDFLAGS)$@
+ 
+ all-unix: all $(UNIX_SO) $(SERIAL_SO)
+ 
+ $(UNIX_SO): $(UNIX_OBJS)
+-	$(LD) $(UNIX_OBJS) $(LDFLAGS)$@
++	$(LD) $(UNIX_OBJS) -Wl,-soname,socket/unix.so $(LDFLAGS)$@
+ 
+ $(SERIAL_SO): $(SERIAL_OBJS)
+-	$(LD) $(SERIAL_OBJS) $(LDFLAGS)$@
++	$(LD) $(SERIAL_OBJS) -Wl,-soname,socket/serial.so $(LDFLAGS)$@
+ 
+ install:
+ 	$(INSTALL_DIR) $(INSTALL_TOP_LDIR)
diff --git a/dev-lua/luasocket/luasocket-3.0.0.ebuild b/dev-lua/luasocket/luasocket-3.0.0.ebuild
new file mode 100644
index 000000000000..9c989a186eaf
--- /dev/null
+++ b/dev-lua/luasocket/luasocket-3.0.0.ebuild
@@ -0,0 +1,88 @@
+# 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_P="${PN}-${EGIT_COMMIT}"
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Networking support for the Lua language"
+HOMEPAGE="
+	http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
+	https://github.com/lunarmodules/luasocket
+"
+SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS="docs/."
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0_rc1_p20200328_publish_API.patch"
+	"${FILESDIR}/${PN}-3.0.0_makefile.patch"
+)
+
+src_prepare() {
+	default
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LD=$(tc-getCC)"
+		"LUAINC_linux=$(lua_get_include_dir)"
+		"LUAV=${ELUA}"
+		"MIME_V=1.0.3-${ELUA}"
+		"MYCFLAGS=${CFLAGS}"
+		"MYLDFLAGS=${LDFLAGS}"
+		"SOCKET_V=3.0.0-${ELUA}"
+	)
+
+	emake "${myemakeargs[@]}" all
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CDIR=$(lua_get_cmod_dir)"
+		"DESTDIR=${ED}"
+		"LDIR=$(lua_get_lmod_dir)"
+		"LUAPREFIX_linux="
+		"MIME_V=1.0.3-${ELUA}"
+		"SOCKET_V=3.0.0-${ELUA}"
+	)
+
+	emake "${myemakeargs[@]}" install
+	emake "${myemakeargs[@]}" install-unix
+
+	insinto "$(lua_get_include_dir)"/luasocket
+	doins src/*.h
+
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
index 58fe8d5c2285..283cd08f0c64 100644
--- a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
+++ b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
@@ -12,9 +12,9 @@ inherit lua toolchain-funcs
 DESCRIPTION="Networking support library for the Lua language"
 HOMEPAGE="
 	http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
-	https://github.com/diegonehab/luasocket
+	https://github.com/lunarmodules/luasocket
 "
-SRC_URI="https://github.com/diegonehab/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/lunarmodules/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
diff --git a/dev-lua/luasocket/metadata.xml b/dev-lua/luasocket/metadata.xml
index d810c98fd551..aadd3b74b2a5 100644
--- a/dev-lua/luasocket/metadata.xml
+++ b/dev-lua/luasocket/metadata.xml
@@ -14,6 +14,6 @@
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">diegonehab/luasocket</remote-id>
+		<remote-id type="github">lunarmodules/luasocket</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/luv/Manifest b/dev-lua/luv/Manifest
index 20022fa2b9cb..1c70b8e8ebd0 100644
--- a/dev-lua/luv/Manifest
+++ b/dev-lua/luv/Manifest
@@ -4,5 +4,5 @@ DIST luv-1.36.0.0.tar.gz 107196 BLAKE2B 31a02c3e928559037355186810187299a3cb1420
 DIST luv-1.43.0.0.tar.gz 122337 BLAKE2B 435334d869487de38215ce9b551f586d4017c7f83497bc90637fc8acb8e63d1c36f6678a3f2c4d5b24b76fd904b2fa8c364a31bc1bd544416f60f2b8290903d3 SHA512 f51d9b3c733dd5617fca49534fdd77dbb6a3d6f58263f453db8dcde21679f4a471e15d6f5b05bcb22a2552455df8beb238d33b0999306bf2a5ad6755da4044ff
 DIST luv-lua-compat-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
 EBUILD luv-1.36.0.0.ebuild 2303 BLAKE2B 516f7e876698b6b15639e648778d59f044d89ec216e2152fa607e24eaebeb0f3c6f5150de367aee211ac3c08b00407b325ab4c3289f873de3abe72f139ea9458 SHA512 732a3d8900cf3695a7ea65ab75c2f05c6cef120d43295a12413ea76c0a838dab4f18e64c815c38a634651af000b9219ee164d52814cf06c0ca5076945a45adeb
-EBUILD luv-1.43.0.0.ebuild 2305 BLAKE2B 8610c30b7a480da8ab737dbed19546192034edac5e9799866806696604e05ab6c0e1ecfef931656ccc32749b6bc6d3f7c9b3f00175741dcfe994237a319dd327 SHA512 fd646181c67e41b1a63cc116ba094df3478df67eb02f33739e4558867c40bab2647957c5bdf3dc0aede7a049e4f19629b3c4212459d33eb8fbafd2d088ad6bf0
+EBUILD luv-1.43.0.0.ebuild 2303 BLAKE2B baf85e4f3509bfb0cca1dfaecd30b8e154167639eeb1e2b747fe29227c2d5aaa2931e47c69193d2224a645f68c9629fdabffddfc34bf19ffc2c859c702462246 SHA512 b415c62b94f1fcb8e85073a85badc8587fe35620aa683b6ecf59b216ead0c25c1a000666483e6d263e717b170949bfd8c2089a0c08efd8c4f13d3b6de992e983
 MISC metadata.xml 484 BLAKE2B eb035fd19fe978128b6742025f44fc233348a496de2628c80f67db2ae64717e4a3685eec1456f920052e406d15855e225987389a4e33d7caaa5b938418849ecf SHA512 4bf472b91b176e1af730ffb84fade9ab49590726107c73f6c37dac491df394b6779a50e658d062b1cedc0a05f1fb89463817945bc075df572e3e9d6adab04a2f
diff --git a/dev-lua/luv/luv-1.43.0.0.ebuild b/dev-lua/luv/luv-1.43.0.0.ebuild
index 9c3fb9018539..c54805a8ba66 100644
--- a/dev-lua/luv/luv-1.43.0.0.ebuild
+++ b/dev-lua/luv/luv-1.43.0.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lua/penlight/Manifest b/dev-lua/penlight/Manifest
index 4ea31dc97c6e..04c4f03bbfe8 100644
--- a/dev-lua/penlight/Manifest
+++ b/dev-lua/penlight/Manifest
@@ -1,3 +1,3 @@
 DIST penlight-1.12.0.tar.gz 429587 BLAKE2B b8a659c051c1bb9406e9c20ad1da20029e3a141d8193c1d74e83c24b7089ee11c12bb1850c6abb08d7199dbe6d02f40ef8efdfaf2ba4fb16aa88b0218f1dbc65 SHA512 70628bd43a0ac4176704611e47c3a42c287c24aac98a0bc63071a192326e4ecab016a499ff9ab201a9e7d7848f26760f0a2ef87d46220df679b4f70a0fdc4aac
-EBUILD penlight-1.12.0.ebuild 1224 BLAKE2B da464cc879834276ce60e0bbedbeebea8be2167c8bdcfc56bff4eaffd2c69dbcacfd26fce346fdc445f44e669d2f8c62d496c5e9867adcc2d8b203d45b84d920 SHA512 131bbe47b472e2044d4d752c3cb48d5bd0f167d65ab12000667bb6a0f3c7385e58d4e99f25856fcbac1546b900eed798bf78e929d5d5d71d6915bdae29400080
-MISC metadata.xml 729 BLAKE2B 17f0fbc28fb9cf4ca711c87af3bed31dcf145b348e6abd6eb3b62cc29e52949ee7b54d006da2accd60f6d5a1d17137c6e28b1d897aed6ec969685fbad34e516b SHA512 52fe762113833b6658431544a3f929e786423a294327d60cd07d3aaec09fb03ed3e6870ff393ef6dc00926eed95b142eba0753835e314a0625aec751ffbfaa31
+EBUILD penlight-1.12.0.ebuild 1230 BLAKE2B 130111463939881fc5018101af233b2f8d0f970e03c12e88b142537c6df689ea81dd71848dd79b88d533c1bf9b6681971c59cdb743e162df497e089b363ff836 SHA512 3906a5411fad5dd7a58604037d9b473ca0920932a730c13e04113a0e37ba8e961248ba1955ff320721158e8da1b3d9fb2f46c2a6ce4135b9a0b0d65418885cd9
+MISC metadata.xml 735 BLAKE2B a68f6f53a706c2b7c5d6e5407efbdc571d7839f7c5c7f05ece179e798419767562b82e1acab87b8b034392f5f3d77190cfd00a19bbd97d54359aeb127c4fe9c8 SHA512 eb5019d34e384d12cc2d1709c879a3afc2832f4e33ece3a0cdebf4bfd15c1d887a9fabed8c34821ee5c72ceb88111f62de87a4043f0fb0f076137fd4b8acecbc
diff --git a/dev-lua/penlight/metadata.xml b/dev-lua/penlight/metadata.xml
index 3c222244d9b4..1a05f3bf022d 100644
--- a/dev-lua/penlight/metadata.xml
+++ b/dev-lua/penlight/metadata.xml
@@ -17,6 +17,6 @@
 		on tables and sequences.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">Tieske/Penlight</remote-id>
+		<remote-id type="github">lunarmodules/Penlight</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/penlight/penlight-1.12.0.ebuild b/dev-lua/penlight/penlight-1.12.0.ebuild
index 965cb7302c5b..b1a4008cf42f 100644
--- a/dev-lua/penlight/penlight-1.12.0.ebuild
+++ b/dev-lua/penlight/penlight-1.12.0.ebuild
@@ -10,7 +10,7 @@ inherit lua toolchain-funcs
 
 DESCRIPTION="Lua utility libraries loosely based on the Python standard libraries"
 HOMEPAGE="https://github.com/lunarmodules/Penlight"
-SRC_URI="https://github.com/Tieske/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/lunarmodules/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"