gentoo Easter resync : 12.04.2020

6 files changed, 9 insertions, 42 deletions

diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index c89ef97ae957..165b19b3bb65 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,9 +1,7 @@
 DIST zipp-1.0.0.tar.gz 10821 BLAKE2B f5e0476cb0ca01054abc0c56f1a9581a6f537c002791c4a363238555ce9a211fe13114041374c1bfef426544545e3c654e5b0a7e0541c30b775757c43df6d756 SHA512 dbfadfedd30ca4cb31ac4163f367134d96e57405ef00d5f4c19c0af7a141f78487dec29a0ba94975584fcb462d22c8b536bf29c67b7e298368072e897b0e9d82
 DIST zipp-2.0.1.tar.gz 12790 BLAKE2B 107079d2cbe73c4d0d7053696181d99636192374eac4598a8f2007b8197c007e90ef39a56d193052d484b36247d73d5712d878ea35d222895e5b3ff21963ba13 SHA512 ac49f0c0aa83398ad0892932b1f067df94e2108691338c80400235053834bcbcb1a58b2b7b5807f398088a09e9d1cb591d94153a2a44ef3ef96506271d817e05
-DIST zipp-2.2.0.tar.gz 13850 BLAKE2B 22596eb8428358c70c2ef233a30121c89f327b38941b9b688bf99de4eef1d5748eb6184c5b954cd70d192ee6987966ca487785bdd93e18a0e42d914ae7c96c84 SHA512 33e715d65df93cd9343a663f93e3cb5d120d4bb5ca2cdcabd78e6c19199554351618b685f7b2146f722a4924a9681f94ca129fbb2df37fb0f44358da507828cb
-DIST zipp-3.0.0.tar.gz 14501 BLAKE2B c0dc7534a3b1dd59e9f275e2dda95119061b26b0426964b7f01ef6721db108255e2ca9734097380e87d19449284d9335405357650f0a69edb87dff1e2223bbe2 SHA512 16ea46ee456416333ab4d25ae0d6099fa30eb93ad9a3485504ac3448c8669dc6020e0ec19830b8204af8ba6851e8336827d238c87cc389e4f2b40345c2877ff2
-EBUILD zipp-1.0.0.ebuild 1174 BLAKE2B 205255bae18e580668df8b3846b0afa55b335354539395dfa82fae4280c369b4262dba4b41c473a3f062f2dff7ff320b7684ad9416f8a844ad7469961975509e SHA512 a56049b22f5f50283fe43688f05702b95bfd54de25d2e2fdf5c076e28a4dfa65d057c52ee99a685f39af9ae0ae8e3b3f15173030f8f06e82b42deebee8ccbc72
-EBUILD zipp-2.0.1.ebuild 913 BLAKE2B edda049af7d5ab070af46d8462496fd14d8ac4168bfd43c3b0a1f804d45370acb97248c84ea66a412554354321b522b8b47f03e37fc7eeb637b9fc23ab9dd72f SHA512 abfe9bf84a3e07145769ebb30fe35d9229daba3783a4eef482f89c5bf3dfd5e1e2d39761f841f4587495af796e6af4c01c4b31c82a48a79dbcb3e2efe471af13
-EBUILD zipp-2.2.0.ebuild 882 BLAKE2B 2a288ef0353fde3a521cd370a3ae0fd9ee613c606d9d9be249dd0386824d465f7166c182e23f1be2967649d381c628c35721d1507989d7274b4318aa916c79d3 SHA512 ed4650c30a0f1a685c8bb7674f62757f67202462a9567ea5cea72969b68e2b659182e0764ce969abbee0da37904ed09f6ab09f31ead7153138bfc09f000ff42a
-EBUILD zipp-3.0.0.ebuild 1123 BLAKE2B 9e5f68482d8f8335baab33a92f585081c2331f1d7a9f8fd18f11fab0e11c8434c760e505292108cfa4e943feebd5107e3b82da26b34af25044cd82aaf324005c SHA512 b7fcb7dacdd58e061ff66596c2abc10edbb2257fbc518cac0fe0b4bbd388d59ee1392ef25cbdad0e1fbe3a3a9f0c1d170a0aa28ee6854d1ce6990a2192c61697
-MISC metadata.xml 523 BLAKE2B b2c729977d84466557f0fae273e5463a41fded78780842e4a92899cc79ad8cf2843fe9c397a70f1d7cab8a7ca317a6723b119047323e0be8862b7294afe96b33 SHA512 82b88eb00bb385c47ebf5c5cd560de25e4f865086983fd9a5767b7fb286406dd06273e8a596df31aba57baaf051b7c353f50f445753541de5b15e6a439132381
+DIST zipp-3.1.0.tar.gz 14808 BLAKE2B fb5524c2619e51c5f8c1b85fa819d1001e6296df6c9d5320c6ab3ec88fa5c932c139161e621d51b2827ef40402bb2492b8b08e470b7333e847495ec690024879 SHA512 bb8dea71eccc4f3b18fc816dae700582c3feb72f346e115bb2d1adc336f121304a285e4d5dad48d15b386b9e137c6e1d1793ef50d22b6bd697812a661817684e
+EBUILD zipp-1.0.0.ebuild 1175 BLAKE2B 8db2f85a33a6054e92c8be22bf33a93ce6ac39d175734576e19a7891ac26f26a0cb08be4b07ac6652b0dfd0296f001c8a4d983a1d74851eae837a2d5189ded93 SHA512 6ac6030b7846260c5fc5adc16cb1ec601fe765110db1ff01e81cf57301b5077049c114663fd0ffd835cc688b766d2d6247b620444ced35d1412df303e555a5fc
+EBUILD zipp-2.0.1.ebuild 906 BLAKE2B 1432497efa32346125169801f84c5e44a61cd01d9f1633bec0a78377453410c9982ffbc5465b075f5e75ea07a17fcb85e15cc7c3f95774fd2556c1fc4f3a2f90 SHA512 6cc2e713a7d1a3c3d10f30eb19ddaff8301b826e758f5743d06c04d415d13f0438b989f92155310ea795dd11da5c61cd50b7f2ca5e9c9b1596a3a8f40d0a2a1d
+EBUILD zipp-3.1.0.ebuild 1135 BLAKE2B a6a8c88d490ce43ae7f088dbf9adce267774e6da9d0aa78a6a1b356795408e7243aafd76675d05c16d4bb123963802f0deb946da2fa6391d9de650a253f17da8 SHA512 00a18225927bdf26ee9dfcd41510f520a8915b38ee12d9b32b34ed6b8841c42c7c7ca47436eec18894006751a52259f9ba5917f43c9072ad0785fe50e303b7b4
+MISC metadata.xml 547 BLAKE2B 18466508bbc1bd39ebac74f8ae583b1f58e7444f96171132ba3521f302d179417cec21f34ea55d95b94a5ce8242ef77cbab5805f844d84de809c58f5a48b5bd4 SHA512 693f379106d242cb63a5bc2e04133d0619f168b964e9e4cfd5dbbacfb06b6d4e732d9304b2029afe28e800020ac771f5b38a0963477976cc5bc049359ef7b6b8
diff --git a/dev-python/zipp/metadata.xml b/dev-python/zipp/metadata.xml
index a0ceea39a38e..b8f93196db5e 100644
--- a/dev-python/zipp/metadata.xml
+++ b/dev-python/zipp/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">zipp</remote-id>
 		<remote-id type="github">jaraco/zipp</remote-id>
diff --git a/dev-python/zipp/zipp-1.0.0.ebuild b/dev-python/zipp/zipp-1.0.0.ebuild
index 5f9bd554565e..c84afd3ef586 100644
--- a/dev-python/zipp/zipp-1.0.0.ebuild
+++ b/dev-python/zipp/zipp-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 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"
 
 RDEPEND="dev-python/more-itertools[${PYTHON_USEDEP}]"
diff --git a/dev-python/zipp/zipp-2.0.1.ebuild b/dev-python/zipp/zipp-2.0.1.ebuild
index 49ed0fc97eee..91052cdf13a2 100644
--- a/dev-python/zipp/zipp-2.0.1.ebuild
+++ b/dev-python/zipp/zipp-2.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 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"
 
 RDEPEND="dev-python/more-itertools[${PYTHON_USEDEP}]"
diff --git a/dev-python/zipp/zipp-2.2.0.ebuild b/dev-python/zipp/zipp-2.2.0.ebuild
deleted file mode 100644
index e49c6c90fb83..000000000000
--- a/dev-python/zipp/zipp-2.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-# [options.entry_points] is present in setup.cfg but it is empty
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="https://github.com/jaraco/zipp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-3.4.2[${PYTHON_USEDEP}]
-	test? (	dev-python/jaraco-itertools[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-
-distutils_enable_tests pytest
diff --git a/dev-python/zipp/zipp-3.0.0.ebuild b/dev-python/zipp/zipp-3.1.0.ebuild
index be47ab9ecb17..742ed8bf9cae 100644
--- a/dev-python/zipp/zipp-3.0.0.ebuild
+++ b/dev-python/zipp/zipp-3.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 
 BDEPEND="