From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1480953-garchives=archives.gentoo.org@lists.gentoo.org>
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 9E14615800F
for <garchives@archives.gentoo.org>; Fri, 27 Jan 2023 00:17:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A1CEDE07F9;
Fri, 27 Jan 2023 00:17:30 +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 41DDBE07F9
for <gentoo-commits@lists.gentoo.org>; Fri, 27 Jan 2023 00:17:30 +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 31E49340E39
for <gentoo-commits@lists.gentoo.org>; Fri, 27 Jan 2023 00:17:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A77C4858
for <gentoo-commits@lists.gentoo.org>; Fri, 27 Jan 2023 00:17:26 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1674778610.24091f5aa7ebb2330fe6ed2b1d1fae6f3e3d11f9.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/libvirt/libvirt-9999.ebuild
X-VCS-Directories: app-emulation/libvirt/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 24091f5aa7ebb2330fe6ed2b1d1fae6f3e3d11f9
X-VCS-Branch: master
Date: Fri, 27 Jan 2023 00:17:26 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 3f90f4b7-2df7-4885-98fb-84ba0be95a22
X-Archives-Hash: b27fb772cbc60abddeaaa19a0c1ab657
commit: 24091f5aa7ebb2330fe6ed2b1d1fae6f3e3d11f9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 00:15:18 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 00:16:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24091f5a
app-emulation/libvirt: PDEPEND on libvirt-python
With libvirt[qemu], we get:
```
(dev-python/libvirt-python-8.9.0:0/0::gentoo, ebuild scheduled for merge) depends on
(app-emulation/libvirt-8.9.0:0/8.9.0::gentoo, ebuild scheduled for merge) (runtime)
(dev-python/libvirt-python-8.9.0:0/0::gentoo, ebuild scheduled for merge) (buildtime)
```
libvirt-python definitely needs libvirt to be importable, hence RDEPEND is needed,
but for libvirt[qemu], it only needs libvirt-python for virt-qemu-qmp-proxy which
we can conceivably live with being temporarily broken before libvirt-python is installed.
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-emulation/libvirt/libvirt-9999.ebuild | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 7f37dd30cfee..647a33c33de3 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} = *9999* ]]; then
else
SRC_URI="https://libvirt.org/sources/${P}.tar.xz
verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
DESCRIPTION="C toolkit to manipulate virtual machines"
@@ -61,8 +61,6 @@ BDEPEND="
# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
# package will use 3 by default. Since we don't have slot pinning in an API,
# we must go with the most recent.
-# The 'circular' dependency on dev-python/libvirt-python is because of
-# virt-qemu-qmp-proxy.
RDEPEND="
acct-user/qemu
app-misc/scrub
@@ -109,7 +107,6 @@ RDEPEND="
qemu? (
>=app-emulation/qemu-4.2
>=dev-libs/yajl-2.0.3:=
- dev-python/libvirt-python
)
rbd? ( sys-cluster/ceph )
sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
@@ -132,9 +129,16 @@ RDEPEND="
)
zfs? ( sys-fs/zfs )
kernel_linux? ( sys-apps/util-linux )"
-DEPEND="${BDEPEND}
+DEPEND="
+ ${BDEPEND}
${RDEPEND}
- ${PYTHON_DEPS}"
+ ${PYTHON_DEPS}
+"
+# The 'circular' dependency on dev-python/libvirt-python is because of
+# virt-qemu-qmp-proxy.
+PDEPEND="
+ qemu? ( dev-python/libvirt-python )
+"
PATCHES=(
"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch