diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-04-06 22:33:41 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-04-06 22:33:41 +0100 |
| commit | e68d405c5d712af4387159df07e226217bdda049 (patch) | |
| tree | 009ab0f3d427f0813e62930d71802cb054c07e30 /app-emulation/qemu/qemu-9999.ebuild | |
| parent | 401101f9c8077911929d3f2b60a37098460a5d89 (diff) | |
gentoo resync : 06.04.2022
Diffstat (limited to 'app-emulation/qemu/qemu-9999.ebuild')
| -rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 6371ac61682b..a8468dde1909 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -12,7 +12,7 @@ inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \ pax-utils xdg-utils if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://git.qemu.org/git/qemu.git" + EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/" EGIT_SUBMODULES=( meson tests/fp/berkeley-softfloat-3 @@ -41,7 +41,7 @@ IUSE="accessibility +aio alsa bpf 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 zstd" + zstd" COMMON_TARGETS=" aarch64 @@ -85,7 +85,6 @@ IUSE_USER_TARGETS=" hexagon mipsn32 mipsn32el - ppc64abi32 ppc64le sparc32plus " @@ -136,7 +135,6 @@ ALL_DEPEND=" # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) # softmmu targets (qemu-system-*). SOFTMMU_TOOLS_DEPEND=" - dev-libs/libxml2[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] @@ -206,7 +204,6 @@ SOFTMMU_TOOLS_DEPEND=" virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) - xfs? ( sys-fs/xfsprogs[static-libs(+)] ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) " @@ -279,7 +276,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch "${FILESDIR}"/${PN}-6.0.0-make.patch "${FILESDIR}"/${PN}-6.1.0-strings.patch - "${FILESDIR}"/${PN}-6.2.0-also-build-virtfs-proxy-helper.patch + "${FILESDIR}"/${PN}-7.0.0-also-build-virtfs-proxy-helper.patch ) QA_PREBUILT=" @@ -308,7 +305,6 @@ QA_WX_LOAD="usr/bin/qemu-i386 usr/bin/qemu-or1k usr/bin/qemu-ppc usr/bin/qemu-ppc64 - usr/bin/qemu-ppc64abi32 usr/bin/qemu-sh4 usr/bin/qemu-sh4eb usr/bin/qemu-sparc @@ -566,18 +562,11 @@ qemu_src_configure() { $(conf_notuser vte) $(conf_notuser xen) $(conf_notuser xen xen-pci-passthrough) - $(conf_notuser xfs xfsctl) # use prebuilt keymaps, bug #759604 --disable-xkbcommon $(conf_notuser zstd) ) - if [[ ${buildtype} == "user" ]] ; then - conf_opts+=( --disable-libxml2 ) - else - conf_opts+=( --enable-libxml2 ) - fi - if [[ ! ${buildtype} == "user" ]] ; then # audio options local audio_opts=( |