gentoo resync : 29.01.2021

4 files changed, 3 insertions, 123 deletions

diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
index 063b499e8c28..ac6318dd78d3 100644
--- a/dev-lua/mpack/Manifest
+++ b/dev-lua/mpack/Manifest
@@ -1,6 +1,3 @@
-DIST mpack-1.0.4.tar.gz 46382 BLAKE2B 5092830e1a970ad96686ede4d96833a210543418cb23f218ba774bfd724267344f9e44e367490bb33dae8023e1145202ea6e457be7753a426eae990df906547d SHA512 8e40a562faf8b62137dec0733cbb9006fa7054e5a47bdd128fb4dfd676fac4e4385a23c3d908a4ce2edd65d673db25916695fa74bc08c5316b0c80e571a7442c
 DIST mpack-1.0.8.tar.gz 15616 BLAKE2B 06593296d1d36459127bf35eaeb37c894a0c0c6ccff0969cd0a82bee1920a715801db26f0ba0bc54a56399d07efc262666ee4ce79878288a5c0221fd27febea1 SHA512 6d21cc6bbdee583a1d808742991459e4b1796f347b2f4eaa747b576f5bb1ca989123339120e43246bac859c20e6f46ac57116ce9f135157256fecbd8cf817f75
-EBUILD mpack-1.0.4.ebuild 1059 BLAKE2B 5263060e57633db082186e660d2fcdc16c0066a6a19c8ce87d7ce0db81fbb0ee20d4efd2975d955cca1ac097bff2aaf8c39555031d0d91481fa33a40243f3386 SHA512 1b94169795a9154cc152269af3aa56f5aadd4a50362284aec09524ecbeacb13298d91ff4fc716c9867cc6a590d02ad1debaac7bda042fc03a466fa5d2f1c7549
-EBUILD mpack-1.0.8-r1.ebuild 1647 BLAKE2B a6c7f72ec35b5da574823bb14129f8695170630545cf9f66bd66e714236d7f3758a260f60788524188c01dfecbbb544f924941ea84e2424aab9a9b337b8866a0 SHA512 fa5305fd83c17b7d20040a363afff06a2b58243b8cd8e4c0f299086ef594159539fb9c355f41e171446c37ae60294d56003644369be828d822d5ac300e4d6c7e
-EBUILD mpack-1.0.8-r100.ebuild 1776 BLAKE2B d9d38dfc62cde85a87e7865e52ceff66762b4878e2a8e9d363d73162f4881e274652f99b86fd5ec7b2e72d6a2d6698e88a2a09268af958a607236d357f493947 SHA512 689bad3022e350a3e2de2132ead2bb2d139ae3a492cffb68353f139b855d1cdc1540b8bd684173b35ec40db8e8e1772dfbb93f6967643169fe622f6e88aa98e9
+EBUILD mpack-1.0.8-r100.ebuild 1774 BLAKE2B 04e4e3be618daa59a679b4e9cb70970e4e0236c14aafa21ce3ca89bc3fa95d7995f2069c021b28cf44080a723054789dd6395a7d62a99da28c685ecc47fbe8d2 SHA512 608da9dfded1fae07c21a5a66b4186a5406d48e2b91b34c959a24b2631168610f57637dc988135faea7442a3acc0e0bbc325743d17210caa7c1b36d8cbeabf3f
 MISC metadata.xml 336 BLAKE2B d2eb682d5c161942105aea7b4d1801cb98478b9c19876563ea921cf0cedaaf04a02cf756c8a5f595d52e710436e6f73e2dfe3acc10a4c9cd080415f4e1bb305a SHA512 a1ab89e3b9f01ff9112240a0a9ac945ed7391e98f5dfd4bd1ea518e0f228ae09109cd8f39fc29b36fe6ecc252dca7e0819693ce35be564421684de705dc8a4a1
diff --git a/dev-lua/mpack/mpack-1.0.4.ebuild b/dev-lua/mpack/mpack-1.0.4.ebuild
deleted file mode 100644
index 0ad6a94afedf..000000000000
--- a/dev-lua/mpack/mpack-1.0.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lua bindings for libmpack"
-HOMEPAGE="https://github.com/libmpack/libmpack/"
-SRC_URI="https://github.com/libmpack/libmpack/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/libmpack-${PV}/binding/lua"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-	luajit? ( dev-lang/luajit:2= )"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-lua/busted )"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		USE_SYSTEM_LUA=yes \
-		LUA_INCLUDE="$($(tc-getPKG_CONFIG) --cflags $(usex luajit 'luajit' 'lua'))" \
-		LUA_LIB="$($(tc-getPKG_CONFIG) --libs $(usex luajit 'luajit' 'lua'))"
-}
-
-src_test() {
-	busted -o gtest test.lua || die
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		USE_SYSTEM_LUA=yes \
-		LUA_CMOD_INSTALLDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" \
-		install
-}
diff --git a/dev-lua/mpack/mpack-1.0.8-r1.ebuild b/dev-lua/mpack/mpack-1.0.8-r1.ebuild
deleted file mode 100644
index 6a4b3afa624e..000000000000
--- a/dev-lua/mpack/mpack-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PN="lib${PN}-lua"
-
-DESCRIPTION="Lua bindings for libmpack"
-HOMEPAGE="https://github.com/libmpack/libmpack/"
-SRC_URI="https://github.com/${MY_PN/-lua/}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libmpack
-	luajit? ( dev-lang/luajit:2= )
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-lua/busted
-		${RDEPEND}
-	)
-"
-
-src_compile() {
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LUA_INCLUDE=$($(tc-getPKG_CONFIG) --cflags $(usex luajit 'luajit' 'lua'))"
-		"LUA_LIB=$($(tc-getPKG_CONFIG) --libs $(usex luajit 'luajit' 'lua'))"
-		"USE_SYSTEM_MPACK=yes"
-		"USE_SYSTEM_LUA=yes"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_test() {
-	if use luajit; then
-		# "[  FAILED  ] test.lua @ 279: mpack should not leak memory"
-		# It doesn't seem upstream actually support LuaJIT so were this up to me
-		# I would drop it from LUA_COMPAT, unfortunately there are packages in the
-		# tree which currently expect it to be supported.
-		ewarn "Not running tests under ${ELUA} because they are known to fail"
-		return
-	else
-		busted --lua=lua test.lua || die
-	fi
-}
-
-src_install() {
-	local myemakeargs=(
-		"DESTDIR=${ED}"
-		"LUA_CMOD_INSTALLDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
-		"USE_SYSTEM_MPACK=yes"
-		"USE_SYSTEM_LUA=yes"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	einstalldocs
-}
diff --git a/dev-lua/mpack/mpack-1.0.8-r100.ebuild b/dev-lua/mpack/mpack-1.0.8-r100.ebuild
index d9777b4051fb..e64d78d190ef 100644
--- a/dev-lua/mpack/mpack-1.0.8-r100.ebuild
+++ b/dev-lua/mpack/mpack-1.0.8-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"