gentoo resync : 25.09.2021

4 files changed, 8 insertions, 79 deletions

diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 5078be9bad45..f2a59175955f 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,7 +1,5 @@
-DIST tox-3.24.1.tar.gz 305886 BLAKE2B fcedf8054a19a79045b2edead599fb11b7942986fa4bbc184140603e3bc6700eada452e661f4a576d029804ab2a9282df0cf9198eee9b483c2c6c68b086ee156 SHA512 e4bfb3dab15887ce6432a91b88a7387179cbf2a5ab5fa608b3f1f7349be4122d76ce01d396ae9b1515c211f2905d110a8414e254cc72bcf8a74542db98ea52de
-DIST tox-3.24.2.tar.gz 305924 BLAKE2B f91af9fdb4de94eb9ecf65774619234f1e52827c7c6e3ce75ca8161564f8cdc8af210f229ae07f5d381f7964cbbc936f47d4242848513c9bf1c8989a73fe0420 SHA512 e33a1126440ac53cf07cd7dbe695ea1307ebad92e0ed4d6e6c738affa059104f1b5bfc360883283ddd59e5156f7bb00c52d2d2ddd2294b6664f22a2abaaf66c3
 DIST tox-3.24.3.tar.gz 306285 BLAKE2B 368eaf959533f62b08d6e44929ae327ff25ea6eca25a3f47c7b9945428821bf80ab7e0ab4daea8821b55b9a7a009f30c3d5641812fd444a86577ea0ae83adb7d SHA512 de1c1ccc3a277c617521e77806d1d993a5c19f811016bebc442bfea12c3d40a22bf80b7d11b11744a5ddf705c6e8955f2811f149d413ea8522d94c985ed1f715
-EBUILD tox-3.24.1.ebuild 2134 BLAKE2B 9589d30a68afe753813e64b7ec5d8a60db842c08634d4e94f8bf942d022fd75c93901a05e234a10a3354b6e3fba88bce5fb868e1d76ad181efac7fcc88fed1bf SHA512 ed38d8c09730746beff05bbb9c9813fa5db5205d462252cfcd4dac19d32fdbe6e7713cefdc16f9f7c8ab6a19b73f9831b9eb7feff3e7b61d3953e00f30038caa
-EBUILD tox-3.24.2.ebuild 2141 BLAKE2B d27b4a9b6e0d4e0bb963365c26e2cfd9e90a1bdcac628335240c3360a589c07d9d79cd3cf98900484ef21fb6cef467d81f3bd0ede54ab37a852394ac2d8fbec5 SHA512 4607531b81a352bd6d6e6d7f7711eca0d8a14161e4e704adba48d175b2f86e3d508f57798bec24c7dc8dbf1354821bf96df831699d395fc4760add99e65e9f6c
-EBUILD tox-3.24.3.ebuild 2147 BLAKE2B 9a9cde24dbd680f2d687e1a7af0467a95da864cb930cb87a042acbdef0507fc211ef5225c69c9f700f0ba63cccf06435986ce5362a1232ab66439c842a29858a SHA512 f1e893873df23c2157d3e7de09bc0ac76f8b06bd069e2f91ec8296555ba1b62424010240e79511a00d865ec210f116891b61cb221b3351f9a27c089ad7a3305c
+DIST tox-3.24.4.tar.gz 306760 BLAKE2B 332c99d021bc3c25549fd95d051baaa1f0dc3aaf776928320826bb7e6bce6444fd5a993e1dbff3a4ebbde9dbb59e30d07eae4b04096294b3a186b130b8312587 SHA512 49e2cb74f119b5cc049d2a64479e56307cea1f36a5586840cca12cb8f4ce8a2ba991cc6142bef7f095a7d32b44f7513f89cce56d89deaff0e12194ceb3da6249
+EBUILD tox-3.24.3.ebuild 2140 BLAKE2B 7a0ce5f2f7d3810c8353be7ff636bacb254a04af8c2000c08eec3ec643c259a0dfca8fb013e703c6c67056916051a8be70256d3de78b499f198fc0e2c0b685bb SHA512 0eb0ade1379a295ecae8aa8d14402a1dc15e698fb034dfc6d927b3336651100b5f5325511a0b5fe51a3158ea6324bfd7a25d357f4870e238e8062efc93a297ff
+EBUILD tox-3.24.4.ebuild 2134 BLAKE2B de098e35b77564825d15e76a5f39fe55091c91ef7cd0dc66c60f52ad55881257b9cd30728d29953cf4a85b34b25db9b9d0b7fe1278a05373b9adc861f8d3ff02 SHA512 2ec2311c1e2e6efa4be096ff7ba52426450d8e3241f2d92d92b943230f9d0590d06f3a58fb9670239b2d8ae904a51a3318c1ae429d88a05cdd0cd1a5a140b76b
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-3.24.1.ebuild b/dev-python/tox/tox-3.24.1.ebuild
deleted file mode 100644
index 57560d97071e..000000000000
--- a/dev-python/tox/tox-3.24.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} 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 ~mips ppc ppc64 ~riscv 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}]
-	' 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/pytest-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local deselect=(
-		# broken without Internet
-		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
-		tests/integration/test_provision_int.py::test_provision_interrupt_child
-
-		# expects python2 to exist
-		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
-	)
-
-	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
-		# TODO?
-		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
-
-		# broken without tox installed first
-		# TODO: why it can't import itself?
-		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
-	)
-
-	distutils_install_for_testing --via-venv
-	epytest --no-network ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/tox/tox-3.24.3.ebuild b/dev-python/tox/tox-3.24.3.ebuild
index 5099e4959d85..93e2236b0b8d 100644
--- a/dev-python/tox/tox-3.24.3.ebuild
+++ b/dev-python/tox/tox-3.24.3.ebuild
@@ -12,7 +12,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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/tox/tox-3.24.2.ebuild b/dev-python/tox/tox-3.24.4.ebuild
index 1e0885d735ef..c0eac290ef6e 100644
--- a/dev-python/tox/tox-3.24.2.ebuild
+++ b/dev-python/tox/tox-3.24.4.ebuild
@@ -12,7 +12,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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
@@ -46,7 +46,7 @@ src_configure() {
 }
 
 python_test() {
-	local deselect=(
+	local EPYTEST_DESELECT=(
 		# broken without Internet
 		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
 		tests/integration/test_provision_int.py::test_provision_interrupt_child
@@ -55,7 +55,7 @@ python_test() {
 		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
 	)
 
-	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
+	[[ ${EPYTHON} != pypy3 ]] && EPYTEST_DESELECT+=(
 		# TODO?
 		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
 
@@ -65,5 +65,5 @@ python_test() {
 	)
 
 	distutils_install_for_testing --via-venv
-	epytest --no-network ${deselect[@]/#/--deselect }
+	epytest --no-network
 }