commit: 7eb9cb4e4851417465a577cc8ef21935020e9e6c Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jan 17 02:56:56 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jan 17 04:34:30 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eb9cb4e
app-emulation/libvirt: sync live Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sam James <sam <AT> gentoo.org> app-emulation/libvirt/libvirt-9999.ebuild | 37 +++++++++++-------------------- 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 7cee3517f02..d943093b102 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,9 +22,9 @@ DESCRIPTION="C toolkit to manipulate virtual machines" HOMEPAGE="https://www.libvirt.org/"; LICENSE="LGPL-2.1" IUSE=" - apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi - iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz - parted pcap policykit +qemu rbd sasl selinux +udev +vepa + apparmor audit +caps dtrace firewalld fuse glusterfs iscsi + iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz + parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs " @@ -33,16 +33,12 @@ REQUIRED_USE=" libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) - policykit? ( dbus ) qemu? ( libvirtd ) - vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )" BDEPEND=" - acct-user/qemu - policykit? ( acct-group/libvirt ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt @@ -56,6 +52,7 @@ BDEPEND=" # package will use 3 by default. Since we don't have slot pinning in an API, # we must go with the most recent RDEPEND=" + acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 @@ -67,6 +64,7 @@ RDEPEND=" net-libs/libtirpc net-libs/rpcsvc-proto >=net-misc/curl-7.18.0 + sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/ncurses:0= @@ -74,7 +72,6 @@ RDEPEND=" apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) - dbus? ( sys-apps/dbus ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) @@ -94,7 +91,10 @@ RDEPEND=" sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) - policykit? ( >=sys-auth/polkit-0.9 ) + policykit? ( + acct-group/libvirt + >=sys-auth/polkit-0.9 + ) qemu? ( >=app-emulation/qemu-1.5.0 dev-libs/yajl @@ -126,6 +126,9 @@ DEPEND="${BDEPEND} PATCHES=( "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch + "${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch + "${FILESDIR}"/${PN}-6.7.0-doc-path.patch + "${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch ) pkg_setup() { @@ -169,9 +172,6 @@ pkg_setup() { kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES" - use macvtap && CONFIG_CHECK+=" - ~MACVTAP" - use virt-network && CONFIG_CHECK+=" ~BRIDGE_EBT_MARK_T ~BRIDGE_NF_EBTABLES @@ -228,7 +228,6 @@ src_configure() { $(meson_use apparmor apparmor_profiles) $(meson_feature audit) $(meson_feature caps capng) - $(meson_feature dbus) $(meson_feature dtrace) $(meson_feature firewalld) $(meson_feature fuse) @@ -241,7 +240,6 @@ src_configure() { $(meson_feature lvm storage_lvm) $(meson_feature lvm storage_mpath) $(meson_feature lxc driver_lxc) - $(meson_feature macvtap) $(meson_feature nls) $(meson_feature numa numactl) $(meson_feature numa numad) @@ -255,14 +253,12 @@ src_configure() { $(meson_feature sasl) $(meson_feature selinux) $(meson_feature udev) - $(meson_feature vepa virtualport) $(meson_feature virt-network driver_network) $(meson_feature virtualbox driver_vbox) $(meson_feature wireshark-plugins wireshark_dissector) $(meson_feature xen driver_libxl) $(meson_feature zfs storage_zfs) - -Dhal=disabled -Dnetcf=disabled -Dsanlock=disabled @@ -282,13 +278,6 @@ src_configure() { } src_test() { - # remove problematic tests, bug #591416, bug #591418 - sed -i -e 's#commandtest$(EXEEXT) # #' \ - -e 's#virfirewalltest$(EXEEXT) # #' \ - -e 's#nwfilterebiptablestest$(EXEEXT) # #' \ - -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \ - tests/Makefile - export VIR_TEST_DEBUG=1 meson_src_test }
