Gentoo Archives: gentoo-commits

From: John Helmert III <ajak@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/
Date: Fri, 01 Apr 2022 03:46:34
Message-Id: 1648784770.a89dfdbade439652c4e7c3ad41a4955a5e971591.ajak@gentoo
1 commit: a89dfdbade439652c4e7c3ad41a4955a5e971591
2 Author: John Helmert III <ajak <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 1 03:43:59 2022 +0000
4 Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 1 03:46:10 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a89dfdba
7
8 app-emulation/qemu: drop libxml2 and xfs handling in live
9
10 Also update Git repository URL.
11
12 xfs dependency was dropped upstream in
13 a5730b8bd3675f484ed0eacea052452048eeb35d, and libxml in
14 9e8be4c546ce8469ca9702715bf8f198d604b685
15
16 Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
17
18 app-emulation/qemu/qemu-9999.ebuild | 13 ++-----------
19 1 file changed, 2 insertions(+), 11 deletions(-)
20
21 diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
22 index 555fae682186..13179f417b18 100644
23 --- a/app-emulation/qemu/qemu-9999.ebuild
24 +++ b/app-emulation/qemu/qemu-9999.ebuild
25 @@ -12,7 +12,7 @@ inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
26 pax-utils xdg-utils
27
28 if [[ ${PV} = *9999* ]]; then
29 - EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
30 + EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/"
31 EGIT_SUBMODULES=(
32 meson
33 tests/fp/berkeley-softfloat-3
34 @@ -41,7 +41,7 @@ IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc
35 +slirp
36 smartcard snappy spice ssh static static-user systemtap test udev usb
37 usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
38 - xfs zstd"
39 + zstd"
40
41 COMMON_TARGETS="
42 aarch64
43 @@ -135,7 +135,6 @@ ALL_DEPEND="
44 # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
45 # softmmu targets (qemu-system-*).
46 SOFTMMU_TOOLS_DEPEND="
47 - dev-libs/libxml2[static-libs(+)]
48 >=x11-libs/pixman-0.28.0[static-libs(+)]
49 accessibility? (
50 app-accessibility/brltty[api]
51 @@ -205,7 +204,6 @@ SOFTMMU_TOOLS_DEPEND="
52 virgl? ( media-libs/virglrenderer[static-libs(+)] )
53 virtfs? ( sys-libs/libcap )
54 xen? ( app-emulation/xen-tools:= )
55 - xfs? ( sys-fs/xfsprogs[static-libs(+)] )
56 zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
57 "
58
59 @@ -564,18 +562,11 @@ qemu_src_configure() {
60 $(conf_notuser vte)
61 $(conf_notuser xen)
62 $(conf_notuser xen xen-pci-passthrough)
63 - $(conf_notuser xfs xfsctl)
64 # use prebuilt keymaps, bug #759604
65 --disable-xkbcommon
66 $(conf_notuser zstd)
67 )
68
69 - if [[ ${buildtype} == "user" ]] ; then
70 - conf_opts+=( --disable-libxml2 )
71 - else
72 - conf_opts+=( --enable-libxml2 )
73 - fi
74 -
75 if [[ ! ${buildtype} == "user" ]] ; then
76 # audio options
77 local audio_opts=(