gentoo resync : 12.05.2022

24 files changed, 215 insertions, 441 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index aa4814d8abc0..a8adb81cad00 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lua-term/Manifest b/dev-lua/lua-term/Manifest
index e04f87e15b10..ad2b9916a7b7 100644
--- a/dev-lua/lua-term/Manifest
+++ b/dev-lua/lua-term/Manifest
@@ -1,3 +1,3 @@
 DIST lua-term-0.7.tar.gz 4365 BLAKE2B 8f4080d4cd3b620cb1f261d417744f112d42b776ab3f4cdb0e52d04b6d64fc4a1ddbd634570496c3bc12e6b10efe5af8025d1f124198ebb3946414679a65f7f4 SHA512 2046ba1861ff590c191bb651941c45eb8b6e9a1252b05e78daaeb31837ce1fc7da9ba124aec34dc7842fd304e945754c463ffd75941125ff952e911ba66efa31
-EBUILD lua-term-0.7-r1.ebuild 1196 BLAKE2B a0623f97d8d3e1c50ae585ada6dd7a3ad3fc61316d027b42e30554e44bfd7a6305df9554c09b3a3d8e6643227b33ed8aa7a00cd77d03e18da1856f2bf4f11523 SHA512 d53783c06220716e16b1d191a4fba9a2ccaa5f0a900d4d92a33fcff551c8b356a830351094a20408f7eccaea92ee53537a35602cc4cffd92882176ccd7562c6d
+EBUILD lua-term-0.7-r2.ebuild 1202 BLAKE2B b7ba62dba3fb80ca004f7a6b54483e9a2dbc3e3a26d5f0c27d2df984130cc2c9d43e94b2e0ba4eaf597120be0b1aff91e3456bc7de3045ff6e129b7edf5b3714 SHA512 f8b61cb70b6bd18fdb3a1d397253de975cadfe6b32b8c54bf118c768f9507591920c4b97dba3bdb332bc445bc8a57b737eb81248df22390be34f90d89ddb60fc
 MISC metadata.xml 441 BLAKE2B 102738d54ba592ba9c0282af4404cb26cccde97ea95377d7664135f8d0b5834ab1017754d8a70a967220c67a423a3ce872a562418014b1ead2dfb3f396e5a05d SHA512 9341c822e8261c3b9c95c02bcc371188546b9e9b056d931c76be13762ee86b64fd8c5777b860634323a0322075da91ba3eed1dd2e74148bed003730c86452e04
diff --git a/dev-lua/lua-term/lua-term-0.7-r1.ebuild b/dev-lua/lua-term/lua-term-0.7-r2.ebuild
index bbbbe0d517af..5fb52c4915e1 100644
--- a/dev-lua/lua-term/lua-term-0.7-r1.ebuild
+++ b/dev-lua/lua-term/lua-term-0.7-r2.ebuild
@@ -36,7 +36,7 @@ lua_src_compile() {
 
 	local myemakeargs=(
 		"CC=$(tc-getCC)"
-		"CFLAGS=${CFLAGS} ${LDFLAGS} $(lua_get_CFLAGS)"
+		"CFLAGS=${CFLAGS} -fPIC ${LDFLAGS} $(lua_get_CFLAGS)"
 	)
 
 	emake "${myemakeargs[@]}" all
diff --git a/dev-lua/lua-unbound/Manifest b/dev-lua/lua-unbound/Manifest
index 18014f9c563c..f3641fc603c0 100644
--- a/dev-lua/lua-unbound/Manifest
+++ b/dev-lua/lua-unbound/Manifest
@@ -1,3 +1,3 @@
 DIST luaunbound-1.0.0.tar.gz 6366 BLAKE2B 7e5937e0109cb7222f982a62b7934ca272be9003810edee0d58684809928514441aeee22c83cbc3a8e309e9ee010f1d4afea50123647ad6eee387a556878f654 SHA512 9fab77481e7c84409d9ceb79156d06cb9ac2b2d7df53349e0f1b6c118022c9b1c22481e9413efedda41cc9acb1640d3d30cc4e0f9b7ed7fd6ed2511192a69d3c
-EBUILD lua-unbound-1.0.0.ebuild 1141 BLAKE2B f97385ca06dd9572147c6d11bbeab73c7a2337b1d95fd08798673648aad0194dc13d80b6eda850f5437d3c6e797620eaad71789cbe2ddae2665b6fb00ffcab19 SHA512 fe05a9bb7c4191697efeb66cb5e1bd8505b9e3c5fe05cec240953b113b8f1ec57e654f506d52926b7ed742291a7d28267181c16ee232034db5782478fad788f8
+EBUILD lua-unbound-1.0.0.ebuild 1139 BLAKE2B 632dad23de93c6738481a1b3f38224243434fd2ccd9c84d06d4cbf8808f054eb8db7c470ed635b6085952a53c9a809e15e026d9d5ea4af854bcf864f6f70acb2 SHA512 df577dfb8eaeefa4dd0a72e48cc1dc7d47a52338c7e76dfb43c1327e5276679292a66bd64a57c3b7c317f0d157539f6f2717e2965838864a4033f53ac360be5b
 MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/dev-lua/lua-unbound/lua-unbound-1.0.0.ebuild b/dev-lua/lua-unbound/lua-unbound-1.0.0.ebuild
index f1ce4c674a1e..abf456484978 100644
--- a/dev-lua/lua-unbound/lua-unbound-1.0.0.ebuild
+++ b/dev-lua/lua-unbound/lua-unbound-1.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index 00e0af709b0b..126fcc47d41b 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -1,7 +1,3 @@
-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
-EBUILD luaexpat-1.4.0.ebuild 1257 BLAKE2B 3566ca5fc1e101daa7dcf146e52cdaa3a23b10d95126e4ce57ece79e8037afaae682f84f04509f63294a5adc838ec28ce86f8c970b26d68e5cb5a9a9c8c7c700 SHA512 20a12db581401cd4d8650a703ce220c6edf756cdc478ae20061b84e2a45be447660d0c840f1412c0b3ab86c67123c8b2ecfdbbd79cbfa0e6a514ea00236c6f5a
-EBUILD luaexpat-1.4.1.ebuild 1257 BLAKE2B 3566ca5fc1e101daa7dcf146e52cdaa3a23b10d95126e4ce57ece79e8037afaae682f84f04509f63294a5adc838ec28ce86f8c970b26d68e5cb5a9a9c8c7c700 SHA512 20a12db581401cd4d8650a703ce220c6edf756cdc478ae20061b84e2a45be447660d0c840f1412c0b3ab86c67123c8b2ecfdbbd79cbfa0e6a514ea00236c6f5a
+EBUILD luaexpat-1.4.1.ebuild 1250 BLAKE2B 87a9e484ee1419e443200bd424823797c5274f9b828bdf03fce94958bf90c9c5d70bb2aa95f5ac43986ab683c2fccc2bcebb33cd7f6520a3eecbc76ae45e7f5f SHA512 2df41c44ea53cd1bce8eebf7dcd5e9a5196afeb3ce8def512724b75979a42d1e9a26cece19e032dd3192879c76232f3a1791e90eec00b6a1449e5bcef2d00388
 MISC metadata.xml 667 BLAKE2B 5efd48f296044b9a01c80274ca8fa4ccee0d03a2e6758020d98e123438c13074ec95de3635bbe9abe0838db6f7c65aed8b351b90d1f670ffc331cbf29299d2d7 SHA512 72f967617a90fe28048ab9c128d86daaf360c13333ed8a27eb5628d4f9c39b91f15213b1459631f3eb147429917bb1500047116b4a8c6a7c91f4002b1670bf31
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
deleted file mode 100644
index 186869f91be1..000000000000
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,74 +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="LuaExpat is a SAX XML parser based on the Expat library"
-HOMEPAGE="https://matthewwild.co.uk/projects/luaexpat/ https://code.matthewwild.co.uk/lua-expat"
-SRC_URI="https://matthewwild.co.uk/projects/${PN}/${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=( "doc/us/." )
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	# Remove '-ansi' to compile with newer lua versions
-	sed -e 's/-O2//g' -e 's/-ansi//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.0.ebuild b/dev-lua/luaexpat/luaexpat-1.4.0.ebuild
deleted file mode 100644
index b0c2791bf0e6..000000000000
--- a/dev-lua/luaexpat/luaexpat-1.4.0.ebuild
+++ /dev/null
@@ -1,73 +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="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
index b0c2791bf0e6..653582b9bb6d 100644
--- a/dev-lua/luaexpat/luaexpat-1.4.1.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-lua/lualdap/Manifest b/dev-lua/lualdap/Manifest
index 7ce399571778..9222f838afc5 100644
--- a/dev-lua/lualdap/Manifest
+++ b/dev-lua/lualdap/Manifest
@@ -1,4 +1,4 @@
 AUX lualdap-1.3.0-lua5-4.patch 552 BLAKE2B d685838d05b9c2e4354abf436837940725f80fd8d81d806a383c0975bfb67ff8b679bd668bfbc524129a4e62cb0f4b5f77e070b1afeec85809a6533114fb1442 SHA512 fb1f7eea88afae2e854f0cabf115739ab4900247483f9d1d8f15f0c5dcaa85ee2c6e16414bce300450b1531a5c76516f8260000c54707d85547236a7185d65e8
 DIST lualdap-1.3.0.tar.gz 81987 BLAKE2B cd25cada91a3c330fb72ee1106298442c64b1bcae4a57f48937efb4311f70b53c5a0e96587caab4b1950b16d9957bb8c25b2b9e0d3753089f06fbae64180ff04 SHA512 dea4282928c5138a327cd97d3d8049341fac17b5e853440f5b0a6e115e3400bac908f24827d48e36bfe81720c7d2bacdc50ae189953ecbcdfb27cb23b78d0de8
-EBUILD lualdap-1.3.0-r2.ebuild 1586 BLAKE2B c24269e2f4e7623337edb0f334902ca4d358c3633beebada8725b320f17b06224ac6a567d3990be863f919156a50aeca509838237e2b0e8f5885efef03a5239f SHA512 e00a635f10909ce3f90931cb0a4ecf4ea033c2586a09c84af75b9ea9e95476929da219645e3a2b5940b0da94acfe88b7600deddb0b34420bb0d31d09bac28abe
+EBUILD lualdap-1.3.0-r2.ebuild 1584 BLAKE2B 3221fd2bec9b524c8aca6c22961de9b4b60a413288f273f9d7085f3de8bffa5d90ee541aecec6aa7fc0d7b1f3214ef988ddca581cf0761b4722255d43cf7bdbd SHA512 02d811158ae71460337a11b6351ad3d383d61fc924ea90d08c3077de2a7df2c064743546f47ee8290a59d79b3b5076fcc54e0d6fb9c7fb2c1d254717667e875c
 MISC metadata.xml 442 BLAKE2B 7e232b04c35cca3befb630d268e162bc7bb095f9802d6aa01b15a78f0ac276d8de41cb02e1f6a94f16f79d7afcbd99bce981ff3f6e04459b71a846378e4d2911 SHA512 c94b931cf34eabb0efc127029419aafa87491a3453ccf3f0045e19b8d23893b9192bbdc22eaf654d2250955f0dd90a217b7118e89664b2572258044ad40e265e
diff --git a/dev-lua/lualdap/lualdap-1.3.0-r2.ebuild b/dev-lua/lualdap/lualdap-1.3.0-r2.ebuild
index 1abb207ea041..4fe217830099 100644
--- a/dev-lua/lualdap/lualdap-1.3.0-r2.ebuild
+++ b/dev-lua/lualdap/lualdap-1.3.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lualdap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="test"
diff --git a/dev-lua/luaposix/Manifest b/dev-lua/luaposix/Manifest
index 4455170acc9d..2c2b5c2ec7c9 100644
--- a/dev-lua/luaposix/Manifest
+++ b/dev-lua/luaposix/Manifest
@@ -1,5 +1,3 @@
-DIST luaposix-35.0.tar.gz 178091 BLAKE2B b2d2ca01f18f0e98b45008919fc886e05d2cad034c84e870900c33891dd5867d9bc7aa8deae06c3f3f0852db902c1e766e693162b32ed474eb710b379bf9e3ed SHA512 4bb61892b78d9e59418a9a6360b9f611fb9b5438b9261a2c6672f053a1b21dfd9a2060b8d2f0d3eac6185773cf84672c1769c081c4ab53d2ddae2232e4a9269b
 DIST luaposix-35.1.tar.gz 180002 BLAKE2B fc48ae91c31968cb92ea9818148f135e16e2bacac10265cbfa43539c34a934c4eb636417b820ce3b0b3724fecbf27a860c6b481749d339b009fc01b6f81e6277 SHA512 f2c36bf69c0d73b4a2c6ab0915f81473addce427c22e82e2d1c334016dec7fecb4365fc980fa6adb0de21ad1a60bc75b73f58579e8a423990ad2067c9ae37775
-EBUILD luaposix-35.0-r103.ebuild 1835 BLAKE2B 6223069db43b82d34ae389954d528d8212122fcef2200319c39a2b0fcc89f4120768bb1cdb2bfe95c734649dd9b0469e87d8d5f7dc97a4a53b8ecba8a51a8ff8 SHA512 a1b1a134363de4fe57a583493dd7196594d4fc1d0919ac2dbc1e083c08b7661637ffe94e9a0ad4ceeb96a0accb78ffb7e6b181a41ac55cf1d44c0d0b634fc90f
-EBUILD luaposix-35.1.ebuild 1674 BLAKE2B 62ba3a833e56f4aa46db67a59407e8335548b7accc1b5197255192102ff225d3f134bde0e047d63d56ceeb288db2429e592dca09e554a95899e3c0fb2f639feb SHA512 afb4495a078d36b24e2a83123aa0201f479099918b07c1b64749442546bcb0d1f02a29dc568e243de08fc3823c0465d1668e0e56d3dbd0c1c562d2855be646d1
-MISC metadata.xml 505 BLAKE2B 42b52401c50e93a3698230d49e18e22f600de6e1b991a8294d3c7dad3eeaea7f88029f60db28d6b29b4fb825e75627647e1c5d771b0bf3030e99676fb40110bb SHA512 fa4fe245d0dd8497bfbb0fd13568401258085fc7d3a2f31167a7ba816f2b979430d76bdaccb5fcb5ed7840d559a3478f7208a972cf665a426a9336cd74059654
+EBUILD luaposix-35.1.ebuild 1672 BLAKE2B d0b74488b53d5bfc0df65f94d03450eec63b0978ede1d86916c17226bfec1a6e9262e300195aced916a42e34c416333cf43d59d20370bfe57a40b11982f46b85 SHA512 28d95e5178b41fe23aaf7dbce2a327b3265a22d6e3f288c42592553e31559f16986debacaf1f8125fa1bd8949677ddc25d568af4809de1a500fa994a8f489561
+MISC metadata.xml 600 BLAKE2B d695065d5b811b5ca92d40058cbbcd82bda51df5d56e8090473865e72d0a812e253cd17510768593cb54470d25fb930730f38dd0476ef7d08ce83a25282ffad0 SHA512 acc4b8b9964c24933453f46f5fba8e5b6138130e12b9393f524d02c2f7e80f71ff43c6c01488f5b68a6857695e6e4880770a0d8dc03fbbd1099b9a82cadff9ae
diff --git a/dev-lua/luaposix/luaposix-35.0-r103.ebuild b/dev-lua/luaposix/luaposix-35.0-r103.ebuild
deleted file mode 100644
index a92fac063f8e..000000000000
--- a/dev-lua/luaposix/luaposix-35.0-r103.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="Bindings for POSIX APIs"
-HOMEPAGE="https://luaposix.github.io/luaposix/ https://github.com/luaposix/luaposix"
-SRC_URI="https://github.com/luaposix/luaposix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-# Requires specl, which is not in the tree yet
-RESTRICT="test"
-
-DEPEND="${LUA_DEPS}
-	virtual/libcrypt:=
-"
-RDEPEND="${DEPEND}
-	lua_targets_lua5-1? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] )
-	lua_targets_luajit? ( dev-lua/lua-bit32[lua_targets_luajit(-)] )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Temporary fix for respect LDFLAGS (#739050)
-	# Fixed in luke 0.2.1
-	sed -i -e "s:c_module,libdirs:c_module,'\$LDFLAGS',libdirs:g" \
-		build-aux/luke || die
-
-	lua_copy_sources
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	# LDOC=true means disable ldoc update documentation
-	./build-aux/luke --verbose package="${PN}" version="${PV}" \
-		LDOC=true \
-		PREFIX="${ED}/usr" \
-		INST_LIBDIR="${ED}/$(lua_get_cmod_dir)" \
-		INST_LUADIR="${ED}/$(lua_get_lmod_dir)" \
-		LUA_INCDIR="${EPREFIX}/$(lua_get_include_dir)" \
-		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die
-
-	popd || die
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_install() {
-	pushd "${BUILD_DIR}" || die
-
-	./build-aux/luke install \
-		LDOC=true \
-		PREFIX="${ED}/usr" \
-		INST_LIBDIR="${ED}/$(lua_get_cmod_dir)" \
-		INST_LUADIR="${ED}/$(lua_get_lmod_dir)" \
-		|| die
-
-	popd || die
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-	dodoc {NEWS,README}.md
-	use doc && dodoc -r doc
-}
diff --git a/dev-lua/luaposix/luaposix-35.1.ebuild b/dev-lua/luaposix/luaposix-35.1.ebuild
index 656a22c8df1d..62a49e74220c 100644
--- a/dev-lua/luaposix/luaposix-35.1.ebuild
+++ b/dev-lua/luaposix/luaposix-35.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/luaposix/luaposix/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/dev-lua/luaposix/metadata.xml b/dev-lua/luaposix/metadata.xml
index 69f0127daebd..6268cdd77d0a 100644
--- a/dev-lua/luaposix/metadata.xml
+++ b/dev-lua/luaposix/metadata.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>azamat.hackimov@gmail.com</email>
-    <name>Azamat H. Hackimov</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">luaposix/luaposix</remote-id>
-  </upstream>
+	<maintainer type="person" proxied="yes">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">luaposix/luaposix</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
index 37c7b4864adb..8001e428b0d9 100644
--- a/dev-lua/luarocks/Manifest
+++ b/dev-lua/luarocks/Manifest
@@ -1,3 +1,5 @@
 DIST luarocks-3.8.0.tar.gz 249787 BLAKE2B 2bfff5af400abfdf17a0eacd1f29838dd77751f2ba085d6c6fc18dfc971ea796523781ff2488566d42c01d005bd5037171bf1aabbfdd664746c55674e3ca32c7 SHA512 6c30884c60da57706228a9870f510a1bce435b2d5d67c63c5f2958b152c7a2b334bd74a016995871e3b05b98374f4c4e008993ede81f9fc564980e183bdf06b2
+DIST luarocks-3.9.0.tar.gz 252777 BLAKE2B fba01692057ea5f4a926db4b31d4a299238079af1dfd15078cbff6d3d17d1b87f9f30db8477b1b706ec4602fe9ef82533ad3cc58f8059fe84490b464da0b3c15 SHA512 ccdee2ff14f52428923d5148f3d86d2ad40f84685988a12419c191c73a4df6cfacb0defbea40556493645619fdbef807e198fbae85be69c4075b5212353c1f2d
 EBUILD luarocks-3.8.0.ebuild 2032 BLAKE2B c35eac393ab58c03ec8b8571f77728cc24b9a8e6b46f9863e93ec2c90ce10db271bb168a41f712801a5598e49ce5226013497768e495b77ba2d3ec0b2c45459b SHA512 a61f31bd7262e9d9f6af0b126a3e4fe41e805a54f4a7765b770a1a1bb4f2b1ab748fc1cdfb3482fb5097c1eec2f8918a889257246e27dde39cebe13257cfc3d4
+EBUILD luarocks-3.9.0.ebuild 2036 BLAKE2B 96cd67a94991f1cd72f87fbd3081b2b6045c479c4a13f8f70b648b2dbb6a21d9e11442603f7ab7bd255dfc1a477c70cef0bb057d6ab871e1be8bb049eb648304 SHA512 75069c2eaf57815d9528d851afe4c29b14e64c5f0887d9103c12a6b57b7e8ae63d48f036471bcdb22837712410357d007d389a3339dcdeba1b841573514f7388
 MISC metadata.xml 501 BLAKE2B 0a2a3e7358a2ef2a4cbb79853408dfdf6015d49348bbb879a59253a88c73cf3d96c2ce708076844344468136d70962be74e639d24331a007fbd02ce6ccc18cee SHA512 43f147be67209e542e02733b6a57ce7ee05b61a7eb0d15662c0fb137db4f57c9f519cc98cf5dceb0e6f626f0dc6f04dd5b67da96a155b1e3884dca55896722f3
diff --git a/dev-lua/luarocks/luarocks-3.9.0.ebuild b/dev-lua/luarocks/luarocks-3.9.0.ebuild
new file mode 100644
index 000000000000..7928ca87e717
--- /dev/null
+++ b/dev-lua/luarocks/luarocks-3.9.0.ebuild
@@ -0,0 +1,86 @@
+# 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-single
+
+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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="${LUA_DEPS}"
+
+DEPEND="
+	net-misc/curl
+	dev-libs/openssl:0
+	${RDEPEND}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
+		$(lua_gen_cond_dep 'dev-lua/busted-htest[${LUA_USEDEP}]')
+		${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=$(lua_get_lmod_dir)"
+		"--with-lua-include=$(lua_get_include_dir)"
+		"--with-lua-interpreter=${ELUA}"
+		"--with-lua-lib=$(lua_get_cmod_dir)"
+	)
+
+	# 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
+}
+
+pkg_postinst() {
+	local lua_abi_ver
+	if use lua_single_target_luajit; then
+		lua_abi_ver="5.1"
+	else
+		lua_abi_ver=${ELUA#lua}
+	fi
+	elog
+	elog "To manage rocks for a Lua version other than the current ${CATEGORY}/${PN} default (${lua_abi_ver})"
+	elog "you can use the command-line option --lua-version, e.g."
+	elog
+	elog "    luarocks --lua-version 5.3 install luasocket"
+	elog
+	elog "(use 5.1 for luajit). Note that the relevant Lua version must already be present in the system."
+	elog
+}
diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index c9a99cd3fce0..b9607f34acfe 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -1,8 +1,5 @@
 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.0.ebuild 1669 BLAKE2B f8ed71c04a819fe6dd400b10eefba00d84251def83563dddc98885257568669e870fdb02431afcd0c89878d4f2bf16c245a31c8508a9168f092689c0a5145c9d SHA512 8afec405096da58e1e74b90105c4e9f887cdb4f90f5b317ea77802419448e737022faa96a390ac3604861332f52d1e085200acb7017687d7c0503a55224e489f
-EBUILD luasocket-3.0_rc1_p20200328-r103.ebuild 1723 BLAKE2B bb2ee9c0268399453f03ebfdeabb1f58a6f9d572b9c960fc03df049de3a149af71e399c70e28739983d2ecccc732e65e00d920e43ea0e2acfc673a106c0331b8 SHA512 14d6239f9eea43a746372b6668a28ca04489aedad9cd5727a160a5263caa1664bbf530c38885391aaba0d89607e8d4241261f66a17f84cc5354da411048be656
+EBUILD luasocket-3.0.0.ebuild 1662 BLAKE2B da633141004d633288863d5278e45fab9b0dfffcf7f56f87567371002b344fe0c6c5100d776aa2f1c9807e7aad4554c5664f5d145826a0145e1c86ad1f931a17 SHA512 0de8fac263a988640adc606b98e56af38cffc5a8974c50ebe33edfbe5eeb0709ca07fb7446ba528be958879c3162462ac1b509ed767c445b623ecaee29f77b90
 MISC metadata.xml 605 BLAKE2B 2358c705cc7a8345cd8975154db2074b70682ae723ad265ed350a49e3958959ea8402405b6a0827d9d7debfcd7bf2d7814211d282492ffea21017dced0b7d5dd SHA512 25b09ed61b7256d5db22ca630ae9067f90491142ff5c3810ab41dadd537cbfc41b08cf6bce55b8c03910b221fefcda72a34afc996184d238af0323a8ac9a5474
diff --git a/dev-lua/luasocket/files/luasocket-3.0_rc1_p20200328_makefile.patch b/dev-lua/luasocket/files/luasocket-3.0_rc1_p20200328_makefile.patch
deleted file mode 100644
index c6e25d7969f6..000000000000
--- a/dev-lua/luasocket/files/luasocket-3.0_rc1_p20200328_makefile.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 49f935a774661d5d0d9b1727c2eee12d11f3b692 Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Tue, 19 Oct 2021 01:13:28 +0300
-Subject: [PATCH 2/2] Fix CFLAGS and LDFLAGS options
-
-Remove CFLAGS optimization overrides, add -Wl,-soname option to LDFLAGS
-for external linking.
----
- src/makefile | 21 +++++++++------------
- 1 file changed, 9 insertions(+), 12 deletions(-)
-
-diff --git a/src/makefile b/src/makefile
-index 522d378..cf4a571 100755
---- a/src/makefile
-+++ b/src/makefile
-@@ -162,7 +162,7 @@ SO_macosx=so
- 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 @@ SO_linux=so
- 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 @@ SO_freebsd=so
- 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 @@ SO_solaris=so
- O_solaris=o
- CC_solaris=gcc
- DEF_solaris=-DLUASOCKET_$(DEBUG)
--CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
--	-Wimplicit -O2 -ggdb3 -fpic
-+CFLAGS_solaris=$(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 @@ O_mingw=o
- 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 @@ none:
- 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)
--- 
-2.32.0
-
diff --git a/dev-lua/luasocket/luasocket-3.0.0.ebuild b/dev-lua/luasocket/luasocket-3.0.0.ebuild
index 9c989a186eaf..ebbca46770e8 100644
--- a/dev-lua/luasocket/luasocket-3.0.0.ebuild
+++ b/dev-lua/luasocket/luasocket-3.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="test"
 
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
deleted file mode 100644
index 283cd08f0c64..000000000000
--- a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_COMMIT="5b18e475f38fcf28429b1cc4b17baee3b9793a62"
-LUA_COMPAT=( lua5-{1..4} luajit )
-MY_P="${PN}-${EGIT_COMMIT}"
-
-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/lunarmodules/luasocket
-"
-SRC_URI="https://github.com/lunarmodules/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-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="doc/."
-
-PATCHES=(
-	"${FILESDIR}/${P}_publish_API.patch"
-	"${FILESDIR}/${P}_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-rc1-${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-rc1-${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/readline/Manifest b/dev-lua/readline/Manifest
index fcc102a65228..071a052565c8 100644
--- a/dev-lua/readline/Manifest
+++ b/dev-lua/readline/Manifest
@@ -1,3 +1,5 @@
 DIST lua-readline-3.0.tar.gz 15675 BLAKE2B 877b50cdf05610eb54fcec6063368206d68b0571e70c28abd6bdf20e0533ae76809a18f3b7cbefc79185544966e2838c8ea95b30bc5821c31547026ee621d1f0 SHA512 7fc9b1b2b03909cd8ebccc539fa8c37a823c70728671dc09c7cec0641625a59ed3c8b7045635e53719d32046437e638193cb1055a94a3d635fb50efb199d213a
-EBUILD readline-3.0-r1.ebuild 1620 BLAKE2B c010b63f5c37b7864b60870170bca89d3ef52290ac9f21c2874642da0e563d2898dc2eec5253692be0b2c116f97e8a1d64940b003c61c93c274f9c20e590d7c9 SHA512 d6f18c32943bf9828d604d941648d08b7b22f865948a055350008f96e275bf69292ba34c592f5fae969d4882d223a0c2830fd70830a3226dc0feca47ad03c364
+DIST lua-readline-3.1.tar.gz 16114 BLAKE2B 372bc61573b20c8ebf66bb684624dde9d5ce7868543294450ef3d47bba5a042c5d7f4262366f2de2db8d3d92bbf7fb4895d29577af34307d7b145e6f913ec957 SHA512 d3bee61b6c876e96d2c1097e29862a3f16d1e666b1087e58899f59a3115f9af31793492edfcc3f3802565f98f276960d382a89c0b6cfb1d54acfd37ad006b74b
+EBUILD readline-3.0-r1.ebuild 1618 BLAKE2B b027dd645f14d7d36ef7eb4c903b1e6ffb112c506789b4880efe3d84329180d6553c2fdf449cc13fddb538de0a6430a30eb5ce890b5200e9b5c7bc74724e55d3 SHA512 5618f10cf58f52750252aba977b57a3ca993feb244eb9789d9740442a106448d593a7d3b3c932a8c41c8ff885e5a67afcbd4e202f9930e9a0fb8c8e07afa7739
+EBUILD readline-3.1.ebuild 1620 BLAKE2B c010b63f5c37b7864b60870170bca89d3ef52290ac9f21c2874642da0e563d2898dc2eec5253692be0b2c116f97e8a1d64940b003c61c93c274f9c20e590d7c9 SHA512 d6f18c32943bf9828d604d941648d08b7b22f865948a055350008f96e275bf69292ba34c592f5fae969d4882d223a0c2830fd70830a3226dc0feca47ad03c364
 MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/dev-lua/readline/readline-3.0-r1.ebuild b/dev-lua/readline/readline-3.0-r1.ebuild
index 813f6f10ba3e..7d1172e9d37d 100644
--- a/dev-lua/readline/readline-3.0-r1.ebuild
+++ b/dev-lua/readline/readline-3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://pjb.com.au/comp/lua/${P}.tar.gz -> lua-${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 # Tests are interactive
diff --git a/dev-lua/readline/readline-3.1.ebuild b/dev-lua/readline/readline-3.1.ebuild
new file mode 100644
index 000000000000..813f6f10ba3e
--- /dev/null
+++ b/dev-lua/readline/readline-3.1.ebuild
@@ -0,0 +1,94 @@
+# 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 simple interface to the readline and history libraries"
+HOMEPAGE="https://pjb.com.au/comp/lua/readline.html"
+SRC_URI="https://pjb.com.au/comp/lua/${P}.tar.gz -> lua-${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+# Tests are interactive
+RESTRICT="test"
+
+RDEPEND="
+	dev-lua/luaposix
+	sys-libs/readline:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local compiler=(
+		"$(tc-getCC)"
+		"${CFLAGS}"
+		"-fPIC"
+		"$(lua_get_CFLAGS)"
+		"-c C-readline.c"
+		"-o C-readline.o"
+	)
+	einfo "${compiler[@]}"
+	${compiler[@]} || die
+
+	local linker=(
+		"$(tc-getCC)"
+		"-shared"
+		"${LDFLAGS}"
+		"$($(tc-getPKG_CONFIG) --libs readline)"
+		"-o C-readline.so"
+		"C-readline.o"
+	)
+	einfo "${linker[@]}"
+	${linker[@]} || die
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	pushd "${BUILD_DIR}" || die
+	LUA_CPATH="./?.so;${ESYSROOT}/usr/$(get_libdir)/lua/$(ver_cut 1-2 $(lua_get_version))/?.so" ${ELUA} test/test_rl.lua || die
+	popd || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	insinto "$(lua_get_cmod_dir)"
+	doins C-readline.so
+
+	insinto "$(lua_get_lmod_dir)"
+	doins readline.lua
+
+	popd || die
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	docinto html
+	dodoc doc/readline.html
+}