commit:     f09045568b3e4ec1aab0e0f7a3c237671c6070b7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 16:18:46 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 16:20:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0904556

app-emulation/qemu: use PYTHON_REQ_USE for ensurepip

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

 app-emulation/qemu/qemu-8.1.5.ebuild    | 3 +--
 app-emulation/qemu/qemu-8.2.3.ebuild    | 3 +--
 app-emulation/qemu/qemu-8.2.5-r1.ebuild | 3 +--
 app-emulation/qemu/qemu-8.2.6-r1.ebuild | 3 +--
 app-emulation/qemu/qemu-8.2.7.ebuild    | 3 +--
 app-emulation/qemu/qemu-9.0.1-r1.ebuild | 3 +--
 app-emulation/qemu/qemu-9.0.2-r1.ebuild | 3 +--
 app-emulation/qemu/qemu-9.0.2-r2.ebuild | 3 +--
 app-emulation/qemu/qemu-9.0.3.ebuild    | 3 +--
 app-emulation/qemu/qemu-9.1.0.ebuild    | 3 +--
 app-emulation/qemu/qemu-9999.ebuild     | 3 +--
 11 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/app-emulation/qemu/qemu-8.1.5.ebuild 
b/app-emulation/qemu/qemu-8.1.5.ebuild
index 35d6d3be0431..1f2f4e207cf5 100644
--- a/app-emulation/qemu/qemu-8.1.5.ebuild
+++ b/app-emulation/qemu/qemu-8.1.5.ebuild
@@ -15,7 +15,7 @@ QEMU_DOCS_VERSION=8.1.0
 QEMU_DOC_USEFLAG="+doc"
 
 PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses,readline"
+PYTHON_REQ_USE="ensurepip(-),ncurses,readline"
 
 FIRMWARE_ABI_VERSION="7.2.0"
 
@@ -276,7 +276,6 @@ BDEPEND="
        dev-lang/perl
        >=dev-build/meson-0.63.0
        app-alternatives/ninja
-       || ( dev-python/pip[${PYTHON_USEDEP}] dev-lang/python[ensurepip(-)] )
        virtual/pkgconfig
        doc? (
                >=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]

diff --git a/app-emulation/qemu/qemu-8.2.3.ebuild 
b/app-emulation/qemu/qemu-8.2.3.ebuild
index b4ba7a97b5c4..6fbc52d1a747 100644
--- a/app-emulation/qemu/qemu-8.2.3.ebuild
+++ b/app-emulation/qemu/qemu-8.2.3.ebuild
@@ -14,7 +14,7 @@ QEMU_DOCS_VERSION=$(ver_cut 1-2).0
 QEMU_DOC_USEFLAG="+doc"
 
 PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses,readline"
+PYTHON_REQ_USE="ensurepip(-),ncurses,readline"
 
 FIRMWARE_ABI_VERSION="7.2.0"
 
@@ -281,7 +281,6 @@ BDEPEND="
        dev-lang/perl
        >=dev-build/meson-0.63.0
        app-alternatives/ninja
-       || ( dev-python/pip[${PYTHON_USEDEP}] dev-lang/python[ensurepip(-)] )
        virtual/pkgconfig
        doc? (
                >=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]

diff --git a/app-emulation/qemu/qemu-8.2.5-r1.ebuild 
b/app-emulation/qemu/qemu-8.2.5-r1.ebuild
index 43045f9c8ecf..55910aad6115 100644
--- a/app-emulation/qemu/qemu-8.2.5-r1.ebuild
+++ b/app-emulation/qemu/qemu-8.2.5-r1.ebuild
@@ -14,7 +14,7 @@ QEMU_DOCS_VERSION=$(ver_cut 1-2).0
 QEMU_DOC_USEFLAG="+doc"
 
 PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses,readline"
+PYTHON_REQ_USE="ensurepip(-),ncurses,readline"
 
 FIRMWARE_ABI_VERSION="7.2.0"
 
@@ -281,7 +281,6 @@ BDEPEND="
        dev-lang/perl
        >=dev-build/meson-0.63.0
        app-alternatives/ninja
-       || ( dev-python/pip[${PYTHON_USEDEP}] dev-lang/python[ensurepip(-)] )
        virtual/pkgconfig
        doc? (
                >=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]

diff --git a/app-emulation/qemu/qemu-8.2.6-r1.ebuild 
b/app-emulation/qemu/qemu-8.2.6-r1.ebuild
index 43045f9c8ecf..55910aad6115 100644
--- a/app-emulation/qemu/qemu-8.2.6-r1.ebuild
+++ b/app-emulation/qemu/qemu-8.2.6-r1.ebuild
@@ -14,7 +14,7 @@ QEMU_DOCS_VERSION=$(ver_cut 1-2).0
 QEMU_DOC_USEFLAG="+doc"
 
 PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses,readline"
+PYTHON_REQ_USE="ensurepip(-),ncurses,readline"
 
 FIRMWARE_ABI_VERSION="7.2.0"
 
@@ -281,7 +281,6 @@ BDEPEND="
        dev-lang/perl
        >=dev-build/meson-0.63.0
        app-alternatives/ninja
-       || ( dev-python/pip[${PYTHON_USEDEP}] dev-lang/python[ensurepip(-)] )
        virtual/pkgconfig
        doc? (
                >=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]

diff --git a/app-emulation/qemu/qemu-8.2.7.ebuild 
b/app-emulation/qemu/qemu-8.2.7.ebuild
index 43045f9c8ecf..55910aad6115 100644
--- a/app-emulation/qemu/qemu-8.2.7.ebuild
+++ b/app-emulation/qemu/qemu-8.2.7.ebuild
@@ -14,7 +14,7 @@ QEMU_DOCS_VERSION=$(ver_cut 1-2).0
 QEMU_DOC_USEFLAG="+doc"
 
 PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses,readline"
+PYTHON_REQ_USE="ensurepip(-),ncurses,readline"
 
 FIRMWARE_ABI_VERSION="7.2.0"
 
@@ -281,7 +281,6 @@ BDEPEND="
        dev-lang/perl
        >=dev-build/meson-0.63.0
        app-alternatives/ninja
-       || ( dev-python/pip[${PYTHON_USEDEP}] dev-lang/python[ensurepip(-)] )
        virtual/pkgconfig
        doc? (
                >=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]

diff --git a/app-emulation/qemu/qemu-9.0.1-r1.ebuild 
b/app-emulation/qemu/qemu-9.0.1-r1.ebuild
index 59ca4a81c91c..a311c317d5d6 100644
--- a/app-emulation/qemu/qemu-9.0.1-r1.ebuild
+++ b/app-emulation/qemu/qemu-9.0.1-r1.ebuild
@@ -14,7 +14,7 @@ QEMU_DOCS_VERSION=$(ver_cut 1-2).0
 QEMU_DOC_USEFLAG="+doc"
 
 PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses,readline"
+PYTHON_REQ_USE="ensurepip(-),ncurses,readline"
 
 FIRMWARE_ABI_VERSION="7.2.0"
 
@@ -281,7 +281,6 @@ BDEPEND="
        dev-lang/perl
        >=dev-build/meson-0.63.0
        app-alternatives/ninja
-       || ( dev-python/pip[${PYTHON_USEDEP}] dev-lang/python[ensurepip(-)] )
        virtual/pkgconfig
        doc? (
                >=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]

diff --git a/app-emulation/qemu/qemu-9.0.2-r1.ebuild 
b/app-emulation/qemu/qemu-9.0.2-r1.ebuild
index 59ca4a81c91c..a311c317d5d6 100644
--- a/app-emulation/qemu/qemu-9.0.2-r1.ebuild
+++ b/app-emulation/qemu/qemu-9.0.2-r1.ebuild
@@ -14,7 +14,7 @@ QEMU_DOCS_VERSION=$(ver_cut 1-2).0
 QEMU_DOC_USEFLAG="+doc"
 
 PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses,readline"
+PYTHON_REQ_USE="ensurepip(-),ncurses,readline"
 
 FIRMWARE_ABI_VERSION="7.2.0"
 
@@ -281,7 +281,6 @@ BDEPEND="
        dev-lang/perl
        >=dev-build/meson-0.63.0
        app-alternatives/ninja
-       || ( dev-python/pip[${PYTHON_USEDEP}] dev-lang/python[ensurepip(-)] )
        virtual/pkgconfig
        doc? (
                >=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]

diff --git a/app-emulation/qemu/qemu-9.0.2-r2.ebuild 
b/app-emulation/qemu/qemu-9.0.2-r2.ebuild
index dc913c05846f..e713c9e7834e 100644
--- a/app-emulation/qemu/qemu-9.0.2-r2.ebuild
+++ b/app-emulation/qemu/qemu-9.0.2-r2.ebuild
@@ -14,7 +14,7 @@ QEMU_DOCS_VERSION=$(ver_cut 1-2).0
 QEMU_DOC_USEFLAG="+doc"
 
 PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="ncurses,readline"
+PYTHON_REQ_USE="ensurepip(-),ncurses,readline"
 
 FIRMWARE_ABI_VERSION="7.2.0"
 
@@ -283,7 +283,6 @@ BDEPEND="
        dev-lang/perl
        >=dev-build/meson-0.63.0
        app-alternatives/ninja
-       || ( dev-python/pip[${PYTHON_USEDEP}] dev-lang/python[ensurepip(-)] )
        virtual/pkgconfig
        doc? (
                >=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]

diff --git a/app-emulation/qemu/qemu-9.0.3.ebuild 
b/app-emulation/qemu/qemu-9.0.3.ebuild
index dc913c05846f..e713c9e7834e 100644
--- a/app-emulation/qemu/qemu-9.0.3.ebuild
+++ b/app-emulation/qemu/qemu-9.0.3.ebuild
@@ -14,7 +14,7 @@ QEMU_DOCS_VERSION=$(ver_cut 1-2).0
 QEMU_DOC_USEFLAG="+doc"
 
 PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="ncurses,readline"
+PYTHON_REQ_USE="ensurepip(-),ncurses,readline"
 
 FIRMWARE_ABI_VERSION="7.2.0"
 
@@ -283,7 +283,6 @@ BDEPEND="
        dev-lang/perl
        >=dev-build/meson-0.63.0
        app-alternatives/ninja
-       || ( dev-python/pip[${PYTHON_USEDEP}] dev-lang/python[ensurepip(-)] )
        virtual/pkgconfig
        doc? (
                >=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]

diff --git a/app-emulation/qemu/qemu-9.1.0.ebuild 
b/app-emulation/qemu/qemu-9.1.0.ebuild
index cc6969fec46f..41f8903faa11 100644
--- a/app-emulation/qemu/qemu-9.1.0.ebuild
+++ b/app-emulation/qemu/qemu-9.1.0.ebuild
@@ -14,7 +14,7 @@ QEMU_DOCS_VERSION=$(ver_cut 1-3)
 QEMU_DOC_USEFLAG="+doc"
 
 PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="ncurses,readline"
+PYTHON_REQ_USE="ensurepip(-),ncurses,readline"
 
 FIRMWARE_ABI_VERSION="7.2.0"
 
@@ -282,7 +282,6 @@ BDEPEND="
        dev-lang/perl
        >=dev-build/meson-0.63.0
        app-alternatives/ninja
-       || ( dev-python/pip[${PYTHON_USEDEP}] dev-lang/python[ensurepip(-)] )
        virtual/pkgconfig
        doc? (
                >=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]

diff --git a/app-emulation/qemu/qemu-9999.ebuild 
b/app-emulation/qemu/qemu-9999.ebuild
index cc6969fec46f..41f8903faa11 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -14,7 +14,7 @@ QEMU_DOCS_VERSION=$(ver_cut 1-3)
 QEMU_DOC_USEFLAG="+doc"
 
 PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="ncurses,readline"
+PYTHON_REQ_USE="ensurepip(-),ncurses,readline"
 
 FIRMWARE_ABI_VERSION="7.2.0"
 
@@ -282,7 +282,6 @@ BDEPEND="
        dev-lang/perl
        >=dev-build/meson-0.63.0
        app-alternatives/ninja
-       || ( dev-python/pip[${PYTHON_USEDEP}] dev-lang/python[ensurepip(-)] )
        virtual/pkgconfig
        doc? (
                >=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]

Reply via email to