gentoo resync : 25.08.2020

4 files changed, 2 insertions, 65 deletions

diff --git a/dev-python/lz4/Manifest b/dev-python/lz4/Manifest
index bb5a8315efa9..09d005e42939 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -1,9 +1,5 @@
 AUX lz4-3.0.2-test-fail-skip.patch 680 BLAKE2B bd222f948084901cabb7e09e525707d0bf5182de216e8705a362fd7b9abdf376e3ea1daf3457fee96bb377e93b16a33bd163b9aee93011824147efc81c7f8b9a SHA512 77651611e228b103bf68f643c67ee7505b293e17d3b29f47e4a385dea334c441e77a7494cf1f72dc8a4713e89ad37ffac465fc36fa2ee0c044f1f47c355ffe07
 AUX test.py 269 BLAKE2B d0b9ff664ca4a954cb8ebf227a1b1c80f1eff8a9bacaf1cebf2f359a6a14dfa3d2f418820d3917a9107c66f4a8aaaa380cf749a9faf2cafb5265364a1955830d SHA512 7968adb54b414a8dc1ba9b3b8ba4f11695564239786cd37474122ce83f8976920206fec2b846eefcacdd307da6c9f6ac73ead87c78dfefab746540021f44964c
-DIST lz4-0.8.2.tar.gz 30818 BLAKE2B ec51d733ebd33fcb00d3d3b634d11be39d92b14741a595139e23b5b067955a43ca325a0a655233a5ae3a62e18a1cf70cc21787d443703fc1a56ab7a765d5e2f4 SHA512 e516d5c3309f214fa422b040a0aacdda079395624dd4f5548ed7af637b1594012aac75b309cef260b41c10a623410f815fc089b54ca5d80955d5f2ead12841b1
-DIST lz4-2.1.6.tar.gz 129066 BLAKE2B 1a739c54946150441ddd4025b4ce8bf79a718d64a714ca5cfeaf8712c73fa88c47e1823a08ec7ad50acd31cba5bc10292f4c9e0905d8b5965b789944dd6eca9f SHA512 e37f9576f182adab263d8248e846c9f7d8a0260b2d2c5f94d74ebf3c2e51d91ba07d4bb0bf8a7560981a930fd380a2a3f5c4d21f4de5be3ae066d44a2246e9b5
 DIST lz4-3.0.2.tar.gz 152443 BLAKE2B 3bf452b5b5ee65caed13b21fd7c39f32ccdea18e6d900facf74e3271868299a2da258b2b0058efaea12a3b42006f0ad0d17004692c95be951c173fee1a1162be SHA512 c31116ee3cd70241b19bff6c59d1852d4c26ad5f0c9a56cd2ecec58e8c2751773162c7ac6a2d887e8cf537bc869ed8866929164f976849efa3ea041eacc4535a
-EBUILD lz4-0.8.2.ebuild 819 BLAKE2B 468e9437f0b7a337e990e5fccc1087ba475767c82f7000940e8b01ce46a4644fd620c392e48cb358ad5bddf03c38933cf88f9c2337b8a9e548be561da4a119a3 SHA512 d7680bebe19102c0933f9723bc5a906aba6f8dcfdf98d313422804d9ef4bdd3840d765dad8f0edd1ffe4ed23f590920a9cec1045c85ab967e4e4ec5828c88ef4
-EBUILD lz4-2.1.6.ebuild 555 BLAKE2B 54679ccbd1c32044f5e2cda84f8d637d6c67106e873821120c77100f969123d706888de95ca90f3a7df2a4e8e3bf5c6651cf7b4ae8d149fddff1f64835e2dd17 SHA512 4f2286c51a425cdc5df1f5e11dd842d0984c6ed83dc3f679ce44fbd496ea9fe4e46ba43023d867ad0753365a0ddcb26fe241312cad9ddc2e8b5b9e0bbfacbd96
-EBUILD lz4-3.0.2.ebuild 770 BLAKE2B 3e67f9f3c77e2c6db67ce630c9f16703dd2102f0f52af6bd432381d6fa5c23cae9d3360268e1b2a4eb967722b69b708c07686fa2316ff8eabdcadd579b6ce202 SHA512 db662b6f827e7d3570c34fb5c232eab6a3e10c32c62d3f04b924942d3a76450e1fbccab143cf58b38d28eacdafd093b8370da9f9d89bb2bc6d68b5b9a5c27249
+EBUILD lz4-3.0.2.ebuild 766 BLAKE2B 2bc7a58f0258bdcdb1bb333fc9c885f595f2b02b5ec382924c4da8f8137944ef44c848bae7525cacc22010c4974a169017c57082cd75b5a75c8d45b045a09fc1 SHA512 a631b522af0864fc55e1405ea21c6313e39533984b1c25409a946d294f070472dd3fe974412605d77db99f229cefd32ce8d9ef1af17e8214a3fb3187215d7b73
 MISC metadata.xml 465 BLAKE2B 3eeb9b063e836d19b4ebfed81a89895f9d4e650b1788ca602f77f4cf3b5ad94cd6af93788293b9656baac1bce29a90a957c8d4afd02ee25b2aae42aefe211a37 SHA512 e5f75916075710426f9a7b875aaeb1239b948f11ac97a8d8bc45032d99985d6659916cd3c126bd37fb0fa53c97cca5b4eeeb4228180633809edc01af3b89ad91
diff --git a/dev-python/lz4/lz4-0.8.2.ebuild b/dev-python/lz4/lz4-0.8.2.ebuild
deleted file mode 100644
index 7803badb5b7c..000000000000
--- a/dev-python/lz4/lz4-0.8.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="LZ4 Bindings for Python"
-HOMEPAGE="https://pypi.org/project/lz4/ https://github.com/steeve/python-lz4"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	sed \
-		-e '/nose/s:setup_requires:test_requires:g' \
-		-i setup.py || die
-	mkdir "${S}"/tests
-	cp "${FILESDIR}"/test.py "${S}"/tests
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test || dies "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/lz4/lz4-2.1.6.ebuild b/dev-python/lz4/lz4-2.1.6.ebuild
deleted file mode 100644
index f46f16e05ed9..000000000000
--- a/dev-python/lz4/lz4-2.1.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="LZ4 Bindings for Python"
-HOMEPAGE="https://pypi.org/project/lz4/ https://github.com/python-lz4/python-lz4"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="app-arch/lz4"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/lz4/lz4-3.0.2.ebuild b/dev-python/lz4/lz4-3.0.2.ebuild
index f46bebe41b22..f766f1f58c75 100644
--- a/dev-python/lz4/lz4-3.0.2.ebuild
+++ b/dev-python/lz4/lz4-3.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-arch/lz4"
 DEPEND="