gentoo resync : 28.04.2021

3 files changed, 2 insertions, 44 deletions

diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index e9c73a54cd82..ea4242da5013 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,5 +1,3 @@
-DIST zipp-3.4.0.tar.gz 15638 BLAKE2B c06f68b9a23e6ba560cf7b703150e4b14d8bbeb5c8712c54257f587de9a44eb853804495eaecff2ad17261304da9b9433951cbb9b17e3f35446406e4e4fe517d SHA512 c791e72f05a92110037cbee7153103e47ec536994d9e86cdecb34c602839c0bf5e6e4ab4ce56d6a44c7eb4f7a555ba531df8c986e302654c624f59e2217bf10f
 DIST zipp-3.4.1.tar.gz 16545 BLAKE2B 5ebdc4d1e932d72502866701db8b0f352aca3194890d9ed340722bb2a65c4e3be0f6bb54f49567e4fd46faaec3379d0c1d668e1a55f63bea6c57e4ef0c2f9e01 SHA512 2ba50109efd0ceea9eb1d57e2d839f522b5a78a8dae344d6da54b79305dd46bff23f1116f562127290152c0b100369439c17fe9dc3fb14d0b42beaa48348ebe6
-EBUILD zipp-3.4.0.ebuild 1209 BLAKE2B 4c7e797fef899adc3074882090ee22e339326d8bc6babf051c16a9dd5e68c4040bf837e4a128f06b509be4e5158210f75f7b96dfebb51eece37412981de6220d SHA512 a11718125971b1bd154d72752af5e06f8dc1e93d448b2e40e92f1dedf01519c9f0f7b6b05f033df8214ac5e801d947d71643f07fc785c794e10262da52babfa3
-EBUILD zipp-3.4.1.ebuild 1218 BLAKE2B 5f210408eb2ec409cfb8cccc6160048747fac96d9175bbea97a62a863b167c84687cd0f372eb0dddd5ed3cae5f0bc87237282c84bd67aab203a29da49a970888 SHA512 d273267cdd7188b0303400f4c5535832613e57772a22a514723b5ae47e7889bbc79550eed39182b12855439cda9cbbf5232aeaf09a091cdb29c476bd33341f79
+EBUILD zipp-3.4.1.ebuild 1210 BLAKE2B 60859480d0c584f58e2702661a7818884af69dfa9c306e22459813e92a3f0007114f2e2912eaab09a2f9a2394e75a0dd11a63a7cc915f2d1b203a7681f40f8fa SHA512 efa2f7ffce10d270ec05396bc4d7ab2e01b836c2114266e3193bf0e42312302930cdb90bcf52350f9bad2a27b464435070190d32f9b19c86e338f458954b81f4
 MISC metadata.xml 547 BLAKE2B 18466508bbc1bd39ebac74f8ae583b1f58e7444f96171132ba3521f302d179417cec21f34ea55d95b94a5ce8242ef77cbab5805f844d84de809c58f5a48b5bd4 SHA512 693f379106d242cb63a5bc2e04133d0619f168b964e9e4cfd5dbbacfb06b6d4e732d9304b2029afe28e800020ac771f5b38a0963477976cc5bc049359ef7b6b8
diff --git a/dev-python/zipp/zipp-3.4.0.ebuild b/dev-python/zipp/zipp-3.4.0.ebuild
deleted file mode 100644
index e6c69b7468f4..000000000000
--- a/dev-python/zipp/zipp-3.4.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-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="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	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
-
-python_prepare_all() {
-	# Skip a potentially flaky performance test
-	sed -i -e '/^import func_timeout\|^ *@func_timeout\.func_set_timeout/d' \
-		-e 's/test_implied_dirs_performance/_&/' test_zipp.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Ignoring zipp.py from ${S} avoids ImportPathMismatchError with Python < 3.8
-	# by ensuring only zipp from ${BUILD_DIR} is loaded
-	pytest --ignore zipp.py -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/zipp/zipp-3.4.1.ebuild b/dev-python/zipp/zipp-3.4.1.ebuild
index b486e084b541..e7eae1e79a92 100644
--- a/dev-python/zipp/zipp-3.4.1.ebuild
+++ b/dev-python/zipp/zipp-3.4.1.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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]