Gentoo Archives: gentoo-commits

From: "Doug Goldstein (cardoe)" <cardoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild qemu-1.1.1-r1.ebuild ChangeLog qemu-1.1.2-r1.ebuild qemu-1.1.2-r2.ebuild qemu-1.2.0.ebuild
Date: Tue, 30 Oct 2012 21:01:52
Message-Id: 20121030210135.6BCDE21600@flycatcher.gentoo.org
1 cardoe 12/10/30 21:01:35
2
3 Modified: qemu-9999.ebuild qemu-1.1.1-r1.ebuild ChangeLog
4 qemu-1.1.2-r1.ebuild qemu-1.1.2-r2.ebuild
5 qemu-1.2.0.ebuild
6 Log:
7 Ensure no one uses USE=bluetooth with USE=static since it doesn't work.
8
9 (Portage version: 2.1.11.9/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.29 app-emulation/qemu/qemu-9999.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.29&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.29&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.28&r2=1.29
17
18 Index: qemu-9999.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
21 retrieving revision 1.28
22 retrieving revision 1.29
23 diff -u -r1.28 -r1.29
24 --- qemu-9999.ebuild 29 Oct 2012 23:50:54 -0000 1.28
25 +++ qemu-9999.ebuild 30 Oct 2012 21:01:35 -0000 1.29
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2012 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.28 2012/10/29 23:50:54 cardoe Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.29 2012/10/30 21:01:35 cardoe Exp $
31
32 EAPI="4"
33
34 @@ -33,16 +33,13 @@
35 sdl smartcard spice static systemtap tci +threads tls usbredir +uuid vde \
36 +vhost-net virtfs +vnc xattr xen xfs"
37
38 -# Block USE flag configurations known to not work
39 -REQUIRED_USE="static ( !bluetooth )"
40 -
41 COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
42 IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
43 IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
44
45 # Setup the default SoftMMU targets, while using the loops
46 # below to setup the other targets.
47 -REQUIRED_USE="${REQUIRED_USE} || ("
48 +REQUIRED_USE="|| ("
49
50 for target in ${IUSE_SOFTMMU_TARGETS}; do
51 IUSE="${IUSE} qemu_softmmu_targets_${target}"
52 @@ -54,8 +51,9 @@
53 IUSE="${IUSE} qemu_user_targets_${target}"
54 done
55
56 +# Block USE flag configurations known to not work
57 REQUIRED_USE="${REQUIRED_USE}
58 - static? ( !alsa !pulseaudio )
59 + static? ( !alsa !pulseaudio !bluetooth )
60 virtfs? ( xattr )"
61
62 # Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
63
64
65
66 1.5 app-emulation/qemu/qemu-1.1.1-r1.ebuild
67
68 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.1.1-r1.ebuild?rev=1.5&view=markup
69 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.1.1-r1.ebuild?rev=1.5&content-type=text/plain
70 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.1.1-r1.ebuild?r1=1.4&r2=1.5
71
72 Index: qemu-1.1.1-r1.ebuild
73 ===================================================================
74 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.1-r1.ebuild,v
75 retrieving revision 1.4
76 retrieving revision 1.5
77 diff -u -r1.4 -r1.5
78 --- qemu-1.1.1-r1.ebuild 30 Oct 2012 20:53:33 -0000 1.4
79 +++ qemu-1.1.1-r1.ebuild 30 Oct 2012 21:01:35 -0000 1.5
80 @@ -1,6 +1,6 @@
81 # Copyright 1999-2012 Gentoo Foundation
82 # Distributed under the terms of the GNU General Public License v2
83 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.1-r1.ebuild,v 1.4 2012/10/30 20:53:33 cardoe Exp $
84 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.1-r1.ebuild,v 1.5 2012/10/30 21:01:35 cardoe Exp $
85
86 EAPI="4"
87
88 @@ -52,7 +52,7 @@
89 IUSE="${IUSE} qemu_user_targets_${target}"
90 done
91
92 -REQUIRED_USE="static? ( !alsa !pulseaudio )
93 +REQUIRED_USE="static? ( !alsa !pulseaudio !bluetooth )
94 amd64? ( qemu_softmmu_targets_x86_64 )
95 x86? ( qemu_softmmu_targets_x86_64 )
96 virtfs? ( xattr )"
97
98
99
100 1.139 app-emulation/qemu/ChangeLog
101
102 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.139&view=markup
103 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.139&content-type=text/plain
104 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.138&r2=1.139
105
106 Index: ChangeLog
107 ===================================================================
108 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
109 retrieving revision 1.138
110 retrieving revision 1.139
111 diff -u -r1.138 -r1.139
112 --- ChangeLog 30 Oct 2012 20:53:33 -0000 1.138
113 +++ ChangeLog 30 Oct 2012 21:01:35 -0000 1.139
114 @@ -1,6 +1,11 @@
115 # ChangeLog for app-emulation/qemu
116 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
117 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.138 2012/10/30 20:53:33 cardoe Exp $
118 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.139 2012/10/30 21:01:35 cardoe Exp $
119 +
120 + 30 Oct 2012; Doug Goldstein <cardoe@g.o> qemu-1.1.1-r1.ebuild,
121 + qemu-1.1.2-r1.ebuild, qemu-1.1.2-r2.ebuild, qemu-1.2.0.ebuild,
122 + qemu-9999.ebuild:
123 + Ensure no one uses USE=bluetooth with USE=static since it doesn't work.
124
125 30 Oct 2012; Doug Goldstein <cardoe@g.o> qemu-1.1.1-r1.ebuild,
126 qemu-1.1.2-r1.ebuild, qemu-1.1.2-r2.ebuild:
127
128
129
130 1.4 app-emulation/qemu/qemu-1.1.2-r1.ebuild
131
132 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r1.ebuild?rev=1.4&view=markup
133 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r1.ebuild?rev=1.4&content-type=text/plain
134 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r1.ebuild?r1=1.3&r2=1.4
135
136 Index: qemu-1.1.2-r1.ebuild
137 ===================================================================
138 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r1.ebuild,v
139 retrieving revision 1.3
140 retrieving revision 1.4
141 diff -u -r1.3 -r1.4
142 --- qemu-1.1.2-r1.ebuild 30 Oct 2012 20:53:33 -0000 1.3
143 +++ qemu-1.1.2-r1.ebuild 30 Oct 2012 21:01:35 -0000 1.4
144 @@ -1,6 +1,6 @@
145 # Copyright 1999-2012 Gentoo Foundation
146 # Distributed under the terms of the GNU General Public License v2
147 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r1.ebuild,v 1.3 2012/10/30 20:53:33 cardoe Exp $
148 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r1.ebuild,v 1.4 2012/10/30 21:01:35 cardoe Exp $
149
150 EAPI="4"
151
152 @@ -39,7 +39,6 @@
153
154 # Setup the default SoftMMU targets, while using the loops
155 # below to setup the other targets.
156 -IUSE="${IUSE}"
157 REQUIRED_USE="|| ("
158
159 for target in ${IUSE_SOFTMMU_TARGETS}; do
160 @@ -53,7 +52,7 @@
161 done
162
163 REQUIRED_USE="${REQUIRED_USE}
164 - static? ( !alsa !pulseaudio )
165 + static? ( !alsa !pulseaudio !bluetooth )
166 virtfs? ( xattr )"
167
168 # Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
169
170
171
172 1.4 app-emulation/qemu/qemu-1.1.2-r2.ebuild
173
174 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r2.ebuild?rev=1.4&view=markup
175 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r2.ebuild?rev=1.4&content-type=text/plain
176 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r2.ebuild?r1=1.3&r2=1.4
177
178 Index: qemu-1.1.2-r2.ebuild
179 ===================================================================
180 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r2.ebuild,v
181 retrieving revision 1.3
182 retrieving revision 1.4
183 diff -u -r1.3 -r1.4
184 --- qemu-1.1.2-r2.ebuild 30 Oct 2012 20:53:33 -0000 1.3
185 +++ qemu-1.1.2-r2.ebuild 30 Oct 2012 21:01:35 -0000 1.4
186 @@ -1,6 +1,6 @@
187 # Copyright 1999-2012 Gentoo Foundation
188 # Distributed under the terms of the GNU General Public License v2
189 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r2.ebuild,v 1.3 2012/10/30 20:53:33 cardoe Exp $
190 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r2.ebuild,v 1.4 2012/10/30 21:01:35 cardoe Exp $
191
192 EAPI="4"
193
194 @@ -39,7 +39,6 @@
195
196 # Setup the default SoftMMU targets, while using the loops
197 # below to setup the other targets.
198 -IUSE="${IUSE}"
199 REQUIRED_USE="|| ("
200
201 for target in ${IUSE_SOFTMMU_TARGETS}; do
202 @@ -52,8 +51,9 @@
203 IUSE="${IUSE} qemu_user_targets_${target}"
204 done
205
206 +# Block USE flag configurations known to not work
207 REQUIRED_USE="${REQUIRED_USE}
208 - static? ( !alsa !pulseaudio )
209 + static? ( !alsa !pulseaudio !bluetooth )
210 virtfs? ( xattr )"
211
212 # Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
213
214
215
216 1.7 app-emulation/qemu/qemu-1.2.0.ebuild
217
218 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild?rev=1.7&view=markup
219 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild?rev=1.7&content-type=text/plain
220 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild?r1=1.6&r2=1.7
221
222 Index: qemu-1.2.0.ebuild
223 ===================================================================
224 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild,v
225 retrieving revision 1.6
226 retrieving revision 1.7
227 diff -u -r1.6 -r1.7
228 --- qemu-1.2.0.ebuild 29 Oct 2012 23:50:54 -0000 1.6
229 +++ qemu-1.2.0.ebuild 30 Oct 2012 21:01:35 -0000 1.7
230 @@ -1,6 +1,6 @@
231 # Copyright 1999-2012 Gentoo Foundation
232 # Distributed under the terms of the GNU General Public License v2
233 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild,v 1.6 2012/10/29 23:50:54 cardoe Exp $
234 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild,v 1.7 2012/10/30 21:01:35 cardoe Exp $
235
236 EAPI="4"
237
238 @@ -33,16 +33,13 @@
239 sdl smartcard spice static systemtap tci +threads tls usbredir +uuid vde \
240 +vhost-net virtfs +vnc xattr xen xfs"
241
242 -# Block USE flag configurations known to not work
243 -REQUIRED_USE="static ( !bluetooth )"
244 -
245 COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
246 IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
247 IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
248
249 # Setup the default SoftMMU targets, while using the loops
250 # below to setup the other targets.
251 -REQUIRED_USE="${REQUIRED_USE} || ("
252 +REQUIRED_USE="|| ("
253
254 for target in ${IUSE_SOFTMMU_TARGETS}; do
255 IUSE="${IUSE} qemu_softmmu_targets_${target}"
256 @@ -54,8 +51,9 @@
257 IUSE="${IUSE} qemu_user_targets_${target}"
258 done
259
260 +# Block USE flag configurations known to not work
261 REQUIRED_USE="${REQUIRED_USE}
262 - static? ( !alsa !pulseaudio )
263 + static? ( !alsa !pulseaudio !bluetooth )
264 virtfs? ( xattr )"
265
266 # Yep, you need both libcap and libcap-ng since virtfs only uses libcap.