From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 94B0915808B for ; Fri, 1 Apr 2022 03:46:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D940DE0864; Fri, 1 Apr 2022 03:46:31 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DC434E0864 for ; Fri, 1 Apr 2022 03:46:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E26F1341033 for ; Fri, 1 Apr 2022 03:46:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F428AF for ; Fri, 1 Apr 2022 03:46:20 +0000 (UTC) From: "John Helmert III" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "John Helmert III" Message-ID: <1648784770.a89dfdbade439652c4e7c3ad41a4955a5e971591.ajak@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/qemu-9999.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: ajak X-VCS-Committer-Name: John Helmert III X-VCS-Revision: a89dfdbade439652c4e7c3ad41a4955a5e971591 X-VCS-Branch: master Date: Fri, 1 Apr 2022 03:46:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9704e05f-295a-4178-835e-ca2a42bd5625 X-Archives-Hash: 1713f1cfb3a90c6dccaa665efe3aad10 commit: a89dfdbade439652c4e7c3ad41a4955a5e971591 Author: John Helmert III gentoo org> AuthorDate: Fri Apr 1 03:43:59 2022 +0000 Commit: John Helmert III gentoo 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 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=(