gentoo auto-resync : 10:12:2022 - 09:20:14

4 files changed, 11 insertions, 152 deletions

diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index b5fa027bd322..af7ec78efc31 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,9 +1,5 @@
 DIST tox-3.27.1.gh.tar.gz 309006 BLAKE2B fa8aaa9cd5b03e54c166bb6b748290420b91498b26d2d124d9f88a64806b9ac0578c1886845b25aa024907f6a782c45609fa6c7657d9e1f538b59c2d9f0f4e14 SHA512 5f568bc6c53f871aae91928681dd6f2419b876a8e6ca925e65abae845b548ee3d00513741882875bbbacb78bf64935228d98213f940d3da8c3f788b73f177b79
-DIST tox-4.0.0rc1.gh.tar.gz 273212 BLAKE2B c9123aa23185655c32ebac36adf24ba8cfc57e8a94c011657acff6a5ce5bede8b14218a21a8cae099fdc2af938343336bea7fed802f8f73bc7769cd17b52d918 SHA512 6619fad1a080a095b827968972dd0d854ca5b48b81ef6548d8c39accc30c0279f9e0cc4208b148920e51fe304328dbdf4f4a8c4554b32398baf243484bba338d
-DIST tox-4.0.0rc3.gh.tar.gz 274520 BLAKE2B 374db4d553f2fa5188fa911058f5bca8230a88f88607d0d633801e504e4a55db29942cc359bc825d94cf2004c357cc32ec1550a83bdd03df23b2e068d787de70 SHA512 0f8ba364d0bcf25eff241361a567863f70bd9443724ebdef04b94d91ecc8b1e7b34804a0d47b7d78fd391962fda0409ce1ab95b45dc6ba2d4738a474a814c0af
-DIST tox-4.0.0rc4.gh.tar.gz 274617 BLAKE2B 7b9c6cf3c556f90952963a124678c634b11802b0a79f1a576589a0ccc388bcb2b7af9f1dccb65a215645fab426a6e648ebc856b7648a257ae362b720eaa7c6da SHA512 28de8d308a90b42c3ee20f2e6627396c1baea698aad38ec366912f8a617821f48f9a8b2246f112cc637b77f451277ccc70546bdf44d240da1d534186daa33c41
+DIST tox-4.0.5.gh.tar.gz 277741 BLAKE2B 19250ec4365a38a149c59de99ebd3b819cc4aba7721c076cc6700a17eb56b7c4b61d5c3b11046dc6857d082f1c04e98c6a78b8c768551468bca5a6810c4b7749 SHA512 7bc6f5479df577b66a7e43b61520995d1d31d056baf5b6297d9dc6acb19da58ed1f7d0db13930ab114417f0ad752799ac512765af18041ec800022b18676db20
 EBUILD tox-3.27.1.ebuild 1916 BLAKE2B ab2496317d588c05936d57132d1c759c9a14f18c10fb50d6188b7bee5bd20de9f06b5d8945a908cbf021f4b7036ba6d23dcf19aad63af9d6cd6bf6baa598ad32 SHA512 b038f9976de8af46ac663faa169a06fad1bd28ef61738679fd70faa5e655c0c85ed3a8e4efddee2dd2aff8cc3fe9f5ec133311d122c6bab15c487a5a074a6c11
-EBUILD tox-4.0.0_rc1.ebuild 1725 BLAKE2B 2a0926b4988e0c068003101b06504980e01880ffdea57dd25752a06c8d64f07839545d33babee4b3429dd1ee015fe22bf8b2f1f6a99c342b8acb02246a977501 SHA512 2d446a6460d317f3292c2dee9c1d4cdf87c4c680e78e11868fd5e1b4e4645053a910d6dc77a813a0056ad908fab0584b64f4d0bfa6a51aa34b96880222a7bc07
-EBUILD tox-4.0.0_rc3.ebuild 2025 BLAKE2B 512c198d235fe049723d2521fb771631c0259eadb2c1dc60812beb3d4c8a5547eecd67a1e812461dc1d22f45bb0dec750a9f6e3f5dcc52a7455f1b338d44fdcb SHA512 466018bd2256f048c43391b40a0ea1d9f8fbae482ad58c6bb22053a614ad8d090a6bec10606503aebba0aebb9d8d27ef590c865e5803869c8032119132e6f9d4
-EBUILD tox-4.0.0_rc4.ebuild 2199 BLAKE2B 0bfffc8b780aabffb19ecdb1a912d06d6ee78358f4efc409938fff286efe40fb0f193baa1214815f2037930bd3ae9bcfc7fcc9291d5c10a52696a15ac5b3757b SHA512 6565ebfd7acd77224a2eb08b75bed0b8052a0b1c71a04bc24b549dc81b2c0a0ca4e714c1ef05cb12d595a585a5a30a7ea286e20f82494214a2fe4a3c70ad3a81
+EBUILD tox-4.0.5.ebuild 2398 BLAKE2B a8a4d53f19e306c32fe542fb0ebb132bcbfe29c54a96f6f090b1beec6c85763ea04d77ab592a7fe20214724295e1a5d4c0740d99644d513dc9f7a311f4c3c5dc SHA512 be8ec59aad967e10ae4c3b03313c6f3ea2bf4491084517875130e737836e3a66c9e7acf29de522cb3ae7b4d445910334d64e070a53db15b8f761e7b3b886aa06
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-4.0.0_rc1.ebuild b/dev-python/tox/tox-4.0.0_rc1.ebuild
deleted file mode 100644
index 80a5a3f20af3..000000000000
--- a/dev-python/tox/tox-4.0.0_rc1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-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
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/cachetools-5.2[${PYTHON_USEDEP}]
-	>=dev-python/chardet-5[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.5.4[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-api-1.1.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	>=dev-python/virtualenv-20.16.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/filelock-3.8[${PYTHON_USEDEP}]
-		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
-		>=dev-python/time-machine-2.8.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-	)
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.0.0_rc3.ebuild b/dev-python/tox/tox-4.0.0_rc3.ebuild
deleted file mode 100644
index 2f7f84091c61..000000000000
--- a/dev-python/tox/tox-4.0.0_rc3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-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
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/cachetools-5.2[${PYTHON_USEDEP}]
-	>=dev-python/chardet-5.1[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.8.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.5.4[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-api-1.2.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	>=dev-python/virtualenv-20.17.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
-		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
-		>=dev-python/time-machine-2.8.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.0.0_rc4.ebuild b/dev-python/tox/tox-4.0.5.ebuild
index 70d37dba6579..ed83ca51ba13 100644
--- a/dev-python/tox/tox-4.0.0_rc4.ebuild
+++ b/dev-python/tox/tox-4.0.5.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
 	>=dev-python/filelock-3.8.2[${PYTHON_USEDEP}]
 	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.5.4[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.6[${PYTHON_USEDEP}]
 	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
 	>=dev-python/pyproject-api-1.2.1[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
@@ -40,7 +40,7 @@ RDEPEND="
 	>=dev-python/virtualenv-20.17.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	>=dev-python/hatch-vcs-0.2.1[${PYTHON_USEDEP}]
 	test? (
 		dev-python/build[${PYTHON_USEDEP}]
 		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
@@ -59,6 +59,13 @@ distutils_enable_tests pytest
 
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 
+src_prepare() {
+	# the minimal bounds in tox are entirely meaningless and new packaging
+	# breaks setuptools
+	sed -i -e '/packaging/s:>=22::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	# devpi_process is not packaged, and has lots of dependencies
 	cat > "${T}"/devpi_process.py <<-EOF || die