commit: a89dfdbade439652c4e7c3ad41a4955a5e971591
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 1 03:43:59 2022 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Fri Apr 1 03:46:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a89dfdba
app-emulation/qemu: drop libxml2 and xfs handling in live
Also update Git repository URL.
xfs dependency was dropped upstream in
a5730b8bd3675f484ed0eacea052452048eeb35d, and libxml in
9e8be4c546ce8469ca9702715bf8f198d604b685
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
app-emulation/qemu/qemu-9999.ebuild | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/app-emulation/qemu/qemu-9999.ebuild
b/app-emulation/qemu/qemu-9999.ebuild
index 555fae682186..13179f417b18 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
@@ -135,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]
@@ -205,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(+)] )
"
@@ -564,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=(
