commit:     85ba2adbcb631fc6a5399fd89cb4a03ffcc00236
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 04:03:54 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 04:04:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85ba2adb

sys-apps/portage: depend on >=dev-build/meson-1.3.0-r1 in live

No need for the || ( ... ) dance now and it lets us drop the setuptools
dep as >=1.3.0 doesn't use distutils, but sysconfig.

Noticed when looking at bug #906991 which I'd forgot about.

Bug: https://bugs.gentoo.org/906991
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/portage/portage-9999.ebuild | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/sys-apps/portage/portage-9999.ebuild 
b/sys-apps/portage/portage-9999.ebuild
index 56a051fcc8d0..46cdd5855772 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -29,21 +29,10 @@ IUSE="apidoc build doc gentoo-dev +ipc +native-extensions 
+rsync-verify selinux
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
-# setuptools is still needed as a workaround for Python 3.12+ for now.
-# https://github.com/mesonbuild/meson/issues/7702
-#
-# >=meson-1.2.1-r1 for bug #912051
 BDEPEND="
        ${PYTHON_DEPS}
        >=app-arch/tar-1.27
-       >=dev-build/meson-1.2.1-r1
-       || (
-               >=dev-build/meson-1.3.0-r1
-               <dev-build/meson-1.3.0
-       )
-       $(python_gen_cond_dep '
-               dev-python/setuptools[${PYTHON_USEDEP}]
-       ' python3_12)
+       >=dev-build/meson-1.3.0-r1
        >=sys-apps/sed-4.0.5
        sys-devel/patch
        !build? ( $(python_gen_impl_dep 'ssl(+)') )

Reply via email to