gentoo resync : 23.09.2020

4 files changed, 2 insertions, 85 deletions

diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index a246087a2da3..984377f310b9 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,7 +1,3 @@
-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-3.1.0.tar.gz 14808 BLAKE2B fb5524c2619e51c5f8c1b85fa819d1001e6296df6c9d5320c6ab3ec88fa5c932c139161e621d51b2827ef40402bb2492b8b08e470b7333e847495ec690024879 SHA512 bb8dea71eccc4f3b18fc816dae700582c3feb72f346e115bb2d1adc336f121304a285e4d5dad48d15b386b9e137c6e1d1793ef50d22b6bd697812a661817684e
-EBUILD zipp-1.0.0.ebuild 1166 BLAKE2B 33ba317190548130b06eb6d48362d7a67e743a6db7b90d62b861bc21e318173745fd1fc356486e900b8f6f12b04f6aca1d7f18146bc8f41805d1a1635899f2ca SHA512 559eb7f50f497c306b566e12c2667280581beaf76342825d82f6f0be6000aab5d2bed9eb93fd2d9f7884f10e4a36be427ff5e14bf27b6f323314c5f85832464f
-EBUILD zipp-2.0.1.ebuild 905 BLAKE2B 70547e97cae1c2a97c517ecd3b7001977e4ccad27f1d8710a9a00b1d9e1bb8cb216c4a3901dad9d2e026310bdc021d63785c842671fe96037277a91ca661b28a SHA512 51e57c1be1277f944feb93d280b50e0e0e85c634cefc332a8817175cf32cce0c63a2dc7c72b8acdbc2a9e53e621c96b9195654c3e68c459a8b338ef846cb6c93
-EBUILD zipp-3.1.0.ebuild 1134 BLAKE2B fcfe0536584396dba9b06f478732b7733e4cbcc42d4de96cae9db60efc99f73beabdc9624c961f5ffc8f8c0badb6db015526e9e4e69523be77fa7c7fe462ac00 SHA512 fa173589fe538ea30eb7944b30a42010f8321506210fafd60232a5b62f8de783c87cfc9eec639fc93b3f3884221125e4a6921d76054abca2eafa2c083d273411
+EBUILD zipp-3.1.0.ebuild 994 BLAKE2B 893c10ffb899eb435f108a4cab3f575b1ac78b66bbcf039ac8527d7de17a0130593686ba2972870bc4f8329889ab2c29182e01e8c4c757668778da507f1a4333 SHA512 6a803a1a570f7fd5af147bab5190f851a7347385706346ea08153aa143e57c01131f16c6ce330317049e60a80c53380e66bcb08b32af24830945d87f2a46c646
 MISC metadata.xml 547 BLAKE2B 18466508bbc1bd39ebac74f8ae583b1f58e7444f96171132ba3521f302d179417cec21f34ea55d95b94a5ce8242ef77cbab5805f844d84de809c58f5a48b5bd4 SHA512 693f379106d242cb63a5bc2e04133d0619f168b964e9e4cfd5dbbacfb06b6d4e732d9304b2029afe28e800020ac771f5b38a0963477976cc5bc049359ef7b6b8
diff --git a/dev-python/zipp/zipp-1.0.0.ebuild b/dev-python/zipp/zipp-1.0.0.ebuild
deleted file mode 100644
index 7b3294151af0..000000000000
--- a/dev-python/zipp/zipp-1.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6..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 s390 sparc x86"
-IUSE="test"
-
-RDEPEND="dev-python/more-itertools[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/contextlib2[${PYTHON_USEDEP}]
-			dev-python/pathlib2[${PYTHON_USEDEP}]
-			dev-python/unittest2[${PYTHON_USEDEP}]
-		' pypy{,3} python{2_7,3_{5,6,7}})
-	)
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
-	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
-		setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/zipp/zipp-2.0.1.ebuild b/dev-python/zipp/zipp-2.0.1.ebuild
deleted file mode 100644
index ffa8b87599a9..000000000000
--- a/dev-python/zipp/zipp-2.0.1.ebuild
+++ /dev/null
@@ -1,33 +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="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-
-RDEPEND="dev-python/more-itertools[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-3.4.2[${PYTHON_USEDEP}]
-	test? (	${RDEPEND} )
-"
-
-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.1.0.ebuild b/dev-python/zipp/zipp-3.1.0.ebuild
index 736fe71888a3..2de7bedc518e 100644
--- a/dev-python/zipp/zipp-3.1.0.ebuild
+++ b/dev-python/zipp/zipp-3.1.0.ebuild
@@ -4,8 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( pypy3 python3_{6..9} )
-# [options.entry_points] is present in setup.cfg but it is empty
-DISTUTILS_USE_SETUPTOOLS=manual
 
 inherit distutils-r1
 
@@ -15,11 +13,10 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv 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}] )