gentoo resync : 25.08.2020

8 files changed, 49 insertions, 309 deletions

diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 1952bce8ef81..eeff8aaa2bf4 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,14 +1,6 @@
-AUX setuptools-42.0.0-imp-fix.patch 1839 BLAKE2B a11f8fe053a4b0ad8d326be339ba9cc95e3b90441b8fdeb4ad589d8e8248abf63a11f97ff1917aea73d3f3daf054d9fa831e805ad6823f31d474e25d67e15eb9 SHA512 c93a5b24f0169ab64ba3c80aa9c64a70609d89c776ee491de3088dc6dc7149d709836f79affde03aa58e2065e014318182a2359bae753fbb47c98d05fa9bcab3
-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.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
-DIST setuptools-47.1.1.zip 870277 BLAKE2B 0ba55f2b51011d4f98a554a959227dba83a79e7369a3cd54450a1d18cb378bf7cfaffc1aa25b0ee11760e917d6f74891f0a63e43478893ca4327e0f5135267dc SHA512 053ffd4c26bf0cf1894754b1ed922be03c6fa2cb54a41e3d28a7d8f7a2fdf2ccebbca4e0bafa16eed476923ef70cf4294ed36df6e77603b2fae0a09b684132c4
-DIST setuptools-47.3.1.zip 869963 BLAKE2B cecc4d43ce09708c2454c20064baf8b5597aff29bf069a859ec7d6a91588456455df611f962cb90650b23ba269bbedcb81dff568b4498431cfa20f46ece828dd SHA512 05d8ac5e1612f0c22d9f51b5dbb22cdd1edfd9c15e97c5f31f6dee8d660e6ca19720cee5169158d0179baa87518766fda1cd2e4d5c69f683e973a9ff08155d48
-DIST setuptools-49.1.0.zip 2170689 BLAKE2B fa5f9a8955ac4206396c653a3c6b5926aeb7f6f4052de7b67698ad39edd3d49c7bad13bc65720b5a40a906d06eaf3e6918cfbc20a2a59e100f75400c2caa17df SHA512 a5734742a6d2409f41c62f29dea35c58f480756ef8a66f70aaa607a6927a64487f92d20def6791860ee508e713b44d800e41e2cf8b5abcffd7e1ed1058374efe
-EBUILD setuptools-44.0.0.ebuild 2241 BLAKE2B 01cc0eac39c495e27d0087f9c130bded0685753fb030992115760fb62132d7e319a530a200ba8fa65ad13d28f23ffb1428358d6d56803aee6a583221dae6c15b SHA512 6a444f1959796ea98e8c59c64ec4bec06b609b8fe425e827150626909a95fd2e461f02179bf03fc3e200bedb3274a910cf8ee816c21c8eb698a17f44817bf3d0
-EBUILD setuptools-44.1.0.ebuild 2241 BLAKE2B 01cc0eac39c495e27d0087f9c130bded0685753fb030992115760fb62132d7e319a530a200ba8fa65ad13d28f23ffb1428358d6d56803aee6a583221dae6c15b SHA512 6a444f1959796ea98e8c59c64ec4bec06b609b8fe425e827150626909a95fd2e461f02179bf03fc3e200bedb3274a910cf8ee816c21c8eb698a17f44817bf3d0
-EBUILD setuptools-46.4.0-r1.ebuild 2296 BLAKE2B 48222d0fbae7bcad855839b6f2434047f7acbbd3e3192d0d5125b63d4ae5f14e31210e364770903f1d617f94baa543a7cc998b055777acc634707c75e4281b11 SHA512 5ba89846ef28a7972c0a9c38e9bcfa4d54ad959fbacf3340bf4f1283c14b00db3b7d89719aa4eb6447f0406e9fed3ed4e58f1cb7e994429dfe45279b10c6a78b
-EBUILD setuptools-47.1.1.ebuild 2028 BLAKE2B 2a0313f4a65f1f17197f84aeaa3e6e621745fd9519d7e17c2129f8d4dbeca012314cc0581f6e424661b49785089227916647d1d6c74e41711dd0ffabaff09e26 SHA512 08d9dc257cc2b947064fc8cc90670017ae07de722624986fe2fc55b627397d63d0701a4beb0fec46383473b1f69f928c9b313510dca61270bb52fae4c196e946
-EBUILD setuptools-47.3.1.ebuild 2028 BLAKE2B 2a0313f4a65f1f17197f84aeaa3e6e621745fd9519d7e17c2129f8d4dbeca012314cc0581f6e424661b49785089227916647d1d6c74e41711dd0ffabaff09e26 SHA512 08d9dc257cc2b947064fc8cc90670017ae07de722624986fe2fc55b627397d63d0701a4beb0fec46383473b1f69f928c9b313510dca61270bb52fae4c196e946
-EBUILD setuptools-49.1.0.ebuild 2043 BLAKE2B a3ed7a61eebac6fd12c831d2d5f28735ba984b1522c3db39c8608615061b00e10df4601c34dd1d1cefd6870ef997afb2fa025a5ad1783dca1f50eba3bba9cfbc SHA512 985b4e11bba757e58aca75659a32fa7fe0923ff36b0437b506b6e99434ff352968e24d4e417c49464a915fac27dd6585a593de021d172112cdb84a13f484acfb
+DIST setuptools-49.6.0.zip 2188590 BLAKE2B b789386d31c0d5cbc0c899d24e9af35baad371b698b488ed46b768e8831bae7245b391971e1e402799bc555475c1d8b78bd59a224c26bc78ba68b122a06e0154 SHA512 aad6e74b0e276da0f79c9429860a6d1c7860a30e9a02ce55527abbe7671366640423a1e5476da9ecadfc62ae1bf803cb0c664e2a09cf7619a9c8ac3965b9cf31
+EBUILD setuptools-46.4.0-r1.ebuild 2349 BLAKE2B addf1d5afe6cc50865cab5c470a759a09be4929960fabebb8e76b2f467153bf58939a7800e3b5beb91d2c70a3e8944a9d9968ad68bccbf6dbd3514d2f8b15a4d SHA512 e8dc79476786ec15580f12a272e42cb3f862fa384102bd4928bb3798d341cc5247603f573fa86cdce9d815b20e2c844ded0d969c393cb40fabf464130e219cd4
+EBUILD setuptools-46.4.0-r2.ebuild 2478 BLAKE2B 28b4e7fe8f73e5161ad5ec6d05614e7907115c2c6ea9c2a62da6c3170e55a3e6cd21848726cd28218c84d85b99c5049753eec5f9f7c42d92a7127a17f657727b SHA512 415cbe43a31997249a945fb69635c2e4be07607aca2305a7edda480438fe920c412f9235a41a90fdcf8bda0bdc918e3c1022276a5bd2da768b3800a38461a8bd
+EBUILD setuptools-49.6.0.ebuild 2242 BLAKE2B 55cbd8c45e536ca370d6f28bd5a4378ea04cb91ede8b5842615ed5ccbbdbf2814c0fbd4e62a089c8c16cf431d1f293fa5e5fb7cdb9502396acc51cd3ad6e1a85 SHA512 300664b69a018daf86725ffa2a7c1e293136cc864482b522b7e97e520e4d38b74fad48c2f695846a5525461f39eecc09e924789c31215b16d6e6994471b10d11
 MISC metadata.xml 443 BLAKE2B 2b923468b7dc3062ad0f95edd944ffdde6dd4a8303ce8cc9a95730fefeb211e67ea64b7a289e60009003b64731d047ab3bb47cc6c8f0805a05a3a38f57846448 SHA512 2b2b1c7a0647283b069af29be73d0aa9c1e1ec8374d15d8a3b53a44b11d4698cba57a26ef5963795eb8bdbda9602b18a02194c5741485023ffd0b3218c028110
diff --git a/dev-python/setuptools/files/setuptools-42.0.0-imp-fix.patch b/dev-python/setuptools/files/setuptools-42.0.0-imp-fix.patch
deleted file mode 100644
index 5c96016c92c3..000000000000
--- a/dev-python/setuptools/files/setuptools-42.0.0-imp-fix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From bbf825eee764cae0bc44077ccc957a733d53d095 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?=
- <mimi1vx@users.noreply.github.com>
-Date: Fri, 15 Nov 2019 08:52:35 +0100
-Subject: [PATCH] Fix _imp module behaviour if is defined paths in find_spec
- call
-
-fixes #1896
----
- setuptools/_imp.py | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/setuptools/_imp.py b/setuptools/_imp.py
-index a3cce9b28..6ccec5799 100644
---- a/setuptools/_imp.py
-+++ b/setuptools/_imp.py
-@@ -19,7 +19,10 @@
- 
- def find_module(module, paths=None):
-     """Just like 'imp.find_module()', but with package support"""
--    spec = importlib.util.find_spec(module, paths)
-+    if isinstance(paths, list):
-+        spec = importlib.machinery.PathFinder().find_spec(module, paths)
-+    else:
-+        spec = importlib.util.find_spec(module, paths)
-     if spec is None:
-         raise ImportError("Can't find %s" % module)
-     if not spec.has_location and hasattr(spec, 'submodule_search_locations'):
-@@ -60,14 +63,20 @@ def find_module(module, paths=None):
- 
- 
- def get_frozen_object(module, paths=None):
--    spec = importlib.util.find_spec(module, paths)
-+    if isinstance(paths, list):
-+        spec = importlib.machinery.PathFinder().find_spec(module, paths)
-+    else:
-+        spec = importlib.util.find_spec(module, paths)
-     if not spec:
-         raise ImportError("Can't find %s" % module)
-     return spec.loader.get_code(module)
- 
- 
- def get_module(module, paths, info):
--    spec = importlib.util.find_spec(module, paths)
-+    if isinstance(paths, list):
-+        spec = importlib.machinery.PathFinder().find_spec(module, paths)
-+    else:
-+        spec = importlib.util.find_spec(module, paths)
-     if not spec:
-         raise ImportError("Can't find %s" % module)
-     return module_from_spec(spec)
diff --git a/dev-python/setuptools/setuptools-44.0.0.ebuild b/dev-python/setuptools/setuptools-44.0.0.ebuild
deleted file mode 100644
index 56fd5bdf49f2..000000000000
--- a/dev-python/setuptools/setuptools-44.0.0.ebuild
+++ /dev/null
@@ -1,79 +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=( python2_7 python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	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"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-
-LICENSE="MIT"
-SLOT="0"
-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}]
-		$(python_gen_cond_dep '
-			dev-python/futures[${PYTHON_USEDEP}]
-		' -2)
-	)
-"
-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} )
-
-PATCHES=(
-	# fix regression introduced by reinventing deprecated 'imp'
-	# https://github.com/pypa/setuptools/pull/1905
-	"${FILESDIR}"/setuptools-42.0.0-imp-fix.patch
-)
-
-python_prepare_all() {
-	if [[ ${PV} == "9999" ]]; then
-		python_setup
-		${EPYTHON} bootstrap.py || die
-	fi
-
-	# 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
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv ${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-44.1.0.ebuild b/dev-python/setuptools/setuptools-44.1.0.ebuild
deleted file mode 100644
index 56fd5bdf49f2..000000000000
--- a/dev-python/setuptools/setuptools-44.1.0.ebuild
+++ /dev/null
@@ -1,79 +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=( python2_7 python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	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"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-
-LICENSE="MIT"
-SLOT="0"
-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}]
-		$(python_gen_cond_dep '
-			dev-python/futures[${PYTHON_USEDEP}]
-		' -2)
-	)
-"
-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} )
-
-PATCHES=(
-	# fix regression introduced by reinventing deprecated 'imp'
-	# https://github.com/pypa/setuptools/pull/1905
-	"${FILESDIR}"/setuptools-42.0.0-imp-fix.patch
-)
-
-python_prepare_all() {
-	if [[ ${PV} == "9999" ]]; then
-		python_setup
-		${EPYTHON} bootstrap.py || die
-	fi
-
-	# 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
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv ${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.4.0-r1.ebuild b/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
index 07b818e2943a..c6933e0ee478 100644
--- a/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
+++ b/dev-python/setuptools/setuptools-46.4.0-r1.ebuild
@@ -14,22 +14,21 @@ 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"
+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}]
 		$(python_gen_cond_dep '
-			dev-python/futures[${PYTHON_USEDEP}]
-		' -2)
+			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}]
+		' -3)
 	)
 "
 PDEPEND="
@@ -63,6 +62,11 @@ python_prepare_all() {
 }
 
 python_test() {
+	if ! python_is_python3; then
+		einfo "Tests are skipped on py2 to untangle deps"
+		return
+	fi
+
 	distutils_install_for_testing
 	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
 	# It tries to sandbox the test in a tempdir
diff --git a/dev-python/setuptools/setuptools-47.3.1.ebuild b/dev-python/setuptools/setuptools-46.4.0-r2.ebuild
index 69172f4815f9..fe0f241c6160 100644
--- a/dev-python/setuptools/setuptools-47.3.1.ebuild
+++ b/dev-python/setuptools/setuptools-46.4.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -14,23 +14,28 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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}]
+		$(python_gen_cond_dep '
+			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}]
+		' -3)
 	)
 "
+# installing plugins apparently breaks stuff at runtime, so let's pull
+# it early
 PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
 # Force in-source build because build system modifies sources.
 DISTUTILS_IN_SOURCE_BUILD=1
@@ -38,6 +43,11 @@ DISTUTILS_IN_SOURCE_BUILD=1
 DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
 
 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
 
@@ -45,8 +55,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
@@ -55,6 +65,11 @@ python_prepare_all() {
 }
 
 python_test() {
+	if ! python_is_python3; then
+		einfo "Tests are skipped on py2 to untangle deps"
+		return
+	fi
+
 	distutils_install_for_testing
 	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
 	# It tries to sandbox the test in a tempdir
diff --git a/dev-python/setuptools/setuptools-47.1.1.ebuild b/dev-python/setuptools/setuptools-47.1.1.ebuild
deleted file mode 100644
index 69172f4815f9..000000000000
--- a/dev-python/setuptools/setuptools-47.1.1.ebuild
+++ /dev/null
@@ -1,67 +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,9} 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 on py3
-	#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
-
-	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 ${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-49.1.0.ebuild b/dev-python/setuptools/setuptools-49.6.0.ebuild
index 3f1c94d2fb6d..0d8d2e8bfb98 100644
--- a/dev-python/setuptools/setuptools-49.1.0.ebuild
+++ b/dev-python/setuptools/setuptools-49.6.0.ebuild
@@ -21,6 +21,7 @@ RESTRICT="!test? ( test )"
 BDEPEND="
 	app-arch/unzip
 	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pip[${PYTHON_USEDEP}]
 		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
@@ -30,7 +31,8 @@ BDEPEND="
 	)
 "
 PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
 # Force in-source build because build system modifies sources.
 DISTUTILS_IN_SOURCE_BUILD=1
@@ -51,6 +53,9 @@ python_prepare_all() {
 	# avoid pointless dep on flake8
 	sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die
 
+	# disable the code disabling non-existing coverage plugin
+	sed -i -e 's:cov = .*:return:' conftest.py || die
+
 	distutils-r1_python_prepare_all
 }