diff options
| author |   Michal Privoznik <mprivozn@redhat.com> | 2019-10-31 14:47:35 +0100 |
|---|---|---|
| committer |   Doug Goldstein <cardoe@gentoo.org> | 2019-12-02 08:41:09 -0600 |
| commit | 9e8a88357932cb3a0c8754385cfc2e69ec6dc74e (patch) | |
| tree | 88fa8b91b9d4b673822bf23c6a68b0afb1ca6943 | |
| parent | dev-php/doctrine: Fix download and source unpack locations (diff) | |
| download | gentoo-9e8a88357932cb3a0c8754385cfc2e69ec6dc74e.tar.gz gentoo-9e8a88357932cb3a0c8754385cfc2e69ec6dc74e.tar.bz2 gentoo-9e8a88357932cb3a0c8754385cfc2e69ec6dc74e.zip | |
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@redhat.com>
Signed-off-by: Doug Goldstein <cardoe@gentoo.org>
| -rw-r--r-- | app-emulation/libvirt/libvirt-5.2.0-r2.ebuild | 6 | ||||
| -rw-r--r-- | app-emulation/libvirt/libvirt-5.5.0-r1.ebuild | 6 | ||||
| -rw-r--r-- | app-emulation/libvirt/libvirt-5.6.0.ebuild | 6 | ||||
| -rw-r--r-- | app-emulation/libvirt/libvirt-5.8.0.ebuild | 6 | ||||
| -rw-r--r-- | 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 0d00aa14bca9..d03db5f55c6b 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 db4043651ccd..581677ab6175 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 11ae2447b09c..07d39538452f 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 696f81fcdc79..17eb6ffb24aa 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 63900def37dc..1c39aa69ee22 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 |