From b1ec7f57e54bad19fce1842681d72ca06f7948bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 10 Feb 2023 06:56:28 +0100 Subject: [PATCH] dev-python/setuptools: Relax dev-python/packaging dep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Portage seems to have trouble with ordering the combined setuptools and packaging upgrade, and setuptools seems to work just fine (modulo a few tests relying on new packaging behavior) with the old version, so permit upgrading setuptools first. Signed-off-by: Michał Górny --- ...uptools-67.2.0.ebuild => setuptools-67.2.0-r1.ebuild} | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) rename dev-python/setuptools/{setuptools-67.2.0.ebuild => setuptools-67.2.0-r1.ebuild} (93%) diff --git a/dev-python/setuptools/setuptools-67.2.0.ebuild b/dev-python/setuptools/setuptools-67.2.0-r1.ebuild similarity index 93% rename from dev-python/setuptools/setuptools-67.2.0.ebuild rename to dev-python/setuptools/setuptools-67.2.0-r1.ebuild index b6d46c764db4c..f46eb55ab7f38 100644 --- a/dev-python/setuptools/setuptools-67.2.0.ebuild +++ b/dev-python/setuptools/setuptools-67.2.0-r1.ebuild @@ -30,7 +30,7 @@ RDEPEND=" >=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}] >=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}] >=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}] - >=dev-python/packaging-23[${PYTHON_USEDEP}] + >=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}] >=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}] >=dev-python/tomli-2.0.1[${PYTHON_USEDEP}] $(python_gen_cond_dep ' @@ -117,5 +117,12 @@ python_test() { setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts ) + if has_version "