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 1E293138334 for ; Mon, 2 Dec 2019 14:42:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44B0CE0871; Mon, 2 Dec 2019 14:42:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 203DFE0871 for ; Mon, 2 Dec 2019 14:42:24 +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 6DE0334D6AA for ; Mon, 2 Dec 2019 14:42:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE758744 for ; Mon, 2 Dec 2019 14:42:17 +0000 (UTC) From: "Doug Goldstein" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Doug Goldstein" Message-ID: <1575297669.9e8a88357932cb3a0c8754385cfc2e69ec6dc74e.cardoe@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/libvirt-5.2.0-r2.ebuild app-emulation/libvirt/libvirt-5.5.0-r1.ebuild app-emulation/libvirt/libvirt-5.6.0.ebuild app-emulation/libvirt/libvirt-5.8.0.ebuild app-emulation/libvirt/libvirt-9999.ebuild X-VCS-Directories: app-emulation/libvirt/ X-VCS-Committer: cardoe X-VCS-Committer-Name: Doug Goldstein X-VCS-Revision: 9e8a88357932cb3a0c8754385cfc2e69ec6dc74e X-VCS-Branch: master Date: Mon, 2 Dec 2019 14:42:17 +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: c4b8beed-99dc-4448-8fd9-be5fe059f8bf X-Archives-Hash: b018bcfafa73e3791e1742a9fecbfc47 commit: 9e8a88357932cb3a0c8754385cfc2e69ec6dc74e Author: Michal Privoznik redhat com> AuthorDate: Thu Oct 31 13:47:35 2019 +0000 Commit: Doug Goldstein gentoo org> CommitDate: Mon Dec 2 14:41:09 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e8a8835 app-emulation/libvirt: Install bash completion even if USE="-libvirtd" The bash completion scripts help client utilities like virsh or virt-admin and are independent of daemon, i.e. of libvirtd use flag. However, due to the placement of 'newbashcomp' and 'bashcomp_alias' calls in ebuilds, the scripts were not installed unless libvirtd use flag was enabled. Signed-off-by: Michal Privoznik redhat.com> Signed-off-by: Doug Goldstein gentoo.org> app-emulation/libvirt/libvirt-5.2.0-r2.ebuild | 6 +++--- app-emulation/libvirt/libvirt-5.5.0-r1.ebuild | 6 +++--- app-emulation/libvirt/libvirt-5.6.0.ebuild | 6 +++--- app-emulation/libvirt/libvirt-5.8.0.ebuild | 6 +++--- app-emulation/libvirt/libvirt-9999.ebuild | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild index 0d00aa14bca..d03db5f55c6 100644 --- a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild +++ b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild @@ -341,6 +341,9 @@ src_install() { rm -rf "${D}"/etc/sysconfig rm -rf "${D}"/var + newbashcomp "${S}/tools/bash-completion/vsh" virsh + bashcomp_alias virsh virt-admin + use libvirtd || return 0 # From here, only libvirtd-related instructions, be warned! @@ -357,9 +360,6 @@ src_install() { newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die - newbashcomp "${S}/tools/bash-completion/vsh" virsh - bashcomp_alias virsh virt-admin - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc diff --git a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild index db4043651cc..581677ab617 100644 --- a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild +++ b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild @@ -336,6 +336,9 @@ src_install() { rm -rf "${D}"/etc/sysconfig rm -rf "${D}"/var + newbashcomp "${S}/tools/bash-completion/vsh" virsh + bashcomp_alias virsh virt-admin + use libvirtd || return 0 # From here, only libvirtd-related instructions, be warned! @@ -352,9 +355,6 @@ src_install() { newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die - newbashcomp "${S}/tools/bash-completion/vsh" virsh - bashcomp_alias virsh virt-admin - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc diff --git a/app-emulation/libvirt/libvirt-5.6.0.ebuild b/app-emulation/libvirt/libvirt-5.6.0.ebuild index 11ae2447b09..07d39538452 100644 --- a/app-emulation/libvirt/libvirt-5.6.0.ebuild +++ b/app-emulation/libvirt/libvirt-5.6.0.ebuild @@ -336,6 +336,9 @@ src_install() { rm -rf "${D}"/etc/sysconfig rm -rf "${D}"/var + newbashcomp "${S}/tools/bash-completion/vsh" virsh + bashcomp_alias virsh virt-admin + use libvirtd || return 0 # From here, only libvirtd-related instructions, be warned! @@ -352,9 +355,6 @@ src_install() { newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die - newbashcomp "${S}/tools/bash-completion/vsh" virsh - bashcomp_alias virsh virt-admin - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc diff --git a/app-emulation/libvirt/libvirt-5.8.0.ebuild b/app-emulation/libvirt/libvirt-5.8.0.ebuild index 696f81fcdc7..17eb6ffb24a 100644 --- a/app-emulation/libvirt/libvirt-5.8.0.ebuild +++ b/app-emulation/libvirt/libvirt-5.8.0.ebuild @@ -340,6 +340,9 @@ src_install() { rm -rf "${D}"/var rm -rf "${D}"/run + newbashcomp "${S}/tools/bash-completion/vsh" virsh + bashcomp_alias virsh virt-admin + use libvirtd || return 0 # From here, only libvirtd-related instructions, be warned! @@ -356,9 +359,6 @@ src_install() { newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die - newbashcomp "${S}/tools/bash-completion/vsh" virsh - bashcomp_alias virsh virt-admin - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 63900def37d..1c39aa69ee2 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -337,6 +337,9 @@ src_install() { rm -rf "${D}"/etc/sysconfig rm -rf "${D}"/var + newbashcomp "${S}/tools/bash-completion/vsh" virsh + bashcomp_alias virsh virt-admin + use libvirtd || return 0 # From here, only libvirtd-related instructions, be warned! @@ -353,9 +356,6 @@ src_install() { newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die - newbashcomp "${S}/tools/bash-completion/vsh" virsh - bashcomp_alias virsh virt-admin - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc