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
