gentoo resync : 14.05.2020

3 files changed, 2 insertions, 35 deletions

diff --git a/dev-python/feedgenerator/Manifest b/dev-python/feedgenerator/Manifest
index 33a924de8525..0b8d2fa21572 100644
--- a/dev-python/feedgenerator/Manifest
+++ b/dev-python/feedgenerator/Manifest
@@ -1,5 +1,3 @@
 DIST feedgenerator-1.9.1.tar.gz 25677 BLAKE2B 0293b3b41f83ab2d0e289cc5ea4b6088217dfa64caedf2da888d99a9d6860c45169852f9249049b2ee0983c9cebcf289b9b107ae63f5f5f5e057d93bf71d8a78 SHA512 db3642acb8f0c9fd692f37a79cf5862e60687a1745afbc6593d37a0372adb994de603238a17a8eae95ffcc993195f63037f16122a3cf8771e6922dea492fb5d5
-DIST feedgenerator-1.9.tar.gz 4136224 BLAKE2B efb70a48a290fcbd959e4213ef2bb95138433a0b86ca000d7a498fed3705ef237690e81a6e2bfae0d050b2be89486f1c2d7d0038c1626dfbfa38842ddf5fc11d SHA512 77f4df51c6bdf261f0d1665206ab048a21f8660cf8f2c7abf3d71e17c63284240d0eaa690dd6d53b0b7d8ce9c9e0349094d5270c75c2a069608b7717538d7fa1
-EBUILD feedgenerator-1.9.1.ebuild 673 BLAKE2B 05d764d63bc8d8e49102ac0a0c9869ae261abcbfa6fdc30e7c913b77b0ac99f06c97f6245a1919ad71de3db0a9ac81fdb79bceb97a7084f1df44b34121fc9c75 SHA512 11fc9f185d9dabb4c6f8dfcd31fdc9220867fe0d137aa45e3a917c4c3a403a45483ce85a17e96f490dfb5433b04567a85f19832ab619e251870806ba698ecf76
-EBUILD feedgenerator-1.9.ebuild 728 BLAKE2B 179acbfc3b696dc53d43af0a7050bb174dbcf2e25cd8851a3ef6cba2313ee659d1eff4a9cb93e90cb3d0d9852e8aef65ad526170806714080e4b3898ae680b30 SHA512 2aabbd551107662ba978887e39412aae48b9e6ad9f3920caad476d9b0cd4b8d6d90b0962d011db91b39be6b37a2562e5de28c5c3ca8a487c1a1738afdc9d1013
+EBUILD feedgenerator-1.9.1.ebuild 671 BLAKE2B a07377c29c11a6da21ed114e591e1d67f2afe085f6c1acd1be75b8a3de88df76ed8eba66928f19b221cb27bbb6e111f732fb49e5c209db328843a3af53bf1bff SHA512 d4f93a59a5aaff4eae420d3002553f3273c3c04a3ae9217fc983796fbf5dd260f01aaffac922cc08f6c201802cc4df51f74afd19495d4bf23030aa255f975679
 MISC metadata.xml 452 BLAKE2B 418a1e8ead7966378946aa28e1978cd64b2a85890e3b380b808d064d37597d60205a6457d626968e1831256ef48a82325fec6b38ee5710a2e3841cf6b5f49437 SHA512 d37223c168450987a8f3d09a34636cbf08b6e95622ba23aad3a0d240ce179fde3f20d0645631cea16b147215b91c8132940d6376cbd3e6a435dd4ee00524b585
diff --git a/dev-python/feedgenerator/feedgenerator-1.9.1.ebuild b/dev-python/feedgenerator/feedgenerator-1.9.1.ebuild
index 68c667240d32..4691cca33957 100644
--- a/dev-python/feedgenerator/feedgenerator-1.9.1.ebuild
+++ b/dev-python/feedgenerator/feedgenerator-1.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/feedgenerator/feedgenerator-1.9.ebuild b/dev-python/feedgenerator/feedgenerator-1.9.ebuild
deleted file mode 100644
index 9675ba882ab7..000000000000
--- a/dev-python/feedgenerator/feedgenerator-1.9.ebuild
+++ /dev/null
@@ -1,31 +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,3_8} )
-inherit distutils-r1
-
-DESCRIPTION="Standalone version of django.utils.feedgenerator"
-HOMEPAGE="https://pypi.org/project/feedgenerator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/six[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-src_prepare() {
-	distutils-r1_src_prepare
-	# Allow pypy to read MANIFEST.in
-	ln -s tests_feedgenerator tests || die
-}
-
-python_test() {
-	"${PYTHON}" setup.py test
-}