gentoo resync : 29.01.2021

3 files changed, 3 insertions, 49 deletions

diff --git a/dev-lua/luassert/Manifest b/dev-lua/luassert/Manifest
index 131a89f4d9f6..be257fa88d8e 100644
--- a/dev-lua/luassert/Manifest
+++ b/dev-lua/luassert/Manifest
@@ -1,5 +1,4 @@
 AUX luassert-1.8.0-disable-highlightcolor-test.patch 2931 BLAKE2B dcf614b08aa0e89404d18e9bdc77ac5b723d577b8f5694f7fded74275c8ace59e938ddd2ad46b19a9ba7d8a36886d36db384d6fb439a2cccee77cf370e711060 SHA512 0bf9b3877e78183d5db3d33acb977f64e1aa7934f313838ffb5ec9b759283b21f071c619020ca4b8ec8aa36d9ea4e8082e3510d59d800fbd82fef74e0d8b9895
 DIST luassert-1.8.0.tar.gz 38874 BLAKE2B ebc4aab1de5dc830d0b9266726ca6bf361e03000f3a8acd27c04805a6c963373755c8e163b187714f64178acc5d755c05493d745b55c785e3254dd41aa4bef31 SHA512 18b296fececa6b0d5950b2a20c4d30da3bbf9b0932c568bbb8ca212b5c82a1047b73c52ee72b4505a41a393d41dd21321189367e038dd029152d177e11bafc93
-EBUILD luassert-1.8.0-r101.ebuild 967 BLAKE2B 58fd29809bfd194ef2eb6356786761e5bd8d582df168a47918c299a95dbdd93df16107b441e1d0cba42ca3a0efb9f5e4f9fd46f7cca97df34fdf8484b01dd727 SHA512 c2e701ed993dca17e79a2cac7a902230e7895b4503e7169a3a3ad9469d38b00a894334a34459b908c3d1ea28cee200c76b683fd1c23dc895ee3ef4078dd65a9d
-EBUILD luassert-1.8.0.ebuild 961 BLAKE2B 5bffb37793777f1980c802436c20de2248ac864d5848103ea46ab570ae2d88063592564af5b4a0c2e931c9b809d25a5a02d9c104271abcfa4995a91db5d584c1 SHA512 a21ac3ce2ebdd2e497eb29a370ce513ecccab92453d570807ef7a8e2f55a6771c661b080e777428b9bc4f1c753712941eb95242493a453c138b31f336a4db154
+EBUILD luassert-1.8.0-r101.ebuild 961 BLAKE2B 665a4e5694872ca41c486155a383fb1ff168c39ba4ec6f1b81a4f63f194d4dd783727729a45d50412152ee7b95af5c50656614d8489822ead801e49a84a1ab59 SHA512 36d28270964034de772032ad8e836a2582ddde0a7912e4c545a01e1e951650a7f0ac04a28100e95329a865dc141d2a6e24ef494c1a634b56d5eec0c1dcb6ac26
 MISC metadata.xml 598 BLAKE2B 44f0ff617e32241bc72db4da50d83f321cae964924c7dd6c12c46b356158d0ca4a99f228042b2c51e7bdbc0e4573b45cdc15814e5cf73e8a4e4fda450df58ab7 SHA512 d5d5330dba6b543ca5ec99235444ead2c736c2319689513767a27cc654837bb645ab60365e2dd96f9e7ffbd3dbc9c4b3ff5029ad59655bf88bec1f7faa50f80a
diff --git a/dev-lua/luassert/luassert-1.8.0-r101.ebuild b/dev-lua/luassert/luassert-1.8.0-r101.ebuild
index 3237001fdadc..6012657e591e 100644
--- a/dev-lua/luassert/luassert-1.8.0-r101.ebuild
+++ b/dev-lua/luassert/luassert-1.8.0-r101.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/luassert/luassert-1.8.0.ebuild b/dev-lua/luassert/luassert-1.8.0.ebuild
deleted file mode 100644
index 5bb7cb40bbf8..000000000000
--- a/dev-lua/luassert/luassert-1.8.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lua Assertions Extension"
-HOMEPAGE="http://olivinelabs.com/busted/"
-SRC_URI="https://github.com/Olivine-Labs/luassert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="luajit test"
-RESTRICT="test" # Requires same version to be installed or busted will fail.
-
-RDEPEND="
-	>=dev-lua/say-1.3_p1[luajit(-)=]
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-	luajit? ( dev-lang/luajit:2 )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-lua/busted
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-src_test() {
-	busted -o gtest || die
-}
-
-src_install() {
-	local instdir
-	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"/${PN}
-	insinto "${instdir#${EPREFIX}}"
-	doins -r src/*
-	local -a DOCS=( CONTRIBUTING.md LICENSE README.md )
-	einstalldocs
-}