commit: 9e8a88357932cb3a0c8754385cfc2e69ec6dc74e
Author: Michal Privoznik <mprivozn <AT> redhat <DOT> com>
AuthorDate: Thu Oct 31 13:47:35 2019 +0000
Commit: Doug Goldstein <cardoe <AT> gentoo <DOT> 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 <mprivozn <AT> redhat.com>
Signed-off-by: Doug Goldstein <cardoe <AT> 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
