gentoo resync : 16.09.2020

5 files changed, 3 insertions, 101 deletions

diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
index 5d299a878c85..377b6593b586 100644
--- a/dev-lua/luarocks/Manifest
+++ b/dev-lua/luarocks/Manifest
@@ -1,7 +1,3 @@
-DIST luarocks-2.2.0.tar.gz 111549 BLAKE2B 214c1c03e03f95ca1acfc1fda863895c91c508221c615fe3ccc064e9adbcaa8549d24ff788141c0093259ca52578fadccfb3f6891209f86336c57937ac5ec32d SHA512 41f32e383263485758e64df661ecfbd744369035362755c64466f2c52a8740ed941b80cab3212222d7d24e4b1a7ed9ccb84fa66c8e458526056af0b06d97224f
-DIST luarocks-3.2.1.tar.gz 232149 BLAKE2B f8298ef054f50b8f70bf48748435a54f683ba8eef3113641e98b00e1aa872b95e75b36f0df96de7870d3576d3b9149dde8af1b68a3d7ceda86d3654dbad507c0 SHA512 9abf2c5477b9ab8e3caf485dd10fc154435b41efc13c7709f36a9182ccbd98d022738627f76901977a9b7c42ae61e5f139e78070d469094a7571910afbb747ff
 DIST luarocks-3.3.1.tar.gz 241636 BLAKE2B fd34d7a233bbf1c5f224bd04886a7f1382d63ffc014c8b78ae7924fb799d66a32e048298deed103686771263885c85c9173c013d1bbb3bad6a48e9fd99fdaac0 SHA512 0a695ceb30ae575cbca52abd2aad9675e33a234c53c5d1e125442d874c21e0e3cf6157431f07085e4311f81833680366adfe5c626a66cb5880380b48899a116a
-EBUILD luarocks-2.2.0.ebuild 1220 BLAKE2B 0ca8c9c627287a0f8e6da220ad362a7f8b812d78c2b757459001a14cbad6b3b0b2ecd2625be3be316e39aa4be7a860d76c9b220048ca1b0dfb20acc9a39c2f22 SHA512 88849c9c84375a188fb6c94d1d09519f0f695ea1284c7247ea69d7faca042aea16a7d7cc776db9c90e1d8ae24f6fa8905924e32917b3cc49f9b6eadae922588f
-EBUILD luarocks-3.2.1.ebuild 898 BLAKE2B cc809c35dcddfd9e7b8a684f8ead406129f1a5ed989352f916c71e2ce14fd81fde69dd1d292eea657d128848f5bf521846e6122d8313551e0a845bb47066571e SHA512 2cbe3f8f7736b94053b53dc59a3db6fc18742ac8f3d472f58ede37b67eb7475958e01f0612db5b3b68d0370dce13029c4be20679d7c1b8c2e4bda9a762bccb9c
-EBUILD luarocks-3.3.1.ebuild 898 BLAKE2B cc809c35dcddfd9e7b8a684f8ead406129f1a5ed989352f916c71e2ce14fd81fde69dd1d292eea657d128848f5bf521846e6122d8313551e0a845bb47066571e SHA512 2cbe3f8f7736b94053b53dc59a3db6fc18742ac8f3d472f58ede37b67eb7475958e01f0612db5b3b68d0370dce13029c4be20679d7c1b8c2e4bda9a762bccb9c
-MISC metadata.xml 863 BLAKE2B 6ae628676393509ea3ea05922a4296a2df5ecd22ab21028cb83dfa8aa78c3d461fa2058c01b5c27e35a1069c913e64fcc478f27d826ef0692bcdcb3775470436 SHA512 c8b868cd8e23dd41c772da7f5f80fbde1bc309153ffc2772dc1483c8b50bb4a4b1db320df8cd27c63843a38a37273464fa0de9724eaee9def09a2347cde1de85
+EBUILD luarocks-3.3.1.ebuild 896 BLAKE2B cbaa03508dbb342ffbe968324c70dc4ecf6b4d2fd066056fab35298cd82b4b35a1fcfde8a5fed332c5e405d902f362c442c23e3253913bdcd2dc1f83a812c84c SHA512 c5755a63fa1ccadef34163b130613dff03194a59021193268c0212ed15d6da7c5ebe041ab5667380f59afa5b3f9aedd3443d885f21ed5d4ae64e9f88a7e51a6c
+MISC metadata.xml 613 BLAKE2B cc10d869cc70c325d22bb6bb9717a86a80d4d29b9340bf18057ab92759c4f96e06d4c114749e73c97c6d61404c7d50c2a054cf10d9a4f5e289ebfc5c3df073bf SHA512 3701e2b1691444a8f709573104f3e70524bd631e0f4ee233b141ad1e2763578bc511140118acebc9ccbf0b540769de56174f97267de67571a4ad12b864e6edb3
diff --git a/dev-lua/luarocks/luarocks-2.2.0.ebuild b/dev-lua/luarocks/luarocks-2.2.0.ebuild
deleted file mode 100644
index 5a450c989c0d..000000000000
--- a/dev-lua/luarocks/luarocks-2.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib
-
-DESCRIPTION="A deployment and management system for Lua modules"
-HOMEPAGE="http://www.luarocks.org"
-SRC_URI="http://luarocks.org/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="curl openssl"
-
-DEPEND="dev-lang/lua
-		curl? ( net-misc/curl )
-		openssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}
-		app-arch/unzip"
-
-src_configure() {
-	USE_MD5="md5sum"
-	USE_FETCH="wget"
-	use openssl && USE_MD5="openssl"
-	use curl && USE_FETCH="curl"
-
-	# econf doesn't work b/c it passes variables the custom configure can't
-	# handle
-	./configure \
-			--prefix=/usr \
-			--with-lua-lib=/usr/$(get_libdir) \
-			--rocks-tree=/usr/$(get_libdir)/lua/luarocks \
-			--with-downloader=$USE_FETCH \
-			--with-md5-checker=$USE_MD5 \
-			|| die "configure failed"
-}
-
-src_compile() {
-	# -j1 b/c make tries to delete files it has yet to create (bug #402005)
-	emake DESTDIR="${D}" -j1
-}
-
-src_install() {
-	# -j1 b/c otherwise it fails to find src/bin/luarocks
-	emake DESTDIR="${D}" -j1 install
-}
-
-pkg_preinst() {
-	find "${D}" -type f | xargs sed -i -e "s:${D}::g" || die "sed failed"
-}
diff --git a/dev-lua/luarocks/luarocks-3.2.1.ebuild b/dev-lua/luarocks/luarocks-3.2.1.ebuild
deleted file mode 100644
index 7607520b4826..000000000000
--- a/dev-lua/luarocks/luarocks-3.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A deployment and management system for Lua modules"
-HOMEPAGE="http://www.luarocks.org"
-SRC_URI="http://luarocks.org/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="libressl"
-
-DEPEND="dev-lang/lua:="
-RDEPEND="${DEPEND}
-	net-misc/curl
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:0 )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	# econf doesn't work b/c it passes variables the custom configure can't
-	# handle
-	./configure \
-			--prefix="${EPRIFIX}/usr" \
-			--with-lua-lib="${EPRIFIX}/usr/$(get_libdir)" \
-			--rocks-tree="${EPRIFIX}/usr/$(get_libdir)/lua/luarocks" \
-			|| die "configure failed"
-}
-
-src_install() {
-	default
-	{ find "${D}" -type f -exec sed -i -e "s:${D}::g" {} \;; } || die "sed failed"
-}
diff --git a/dev-lua/luarocks/luarocks-3.3.1.ebuild b/dev-lua/luarocks/luarocks-3.3.1.ebuild
index 7607520b4826..59de0b8da8e0 100644
--- a/dev-lua/luarocks/luarocks-3.3.1.ebuild
+++ b/dev-lua/luarocks/luarocks-3.3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://luarocks.org/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="libressl"
 
 DEPEND="dev-lang/lua:="
diff --git a/dev-lua/luarocks/metadata.xml b/dev-lua/luarocks/metadata.xml
index da075190f828..da7ced9078f6 100644
--- a/dev-lua/luarocks/metadata.xml
+++ b/dev-lua/luarocks/metadata.xml
@@ -9,12 +9,6 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<use>
-		<flag name="curl">Uses <pkg>net-misc/curl</pkg> for fetching lua
-			packages instead of <pkg>net-misc/wget</pkg>.</flag>
-		<flag name="openssl">Uses <pkg>dev-libs/openssl</pkg> for verifying lua
-			packages instead of md5sum.</flag>
-	</use>
 	<longdescription lang="en">
 		Package manager for Lua.