gentoo Easter resync : 12.04.2020

6 files changed, 50 insertions, 61 deletions

diff --git a/dev-python/contextlib2/Manifest b/dev-python/contextlib2/Manifest
index 1a23747fa35c..3f69ded4296b 100644
--- a/dev-python/contextlib2/Manifest
+++ b/dev-python/contextlib2/Manifest
@@ -1,7 +1,5 @@
-DIST contextlib2-0.5.4.tar.gz 28523 BLAKE2B ada08a83e968f58caba5851b0f6ea0eedf8242d5e4b0d4e9c036ed0576c4ce8300669fd09d4ab3b019d8d49bdb79dfcdd03668d5af8519119013c931f037daa8 SHA512 c8bb5bf9dbbf5bfd882663813f2a456d82215be7ace55aed1d5047ce7f21f26d5518982ec26344b1e950d3aea27cd8a5c48627730bb28f8b3cfb6a331fd7ba66
-DIST contextlib2-0.5.5.tar.gz 28755 BLAKE2B 4fa16a0591c5e2138123b4f6d539bae8993bf826bc92b9ba08d335efd142b5e20c53e0d4e3cf5d7ac5d8b43cff45a19e170a7d97a9300fe385fa53d042cbfa38 SHA512 d5c97ff8eef7d8b14da0bfdc3515f8019bcc05e24cb922ce08ca2366d5182b029d873bbf172e9e6791297df05e24f6faf40868550063dcdb54f451b14c9e505d
+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.5.4.ebuild 636 BLAKE2B 6bb7a505f6a7eeee6119909d3de9483d565a3ef4b14da3f6f19cfd71b5635859e522a4fcbacd252825d72a8f86a114d8bfaf3c63837c15d56e492f45267da55c SHA512 f2e5d45688e91f1b1731d1b03a3f7fb1c520165f8fdc32f6fb2d860e91a28ad05e9f617d9f4140954b68b99cc703f2c14d0d370be9be39142751ae0f064fd1fb
-EBUILD contextlib2-0.5.5.ebuild 680 BLAKE2B dc7c5f14a2bb36da63f45735b70000d79c6218caf9fd30fea5e1f459e1235af028c3081d09da5ad30449a02fb104eb2313367b78526897c1f66fb43d6be572d4 SHA512 da1cf7d417736e9db61f64fb3f5f2cad86fa9f8c7a778d1357b8cb40dc27154e232fdea01855fd92e45d8103a04f62f1e950773514bd34fd6ed7628e180b83dc
-EBUILD contextlib2-0.6.0.ebuild 913 BLAKE2B b8dcac943cce16bec9c304dc51bcfa7da0d0618e3e7624c98043cf4bc9e3e3a525d4374805aa14223897058397cdb0a8d622cd1699eb317543b27fa3a4022292 SHA512 ae072dc7e0fc31de7b24d3e649ad1bba7db146a7e85ab9afc9b1c84ba74076bfeffb647191644aed6d70798a28efcd9280b4c3d5952319c81c0b2b4c65b25c6c
-MISC metadata.xml 324 BLAKE2B cfd3b05583ab0f14acf1057ac34124525ffd63c1855689ac19fb10fa9f998f477d1c070226c9e5798dd68c8629b2564e2112d24f38306a0f3958526179c4caf5 SHA512 616fe24d7cf8c1e1c52add7d9a8fc15d6e41cf20c116e73997b1e3a732110f6305e5ec50de9a4be75d58c588f55da30980bbdcbd65078c05a6da0dccd89cb36d
+EBUILD contextlib2-0.6.0.ebuild 904 BLAKE2B 8892a9c9943f53514887a01fe45e7fd2eb9e96ddcbe0d112ad5c617af024b07f366eb1170b1d1d7621451b10eea4ba3f9b182557a64142edf912293437e7c7b0 SHA512 beeb3bb8c4ae1f1efca1446ab18c0fc2e3d6742de193374bfabe384cdf0a47e738c5b0e42306600f8052c0109a573f638a4ce188f8d47d8963540933d7e5943b
+EBUILD contextlib2-0.6.0_p1.ebuild 981 BLAKE2B 54baf88921eb7f8b74ad1397ff65248fb8211a3e8599915d41e218d6aaf85f3abe7a3dd891183a22033bea17660001b2975ddb3e714648eb8765a4e3b87c61cf SHA512 c2a152d077aa656b48a460acd4c97c87590927e5c3200aec7af6396950cdea1b8cd6c871e3c466291395a31caf78816f35a527a234dd5dfa48f9426382e805f1
+MISC metadata.xml 349 BLAKE2B 199f23d7a13fb54ab53398cdd83d16a2db50767df6ac02c09adde49fc93df406e3be3762840a897088f54481317d4f800c472636c66620ad806d8f04285c1192 SHA512 d7f0e31697124f884401636805e03f4de0f8fdbe2885d64f37880a534574a4c60fd4f96ba6b1286aa28995071422e1199d59ae487296a1261708f2054a06c269
diff --git a/dev-python/contextlib2/contextlib2-0.5.4.ebuild b/dev-python/contextlib2/contextlib2-0.5.4.ebuild
deleted file mode 100644
index f5f089951b95..000000000000
--- a/dev-python/contextlib2/contextlib2-0.5.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-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="amd64 ~arm64 ~hppa ~sparc x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )
-"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	"${PYTHON}" test_contextlib2.py || die "Tests fail for ${EPYTHON}"
-}
diff --git a/dev-python/contextlib2/contextlib2-0.5.5.ebuild b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
deleted file mode 100644
index 5e3fddf02fb3..000000000000
--- a/dev-python/contextlib2/contextlib2-0.5.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7} 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? ( dev-python/unittest2[${PYTHON_USEDEP}] )
-"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	"${PYTHON}" test_contextlib2.py || die "Tests fail for ${EPYTHON}"
-}
diff --git a/dev-python/contextlib2/contextlib2-0.6.0.ebuild b/dev-python/contextlib2/contextlib2-0.6.0.ebuild
index 3f0e0face25f..fa8613af4c2f 100644
--- a/dev-python/contextlib2/contextlib2-0.6.0.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.6.0.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/contextlib2/contextlib2-0.6.0_p1.ebuild b/dev-python/contextlib2/contextlib2-0.6.0_p1.ebuild
new file mode 100644
index 000000000000..114a17add9f9
--- /dev/null
+++ b/dev-python/contextlib2/contextlib2-0.6.0_p1.ebuild
@@ -0,0 +1,44 @@
+# 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
+
+MY_P="${PN}-${PV/_p/.post}"
+DESCRIPTION="Backports and enhancements for the contextlib module"
+HOMEPAGE="https://pypi.org/project/contextlib2/"
+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"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( $(python_gen_cond_dep '
+			dev-python/unittest2[${PYTHON_USEDEP}]
+			' python2_7 pypy3
+		)
+	)
+"
+
+S="${WORKDIR}"/${MY_P}
+
+RESTRICT="!test? ( test )"
+
+DOCS=( NEWS.rst README.rst )
+
+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/metadata.xml b/dev-python/contextlib2/metadata.xml
index 834a2b7e152e..9327abec758b 100644
--- a/dev-python/contextlib2/metadata.xml
+++ b/dev-python/contextlib2/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">contextlib2</remote-id>
   </upstream>