gentoo resync : 30.05.2020

5 files changed, 16 insertions, 163 deletions

diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index ccd6da654899..52fd8b09e098 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,13 +1,10 @@
 AUX setuptools-42.0.0-imp-fix.patch 1839 BLAKE2B a11f8fe053a4b0ad8d326be339ba9cc95e3b90441b8fdeb4ad589d8e8248abf63a11f97ff1917aea73d3f3daf054d9fa831e805ad6823f31d474e25d67e15eb9 SHA512 c93a5b24f0169ab64ba3c80aa9c64a70609d89c776ee491de3088dc6dc7149d709836f79affde03aa58e2065e014318182a2359bae753fbb47c98d05fa9bcab3
-AUX setuptools-46.2.0-test-warning.patch 2641 BLAKE2B 6d3f9fe2425087c3d4199a0bc70cfb68bbfc881ac06c6eeb4aef010ae4db8271e2a9e289d304dbe7a4184a5ccf80236298a67c917830512d730b11ec7c9a92f3 SHA512 e59c867dd1345c32ab463a1a38626cd4de90aa05d1cc1e400e7816790fa7583353140ba0f79c213c12d130588b34115d68e8d1f6a48ece467aadcdf3cbc6ce75
 DIST setuptools-44.0.0.zip 858893 BLAKE2B 02ba2a838487ba9e80d9ca3b8598cecbec4d286f2734be439d2b73f3f7f0ca80e80ea71a0c2322093deb548503c82d6eb32b1585992979b053f14f49baa00baa SHA512 bb48e7763d258e654472bc416d16ec8708eefa95d1eb03cb6e81b623fd636cefc51a0bd67887084ab0214e256e2030a8f655184c3b59ad6937abab6a6178f3a1
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
-DIST setuptools-46.1.3.zip 862431 BLAKE2B 89d65360e15b22f535312627723ad61df84dce3ee9d5850dd0c60dace0f8c04a502ac6246afe1add1e4fbd0e0dc9530afc8bfd2a4cf058f93cde2ff4184e21f2 SHA512 7f8f99313ce2af2cbfa86ff9a3135bc3445804e9323a375b498d20dad7f8fc819481da0c2a057160397e98b6178c1eb453a093652cfdfe7896c9d31732f7ad8c
-DIST setuptools-46.2.0.zip 865117 BLAKE2B 490387146003e07a5391afa798d1e45a76e9afc81c3e0c484005b3b0bff15f172db2016907199fe2216a4e17379987a53d58149d285be6dcfe7c37a64ce7c359 SHA512 d8d89a99c6a3be0a343d6a0e17117ba00393188d69c8995a5dbe9a7772c002fc301a53963288231e3f8053ffda4cafd5406edb2f4650f2036c665f8e3eb5822e
-DIST setuptools-46.3.0.zip 864654 BLAKE2B ce916b8f84f777a4baf6dd7458d5a74d7afbc0ede3a60238ce1e6ddf8b4c9837cd88508d4af4577be446d811fc9b997e9361775abaf9308bc9af6f66ca173bfb SHA512 57bc3e1a585a99d9434ed55af037a71665ee7e76ac9dbf19c87260b3d4331183f9eb3c7389c3455407f379ba28a74e90e27346afc614003ae259ab92e3dc16ec
+DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
+DIST setuptools-47.1.1.zip 870277 BLAKE2B 0ba55f2b51011d4f98a554a959227dba83a79e7369a3cd54450a1d18cb378bf7cfaffc1aa25b0ee11760e917d6f74891f0a63e43478893ca4327e0f5135267dc SHA512 053ffd4c26bf0cf1894754b1ed922be03c6fa2cb54a41e3d28a7d8f7a2fdf2ccebbca4e0bafa16eed476923ef70cf4294ed36df6e77603b2fae0a09b684132c4
 EBUILD setuptools-44.0.0.ebuild 2241 BLAKE2B 01cc0eac39c495e27d0087f9c130bded0685753fb030992115760fb62132d7e319a530a200ba8fa65ad13d28f23ffb1428358d6d56803aee6a583221dae6c15b SHA512 6a444f1959796ea98e8c59c64ec4bec06b609b8fe425e827150626909a95fd2e461f02179bf03fc3e200bedb3274a910cf8ee816c21c8eb698a17f44817bf3d0
 EBUILD setuptools-44.1.0.ebuild 2242 BLAKE2B 5d25046d9212067075ed3bd31d2821a24e459fa35ffb3178103907042cb354a11251de89c8a8ef161bc9f6d0a28963ab8ba75ae13d6385cee8483c6112aa814f SHA512 5f5daa3dd6f118d6654d3b0e1d7d3bffc1a47d14f1e2d7ab9dc4a78c1ee64fdab0c9bf6117e30850c5db5e325f9f0551baaa36a6ea9c512f9cfcf1306230d278
-EBUILD setuptools-46.1.3.ebuild 2018 BLAKE2B d70e0fe5452b0700f40ed9670c41374b1a2129c7578bdddf60f867b68d2112c67b32aeed2f46afed80707e3488c42e489190e2dfe4211d42d63efdb706ffbca3 SHA512 f12c8c790feb0619153877c740b836e00127be4cdb719d16645d1136afa35068bb2f384d971457faf3dbc8a2f3fea968312cbdb2cd57548698f06e84e9e1041d
-EBUILD setuptools-46.2.0.ebuild 2086 BLAKE2B ebd4790c83f6e527cfa7b8ed4829ca7781546924d5b2e9a3f6d78b558fbeb272344d0fb39fed5ac608c991a4d270abc508a62e469dd59a78822f08adc7458df6 SHA512 86a3ca87f3d890f70fdee6386874916e0119b2cc06d210504fb13898c0196065900691621ebb7c8ae8cc9199ef90f90715f04b30a061a62c9c14ffca2db352ac
-EBUILD setuptools-46.3.0.ebuild 2034 BLAKE2B 2146b9d5adf112153a7148622a7f7f171d3717691dd1a622eb5775b560186e9359244d032036900c20f668e2ae199fc9a2404c0db56bf8b599897b3daec02851 SHA512 7c705c5913f0e0b521e3f5deeb209ed89c35a774d6f67e7391dee5838820f95b202457fe96a2223e45dac1f7c5f0a3820a6715784447a86d1357df324f7b35a9
+EBUILD setuptools-46.4.0-r1.ebuild 2296 BLAKE2B 48222d0fbae7bcad855839b6f2434047f7acbbd3e3192d0d5125b63d4ae5f14e31210e364770903f1d617f94baa543a7cc998b055777acc634707c75e4281b11 SHA512 5ba89846ef28a7972c0a9c38e9bcfa4d54ad959fbacf3340bf4f1283c14b00db3b7d89719aa4eb6447f0406e9fed3ed4e58f1cb7e994429dfe45279b10c6a78b
+EBUILD setuptools-47.1.1.ebuild 2028 BLAKE2B 2a0313f4a65f1f17197f84aeaa3e6e621745fd9519d7e17c2129f8d4dbeca012314cc0581f6e424661b49785089227916647d1d6c74e41711dd0ffabaff09e26 SHA512 08d9dc257cc2b947064fc8cc90670017ae07de722624986fe2fc55b627397d63d0701a4beb0fec46383473b1f69f928c9b313510dca61270bb52fae4c196e946
 MISC metadata.xml 443 BLAKE2B 2b923468b7dc3062ad0f95edd944ffdde6dd4a8303ce8cc9a95730fefeb211e67ea64b7a289e60009003b64731d047ab3bb47cc6c8f0805a05a3a38f57846448 SHA512 2b2b1c7a0647283b069af29be73d0aa9c1e1ec8374d15d8a3b53a44b11d4698cba57a26ef5963795eb8bdbda9602b18a02194c5741485023ffd0b3218c028110
diff --git a/dev-python/setuptools/files/setuptools-46.2.0-test-warning.patch b/dev-python/setuptools/files/setuptools-46.2.0-test-warning.patch
deleted file mode 100644
index e27db9a41da9..000000000000
--- a/dev-python/setuptools/files/setuptools-46.2.0-test-warning.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 56bcce894e99059a8abda29d8b919b0bee7fd1b9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Tue, 12 May 2020 13:33:04 +0200
-Subject: [PATCH] Reuse @ack_2to3 in TestDevelop.test_2to3_user_mode
-
-Fixes https://github.com/pypa/setuptools/issues/2100
----
- changelog.d/2105.misc.rst        | 1 +
- setuptools/tests/__init__.py     | 4 +++-
- setuptools/tests/test_develop.py | 2 ++
- setuptools/tests/test_test.py    | 4 +---
- 4 files changed, 7 insertions(+), 4 deletions(-)
- create mode 100644 changelog.d/2105.misc.rst
-
-diff --git a/changelog.d/2105.misc.rst b/changelog.d/2105.misc.rst
-new file mode 100644
-index 000000000..75eaf2cb3
---- /dev/null
-+++ b/changelog.d/2105.misc.rst
-@@ -0,0 +1 @@
-+Filter ``2to3`` deprecation warnings from ``TestDevelop.test_2to3_user_mode``.
-diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
-index 9c77b51f8..6377d7857 100644
---- a/setuptools/tests/__init__.py
-+++ b/setuptools/tests/__init__.py
-@@ -6,7 +6,7 @@
- 
- 
- __all__ = [
--    'fail_on_ascii', 'py2_only', 'py3_only'
-+    'fail_on_ascii', 'py2_only', 'py3_only', 'ack_2to3'
- ]
- 
- 
-@@ -16,3 +16,5 @@
- 
- py2_only = pytest.mark.skipif(not PY2, reason="Test runs on Python 2 only")
- py3_only = pytest.mark.skipif(not PY3, reason="Test runs on Python 3 only")
-+
-+ack_2to3 = pytest.mark.filterwarnings('ignore:2to3 support is deprecated')
-diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
-index 792975fd1..bb89a865b 100644
---- a/setuptools/tests/test_develop.py
-+++ b/setuptools/tests/test_develop.py
-@@ -17,6 +17,7 @@
- 
- from setuptools.command.develop import develop
- from setuptools.dist import Distribution
-+from setuptools.tests import ack_2to3
- from . import contexts
- from . import namespaces
- 
-@@ -65,6 +66,7 @@ class TestDevelop:
-     @pytest.mark.skipif(
-         in_virtualenv or in_venv,
-         reason="Cannot run when invoked in a virtualenv or venv")
-+    @ack_2to3
-     def test_2to3_user_mode(self, test_env):
-         settings = dict(
-             name='foo',
-diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
-index 0f77d8ff3..892fd120d 100644
---- a/setuptools/tests/test_test.py
-+++ b/setuptools/tests/test_test.py
-@@ -10,6 +10,7 @@
- 
- from setuptools.command.test import test
- from setuptools.dist import Distribution
-+from setuptools.tests import ack_2to3
- 
- from .textwrap import DALS
- 
-@@ -73,9 +74,6 @@ def quiet_log():
-     log.set_verbosity(0)
- 
- 
--ack_2to3 = pytest.mark.filterwarnings('ignore:2to3 support is deprecated')
--
--
- @pytest.mark.usefixtures('sample_test', 'quiet_log')
- @ack_2to3
- def test_test(capfd):
diff --git a/dev-python/setuptools/setuptools-46.1.3.ebuild b/dev-python/setuptools/setuptools-46.1.3.ebuild
deleted file mode 100644
index cec7f0074922..000000000000
--- a/dev-python/setuptools/setuptools-46.1.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/unzip
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	# xpass-es for me
-	sed -i -e '/xfail.*710/d' setuptools/tests/test_archive_util.py || die
-
-	# avoid pointless dep on flake8
-	sed -i -e 's:--flake8::' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv --disable-warnings ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-46.2.0.ebuild b/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
index ef030388abe8..07b818e2943a 100644
--- a/dev-python/setuptools/setuptools-46.2.0.ebuild
+++ b/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -27,6 +27,9 @@ BDEPEND="
 		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
 		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/futures[${PYTHON_USEDEP}]
+		' -2)
 	)
 "
 PDEPEND="
@@ -37,11 +40,12 @@ DISTUTILS_IN_SOURCE_BUILD=1
 
 DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
 
-PATCHES=(
-	"${FILESDIR}"/${P}-test-warning.patch
-)
-
 python_prepare_all() {
+	# silence the py2 warning that is awfully verbose and breaks some
+	# packages by adding unexpected output
+	# (also, we know!)
+	sed -i -e '/py2_warn/d' pkg_resources/__init__.py || die
+
 	# disable tests requiring a network connection
 	rm setuptools/tests/test_packageindex.py || die
 
diff --git a/dev-python/setuptools/setuptools-46.3.0.ebuild b/dev-python/setuptools/setuptools-47.1.1.ebuild
index 8562f41ff110..69172f4815f9 100644
--- a/dev-python/setuptools/setuptools-46.3.0.ebuild
+++ b/dev-python/setuptools/setuptools-47.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -45,8 +45,8 @@ python_prepare_all() {
 	rm setuptools/tests/test_integration.py || die
 
 	# xpass-es for me on py3
-	sed -e '/xfail.*710/s:(:(six.PY2, :' \
-		-i setuptools/tests/test_archive_util.py || die
+	#sed -e '/xfail.*710/s:(:(six.PY2, :' \
+	#	-i setuptools/tests/test_archive_util.py || die
 
 	# avoid pointless dep on flake8
 	sed -i -e 's:--flake8::' pytest.ini || die