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