gentoo resync : 28.04.2021

6 files changed, 17 insertions, 11 deletions

diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 027aa1f4f280..6f0530d328ea 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,11 +1,11 @@
-DIST setuptools-53.0.0.tar.gz 2050503 BLAKE2B b1ebe5a9776917fe9a21a13a4db613fd05aa1f61043482487013bcfed7802ff1b984fe0f72623b092eee7ebfb9debd5f71732223220bc2b73a6ece0a7ec86a2c SHA512 d045198210f09c5f2acbd487d3dd291cd7ce814bebe331f1876c133cd28f56d368717c7bd4a875b439c9cc8c9488dc9a7d3e27ab791cce419f78b87fcfd8fff6
 DIST setuptools-53.1.0.tar.gz 2051159 BLAKE2B f4148df45f5c62acd6acae833619dcae50f131da91ece1a2e1231620d4800294f14dab6c72ca5b2ffd31191c4e3306a869abdba349adcec5746600fc067b340d SHA512 0ca02e9b997623268d8f73b73ee6a4b1ad513802cbc75c74124a85bd5ca7bfaea5cf7cccb706334c0dac2c8a0674a5bc2cea10f44f99f881ad893c8337af3da2
 DIST setuptools-54.1.1.tar.gz 2053415 BLAKE2B 59d60e9be5a184e34e8c9e1ccb477eae538836c8fac4862f3365e1abe8beec6cc85490918d413b29831c4d3738ca19cd84ac4a9d30178e45e42c652a0ade5fac SHA512 d2ab5445a9b4de5b5fae8aab6a47131ad41a011fa23fb1e6c07a599bcb27a8f89ea3c5ea9939577d6286bf3f8e2edf0334816ae1a507dba09c46435d063c3379
 DIST setuptools-54.1.2.tar.gz 2053508 BLAKE2B 23958ab6bc8ac5681fb4a86217b893f5389be1afc9e71f77a3aaaca469e3f86117e55f9df8f864ae56059ef6aef054a6a5ce8d6670a5ce266de6322b820e68d7 SHA512 b6efe6e92227704a95d4d4a31d033df6df96a430d7e51cb7df80203af56d8f8f64c95deaf194c7cfbfd2111f5bc02be45db2c0383c3209c898c1858821eb4642
 DIST setuptools-54.2.0.tar.gz 2054279 BLAKE2B 2a52e76808fb2bc6df4c59ac7476a9386401180ff6c0d52a5f3d87aedf976a3057cfa0a7ddf2a4497c4c1552d5ebe4810c4bbfa127e1293f950054bddbf7d835 SHA512 b18cd075cf59b8648611eef1874de41199ede6ffe6d7f5047586c6ac8783fe18b9a4f537783e590e7aec127033f612b93925e92f039bd6416a609fcfb262e354
-EBUILD setuptools-53.0.0.ebuild 2125 BLAKE2B 36d22c2a80921dc739c60798293b0c6475f45832ccba934901e1f525109737966dd8e8cec259e123d2168dce2dfaf7acd6e8021ca43762752ab8f3f56911dfbd SHA512 71aee4df07af820f2051bf98ddb7465605b17574b0855a5f56c358048256b8d3b05e886ad163273fe6ec5aee121f7e334af2ed24501667a7f67dc780523e4748
-EBUILD setuptools-53.1.0.ebuild 2134 BLAKE2B 026061402b07b6aee16e9c963e8af99e35fba7c894c7ef922ab9b2ae5fd0231d42578846985648e8ca7791b3ed83e721dd2d152a59af958e4b54df42bdef39e3 SHA512 a4a912ede611ca6d251e6923625d2ecb6343ce0032ee89015236bdbf6d740fc2876c298e33be385e3a15d42655bc61b4ed4472df27c9b514d1ac60c4f57daf3a
-EBUILD setuptools-54.1.1.ebuild 2198 BLAKE2B 9398a7ed3e4503cddda05dc4a07c875899fd0343943cf681dc1b374dc31a552aff18bd481de62f3f9b6ef22a629c867c66189ba1757771c071ad2cb755e661c7 SHA512 0dcd13c80cb304998dd9d7ef8d0ce73bc346ed550b4c1606d27b8d93a559c4bec7758dccdc2e54ee5107e61b11dffe875b5d847077c139ecbbc8095bd8c481d7
-EBUILD setuptools-54.1.2.ebuild 2204 BLAKE2B 2bc528a9b34c3ba3138183c7102a959e067360d804749640c6cf26a4cb26c139dbdef5ad3273046098153edc65ef118540e8fd1cd15b1886c81befb4d60a41cf SHA512 1cac63fca82cd8ac8bb3c0f0fa901b709f0a792a00232a9db47e75fe34f47edbc545d80b8f24071b326d23ad535c23cc4a77fb1bf2513bac5b2c668a15b00a54
-EBUILD setuptools-54.2.0.ebuild 2204 BLAKE2B 2bc528a9b34c3ba3138183c7102a959e067360d804749640c6cf26a4cb26c139dbdef5ad3273046098153edc65ef118540e8fd1cd15b1886c81befb4d60a41cf SHA512 1cac63fca82cd8ac8bb3c0f0fa901b709f0a792a00232a9db47e75fe34f47edbc545d80b8f24071b326d23ad535c23cc4a77fb1bf2513bac5b2c668a15b00a54
+DIST setuptools-56.0.0.tar.gz 2054762 BLAKE2B 3fc0f47304109f765ff0f8430dae735005d508aaa79609c5ca08217eb3802014267bd0f1a4f4678b417143f0d22b4b27f166573e41685229e0d4491b1789713d SHA512 951d43a0192b9dddacd7bd7ff6b76e281c14071771096db3c413fde6ea67b0c534f17a770cb3464cd3a6a4e8145b82f4cf5c0228e76e6f2cefe88d33748816e9
+EBUILD setuptools-53.1.0.ebuild 2126 BLAKE2B ef2d14c8674ce19ca5c5ca8ddd1c2a85737ba65692d2f5f2f1a83f940580d21407bcb312e34e4f2903596b35a741b246a934be0c60d6624f9888807e9cff411f SHA512 7852690b68bc1c0a3bd0ccf31183b03a24fb701a7ddb664e9eba4bd9f8ae5a0e7707ccc938b80495dd7a42777c30cbe871ba8135ac2f69f78e32dfe1f9c18c4a
+EBUILD setuptools-54.1.1.ebuild 2227 BLAKE2B 5fac1e377bb173c80ca9e2e8a33688e4aab22434e23d8e61f7fb564a006a155b98d193bede2568ea80a72093a145a033c09be843dac16337f5fa55f3223ecd8f SHA512 f73a69d5a1ba2ea90bb55dc87d82e1eaa4bbb098c1b49cdc0572368089b7db09eb2599552620ef651b680483f6d4ea73ed0a63d2b308a888cbd1922956a163c1
+EBUILD setuptools-54.1.2.ebuild 2234 BLAKE2B 77b2c6a1dd0c95dbfc33a4920fe199834c76cd2e1985fd646d0249cbbae00b2086b412295addd28339e2400c90a9e72593b7e2913420bf961f310c040ad23cd6 SHA512 919f767e1d0ae2fe5c805e1414d2908fbf479b0a628e579f8688d4e9697c529972f86f675cc42399ae20151b19edf07106e1d7f9d6d64be02cc9536c6785d705
+EBUILD setuptools-54.2.0.ebuild 2239 BLAKE2B 47c9b17ee82bd8383f2b2833e4c5abc3c99b47c6ab129d4e9472da195dbc63f126e041608bd666df25848ea7b873c8708fc8e7fd227d9cb9721b4db2ad62fc1f SHA512 4875a32f23efb0ab34764c74f0b08d16dea1e72cea8581b93aa91b7c012e55a6326371fe8172991d05898d7c2f248cee9650bf02ed2625e72eb9aedef715776d
+EBUILD setuptools-56.0.0.ebuild 2241 BLAKE2B 8e58e2acc3cc8d6d2b3b8fe16ee3915e5bbabbdc08f4ba23c73af7455ee18c6ad1e462191a95b48d3652554969fd21bd960ab23a4ef7e0398d7c6cfd2ca1f055 SHA512 11a118d499b3b36e503c448022cfb7e67a36b727015d060fcbfd300eb526336ee8fc13cf63150425dbd26f88b4c60bcebb3b326f7723cb3c4d09c0db94fdf06a
 MISC metadata.xml 468 BLAKE2B 7acca7f204485279233a4ccd34d76661954e2f995cf82bd178f1dac0d9825b073dea76e734aa7625d036813d658e1dd7a5acd408b79b6841540bde62644ddd47 SHA512 c8215fadf291dc1cf8df2f1d8931f5f70657fc6c37fd105426d03f3e4b19963fe93ec4b76107aef5c2f9bf6fe5ce123fcd48519bf942ce8cbbc0c5f2678e1de6
diff --git a/dev-python/setuptools/setuptools-53.1.0.ebuild b/dev-python/setuptools/setuptools-53.1.0.ebuild
index 49b44d46c0df..c104805cb434 100644
--- a/dev-python/setuptools/setuptools-53.1.0.ebuild
+++ b/dev-python/setuptools/setuptools-53.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/setuptools/setuptools-54.1.1.ebuild b/dev-python/setuptools/setuptools-54.1.1.ebuild
index ea333f90465a..ca447b23d5f0 100644
--- a/dev-python/setuptools/setuptools-54.1.1.ebuild
+++ b/dev-python/setuptools/setuptools-54.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/setuptools/setuptools-54.1.2.ebuild b/dev-python/setuptools/setuptools-54.1.2.ebuild
index 533095efb380..67fc34e2ea88 100644
--- a/dev-python/setuptools/setuptools-54.1.2.ebuild
+++ b/dev-python/setuptools/setuptools-54.1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/setuptools/setuptools-54.2.0.ebuild b/dev-python/setuptools/setuptools-54.2.0.ebuild
index 533095efb380..752ff3c95f7e 100644
--- a/dev-python/setuptools/setuptools-54.2.0.ebuild
+++ b/dev-python/setuptools/setuptools-54.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/setuptools/setuptools-53.0.0.ebuild b/dev-python/setuptools/setuptools-56.0.0.ebuild
index 4231ee0d4ba4..893b46224b3f 100644
--- a/dev-python/setuptools/setuptools-53.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-56.0.0.ebuild
@@ -15,13 +15,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 BDEPEND="
 	test? (
 		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
 		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
@@ -43,12 +45,16 @@ DOCS=( {CHANGES,README}.rst )
 python_test() {
 	distutils_install_for_testing --via-root
 	local deselect=(
+		# network
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_distutils_adoption.py
 		# TODO
 		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
 		# this one's unhappy about pytest-xdist but one test is not worth
 		# losing the speed gain
 		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
 	)
+
 	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
 	# It tries to sandbox the test in a tempdir
 	HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \