[gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/ - gentoo-commits

From:	Doug Goldstein <cardoe@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/
Date:	Mon, 02 Dec 2019 14:42:26
Message-Id:	`1575297669.9e8a88357932cb3a0c8754385cfc2e69ec6dc74e.cardoe@gentoo`

1

commit:     9e8a88357932cb3a0c8754385cfc2e69ec6dc74e

2

Author:     Michal Privoznik <mprivozn <AT> redhat <DOT> com>

3

AuthorDate: Thu Oct 31 13:47:35 2019 +0000

4

Commit:     Doug Goldstein <cardoe <AT> gentoo <DOT> org>

5

CommitDate: Mon Dec  2 14:41:09 2019 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e8a8835

7

8

app-emulation/libvirt: Install bash completion even if USE="-libvirtd"

9

10

The bash completion scripts help client utilities like virsh or

11

virt-admin and are independent of daemon, i.e. of libvirtd use

12

flag. However, due to the placement of 'newbashcomp' and

13

'bashcomp_alias' calls in ebuilds, the scripts were not installed

14

unless libvirtd use flag was enabled.

15

16

Signed-off-by: Michal Privoznik <mprivozn <AT> redhat.com>

17

Signed-off-by: Doug Goldstein <cardoe <AT> gentoo.org>

18

19

 app-emulation/libvirt/libvirt-5.2.0-r2.ebuild | 6 +++---

20

 app-emulation/libvirt/libvirt-5.5.0-r1.ebuild | 6 +++---

21

 app-emulation/libvirt/libvirt-5.6.0.ebuild    | 6 +++---

22

 app-emulation/libvirt/libvirt-5.8.0.ebuild    | 6 +++---

23

 app-emulation/libvirt/libvirt-9999.ebuild     | 6 +++---

24

 5 files changed, 15 insertions(+), 15 deletions(-)

25

26

diff --git a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild

27

index 0d00aa14bca..d03db5f55c6 100644

28

--- a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild

29

+++ b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild

30

@@ -341,6 +341,9 @@ src_install() {

31

 	rm -rf "${D}"/etc/sysconfig

32

 	rm -rf "${D}"/var

33

34

+	newbashcomp "${S}/tools/bash-completion/vsh" virsh

35

+	bashcomp_alias virsh virt-admin

36

+

37

 	use libvirtd || return 0

38

 	# From here, only libvirtd-related instructions, be warned!

39

40

@@ -357,9 +360,6 @@ src_install() {

41

 	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die

42

 	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die

43

44

-	newbashcomp "${S}/tools/bash-completion/vsh" virsh

45

-	bashcomp_alias virsh virt-admin

46

-

47

 	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")

48

 	DISABLE_AUTOFORMATTING=true

49

 	readme.gentoo_create_doc

50

51

diff --git a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild

52

index db4043651cc..581677ab617 100644

53

--- a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild

54

+++ b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild

55

@@ -336,6 +336,9 @@ src_install() {

56

 	rm -rf "${D}"/etc/sysconfig

57

 	rm -rf "${D}"/var

58

59

+	newbashcomp "${S}/tools/bash-completion/vsh" virsh

60

+	bashcomp_alias virsh virt-admin

61

+

62

 	use libvirtd || return 0

63

 	# From here, only libvirtd-related instructions, be warned!

64

65

@@ -352,9 +355,6 @@ src_install() {

66

 	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die

67

 	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die

68

69

-	newbashcomp "${S}/tools/bash-completion/vsh" virsh

70

-	bashcomp_alias virsh virt-admin

71

-

72

 	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")

73

 	DISABLE_AUTOFORMATTING=true

74

 	readme.gentoo_create_doc

75

76

diff --git a/app-emulation/libvirt/libvirt-5.6.0.ebuild b/app-emulation/libvirt/libvirt-5.6.0.ebuild

77

index 11ae2447b09..07d39538452 100644

78

--- a/app-emulation/libvirt/libvirt-5.6.0.ebuild

79

+++ b/app-emulation/libvirt/libvirt-5.6.0.ebuild

80

@@ -336,6 +336,9 @@ src_install() {

81

 	rm -rf "${D}"/etc/sysconfig

82

 	rm -rf "${D}"/var

83

84

+	newbashcomp "${S}/tools/bash-completion/vsh" virsh

85

+	bashcomp_alias virsh virt-admin

86

+

87

 	use libvirtd || return 0

88

 	# From here, only libvirtd-related instructions, be warned!

89

90

@@ -352,9 +355,6 @@ src_install() {

91

 	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die

92

 	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die

93

94

-	newbashcomp "${S}/tools/bash-completion/vsh" virsh

95

-	bashcomp_alias virsh virt-admin

96

-

97

 	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")

98

 	DISABLE_AUTOFORMATTING=true

99

 	readme.gentoo_create_doc

100

101

diff --git a/app-emulation/libvirt/libvirt-5.8.0.ebuild b/app-emulation/libvirt/libvirt-5.8.0.ebuild

102

index 696f81fcdc7..17eb6ffb24a 100644

103

--- a/app-emulation/libvirt/libvirt-5.8.0.ebuild

104

+++ b/app-emulation/libvirt/libvirt-5.8.0.ebuild

105

@@ -340,6 +340,9 @@ src_install() {

106

 	rm -rf "${D}"/var

107

 	rm -rf "${D}"/run

108

109

+	newbashcomp "${S}/tools/bash-completion/vsh" virsh

110

+	bashcomp_alias virsh virt-admin

111

+

112

 	use libvirtd || return 0

113

 	# From here, only libvirtd-related instructions, be warned!

114

115

@@ -356,9 +359,6 @@ src_install() {

116

 	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die

117

 	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die

118

119

-	newbashcomp "${S}/tools/bash-completion/vsh" virsh

120

-	bashcomp_alias virsh virt-admin

121

-

122

 	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")

123

 	DISABLE_AUTOFORMATTING=true

124

 	readme.gentoo_create_doc

125

126

diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild

127

index 63900def37d..1c39aa69ee2 100644

128

--- a/app-emulation/libvirt/libvirt-9999.ebuild

129

+++ b/app-emulation/libvirt/libvirt-9999.ebuild

130

@@ -337,6 +337,9 @@ src_install() {

131

 	rm -rf "${D}"/etc/sysconfig

132

 	rm -rf "${D}"/var

133

134

+	newbashcomp "${S}/tools/bash-completion/vsh" virsh

135

+	bashcomp_alias virsh virt-admin

136

+

137

 	use libvirtd || return 0

138

 	# From here, only libvirtd-related instructions, be warned!

139

140

@@ -353,9 +356,6 @@ src_install() {

141

 	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die

142

 	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die

143

144

-	newbashcomp "${S}/tools/bash-completion/vsh" virsh

145

-	bashcomp_alias virsh virt-admin

146

-

147

 	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")

148

 	DISABLE_AUTOFORMATTING=true

149

 	readme.gentoo_create_doc

1	commit: 9e8a88357932cb3a0c8754385cfc2e69ec6dc74e
2	Author: Michal Privoznik <mprivozn <AT> redhat <DOT> com>
3	AuthorDate: Thu Oct 31 13:47:35 2019 +0000
4	Commit: Doug Goldstein <cardoe <AT> gentoo <DOT> org>
5	CommitDate: Mon Dec 2 14:41:09 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e8a8835
7
8	app-emulation/libvirt: Install bash completion even if USE="-libvirtd"
9
10	The bash completion scripts help client utilities like virsh or
11	virt-admin and are independent of daemon, i.e. of libvirtd use
12	flag. However, due to the placement of 'newbashcomp' and
13	'bashcomp_alias' calls in ebuilds, the scripts were not installed
14	unless libvirtd use flag was enabled.
15
16	Signed-off-by: Michal Privoznik <mprivozn <AT> redhat.com>
17	Signed-off-by: Doug Goldstein <cardoe <AT> gentoo.org>
18
19	app-emulation/libvirt/libvirt-5.2.0-r2.ebuild \| 6 +++---
20	app-emulation/libvirt/libvirt-5.5.0-r1.ebuild \| 6 +++---
21	app-emulation/libvirt/libvirt-5.6.0.ebuild \| 6 +++---
22	app-emulation/libvirt/libvirt-5.8.0.ebuild \| 6 +++---
23	app-emulation/libvirt/libvirt-9999.ebuild \| 6 +++---
24	5 files changed, 15 insertions(+), 15 deletions(-)
25
26	diff --git a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
27	index 0d00aa14bca..d03db5f55c6 100644
28	--- a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
29	+++ b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
30	@@ -341,6 +341,9 @@ src_install() {
31	rm -rf "${D}"/etc/sysconfig
32	rm -rf "${D}"/var
33
34	+ newbashcomp "${S}/tools/bash-completion/vsh" virsh
35	+ bashcomp_alias virsh virt-admin
36	+
37	use libvirtd \|\| return 0
38	# From here, only libvirtd-related instructions, be warned!
39
40	@@ -357,9 +360,6 @@ src_install() {
41	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd \|\| die
42	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests \|\| die
43
44	- newbashcomp "${S}/tools/bash-completion/vsh" virsh
45	- bashcomp_alias virsh virt-admin
46	-
47	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
48	DISABLE_AUTOFORMATTING=true
49	readme.gentoo_create_doc
50
51	diff --git a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
52	index db4043651cc..581677ab617 100644
53	--- a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
54	+++ b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
55	@@ -336,6 +336,9 @@ src_install() {
56	rm -rf "${D}"/etc/sysconfig
57	rm -rf "${D}"/var
58
59	+ newbashcomp "${S}/tools/bash-completion/vsh" virsh
60	+ bashcomp_alias virsh virt-admin
61	+
62	use libvirtd \|\| return 0
63	# From here, only libvirtd-related instructions, be warned!
64
65	@@ -352,9 +355,6 @@ src_install() {
66	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd \|\| die
67	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests \|\| die
68
69	- newbashcomp "${S}/tools/bash-completion/vsh" virsh
70	- bashcomp_alias virsh virt-admin
71	-
72	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
73	DISABLE_AUTOFORMATTING=true
74	readme.gentoo_create_doc
75
76	diff --git a/app-emulation/libvirt/libvirt-5.6.0.ebuild b/app-emulation/libvirt/libvirt-5.6.0.ebuild
77	index 11ae2447b09..07d39538452 100644
78	--- a/app-emulation/libvirt/libvirt-5.6.0.ebuild
79	+++ b/app-emulation/libvirt/libvirt-5.6.0.ebuild
80	@@ -336,6 +336,9 @@ src_install() {
81	rm -rf "${D}"/etc/sysconfig
82	rm -rf "${D}"/var
83
84	+ newbashcomp "${S}/tools/bash-completion/vsh" virsh
85	+ bashcomp_alias virsh virt-admin
86	+
87	use libvirtd \|\| return 0
88	# From here, only libvirtd-related instructions, be warned!
89
90	@@ -352,9 +355,6 @@ src_install() {
91	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd \|\| die
92	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests \|\| die
93
94	- newbashcomp "${S}/tools/bash-completion/vsh" virsh
95	- bashcomp_alias virsh virt-admin
96	-
97	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
98	DISABLE_AUTOFORMATTING=true
99	readme.gentoo_create_doc
100
101	diff --git a/app-emulation/libvirt/libvirt-5.8.0.ebuild b/app-emulation/libvirt/libvirt-5.8.0.ebuild
102	index 696f81fcdc7..17eb6ffb24a 100644
103	--- a/app-emulation/libvirt/libvirt-5.8.0.ebuild
104	+++ b/app-emulation/libvirt/libvirt-5.8.0.ebuild
105	@@ -340,6 +340,9 @@ src_install() {
106	rm -rf "${D}"/var
107	rm -rf "${D}"/run
108
109	+ newbashcomp "${S}/tools/bash-completion/vsh" virsh
110	+ bashcomp_alias virsh virt-admin
111	+
112	use libvirtd \|\| return 0
113	# From here, only libvirtd-related instructions, be warned!
114
115	@@ -356,9 +359,6 @@ src_install() {
116	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd \|\| die
117	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests \|\| die
118
119	- newbashcomp "${S}/tools/bash-completion/vsh" virsh
120	- bashcomp_alias virsh virt-admin
121	-
122	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
123	DISABLE_AUTOFORMATTING=true
124	readme.gentoo_create_doc
125
126	diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
127	index 63900def37d..1c39aa69ee2 100644
128	--- a/app-emulation/libvirt/libvirt-9999.ebuild
129	+++ b/app-emulation/libvirt/libvirt-9999.ebuild
130	@@ -337,6 +337,9 @@ src_install() {
131	rm -rf "${D}"/etc/sysconfig
132	rm -rf "${D}"/var
133
134	+ newbashcomp "${S}/tools/bash-completion/vsh" virsh
135	+ bashcomp_alias virsh virt-admin
136	+
137	use libvirtd \|\| return 0
138	# From here, only libvirtd-related instructions, be warned!
139
140	@@ -353,9 +356,6 @@ src_install() {
141	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd \|\| die
142	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests \|\| die
143
144	- newbashcomp "${S}/tools/bash-completion/vsh" virsh
145	- bashcomp_alias virsh virt-admin
146	-
147	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
148	DISABLE_AUTOFORMATTING=true
149	readme.gentoo_create_doc

Gentoo Archives: gentoo-commits