From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 57A27138335 for ; Sun, 22 Sep 2019 02:12:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AC07E0999; Sun, 22 Sep 2019 02:12:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E5F14E0999 for ; Sun, 22 Sep 2019 02:12:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C346334B47A for ; Sun, 22 Sep 2019 02:12:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C85597F8 for ; Sun, 22 Sep 2019 02:12:36 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1569118325.869b4dc904f7c2e554113f1e93159e12e262e697.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/metadata.xml app-emulation/qemu/qemu-9999.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 869b4dc904f7c2e554113f1e93159e12e262e697 X-VCS-Branch: master Date: Sun, 22 Sep 2019 02:12:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e1c5c1ee-99b6-49e9-8880-0702ebfe8d75 X-Archives-Hash: bd0545c013ac7a5fc4a3f0d77c8b69b2 commit: 869b4dc904f7c2e554113f1e93159e12e262e697 Author: James Le Cuirot gentoo org> AuthorDate: Sat Sep 21 22:56:46 2019 +0000 Commit: Matthias Maier gentoo org> CommitDate: Sun Sep 22 02:12:05 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=869b4dc9 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 gentoo.org> Signed-off-by: Matthias Maier gentoo.org> 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 f38823b3990..3439dfdd4e1 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 81ea6f1f096..f1f1b3bc6f7 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