commit:     c0dd4325af825d4b9120bb663f3c5b568c275ca4
Author:     Jonathan Davies <jpds <AT> protonmail <DOT> com>
AuthorDate: Wed Nov  4 17:45:23 2020 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Nov  6 01:17:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0dd4325

app-emulation/libvirt: Version updated to 6.9.0.

Signed-off-by: Jonathan Davies <jpds <AT> protonmail.com>
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 app-emulation/libvirt/Manifest             |   1 +
 app-emulation/libvirt/libvirt-6.9.0.ebuild | 344 +++++++++++++++++++++++++++++
 2 files changed, 345 insertions(+)

diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index d865d595076..16acbdd493a 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/app-emulation/libvirt/libvirt-6.9.0.ebuild 
b/app-emulation/libvirt/libvirt-6.9.0.ebuild
new file mode 100644
index 00000000000..96ccd9a1949
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-6.9.0.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson bash-completion-r1 eutils linux-info python-any-r1 
readme.gentoo-r1 systemd
+
+if [[ ${PV} = *9999* ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git";
+       SRC_URI=""
+       SLOT="0"
+else
+       SRC_URI="https://libvirt.org/sources/${P}.tar.xz";
+       KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+       SLOT="0/${PV}"
+fi
+
+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
+       virtualbox +virt-network wireshark-plugins xen zfs
+"
+
+REQUIRED_USE="
+       firewalld? ( virt-network )
+       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
+       dev-perl/XML-XPath
+       dev-python/docutils
+       virtual/pkgconfig"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# 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
+RDEPEND="
+       app-misc/scrub
+       >=dev-libs/glib-2.48.0
+       dev-libs/libgcrypt:0
+       dev-libs/libnl:3
+       >=dev-libs/libxml2-2.7.6
+       >=net-analyzer/openbsd-netcat-1.105-r1
+       >=net-libs/gnutls-1.0.25:0=
+       net-libs/libssh2
+       net-libs/libtirpc
+       net-libs/rpcsvc-proto
+       >=net-misc/curl-7.18.0
+       sys-apps/dmidecode
+       sys-devel/gettext
+       sys-libs/ncurses:0=
+       sys-libs/readline:=
+       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= )
+       glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+       iscsi? ( sys-block/open-iscsi )
+       iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+       libssh? ( net-libs/libssh )
+       lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+       nfs? ( net-fs/nfs-utils )
+       numa? (
+               >sys-process/numactl-2.0.2
+               sys-process/numad
+       )
+       parted? (
+               >=sys-block/parted-1.8[device-mapper]
+               sys-fs/lvm2[-device-mapper-only(-)]
+       )
+       pcap? ( >=net-libs/libpcap-1.0.0 )
+       policykit? ( >=sys-auth/polkit-0.9 )
+       qemu? (
+               >=app-emulation/qemu-1.5.0
+               dev-libs/yajl
+       )
+       rbd? ( sys-cluster/ceph )
+       sasl? ( dev-libs/cyrus-sasl )
+       selinux? ( >=sys-libs/libselinux-2.0.85 )
+       virt-network? (
+               net-dns/dnsmasq[script]
+               net-firewall/ebtables
+               >=net-firewall/iptables-1.4.10[ipv6]
+               net-misc/radvd
+               sys-apps/iproute2[-minimal]
+       )
+       wireshark-plugins? ( net-analyzer/wireshark:= )
+       xen? (
+               >=app-emulation/xen-4.6.0
+               app-emulation/xen-tools:=
+       )
+       udev? (
+               virtual/libudev
+               >=x11-libs/libpciaccess-0.10.9
+       )
+       zfs? ( sys-fs/zfs )"
+
+DEPEND="${BDEPEND}
+       ${RDEPEND}
+       ${PYTHON_DEPS}"
+
+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() {
+       # Check kernel configuration:
+       CONFIG_CHECK=""
+       use fuse && CONFIG_CHECK+="
+               ~FUSE_FS"
+
+       use lvm && CONFIG_CHECK+="
+               ~BLK_DEV_DM
+               ~DM_MULTIPATH
+               ~DM_SNAPSHOT"
+
+       use lxc && CONFIG_CHECK+="
+               ~BLK_CGROUP
+               ~CGROUP_CPUACCT
+               ~CGROUP_DEVICE
+               ~CGROUP_FREEZER
+               ~CGROUP_NET_PRIO
+               ~CGROUP_PERF
+               ~CGROUPS
+               ~CGROUP_SCHED
+               ~CPUSETS
+               ~IPC_NS
+               ~MACVLAN
+               ~NAMESPACES
+               ~NET_CLS_CGROUP
+               ~NET_NS
+               ~PID_NS
+               ~POSIX_MQUEUE
+               ~SECURITYFS
+               ~USER_NS
+               ~UTS_NS
+               ~VETH
+               ~!GRKERNSEC_CHROOT_MOUNT
+               ~!GRKERNSEC_CHROOT_DOUBLE
+               ~!GRKERNSEC_CHROOT_PIVOT
+               ~!GRKERNSEC_CHROOT_CHMOD
+               ~!GRKERNSEC_CHROOT_CAPS"
+
+       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
+               ~NETFILTER_ADVANCED
+               ~NETFILTER_XT_CONNMARK
+               ~NETFILTER_XT_MARK
+               ~NETFILTER_XT_TARGET_CHECKSUM
+               ~IP_NF_FILTER
+               ~IP_NF_MANGLE
+               ~IP_NF_NAT
+               ~IP_NF_TARGET_MASQUERADE
+               ~IP6_NF_FILTER
+               ~IP6_NF_MANGLE
+               ~IP6_NF_NAT"
+       # Bandwidth Limiting Support
+       use virt-network && CONFIG_CHECK+="
+               ~BRIDGE_EBT_T_NAT
+               ~IP_NF_TARGET_REJECT
+               ~NET_ACT_POLICE
+               ~NET_CLS_FW
+               ~NET_CLS_U32
+               ~NET_SCH_HTB
+               ~NET_SCH_INGRESS
+               ~NET_SCH_SFQ"
+
+       # Handle specific kernel versions for different features
+       kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+       if kernel_is ge 3 6; then
+               CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+               kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
+       fi
+
+       ERROR_USER_NS="Optional depending on LXC configuration."
+
+       if [[ -n ${CONFIG_CHECK} ]]; then
+               linux-info_pkg_setup
+       fi
+}
+
+src_prepare() {
+       touch "${S}/.mailmap" || die
+
+       default
+
+       # Tweak the init script:
+       cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+       sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+               -i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+       local emesonargs=(
+               $(meson_feature apparmor)
+               $(meson_use apparmor apparmor_profiles)
+               $(meson_feature audit)
+               $(meson_feature caps capng)
+               $(meson_feature dbus)
+               $(meson_feature dtrace)
+               $(meson_feature firewalld)
+               $(meson_feature fuse)
+               $(meson_feature glusterfs)
+               $(meson_feature glusterfs storage_gluster)
+               $(meson_feature iscsi storage_iscsi)
+               $(meson_feature iscsi-direct storage_iscsi_direct)
+               $(meson_feature libvirtd driver_libvirtd)
+               $(meson_feature libssh)
+               $(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)
+               $(meson_feature openvz driver_openvz)
+               $(meson_feature parted storage_disk)
+               $(meson_feature pcap libpcap)
+               $(meson_feature policykit polkit)
+               $(meson_feature qemu driver_qemu)
+               $(meson_feature qemu yajl)
+               $(meson_feature rbd storage_rbd)
+               $(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
+
+               -Ddriver_esx=enabled
+               -Dinit_script=systemd
+               -Dqemu_user=$(usex caps qemu root)
+               -Dqemu_group=$(usex caps qemu root)
+               -Ddriver_remote=enabled
+               -Dstorage_fs=enabled
+               -Ddriver_vmware=enabled
+
+               --localstatedir="${EPREFIX}/var"
+               -Drunstatedir="${EPREFIX}/run"
+       )
+
+       meson_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
+}
+
+src_install() {
+       meson_src_install
+
+       # Remove bogus, empty directories. They are either not used, or
+       # libvirtd is able to create them on demand
+       rm -rf "${D}"/etc/sysconfig || die
+       rm -rf "${D}"/var || die
+       rm -rf "${D}"/run || die
+
+       newbashcomp "${S}/tools/bash-completion/vsh" virsh
+       bashcomp_alias virsh virt-admin
+
+       use libvirtd || return 0
+       # From here, only libvirtd-related instructions, be warned!
+
+       systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+       newinitd "${S}/libvirtd.init" libvirtd
+       newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+       newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+       newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+       newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+       newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+       DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+       DISABLE_AUTOFORMATTING=true
+       readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+       # we only ever want to generate this once
+       if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+               rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml || die
+       fi
+}
+
+pkg_postinst() {
+       if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+               touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+       fi
+
+       use libvirtd || return 0
+       # From here, only libvirtd-related instructions, be warned!
+
+       readme.gentoo_print_elog
+}

Reply via email to