gentoo resync : 15.12.2019

5 files changed, 3 insertions, 164 deletions

diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
index 3510df615d4c..6a7a11923b6e 100644
--- a/dev-lua/luarocks/Manifest
+++ b/dev-lua/luarocks/Manifest
@@ -1,9 +1,3 @@
-DIST luarocks-2.0.12.tar.gz 89028 BLAKE2B 66d06696483f6550421acb8e6834b082f06c5bc0088f730b0316db72725ce5c5ebaf0956a7c84f18b03beafaa6e7c558387025ba9ac701c8b8f7f64fa5557e11 SHA512 5ece403d7bc7804ff47ec8d0ecdea7687d530d10ddf0a800c4a2a68b69a263e68f40ab7e55e39a59ab05315d3e2bc9cf76a0618803dc8e12c7e52941b4a7053f
-DIST luarocks-2.0.7.1.tar.gz 81757 BLAKE2B 2b279fd1302e56eaaa5e5b32f4be37cb1fe21ed5b495aae4014903a5f5e87f198e05f8c2a59fba900ff15f26ec76587b5b8114f6bdf3cdf81d5e59795ffbf792 SHA512 00f37c2baed83bbc7182a4595973bbe5c252fd7f530ebc35ba254fab727c1e6a7f743bafc25bfbde945e40d531f0e764c1f785edddef62fc6219e318bffdc6f3
-DIST luarocks-2.0.8.tar.gz 82313 BLAKE2B e27071c1ef6cf9b4182d8100d76c93e86c606b4ccc62be8e883cdfe7e39de900bef100f1e1a9274cfcae58218768b58a1d1189a0a15696091909b77a83a9ed5f SHA512 8246b3a863197bc5bd9efad343f8f5ba22d7a34904fd3afe99f916631ee30930ec91d15298e67abf22f0bcc6cda02785a5bbc9e60b424a631162e20941d20523
 DIST luarocks-2.2.0.tar.gz 111549 BLAKE2B 214c1c03e03f95ca1acfc1fda863895c91c508221c615fe3ccc064e9adbcaa8549d24ff788141c0093259ca52578fadccfb3f6891209f86336c57937ac5ec32d SHA512 41f32e383263485758e64df661ecfbd744369035362755c64466f2c52a8740ed941b80cab3212222d7d24e4b1a7ed9ccb84fa66c8e458526056af0b06d97224f
-EBUILD luarocks-2.0.12.ebuild 1258 BLAKE2B cfdc27b254c6873f41b5b5e09feff8aaffa7640828f4895cd3f2d34323dbf2261cba5d79af4eed43b374aca42a1cc58d8ef82acc609b40fb3882a8db9ce0ff66 SHA512 18aa15e628d8f34cbc8ff39fcd4e07dcd9a30f30f9f45391b7f7078bce9de5c48209d9759524e5ea778a07fe8ef7767190e650b20206af0eeb02c42b0ca5aefb
-EBUILD luarocks-2.0.7.1.ebuild 1201 BLAKE2B 0bb500272ec732b57aad10633f41b116abb432931bc523d3ae5c18da4352665400102afb89aadbc8b8dbb25456344667eb04007539a134fec6a1acddffe773d5 SHA512 2f3206fc1d808f27f00b02b9c1f968993b02189d2d6fd8b0bc88a91d9be1aece467ac309b817c10934cd9af6fbec63c5e1ce7d5f2953ede9fc12ff2246244ac0
-EBUILD luarocks-2.0.8.ebuild 1273 BLAKE2B 72e9514e632d2e058a61ae734e900735d7352d13678c4825e55f03a98087d5fa4c9030813f59654ffc26b871b19e1a7e2cf0596914c9b905addd8722c1b2c236 SHA512 fea2d4c75dd55fe5ac05540fa3fc4ec8d036979f02ce93fa0d26c0b96182ff291489713e6088deb8b6daadf2e23941727b422910ed7ed6a513472367c4fe77d5
-EBUILD luarocks-2.2.0.ebuild 1259 BLAKE2B 4f9ef26696091ffd0601df4f834d20227a092e7be255f2c9b9a659da1f343a2b8863c561272fa6b97234f8ff74b17e563388d826e35039ab1573644623a96020 SHA512 a91f1039f43aab50f23eea40d13270bb804981af82b4e2649d3b7c8d206924fa0f5c4e9bce71dfaabd57ce524e07481e4c38acffae72f633a9ad25e700ca24bb
+EBUILD luarocks-2.2.0.ebuild 1220 BLAKE2B 0ca8c9c627287a0f8e6da220ad362a7f8b812d78c2b757459001a14cbad6b3b0b2ecd2625be3be316e39aa4be7a860d76c9b220048ca1b0dfb20acc9a39c2f22 SHA512 88849c9c84375a188fb6c94d1d09519f0f695ea1284c7247ea69d7faca042aea16a7d7cc776db9c90e1d8ae24f6fa8905924e32917b3cc49f9b6eadae922588f
 MISC metadata.xml 490 BLAKE2B d382db4c716bec8c5a8bda5441241069bc92fa8e772ca64d815d16caad6a73754cad42e6d97d6df9247e342eaf597ce07b5cf21fb8ae69b8910f7d95d57856cf SHA512 48050b50c81716c3d43daab16338f22bf05bdfd3b3eff2eeb69b0081527a802b982d9006955039b66ca5cc8cbb057d59c579c922a31abc152bff74b398384021
diff --git a/dev-lua/luarocks/luarocks-2.0.12.ebuild b/dev-lua/luarocks/luarocks-2.0.12.ebuild
deleted file mode 100644
index d1b114274466..000000000000
--- a/dev-lua/luarocks/luarocks-2.0.12.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 || die "make failed"
-}
-
-src_install() {
-	# -j1 b/c otherwise it fails to find src/bin/luarocks
-	emake DESTDIR="${D}" -j1 install || die "einstall"
-}
-
-pkg_preinst() {
-	find "${D}" -type f | xargs sed -i -e "s:${D}::g" || die "sed failed"
-}
diff --git a/dev-lua/luarocks/luarocks-2.0.7.1.ebuild b/dev-lua/luarocks/luarocks-2.0.7.1.ebuild
deleted file mode 100644
index 85009d19c02c..000000000000
--- a/dev-lua/luarocks/luarocks-2.0.7.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 \
-			--force-config || die "configure failed"
-}
-
-src_compile() {
-	emake DESTDIR="${D}" || die "make failed"
-}
-
-src_install() {
-	# -j1 b/c otherwise it fails with to find src/bin/luarocks
-	emake DESTDIR="${D}" -j1 install || die "einstall"
-}
-
-pkg_preinst() {
-	find "${D}" -type f | xargs sed -i -e "s:${D}::g" || die "sed failed"
-}
diff --git a/dev-lua/luarocks/luarocks-2.0.8.ebuild b/dev-lua/luarocks/luarocks-2.0.8.ebuild
deleted file mode 100644
index a4e71ae1e79b..000000000000
--- a/dev-lua/luarocks/luarocks-2.0.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 \
-			--force-config || die "configure failed"
-}
-
-src_compile() {
-	# -j1 b/c make tries to delete files it has yet to create (bug #402005)
-	emake DESTDIR="${D}" -j1 || die "make failed"
-}
-
-src_install() {
-	# -j1 b/c otherwise it fails to find src/bin/luarocks
-	emake DESTDIR="${D}" -j1 install || die "einstall"
-}
-
-pkg_preinst() {
-	find "${D}" -type f | xargs sed -i -e "s:${D}::g" || die "sed failed"
-}
diff --git a/dev-lua/luarocks/luarocks-2.2.0.ebuild b/dev-lua/luarocks/luarocks-2.2.0.ebuild
index a64514f182e2..5a450c989c0d 100644
--- a/dev-lua/luarocks/luarocks-2.2.0.ebuild
+++ b/dev-lua/luarocks/luarocks-2.2.0.ebuild
@@ -39,12 +39,12 @@ src_configure() {
 
 src_compile() {
 	# -j1 b/c make tries to delete files it has yet to create (bug #402005)
-	emake DESTDIR="${D}" -j1 || die "make failed"
+	emake DESTDIR="${D}" -j1
 }
 
 src_install() {
 	# -j1 b/c otherwise it fails to find src/bin/luarocks
-	emake DESTDIR="${D}" -j1 install || die "einstall"
+	emake DESTDIR="${D}" -j1 install
 }
 
 pkg_preinst() {