From c6fc8da5ec1a267eb7ecb54233e81a2fe123c8fc Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 18 Oct 2025 12:51:22 +0100 Subject: [PATCH] app-emulation/qemu: fix Python BDEPEND for ensurepip python_gen_impl_dep with no arguments will use a blank PYTHON_REQ_USE rather than whatever is set in global scope, so use PYTHON_DEPS instead. The dep was correct in {R,}DEPEND for USE=python but not otherwise (in BDEPEND for the general case). Importantly, the eclass doesn't just add to BDEPEND for you either. Bug: https://bugs.gentoo.org/913084 Bug: https://bugs.gentoo.org/942466 Closes: https://bugs.gentoo.org/942518 Signed-off-by: Sam James --- app-emulation/qemu/qemu-10.0.0.ebuild | 2 +- app-emulation/qemu/qemu-10.0.2-r50.ebuild | 2 +- app-emulation/qemu/qemu-10.0.2.ebuild | 2 +- app-emulation/qemu/qemu-10.0.3.ebuild | 2 +- app-emulation/qemu/qemu-10.0.4.ebuild | 2 +- app-emulation/qemu/qemu-10.0.5.ebuild | 2 +- app-emulation/qemu/qemu-10.1.0.ebuild | 2 +- app-emulation/qemu/qemu-10.1.1.ebuild | 2 +- app-emulation/qemu/qemu-9.1.3-r2.ebuild | 2 +- app-emulation/qemu/qemu-9.2.3-r3.ebuild | 2 +- app-emulation/qemu/qemu-9.2.4.ebuild | 2 +- app-emulation/qemu/qemu-9999.ebuild | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app-emulation/qemu/qemu-10.0.0.ebuild b/app-emulation/qemu/qemu-10.0.0.ebuild index e7bd85081883c..e26552f6a5eb1 100644 --- a/app-emulation/qemu/qemu-10.0.0.ebuild +++ b/app-emulation/qemu/qemu-10.0.0.ebuild @@ -276,7 +276,7 @@ PPC_FIRMWARE_DEPEND=" # See bug #913084 for pip dep BDEPEND=" - $(python_gen_impl_dep) + ${PYTHON_DEPS} dev-python/distlib[${PYTHON_USEDEP}] dev-lang/perl >=dev-build/meson-0.63.0 diff --git a/app-emulation/qemu/qemu-10.0.2-r50.ebuild b/app-emulation/qemu/qemu-10.0.2-r50.ebuild index 31fc585a0b5cf..5f10bf150261b 100644 --- a/app-emulation/qemu/qemu-10.0.2-r50.ebuild +++ b/app-emulation/qemu/qemu-10.0.2-r50.ebuild @@ -290,7 +290,7 @@ PPC_FIRMWARE_DEPEND=" # See bug #913084 for pip dep BDEPEND=" - $(python_gen_impl_dep) + ${PYTHON_DEPS} dev-python/distlib[${PYTHON_USEDEP}] dev-lang/perl >=dev-build/meson-0.63.0 diff --git a/app-emulation/qemu/qemu-10.0.2.ebuild b/app-emulation/qemu/qemu-10.0.2.ebuild index bdcf47772e291..174e5d24269bd 100644 --- a/app-emulation/qemu/qemu-10.0.2.ebuild +++ b/app-emulation/qemu/qemu-10.0.2.ebuild @@ -276,7 +276,7 @@ PPC_FIRMWARE_DEPEND=" # See bug #913084 for pip dep BDEPEND=" - $(python_gen_impl_dep) + ${PYTHON_DEPS} dev-python/distlib[${PYTHON_USEDEP}] dev-lang/perl >=dev-build/meson-0.63.0 diff --git a/app-emulation/qemu/qemu-10.0.3.ebuild b/app-emulation/qemu/qemu-10.0.3.ebuild index 31fc585a0b5cf..5f10bf150261b 100644 --- a/app-emulation/qemu/qemu-10.0.3.ebuild +++ b/app-emulation/qemu/qemu-10.0.3.ebuild @@ -290,7 +290,7 @@ PPC_FIRMWARE_DEPEND=" # See bug #913084 for pip dep BDEPEND=" - $(python_gen_impl_dep) + ${PYTHON_DEPS} dev-python/distlib[${PYTHON_USEDEP}] dev-lang/perl >=dev-build/meson-0.63.0 diff --git a/app-emulation/qemu/qemu-10.0.4.ebuild b/app-emulation/qemu/qemu-10.0.4.ebuild index 31fc585a0b5cf..5f10bf150261b 100644 --- a/app-emulation/qemu/qemu-10.0.4.ebuild +++ b/app-emulation/qemu/qemu-10.0.4.ebuild @@ -290,7 +290,7 @@ PPC_FIRMWARE_DEPEND=" # See bug #913084 for pip dep BDEPEND=" - $(python_gen_impl_dep) + ${PYTHON_DEPS} dev-python/distlib[${PYTHON_USEDEP}] dev-lang/perl >=dev-build/meson-0.63.0 diff --git a/app-emulation/qemu/qemu-10.0.5.ebuild b/app-emulation/qemu/qemu-10.0.5.ebuild index e614bd979f4dd..29db7ab9be18f 100644 --- a/app-emulation/qemu/qemu-10.0.5.ebuild +++ b/app-emulation/qemu/qemu-10.0.5.ebuild @@ -290,7 +290,7 @@ PPC_FIRMWARE_DEPEND=" # See bug #913084 for pip dep BDEPEND=" - $(python_gen_impl_dep) + ${PYTHON_DEPS} dev-python/distlib[${PYTHON_USEDEP}] dev-lang/perl >=dev-build/meson-0.63.0 diff --git a/app-emulation/qemu/qemu-10.1.0.ebuild b/app-emulation/qemu/qemu-10.1.0.ebuild index 9b0a4a4e86d2e..906a00598ad1f 100644 --- a/app-emulation/qemu/qemu-10.1.0.ebuild +++ b/app-emulation/qemu/qemu-10.1.0.ebuild @@ -291,7 +291,7 @@ PPC_FIRMWARE_DEPEND=" # See bug #913084 for pip dep BDEPEND=" - $(python_gen_impl_dep) + ${PYTHON_DEPS} dev-python/distlib[${PYTHON_USEDEP}] dev-lang/perl >=dev-build/meson-0.63.0 diff --git a/app-emulation/qemu/qemu-10.1.1.ebuild b/app-emulation/qemu/qemu-10.1.1.ebuild index 0a641cc685be0..4b3579b0bc4b1 100644 --- a/app-emulation/qemu/qemu-10.1.1.ebuild +++ b/app-emulation/qemu/qemu-10.1.1.ebuild @@ -291,7 +291,7 @@ PPC_FIRMWARE_DEPEND=" # See bug #913084 for pip dep BDEPEND=" - $(python_gen_impl_dep) + ${PYTHON_DEPS} dev-python/distlib[${PYTHON_USEDEP}] dev-lang/perl >=dev-build/meson-0.63.0 diff --git a/app-emulation/qemu/qemu-9.1.3-r2.ebuild b/app-emulation/qemu/qemu-9.1.3-r2.ebuild index a8d792bdfc4a3..9089198ad371f 100644 --- a/app-emulation/qemu/qemu-9.1.3-r2.ebuild +++ b/app-emulation/qemu/qemu-9.1.3-r2.ebuild @@ -277,7 +277,7 @@ PPC_FIRMWARE_DEPEND=" # See bug #913084 for pip dep BDEPEND=" - $(python_gen_impl_dep) + ${PYTHON_DEPS} dev-python/distlib[${PYTHON_USEDEP}] dev-lang/perl >=dev-build/meson-0.63.0 diff --git a/app-emulation/qemu/qemu-9.2.3-r3.ebuild b/app-emulation/qemu/qemu-9.2.3-r3.ebuild index 3bb7630d8bb6a..e41c8a204c2c8 100644 --- a/app-emulation/qemu/qemu-9.2.3-r3.ebuild +++ b/app-emulation/qemu/qemu-9.2.3-r3.ebuild @@ -276,7 +276,7 @@ PPC_FIRMWARE_DEPEND=" # See bug #913084 for pip dep BDEPEND=" - $(python_gen_impl_dep) + ${PYTHON_DEPS} dev-python/distlib[${PYTHON_USEDEP}] dev-lang/perl >=dev-build/meson-0.63.0 diff --git a/app-emulation/qemu/qemu-9.2.4.ebuild b/app-emulation/qemu/qemu-9.2.4.ebuild index d64cf18f6a876..b1e3953c9aad8 100644 --- a/app-emulation/qemu/qemu-9.2.4.ebuild +++ b/app-emulation/qemu/qemu-9.2.4.ebuild @@ -276,7 +276,7 @@ PPC_FIRMWARE_DEPEND=" # See bug #913084 for pip dep BDEPEND=" - $(python_gen_impl_dep) + ${PYTHON_DEPS} dev-python/distlib[${PYTHON_USEDEP}] dev-lang/perl >=dev-build/meson-0.63.0 diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 60f62065cde28..2676d7c9b3ace 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -291,7 +291,7 @@ PPC_FIRMWARE_DEPEND=" # See bug #913084 for pip dep BDEPEND=" - $(python_gen_impl_dep) + ${PYTHON_DEPS} dev-python/distlib[${PYTHON_USEDEP}] dev-lang/perl >=dev-build/meson-0.63.0