From 869b4dc904f7c2e554113f1e93159e12e262e697 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sat, 21 Sep 2019 23:56:46 +0100 Subject: [PATCH] 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 Signed-off-by: Matthias Maier --- app-emulation/qemu/metadata.xml | 1 + app-emulation/qemu/qemu-9999.ebuild | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml index f38823b3990e..3439dfdd4e15 100644 --- a/app-emulation/qemu/metadata.xml +++ b/app-emulation/qemu/metadata.xml @@ -54,5 +54,6 @@ Enables support for Xen backends Support xfsctl() notification and syncing for XFS backed virtual disks. + Depend on x11-libs/libxkbcommon to build qemu-keymap tool for converting xkb keymaps diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 81ea6f1f096e..f1f1b3bc6f71 100644 --- 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 -- 2.26.2