commit:     d4dbabb19b26f4203d67e25f78772c5bebf650ff
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 20 04:31:40 2021 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 06:42:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4dbabb1

app-emulation/qemu: drop 6.0.0-r4, 6.0.0-r54, 6.0.1-r1

Bug: https://bugs.gentoo.org/807055
Bug: https://bugs.gentoo.org/820743
Closes: https://github.com/gentoo/gentoo/pull/23421
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 app-emulation/qemu/Manifest                        |   2 -
 .../qemu/files/qemu-5.2.0-cleaner-werror.patch     |  40 -
 .../qemu/files/qemu-5.2.0-dce-locks.patch          |  18 -
 app-emulation/qemu/files/qemu-5.2.0-strings.patch  |  23 -
 app-emulation/qemu/qemu-6.0.0-r4.ebuild            | 910 --------------------
 app-emulation/qemu/qemu-6.0.0-r54.ebuild           | 911 ---------------------
 app-emulation/qemu/qemu-6.0.1-r1.ebuild            | 911 ---------------------
 7 files changed, 2815 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 2e25d84139b6..94a4f3c94cb0 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,4 +1,2 @@
-DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 
7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418
 SHA512 
ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4
-DIST qemu-6.0.1.tar.xz 107084292 BLAKE2B 
53f4adc1a4ba99aaf03659db499d557c57d0c2559955980591594bf0ed06aaf485f0192d7f8f68338b97e0d4d0a114e4431bae5e5b3f3fc82aef08616429d8ed
 SHA512 
2e37ae97a56c4de71412ebabe0e0a59908a7ca7d353440e046831319456d4020614f0909af07cb2a8bb23423e84880a89b5aa4e463e95d1ad37a64fbf8021337
 DIST qemu-6.1.0.tar.xz 111258808 BLAKE2B 
412eecf6d39debd6089b26d3b22e5d25c6c8c30d2eaf31b17c25cc2b3a1b10794a30218dfb151c78801aa295255aa974b297f1fe05b93f14334f203c2af5ccee
 SHA512 
3378ae21c75b77ee6a759827f1fcf7b2a50a0fef07e3b0e89117108022a8d8655fa977e4d65596f4f24f7c735c6594d44b0c6f69732ea4465e88a7406b1d5d3c
 DIST qemu-6.2.0.tar.xz 115667324 BLAKE2B 
3f2f02e5c36113df6231a9474c6d5db774e541312173813c28f578d669a51f391695d364dc806f5906d9e3c2796bb20b2606fcd46a247eb751ea517de9d7ce15
 SHA512 
e9f8231c9e1cfcc41cb47f10a55d63f6b8aee307af00cf6acf64acb7aa4f49fa7e9d6330703a2abea15d8b7bbaba7d3cb08c83edd98d82642367b527df730817

diff --git a/app-emulation/qemu/files/qemu-5.2.0-cleaner-werror.patch 
b/app-emulation/qemu/files/qemu-5.2.0-cleaner-werror.patch
deleted file mode 100644
index 33115f1df480..000000000000
--- a/app-emulation/qemu/files/qemu-5.2.0-cleaner-werror.patch
+++ /dev/null
@@ -1,40 +0,0 @@
--Wall -Wextra compains about unused arguments,
-causes safe-stack to be mis-detected.
---- a/configure
-+++ b/configure
-@@ -2293,7 +2293,7 @@ fi
- cat > $TMPC << EOF
- #include <stdint.h>
- #include <stdio.h>
--int main(int argc, char *argv[]) {
-+int main(void) {
-     return printf("%zu", SIZE_MAX);
- }
- EOF
-@@ -4911,7 +4911,7 @@ fi
- 
- if test "$safe_stack" = "yes"; then
- cat > $TMPC << EOF
--int main(int argc, char *argv[])
-+int main(void)
- {
- #if ! __has_feature(safe_stack)
- #error SafeStack Disabled
-@@ -4933,7 +4933,7 @@ EOF
-   fi
- else
- cat > $TMPC << EOF
--int main(int argc, char *argv[])
-+int main(void)
- {
- #if defined(__has_feature)
- #if __has_feature(safe_stack)
-@@ -5283,7 +5283,7 @@ static const int Z = 1;
- #define TAUT(X) ((X) == Z)
- #define PAREN(X, Y) (X == Y)
- #define ID(X) (X)
--int main(int argc, char *argv[])
-+int main(void)
- {
-     int x = 0, y = 0;
-     x = ID(x);

diff --git a/app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch 
b/app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch
deleted file mode 100644
index 679a9f391b0b..000000000000
--- a/app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix CFLAGS=-Og build break. -Og fails because gcc does not enable dead
-code elimination (but does set __OPTIMIZE__ define).
-
-The fix avoids DCE reliance downstream entirely.
-
-Reported-by: Luke-Jr
-Bug: https://bugs.gentoo.org/782364
---- a/include/qemu/lockable.h
-+++ b/include/qemu/lockable.h
-@@ -28,7 +28,7 @@ struct QemuLockable {
-  * to QEMU_MAKE_LOCKABLE.  For optimized builds, we can rely on dead-code 
elimination
-  * from the compiler, and give the errors already at link time.
-  */
--#if defined(__OPTIMIZE__) && !defined(__SANITIZE_ADDRESS__)
-+#if defined(__OPTIMIZE__) && !defined(__SANITIZE_ADDRESS__) && 
defined(VALIDATE_LOCKS_VIA_DCE)
- void unknown_lock_type(void *);
- #else
- static inline void unknown_lock_type(void *unused)

diff --git a/app-emulation/qemu/files/qemu-5.2.0-strings.patch 
b/app-emulation/qemu/files/qemu-5.2.0-strings.patch
deleted file mode 100644
index 0b3dcdce78c9..000000000000
--- a/app-emulation/qemu/files/qemu-5.2.0-strings.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/759310
---- a/configure
-+++ b/configure
-@@ -521,6 +521,7 @@ ld="${LD-${cross_prefix}ld}"
- ranlib="${RANLIB-${cross_prefix}ranlib}"
- nm="${NM-${cross_prefix}nm}"
- strip="${STRIP-${cross_prefix}strip}"
-+strings="${STRINGS-${cross_prefix}strings}"
- windres="${WINDRES-${cross_prefix}windres}"
- pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}"
- query_pkg_config() {
-@@ -2265,9 +2266,9 @@ int main(int argc, char *argv[]) {
- EOF
- 
- if compile_object ; then
--    if strings -a $TMPO | grep -q BiGeNdIaN ; then
-+    if $strings -a $TMPO | grep -q BiGeNdIaN ; then
-         bigendian="yes"
--    elif strings -a $TMPO | grep -q LiTtLeEnDiAn ; then
-+    elif $strings -a $TMPO | grep -q LiTtLeEnDiAn ; then
-         bigendian="no"
-     else
-         echo big/little test failed

diff --git a/app-emulation/qemu/qemu-6.0.0-r4.ebuild 
b/app-emulation/qemu/qemu-6.0.0-r4.ebuild
deleted file mode 100644
index a80aca052305..000000000000
--- a/app-emulation/qemu/qemu-6.0.0-r4.ebuild
+++ /dev/null
@@ -1,910 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="5.2.0-r50"
-
-inherit eutils linux-info toolchain-funcs multilib python-r1
-inherit udev fcaps readme.gentoo-r1 pax-utils xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-       EGIT_REPO_URI="https://git.qemu.org/git/qemu.git";
-       EGIT_SUBMODULES=(
-               meson
-               tests/fp/berkeley-softfloat-3
-               tests/fp/berkeley-testfloat-3
-               ui/keycodemapdb
-       )
-       inherit git-r3
-       SRC_URI=""
-else
-       SRC_URI="https://download.qemu.org/${P}.tar.xz";
-       KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org";
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
-       +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring
-       jack jemalloc +jpeg kernel_linux
-       kernel_FreeBSD lzo multipath
-       ncurses nfs nls numa opengl +oss +pin-upstream-blobs
-       plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
-       +slirp
-       smartcard snappy spice ssh static static-user systemtap test udev usb
-       usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
-       xfs zstd"
-
-COMMON_TARGETS="
-       aarch64
-       alpha
-       arm
-       cris
-       hppa
-       i386
-       m68k
-       microblaze
-       microblazeel
-       mips
-       mips64
-       mips64el
-       mipsel
-       nios2
-       or1k
-       ppc
-       ppc64
-       riscv32
-       riscv64
-       s390x
-       sh4
-       sh4eb
-       sparc
-       sparc64
-       x86_64
-       xtensa
-       xtensaeb
-"
-IUSE_SOFTMMU_TARGETS="
-       ${COMMON_TARGETS}
-       avr
-       lm32
-       moxie
-       rx
-       tricore
-       unicore32
-"
-IUSE_USER_TARGETS="
-       ${COMMON_TARGETS}
-       aarch64_be
-       armeb
-       hexagon
-       mipsn32
-       mipsn32el
-       ppc64abi32
-       ppc64le
-       sparc32plus
-"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' 
${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-       qemu_softmmu_targets_arm? ( fdt )
-       qemu_softmmu_targets_microblaze? ( fdt )
-       qemu_softmmu_targets_mips64el? ( fdt )
-       qemu_softmmu_targets_ppc64? ( fdt )
-       qemu_softmmu_targets_ppc? ( fdt )
-       qemu_softmmu_targets_riscv32? ( fdt )
-       qemu_softmmu_targets_riscv64? ( fdt )
-       sdl-image? ( sdl )
-       static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins 
!rbd !snappy !udev )
-       static-user? ( !plugins )
-       vhost-user-fs? ( caps seccomp )
-       virgl? ( opengl )
-       virtfs? ( caps xattr )
-       vte? ( gtk )
-       multipath? ( udev )
-       plugins? ( !static !static-user )
-"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
-       >=dev-libs/glib-2.0[static-libs(+)]
-       sys-libs/zlib[static-libs(+)]
-       python? ( ${PYTHON_DEPS} )
-       systemtap? ( dev-util/systemtap )
-       xattr? ( sys-apps/attr[static-libs(+)] )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
-       dev-libs/libxml2[static-libs(+)]
-       >=x11-libs/pixman-0.28.0[static-libs(+)]
-       accessibility? (
-               app-accessibility/brltty[api]
-               app-accessibility/brltty[static-libs(+)]
-       )
-       aio? ( dev-libs/libaio[static-libs(+)] )
-       alsa? ( >=media-libs/alsa-lib-1.0.13 )
-       bzip2? ( app-arch/bzip2[static-libs(+)] )
-       capstone? ( dev-libs/capstone:= )
-       caps? ( sys-libs/libcap-ng[static-libs(+)] )
-       curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-       fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
-       fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-       gnutls? (
-               dev-libs/nettle:=[static-libs(+)]
-               >=net-libs/gnutls-3.0:=[static-libs(+)]
-       )
-       gtk? (
-               x11-libs/gtk+:3
-               vte? ( x11-libs/vte:2.91 )
-       )
-       infiniband? (
-               sys-fabric/libibumad:=[static-libs(+)]
-               sys-fabric/libibverbs:=[static-libs(+)]
-               sys-fabric/librdmacm:=[static-libs(+)]
-       )
-       iscsi? ( net-libs/libiscsi )
-       io-uring? ( sys-libs/liburing:=[static-libs(+)] )
-       jack? ( virtual/jack )
-       jemalloc? ( dev-libs/jemalloc )
-       jpeg? ( virtual/jpeg:0=[static-libs(+)] )
-       lzo? ( dev-libs/lzo:2[static-libs(+)] )
-       multipath? ( sys-fs/multipath-tools )
-       ncurses? (
-               sys-libs/ncurses:=[unicode(+)]
-               sys-libs/ncurses:=[static-libs(+)]
-       )
-       nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
-       numa? ( sys-process/numactl[static-libs(+)] )
-       opengl? (
-               virtual/opengl
-               media-libs/libepoxy[static-libs(+)]
-               media-libs/mesa[static-libs(+)]
-               media-libs/mesa[egl(+),gbm(+)]
-       )
-       png? ( media-libs/libpng:0=[static-libs(+)] )
-       pulseaudio? ( media-sound/pulseaudio )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-       sdl? (
-               media-libs/libsdl2[video]
-               media-libs/libsdl2[static-libs(+)]
-       )
-       sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-       seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-       slirp? ( net-libs/libslirp[static-libs(+)] )
-       smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-       snappy? ( app-arch/snappy:= )
-       spice? (
-               >=app-emulation/spice-protocol-0.12.3
-               >=app-emulation/spice-0.12.0[static-libs(+)]
-       )
-       ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
-       udev? ( virtual/libudev:= )
-       usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
-       usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-       vde? ( net-misc/vde[static-libs(+)] )
-       virgl? ( media-libs/virglrenderer[static-libs(+)] )
-       virtfs? ( sys-libs/libcap )
-       xen? ( app-emulation/xen-tools:= )
-       xfs? ( sys-fs/xfsprogs[static-libs(+)] )
-       zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
-"
-
-SEABIOS_VERSION="1.14.0"
-
-X86_FIRMWARE_DEPEND="
-       pin-upstream-blobs? (
-               ~sys-firmware/edk2-ovmf-202008[binary]
-               ~sys-firmware/ipxe-1.21.1[binary,qemu]
-               ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
-               ~sys-firmware/sgabios-0.1_pre10[binary]
-       )
-       !pin-upstream-blobs? (
-               sys-firmware/edk2-ovmf
-               sys-firmware/ipxe[qemu]
-               >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-               sys-firmware/sgabios
-       )"
-PPC_FIRMWARE_DEPEND="
-       pin-upstream-blobs? (
-               ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
-       )
-       !pin-upstream-blobs? (
-               >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-       )
-"
-
-BDEPEND="
-       $(python_gen_impl_dep)
-       dev-lang/perl
-       sys-apps/texinfo
-       virtual/pkgconfig
-       doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-       gtk? ( nls? ( sys-devel/gettext ) )
-       test? (
-               dev-libs/glib[utils]
-               sys-devel/bc
-       )
-"
-CDEPEND="
-       !static? (
-               ${ALL_DEPEND//\[static-libs(+)]}
-               ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-       )
-       qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-       qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-       qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
-       qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
-"
-DEPEND="${CDEPEND}
-       kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-       static? (
-               ${ALL_DEPEND}
-               ${SOFTMMU_TOOLS_DEPEND}
-       )
-       static-user? ( ${ALL_DEPEND} )"
-RDEPEND="${CDEPEND}
-       acct-group/kvm
-       selinux? ( sec-policy/selinux-qemu )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
-       "${FILESDIR}"/${PN}-5.2.0-strings.patch
-       "${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
-       "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
-       "${FILESDIR}"/${PN}-5.2.0-dce-locks.patch
-       "${FILESDIR}"/${PN}-6.0.0-make.patch
-)
-
-QA_PREBUILT="
-       usr/share/qemu/hppa-firmware.img
-       usr/share/qemu/openbios-ppc
-       usr/share/qemu/openbios-sparc64
-       usr/share/qemu/openbios-sparc32
-       usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
-       usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-       usr/share/qemu/palcode-clipper
-       usr/share/qemu/s390-ccw.img
-       usr/share/qemu/s390-netboot.img
-       usr/share/qemu/u-boot.e500
-"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-       usr/bin/qemu-x86_64
-       usr/bin/qemu-alpha
-       usr/bin/qemu-arm
-       usr/bin/qemu-cris
-       usr/bin/qemu-m68k
-       usr/bin/qemu-microblaze
-       usr/bin/qemu-microblazeel
-       usr/bin/qemu-mips
-       usr/bin/qemu-mipsel
-       usr/bin/qemu-or1k
-       usr/bin/qemu-ppc
-       usr/bin/qemu-ppc64
-       usr/bin/qemu-ppc64abi32
-       usr/bin/qemu-sh4
-       usr/bin/qemu-sh4eb
-       usr/bin/qemu-sparc
-       usr/bin/qemu-sparc64
-       usr/bin/qemu-armeb
-       usr/bin/qemu-sparc32plus
-       usr/bin/qemu-s390x
-       usr/bin/qemu-unicore32
-"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you 
have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
-       For AMD CPUs the module is called 'kvm-amd'.
-       For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
-       $ gpasswd -a <USER> kvm
-then have <USER> re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it.  You can tell udev to reset ownership/perms:
-       $ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
-       # rc-update add qemu-binfmt
-For systemd:
-       # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
-       if use kernel_linux && kernel_is lt 2 6 25; then
-               eerror "This version of KVM requires a host kernel of 2.6.25 or 
higher."
-       elif use kernel_linux; then
-               if ! linux_config_exists; then
-                       eerror "Unable to check your kernel for KVM support"
-               else
-                       CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-                       ERROR_KVM="You must enable KVM in your kernel to 
continue"
-                       ERROR_KVM_AMD="If you have an AMD CPU, you must enable 
KVM_AMD in"
-                       ERROR_KVM_AMD+=" your kernel configuration."
-                       ERROR_KVM_INTEL="If you have an Intel CPU, you must 
enable"
-                       ERROR_KVM_INTEL+=" KVM_INTEL in your kernel 
configuration."
-                       ERROR_TUN="You will need the Universal TUN/TAP driver 
compiled"
-                       ERROR_TUN+=" into your kernel or loaded as a module to 
use the"
-                       ERROR_TUN+=" virtual network device if using -net tap."
-                       ERROR_BRIDGE="You will also need support for 802.1d"
-                       ERROR_BRIDGE+=" Ethernet Bridging for some network 
configurations."
-                       use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-                       ERROR_VHOST_NET="You must enable VHOST_NET to have 
vhost-net"
-                       ERROR_VHOST_NET+=" support"
-
-                       if use amd64 || use x86 || use amd64-linux || use 
x86-linux; then
-                               if grep -q AuthenticAMD /proc/cpuinfo; then
-                                       CONFIG_CHECK+=" ~KVM_AMD"
-                               elif grep -q GenuineIntel /proc/cpuinfo; then
-                                       CONFIG_CHECK+=" ~KVM_INTEL"
-                               fi
-                       fi
-
-                       use python && CONFIG_CHECK+=" ~DEBUG_FS"
-                       ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-                       # Now do the actual checks setup above
-                       check_extra_config
-               fi
-       fi
-
-       if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-               eerror "The kvm/qemu-kvm wrappers no longer exist, but your 
libvirt"
-               eerror "instances are still pointing to it.  Please update your"
-               eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm 
flag"
-               eerror "and the right system binary (e.g. qemu-system-x86_64)."
-               die "update your virt configs to not use qemu-kvm"
-       fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
-       local var=$1 mak=$2
-       local detected sorted
-
-       pushd "${S}"/default-configs/targets/ >/dev/null || die
-
-       # Force C locale until glibc is updated. #564936
-       detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | 
LC_COLLATE=C sort -u))
-       sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
-       if [[ ${sorted} != "${detected}" ]] ; then
-               eerror "The ebuild needs to be kept in sync."
-               eerror "${var}: ${sorted}"
-               eerror "$(printf '%-*s' ${#var} configure): ${detected}"
-               die "sync ${var} to the list of targets"
-       fi
-
-       popd >/dev/null
-}
-
-src_prepare() {
-       check_targets IUSE_SOFTMMU_TARGETS softmmu
-       check_targets IUSE_USER_TARGETS linux-user
-
-       default
-
-       # Use correct toolchain to fix cross-compiling
-       tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
-       export WINDRES=${CHOST}-windres
-
-       # Verbose builds
-       MAKEOPTS+=" V=1"
-
-       # Remove bundled copy of libfdt
-       rm -r dtc || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-       debug-print-function ${FUNCNAME} "$@"
-
-       local buildtype=$1
-       local builddir="${S}/${buildtype}-build"
-
-       mkdir "${builddir}"
-
-       local conf_opts=(
-               --prefix=/usr
-               --sysconfdir=/etc
-               --bindir=/usr/bin
-               --libdir=/usr/$(get_libdir)
-               --datadir=/usr/share
-               --docdir=/usr/share/doc/${PF}/html
-               --mandir=/usr/share/man
-               --localstatedir=/var
-               --disable-bsd-user
-               --disable-containers # bug #732972
-               --disable-guest-agent
-               --disable-strip
-
-               # bug #746752: TCG interpreter has a few limitations:
-               # - it does not support FPU
-               # - it's generally slower on non-self-modifying code
-               # It's advantage is support for host architectures
-               # where native codegeneration is not implemented.
-               # Gentoo has qemu keyworded only on targets with
-               # native code generation available. Avoid the interpreter.
-               --disable-tcg-interpreter
-
-               --disable-werror
-               # We support gnutls/nettle for crypto operations.  It is 
possible
-               # to use gcrypt when gnutls/nettle are disabled (but not when 
they
-               # are enabled), but it's not really worth the hassle.  Disable 
it
-               # all the time to avoid automatically detecting it. #568856
-               --disable-gcrypt
-               --python="${PYTHON}"
-               --cc="$(tc-getCC)"
-               --cxx="$(tc-getCXX)"
-               --host-cc="$(tc-getBUILD_CC)"
-               $(use_enable debug debug-info)
-               $(use_enable debug debug-tcg)
-               $(use_enable doc docs)
-               $(use_enable nls gettext)
-               $(use_enable plugins)
-               $(use_enable xattr attr)
-       )
-
-       # Disable options not used by user targets. This simplifies building
-       # static user targets (USE=static-user) considerably.
-       conf_notuser() {
-               if [[ ${buildtype} == "user" ]] ; then
-                       echo "--disable-${2:-$1}"
-               else
-                       use_enable "$@"
-               fi
-       }
-       # Enable option only for softmmu build, but not 'user' or 'tools'
-       conf_softmmu() {
-               if [[ ${buildtype} == "softmmu" ]] ; then
-                       use_enable "$@"
-               else
-                       echo "--disable-${2:-$1}"
-               fi
-       }
-       # Enable option only for tools build, but not 'user' or 'softmmu'
-       conf_tools() {
-               if [[ ${buildtype} == "tools" ]] ; then
-                       use_enable "$@"
-               else
-                       echo "--disable-${2:-$1}"
-               fi
-       }
-       conf_opts+=(
-               $(conf_notuser accessibility brlapi)
-               $(conf_notuser aio linux-aio)
-               $(conf_notuser bzip2)
-               $(conf_notuser capstone)
-               $(conf_notuser caps cap-ng)
-               $(conf_notuser curl)
-               $(conf_notuser fdt)
-               $(conf_notuser fuse)
-               $(conf_notuser glusterfs)
-               $(conf_notuser gnutls)
-               $(conf_notuser gnutls nettle)
-               $(conf_notuser gtk)
-               $(conf_notuser infiniband rdma)
-               $(conf_notuser iscsi libiscsi)
-               $(conf_notuser io-uring linux-io-uring)
-               $(conf_notuser jemalloc jemalloc)
-               $(conf_notuser jpeg vnc-jpeg)
-               $(conf_notuser kernel_linux kvm)
-               $(conf_notuser lzo)
-               $(conf_notuser multipath mpath)
-               $(conf_notuser ncurses curses)
-               $(conf_notuser nfs libnfs)
-               $(conf_notuser numa)
-               $(conf_notuser opengl)
-               $(conf_notuser png vnc-png)
-               $(conf_notuser rbd)
-               $(conf_notuser sasl vnc-sasl)
-               $(conf_notuser sdl)
-               $(conf_softmmu sdl-image)
-               $(conf_notuser seccomp)
-               $(conf_notuser slirp slirp system)
-               $(conf_notuser smartcard)
-               $(conf_notuser snappy)
-               $(conf_notuser spice)
-               $(conf_notuser ssh libssh)
-               $(conf_notuser udev libudev)
-               $(conf_notuser usb libusb)
-               $(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)
-               $(conf_notuser vte)
-               $(conf_notuser xen)
-               $(conf_notuser xen xen-pci-passthrough)
-               $(conf_notuser xfs xfsctl)
-               # use prebuilt keymaps, bug #759604
-               --disable-xkbcommon
-               $(conf_notuser zstd)
-       )
-
-       if [[ ${buildtype} == "user" ]] ; then
-               conf_opts+=( --disable-libxml2 )
-       else
-               conf_opts+=( --enable-libxml2 )
-       fi
-
-       if [[ ! ${buildtype} == "user" ]] ; then
-               # audio options
-               local audio_opts=(
-                       # Note: backend order matters here: #716202
-                       # We iterate from higher-level to lower level.
-                       $(usex pulseaudio pa "")
-                       $(usev jack)
-                       $(usev sdl)
-                       $(usev alsa)
-                       $(usev oss)
-               )
-               conf_opts+=(
-                       --audio-drv-list=$(printf "%s," "${audio_opts[@]}")
-               )
-       fi
-
-       case ${buildtype} in
-       user)
-               conf_opts+=(
-                       --enable-linux-user
-                       --disable-system
-                       --disable-blobs
-                       --disable-tools
-               )
-               local static_flag="static-user"
-               ;;
-       softmmu)
-               conf_opts+=(
-                       --disable-linux-user
-                       --enable-system
-                       --disable-tools
-               )
-               local static_flag="static"
-               ;;
-       tools)
-               conf_opts+=(
-                       --disable-linux-user
-                       --disable-system
-                       --disable-blobs
-                       --enable-tools
-               )
-               local static_flag="static"
-               ;;
-       esac
-
-       local targets="${buildtype}_targets"
-       [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-       # Add support for SystemTAP
-       use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
-       # We always want to attempt to build with PIE support as it results
-       # in a more secure binary. But it doesn't work with static or if
-       # the current GCC doesn't have PIE support.
-       if use ${static_flag}; then
-               conf_opts+=( --static --disable-pie )
-       else
-               tc-enables-pie && conf_opts+=( --enable-pie )
-       fi
-
-       # Meson will not use a cross-file unless cross_prefix is set.
-       tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
-
-       # Plumb through equivalent of EXTRA_ECONF to allow experiments
-       # like bug #747928.
-       conf_opts+=( ${EXTRA_CONF_QEMU} )
-
-       echo "../configure ${conf_opts[*]}"
-       cd "${builddir}"
-       ../configure "${conf_opts[@]}" || die "configure failed"
-
-       # FreeBSD's kernel does not support QEMU assigning/grabbing
-       # host USB devices yet
-       use kernel_FreeBSD && \
-               sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
-       local target
-
-       python_setup
-
-       softmmu_targets= softmmu_bins=()
-       user_targets= user_bins=()
-
-       for target in ${IUSE_SOFTMMU_TARGETS} ; do
-               if use "qemu_softmmu_targets_${target}"; then
-                       softmmu_targets+=",${target}-softmmu"
-                       softmmu_bins+=( "qemu-system-${target}" )
-               fi
-       done
-
-       for target in ${IUSE_USER_TARGETS} ; do
-               if use "qemu_user_targets_${target}"; then
-                       user_targets+=",${target}-linux-user"
-                       user_bins+=( "qemu-${target}" )
-               fi
-       done
-
-       softmmu_targets=${softmmu_targets#,}
-       user_targets=${user_targets#,}
-
-       [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-       [[ -n ${user_targets}    ]] && qemu_src_configure "user"
-       qemu_src_configure "tools"
-}
-
-src_compile() {
-       if [[ -n ${user_targets} ]]; then
-               cd "${S}/user-build"
-               default
-       fi
-
-       if [[ -n ${softmmu_targets} ]]; then
-               cd "${S}/softmmu-build"
-               default
-       fi
-
-       cd "${S}/tools-build"
-       default
-}
-
-src_test() {
-       if [[ -n ${softmmu_targets} ]]; then
-               cd "${S}/softmmu-build"
-               pax-mark m */qemu-system-* #515550
-               emake check
-       fi
-}
-
-qemu_python_install() {
-       python_domodule "${S}/python/qemu"
-
-       python_doscript "${S}/scripts/kvm/vmxcap"
-       python_doscript "${S}/scripts/qmp/qmp-shell"
-       python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
-       local out="${T}/qemu-binfmt"
-       local out_systemd="${T}/qemu.conf"
-       local d="${T}/binfmt.d"
-
-       einfo "Generating qemu binfmt scripts and configuration files"
-
-       # Generate the debian fragments first.
-       mkdir -p "${d}"
-       "${S}"/scripts/qemu-binfmt-conf.sh \
-               --debian \
-               --exportdir "${d}" \
-               --qemu-path "${EPREFIX}/usr/bin" \
-               || die
-       # Then turn the fragments into a shell script we can source.
-       sed -E -i \
-               -e 's:^([^ ]+) (.*)$:\1="\2":' \
-               "${d}"/* || die
-
-       # Generate the init.d script by assembling the fragments from above.
-       local f qcpu package interpreter magic mask
-       cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
-       for f in "${d}"/qemu-* ; do
-               source "${f}"
-
-               # Normalize the cpu logic like we do in the init.d for the 
native cpu.
-               qcpu=${package#qemu-}
-               case ${qcpu} in
-               arm*)   qcpu="arm";;
-               mips*)  qcpu="mips";;
-               ppc*)   qcpu="ppc";;
-               s390*)  qcpu="s390";;
-               sh*)    qcpu="sh";;
-               sparc*) qcpu="sparc";;
-               esac
-
-               # we use 'printf' here to be portable across 'sh'
-               # implementations: #679168
-               cat <<EOF >>"${out}"
-       if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
-               printf '%s\n' 
':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" 
>/proc/sys/fs/binfmt_misc/register
-       fi
-EOF
-
-               echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" 
>>"${out_systemd}"
-
-       done
-       cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
-       if [[ -n ${user_targets} ]]; then
-               cd "${S}/user-build"
-               emake DESTDIR="${ED}" install
-
-               # Install binfmt handler init script for user targets.
-               generate_initd
-               doinitd "${T}/qemu-binfmt"
-
-               # Install binfmt/qemu.conf.
-               insinto "/usr/share/qemu/binfmt.d"
-               doins "${T}/qemu.conf"
-       fi
-
-       if [[ -n ${softmmu_targets} ]]; then
-               cd "${S}/softmmu-build"
-               emake DESTDIR="${ED}" install
-
-               # This might not exist if the test failed. #512010
-               [[ -e check-report.html ]] && dodoc check-report.html
-
-               if use kernel_linux; then
-                       udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
-               fi
-
-               if use python; then
-                       python_foreach_impl qemu_python_install
-               fi
-       fi
-
-       cd "${S}/tools-build"
-       emake DESTDIR="${ED}" install
-
-       # Disable mprotect on the qemu binaries as they use JITs to be fast 
#459348
-       pushd "${ED}"/usr/bin >/dev/null
-       pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
-       popd >/dev/null
-
-       # Install config file example for qemu-bridge-helper
-       insinto "/etc/qemu"
-       doins "${FILESDIR}/bridge.conf"
-
-       cd "${S}"
-       dodoc MAINTAINERS docs/specs/pci-ids.txt
-       newdoc pc-bios/README README.pc-bios
-
-       # Disallow stripping of prebuilt firmware files.
-       dostrip -x ${QA_PREBUILT}
-
-       if [[ -n ${softmmu_targets} ]]; then
-               # Remove SeaBIOS since we're using the SeaBIOS packaged one
-               rm "${ED}/usr/share/qemu/bios.bin"
-               rm "${ED}/usr/share/qemu/bios-256k.bin"
-               if use qemu_softmmu_targets_x86_64 || use 
qemu_softmmu_targets_i386; then
-                       dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-                       dosym ../seabios/bios-256k.bin 
/usr/share/qemu/bios-256k.bin
-               fi
-
-               # Remove vgabios since we're using the seavgabios packaged one
-               rm "${ED}/usr/share/qemu/vgabios.bin"
-               rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-               rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-               rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-               rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
-               rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-               # PPC/PPC64 loads vgabios-stdvga
-               if use qemu_softmmu_targets_x86_64 || use 
qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use 
qemu_softmmu_targets_ppc64; then
-                       dosym ../seavgabios/vgabios-isavga.bin 
/usr/share/qemu/vgabios.bin
-                       dosym ../seavgabios/vgabios-cirrus.bin 
/usr/share/qemu/vgabios-cirrus.bin
-                       dosym ../seavgabios/vgabios-qxl.bin 
/usr/share/qemu/vgabios-qxl.bin
-                       dosym ../seavgabios/vgabios-stdvga.bin 
/usr/share/qemu/vgabios-stdvga.bin
-                       dosym ../seavgabios/vgabios-virtio.bin 
/usr/share/qemu/vgabios-virtio.bin
-                       dosym ../seavgabios/vgabios-vmware.bin 
/usr/share/qemu/vgabios-vmware.bin
-               fi
-
-               # Remove sgabios since we're using the sgabios packaged one
-               rm "${ED}/usr/share/qemu/sgabios.bin"
-               if use qemu_softmmu_targets_x86_64 || use 
qemu_softmmu_targets_i386; then
-                       dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-               fi
-
-               # Remove iPXE since we're using the iPXE packaged one
-               rm "${ED}"/usr/share/qemu/pxe-*.rom
-               if use qemu_softmmu_targets_x86_64 || use 
qemu_softmmu_targets_i386; then
-                       dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-                       dosym ../ipxe/80861209.rom 
/usr/share/qemu/pxe-eepro100.rom
-                       dosym ../ipxe/10500940.rom 
/usr/share/qemu/pxe-ne2k_pci.rom
-                       dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-                       dosym ../ipxe/10ec8139.rom 
/usr/share/qemu/pxe-rtl8139.rom
-                       dosym ../ipxe/1af41000.rom 
/usr/share/qemu/pxe-virtio.rom
-               fi
-       fi
-
-       DISABLE_AUTOFORMATTING=true
-       readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
-       local pv
-       for pv in ${REPLACING_VERSIONS}; do
-               if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
-                       return 0
-               fi
-       done
-       return 1
-}
-
-pkg_postinst() {
-       if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-               udev_reload
-       fi
-
-       xdg_icon_cache_update
-
-       [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] 
&& \
-               fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
-
-       DISABLE_AUTOFORMATTING=true
-       readme.gentoo_print_elog
-
-       if use pin-upstream-blobs && firmware_abi_change; then
-               ewarn "This version of qemu pins new versions of firmware 
blobs:"
-               ewarn " $(best_version sys-firmware/edk2-ovmf)"
-               ewarn " $(best_version sys-firmware/ipxe)"
-               ewarn " $(best_version sys-firmware/seabios)"
-               ewarn " $(best_version sys-firmware/sgabios)"
-               ewarn "This might break resume of hibernated guests (started 
with a different"
-               ewarn "firmware version) and live migration to/from qemu 
versions with different"
-               ewarn "firmware. Please (cold) restart all running guests. For 
functional"
-               ewarn "guest migration ensure that all"
-               ewarn "hosts run at least"
-               ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
-       fi
-}
-
-pkg_info() {
-       echo "Using:"
-       echo "  $(best_version app-emulation/spice-protocol)"
-       echo "  $(best_version sys-firmware/edk2-ovmf)"
-       if has_version 'sys-firmware/edk2-ovmf[binary]'; then
-               echo "    USE=binary"
-       else
-               echo "    USE=''"
-       fi
-       echo "  $(best_version sys-firmware/ipxe)"
-       echo "  $(best_version sys-firmware/seabios)"
-       if has_version 'sys-firmware/seabios[binary]'; then
-               echo "    USE=binary"
-       else
-               echo "    USE=''"
-       fi
-       echo "  $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
-       xdg_icon_cache_update
-}

diff --git a/app-emulation/qemu/qemu-6.0.0-r54.ebuild 
b/app-emulation/qemu/qemu-6.0.0-r54.ebuild
deleted file mode 100644
index 2f54662694fa..000000000000
--- a/app-emulation/qemu/qemu-6.0.0-r54.ebuild
+++ /dev/null
@@ -1,911 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="6.0.0-r50"
-
-inherit eutils linux-info toolchain-funcs multilib python-r1
-inherit udev fcaps readme.gentoo-r1 pax-utils xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-       EGIT_REPO_URI="https://git.qemu.org/git/qemu.git";
-       EGIT_SUBMODULES=(
-               meson
-               tests/fp/berkeley-softfloat-3
-               tests/fp/berkeley-testfloat-3
-               ui/keycodemapdb
-       )
-       inherit git-r3
-       SRC_URI=""
-else
-       SRC_URI="https://download.qemu.org/${P}.tar.xz";
-       KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org";
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
-       +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring
-       jack jemalloc +jpeg kernel_linux
-       kernel_FreeBSD lzo multipath
-       ncurses nfs nls numa opengl +oss +pin-upstream-blobs
-       plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
-       +slirp
-       smartcard snappy spice ssh static static-user systemtap test udev usb
-       usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
-       xfs zstd"
-
-COMMON_TARGETS="
-       aarch64
-       alpha
-       arm
-       cris
-       hppa
-       i386
-       m68k
-       microblaze
-       microblazeel
-       mips
-       mips64
-       mips64el
-       mipsel
-       nios2
-       or1k
-       ppc
-       ppc64
-       riscv32
-       riscv64
-       s390x
-       sh4
-       sh4eb
-       sparc
-       sparc64
-       x86_64
-       xtensa
-       xtensaeb
-"
-IUSE_SOFTMMU_TARGETS="
-       ${COMMON_TARGETS}
-       avr
-       lm32
-       moxie
-       rx
-       tricore
-       unicore32
-"
-IUSE_USER_TARGETS="
-       ${COMMON_TARGETS}
-       aarch64_be
-       armeb
-       hexagon
-       mipsn32
-       mipsn32el
-       ppc64abi32
-       ppc64le
-       sparc32plus
-"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' 
${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-       qemu_softmmu_targets_arm? ( fdt )
-       qemu_softmmu_targets_microblaze? ( fdt )
-       qemu_softmmu_targets_mips64el? ( fdt )
-       qemu_softmmu_targets_ppc64? ( fdt )
-       qemu_softmmu_targets_ppc? ( fdt )
-       qemu_softmmu_targets_riscv32? ( fdt )
-       qemu_softmmu_targets_riscv64? ( fdt )
-       sdl-image? ( sdl )
-       static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins 
!rbd !snappy !udev )
-       static-user? ( !plugins )
-       vhost-user-fs? ( caps seccomp )
-       virgl? ( opengl )
-       virtfs? ( caps xattr )
-       vte? ( gtk )
-       multipath? ( udev )
-       plugins? ( !static !static-user )
-"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
-       >=dev-libs/glib-2.0[static-libs(+)]
-       sys-libs/zlib[static-libs(+)]
-       python? ( ${PYTHON_DEPS} )
-       systemtap? ( dev-util/systemtap )
-       xattr? ( sys-apps/attr[static-libs(+)] )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
-       dev-libs/libxml2[static-libs(+)]
-       >=x11-libs/pixman-0.28.0[static-libs(+)]
-       accessibility? (
-               app-accessibility/brltty[api]
-               app-accessibility/brltty[static-libs(+)]
-       )
-       aio? ( dev-libs/libaio[static-libs(+)] )
-       alsa? ( >=media-libs/alsa-lib-1.0.13 )
-       bzip2? ( app-arch/bzip2[static-libs(+)] )
-       capstone? ( dev-libs/capstone:= )
-       caps? ( sys-libs/libcap-ng[static-libs(+)] )
-       curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-       fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
-       fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-       gnutls? (
-               dev-libs/nettle:=[static-libs(+)]
-               >=net-libs/gnutls-3.0:=[static-libs(+)]
-       )
-       gtk? (
-               x11-libs/gtk+:3
-               vte? ( x11-libs/vte:2.91 )
-       )
-       infiniband? (
-               sys-fabric/libibumad:=[static-libs(+)]
-               sys-fabric/libibverbs:=[static-libs(+)]
-               sys-fabric/librdmacm:=[static-libs(+)]
-       )
-       iscsi? ( net-libs/libiscsi )
-       io-uring? ( sys-libs/liburing:=[static-libs(+)] )
-       jack? ( virtual/jack )
-       jemalloc? ( dev-libs/jemalloc )
-       jpeg? ( virtual/jpeg:0=[static-libs(+)] )
-       lzo? ( dev-libs/lzo:2[static-libs(+)] )
-       multipath? ( sys-fs/multipath-tools )
-       ncurses? (
-               sys-libs/ncurses:=[unicode(+)]
-               sys-libs/ncurses:=[static-libs(+)]
-       )
-       nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
-       numa? ( sys-process/numactl[static-libs(+)] )
-       opengl? (
-               virtual/opengl
-               media-libs/libepoxy[static-libs(+)]
-               media-libs/mesa[static-libs(+)]
-               media-libs/mesa[egl(+),gbm(+)]
-       )
-       png? ( media-libs/libpng:0=[static-libs(+)] )
-       pulseaudio? ( media-sound/pulseaudio )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-       sdl? (
-               media-libs/libsdl2[video]
-               media-libs/libsdl2[static-libs(+)]
-       )
-       sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-       seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-       slirp? ( net-libs/libslirp[static-libs(+)] )
-       smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-       snappy? ( app-arch/snappy:= )
-       spice? (
-               >=app-emulation/spice-protocol-0.12.3
-               >=app-emulation/spice-0.12.0[static-libs(+)]
-       )
-       ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
-       udev? ( virtual/libudev:= )
-       usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
-       usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-       vde? ( net-misc/vde[static-libs(+)] )
-       virgl? ( media-libs/virglrenderer[static-libs(+)] )
-       virtfs? ( sys-libs/libcap )
-       xen? ( app-emulation/xen-tools:= )
-       xfs? ( sys-fs/xfsprogs[static-libs(+)] )
-       zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
-"
-
-EDK2_OVMF_VERSION="202105"
-SEABIOS_VERSION="1.14.0"
-
-X86_FIRMWARE_DEPEND="
-       pin-upstream-blobs? (
-               ~sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}[binary]
-               ~sys-firmware/ipxe-1.21.1[binary,qemu]
-               ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
-               ~sys-firmware/sgabios-0.1_pre10[binary]
-       )
-       !pin-upstream-blobs? (
-               >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
-               sys-firmware/ipxe[qemu]
-               >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-               sys-firmware/sgabios
-       )"
-PPC_FIRMWARE_DEPEND="
-       pin-upstream-blobs? (
-               ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
-       )
-       !pin-upstream-blobs? (
-               >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-       )
-"
-
-BDEPEND="
-       $(python_gen_impl_dep)
-       dev-lang/perl
-       sys-apps/texinfo
-       virtual/pkgconfig
-       doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-       gtk? ( nls? ( sys-devel/gettext ) )
-       test? (
-               dev-libs/glib[utils]
-               sys-devel/bc
-       )
-"
-CDEPEND="
-       !static? (
-               ${ALL_DEPEND//\[static-libs(+)]}
-               ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-       )
-       qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-       qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-       qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
-       qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
-"
-DEPEND="${CDEPEND}
-       kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-       static? (
-               ${ALL_DEPEND}
-               ${SOFTMMU_TOOLS_DEPEND}
-       )
-       static-user? ( ${ALL_DEPEND} )"
-RDEPEND="${CDEPEND}
-       acct-group/kvm
-       selinux? ( sec-policy/selinux-qemu )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
-       "${FILESDIR}"/${PN}-5.2.0-strings.patch
-       "${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
-       "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
-       "${FILESDIR}"/${PN}-5.2.0-dce-locks.patch
-       "${FILESDIR}"/${PN}-6.0.0-make.patch
-)
-
-QA_PREBUILT="
-       usr/share/qemu/hppa-firmware.img
-       usr/share/qemu/openbios-ppc
-       usr/share/qemu/openbios-sparc64
-       usr/share/qemu/openbios-sparc32
-       usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
-       usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-       usr/share/qemu/palcode-clipper
-       usr/share/qemu/s390-ccw.img
-       usr/share/qemu/s390-netboot.img
-       usr/share/qemu/u-boot.e500
-"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-       usr/bin/qemu-x86_64
-       usr/bin/qemu-alpha
-       usr/bin/qemu-arm
-       usr/bin/qemu-cris
-       usr/bin/qemu-m68k
-       usr/bin/qemu-microblaze
-       usr/bin/qemu-microblazeel
-       usr/bin/qemu-mips
-       usr/bin/qemu-mipsel
-       usr/bin/qemu-or1k
-       usr/bin/qemu-ppc
-       usr/bin/qemu-ppc64
-       usr/bin/qemu-ppc64abi32
-       usr/bin/qemu-sh4
-       usr/bin/qemu-sh4eb
-       usr/bin/qemu-sparc
-       usr/bin/qemu-sparc64
-       usr/bin/qemu-armeb
-       usr/bin/qemu-sparc32plus
-       usr/bin/qemu-s390x
-       usr/bin/qemu-unicore32
-"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you 
have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
-       For AMD CPUs the module is called 'kvm-amd'.
-       For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
-       $ gpasswd -a <USER> kvm
-then have <USER> re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it.  You can tell udev to reset ownership/perms:
-       $ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
-       # rc-update add qemu-binfmt
-For systemd:
-       # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
-       if use kernel_linux && kernel_is lt 2 6 25; then
-               eerror "This version of KVM requires a host kernel of 2.6.25 or 
higher."
-       elif use kernel_linux; then
-               if ! linux_config_exists; then
-                       eerror "Unable to check your kernel for KVM support"
-               else
-                       CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-                       ERROR_KVM="You must enable KVM in your kernel to 
continue"
-                       ERROR_KVM_AMD="If you have an AMD CPU, you must enable 
KVM_AMD in"
-                       ERROR_KVM_AMD+=" your kernel configuration."
-                       ERROR_KVM_INTEL="If you have an Intel CPU, you must 
enable"
-                       ERROR_KVM_INTEL+=" KVM_INTEL in your kernel 
configuration."
-                       ERROR_TUN="You will need the Universal TUN/TAP driver 
compiled"
-                       ERROR_TUN+=" into your kernel or loaded as a module to 
use the"
-                       ERROR_TUN+=" virtual network device if using -net tap."
-                       ERROR_BRIDGE="You will also need support for 802.1d"
-                       ERROR_BRIDGE+=" Ethernet Bridging for some network 
configurations."
-                       use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-                       ERROR_VHOST_NET="You must enable VHOST_NET to have 
vhost-net"
-                       ERROR_VHOST_NET+=" support"
-
-                       if use amd64 || use x86 || use amd64-linux || use 
x86-linux; then
-                               if grep -q AuthenticAMD /proc/cpuinfo; then
-                                       CONFIG_CHECK+=" ~KVM_AMD"
-                               elif grep -q GenuineIntel /proc/cpuinfo; then
-                                       CONFIG_CHECK+=" ~KVM_INTEL"
-                               fi
-                       fi
-
-                       use python && CONFIG_CHECK+=" ~DEBUG_FS"
-                       ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-                       # Now do the actual checks setup above
-                       check_extra_config
-               fi
-       fi
-
-       if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-               eerror "The kvm/qemu-kvm wrappers no longer exist, but your 
libvirt"
-               eerror "instances are still pointing to it.  Please update your"
-               eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm 
flag"
-               eerror "and the right system binary (e.g. qemu-system-x86_64)."
-               die "update your virt configs to not use qemu-kvm"
-       fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
-       local var=$1 mak=$2
-       local detected sorted
-
-       pushd "${S}"/default-configs/targets/ >/dev/null || die
-
-       # Force C locale until glibc is updated. #564936
-       detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | 
LC_COLLATE=C sort -u))
-       sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
-       if [[ ${sorted} != "${detected}" ]] ; then
-               eerror "The ebuild needs to be kept in sync."
-               eerror "${var}: ${sorted}"
-               eerror "$(printf '%-*s' ${#var} configure): ${detected}"
-               die "sync ${var} to the list of targets"
-       fi
-
-       popd >/dev/null
-}
-
-src_prepare() {
-       check_targets IUSE_SOFTMMU_TARGETS softmmu
-       check_targets IUSE_USER_TARGETS linux-user
-
-       default
-
-       # Use correct toolchain to fix cross-compiling
-       tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
-       export WINDRES=${CHOST}-windres
-
-       # Verbose builds
-       MAKEOPTS+=" V=1"
-
-       # Remove bundled copy of libfdt
-       rm -r dtc || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-       debug-print-function ${FUNCNAME} "$@"
-
-       local buildtype=$1
-       local builddir="${S}/${buildtype}-build"
-
-       mkdir "${builddir}"
-
-       local conf_opts=(
-               --prefix=/usr
-               --sysconfdir=/etc
-               --bindir=/usr/bin
-               --libdir=/usr/$(get_libdir)
-               --datadir=/usr/share
-               --docdir=/usr/share/doc/${PF}/html
-               --mandir=/usr/share/man
-               --localstatedir=/var
-               --disable-bsd-user
-               --disable-containers # bug #732972
-               --disable-guest-agent
-               --disable-strip
-
-               # bug #746752: TCG interpreter has a few limitations:
-               # - it does not support FPU
-               # - it's generally slower on non-self-modifying code
-               # It's advantage is support for host architectures
-               # where native codegeneration is not implemented.
-               # Gentoo has qemu keyworded only on targets with
-               # native code generation available. Avoid the interpreter.
-               --disable-tcg-interpreter
-
-               --disable-werror
-               # We support gnutls/nettle for crypto operations.  It is 
possible
-               # to use gcrypt when gnutls/nettle are disabled (but not when 
they
-               # are enabled), but it's not really worth the hassle.  Disable 
it
-               # all the time to avoid automatically detecting it. #568856
-               --disable-gcrypt
-               --python="${PYTHON}"
-               --cc="$(tc-getCC)"
-               --cxx="$(tc-getCXX)"
-               --host-cc="$(tc-getBUILD_CC)"
-               $(use_enable debug debug-info)
-               $(use_enable debug debug-tcg)
-               $(use_enable doc docs)
-               $(use_enable nls gettext)
-               $(use_enable plugins)
-               $(use_enable xattr attr)
-       )
-
-       # Disable options not used by user targets. This simplifies building
-       # static user targets (USE=static-user) considerably.
-       conf_notuser() {
-               if [[ ${buildtype} == "user" ]] ; then
-                       echo "--disable-${2:-$1}"
-               else
-                       use_enable "$@"
-               fi
-       }
-       # Enable option only for softmmu build, but not 'user' or 'tools'
-       conf_softmmu() {
-               if [[ ${buildtype} == "softmmu" ]] ; then
-                       use_enable "$@"
-               else
-                       echo "--disable-${2:-$1}"
-               fi
-       }
-       # Enable option only for tools build, but not 'user' or 'softmmu'
-       conf_tools() {
-               if [[ ${buildtype} == "tools" ]] ; then
-                       use_enable "$@"
-               else
-                       echo "--disable-${2:-$1}"
-               fi
-       }
-       conf_opts+=(
-               $(conf_notuser accessibility brlapi)
-               $(conf_notuser aio linux-aio)
-               $(conf_notuser bzip2)
-               $(conf_notuser capstone)
-               $(conf_notuser caps cap-ng)
-               $(conf_notuser curl)
-               $(conf_notuser fdt)
-               $(conf_notuser fuse)
-               $(conf_notuser glusterfs)
-               $(conf_notuser gnutls)
-               $(conf_notuser gnutls nettle)
-               $(conf_notuser gtk)
-               $(conf_notuser infiniband rdma)
-               $(conf_notuser iscsi libiscsi)
-               $(conf_notuser io-uring linux-io-uring)
-               $(conf_notuser jemalloc jemalloc)
-               $(conf_notuser jpeg vnc-jpeg)
-               $(conf_notuser kernel_linux kvm)
-               $(conf_notuser lzo)
-               $(conf_notuser multipath mpath)
-               $(conf_notuser ncurses curses)
-               $(conf_notuser nfs libnfs)
-               $(conf_notuser numa)
-               $(conf_notuser opengl)
-               $(conf_notuser png vnc-png)
-               $(conf_notuser rbd)
-               $(conf_notuser sasl vnc-sasl)
-               $(conf_notuser sdl)
-               $(conf_softmmu sdl-image)
-               $(conf_notuser seccomp)
-               $(conf_notuser slirp slirp system)
-               $(conf_notuser smartcard)
-               $(conf_notuser snappy)
-               $(conf_notuser spice)
-               $(conf_notuser ssh libssh)
-               $(conf_notuser udev libudev)
-               $(conf_notuser usb libusb)
-               $(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)
-               $(conf_notuser vte)
-               $(conf_notuser xen)
-               $(conf_notuser xen xen-pci-passthrough)
-               $(conf_notuser xfs xfsctl)
-               # use prebuilt keymaps, bug #759604
-               --disable-xkbcommon
-               $(conf_notuser zstd)
-       )
-
-       if [[ ${buildtype} == "user" ]] ; then
-               conf_opts+=( --disable-libxml2 )
-       else
-               conf_opts+=( --enable-libxml2 )
-       fi
-
-       if [[ ! ${buildtype} == "user" ]] ; then
-               # audio options
-               local audio_opts=(
-                       # Note: backend order matters here: #716202
-                       # We iterate from higher-level to lower level.
-                       $(usex pulseaudio pa "")
-                       $(usev jack)
-                       $(usev sdl)
-                       $(usev alsa)
-                       $(usev oss)
-               )
-               conf_opts+=(
-                       --audio-drv-list=$(printf "%s," "${audio_opts[@]}")
-               )
-       fi
-
-       case ${buildtype} in
-       user)
-               conf_opts+=(
-                       --enable-linux-user
-                       --disable-system
-                       --disable-blobs
-                       --disable-tools
-               )
-               local static_flag="static-user"
-               ;;
-       softmmu)
-               conf_opts+=(
-                       --disable-linux-user
-                       --enable-system
-                       --disable-tools
-               )
-               local static_flag="static"
-               ;;
-       tools)
-               conf_opts+=(
-                       --disable-linux-user
-                       --disable-system
-                       --disable-blobs
-                       --enable-tools
-               )
-               local static_flag="static"
-               ;;
-       esac
-
-       local targets="${buildtype}_targets"
-       [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-       # Add support for SystemTAP
-       use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
-       # We always want to attempt to build with PIE support as it results
-       # in a more secure binary. But it doesn't work with static or if
-       # the current GCC doesn't have PIE support.
-       if use ${static_flag}; then
-               conf_opts+=( --static --disable-pie )
-       else
-               tc-enables-pie && conf_opts+=( --enable-pie )
-       fi
-
-       # Meson will not use a cross-file unless cross_prefix is set.
-       tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
-
-       # Plumb through equivalent of EXTRA_ECONF to allow experiments
-       # like bug #747928.
-       conf_opts+=( ${EXTRA_CONF_QEMU} )
-
-       echo "../configure ${conf_opts[*]}"
-       cd "${builddir}"
-       ../configure "${conf_opts[@]}" || die "configure failed"
-
-       # FreeBSD's kernel does not support QEMU assigning/grabbing
-       # host USB devices yet
-       use kernel_FreeBSD && \
-               sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
-       local target
-
-       python_setup
-
-       softmmu_targets= softmmu_bins=()
-       user_targets= user_bins=()
-
-       for target in ${IUSE_SOFTMMU_TARGETS} ; do
-               if use "qemu_softmmu_targets_${target}"; then
-                       softmmu_targets+=",${target}-softmmu"
-                       softmmu_bins+=( "qemu-system-${target}" )
-               fi
-       done
-
-       for target in ${IUSE_USER_TARGETS} ; do
-               if use "qemu_user_targets_${target}"; then
-                       user_targets+=",${target}-linux-user"
-                       user_bins+=( "qemu-${target}" )
-               fi
-       done
-
-       softmmu_targets=${softmmu_targets#,}
-       user_targets=${user_targets#,}
-
-       [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-       [[ -n ${user_targets}    ]] && qemu_src_configure "user"
-       qemu_src_configure "tools"
-}
-
-src_compile() {
-       if [[ -n ${user_targets} ]]; then
-               cd "${S}/user-build"
-               default
-       fi
-
-       if [[ -n ${softmmu_targets} ]]; then
-               cd "${S}/softmmu-build"
-               default
-       fi
-
-       cd "${S}/tools-build"
-       default
-}
-
-src_test() {
-       if [[ -n ${softmmu_targets} ]]; then
-               cd "${S}/softmmu-build"
-               pax-mark m */qemu-system-* #515550
-               emake check
-       fi
-}
-
-qemu_python_install() {
-       python_domodule "${S}/python/qemu"
-
-       python_doscript "${S}/scripts/kvm/vmxcap"
-       python_doscript "${S}/scripts/qmp/qmp-shell"
-       python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
-       local out="${T}/qemu-binfmt"
-       local out_systemd="${T}/qemu.conf"
-       local d="${T}/binfmt.d"
-
-       einfo "Generating qemu binfmt scripts and configuration files"
-
-       # Generate the debian fragments first.
-       mkdir -p "${d}"
-       "${S}"/scripts/qemu-binfmt-conf.sh \
-               --debian \
-               --exportdir "${d}" \
-               --qemu-path "${EPREFIX}/usr/bin" \
-               || die
-       # Then turn the fragments into a shell script we can source.
-       sed -E -i \
-               -e 's:^([^ ]+) (.*)$:\1="\2":' \
-               "${d}"/* || die
-
-       # Generate the init.d script by assembling the fragments from above.
-       local f qcpu package interpreter magic mask
-       cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
-       for f in "${d}"/qemu-* ; do
-               source "${f}"
-
-               # Normalize the cpu logic like we do in the init.d for the 
native cpu.
-               qcpu=${package#qemu-}
-               case ${qcpu} in
-               arm*)   qcpu="arm";;
-               mips*)  qcpu="mips";;
-               ppc*)   qcpu="ppc";;
-               s390*)  qcpu="s390";;
-               sh*)    qcpu="sh";;
-               sparc*) qcpu="sparc";;
-               esac
-
-               # we use 'printf' here to be portable across 'sh'
-               # implementations: #679168
-               cat <<EOF >>"${out}"
-       if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
-               printf '%s\n' 
':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" 
>/proc/sys/fs/binfmt_misc/register
-       fi
-EOF
-
-               echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" 
>>"${out_systemd}"
-
-       done
-       cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
-       if [[ -n ${user_targets} ]]; then
-               cd "${S}/user-build"
-               emake DESTDIR="${ED}" install
-
-               # Install binfmt handler init script for user targets.
-               generate_initd
-               doinitd "${T}/qemu-binfmt"
-
-               # Install binfmt/qemu.conf.
-               insinto "/usr/share/qemu/binfmt.d"
-               doins "${T}/qemu.conf"
-       fi
-
-       if [[ -n ${softmmu_targets} ]]; then
-               cd "${S}/softmmu-build"
-               emake DESTDIR="${ED}" install
-
-               # This might not exist if the test failed. #512010
-               [[ -e check-report.html ]] && dodoc check-report.html
-
-               if use kernel_linux; then
-                       udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
-               fi
-
-               if use python; then
-                       python_foreach_impl qemu_python_install
-               fi
-       fi
-
-       cd "${S}/tools-build"
-       emake DESTDIR="${ED}" install
-
-       # Disable mprotect on the qemu binaries as they use JITs to be fast 
#459348
-       pushd "${ED}"/usr/bin >/dev/null
-       pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
-       popd >/dev/null
-
-       # Install config file example for qemu-bridge-helper
-       insinto "/etc/qemu"
-       doins "${FILESDIR}/bridge.conf"
-
-       cd "${S}"
-       dodoc MAINTAINERS docs/specs/pci-ids.txt
-       newdoc pc-bios/README README.pc-bios
-
-       # Disallow stripping of prebuilt firmware files.
-       dostrip -x ${QA_PREBUILT}
-
-       if [[ -n ${softmmu_targets} ]]; then
-               # Remove SeaBIOS since we're using the SeaBIOS packaged one
-               rm "${ED}/usr/share/qemu/bios.bin"
-               rm "${ED}/usr/share/qemu/bios-256k.bin"
-               if use qemu_softmmu_targets_x86_64 || use 
qemu_softmmu_targets_i386; then
-                       dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-                       dosym ../seabios/bios-256k.bin 
/usr/share/qemu/bios-256k.bin
-               fi
-
-               # Remove vgabios since we're using the seavgabios packaged one
-               rm "${ED}/usr/share/qemu/vgabios.bin"
-               rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-               rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-               rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-               rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
-               rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-               # PPC/PPC64 loads vgabios-stdvga
-               if use qemu_softmmu_targets_x86_64 || use 
qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use 
qemu_softmmu_targets_ppc64; then
-                       dosym ../seavgabios/vgabios-isavga.bin 
/usr/share/qemu/vgabios.bin
-                       dosym ../seavgabios/vgabios-cirrus.bin 
/usr/share/qemu/vgabios-cirrus.bin
-                       dosym ../seavgabios/vgabios-qxl.bin 
/usr/share/qemu/vgabios-qxl.bin
-                       dosym ../seavgabios/vgabios-stdvga.bin 
/usr/share/qemu/vgabios-stdvga.bin
-                       dosym ../seavgabios/vgabios-virtio.bin 
/usr/share/qemu/vgabios-virtio.bin
-                       dosym ../seavgabios/vgabios-vmware.bin 
/usr/share/qemu/vgabios-vmware.bin
-               fi
-
-               # Remove sgabios since we're using the sgabios packaged one
-               rm "${ED}/usr/share/qemu/sgabios.bin"
-               if use qemu_softmmu_targets_x86_64 || use 
qemu_softmmu_targets_i386; then
-                       dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-               fi
-
-               # Remove iPXE since we're using the iPXE packaged one
-               rm "${ED}"/usr/share/qemu/pxe-*.rom
-               if use qemu_softmmu_targets_x86_64 || use 
qemu_softmmu_targets_i386; then
-                       dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-                       dosym ../ipxe/80861209.rom 
/usr/share/qemu/pxe-eepro100.rom
-                       dosym ../ipxe/10500940.rom 
/usr/share/qemu/pxe-ne2k_pci.rom
-                       dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-                       dosym ../ipxe/10ec8139.rom 
/usr/share/qemu/pxe-rtl8139.rom
-                       dosym ../ipxe/1af41000.rom 
/usr/share/qemu/pxe-virtio.rom
-               fi
-       fi
-
-       DISABLE_AUTOFORMATTING=true
-       readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
-       local pv
-       for pv in ${REPLACING_VERSIONS}; do
-               if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
-                       return 0
-               fi
-       done
-       return 1
-}
-
-pkg_postinst() {
-       if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-               udev_reload
-       fi
-
-       xdg_icon_cache_update
-
-       [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] 
&& \
-               fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
-
-       DISABLE_AUTOFORMATTING=true
-       readme.gentoo_print_elog
-
-       if use pin-upstream-blobs && firmware_abi_change; then
-               ewarn "This version of qemu pins new versions of firmware 
blobs:"
-               ewarn " $(best_version sys-firmware/edk2-ovmf)"
-               ewarn " $(best_version sys-firmware/ipxe)"
-               ewarn " $(best_version sys-firmware/seabios)"
-               ewarn " $(best_version sys-firmware/sgabios)"
-               ewarn "This might break resume of hibernated guests (started 
with a different"
-               ewarn "firmware version) and live migration to/from qemu 
versions with different"
-               ewarn "firmware. Please (cold) restart all running guests. For 
functional"
-               ewarn "guest migration ensure that all"
-               ewarn "hosts run at least"
-               ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
-       fi
-}
-
-pkg_info() {
-       echo "Using:"
-       echo "  $(best_version app-emulation/spice-protocol)"
-       echo "  $(best_version sys-firmware/edk2-ovmf)"
-       if has_version 'sys-firmware/edk2-ovmf[binary]'; then
-               echo "    USE=binary"
-       else
-               echo "    USE=''"
-       fi
-       echo "  $(best_version sys-firmware/ipxe)"
-       echo "  $(best_version sys-firmware/seabios)"
-       if has_version 'sys-firmware/seabios[binary]'; then
-               echo "    USE=binary"
-       else
-               echo "    USE=''"
-       fi
-       echo "  $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
-       xdg_icon_cache_update
-}

diff --git a/app-emulation/qemu/qemu-6.0.1-r1.ebuild 
b/app-emulation/qemu/qemu-6.0.1-r1.ebuild
deleted file mode 100644
index c52efb258bce..000000000000
--- a/app-emulation/qemu/qemu-6.0.1-r1.ebuild
+++ /dev/null
@@ -1,911 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="6.0.0-r50"
-
-inherit eutils linux-info toolchain-funcs multilib python-r1
-inherit udev fcaps readme.gentoo-r1 pax-utils xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-       EGIT_REPO_URI="https://git.qemu.org/git/qemu.git";
-       EGIT_SUBMODULES=(
-               meson
-               tests/fp/berkeley-softfloat-3
-               tests/fp/berkeley-testfloat-3
-               ui/keycodemapdb
-       )
-       inherit git-r3
-       SRC_URI=""
-else
-       SRC_URI="https://download.qemu.org/${P}.tar.xz";
-       KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org";
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
-       +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring
-       jack jemalloc +jpeg kernel_linux
-       kernel_FreeBSD lzo multipath
-       ncurses nfs nls numa opengl +oss +pin-upstream-blobs
-       plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
-       +slirp
-       smartcard snappy spice ssh static static-user systemtap test udev usb
-       usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
-       xfs zstd"
-
-COMMON_TARGETS="
-       aarch64
-       alpha
-       arm
-       cris
-       hppa
-       i386
-       m68k
-       microblaze
-       microblazeel
-       mips
-       mips64
-       mips64el
-       mipsel
-       nios2
-       or1k
-       ppc
-       ppc64
-       riscv32
-       riscv64
-       s390x
-       sh4
-       sh4eb
-       sparc
-       sparc64
-       x86_64
-       xtensa
-       xtensaeb
-"
-IUSE_SOFTMMU_TARGETS="
-       ${COMMON_TARGETS}
-       avr
-       lm32
-       moxie
-       rx
-       tricore
-       unicore32
-"
-IUSE_USER_TARGETS="
-       ${COMMON_TARGETS}
-       aarch64_be
-       armeb
-       hexagon
-       mipsn32
-       mipsn32el
-       ppc64abi32
-       ppc64le
-       sparc32plus
-"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' 
${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-       qemu_softmmu_targets_arm? ( fdt )
-       qemu_softmmu_targets_microblaze? ( fdt )
-       qemu_softmmu_targets_mips64el? ( fdt )
-       qemu_softmmu_targets_ppc64? ( fdt )
-       qemu_softmmu_targets_ppc? ( fdt )
-       qemu_softmmu_targets_riscv32? ( fdt )
-       qemu_softmmu_targets_riscv64? ( fdt )
-       sdl-image? ( sdl )
-       static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins 
!rbd !snappy !udev )
-       static-user? ( !plugins )
-       vhost-user-fs? ( caps seccomp )
-       virgl? ( opengl )
-       virtfs? ( caps xattr )
-       vte? ( gtk )
-       multipath? ( udev )
-       plugins? ( !static !static-user )
-"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
-       >=dev-libs/glib-2.0[static-libs(+)]
-       sys-libs/zlib[static-libs(+)]
-       python? ( ${PYTHON_DEPS} )
-       systemtap? ( dev-util/systemtap )
-       xattr? ( sys-apps/attr[static-libs(+)] )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
-       dev-libs/libxml2[static-libs(+)]
-       >=x11-libs/pixman-0.28.0[static-libs(+)]
-       accessibility? (
-               app-accessibility/brltty[api]
-               app-accessibility/brltty[static-libs(+)]
-       )
-       aio? ( dev-libs/libaio[static-libs(+)] )
-       alsa? ( >=media-libs/alsa-lib-1.0.13 )
-       bzip2? ( app-arch/bzip2[static-libs(+)] )
-       capstone? ( dev-libs/capstone:= )
-       caps? ( sys-libs/libcap-ng[static-libs(+)] )
-       curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-       fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
-       fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
-       glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-       gnutls? (
-               dev-libs/nettle:=[static-libs(+)]
-               >=net-libs/gnutls-3.0:=[static-libs(+)]
-       )
-       gtk? (
-               x11-libs/gtk+:3
-               vte? ( x11-libs/vte:2.91 )
-       )
-       infiniband? (
-               sys-fabric/libibumad:=[static-libs(+)]
-               sys-fabric/libibverbs:=[static-libs(+)]
-               sys-fabric/librdmacm:=[static-libs(+)]
-       )
-       iscsi? ( net-libs/libiscsi )
-       io-uring? ( sys-libs/liburing:=[static-libs(+)] )
-       jack? ( virtual/jack )
-       jemalloc? ( dev-libs/jemalloc )
-       jpeg? ( virtual/jpeg:0=[static-libs(+)] )
-       lzo? ( dev-libs/lzo:2[static-libs(+)] )
-       multipath? ( sys-fs/multipath-tools )
-       ncurses? (
-               sys-libs/ncurses:=[unicode(+)]
-               sys-libs/ncurses:=[static-libs(+)]
-       )
-       nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
-       numa? ( sys-process/numactl[static-libs(+)] )
-       opengl? (
-               virtual/opengl
-               media-libs/libepoxy[static-libs(+)]
-               media-libs/mesa[static-libs(+)]
-               media-libs/mesa[egl(+),gbm(+)]
-       )
-       png? ( media-libs/libpng:0=[static-libs(+)] )
-       pulseaudio? ( media-sound/pulseaudio )
-       rbd? ( sys-cluster/ceph )
-       sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-       sdl? (
-               media-libs/libsdl2[video]
-               media-libs/libsdl2[static-libs(+)]
-       )
-       sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-       seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-       slirp? ( net-libs/libslirp[static-libs(+)] )
-       smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
-       snappy? ( app-arch/snappy:= )
-       spice? (
-               >=app-emulation/spice-protocol-0.12.3
-               >=app-emulation/spice-0.12.0[static-libs(+)]
-       )
-       ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
-       udev? ( virtual/libudev:= )
-       usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
-       usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-       vde? ( net-misc/vde[static-libs(+)] )
-       virgl? ( media-libs/virglrenderer[static-libs(+)] )
-       virtfs? ( sys-libs/libcap )
-       xen? ( app-emulation/xen-tools:= )
-       xfs? ( sys-fs/xfsprogs[static-libs(+)] )
-       zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
-"
-
-EDK2_OVMF_VERSION="202105"
-SEABIOS_VERSION="1.14.0"
-
-X86_FIRMWARE_DEPEND="
-       pin-upstream-blobs? (
-               ~sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}[binary]
-               ~sys-firmware/ipxe-1.21.1[binary,qemu]
-               ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
-               ~sys-firmware/sgabios-0.1_pre10[binary]
-       )
-       !pin-upstream-blobs? (
-               >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
-               sys-firmware/ipxe[qemu]
-               >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-               sys-firmware/sgabios
-       )"
-PPC_FIRMWARE_DEPEND="
-       pin-upstream-blobs? (
-               ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
-       )
-       !pin-upstream-blobs? (
-               >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
-       )
-"
-
-BDEPEND="
-       $(python_gen_impl_dep)
-       dev-lang/perl
-       sys-apps/texinfo
-       virtual/pkgconfig
-       doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-       gtk? ( nls? ( sys-devel/gettext ) )
-       test? (
-               dev-libs/glib[utils]
-               sys-devel/bc
-       )
-"
-CDEPEND="
-       !static? (
-               ${ALL_DEPEND//\[static-libs(+)]}
-               ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-       )
-       qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-       qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-       qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
-       qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} )
-"
-DEPEND="${CDEPEND}
-       kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-       static? (
-               ${ALL_DEPEND}
-               ${SOFTMMU_TOOLS_DEPEND}
-       )
-       static-user? ( ${ALL_DEPEND} )"
-RDEPEND="${CDEPEND}
-       acct-group/kvm
-       selinux? ( sec-policy/selinux-qemu )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
-       "${FILESDIR}"/${PN}-5.2.0-strings.patch
-       "${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
-       "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
-       "${FILESDIR}"/${PN}-5.2.0-dce-locks.patch
-       "${FILESDIR}"/${PN}-6.0.0-make.patch
-)
-
-QA_PREBUILT="
-       usr/share/qemu/hppa-firmware.img
-       usr/share/qemu/openbios-ppc
-       usr/share/qemu/openbios-sparc64
-       usr/share/qemu/openbios-sparc32
-       usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf
-       usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-       usr/share/qemu/palcode-clipper
-       usr/share/qemu/s390-ccw.img
-       usr/share/qemu/s390-netboot.img
-       usr/share/qemu/u-boot.e500
-"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-       usr/bin/qemu-x86_64
-       usr/bin/qemu-alpha
-       usr/bin/qemu-arm
-       usr/bin/qemu-cris
-       usr/bin/qemu-m68k
-       usr/bin/qemu-microblaze
-       usr/bin/qemu-microblazeel
-       usr/bin/qemu-mips
-       usr/bin/qemu-mipsel
-       usr/bin/qemu-or1k
-       usr/bin/qemu-ppc
-       usr/bin/qemu-ppc64
-       usr/bin/qemu-ppc64abi32
-       usr/bin/qemu-sh4
-       usr/bin/qemu-sh4eb
-       usr/bin/qemu-sparc
-       usr/bin/qemu-sparc64
-       usr/bin/qemu-armeb
-       usr/bin/qemu-sparc32plus
-       usr/bin/qemu-s390x
-       usr/bin/qemu-unicore32
-"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you 
have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
-       For AMD CPUs the module is called 'kvm-amd'.
-       For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
-       $ gpasswd -a <USER> kvm
-then have <USER> re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it.  You can tell udev to reset ownership/perms:
-       $ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
-       # rc-update add qemu-binfmt
-For systemd:
-       # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
-       if use kernel_linux && kernel_is lt 2 6 25; then
-               eerror "This version of KVM requires a host kernel of 2.6.25 or 
higher."
-       elif use kernel_linux; then
-               if ! linux_config_exists; then
-                       eerror "Unable to check your kernel for KVM support"
-               else
-                       CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-                       ERROR_KVM="You must enable KVM in your kernel to 
continue"
-                       ERROR_KVM_AMD="If you have an AMD CPU, you must enable 
KVM_AMD in"
-                       ERROR_KVM_AMD+=" your kernel configuration."
-                       ERROR_KVM_INTEL="If you have an Intel CPU, you must 
enable"
-                       ERROR_KVM_INTEL+=" KVM_INTEL in your kernel 
configuration."
-                       ERROR_TUN="You will need the Universal TUN/TAP driver 
compiled"
-                       ERROR_TUN+=" into your kernel or loaded as a module to 
use the"
-                       ERROR_TUN+=" virtual network device if using -net tap."
-                       ERROR_BRIDGE="You will also need support for 802.1d"
-                       ERROR_BRIDGE+=" Ethernet Bridging for some network 
configurations."
-                       use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-                       ERROR_VHOST_NET="You must enable VHOST_NET to have 
vhost-net"
-                       ERROR_VHOST_NET+=" support"
-
-                       if use amd64 || use x86 || use amd64-linux || use 
x86-linux; then
-                               if grep -q AuthenticAMD /proc/cpuinfo; then
-                                       CONFIG_CHECK+=" ~KVM_AMD"
-                               elif grep -q GenuineIntel /proc/cpuinfo; then
-                                       CONFIG_CHECK+=" ~KVM_INTEL"
-                               fi
-                       fi
-
-                       use python && CONFIG_CHECK+=" ~DEBUG_FS"
-                       ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-                       # Now do the actual checks setup above
-                       check_extra_config
-               fi
-       fi
-
-       if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-               eerror "The kvm/qemu-kvm wrappers no longer exist, but your 
libvirt"
-               eerror "instances are still pointing to it.  Please update your"
-               eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm 
flag"
-               eerror "and the right system binary (e.g. qemu-system-x86_64)."
-               die "update your virt configs to not use qemu-kvm"
-       fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
-       local var=$1 mak=$2
-       local detected sorted
-
-       pushd "${S}"/default-configs/targets/ >/dev/null || die
-
-       # Force C locale until glibc is updated. #564936
-       detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | 
LC_COLLATE=C sort -u))
-       sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
-       if [[ ${sorted} != "${detected}" ]] ; then
-               eerror "The ebuild needs to be kept in sync."
-               eerror "${var}: ${sorted}"
-               eerror "$(printf '%-*s' ${#var} configure): ${detected}"
-               die "sync ${var} to the list of targets"
-       fi
-
-       popd >/dev/null
-}
-
-src_prepare() {
-       check_targets IUSE_SOFTMMU_TARGETS softmmu
-       check_targets IUSE_USER_TARGETS linux-user
-
-       default
-
-       # Use correct toolchain to fix cross-compiling
-       tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
-       export WINDRES=${CHOST}-windres
-
-       # Verbose builds
-       MAKEOPTS+=" V=1"
-
-       # Remove bundled copy of libfdt
-       rm -r dtc || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-       debug-print-function ${FUNCNAME} "$@"
-
-       local buildtype=$1
-       local builddir="${S}/${buildtype}-build"
-
-       mkdir "${builddir}"
-
-       local conf_opts=(
-               --prefix=/usr
-               --sysconfdir=/etc
-               --bindir=/usr/bin
-               --libdir=/usr/$(get_libdir)
-               --datadir=/usr/share
-               --docdir=/usr/share/doc/${PF}/html
-               --mandir=/usr/share/man
-               --localstatedir=/var
-               --disable-bsd-user
-               --disable-containers # bug #732972
-               --disable-guest-agent
-               --disable-strip
-
-               # bug #746752: TCG interpreter has a few limitations:
-               # - it does not support FPU
-               # - it's generally slower on non-self-modifying code
-               # It's advantage is support for host architectures
-               # where native codegeneration is not implemented.
-               # Gentoo has qemu keyworded only on targets with
-               # native code generation available. Avoid the interpreter.
-               --disable-tcg-interpreter
-
-               --disable-werror
-               # We support gnutls/nettle for crypto operations.  It is 
possible
-               # to use gcrypt when gnutls/nettle are disabled (but not when 
they
-               # are enabled), but it's not really worth the hassle.  Disable 
it
-               # all the time to avoid automatically detecting it. #568856
-               --disable-gcrypt
-               --python="${PYTHON}"
-               --cc="$(tc-getCC)"
-               --cxx="$(tc-getCXX)"
-               --host-cc="$(tc-getBUILD_CC)"
-               $(use_enable debug debug-info)
-               $(use_enable debug debug-tcg)
-               $(use_enable doc docs)
-               $(use_enable nls gettext)
-               $(use_enable plugins)
-               $(use_enable xattr attr)
-       )
-
-       # Disable options not used by user targets. This simplifies building
-       # static user targets (USE=static-user) considerably.
-       conf_notuser() {
-               if [[ ${buildtype} == "user" ]] ; then
-                       echo "--disable-${2:-$1}"
-               else
-                       use_enable "$@"
-               fi
-       }
-       # Enable option only for softmmu build, but not 'user' or 'tools'
-       conf_softmmu() {
-               if [[ ${buildtype} == "softmmu" ]] ; then
-                       use_enable "$@"
-               else
-                       echo "--disable-${2:-$1}"
-               fi
-       }
-       # Enable option only for tools build, but not 'user' or 'softmmu'
-       conf_tools() {
-               if [[ ${buildtype} == "tools" ]] ; then
-                       use_enable "$@"
-               else
-                       echo "--disable-${2:-$1}"
-               fi
-       }
-       conf_opts+=(
-               $(conf_notuser accessibility brlapi)
-               $(conf_notuser aio linux-aio)
-               $(conf_notuser bzip2)
-               $(conf_notuser capstone)
-               $(conf_notuser caps cap-ng)
-               $(conf_notuser curl)
-               $(conf_notuser fdt)
-               $(conf_notuser fuse)
-               $(conf_notuser glusterfs)
-               $(conf_notuser gnutls)
-               $(conf_notuser gnutls nettle)
-               $(conf_notuser gtk)
-               $(conf_notuser infiniband rdma)
-               $(conf_notuser iscsi libiscsi)
-               $(conf_notuser io-uring linux-io-uring)
-               $(conf_notuser jemalloc jemalloc)
-               $(conf_notuser jpeg vnc-jpeg)
-               $(conf_notuser kernel_linux kvm)
-               $(conf_notuser lzo)
-               $(conf_notuser multipath mpath)
-               $(conf_notuser ncurses curses)
-               $(conf_notuser nfs libnfs)
-               $(conf_notuser numa)
-               $(conf_notuser opengl)
-               $(conf_notuser png vnc-png)
-               $(conf_notuser rbd)
-               $(conf_notuser sasl vnc-sasl)
-               $(conf_notuser sdl)
-               $(conf_softmmu sdl-image)
-               $(conf_notuser seccomp)
-               $(conf_notuser slirp slirp system)
-               $(conf_notuser smartcard)
-               $(conf_notuser snappy)
-               $(conf_notuser spice)
-               $(conf_notuser ssh libssh)
-               $(conf_notuser udev libudev)
-               $(conf_notuser usb libusb)
-               $(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)
-               $(conf_notuser vte)
-               $(conf_notuser xen)
-               $(conf_notuser xen xen-pci-passthrough)
-               $(conf_notuser xfs xfsctl)
-               # use prebuilt keymaps, bug #759604
-               --disable-xkbcommon
-               $(conf_notuser zstd)
-       )
-
-       if [[ ${buildtype} == "user" ]] ; then
-               conf_opts+=( --disable-libxml2 )
-       else
-               conf_opts+=( --enable-libxml2 )
-       fi
-
-       if [[ ! ${buildtype} == "user" ]] ; then
-               # audio options
-               local audio_opts=(
-                       # Note: backend order matters here: #716202
-                       # We iterate from higher-level to lower level.
-                       $(usex pulseaudio pa "")
-                       $(usev jack)
-                       $(usev sdl)
-                       $(usev alsa)
-                       $(usev oss)
-               )
-               conf_opts+=(
-                       --audio-drv-list=$(printf "%s," "${audio_opts[@]}")
-               )
-       fi
-
-       case ${buildtype} in
-       user)
-               conf_opts+=(
-                       --enable-linux-user
-                       --disable-system
-                       --disable-blobs
-                       --disable-tools
-               )
-               local static_flag="static-user"
-               ;;
-       softmmu)
-               conf_opts+=(
-                       --disable-linux-user
-                       --enable-system
-                       --disable-tools
-               )
-               local static_flag="static"
-               ;;
-       tools)
-               conf_opts+=(
-                       --disable-linux-user
-                       --disable-system
-                       --disable-blobs
-                       --enable-tools
-               )
-               local static_flag="static"
-               ;;
-       esac
-
-       local targets="${buildtype}_targets"
-       [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-       # Add support for SystemTAP
-       use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
-       # We always want to attempt to build with PIE support as it results
-       # in a more secure binary. But it doesn't work with static or if
-       # the current GCC doesn't have PIE support.
-       if use ${static_flag}; then
-               conf_opts+=( --static --disable-pie )
-       else
-               tc-enables-pie && conf_opts+=( --enable-pie )
-       fi
-
-       # Meson will not use a cross-file unless cross_prefix is set.
-       tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
-
-       # Plumb through equivalent of EXTRA_ECONF to allow experiments
-       # like bug #747928.
-       conf_opts+=( ${EXTRA_CONF_QEMU} )
-
-       echo "../configure ${conf_opts[*]}"
-       cd "${builddir}"
-       ../configure "${conf_opts[@]}" || die "configure failed"
-
-       # FreeBSD's kernel does not support QEMU assigning/grabbing
-       # host USB devices yet
-       use kernel_FreeBSD && \
-               sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
-       local target
-
-       python_setup
-
-       softmmu_targets= softmmu_bins=()
-       user_targets= user_bins=()
-
-       for target in ${IUSE_SOFTMMU_TARGETS} ; do
-               if use "qemu_softmmu_targets_${target}"; then
-                       softmmu_targets+=",${target}-softmmu"
-                       softmmu_bins+=( "qemu-system-${target}" )
-               fi
-       done
-
-       for target in ${IUSE_USER_TARGETS} ; do
-               if use "qemu_user_targets_${target}"; then
-                       user_targets+=",${target}-linux-user"
-                       user_bins+=( "qemu-${target}" )
-               fi
-       done
-
-       softmmu_targets=${softmmu_targets#,}
-       user_targets=${user_targets#,}
-
-       [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-       [[ -n ${user_targets}    ]] && qemu_src_configure "user"
-       qemu_src_configure "tools"
-}
-
-src_compile() {
-       if [[ -n ${user_targets} ]]; then
-               cd "${S}/user-build"
-               default
-       fi
-
-       if [[ -n ${softmmu_targets} ]]; then
-               cd "${S}/softmmu-build"
-               default
-       fi
-
-       cd "${S}/tools-build"
-       default
-}
-
-src_test() {
-       if [[ -n ${softmmu_targets} ]]; then
-               cd "${S}/softmmu-build"
-               pax-mark m */qemu-system-* #515550
-               emake check
-       fi
-}
-
-qemu_python_install() {
-       python_domodule "${S}/python/qemu"
-
-       python_doscript "${S}/scripts/kvm/vmxcap"
-       python_doscript "${S}/scripts/qmp/qmp-shell"
-       python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-#   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-#   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
-       local out="${T}/qemu-binfmt"
-       local out_systemd="${T}/qemu.conf"
-       local d="${T}/binfmt.d"
-
-       einfo "Generating qemu binfmt scripts and configuration files"
-
-       # Generate the debian fragments first.
-       mkdir -p "${d}"
-       "${S}"/scripts/qemu-binfmt-conf.sh \
-               --debian \
-               --exportdir "${d}" \
-               --qemu-path "${EPREFIX}/usr/bin" \
-               || die
-       # Then turn the fragments into a shell script we can source.
-       sed -E -i \
-               -e 's:^([^ ]+) (.*)$:\1="\2":' \
-               "${d}"/* || die
-
-       # Generate the init.d script by assembling the fragments from above.
-       local f qcpu package interpreter magic mask
-       cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
-       for f in "${d}"/qemu-* ; do
-               source "${f}"
-
-               # Normalize the cpu logic like we do in the init.d for the 
native cpu.
-               qcpu=${package#qemu-}
-               case ${qcpu} in
-               arm*)   qcpu="arm";;
-               mips*)  qcpu="mips";;
-               ppc*)   qcpu="ppc";;
-               s390*)  qcpu="s390";;
-               sh*)    qcpu="sh";;
-               sparc*) qcpu="sparc";;
-               esac
-
-               # we use 'printf' here to be portable across 'sh'
-               # implementations: #679168
-               cat <<EOF >>"${out}"
-       if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
-               printf '%s\n' 
':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" 
>/proc/sys/fs/binfmt_misc/register
-       fi
-EOF
-
-               echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" 
>>"${out_systemd}"
-
-       done
-       cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
-       if [[ -n ${user_targets} ]]; then
-               cd "${S}/user-build"
-               emake DESTDIR="${ED}" install
-
-               # Install binfmt handler init script for user targets.
-               generate_initd
-               doinitd "${T}/qemu-binfmt"
-
-               # Install binfmt/qemu.conf.
-               insinto "/usr/share/qemu/binfmt.d"
-               doins "${T}/qemu.conf"
-       fi
-
-       if [[ -n ${softmmu_targets} ]]; then
-               cd "${S}/softmmu-build"
-               emake DESTDIR="${ED}" install
-
-               # This might not exist if the test failed. #512010
-               [[ -e check-report.html ]] && dodoc check-report.html
-
-               if use kernel_linux; then
-                       udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules
-               fi
-
-               if use python; then
-                       python_foreach_impl qemu_python_install
-               fi
-       fi
-
-       cd "${S}/tools-build"
-       emake DESTDIR="${ED}" install
-
-       # Disable mprotect on the qemu binaries as they use JITs to be fast 
#459348
-       pushd "${ED}"/usr/bin >/dev/null
-       pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
-       popd >/dev/null
-
-       # Install config file example for qemu-bridge-helper
-       insinto "/etc/qemu"
-       doins "${FILESDIR}/bridge.conf"
-
-       cd "${S}"
-       dodoc MAINTAINERS docs/specs/pci-ids.txt
-       newdoc pc-bios/README README.pc-bios
-
-       # Disallow stripping of prebuilt firmware files.
-       dostrip -x ${QA_PREBUILT}
-
-       if [[ -n ${softmmu_targets} ]]; then
-               # Remove SeaBIOS since we're using the SeaBIOS packaged one
-               rm "${ED}/usr/share/qemu/bios.bin"
-               rm "${ED}/usr/share/qemu/bios-256k.bin"
-               if use qemu_softmmu_targets_x86_64 || use 
qemu_softmmu_targets_i386; then
-                       dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-                       dosym ../seabios/bios-256k.bin 
/usr/share/qemu/bios-256k.bin
-               fi
-
-               # Remove vgabios since we're using the seavgabios packaged one
-               rm "${ED}/usr/share/qemu/vgabios.bin"
-               rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-               rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-               rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-               rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
-               rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-               # PPC/PPC64 loads vgabios-stdvga
-               if use qemu_softmmu_targets_x86_64 || use 
qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use 
qemu_softmmu_targets_ppc64; then
-                       dosym ../seavgabios/vgabios-isavga.bin 
/usr/share/qemu/vgabios.bin
-                       dosym ../seavgabios/vgabios-cirrus.bin 
/usr/share/qemu/vgabios-cirrus.bin
-                       dosym ../seavgabios/vgabios-qxl.bin 
/usr/share/qemu/vgabios-qxl.bin
-                       dosym ../seavgabios/vgabios-stdvga.bin 
/usr/share/qemu/vgabios-stdvga.bin
-                       dosym ../seavgabios/vgabios-virtio.bin 
/usr/share/qemu/vgabios-virtio.bin
-                       dosym ../seavgabios/vgabios-vmware.bin 
/usr/share/qemu/vgabios-vmware.bin
-               fi
-
-               # Remove sgabios since we're using the sgabios packaged one
-               rm "${ED}/usr/share/qemu/sgabios.bin"
-               if use qemu_softmmu_targets_x86_64 || use 
qemu_softmmu_targets_i386; then
-                       dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-               fi
-
-               # Remove iPXE since we're using the iPXE packaged one
-               rm "${ED}"/usr/share/qemu/pxe-*.rom
-               if use qemu_softmmu_targets_x86_64 || use 
qemu_softmmu_targets_i386; then
-                       dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-                       dosym ../ipxe/80861209.rom 
/usr/share/qemu/pxe-eepro100.rom
-                       dosym ../ipxe/10500940.rom 
/usr/share/qemu/pxe-ne2k_pci.rom
-                       dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-                       dosym ../ipxe/10ec8139.rom 
/usr/share/qemu/pxe-rtl8139.rom
-                       dosym ../ipxe/1af41000.rom 
/usr/share/qemu/pxe-virtio.rom
-               fi
-       fi
-
-       DISABLE_AUTOFORMATTING=true
-       readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
-       local pv
-       for pv in ${REPLACING_VERSIONS}; do
-               if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then
-                       return 0
-               fi
-       done
-       return 1
-}
-
-pkg_postinst() {
-       if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-               udev_reload
-       fi
-
-       xdg_icon_cache_update
-
-       [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] 
&& \
-               fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
-
-       DISABLE_AUTOFORMATTING=true
-       readme.gentoo_print_elog
-
-       if use pin-upstream-blobs && firmware_abi_change; then
-               ewarn "This version of qemu pins new versions of firmware 
blobs:"
-               ewarn " $(best_version sys-firmware/edk2-ovmf)"
-               ewarn " $(best_version sys-firmware/ipxe)"
-               ewarn " $(best_version sys-firmware/seabios)"
-               ewarn " $(best_version sys-firmware/sgabios)"
-               ewarn "This might break resume of hibernated guests (started 
with a different"
-               ewarn "firmware version) and live migration to/from qemu 
versions with different"
-               ewarn "firmware. Please (cold) restart all running guests. For 
functional"
-               ewarn "guest migration ensure that all"
-               ewarn "hosts run at least"
-               ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
-       fi
-}
-
-pkg_info() {
-       echo "Using:"
-       echo "  $(best_version app-emulation/spice-protocol)"
-       echo "  $(best_version sys-firmware/edk2-ovmf)"
-       if has_version 'sys-firmware/edk2-ovmf[binary]'; then
-               echo "    USE=binary"
-       else
-               echo "    USE=''"
-       fi
-       echo "  $(best_version sys-firmware/ipxe)"
-       echo "  $(best_version sys-firmware/seabios)"
-       if has_version 'sys-firmware/seabios[binary]'; then
-               echo "    USE=binary"
-       else
-               echo "    USE=''"
-       fi
-       echo "  $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
-       xdg_icon_cache_update
-}

Reply via email to