gentoo resync : 12.05.2022

3 files changed, 98 insertions, 2 deletions

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
+}