gentoo resync : 17.02.2020

3 files changed, 34 insertions, 49 deletions

diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 31f485d99602..acc7feb561d0 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,9 +1,9 @@
-DIST zipp-0.6.0.tar.gz 10778 BLAKE2B 165ae85f51fe0c0232f6cf2dde70e2d7f8064413c15616d15e1ebd65cfe3c345bbd5b1b9713fa1171cad18015b605862509790bedd734edf5a7d8c80c5378af3 SHA512 18bef5aa3388ab3901bf08888127fc9cc17d8972a52f23ccf9a8035f09ee5598e17ddff833a10b81b2118461e0c517e88413518736763425a728cd0b19cc2052
 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.1.0.tar.gz 13758 BLAKE2B 1e1c0e0a7d6b7116c12c8f2af8ba9e807d203920450e1673fc0137ba4f47390ae5fd9c677876b582ed2c91cf33677913ada5fedf20f7c8cdd48c38646d3a4afd SHA512 24829aea6f76bf277e2bef9f039f253d5f7cae5830ca7fb0ad9140ba48ad02bb5848b0f5eccb5e72c5282da1f8e18083b98868aea2ca4f7a41d478a03d012235
-EBUILD zipp-0.6.0.ebuild 1196 BLAKE2B f4c446a07369d5d45f2b0563f070ed38cbf353bb66ed7453ea0931d9cb6e9fd77499dba623b869076e8b02de164b72a0bd207ec0238215bee77a751c73446427 SHA512 9f6570677e31aaf885bc458d44c8b9f6e2a67066fa5f284e5ed3681ef566d9caaf94064ba31563e1c881196960d47ef8a67da010180150a7a85adfdc14b4ba35
+DIST zipp-2.2.0.tar.gz 13850 BLAKE2B 22596eb8428358c70c2ef233a30121c89f327b38941b9b688bf99de4eef1d5748eb6184c5b954cd70d192ee6987966ca487785bdd93e18a0e42d914ae7c96c84 SHA512 33e715d65df93cd9343a663f93e3cb5d120d4bb5ca2cdcabd78e6c19199554351618b685f7b2146f722a4924a9681f94ca129fbb2df37fb0f44358da507828cb
 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.1.0.ebuild 882 BLAKE2B 2a288ef0353fde3a521cd370a3ae0fd9ee613c606d9d9be249dd0386824d465f7166c182e23f1be2967649d381c628c35721d1507989d7274b4318aa916c79d3 SHA512 ed4650c30a0f1a685c8bb7674f62757f67202462a9567ea5cea72969b68e2b659182e0764ce969abbee0da37904ed09f6ab09f31ead7153138bfc09f000ff42a
+EBUILD zipp-2.2.0.ebuild 882 BLAKE2B 2a288ef0353fde3a521cd370a3ae0fd9ee613c606d9d9be249dd0386824d465f7166c182e23f1be2967649d381c628c35721d1507989d7274b4318aa916c79d3 SHA512 ed4650c30a0f1a685c8bb7674f62757f67202462a9567ea5cea72969b68e2b659182e0764ce969abbee0da37904ed09f6ab09f31ead7153138bfc09f000ff42a
 MISC metadata.xml 523 BLAKE2B b2c729977d84466557f0fae273e5463a41fded78780842e4a92899cc79ad8cf2843fe9c397a70f1d7cab8a7ca317a6723b119047323e0be8862b7294afe96b33 SHA512 82b88eb00bb385c47ebf5c5cd560de25e4f865086983fd9a5767b7fb286406dd06273e8a596df31aba57baaf051b7c353f50f445753541de5b15e6a439132381
diff --git a/dev-python/zipp/zipp-0.6.0.ebuild b/dev-python/zipp/zipp-0.6.0.ebuild
deleted file mode 100644
index b936b98c8168..000000000000
--- a/dev-python/zipp/zipp-0.6.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-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="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/more-itertools[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/contextlib2[${PYTHON_USEDEP}]
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	pytest -vv || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/zipp/zipp-2.2.0.ebuild b/dev-python/zipp/zipp-2.2.0.ebuild
new file mode 100644
index 000000000000..e49c6c90fb83
--- /dev/null
+++ b/dev-python/zipp/zipp-2.2.0.ebuild
@@ -0,0 +1,32 @@
+# 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