commit: b1af8db2b307691d0f5f7b617d73bef5fe1f5b80 Author: Michal Privoznik <michal.privoznik <AT> gmail <DOT> com> AuthorDate: Fri Aug 23 21:45:04 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Aug 25 18:58:26 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1af8db2
app-emulation/libvirt: Depend on sys-libs/libnbd too In its upstream commit of v9.8.0-rc1~27 [1] libvirt introduced an optional dependency on libnbd. Reflect this in corresponding ebuilds. Now, pre-10.0.0 ebuilds do not have nbd USE flag. Thus, it needs to be introduced to record the dependency properly. NB, initially, the configure option was named 'libnbd' and only after v9.9.0-rc1~108 [2] it was changed to 'nbdkit'. Hence the discrepancy in libvirt-9.8.0-r3 and libvirt-9.9.0-r3 ebuilds. 1: https://gitlab.com/libvirt/libvirt/-/commit/40935b395c91a95a71cd66b9e2872346ac3a2145 2: https://gitlab.com/libvirt/libvirt/-/commit/7cbd8c42305735375b60abf8abc47838a7a050d4 Closes: https://bugs.gentoo.org/938346 Signed-off-by: Michal Privoznik <michal.privoznik <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/38274 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{libvirt-10.0.0-r3.ebuild => libvirt-10.0.0-r4.ebuild} | 5 ++++- .../{libvirt-10.1.0-r2.ebuild => libvirt-10.1.0-r3.ebuild} | 5 ++++- .../{libvirt-10.2.0-r1.ebuild => libvirt-10.2.0-r2.ebuild} | 5 ++++- .../{libvirt-10.3.0-r2.ebuild => libvirt-10.3.0-r3.ebuild} | 5 ++++- .../libvirt/{libvirt-10.5.0.ebuild => libvirt-10.5.0-r1.ebuild} | 5 ++++- .../libvirt/{libvirt-9.8.0-r3.ebuild => libvirt-9.8.0-r4.ebuild} | 9 +++++++-- .../libvirt/{libvirt-9.9.0-r3.ebuild => libvirt-9.9.0-r4.ebuild} | 9 +++++++-- app-emulation/libvirt/libvirt-9999.ebuild | 5 ++++- 8 files changed, 38 insertions(+), 10 deletions(-) diff --git a/app-emulation/libvirt/libvirt-10.0.0-r3.ebuild b/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild similarity index 99% rename from app-emulation/libvirt/libvirt-10.0.0-r3.ebuild rename to app-emulation/libvirt/libvirt-10.0.0-r4.ebuild index e1f5b32c94f2..69cebb86b3af 100644 --- a/app-emulation/libvirt/libvirt-10.0.0-r3.ebuild +++ b/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild @@ -90,7 +90,10 @@ RDEPEND=" libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) - nbd? ( sys-block/nbdkit ) + nbd? ( + sys-block/nbdkit + sys-libs/libnbd + ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 diff --git a/app-emulation/libvirt/libvirt-10.1.0-r2.ebuild b/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild similarity index 99% rename from app-emulation/libvirt/libvirt-10.1.0-r2.ebuild rename to app-emulation/libvirt/libvirt-10.1.0-r3.ebuild index 4b7123665d73..79ac27610a78 100644 --- a/app-emulation/libvirt/libvirt-10.1.0-r2.ebuild +++ b/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild @@ -90,7 +90,10 @@ RDEPEND=" libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) - nbd? ( sys-block/nbdkit ) + nbd? ( + sys-block/nbdkit + sys-libs/libnbd + ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 diff --git a/app-emulation/libvirt/libvirt-10.2.0-r1.ebuild b/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild similarity index 99% rename from app-emulation/libvirt/libvirt-10.2.0-r1.ebuild rename to app-emulation/libvirt/libvirt-10.2.0-r2.ebuild index f888ab84e3c8..a3d8c0af30fc 100644 --- a/app-emulation/libvirt/libvirt-10.2.0-r1.ebuild +++ b/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild @@ -90,7 +90,10 @@ RDEPEND=" libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) - nbd? ( sys-block/nbdkit ) + nbd? ( + sys-block/nbdkit + sys-libs/libnbd + ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 diff --git a/app-emulation/libvirt/libvirt-10.3.0-r2.ebuild b/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild similarity index 99% rename from app-emulation/libvirt/libvirt-10.3.0-r2.ebuild rename to app-emulation/libvirt/libvirt-10.3.0-r3.ebuild index 1bdfb61feab9..f0f0337d8804 100644 --- a/app-emulation/libvirt/libvirt-10.3.0-r2.ebuild +++ b/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild @@ -90,7 +90,10 @@ RDEPEND=" libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) - nbd? ( sys-block/nbdkit ) + nbd? ( + sys-block/nbdkit + sys-libs/libnbd + ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 diff --git a/app-emulation/libvirt/libvirt-10.5.0.ebuild b/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild similarity index 99% rename from app-emulation/libvirt/libvirt-10.5.0.ebuild rename to app-emulation/libvirt/libvirt-10.5.0-r1.ebuild index 6c1f35a42d3e..315ce62b97a9 100644 --- a/app-emulation/libvirt/libvirt-10.5.0.ebuild +++ b/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild @@ -90,7 +90,10 @@ RDEPEND=" libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) - nbd? ( sys-block/nbdkit ) + nbd? ( + sys-block/nbdkit + sys-libs/libnbd + ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 diff --git a/app-emulation/libvirt/libvirt-9.8.0-r3.ebuild b/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild similarity index 97% rename from app-emulation/libvirt/libvirt-9.8.0-r3.ebuild rename to app-emulation/libvirt/libvirt-9.8.0-r4.ebuild index 2da56ec3143d..62d04583be8e 100644 --- a/app-emulation/libvirt/libvirt-9.8.0-r3.ebuild +++ b/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild @@ -30,8 +30,8 @@ LICENSE="LGPL-2.1" SLOT="0/${PV}" IUSE=" apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs - iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz - parted pcap policykit +qemu rbd sasl selinux test +udev + iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa + openvz parted pcap policykit +qemu rbd sasl selinux test +udev virtualbox +virt-network wireshark-plugins xen zfs " RESTRICT="!test? ( test )" @@ -91,6 +91,10 @@ RDEPEND=" libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) + nbd? ( + sys-block/nbdkit + sys-libs/libnbd + ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 @@ -274,6 +278,7 @@ src_configure() { $(meson_feature lvm storage_lvm) $(meson_feature lvm storage_mpath) $(meson_feature lxc driver_lxc) + $(meson_feature nbd libnbd) $(meson_feature nls) $(meson_feature numa numactl) $(meson_feature numa numad) diff --git a/app-emulation/libvirt/libvirt-9.9.0-r3.ebuild b/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild similarity index 97% rename from app-emulation/libvirt/libvirt-9.9.0-r3.ebuild rename to app-emulation/libvirt/libvirt-9.9.0-r4.ebuild index 18388bf95abe..9ccc939d1bfc 100644 --- a/app-emulation/libvirt/libvirt-9.9.0-r3.ebuild +++ b/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild @@ -30,8 +30,8 @@ LICENSE="LGPL-2.1" SLOT="0/${PV}" IUSE=" apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs - iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz - parted pcap policykit +qemu rbd sasl selinux test +udev virtiofsd + iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nbd nfs nls numa + openvz parted pcap policykit +qemu rbd sasl selinux test +udev virtiofsd virtualbox +virt-network wireshark-plugins xen zfs " RESTRICT="!test? ( test )" @@ -91,6 +91,10 @@ RDEPEND=" libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) + nbd? ( + sys-block/nbdkit + sys-libs/libnbd + ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 @@ -275,6 +279,7 @@ src_configure() { $(meson_feature lvm storage_lvm) $(meson_feature lvm storage_mpath) $(meson_feature lxc driver_lxc) + $(meson_feature nbd nbdkit) $(meson_feature nls) $(meson_feature numa numactl) $(meson_feature numa numad) diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 6c1f35a42d3e..315ce62b97a9 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -90,7 +90,10 @@ RDEPEND=" libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) - nbd? ( sys-block/nbdkit ) + nbd? ( + sys-block/nbdkit + sys-libs/libnbd + ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2
