gentoo Easter resync : 12.04.2020

5 files changed, 13 insertions, 55 deletions

diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 38fc96ce5778..9e2e9ecce348 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,8 +1,7 @@
-AUX importlib_metadata-0.23-py38.patch 1069 BLAKE2B 1286d00ffda07aace5c10bd5f72e4991f7853292a633d495415dc60f8210b5bddbd02b31d0547c2d4fccabee88a12fe74341edb3854f1756da9739f8368c34ea SHA512 0004fba3856134614124c5fe42935623ede41ccefc726c8ddd177749f307761af5872c627092dee126b1dfe506aa49ac9a1577c773e22d25d01f9cb99fc35e24
-DIST importlib_metadata-0.23.tar.gz 25172 BLAKE2B 8b88081971c658a01fd1c47cc664e54f4b42eb209ac1ce00af1dad5c15f66b661b20fc287abf818d7e4ef2e92447bea713fac6fb89a98d5ea7ba93e74134e4d6 SHA512 56594dfd67733842d83547770a09e12b4e4e3c000b7c9743206e13e4629906bb7271065e03c387f5114bac7f673fc17594d2ef90af23cd34b7ededecaf3fd47a
 DIST importlib_metadata-1.4.0.tar.gz 26380 BLAKE2B b185183b5a71b822f068856a4b1af3fc833a0cfcad65e522d3034022c20ab382a02b232cf3b365bfadc971d4a150b93d7e3b0ada7645dd33f201ffec976117fa SHA512 859faa1ef9cecd6b2ae88fff9d90d72e54e6f0ce3025b09e8a22d8f2b0d7c204c4041aa6a1f35ce79751b04ae482e406d2157f9296d4f8b579b5b29591b39089
 DIST importlib_metadata-1.5.0.tar.gz 26738 BLAKE2B b2ccc2244a2b9e0d384a22e0805d2a9931a3412afba98246692bc7a10684c9e1cc8435529461d45cd6d0b75c81a75c028b9269860d5de6cd376c70ad30700eed SHA512 074bc38df2a1b20dac62d88e209b2730cc56f8a8bb7f7b99bf766028f602700733448e7cb4d22ea099be38cfc9484ff6a235a46c6c114c3d70883393eeef3aa0
-EBUILD importlib_metadata-0.23-r1.ebuild 1407 BLAKE2B 2e4d29c2677331817023b7258a4a741019ad14c2fd2b81f2b4ea93ddf25d99a5e0f543c65663ed5929b84200897a64b58e0fad46c625984d4fdac0f561127323 SHA512 c24af8a052681a6c454db5dd6678945d2985966b45297de7b012f733ed79b5c29c8b209f767c3dbe8232021b34a6669222d741072fc9440e0ff71f10823db5dd
-EBUILD importlib_metadata-1.4.0.ebuild 1071 BLAKE2B ca6816dbce60b0b05775d0867a555ecb8b333de092813b4867771f12a0e9285e74531b77ede3fca7092357a86093c4fb0163c8756c9eb38e53db5a3569a1ca13 SHA512 3f7889058c964331779c610e48ac625e6d2db0cec912cb54701f32f473eb61e8d88e9b6e1cc30eae5948ac2c7d2b5d8005f6c289a7c5567f295a9343e399d58d
-EBUILD importlib_metadata-1.5.0.ebuild 1081 BLAKE2B 921e68237aa4f21a4667c33232c84dce7d3ad0e0cae4788eef174d8bede33c646c05a333532344c1eebdae698b48a83d3c71c694f2a495ccedfcdce13304635b SHA512 d7d5ada1878b1b63508042f1a26cb4decf5c875677bd4d63673bd788e947051e62e32e83a786bd6a7132495eb2e3fa015e9ba70faa527ea9e5c5efe83bca04cc
+DIST importlib_metadata-1.6.0.tar.gz 27136 BLAKE2B 55a987a75c78ff39fc5ac5d586cc7b7f9e7340edce505387be22cb291b53dec87e4f362bdb3f9a13f2797b6806f783b3cf0858c9db298266379f706402a43331 SHA512 4108d84a39da3c892a3b448027cca2835f6a68ac790b51b7cc4eb4ec925f5e8322847d86d8e89fbcec474258f592220f283116c82c536130aab70b96cea0435c
+EBUILD importlib_metadata-1.4.0.ebuild 1071 BLAKE2B 13d171a070a2b9c48a96c33e869a2efcc549cf1bcc137066fed60132dff4f557f4b856680f9b0b999464bcc1899608e039fb159e15ea2a53c9b9217995863018 SHA512 e5af262c03a8376c09581f1b17a35a712de9d82e8397db067db7415f73242fef147f490bb2bcab5b108bfd3a7e676a14ec5490e018d9d16010be9dab53c4013a
+EBUILD importlib_metadata-1.5.0.ebuild 1088 BLAKE2B 9c1da9504a6f9a1ad28ae38840d92d5fdeafb9d2cd94bded5b175c6d7ea52755b6a024a764fcde2b8691029b615ed917442f2f324d76ce8cda7f2e23584dcbb9 SHA512 66a81c37e82b8775a4fd880185c743350c6aa7f10c765d8779f7d34120684dad08fa4e847619d74feb5feba396cd1571f1be431db88a2ed4c4e9398b23f76583
+EBUILD importlib_metadata-1.6.0-r1.ebuild 1216 BLAKE2B c2c6b1f75abe58335fd5646dae6da95669d58f94571f4c60bdd2b8741b322001453d53e85645d39096f809fcd8b027a0b0453edd61ce798c979d5fa78e56514e SHA512 696cd63b2abe840397478ea234f21e5502c5d784cf401440d82202f53b5618c261c32772a5ccc4cf52407d5747c9430c537842fe7f1075efe1c67f5186133d6a
 MISC metadata.xml 575 BLAKE2B fd32bd69ffa26679f44ae19012bf57e77219abea01918062e2290e48121209353d5a50eb2aa028ca8359b3c8f40a35c1cc4c48e2f05cb855a3016f2f01da41f2 SHA512 fdb2a87b50b50fd23d97c7dd9875958ad9ae6474f6e0a0e5fb8df12ed381c30e21a71ae2eaf3baf03ae1ab973c0c7827c8a84fa09c8ca52eb938439e4f66e17d
diff --git a/dev-python/importlib_metadata/files/importlib_metadata-0.23-py38.patch b/dev-python/importlib_metadata/files/importlib_metadata-0.23-py38.patch
deleted file mode 100644
index f0b8b636543a..000000000000
--- a/dev-python/importlib_metadata/files/importlib_metadata-0.23-py38.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/importlib_metadata/tests/test_main.py b/importlib_metadata/tests/test_main.py
-index 38ec884..0ab1cf1 100644
---- a/importlib_metadata/tests/test_main.py
-+++ b/importlib_metadata/tests/test_main.py
-@@ -2,11 +2,17 @@
- from __future__ import unicode_literals
- 
- import re
-+import sys
- import textwrap
- import unittest
- import importlib
- import importlib_metadata
- 
-+if sys.hexversion > 0x3080000:
-+    from importlib.metadata import (
-+        Distribution as SysDistribution,
-+        )
-+
- from . import fixtures
- from .. import (
-     Distribution, EntryPoint, MetadataPathFinder,
-@@ -157,8 +163,12 @@ class DiscoveryTests(fixtures.EggInfoPkg,
- 
-     def test_package_discovery(self):
-         dists = list(distributions())
-+        if sys.hexversion > 0x3080000:
-+            dist_classes = (Distribution, SysDistribution)
-+        else:
-+            dist_classes = (Distribution)
-         assert all(
--            isinstance(dist, Distribution)
-+            isinstance(dist, dist_classes)
-             for dist in dists
-             )
-         assert any(
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild
index 15496a4144de..12625909d107 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 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"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild
index 242a727f4b2d..ab1c471935f9 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.6.0-r1.ebuild
index bf98c2989273..3ade092a2b5d 100644
--- a/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.6.0-r1.ebuild
@@ -13,8 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
@@ -23,27 +22,23 @@ RDEPEND="
 	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
 "
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy{,3} python{2_7,3_{5,6}})
+		$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy3 python{2_7,3_6})
 		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/importlib_metadata-0.23-py38.patch"
-)
-
 distutils_enable_sphinx "${PN}/docs" \
 	'>=dev-python/rst-linker-1.9'
 distutils_enable_tests unittest
 
 python_prepare_all() {
-	# avoid a setuptools_scm dependency
-	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
+	# remove dep on setuptools_scm
+	sed -i -r "s:use_scm_version=.+,:version='${PV}',:" \
+		setup.py || die
+	sed -i -e 's:setuptools-scm::' setup.cfg || die
 
 	distutils-r1_python_prepare_all
 }