gentoo resync : 25.08.2020

13 files changed, 9 insertions, 613 deletions

diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index cf7f7dc66472..a43d1917700d 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,23 +1,6 @@
-AUX tox-3.12.1-skip-broken-tests.patch 2766 BLAKE2B f2776638f48909c18a14c0e556d7646584b382eb62d17bd0a72e6d10011f25818de0886df79eaa4bada5fb9b43797505b1c8df4fc7d97398741d2f719143c4e8 SHA512 cc14794264ce0d9ca4c36de868e823a46e84bea8867e6bb7b37f5e13723d3ec84af41bc0cc7586789cc14b4f6844a68d2c5057cf77d36950c2fa2e8152e1be61
 AUX tox-3.9.0-strip-setuptools_scm.patch 699 BLAKE2B 15c001c0523420c2ae22013cc6729b34b97f1a25f7cddcde53f752dc11e1329d66522eeebbbda00bce58781c96b622ce4cd22127902b5ddf34b43e5197577792 SHA512 6c23dfa907303a826595cc7ff897212272841b151b574596d401b87bd441d26599c12b36bc08a5659af3e6639c20773c866df7b53c4230bb3eea86986253eb07
-DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540cc2922a897e016b5aabc9974772c9b897e0fab7b38b00f99478a063ad988ffa8b65fa53f684997334e492c SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066
-DIST tox-3.12.1.tar.gz 283964 BLAKE2B b7cb2394a721f281552d1f614a6059f7025390a4ea03fd970c85330dffb97f601f0c3f8c9c9b05f86b5b92e87ef80fba48676201550581562b8cf3f1b2afa34b SHA512 d7ed7ce17b03b5c8e3ba95e14f547c8dbb9a04ac38b98fb24c09261b5087ffc83b05e9a03607fa53ce61340a3ba69fc4121622f7fe338ce8ed402d25d59c7e6a
-DIST tox-3.14.4.tar.gz 289600 BLAKE2B 413782a524b70b4e301f5a4bda9c763dc7e670d7fe7785ce288b54d8a4940db0b8fed5f075c3f2cdea1d2242e35fa50765de1cd5ea544d1f433faa9a31894d61 SHA512 94e71d06ea62c275651e574359ffa224702eb4062398b44dff9504ce9e55df94d9227fc7cdbf02bc3d44244c29f29b8d3bdef3a66d94ad2dba6971860444ae7d
-DIST tox-3.14.5.tar.gz 290075 BLAKE2B 7e412e85981fe11cba4dc6a4ab3df824678b11fe59bd7d909361029f30e407ffe62a24967e5a447cc643500dfb61326d47fb276bb669311780ac49aa2075fe09 SHA512 cbd0e4c53bb82a302016f380a246e9a9630b8f0c6631195af2dfa12c090cc76c3d9da8362e11c42e74bacbb3f9be504eb67e07de1d2cbac7b5f05341ea2970c4
-DIST tox-3.15.0.tar.gz 291890 BLAKE2B 9c42c587332eafcfd02d2d8a42588af6253baf9f62e82eb8a8bf10da291b4868b1fe319e38a583bc67bb26ab868b8a123feccd5bd008ce618ceb46d3121c68d2 SHA512 cb21574301d953b361eb5e1d89eefe22e68ae5871036f03d5753ee97c888cadde548d62a50622dd65b3c488143bbbdf8d309bafa3b6a4807871c9e78b6fcdb9c
-DIST tox-3.15.1.tar.gz 292044 BLAKE2B eb3062fb1a2494a6b23e1c6f2c6af56be5879664ae26918e60839d2f8cff98dc6b684a27469eac81c363a3cd3e90abdafe0ab4dc601840023e5263a42301f384 SHA512 334e2129d5418d4733a25419b81cc57e794a11954c21774231e32c93e977f1a7fb71c739adabccb5cdde9428ab69772e8623a0c0a1172855957f7cbcd4a917b1
-DIST tox-3.15.2.tar.gz 293523 BLAKE2B a1a1c84a987d2b2e5194321405775ee3828b8e2c8dcd38c7e780a9d508b789a42f1880cffcecd68c50dfdc37008a4e9a117660fa2c732864c82af6c2eaf5a99e SHA512 9448554452c79039289d2d2c05c974f451647329701372c3e4b154a0161fa768245c0068cd5e3f1221b4b51a07be806f7c66ab9d4ef83a3e8e5964e18b9cde85
-DIST tox-3.16.0.tar.gz 294040 BLAKE2B 2f5ca2c1b0b839b4fe6834cba69d772b9605e6bb00b24d75867de768042cd091a8fd7f5a349867a5de578b96eaad9f59f2ad019203fc6b2c39c9efc6933d2d96 SHA512 f92accae643b01867749f10d01ba0e18ebb36071af55a21cd38ac8f14fa3db1b1e708b22f8601e4d1b172e59fb62588c1252d064be3fb6007002eeaaef716373
-DIST tox-3.16.1.tar.gz 294080 BLAKE2B 692ef3f498f78f239ecbb3f9ac5745462430a96bb67df7a732e5c5756d1b579c4ee8582d528d5eafddc7b19905057c01514cccaa42d7c1a442ac24cd531a656f SHA512 83fefc4b82fb33adbf2ece9a6fd6ffaf27771ac6076af5d2939dcbf68f1dd88b8edd0a105b0ec86dc7ee37b127d27ed46748af61423811c7435d0093d2e8e1eb
-DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
-EBUILD tox-2.9.1.ebuild 1284 BLAKE2B 601887c581bbd95d0c6377a4383693b4dc9956a8bfc474ce73f77b22ed8f73593a3ec7ef002e1b415798024a6451ce8f85f7c9dc03dc01b3af392babb2ef3524 SHA512 730680951dda514c0b228f7f37b06537ee44893a0fc0dd812954350f4123519514b07a7394b83243c267c1e05c5c0917efe6c8ea1b04c11418a2f997cea38878
-EBUILD tox-3.12.1.ebuild 1470 BLAKE2B 328809a7f1aac4a932586a88ac9082a83f8f5aa66b09714747584ed6d4acb8ab18480d2da58d7b74992633ccda2e223214eb871206d2a1531de97f5165f991ba SHA512 3e3f7bb27056a9e5bbaf3c699b1618bbde793518aed71acdc639e4f7692417b23e669c79f9737eff6e21ae255551f6cc296519cf85c28126e897a8dfb414f6f4
-EBUILD tox-3.14.4.ebuild 2249 BLAKE2B 4a8e695a7625cfebed1fc86451ceec4459673d31385a3bc295bd311e5c9c045b86b4b5b6577bf6ba6fb4b2f142812dcbf8003a53668a1035c964d2c2c68f16f0 SHA512 10d73cfdf517bc0726ee19609134914bf8bdf3b79dfae810e7eb9ac3c7e9713b8a2da28e7927cbbba8da571fe56a9d8c4b7767ad4b22d88d97f92770167ec10b
-EBUILD tox-3.14.5.ebuild 2289 BLAKE2B 987bd969cf8477bfa0436717e70915918f1d97a2149ff1cc9f76df58d8f105ea959f8f50f2a684c09ea1613281e294694aa7f53c2992124c89e12f78261f02c5 SHA512 5e7a92de1f17558593d06f417b4d8655c20308f8d0af92ceeaf6570228835d53d3592c9183f9a6fc1f390dd3f6e2f3f63cd03b4e52677101a8166ca5efc7165a
-EBUILD tox-3.15.0.ebuild 2277 BLAKE2B 4dde45fa512c6b125f506b2ac4e2fff538e49f0c8b9b26106edfaac9bde6b0fc6025989a56dfa3e55660d0373f5cbaf65811474ad39957711fcea028881e29b0 SHA512 c9d973a77a9ad1f8b7c37af20184971bd41ce0233352dced8625f01b911c84c46d1e388cacdfdc19a7775b2ad27273e966e32515e9d671f2a7ec258eb025948d
-EBUILD tox-3.15.1.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
-EBUILD tox-3.15.2.ebuild 2237 BLAKE2B c012b59b73176ca6cf9371b12a0354217fd17917bb1cddd814c97bc5dd0ea1335450cd10ba68370da2fc46a41e2b319d4db770205cd50431dd8933b84953f325 SHA512 beb0a1ecfb5cbeb4c267c9e7bfb3d61255df1034090d696f757ef8cf04d8875226c4d84002884c0c9065f68b3d2570ffa649950510f8cb70f8bfd0c90ed9d8de
-EBUILD tox-3.16.0.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
-EBUILD tox-3.16.1.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
-EBUILD tox-3.2.1.ebuild 1969 BLAKE2B 20c9b07cceda854b8ecf10ffa1c75349cbf35c6deed3cabea04d8530be46e175aa311d7862108dfd575e1e4e27fea54f9f6c70fe710855a52ae660a37fcd6d85 SHA512 74c107f3fed79053c9e9339e50037aceb233215af2704a5c176b8fa27b735e7ce09eb56f3fcb05d00a48d5fc3c95837dfb7767971062402db19389fdeb84964b
-MISC metadata.xml 357 BLAKE2B bdd98bc9f7cc557df1218d1d6c6dd6c0b77fe41ac2e7133728cec5e0709059b60d778fcc958c6932996dd6776c89aeb2e5d1059ee92e8aa824296c512145a2c7 SHA512 8955a371491a0ec5c85704134be03aef40584281a4c7cc74b3d63a0820050692ac7ebeca042b8847fe415170d83dacb27bb51a1d545da0ee28e77c7e405e59c3
+DIST tox-3.17.1.tar.gz 294492 BLAKE2B 1a2ed9a26ad366a1ae7343289b45a338a8d2a58c1b6df2aaf716a2e8bbcc1cbc797c70fb51665411cf1bb69243aa8415f7fb7c82d78afb2ffb7117e4ae75edad SHA512 b084d4552609c90d006573dc95d46d0b27cf53c40a54465040e3c625b5d33eb19f95f3fa488439f11029e30ca414ce4e9ed6793a44072023826bc1f4398aaeeb
+DIST tox-3.19.0.tar.gz 296499 BLAKE2B cad41c7791108ecdf6efc7bca99623c66d1d8ffbb2b06688eb84e575f14958ba2b497e0035ccc331fc8e0ce667824cba2c8dd37488ac48b3c16902c7b546074b SHA512 7a542282dc2fdef7ab8aff04372aeeeaad54b83bd7f1022c1c60465604d67a5984abcea7d409b8593b646192407c78cb88422aa4dfd11fb2a2d9da520aeafb39
+EBUILD tox-3.17.1.ebuild 2229 BLAKE2B 40d7b8dc05367102a5c9442187bd4ef3b1f8a2a0708cd751a9b009723896b67b41bf9705870457d5afc93e05397ff6c944e0b72601b33162377e3ea480bfe5e7 SHA512 f5488902e1a68cabfde1eef47b6180d8ab215ddee2d3788b9f803933b7f4372d9424eaeaaf1bebc653c68bd1dc4722e8e787aa70cdf221ae70c55a11abb2c20a
+EBUILD tox-3.19.0.ebuild 2236 BLAKE2B a23faaf319dc2589304ceb01f48e5a9220d017e7962ad7feb06d2e2c438d3a627e41d84cb8248fbae064073f5eec9a7f021698f567a4de6151382a8f057f04f1 SHA512 0af72e70c86c1844ef67c9a0594e0b2ef5fd79519eb35c01b019de1ce4fcc3c7db575623e1f8dc6f3f70abc8fb679d0eff046bf17f70e73703327312a7b3cbd6
+MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/files/tox-3.12.1-skip-broken-tests.patch b/dev-python/tox/files/tox-3.12.1-skip-broken-tests.patch
deleted file mode 100644
index 382bf2b158eb..000000000000
--- a/dev-python/tox/files/tox-3.12.1-skip-broken-tests.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/tests/integration/test_provision_int.py b/tests/integration/test_provision_int.py
-index 6a8ac18..56dbe95 100644
---- a/tests/integration/test_provision_int.py
-+++ b/tests/integration/test_provision_int.py
-@@ -43,7 +43,7 @@ def test_provision_missing(initproj, cmd):
- @pytest.mark.skipif(
-     "sys.platform == 'win32'", reason="triggering SIGINT reliably on Windows is hard"
- )
--def test_provision_interrupt_child(initproj, monkeypatch, capfd):
-+def xtest_provision_interrupt_child(initproj, monkeypatch, capfd):
-     monkeypatch.delenv(str("PYTHONPATH"), raising=False)
-     monkeypatch.setenv(str("TOX_REPORTER_TIMESTAMP"), str("1"))
-     initproj(
-diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
-index b814b7a..fe7ebe3 100644
---- a/tests/unit/config/test_config.py
-+++ b/tests/unit/config/test_config.py
-@@ -1897,7 +1897,7 @@ class TestConfigTestEnv:
-         for name, config in configs.items():
-             assert config.basepython == "python{}.{}".format(name[2], name[3])
- 
--    def test_default_factors_conflict(self, newconfig, capsys):
-+    def xtest_default_factors_conflict(self, newconfig, capsys):
-         with pytest.warns(UserWarning, match=r"conflicting basepython .*"):
-             config = newconfig(
-                 """
-diff --git a/tests/unit/interpreters/test_interpreters.py b/tests/unit/interpreters/test_interpreters.py
-index ea6f65d..e4f0e92 100644
---- a/tests/unit/interpreters/test_interpreters.py
-+++ b/tests/unit/interpreters/test_interpreters.py
-@@ -28,7 +28,7 @@ def create_interpreters_instance():
-     return Interpreters(hook=pm.hook)
- 
- 
--def test_tox_get_python_executable():
-+def xtest_tox_get_python_executable():
-     class envconfig:
-         basepython = sys.executable
-         envname = "pyxx"
-@@ -72,7 +72,7 @@ def test_tox_get_python_executable():
- 
- 
- @pytest.mark.skipif("sys.platform == 'win32'", reason="symlink execution unreliable on Windows")
--def test_find_alias_on_path(monkeypatch, tmp_path):
-+def xtest_find_alias_on_path(monkeypatch, tmp_path):
-     reporter.update_default_reporter(Verbosity.DEFAULT, Verbosity.DEBUG)
-     magic = tmp_path / "magic{}".format(os.path.splitext(sys.executable)[1])
-     os.symlink(sys.executable, str(magic))
-diff --git a/tests/unit/test_venv.py b/tests/unit/test_venv.py
-index 0523112..3db5416 100644
---- a/tests/unit/test_venv.py
-+++ b/tests/unit/test_venv.py
-@@ -445,7 +445,7 @@ def test_install_command_not_installed_bash(newmocksession):
-     mocksession.report.expect("warning", "*test command found but not*")
- 
- 
--def test_install_python3(newmocksession):
-+def xtest_install_python3(newmocksession):
-     if not py.path.local.sysfind("python3"):
-         pytest.skip("needs python3")
-     mocksession = newmocksession(
diff --git a/dev-python/tox/metadata.xml b/dev-python/tox/metadata.xml
index 9a563f6807cb..c562ca1f3995 100644
--- a/dev-python/tox/metadata.xml
+++ b/dev-python/tox/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">tox</remote-id>
 		<remote-id type="github">tox-dev/tox</remote-id>
diff --git a/dev-python/tox/tox-2.9.1.ebuild b/dev-python/tox/tox-2.9.1.ebuild
deleted file mode 100644
index 52fea638670c..000000000000
--- a/dev-python/tox/tox-2.9.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-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 ~amd64-linux ~x86-linux"
-
-IUSE="doc test"
-
-# tests need internet
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-1.11.2[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	>=dev-python/py-1.4.17[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	>=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# remove intersphinx stuff
-	sed -i -e "s/'sphinx.ext.intersphinx',//" doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${S}"/doc/build/html/. )
-	fi
-}
-
-python_test() {
-	esetup.py test || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.12.1.ebuild b/dev-python/tox/tox-3.12.1.ebuild
deleted file mode 100644
index 0b093a1f9d91..000000000000
--- a/dev-python/tox/tox-3.12.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~sparc ~x86"
-
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		<dev-python/flaky-4
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
-	)"
-
-# for some reason, --deselect doesn't work in tox's tests
-PATCHES=(
-	"${FILESDIR}/${PN}-3.12.1-skip-broken-tests.patch"
-	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
-)
-
-python_test() {
-	distutils_install_for_testing
-	pytest -v --no-network || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.14.4.ebuild b/dev-python/tox/tox-3.14.4.ebuild
deleted file mode 100644
index 188f784f7e8c..000000000000
--- a/dev-python/tox/tox-3.14.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc64 sparc x86"
-
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
-	' python3_{5,6,7} pypy3)
-	dev-python/packaging[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
-# TODO: figure out how to make tests work without the package being
-# installed first.
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		<dev-python/flaky-4
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
-		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# broken without internet
-	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
-		tests/unit/session/test_provision.py || die
-	sed -i -e 's:test_provision_interrupt_child:_&:' \
-		tests/integration/test_provision_int.py || die
-	# broken with our mock version (?)
-	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
-		tests/unit/test_venv.py || die
-	# broken with Gentoo Python layout
-	sed -i -e 's:test_tox_get_python_executable:_&:' \
-		-e 's:test_find_alias_on_path:_&:' \
-		tests/unit/interpreters/test_interpreters.py || die
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.14.5.ebuild b/dev-python/tox/tox-3.14.5.ebuild
deleted file mode 100644
index 3246135988a2..000000000000
--- a/dev-python/tox/tox-3.14.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
-	' python3_{5,6,7} pypy3)
-	dev-python/packaging[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
-# TODO: figure out how to make tests work without the package being
-# installed first.
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		<dev-python/flaky-4
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
-		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# broken without internet
-	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
-		tests/unit/session/test_provision.py || die
-	sed -i -e 's:test_provision_interrupt_child:_&:' \
-		tests/integration/test_provision_int.py || die
-	# broken with our mock version (?)
-	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
-		tests/unit/test_venv.py || die
-	# broken with Gentoo Python layout
-	sed -i -e 's:test_tox_get_python_executable:_&:' \
-		-e 's:test_find_alias_on_path:_&:' \
-		tests/unit/interpreters/test_interpreters.py || die
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.15.0.ebuild b/dev-python/tox/tox-3.15.0.ebuild
deleted file mode 100644
index dd501faa9ef5..000000000000
--- a/dev-python/tox/tox-3.15.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
-	' python3_{5,6,7} pypy3)
-	dev-python/packaging[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
-# TODO: figure out how to make tests work without the package being
-# installed first.
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		<dev-python/flaky-4
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
-		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# broken without internet
-	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
-		tests/unit/session/test_provision.py || die
-	sed -i -e 's:test_provision_interrupt_child:_&:' \
-		tests/integration/test_provision_int.py || die
-	# broken with our mock version (?)
-	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
-		tests/unit/test_venv.py || die
-	# broken with Gentoo Python layout
-	sed -i -e 's:test_tox_get_python_executable:_&:' \
-		-e 's:test_find_alias_on_path:_&:' \
-		tests/unit/interpreters/test_interpreters.py || die
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.15.1.ebuild b/dev-python/tox/tox-3.15.1.ebuild
deleted file mode 100644
index 0365e6a79004..000000000000
--- a/dev-python/tox/tox-3.15.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
-	' python3_{5,6,7} pypy3)
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
-# TODO: figure out how to make tests work without the package being
-# installed first.
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# broken without internet
-	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
-		tests/unit/session/test_provision.py || die
-	sed -i -e 's:test_provision_interrupt_child:_&:' \
-		tests/integration/test_provision_int.py || die
-	# broken with our mock version (?)
-	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
-		tests/unit/test_venv.py || die
-	# broken with Gentoo Python layout
-	sed -i -e 's:test_tox_get_python_executable:_&:' \
-		-e 's:test_find_alias_on_path:_&:' \
-		tests/unit/interpreters/test_interpreters.py || die
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.16.1.ebuild b/dev-python/tox/tox-3.16.1.ebuild
deleted file mode 100644
index 0365e6a79004..000000000000
--- a/dev-python/tox/tox-3.16.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
-	' python3_{5,6,7} pypy3)
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
-# TODO: figure out how to make tests work without the package being
-# installed first.
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# broken without internet
-	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
-		tests/unit/session/test_provision.py || die
-	sed -i -e 's:test_provision_interrupt_child:_&:' \
-		tests/integration/test_provision_int.py || die
-	# broken with our mock version (?)
-	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
-		tests/unit/test_venv.py || die
-	# broken with Gentoo Python layout
-	sed -i -e 's:test_tox_get_python_executable:_&:' \
-		-e 's:test_find_alias_on_path:_&:' \
-		tests/unit/interpreters/test_interpreters.py || die
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.15.2.ebuild b/dev-python/tox/tox-3.17.1.ebuild
index bc779e0a1099..8fcf947120f9 100644
--- a/dev-python/tox/tox-3.15.2.ebuild
+++ b/dev-python/tox/tox-3.17.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,8 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
-
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/tox/tox-3.16.0.ebuild b/dev-python/tox/tox-3.19.0.ebuild
index 0365e6a79004..499658c518d4 100644
--- a/dev-python/tox/tox-3.16.0.ebuild
+++ b/dev-python/tox/tox-3.19.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -15,7 +15,6 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/tox/tox-3.2.1.ebuild b/dev-python/tox/tox-3.2.1.ebuild
deleted file mode 100644
index b8798335d338..000000000000
--- a/dev-python/tox/tox-3.2.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-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 ~amd64-linux ~x86-linux"
-
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-1.11.2[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	>=dev-python/py-1.4.17[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-		<dev-python/pytest-4.0
-		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# remove intersphinx stuff
-	sed -i -e "s/'sphinx.ext.intersphinx',//" doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${S}"/doc/build/html/. )
-	fi
-}
-
-python_test() {
-	# TODO: find why these 8 tests excluded below fail.
-	pytest -v --no-network \
-		--deselect tests/test_config.py::test_plugin_require \
-		--deselect tests/test_docs.py::test_all_rst_ini_blocks_parse \
-		--deselect tests/test_interpreters.py::test_tox_get_python_executable \
-		--deselect tests/test_session.py::test_tox_parallel_build_safe \
-		--deselect tests/test_venv.py::test_install_python3 \
-		--deselect tests/test_z_cmdline.py::test_alwayscopy \
-		--deselect tests/test_z_cmdline.py::test_tox_quickstart_script \
-		--deselect tests/test_z_cmdline.py::test_tox_console_script \
-		|| die "Testsuite failed under ${EPYTHON}"
-}