gentoo resync : 15.06.2021

3 files changed, 2 insertions, 90 deletions

diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
index 6003bbc8594d..ce948677e629 100644
--- a/dev-lua/luarocks/Manifest
+++ b/dev-lua/luarocks/Manifest
@@ -1,5 +1,3 @@
-DIST luarocks-3.5.0.tar.gz 244798 BLAKE2B 24ceead8953ad6d9eefbf471fd49e0bd82256cc00c201395770919a680873544db67f062a4af93ddd390985b0b74db55e37a95516287dfc1e077a25b67c9f264 SHA512 fda01b7149839adf7c0e1c05d0f1793e79575c5d378d96ee1e197828e9b9b6e89a635f8a26a5b71db5b48465ef74b219fac18ecdbd59962cbf9da613b05dd42a
 DIST luarocks-3.7.0.tar.gz 247576 BLAKE2B b1e119ec897bc8122441445dc215e628d2415dacba9b23c2b075f82a01e21e6e9a8eeab5a3345355d85c566ff9f85ab29194580674521d4d92725b01377ee940 SHA512 cc3c555c488da9f95a118eedb74cb9e2a38b572e172958843dabebce125524e58a13ac65e89a349deb8fef13b6de751074fc3adbb430ab55d4e4109288119153
-EBUILD luarocks-3.5.0.ebuild 2013 BLAKE2B c0be675936dc181cc80df388b2ab0814e213caf6486a83a9aea8c22b822101b6cc68fdf3cebaae8627d0e895d10df24ffd718647d3a566f51d5d2846af0a47a6 SHA512 cfea7775aed1412e20f515d1ade8b42e098d07a5b7ff082a040af847663098b2e3b037057cb8997ea3a0e30cf26349417ad92c9cef0ec861dd0fd85bd2437a5c
-EBUILD luarocks-3.7.0.ebuild 2036 BLAKE2B d3d44eb8b84ba3d521d979dfa0e1e94ff576ddc77c98bfd7b91d72fcb29dfefa5c9fae3c9426fa0468db36720143389a7d11988e74835800dc6ac943883f50f1 SHA512 c5447120d9be53d06e5f54e5db4a7d06656320f0fb7b03b1105c739b627c35106881ef3585384b27c3cf2e53a829101ea006665f5e55acb2801238e2ec1d314c
+EBUILD luarocks-3.7.0.ebuild 2032 BLAKE2B 1cc6d706561ce0e4d138183f266ca442b35c4ffe0a0cabb8e3d9248de063ebc05c42a9592ffa930e338c3a3eabfe94577db2283a88432d546266a1ddfd5527da SHA512 7e904f5cd9672c3de4bfe1ad1211a3a838b172bc7827b310cba6d496340e1a5d7125484b22ecd6c4baca3b288b0a83b432c1d41a519b2d35b35c1036360c1c1f
 MISC metadata.xml 500 BLAKE2B e02380c5f6e05e96affc13af252132aa35b824d785616854b4a55e5dfeb9724d5b689b1135b29c4a09513e2d4bbb1b0532ca763f02293bb1ffd3dfb384a9f392 SHA512 0b528851caa0a6a6df8ec334535f460189a7b71a24d9176a4adb165b30b520b3bce8d10aa00f187b687bd1cf7d36d2129cd74e1fda92be42832253420025978c
diff --git a/dev-lua/luarocks/luarocks-3.5.0.ebuild b/dev-lua/luarocks/luarocks-3.5.0.ebuild
deleted file mode 100644
index c76f49a19d3f..000000000000
--- a/dev-lua/luarocks/luarocks-3.5.0.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 )
-
-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 ~ppc ~ppc64 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/luarocks/luarocks-3.7.0.ebuild b/dev-lua/luarocks/luarocks-3.7.0.ebuild
index 98464029b8b7..7a4a3895e807 100644
--- a/dev-lua/luarocks/luarocks-3.7.0.ebuild
+++ b/dev-lua/luarocks/luarocks-3.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://luarocks.org/releases/${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}"
 RESTRICT="test"