commit: 65296998c4e7147814af2210cee47d5c42a479c3 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Sat Dec 5 17:21:05 2020 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Sat Dec 5 17:21:35 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65296998
app-emulation/libvirt: ebuild maintenance - remove unsupported meson configure options - remove obsolete sed Closes: https://bugs.gentoo.org/758650 Closes: https://bugs.gentoo.org/758653 Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> app-emulation/libvirt/Manifest | 2 +- ...virt-6.10.0.ebuild => libvirt-6.10.0-r1.ebuild} | 24 ++++------------------ 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index 2dd70837fb0..f08670f2237 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -1,4 +1,4 @@ +DIST libvirt-6.10.0.tar.xz 8462796 BLAKE2B f1188cc869768682bdcb7ab763465705413ebc4fe418e37d4f5ef6a861507c4104a1844cd533fce905e24847918eba6e4e4f054f66b112e9fb54ee19a3653dfc SHA512 42e77a3542e9f15c3aeaab1639a80ee6539cb0f09a1e8324aa0059a8f6041acf20263a9556ac65c9a7a14693b0756020231085e4556ff54cf8329110018a2485 DIST libvirt-6.7.0.tar.xz 8362140 BLAKE2B d0afe33fcdaab3cc0f2ea8c552e7550bcece018b049a3b58e5c05ee85b39e2b3ebf42fa1b70ddb1d2a541d1114b6b49734f23a889b3589397a30a672f27a3a56 SHA512 cabfb6aa65a3a1412b0111654ad3a7d0a6dfc63399a892c540ca39ab4e56f87626a067037e4480bb55418a371d2b5e9ac74862c92a3cdea69822ec3d158d769f DIST libvirt-6.8.0.tar.xz 8412092 BLAKE2B c118ca6b263054bb6941c62f3d1415f7ed1a3f29a35294272d04bc726643247ee5691e0310a1bf013faeba856d7aadd00a90fe8dbdca6ff4c7eb480e94d92fa2 SHA512 9b69f3dcceb5e40470a78908654faf51b643f6793e556f3115daa4bfe08743af290882dd51f15eb27c38d589eb210d495de7c44a40b363420ab4f4d3a6393cc9 DIST libvirt-6.9.0.tar.xz 8432360 BLAKE2B 5cf577017158bab3ec5ad55e8e5944f4efd88cb3eb5460355ad0bfc1a30dba5c607b5b3523b8f9095552c494129ccb19bb89a6a0791469d5d47052c2375fa940 SHA512 ca9aed93589e91d383f9a5bddf5ba9fa20b849ba3b302017d625ba4910a0f942d1531006ddeaaa2622d121808105dec6e9bcb0c867f62e2fc546ce043675e175 -DIST libvirt-6.10.0.tar.xz 8462796 BLAKE2B f1188cc869768682bdcb7ab763465705413ebc4fe418e37d4f5ef6a861507c4104a1844cd533fce905e24847918eba6e4e4f054f66b112e9fb54ee19a3653dfc SHA512 42e77a3542e9f15c3aeaab1639a80ee6539cb0f09a1e8324aa0059a8f6041acf20263a9556ac65c9a7a14693b0756020231085e4556ff54cf8329110018a2485 diff --git a/app-emulation/libvirt/libvirt-6.10.0.ebuild b/app-emulation/libvirt/libvirt-6.10.0-r1.ebuild similarity index 92% rename from app-emulation/libvirt/libvirt-6.10.0.ebuild rename to app-emulation/libvirt/libvirt-6.10.0-r1.ebuild index 96ccd9a1949..2e38192ba18 100644 --- a/app-emulation/libvirt/libvirt-6.10.0.ebuild +++ b/app-emulation/libvirt/libvirt-6.10.0-r1.ebuild @@ -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,9 +33,7 @@ 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 )" @@ -67,6 +65,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 +73,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= ) @@ -171,9 +169,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 @@ -230,7 +225,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) @@ -243,7 +237,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) @@ -257,14 +250,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 @@ -284,13 +275,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 }
