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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 30177158087 for ; Sat, 15 Jan 2022 02:10:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65F45E07C5; Sat, 15 Jan 2022 02:10:55 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B6A76E07C5 for ; Sat, 15 Jan 2022 02:10:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 77E71342D7B for ; Sat, 15 Jan 2022 02:10:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0FFE3A5 for ; Sat, 15 Jan 2022 02:10:52 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1642212623.788e72c08666ef319f9bb7615037e7e66db60b8c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/libvirt-7.10.0-r2.ebuild app-emulation/libvirt/libvirt-7.10.0-r3.ebuild app-emulation/libvirt/libvirt-9999.ebuild X-VCS-Directories: app-emulation/libvirt/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 788e72c08666ef319f9bb7615037e7e66db60b8c X-VCS-Branch: master Date: Sat, 15 Jan 2022 02:10:52 +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: dd350f27-e457-496a-8887-dd775caeb0e9 X-Archives-Hash: 88f3bf587dfdd99dc18922bf3411f604 commit: 788e72c08666ef319f9bb7615037e7e66db60b8c Author: Sam James gentoo org> AuthorDate: Sat Jan 15 02:10:23 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jan 15 02:10:23 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=788e72c0 Revert "app-emulation/libvirt: [QA] unconditionally install bash-completion files" I'd missed that the Meson check is actually a bit convoluted here -- it needs adapting to always take the bashcompletiondir parameter. This reverts commit 1c4e48ea59c8e7783f02af81ee28c31ecbb628ab. Signed-off-by: Sam James gentoo.org> .../{libvirt-7.10.0-r3.ebuild => libvirt-7.10.0-r2.ebuild} | 6 ++---- app-emulation/libvirt/libvirt-9999.ebuild | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app-emulation/libvirt/libvirt-7.10.0-r3.ebuild b/app-emulation/libvirt/libvirt-7.10.0-r2.ebuild similarity index 98% rename from app-emulation/libvirt/libvirt-7.10.0-r3.ebuild rename to app-emulation/libvirt/libvirt-7.10.0-r2.ebuild index 70c8985899f1..14c31d413e2c 100644 --- a/app-emulation/libvirt/libvirt-7.10.0-r3.ebuild +++ b/app-emulation/libvirt/libvirt-7.10.0-r2.ebuild @@ -25,7 +25,7 @@ HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" LICENSE="LGPL-2.1" VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc IUSE=" - apparmor audit +caps dtrace firewalld fuse glusterfs + apparmor audit bash-completion +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 @@ -48,6 +48,7 @@ BDEPEND=" dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig + bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt )" # gettext.sh command is used by the libvirt command wrappers, and it's @@ -280,9 +281,6 @@ src_configure() { --localstatedir="${EPREFIX}/var" -Drunstatedir="${EPREFIX}/run" -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - - -Dbash_completion=enabled - -Dbash_completion_dir="$(get_bashcompdir)" ) meson_src_configure diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 0129df7341ea..fa0d16f6ac3b 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-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -25,7 +25,7 @@ HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" LICENSE="LGPL-2.1" VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc IUSE=" - apparmor audit +caps dtrace firewalld fuse glusterfs + apparmor audit bash-completion +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 @@ -48,6 +48,7 @@ BDEPEND=" dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig + bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt )" # gettext.sh command is used by the libvirt command wrappers, and it's @@ -278,9 +279,6 @@ src_configure() { --localstatedir="${EPREFIX}/var" -Drunstatedir="${EPREFIX}/run" -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - - -Dbash_completion=enabled - -Dbash_completion_dir="$(get_bashcompdir)" ) meson_src_configure