summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-12-12 23:30:03 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2020-12-12 23:53:12 +0000
commit1cc25abb2720fce0fdfaa38e1e3f5b39a4dcf895 (patch)
tree23c97ed78c618e1644c5aecaf2f95d28fab85cb5 /app-emulation/qemu/qemu-9999.ebuild
parentprofiles/arch/powerpc: unmask dev-util/gtk-doc[test] on ppc (diff)
downloadgentoo-1cc25abb2720fce0fdfaa38e1e3f5b39a4dcf895.tar.gz
gentoo-1cc25abb2720fce0fdfaa38e1e3f5b39a4dcf895.tar.bz2
gentoo-1cc25abb2720fce0fdfaa38e1e3f5b39a4dcf895.zip
app-emulation/qemu: drop USE=xkb, use prebuilt keymaps
USE=xkb re-generates qemu keymaps instead of already prebuilt ones. It has a few problems: - present /usr/bin/qemu-keymaps is preferred over locally built one - /usr/bin/qemu-keymaps can't be ran on a system without x11-misc/xkeyboard-config Let's rely on prebuilt keymaps. Reported-by: Ben Kohler Closes: https://bugs.gentoo.org/759604 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'app-emulation/qemu/qemu-9999.ebuild')
-rw-r--r--app-emulation/qemu/qemu-9999.ebuild6
1 files changed, 3 insertions, 3 deletions
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 2ca83e90d024..ad937601f520 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -41,7 +41,7 @@ IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
+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 +xkb zstd"
+ xfs zstd"
COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
@@ -93,7 +93,6 @@ ALL_DEPEND="
# softmmu targets (qemu-system-*).
SOFTMMU_TOOLS_DEPEND="
dev-libs/libxml2[static-libs(+)]
- xkb? ( x11-libs/libxkbcommon[static-libs(+)] )
>=x11-libs/pixman-0.28.0[static-libs(+)]
accessibility? (
app-accessibility/brltty[api]
@@ -486,7 +485,8 @@ qemu_src_configure() {
$(conf_notuser xen)
$(conf_notuser xen xen-pci-passthrough)
$(conf_notuser xfs xfsctl)
- $(conf_notuser xkb xkbcommon)
+ # use prebuilt keymaps, bug #759604
+ --disable-xkbcommon
$(conf_notuser zstd)
)