From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D80541382C5 for ; Thu, 22 Apr 2021 13:41:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2FC7EE0837; Thu, 22 Apr 2021 13:41:10 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 13FD0E0837 for ; Thu, 22 Apr 2021 13:41:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 91EDB341217 for ; Thu, 22 Apr 2021 13:41:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 959F3647 for ; Thu, 22 Apr 2021 13:41:06 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1619098755.d59fc9687651f5384667abe0e35b7e27a775e4dc.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/libvirt-9999.ebuild X-VCS-Directories: app-emulation/libvirt/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: d59fc9687651f5384667abe0e35b7e27a775e4dc X-VCS-Branch: master Date: Thu, 22 Apr 2021 13:41:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 14f2de9a-4e35-4f38-a6e4-4eba70606864 X-Archives-Hash: 22652ba8a8b881f635bfdf2b8f7fee30 commit: d59fc9687651f5384667abe0e35b7e27a775e4dc Author: Matthias Maier gentoo org> AuthorDate: Thu Apr 22 13:34:19 2021 +0000 Commit: Matthias Maier gentoo org> CommitDate: Thu Apr 22 13:39:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d59fc968 app-emulation/libvirt: update live ebuild Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Matthias Maier gentoo.org> app-emulation/libvirt/libvirt-9999.ebuild | 35 ++++++++++++------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 767580ad5f7..586aec96cbd 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 tmpfiles +inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles if [[ ${PV} = *9999* ]]; then inherit git-r3 @@ -13,13 +13,14 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="" SLOT="0" else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz" + SRC_URI="https://libvirt.org/sources/${P}.tar.xz + verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" SLOT="0/${PV}" fi DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="https://www.libvirt.org/" +HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" LICENSE="LGPL-2.1" IUSE=" apparmor audit +caps dtrace firewalld fuse glusterfs iscsi @@ -197,13 +198,6 @@ pkg_setup() { ~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 @@ -289,11 +283,15 @@ 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 + # Depending on configuration option, libvirt will create some bogus + # directoreis. They are either not used, or libvirtd is able to create + # them on demand, so let's remove them. + # + # Note, we are using -f here so that rm does not fail or warn if the + # directory is nonexistent. + rm -rf "${D}"/etc/sysconfig + rm -rf "${D}"/var + rm -rf "${D}"/run newbashcomp "${S}/tools/bash-completion/vsh" virsh bashcomp_alias virsh virt-admin @@ -316,13 +314,6 @@ src_install() { 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