Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/
Date: Sun, 10 Jun 2018 03:31:30
Message-Id: 1528601402.9d536374f7c6f1e7bb6c1466d5e131b8a5bc562d.tamiko@gentoo
1 commit: 9d536374f7c6f1e7bb6c1466d5e131b8a5bc562d
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 10 03:22:39 2018 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 10 03:30:02 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d536374
7
8 app-emulation/qemu: update live ebuild
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 app-emulation/qemu/qemu-9999.ebuild | 18 +++++++++++++++---
13 1 file changed, 15 insertions(+), 3 deletions(-)
14
15 diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
16 index 2df4a751f82..2573012333f 100644
17 --- a/app-emulation/qemu/qemu-9999.ebuild
18 +++ b/app-emulation/qemu/qemu-9999.ebuild
19 @@ -3,7 +3,7 @@
20
21 EAPI="6"
22
23 -PYTHON_COMPAT=( python2_7 )
24 +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
25 PYTHON_REQ_USE="ncurses,readline"
26
27 PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
28 @@ -79,6 +79,8 @@ ALL_DEPEND="
29 # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
30 # softmmu targets (qemu-system-*).
31 SOFTMMU_TOOLS_DEPEND="
32 + dev-libs/libxml2[static-libs(+)]
33 + x11-libs/libxkbcommon[static-libs(+)]
34 >=x11-libs/pixman-0.28.0[static-libs(+)]
35 accessibility? (
36 app-accessibility/brltty[api]
37 @@ -107,7 +109,11 @@ SOFTMMU_TOOLS_DEPEND="
38 vte? ( x11-libs/vte:2.91 )
39 )
40 )
41 - infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] )
42 + infiniband? (
43 + sys-fabric/libibumad:=[static-libs(+)]
44 + sys-fabric/libibverbs:=[static-libs(+)]
45 + sys-fabric/librdmacm:=[static-libs(+)]
46 + )
47 iscsi? ( net-libs/libiscsi )
48 jpeg? ( virtual/jpeg:0=[static-libs(+)] )
49 lzo? ( dev-libs/lzo:2[static-libs(+)] )
50 @@ -139,7 +145,7 @@ SOFTMMU_TOOLS_DEPEND="
51 )
52 seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
53 smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
54 - snappy? ( app-arch/snappy )
55 + snappy? ( app-arch/snappy:= )
56 spice? (
57 >=app-emulation/spice-protocol-0.12.3
58 >=app-emulation/spice-0.12.0[static-libs(+)]
59 @@ -472,6 +478,12 @@ qemu_src_configure() {
60 $(conf_notuser xfs xfsctl)
61 )
62
63 + if [[ ${buildtype} == "user" ]] ; then
64 + conf_opts+=( --disable-libxml2 )
65 + else
66 + conf_opts+=( --enable-libxml2 )
67 + fi
68 +
69 if [[ ! ${buildtype} == "user" ]] ; then
70 # audio options
71 local audio_opts="oss"