app-emulation/qemu: Sync with Gentoo

It's from Gentoo commit 9ada4ee70b6abcf9efc8833c6ac0101b15cb2213.
This commit is contained in:
Flatcar Buildbot 2024-10-21 07:04:47 +00:00
parent 1d1a10b1c4
commit afe741b375
16 changed files with 160 additions and 171 deletions

View File

@ -13,7 +13,7 @@ QEMU_DOCS_VERSION="7.2.0"
# bug #830088
QEMU_DOC_USEFLAG="+doc"
PYTHON_COMPAT=( python3_{10,11} )
PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="ncurses,readline"
FIRMWARE_ABI_VERSION="7.2.0"
@ -240,15 +240,15 @@ SEABIOS_VERSION="1.16.0"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@ -930,10 +930,10 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware blobs:"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -957,10 +957,10 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -13,7 +13,7 @@ QEMU_DOCS_VERSION="7.2.0"
# bug #830088
QEMU_DOC_USEFLAG="+doc"
PYTHON_COMPAT=( python3_{10,11} )
PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="ncurses,readline"
FIRMWARE_ABI_VERSION="7.2.0"
@ -240,15 +240,15 @@ SEABIOS_VERSION="1.16.0"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@ -930,10 +930,10 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware blobs:"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -957,10 +957,10 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -13,7 +13,7 @@ QEMU_DOCS_VERSION="7.2.0"
# bug #830088
QEMU_DOC_USEFLAG="+doc"
PYTHON_COMPAT=( python3_{10,11} )
PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="ncurses,readline"
FIRMWARE_ABI_VERSION="7.2.0"
@ -240,15 +240,15 @@ SEABIOS_VERSION="1.16.0"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@ -930,10 +930,10 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware blobs:"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -957,10 +957,10 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -13,7 +13,7 @@ QEMU_DOCS_VERSION="7.2.0"
# bug #830088
QEMU_DOC_USEFLAG="+doc"
PYTHON_COMPAT=( python3_{10,11} )
PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="ncurses,readline"
FIRMWARE_ABI_VERSION="7.2.0"
@ -41,7 +41,7 @@ else
fi
S="${WORKDIR}/${MY_P}"
[[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
[[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@ -240,15 +240,15 @@ SEABIOS_VERSION="1.16.0"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@ -930,10 +930,10 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware blobs:"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -957,10 +957,10 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -240,15 +240,15 @@ SEABIOS_VERSION="1.16.0"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@ -931,10 +931,10 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware blobs:"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -958,10 +958,10 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -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"
@ -240,15 +240,15 @@ SEABIOS_VERSION="1.16.0"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@ -276,7 +276,6 @@ BDEPEND="
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
dev-python/pip[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (
>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
@ -931,10 +930,10 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware blobs:"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -958,10 +957,10 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -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"
@ -245,15 +245,15 @@ SEABIOS_VERSION="1.16.0"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@ -281,7 +281,6 @@ BDEPEND="
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
dev-python/pip[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (
>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
@ -951,10 +950,10 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware blobs:"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -978,10 +977,10 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -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"
@ -245,15 +245,15 @@ SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@ -281,7 +281,6 @@ BDEPEND="
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
dev-python/pip[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (
>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
@ -951,10 +950,10 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware blobs:"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -978,10 +977,10 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -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"
@ -245,15 +245,15 @@ SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@ -281,7 +281,6 @@ BDEPEND="
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
dev-python/pip[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (
>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
@ -951,10 +950,10 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware blobs:"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -978,10 +977,10 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -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"
@ -245,15 +245,15 @@ SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@ -281,7 +281,6 @@ BDEPEND="
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
dev-python/pip[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (
>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
@ -951,10 +950,10 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware blobs:"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -978,10 +977,10 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -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"
@ -245,15 +245,15 @@ SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@ -281,7 +281,6 @@ BDEPEND="
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
dev-python/pip[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (
>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
@ -955,10 +954,10 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware blobs:"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -982,10 +981,10 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -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"
@ -245,15 +245,15 @@ SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@ -281,7 +281,6 @@ BDEPEND="
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
dev-python/pip[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (
>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
@ -955,10 +954,10 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware blobs:"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -982,10 +981,10 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -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"
@ -247,15 +247,15 @@ SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@ -283,7 +283,6 @@ BDEPEND="
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
dev-python/pip[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (
>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
@ -958,10 +957,10 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware blobs:"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -985,10 +984,10 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -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"
@ -247,15 +247,15 @@ SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@ -283,7 +283,6 @@ BDEPEND="
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
dev-python/pip[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (
>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
@ -958,10 +957,10 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware blobs:"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -985,10 +984,10 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -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"
@ -246,15 +246,15 @@ SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@ -282,7 +282,6 @@ BDEPEND="
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
dev-python/pip[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (
>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
@ -957,10 +956,10 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware blobs:"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -984,10 +983,10 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -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"
@ -246,15 +246,15 @@ SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
|| (
@ -282,7 +282,6 @@ BDEPEND="
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
dev-python/pip[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (
>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]
@ -957,10 +956,10 @@ pkg_postinst() {
if use pin-upstream-blobs && firmware_abi_change; then
ewarn "This version of qemu pins new versions of firmware blobs:"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
ewarn " $(best_version sys-firmware/edk2-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -984,10 +983,10 @@ pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
if has_version 'sys-firmware/edk2-bin'; then
echo " $(best_version sys-firmware/edk2-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then