commit:     dcb6ceeaa1f9415a574a53e5090c317ebc153690
Author:     Michal Privoznik <michal.privoznik <AT> gmail <DOT> com>
AuthorDate: Wed Oct 19 08:00:35 2022 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Wed Oct 19 14:14:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcb6ceea

app-emulation/qemu: Update live ebuild

Two things happened upstream:

  a) slirp submodule was dropped [1],
  b) strings binary usage was dropped from the configure script [2].

This means, we have to stop removing slirp/ directory and change
the argument we pass to the configure script. Also, The
7.1.0-strings.patch is no longer necessary.

1: 
https://gitlab.com/qemu-project/qemu/-/commit/5890258aeeba303704ec1adca415e46067800777
2: 
https://gitlab.com/qemu-project/qemu/-/commit/33ab5f24913db8d5590fe4155829bd38e7902506

Signed-off-by: Michal Privoznik <michal.privoznik <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27843
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 app-emulation/qemu/qemu-9999.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app-emulation/qemu/qemu-9999.ebuild 
b/app-emulation/qemu/qemu-9999.ebuild
index 4d1ead785bc1..c3489c029294 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -308,7 +308,6 @@ PATCHES=(
        "${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-strings.patch
 )
 
 QA_PREBUILT="
@@ -454,7 +453,7 @@ src_prepare() {
        sed -i -e 's/-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2//' configure || die
 
        # Remove bundled modules
-       rm -r dtc meson roms/*/ slirp || die
+       rm -r dtc meson roms/*/ || die
 }
 
 ##
@@ -581,7 +580,7 @@ qemu_src_configure() {
                $(conf_notuser sdl)
                $(conf_softmmu sdl-image)
                $(conf_notuser seccomp)
-               $(conf_notuser slirp slirp system)
+               $(conf_notuser slirp)
                $(conf_notuser smartcard)
                $(conf_notuser snappy)
                $(conf_notuser spice)

Reply via email to