commit: a9ca061a7fa2393c69be5b3de53bac2db1289ef1 Author: NRK <nrk <AT> disroot <DOT> org> AuthorDate: Tue Sep 10 12:27:07 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Oct 12 16:20:51 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9ca061a
app-emulation/qemu: also allow python[ensurepip] according to upstream comment [0] python[ensurepip] should also work as a fallback if pip is missing. tested and confirmed to build fine with qemu-9.0.2. 0: https://gitlab.com/qemu-project/qemu/-/commit/81e2b198a8c Bug: https://bugs.gentoo.org/913084 Signed-off-by: NRK <nrk <AT> disroot.org> Closes: https://github.com/gentoo/gentoo/pull/38549 Signed-off-by: Sam James <sam <AT> gentoo.org> app-emulation/qemu/qemu-8.1.5.ebuild | 2 +- app-emulation/qemu/qemu-8.2.3.ebuild | 2 +- app-emulation/qemu/qemu-8.2.5-r1.ebuild | 2 +- app-emulation/qemu/qemu-8.2.6-r1.ebuild | 2 +- app-emulation/qemu/qemu-8.2.7.ebuild | 2 +- app-emulation/qemu/qemu-9.0.1-r1.ebuild | 2 +- app-emulation/qemu/qemu-9.0.2-r1.ebuild | 2 +- app-emulation/qemu/qemu-9.0.2-r2.ebuild | 2 +- app-emulation/qemu/qemu-9.0.3.ebuild | 2 +- app-emulation/qemu/qemu-9.1.0.ebuild | 2 +- app-emulation/qemu/qemu-9999.ebuild | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app-emulation/qemu/qemu-8.1.5.ebuild b/app-emulation/qemu/qemu-8.1.5.ebuild index 8ab472d7d422..35d6d3be0431 100644 --- a/app-emulation/qemu/qemu-8.1.5.ebuild +++ b/app-emulation/qemu/qemu-8.1.5.ebuild @@ -276,7 +276,7 @@ BDEPEND=" dev-lang/perl >=dev-build/meson-0.63.0 app-alternatives/ninja - dev-python/pip[${PYTHON_USEDEP}] + || ( 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 fc8ef10ae81f..b4ba7a97b5c4 100644 --- a/app-emulation/qemu/qemu-8.2.3.ebuild +++ b/app-emulation/qemu/qemu-8.2.3.ebuild @@ -281,7 +281,7 @@ BDEPEND=" dev-lang/perl >=dev-build/meson-0.63.0 app-alternatives/ninja - dev-python/pip[${PYTHON_USEDEP}] + || ( 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 542c81a40465..43045f9c8ecf 100644 --- a/app-emulation/qemu/qemu-8.2.5-r1.ebuild +++ b/app-emulation/qemu/qemu-8.2.5-r1.ebuild @@ -281,7 +281,7 @@ BDEPEND=" dev-lang/perl >=dev-build/meson-0.63.0 app-alternatives/ninja - dev-python/pip[${PYTHON_USEDEP}] + || ( 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 542c81a40465..43045f9c8ecf 100644 --- a/app-emulation/qemu/qemu-8.2.6-r1.ebuild +++ b/app-emulation/qemu/qemu-8.2.6-r1.ebuild @@ -281,7 +281,7 @@ BDEPEND=" dev-lang/perl >=dev-build/meson-0.63.0 app-alternatives/ninja - dev-python/pip[${PYTHON_USEDEP}] + || ( 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 542c81a40465..43045f9c8ecf 100644 --- a/app-emulation/qemu/qemu-8.2.7.ebuild +++ b/app-emulation/qemu/qemu-8.2.7.ebuild @@ -281,7 +281,7 @@ BDEPEND=" dev-lang/perl >=dev-build/meson-0.63.0 app-alternatives/ninja - dev-python/pip[${PYTHON_USEDEP}] + || ( 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 2a6e393f87d9..59ca4a81c91c 100644 --- a/app-emulation/qemu/qemu-9.0.1-r1.ebuild +++ b/app-emulation/qemu/qemu-9.0.1-r1.ebuild @@ -281,7 +281,7 @@ BDEPEND=" dev-lang/perl >=dev-build/meson-0.63.0 app-alternatives/ninja - dev-python/pip[${PYTHON_USEDEP}] + || ( 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 2a6e393f87d9..59ca4a81c91c 100644 --- a/app-emulation/qemu/qemu-9.0.2-r1.ebuild +++ b/app-emulation/qemu/qemu-9.0.2-r1.ebuild @@ -281,7 +281,7 @@ BDEPEND=" dev-lang/perl >=dev-build/meson-0.63.0 app-alternatives/ninja - dev-python/pip[${PYTHON_USEDEP}] + || ( 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 2a81130d99cc..dc913c05846f 100644 --- a/app-emulation/qemu/qemu-9.0.2-r2.ebuild +++ b/app-emulation/qemu/qemu-9.0.2-r2.ebuild @@ -283,7 +283,7 @@ BDEPEND=" dev-lang/perl >=dev-build/meson-0.63.0 app-alternatives/ninja - dev-python/pip[${PYTHON_USEDEP}] + || ( 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 2a81130d99cc..dc913c05846f 100644 --- a/app-emulation/qemu/qemu-9.0.3.ebuild +++ b/app-emulation/qemu/qemu-9.0.3.ebuild @@ -283,7 +283,7 @@ BDEPEND=" dev-lang/perl >=dev-build/meson-0.63.0 app-alternatives/ninja - dev-python/pip[${PYTHON_USEDEP}] + || ( 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 e1255ec74319..cc6969fec46f 100644 --- a/app-emulation/qemu/qemu-9.1.0.ebuild +++ b/app-emulation/qemu/qemu-9.1.0.ebuild @@ -282,7 +282,7 @@ BDEPEND=" dev-lang/perl >=dev-build/meson-0.63.0 app-alternatives/ninja - dev-python/pip[${PYTHON_USEDEP}] + || ( 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 e1255ec74319..cc6969fec46f 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -282,7 +282,7 @@ BDEPEND=" dev-lang/perl >=dev-build/meson-0.63.0 app-alternatives/ninja - dev-python/pip[${PYTHON_USEDEP}] + || ( dev-python/pip[${PYTHON_USEDEP}] dev-lang/python[ensurepip(-)] ) virtual/pkgconfig doc? ( >=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
