[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

[John Helmert III]

commit:     5db75331704332aa1415830e55b6b61731526995
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 02:35:41 2022 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 02:39:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5db75331

app-emulation/qemu: sync live

Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 app-emulation/qemu/qemu-9999.ebuild | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/app-emulation/qemu/qemu-9999.ebuild 
b/app-emulation/qemu/qemu-9999.ebuild
index c3489c029294..671b13b12e50 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -17,7 +17,7 @@ QEMU_DOC_USEFLAG="+doc"
 PYTHON_COMPAT=( python3_{8,9,10,11} )
 PYTHON_REQ_USE="ncurses,readline"
 
-FIRMWARE_ABI_VERSION="7.1.0"
+FIRMWARE_ABI_VERSION="7.2.0"
 
 inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
                pax-utils xdg-utils
@@ -42,7 +42,7 @@ else
        fi
 
        S="${WORKDIR}/${MY_P}"
-       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"
@@ -304,10 +304,13 @@ RDEPEND="${CDEPEND}
        )"
 
 PATCHES=(
-       "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
        "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
        "${FILESDIR}"/${PN}-6.0.0-make.patch
        "${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch
+       "${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
+       #"${FILESDIR}"/${PN}-7.1.0-mips-n32-syscalls.patch
+       #"${FILESDIR}"/${PN}-7.1.0-loong-stat.patch
+       #"${FILESDIR}"/${PN}-7.1.0-faccessat2.patch
 )
 
 QA_PREBUILT="
@@ -590,8 +593,6 @@ qemu_src_configure() {
                $(conf_notuser usbredir usb-redir)
                $(conf_notuser vde)
                $(conf_notuser vhost-net)
-               # $(conf_notuser vhost-user-fs)
-               # $(conf_tools vhost-user-fs virtiofsd)
                $(conf_notuser virgl virglrenderer)
                $(conf_softmmu virtfs)
                $(conf_notuser vnc)
@@ -624,6 +625,7 @@ qemu_src_configure() {
                conf_opts+=(
                        --enable-linux-user
                        --disable-system
+                       --disable-blobs
                        --disable-tools
                )
                local static_flag="static-user"
@@ -632,7 +634,6 @@ qemu_src_configure() {
                conf_opts+=(
                        --disable-linux-user
                        --enable-system
-                       --disable-blobs
                        --disable-tools
                )
                local static_flag="static"
@@ -698,6 +699,11 @@ src_configure() {
                        softmmu_targets+=",${target}-softmmu"
                        softmmu_bins+=( "qemu-system-${target}" )
 
+                       # Needed to rework vhost-user-fs handling thanks to 
https://gitlab.com/qemu-project/qemu/-/commit/5166dab
+                       # The option was converted into being configurable by
+                       # Kconfig's. So, to enable it, we insert the necessary
+                       # options into each arch's softmmu target gentoo.mak 
file,
+                       # then configure with --with-devices-${target}=gentoo.
                        if use vhost-user-fs; then
                                echo "CONFIG_VHOST_USER_FS=y for 
${target}-softmmu" || die
                                echo "CONFIG_VIRTIO=y" >> 
"configs/devices/${target}-softmmu/gentoo.mak" || die