1 |
commit: 1c4e48ea59c8e7783f02af81ee28c31ecbb628ab |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 15 01:46:21 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 15 01:46:21 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c4e48ea |
7 |
|
8 |
app-emulation/libvirt: [QA] unconditionally install bash-completion files |
9 |
|
10 |
See small file policy [0]. Users can use INSTALL_MASK if they want these |
11 |
files (previously was automagic). |
12 |
|
13 |
(This is one of very few of these left, yay!) |
14 |
|
15 |
[0] https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0301 |
16 |
|
17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
18 |
|
19 |
.../{libvirt-7.10.0-r2.ebuild => libvirt-7.10.0-r3.ebuild} | 6 ++++-- |
20 |
app-emulation/libvirt/libvirt-9999.ebuild | 8 +++++--- |
21 |
2 files changed, 9 insertions(+), 5 deletions(-) |
22 |
|
23 |
diff --git a/app-emulation/libvirt/libvirt-7.10.0-r2.ebuild b/app-emulation/libvirt/libvirt-7.10.0-r3.ebuild |
24 |
similarity index 98% |
25 |
rename from app-emulation/libvirt/libvirt-7.10.0-r2.ebuild |
26 |
rename to app-emulation/libvirt/libvirt-7.10.0-r3.ebuild |
27 |
index 14c31d413e2c..70c8985899f1 100644 |
28 |
--- a/app-emulation/libvirt/libvirt-7.10.0-r2.ebuild |
29 |
+++ b/app-emulation/libvirt/libvirt-7.10.0-r3.ebuild |
30 |
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" |
31 |
LICENSE="LGPL-2.1" |
32 |
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc |
33 |
IUSE=" |
34 |
- apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs |
35 |
+ apparmor audit +caps dtrace firewalld fuse glusterfs |
36 |
iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz |
37 |
parted pcap policykit +qemu rbd sasl selinux +udev |
38 |
virtualbox +virt-network wireshark-plugins xen zfs |
39 |
@@ -48,7 +48,6 @@ BDEPEND=" |
40 |
dev-perl/XML-XPath |
41 |
dev-python/docutils |
42 |
virtual/pkgconfig |
43 |
- bash-completion? ( >=app-shells/bash-completion-2.0 ) |
44 |
verify-sig? ( sec-keys/openpgp-keys-libvirt )" |
45 |
|
46 |
# gettext.sh command is used by the libvirt command wrappers, and it's |
47 |
@@ -281,6 +280,9 @@ src_configure() { |
48 |
--localstatedir="${EPREFIX}/var" |
49 |
-Drunstatedir="${EPREFIX}/run" |
50 |
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}" |
51 |
+ |
52 |
+ -Dbash_completion=enabled |
53 |
+ -Dbash_completion_dir="$(get_bashcompdir)" |
54 |
) |
55 |
|
56 |
meson_src_configure |
57 |
|
58 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild |
59 |
index fa0d16f6ac3b..0129df7341ea 100644 |
60 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
61 |
+++ b/app-emulation/libvirt/libvirt-9999.ebuild |
62 |
@@ -1,4 +1,4 @@ |
63 |
-# Copyright 1999-2021 Gentoo Authors |
64 |
+# Copyright 1999-2022 Gentoo Authors |
65 |
# Distributed under the terms of the GNU General Public License v2 |
66 |
|
67 |
EAPI=7 |
68 |
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" |
69 |
LICENSE="LGPL-2.1" |
70 |
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc |
71 |
IUSE=" |
72 |
- apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs |
73 |
+ apparmor audit +caps dtrace firewalld fuse glusterfs |
74 |
iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz |
75 |
parted pcap policykit +qemu rbd sasl selinux +udev |
76 |
virtualbox +virt-network wireshark-plugins xen zfs |
77 |
@@ -48,7 +48,6 @@ BDEPEND=" |
78 |
dev-perl/XML-XPath |
79 |
dev-python/docutils |
80 |
virtual/pkgconfig |
81 |
- bash-completion? ( >=app-shells/bash-completion-2.0 ) |
82 |
verify-sig? ( sec-keys/openpgp-keys-libvirt )" |
83 |
|
84 |
# gettext.sh command is used by the libvirt command wrappers, and it's |
85 |
@@ -279,6 +278,9 @@ src_configure() { |
86 |
--localstatedir="${EPREFIX}/var" |
87 |
-Drunstatedir="${EPREFIX}/run" |
88 |
-Ddocdir="${EPREFIX}/usr/share/doc/${PF}" |
89 |
+ |
90 |
+ -Dbash_completion=enabled |
91 |
+ -Dbash_completion_dir="$(get_bashcompdir)" |
92 |
) |
93 |
|
94 |
meson_src_configure |