app-emulation/qemu: Add xkb USE flag now that xkbcommon option exists

Upstream merged my patch to add this option. Use of libxkbcommon was
automagic before.

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Signed-off-by: Matthias Maier <tamiko@gentoo.org>

diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index f38823b3990e0e6b27c98a42c21dffb0890a0570..3439dfdd4e1516aa8a300ea83eec31e909460c12 100644 (file)
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -54,5 +54,6 @@
                <flag name="xen">Enables support for Xen backends</flag>
                <flag name="xfs">Support xfsctl() notification and syncing for XFS backed
                virtual disks.</flag>
+               <flag name="xkb">Depend on x11-libs/libxkbcommon to build qemu-keymap tool for converting xkb keymaps</flag>
        </use>
 </pkgmetadata>

diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 81ea6f1f096ec72114c920123578f63c03842614..f1f1b3bc6f7181c422e66027e98ba4ea013adffe 100644 (file)
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -32,12 +32,13 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
+
 IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
        +fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux
        kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
        pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
        spice ssh static static-user systemtap tci test usb usbredir vde
-       +vhost-net virgl virtfs +vnc vte xattr xen xfs"
+       +vhost-net virgl virtfs +vnc vte xattr xen xfs +xkb"
 
 COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
        mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
@@ -85,7 +86,7 @@ ALL_DEPEND="
 # softmmu targets (qemu-system-*).
 SOFTMMU_TOOLS_DEPEND="
        dev-libs/libxml2[static-libs(+)]
-       x11-libs/libxkbcommon[static-libs(+)]
+       xkb? ( x11-libs/libxkbcommon[static-libs(+)] )
        >=x11-libs/pixman-0.28.0[static-libs(+)]
        accessibility? (
                app-accessibility/brltty[api]
@@ -463,6 +464,7 @@ qemu_src_configure() {
                $(conf_notuser xen)
                $(conf_notuser xen xen-pci-passthrough)
                $(conf_notuser xfs xfsctl)
+               $(conf_notuser xkb xkbcommon)
        )
 
        if [[ ${buildtype} == "user" ]] ; then