gentoo resync : 25.08.2020

3 files changed, 2 insertions, 43 deletions

diff --git a/dev-python/contextlib2/Manifest b/dev-python/contextlib2/Manifest
index fb32839aa410..59a13694d8ac 100644
--- a/dev-python/contextlib2/Manifest
+++ b/dev-python/contextlib2/Manifest
@@ -1,5 +1,3 @@
 DIST contextlib2-0.6.0.post1.tar.gz 29670 BLAKE2B 927cbc674c2cb568e71bd110773bea6f848233928bb910e0db7114812b3359b9395e43c01be1645d44f3202f94c62bc21c4db883a155c64feb636a61865dd7d8 SHA512 bd3b458b365bc1d556476f6368bc523fde07e85afdad74037aa98d7a498008103a789f6b481b606700da92606ee6477fc5a817f1596e93a6e3c548ed0d4a5bf8
-DIST contextlib2-0.6.0.tar.gz 29607 BLAKE2B 674d0ed2cb71837ec8bed46b44790c31601347e315abb3ab666aac3a7754f07602bbc4f1591a8c905e02949ed9178fb6230f600ca35d244b83353286901510e2 SHA512 01901ac226c7fca40add00e95cedb2535a802e0114a53ae1315c6dfee20744dbafa7d9619986ad76345ad9b9aa3e364ac01d23f51b5eb70dd2febd5af1f1fc56
-EBUILD contextlib2-0.6.0.ebuild 904 BLAKE2B 8892a9c9943f53514887a01fe45e7fd2eb9e96ddcbe0d112ad5c617af024b07f366eb1170b1d1d7621451b10eea4ba3f9b182557a64142edf912293437e7c7b0 SHA512 beeb3bb8c4ae1f1efca1446ab18c0fc2e3d6742de193374bfabe384cdf0a47e738c5b0e42306600f8052c0109a573f638a4ce188f8d47d8963540933d7e5943b
-EBUILD contextlib2-0.6.0_p1.ebuild 942 BLAKE2B 5e77978e3eb4393ec87245598c69bd2f8ced6641ffb38e83a8abed9b8e5b297aed43a34ab4cb14dd88a78e32b64f3fb475816dd72dcf090c66b450695e3552ad SHA512 0b5fbc79ff37a02a729444ba020e2059fe30d6ff2fd5c0b35f571aa3b86514a3ebc229602c669658d9e6c4b74c756501119dcb998bc73763797786aacd73da25
+EBUILD contextlib2-0.6.0_p1.ebuild 933 BLAKE2B e7872a8464b2370d0a56adbe6106806ee8e2267cf049e706f692050a75d058d505bd94ff15eacfa607c77b9790dcb1a145ccab2534c5b515f14b412044e0f2b8 SHA512 20913a0d043bacf83575c20bd8950b94613bdd7b0a63b6f00c232ecc0e8dd91387f8633fcc70c4cdf8468bf2cb0cfaf9c5f1dc05a62c011b07d4489ef4c129d5
 MISC metadata.xml 349 BLAKE2B 199f23d7a13fb54ab53398cdd83d16a2db50767df6ac02c09adde49fc93df406e3be3762840a897088f54481317d4f800c472636c66620ad806d8f04285c1192 SHA512 d7f0e31697124f884401636805e03f4de0f8fdbe2885d64f37880a534574a4c60fd4f96ba6b1286aa28995071422e1199d59ae487296a1261708f2054a06c269
diff --git a/dev-python/contextlib2/contextlib2-0.6.0.ebuild b/dev-python/contextlib2/contextlib2-0.6.0.ebuild
deleted file mode 100644
index fa8613af4c2f..000000000000
--- a/dev-python/contextlib2/contextlib2-0.6.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backports and enhancements for the contextlib module"
-HOMEPAGE="https://pypi.org/project/contextlib2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2.4"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( $(python_gen_cond_dep '
-			dev-python/unittest2[${PYTHON_USEDEP}]
-			' python{2_7,3_{5,3,6,7}} pypy{,3}
-		)
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-python_prepare_all() {
-	sed -i -e 's:unittest.main():unittest.main(verbosity=2):' \
-		test_contextlib2.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" test_contextlib2.py || die "Tests fail for ${EPYTHON}"
-}
diff --git a/dev-python/contextlib2/contextlib2-0.6.0_p1.ebuild b/dev-python/contextlib2/contextlib2-0.6.0_p1.ebuild
index 341b0e956fa5..51060f9397b8 100644
--- a/dev-python/contextlib2/contextlib2-0.6.0_p1.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.6.0_p1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="PSF-2.4"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 DEPEND="