gentoo resync : 15.12.2019

4 files changed, 48 insertions, 2 deletions

diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 8d6c51964c90..d3e942181c22 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,5 +1,6 @@
 DIST zipp-0.5.2.tar.gz 10875 BLAKE2B 97e56b8e1cbff2344ee6b385085e6c821d61bd2c2510ac54e50a3f706515f1e22789168c97599787787b47f09dabe55abb594f5724d1d540f62d8d68fc32e36f SHA512 8c84b620844315ab1f1aa3c5bb29dcdf1271a0139198b5c3d6aa31ecb9a86f0dcef963819403d971ae0461c737312c064572c57ecf32d73dc973a5f69cf0375c
 DIST zipp-0.6.0.tar.gz 10778 BLAKE2B 165ae85f51fe0c0232f6cf2dde70e2d7f8064413c15616d15e1ebd65cfe3c345bbd5b1b9713fa1171cad18015b605862509790bedd734edf5a7d8c80c5378af3 SHA512 18bef5aa3388ab3901bf08888127fc9cc17d8972a52f23ccf9a8035f09ee5598e17ddff833a10b81b2118461e0c517e88413518736763425a728cd0b19cc2052
-EBUILD zipp-0.5.2.ebuild 1107 BLAKE2B c79bf6753de8cfbfaf3ff0e54ced1763d5594915211d2cedb95f3d25c605399ba65f1ce25ea0b9d2816dd71e0ba31d802f978dc3ce12da67c4cb93df91b3db7a SHA512 addadf9afc87bdd8c52c0407e42a4821628170cb1b7b06284ad72f0cf53735f1e48e3460bd2d88550aa241a41735ce75cd4f42eceda0364b8c6cc0a8f1d2b2be
-EBUILD zipp-0.6.0.ebuild 1174 BLAKE2B 1f4c65171e70f0f563177cf3ff3e18be0c2ba0a358bfc4893c48509522ed9ab10996334cf7bfb9cd0484cf9fb702ac788aee150648d79639e8223bb4cc0e0592 SHA512 f5bb949a6868e70885d88ef7592c24fa04ac20de019d1dbba5c1e85f31940c7d2625d706e75d80aa8b503405f5c4db4f433cef5654f9a256609ddb0dd8482e5f
+EBUILD zipp-0.5.2.ebuild 1134 BLAKE2B 964f7b2a90f233924c1d63f6e9204f8b0623c2907edb7c89fdbe4a5f5125ed5e4d45f9d16a543030531e8904ee92ab4b472ea468a7a205a56a24491034e36804 SHA512 ab4bfbf28319ae5c5e84157face7fd4b57dc08ee03c7d2aebeb5165ad1ec6a262df7105b29f7ead0f50ff9b4832b44e75d7a6dd793971b4822a264c3c6d70923
+EBUILD zipp-0.6.0-r1.ebuild 1187 BLAKE2B e0d85bcff75982cca7c41400cff9ea42adaff522642d7855847fd0fa1a08c5a895edd4ba21a63c31cc6dcf15449b81802c120ebbfd1fb65aaa553600bb35a1a6 SHA512 c912761bbe28caab8b7479359afeab924ebe84b57d23d36f4ae145b2f0aecfa2fd3f29ca93365b6f777d07849f20c0351159698e9d351e8bae582c79b4b436a2
+EBUILD zipp-0.6.0.ebuild 1201 BLAKE2B b77ccd226506b7b79fdb160dff2ca7f20ff6185c89cdc4c6122ac91b64332f6da33d83ae348e0ef79147cb70859968fc643aa5955f274057b9e77ee0585e531b SHA512 ba9141f8046bbdc3486d1e0eb07299b5993b5c64885c9aab79dd873c1412850a67b5b82ae3eab708aa519dfa7b240a36b982ea53ca0aa56af23225a54c7193a2
 MISC metadata.xml 523 BLAKE2B b2c729977d84466557f0fae273e5463a41fded78780842e4a92899cc79ad8cf2843fe9c397a70f1d7cab8a7ca317a6723b119047323e0be8862b7294afe96b33 SHA512 82b88eb00bb385c47ebf5c5cd560de25e4f865086983fd9a5767b7fb286406dd06273e8a596df31aba57baaf051b7c353f50f445753541de5b15e6a439132381
diff --git a/dev-python/zipp/zipp-0.5.2.ebuild b/dev-python/zipp/zipp-0.5.2.ebuild
index 366b54407418..550d4f714b81 100644
--- a/dev-python/zipp/zipp-0.5.2.ebuild
+++ b/dev-python/zipp/zipp-0.5.2.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/zipp/zipp-0.6.0-r1.ebuild b/dev-python/zipp/zipp-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..4366045bcdaf
--- /dev/null
+++ b/dev-python/zipp/zipp-0.6.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
+
+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}]
+	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-0.6.0.ebuild b/dev-python/zipp/zipp-0.6.0.ebuild
index 46f6ff270793..e24fe1387bde 100644
--- a/dev-python/zipp/zipp-0.6.0.ebuild
+++ b/dev-python/zipp/zipp-0.6.0.ebuild
@@ -15,6 +15,7 @@ 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="