diff options
Diffstat (limited to 'app-emulation/libvirt/libvirt-9999.ebuild')
| -rw-r--r-- | app-emulation/libvirt/libvirt-9999.ebuild | 67 |
1 files changed, 46 insertions, 21 deletions
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 6128a61b974d..f1c08714d713 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,9 +10,9 @@ EAPI=8 # app-emulation/libvirt # Please bump them together! -PYTHON_COMPAT=( python3_{8..11} ) -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc -inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig +PYTHON_COMPAT=( python3_{10..12} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc +inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig if [[ ${PV} = *9999* ]]; then inherit git-r3 @@ -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" @@ -30,10 +30,11 @@ 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 +udev - virtualbox +virt-network wireshark-plugins xen zfs + 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 )" REQUIRED_USE=" firewalld? ( virt-network ) @@ -52,7 +53,6 @@ BDEPEND=" dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig - net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt )" @@ -60,7 +60,7 @@ BDEPEND=" # non-optional, so put it into RDEPEND. # 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 +# we must go with the most recent. RDEPEND=" acct-user/qemu app-misc/scrub @@ -80,16 +80,17 @@ RDEPEND=" apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) - dtrace? ( dev-util/systemtap ) + dtrace? ( dev-debug/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) - libssh? ( >=net-libs/libssh-0.7:= ) + libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) + nbd? ( sys-block/nbdkit ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 @@ -97,7 +98,7 @@ RDEPEND=" ) parted? ( >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2[-device-mapper-only(-)] + sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( @@ -105,7 +106,8 @@ RDEPEND=" >=sys-auth/polkit-0.9 ) qemu? ( - >=app-emulation/qemu-2.11 + >=app-emulation/qemu-4.2 + app-crypt/swtpm >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) @@ -118,6 +120,7 @@ RDEPEND=" net-misc/radvd sys-apps/iproute2[-minimal] ) + virtiofsd? ( app-emulation/virtiofsd ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 @@ -129,14 +132,21 @@ 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 - "${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch - "${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch + "${FILESDIR}"/${PN}-9.4.0-fix_paths_in_libvirt-guests_sh.patch + "${FILESDIR}"/${PN}-9.9.0-do-not-use-sysconfig.patch + "${FILESDIR}"/${PN}-9.6.0-fix-paths-for-apparmor.patch ) pkg_setup() { @@ -190,10 +200,21 @@ pkg_setup() { ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_NAT - ~IP_NF_TARGET_MASQUERADE ~IP6_NF_FILTER ~IP6_NF_MANGLE ~IP6_NF_NAT" + + # This was renamed in kernel commit v5.2-rc1~133^2~174^2~6 + if use virt-network ; then + if kernel_is -lt 5 2 ; then + CONFIG_CHECK+=" + ~IP_NF_TARGET_MASQUERADE" + else + CONFIG_CHECK+=" + ~NETFILTER_XT_TARGET_MASQUERADE" + fi + fi + # Bandwidth Limiting Support use virt-network && CONFIG_CHECK+=" ~BRIDGE_EBT_T_NAT @@ -250,6 +271,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) @@ -262,6 +284,7 @@ src_configure() { $(meson_feature rbd storage_rbd) $(meson_feature sasl) $(meson_feature selinux) + $(meson_feature test tests) $(meson_feature udev) $(meson_feature virt-network driver_network) $(meson_feature virtualbox driver_vbox) @@ -271,6 +294,7 @@ src_configure() { -Dnetcf=disabled -Dsanlock=disabled + -Dopenwsman=disabled -Ddriver_esx=enabled -Dinit_script=systemd @@ -281,6 +305,7 @@ src_configure() { -Ddriver_vmware=enabled --localstatedir="${EPREFIX}/var" + -Dinitconfdir="${EPREFIX}/etc/systemd" -Drunstatedir="${EPREFIX}/run" -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" ) |