gentoo resync : 05.12.2021

9 files changed, 92 insertions, 185 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 7cbecc834846..e4a96c694e4d 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
index 91a845fbb6bd..5e6424c58de8 100644
--- a/dev-lua/luarocks/Manifest
+++ b/dev-lua/luarocks/Manifest
@@ -1,3 +1,5 @@
 DIST luarocks-3.7.0.tar.gz 247576 BLAKE2B b1e119ec897bc8122441445dc215e628d2415dacba9b23c2b075f82a01e21e6e9a8eeab5a3345355d85c566ff9f85ab29194580674521d4d92725b01377ee940 SHA512 cc3c555c488da9f95a118eedb74cb9e2a38b572e172958843dabebce125524e58a13ac65e89a349deb8fef13b6de751074fc3adbb430ab55d4e4109288119153
+DIST luarocks-3.8.0.tar.gz 249787 BLAKE2B 2bfff5af400abfdf17a0eacd1f29838dd77751f2ba085d6c6fc18dfc971ea796523781ff2488566d42c01d005bd5037171bf1aabbfdd664746c55674e3ca32c7 SHA512 6c30884c60da57706228a9870f510a1bce435b2d5d67c63c5f2958b152c7a2b334bd74a016995871e3b05b98374f4c4e008993ede81f9fc564980e183bdf06b2
 EBUILD luarocks-3.7.0.ebuild 2032 BLAKE2B 1cc6d706561ce0e4d138183f266ca442b35c4ffe0a0cabb8e3d9248de063ebc05c42a9592ffa930e338c3a3eabfe94577db2283a88432d546266a1ddfd5527da SHA512 7e904f5cd9672c3de4bfe1ad1211a3a838b172bc7827b310cba6d496340e1a5d7125484b22ecd6c4baca3b288b0a83b432c1d41a519b2d35b35c1036360c1c1f
+EBUILD luarocks-3.8.0.ebuild 2036 BLAKE2B 9d0ad6b22b35a2f9f5f44f0af037dff62937c1f284ae3b0434c22d8c3220154b885259e9b0fcd4f17763ac5ccf0a7c2c5165c488e0c37b2c6f4aa5d5ce4c492e SHA512 bd8803c691cb922c9a78e93dbee255541483171c4cd141a9284d62d776ef0c8382a68310691967d121356b6ebf34304e516cba5a18f43210d59b53d90c4e9620
 MISC metadata.xml 501 BLAKE2B 0a2a3e7358a2ef2a4cbb79853408dfdf6015d49348bbb879a59253a88c73cf3d96c2ce708076844344468136d70962be74e639d24331a007fbd02ce6ccc18cee SHA512 43f147be67209e542e02733b6a57ce7ee05b61a7eb0d15662c0fb137db4f57c9f519cc98cf5dceb0e6f626f0dc6f04dd5b67da96a155b1e3884dca55896722f3
diff --git a/dev-lua/luarocks/luarocks-3.8.0.ebuild b/dev-lua/luarocks/luarocks-3.8.0.ebuild
new file mode 100644
index 000000000000..c3c1e40609f5
--- /dev/null
+++ b/dev-lua/luarocks/luarocks-3.8.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 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/luasec/Manifest b/dev-lua/luasec/Manifest
index bc996fc09191..d63fbdef8879 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,4 +1,3 @@
 DIST luasec-1.0.2.tar.gz 52838 BLAKE2B 41bfaf8af6be56bb46c747b2bf3e938a164f43d2f39cde7386d5795811a555ebad3146344ef491412489de7679f82948bb9fb862e3ae98ab9b73f4116218a5ac SHA512 a873d8217b1ec9e66f50d7319ea0fa467b92b5855e7514dbd00429a26be3546e69fdfc985ac79a80d86f3c6845910b2e14a2198951dcad249b2d1c7d6855453f
-EBUILD luasec-1.0.2-r1.ebuild 1743 BLAKE2B 3d92e0484e7566daa5b2528faae99af5cd702d03c69f8c29a8b41616c12637418d01a55be361d2d6b11e8993c4a458e3c7f81c39ef30968a59340aadfcf806f5 SHA512 40b2a54a1c611e5de01dc3fa641bbdfa66f5a9cafa40a76e55fd47bec2d11067fb109feb1beba0c01b8c1c534961d9c45a11c659f08436b055552f4c633e5d00
-EBUILD luasec-1.0.2.ebuild 1538 BLAKE2B 2acc3879b5d0c0d815b62fdb6168bdb7a5b0620ee69afd44760532fe4317f0db8151a8f6e1baf3c23ff05aa5dfd669db267187e3028bbf1332be033a42f847b1 SHA512 6fa9484a5168bfad532ca016ed5020f62cb68934b5115af11cc80f53aaebbf947d8b6c2afb76bf085002b960fd6bde877a96024b39b00cc8f4cee5b64d0430e0
+EBUILD luasec-1.0.2-r1.ebuild 1737 BLAKE2B c97c06c4bb40382f1cf0c1611cde00e36714bf45f818806feafda167922a15c83af3c43481ae2ec6fc9990078f9dcabf15190372ab9956ecc706e1cb2e9e0409 SHA512 6812a05fc869453678c0989da7e05a6795303baed715f748a73aef8384b86cd65def28ee9085596d87ba9b1032696dd3151cc1100be627f7241fabcb8cd0a82c
 MISC metadata.xml 597 BLAKE2B 6398ca37e0d10458a7b1a111d2d0e8d44aa64136ada116a8bb73bf200be4c10f673c8f574733043eb7b2216c28b003c30a993736145344ae72ef25f001a5783e SHA512 399501a7a9c0b08d8747b30478a3810dde63efb48d2d42eeff1ba7355c882e35fd3528424930f618d51182f80641c1c6fb4662b31ec21cf38abd0f0fde0d17dd
diff --git a/dev-lua/luasec/luasec-1.0.2-r1.ebuild b/dev-lua/luasec/luasec-1.0.2-r1.ebuild
index b347d6e6c493..49c55d854b4b 100644
--- a/dev-lua/luasec/luasec-1.0.2-r1.ebuild
+++ b/dev-lua/luasec/luasec-1.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/brunoos/luasec/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"
 
 RDEPEND="
 	>=dev-lua/luasocket-3.0_rc1_p20200328-r103[${LUA_USEDEP}]
diff --git a/dev-lua/luasec/luasec-1.0.2.ebuild b/dev-lua/luasec/luasec-1.0.2.ebuild
deleted file mode 100644
index a001f3ea42e7..000000000000
--- a/dev-lua/luasec/luasec-1.0.2.ebuild
+++ /dev/null
@@ -1,86 +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 )
-LUA_REQ_USE="deprecated(+)"
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="Lua binding for OpenSSL library to provide TLS/SSL communication"
-HOMEPAGE="https://github.com/brunoos/luasec"
-SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
-	dev-lua/luasocket[${LUA_USEDEP}]
-	dev-libs/openssl:0=
-	${LUA_DEPS}
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-lua_src_prepare() {
-	pushd "${BUILD_DIR}" || die
-
-	${ELUA} src/options.lua -g /usr/include/openssl/ssl.h > src/options.c || die
-
-	popd
-}
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-O2//g' -i src/Makefile || die
-
-	lua_copy_sources
-
-	lua_foreach_impl lua_src_prepare
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LD=$(tc-getCC)"
-		"INC_PATH=-I$(lua_get_include_dir)"
-		"LIB_PATH=$(lua_get_CFLAGS)"
-		"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=(
-		"DESTDIR=${ED}"
-		"LUAPATH=$(lua_get_lmod_dir)"
-		"LUACPATH=$(lua_get_cmod_dir)"
-	)
-
-	emake "${emakeargs[@]}" install
-
-	popd
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index 3828eebe5ab2..8687ed10e69d 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -1,6 +1,5 @@
 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_rc1_p20200328.tar.gz 335628 BLAKE2B 9e5d3e415337903b689705669b586c4481179a319b4e3428823c8f442d04f26db86bfeca66db7e58d157e31431c31e4f687403f7163b75f57d6f87cdb934717f SHA512 bdf7086a0504b0072b9cfd1266fc4ae89504053801722859a426f567fca00ed76f4c295c2a3a968e93f0036d9b792cf97561e9baa82c09ea23999cfd473227eb
-EBUILD luasocket-3.0_rc1_p20200328-r102.ebuild 1829 BLAKE2B a05a297f6fe9bdb8e4ec0a08b443c721626339fc22f9cca14b271aa30773ea5605018da75719c903260a0a8407ea10bc1e15bdb97211c6207545bdaa0d595b51 SHA512 dfe60d5b4ead58b3b5523da92b25cc2050e0624aa532d10fed58219ef900f45f3c11c4425534e20f9da00a7d8346bd2d740cf45b60d9f6c9e05a7446f5f959d5
-EBUILD luasocket-3.0_rc1_p20200328-r103.ebuild 1726 BLAKE2B 8a11b01eeade6275f5f92ddc54664d5ca8a3c7a654e83aa54efe5aa3cffced57d1c13d72210f645f190572bb5ae4273ecd65913926d8e0d905887652301f370c SHA512 cb646e6e62a6621caa91e7af970e737abb597cd7169af468ea1a988db69c7f2235349fceb0fda89f9ce32454fd572db931f5c9b94b007be49c3c2f231d24cb43
+EBUILD luasocket-3.0_rc1_p20200328-r103.ebuild 1719 BLAKE2B 18d04f607f605218e58163e96b6eaf0592039957173ea5724c8c763b5b8130838cfe4ed80da51ca9e7d1e2abfb7562cc5257a565e71398bf0311002880d5e074 SHA512 bb1c8925541bdaa0008c75e7f8c9b0d2d58148e944e308eecf82b27e659931aa0a6e2c0649a7093a0cef07e3fd75d83e1b0b8a2984e245a84b3223a82ff48cc2
 MISC metadata.xml 603 BLAKE2B 594c4454fadefcc94e1697d28300a12ccd373f365543fab2cdc3b9a90a6fd4d614b13705026a2a9956aaeab78e88ca10ef608e96c968b20825340503e5675537 SHA512 03612e81cc1d8e9279a16270d5eb391917798fca0148616e2e99aa2994f109d34ac657a89d0d3cfd853af372d7fdc14703f97c1cbc5ca7f8a63f07f0eee93259
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild
deleted file mode 100644
index 5b124acb9064..000000000000
--- a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="5b18e475f38fcf28429b1cc4b17baee3b9793a62"
-LUA_COMPAT=( lua5-{1..4} luajit )
-MY_P="${PN}-${EGIT_COMMIT}"
-
-inherit flag-o-matic 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
-"
-SRC_URI="https://github.com/diegonehab/${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/."
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-O2 -ggdb3//g' -i src/makefile || die
-
-	# Workaround for 32-bit systems
-	append-cflags -fno-stack-protector
-
-	lua_copy_sources
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LD=$(tc-getCC)"
-		"LDFLAGS_linux=-O -fpic -shared -o"
-		"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/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
index 6011ad7d5976..58fe8d5c2285 100644
--- a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
+++ b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 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"