gentoo resync : 29.01.2021

4 files changed, 3 insertions, 74 deletions

diff --git a/dev-lua/say/Manifest b/dev-lua/say/Manifest
index 5b9a631bc506..6a3a4b51351f 100644
--- a/dev-lua/say/Manifest
+++ b/dev-lua/say/Manifest
@@ -1,5 +1,3 @@
 DIST say-1.3_p1.tar.gz 3667 BLAKE2B bd99687a71129c5038749b0a2ea48411a411cf05559793cc0c4802a5b7aa620fbf4fd15ed9ab661b33c7b9f94468aaf9e292d177aca4d1c7cd29009601d015f0 SHA512 8d4a360bf0731c2a70c23edb9e6e81cab1e7d9b861aa35103a5c6e521633410860d76c46dc2ea62a06ac8ab3b522bc71c11143d6fe7e26e7fa24dd3f5ea1e5f6
-EBUILD say-1.3_p1-r1.ebuild 887 BLAKE2B 4657c5a3f5297703c44844d9182bc5547debb804a7a396c578922ded64da590852f88afbceb669a38eabe7b144ea975b026dd87c8f05d4e0d75f62317915424b SHA512 391dced871507f9295f3ed665101d88b8f114950724fe2f80d5cd04700b628d06fffa9324e0fb5b5d21590342cb361a5ad5be3673a92f37afc0d93fa3651d919
-EBUILD say-1.3_p1-r101.ebuild 899 BLAKE2B 261cd20f01cf361b633ad173ede70056da681372eff359f25d25bf013977b3a626b3dcc5b61e961b276881b8f1eee13d61bcc752bf4f38adcf578343717d22a3 SHA512 a137ce27fb4c01dbdf93ed1ddc9ce62cffd0a5e7c7c718e2bc3c05bcb25ce1bb08efdd0c4c7c5d66d838c07800b085efd86fe1d8d527dfb45de4ce5911cfbe75
-EBUILD say-1.3_p1.ebuild 662 BLAKE2B 1a37fa0b7df12661bf1c46560f114cfd02ddbd7b10e927d92dbda902ef8c8749c703f01d226b577b360383e1e4e32d4fd6cec38d9dede3e346475adcc93f1fe0 SHA512 37e8abc4018eee12be258abb9ad0d6663b77526d1ffb35e647da09e202b5eb6232f7a1006bc08914d683a33dd7a09f9a674d1a0d6323a0cb276faeaa25f6307d
+EBUILD say-1.3_p1-r101.ebuild 893 BLAKE2B 4f016c02e8417b0f198db1907ec8a77499220529e69f991ad23b3b42dec8b724a6ed221a604a9a4594f43e6b20d0c70ec882fd75073787c182b172f03ac20990 SHA512 2be86768c7c91f4416ae458e7857d6a5aa35e1392fb96f76b71ed104e187ce3332aa81a57998017ea8a0734e1bea071b4cf22f282f18c64b227a55a9c6a15217
 MISC metadata.xml 440 BLAKE2B 436e12385108634e35113c2cfa87d1fc7702e577f3da3242e575ba2c4d64c076ebd05e96e628db472c59957db600c244a14d72537c3728a83cb3125547c789be SHA512 15db0d85172a05831440854135278061e1240e287e36c367ba98cab7f98505450db8d770dbb7612a21a3468f079328bc074102d067e1c5f5f86e18b8d6794392
diff --git a/dev-lua/say/say-1.3_p1-r1.ebuild b/dev-lua/say/say-1.3_p1-r1.ebuild
deleted file mode 100644
index b73175d9b818..000000000000
--- a/dev-lua/say/say-1.3_p1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MY_PV=1.3-1
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lua String Hashing/Indexing Library"
-HOMEPAGE="http://olivinelabs.com/busted/"
-SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 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 )"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-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 src/init.lua
-	einstalldocs
-}
diff --git a/dev-lua/say/say-1.3_p1-r101.ebuild b/dev-lua/say/say-1.3_p1-r101.ebuild
index 422d9926960f..2d9756fef117 100644
--- a/dev-lua/say/say-1.3_p1-r101.ebuild
+++ b/dev-lua/say/say-1.3_p1-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
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 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/say/say-1.3_p1.ebuild b/dev-lua/say/say-1.3_p1.ebuild
deleted file mode 100644
index 243583660466..000000000000
--- a/dev-lua/say/say-1.3_p1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_PV=1.3-1
-
-inherit toolchain-funcs
-
-DESCRIPTION="Lua String Hashing/Indexing Library"
-HOMEPAGE="http://olivinelabs.com/busted/"
-SRC_URI="https://github.com/Olivine-Labs/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-lang/lua-5.1:0="
-DEPEND="${COMMON_DEPEND}
-virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_install() {
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN}
-doins src/init.lua
-dodoc CONTRIBUTING.md README.md
-}