1 |
cardoe 12/10/29 23:50:54 |
2 |
|
3 |
Modified: qemu-9999.ebuild ChangeLog qemu-1.2.0.ebuild |
4 |
metadata.xml |
5 |
Log: |
6 |
Updates from the 1.1.x to ready for the 1.2.x series unmask. |
7 |
|
8 |
(Portage version: 2.1.11.9/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.28 app-emulation/qemu/qemu-9999.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.28&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.28&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.27&r2=1.28 |
16 |
|
17 |
Index: qemu-9999.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v |
20 |
retrieving revision 1.27 |
21 |
retrieving revision 1.28 |
22 |
diff -u -r1.27 -r1.28 |
23 |
--- qemu-9999.ebuild 29 Oct 2012 11:15:29 -0000 1.27 |
24 |
+++ qemu-9999.ebuild 29 Oct 2012 23:50:54 -0000 1.28 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2012 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.27 2012/10/29 11:15:29 dev-zero Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.28 2012/10/29 23:50:54 cardoe Exp $ |
30 |
|
31 |
EAPI="4" |
32 |
|
33 |
@@ -9,7 +9,7 @@ |
34 |
|
35 |
PYTHON_DEPEND="2" |
36 |
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user |
37 |
-#BACKPORTS=1 |
38 |
+#BACKPORTS=6cee76f0 |
39 |
|
40 |
if [[ ${PV} = *9999* ]]; then |
41 |
EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git" |
42 |
@@ -19,7 +19,7 @@ |
43 |
else |
44 |
SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz |
45 |
${BACKPORTS:+ |
46 |
- http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-bp-${BACKPORTS}.tar.xz}" |
47 |
+ http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}" |
48 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" |
49 |
fi |
50 |
|
51 |
@@ -29,24 +29,22 @@ |
52 |
LICENSE="GPL-2 LGPL-2 BSD-2" |
53 |
SLOT="0" |
54 |
IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux \ |
55 |
-kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl sdl \ |
56 |
-smartcard spice static systemtap tci tls usbredir +uuid vde +vhost-net \ |
57 |
-virtfs +vnc xattr xen xfs" |
58 |
- |
59 |
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32" |
60 |
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb xtensa xtensaeb" |
61 |
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus" |
62 |
+kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp \ |
63 |
+sdl smartcard spice static systemtap tci +threads tls usbredir +uuid vde \ |
64 |
++vhost-net virtfs +vnc xattr xen xfs" |
65 |
+ |
66 |
+# Block USE flag configurations known to not work |
67 |
+REQUIRED_USE="static ( !bluetooth )" |
68 |
+ |
69 |
+COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x" |
70 |
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb" |
71 |
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32" |
72 |
|
73 |
# Setup the default SoftMMU targets, while using the loops |
74 |
-# below to setup the other targets. x86_64 should be the only |
75 |
-# defaults on for qemu-kvm |
76 |
-IUSE="${IUSE} +qemu_softmmu_targets_x86_64" |
77 |
-REQUIRED_USE="|| ( qemu_softmmu_targets_x86_64" |
78 |
+# below to setup the other targets. |
79 |
+REQUIRED_USE="${REQUIRED_USE} || (" |
80 |
|
81 |
for target in ${IUSE_SOFTMMU_TARGETS}; do |
82 |
- if [ "x${target}" = "xx86_64" ]; then |
83 |
- continue |
84 |
- fi |
85 |
IUSE="${IUSE} qemu_softmmu_targets_${target}" |
86 |
REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}" |
87 |
done |
88 |
@@ -58,8 +56,6 @@ |
89 |
|
90 |
REQUIRED_USE="${REQUIRED_USE} |
91 |
static? ( !alsa !pulseaudio ) |
92 |
- amd64? ( qemu_softmmu_targets_x86_64 ) |
93 |
- x86? ( qemu_softmmu_targets_x86_64 ) |
94 |
virtfs? ( xattr )" |
95 |
|
96 |
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. |
97 |
@@ -76,6 +72,7 @@ |
98 |
rbd? ( sys-cluster/ceph[static-libs(+)] ) |
99 |
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) |
100 |
sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) |
101 |
+ seccomp? ( >=sys-libs/libseccomp-1.0.0[static-libs(+)] ) |
102 |
spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] ) |
103 |
tls? ( net-libs/gnutls[static-libs(+)] ) |
104 |
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) |
105 |
@@ -84,8 +81,6 @@ |
106 |
xfs? ( sys-fs/xfsprogs[static-libs(+)] )" |
107 |
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) |
108 |
!app-emulation/kqemu |
109 |
- !app-emulation/qemu |
110 |
- !<app-emulation/qemu-1.0 |
111 |
sys-firmware/ipxe |
112 |
>=sys-firmware/seabios-1.7.0 |
113 |
sys-firmware/sgabios |
114 |
@@ -105,11 +100,13 @@ |
115 |
xen? ( app-emulation/xen-tools )" |
116 |
|
117 |
DEPEND="${RDEPEND} |
118 |
- app-text/texi2html |
119 |
virtual/pkgconfig |
120 |
+ doc? ( app-text/texi2html ) |
121 |
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) |
122 |
static? ( ${LIB_DEPEND} )" |
123 |
|
124 |
+S="${WORKDIR}/${MY_P}" |
125 |
+ |
126 |
STRIP_MASK="/usr/share/qemu/palcode-clipper" |
127 |
|
128 |
QA_PREBUILT=" |
129 |
@@ -195,6 +192,7 @@ |
130 |
|
131 |
python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat" |
132 |
|
133 |
+ epatch "${FILESDIR}"/${P}-cflags.patch |
134 |
epatch "${FILESDIR}"/${P}-fix-mipsen.patch |
135 |
[[ -n ${BACKPORTS} ]] && \ |
136 |
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ |
137 |
@@ -248,10 +246,6 @@ |
138 |
use pulseaudio && audio_opts="pa,${audio_opts}" |
139 |
use mixemu && conf_opts="${conf_opts} --enable-mixemu" |
140 |
|
141 |
- # $(use_enable xen xen-pci-passthrough) for 1.2 |
142 |
- # $(use_enable debug debug-mon) goes away for 1.2 |
143 |
- # --disable-seccomp as in-tree seccomp is API incompatible (in-tree |
144 |
- # version is ancient) |
145 |
./configure --prefix=/usr \ |
146 |
--sysconfdir=/etc \ |
147 |
--disable-bsd-user \ |
148 |
@@ -260,7 +254,6 @@ |
149 |
--disable-strip \ |
150 |
--disable-werror \ |
151 |
--python=python2 \ |
152 |
- --disable-seccomp \ |
153 |
$(use_enable aio linux-aio) \ |
154 |
$(use_enable bluetooth bluez) \ |
155 |
$(use_enable brltty brlapi) \ |
156 |
@@ -279,6 +272,7 @@ |
157 |
$(use_enable rbd) \ |
158 |
$(use_enable sasl vnc-sasl) \ |
159 |
$(use_enable sdl) \ |
160 |
+ $(use_enable seccomp) \ |
161 |
$(use_enable smartcard smartcard) \ |
162 |
$(use_enable smartcard smartcard-nss) \ |
163 |
$(use_enable spice) \ |
164 |
@@ -317,13 +311,13 @@ |
165 |
fi |
166 |
|
167 |
if use qemu_softmmu_targets_x86_64 ; then |
168 |
- dobin "${FILESDIR}"/qemu-kvm |
169 |
+ dosym /usr/bin/qemu-system-x86_64 /usr/bin/qemu-kvm |
170 |
ewarn "The depreciated '/usr/bin/kvm' symlink is no longer installed" |
171 |
ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit" |
172 |
ewarn "your libvirt configs or other wrappers for ${PN}" |
173 |
else |
174 |
elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install" |
175 |
- elog "of /usr/bin/qemu-kvm and /usr/bin/kvm" |
176 |
+ elog "of the /usr/bin/qemu-kvm symlink." |
177 |
fi |
178 |
fi |
179 |
|
180 |
@@ -336,7 +330,7 @@ |
181 |
|
182 |
use python & dobin scripts/kvm/kvm_stat |
183 |
|
184 |
- # avoid collision with libcacard |
185 |
+ # Avoid collision with app-emulation/libcacard |
186 |
use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient" |
187 |
|
188 |
# Remove SeaBIOS since we're using the SeaBIOS packaged one |
189 |
|
190 |
|
191 |
|
192 |
1.137 app-emulation/qemu/ChangeLog |
193 |
|
194 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.137&view=markup |
195 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.137&content-type=text/plain |
196 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.136&r2=1.137 |
197 |
|
198 |
Index: ChangeLog |
199 |
=================================================================== |
200 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v |
201 |
retrieving revision 1.136 |
202 |
retrieving revision 1.137 |
203 |
diff -u -r1.136 -r1.137 |
204 |
--- ChangeLog 29 Oct 2012 11:15:29 -0000 1.136 |
205 |
+++ ChangeLog 29 Oct 2012 23:50:54 -0000 1.137 |
206 |
@@ -1,6 +1,10 @@ |
207 |
# ChangeLog for app-emulation/qemu |
208 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
209 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.136 2012/10/29 11:15:29 dev-zero Exp $ |
210 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.137 2012/10/29 23:50:54 cardoe Exp $ |
211 |
+ |
212 |
+ 29 Oct 2012; Doug Goldstein <cardoe@g.o> qemu-1.2.0.ebuild, |
213 |
+ qemu-9999.ebuild: |
214 |
+ Updates from the 1.1.x to ready for the 1.2.x series unmask. |
215 |
|
216 |
29 Oct 2012; Tiziano Müller <dev-zero@g.o> qemu-9999.ebuild: |
217 |
Fix collision with vscclient in the live ebuild like in the 1.2.0 ebuild. |
218 |
|
219 |
|
220 |
|
221 |
1.6 app-emulation/qemu/qemu-1.2.0.ebuild |
222 |
|
223 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild?rev=1.6&view=markup |
224 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild?rev=1.6&content-type=text/plain |
225 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild?r1=1.5&r2=1.6 |
226 |
|
227 |
Index: qemu-1.2.0.ebuild |
228 |
=================================================================== |
229 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild,v |
230 |
retrieving revision 1.5 |
231 |
retrieving revision 1.6 |
232 |
diff -u -r1.5 -r1.6 |
233 |
--- qemu-1.2.0.ebuild 28 Oct 2012 20:15:51 -0000 1.5 |
234 |
+++ qemu-1.2.0.ebuild 29 Oct 2012 23:50:54 -0000 1.6 |
235 |
@@ -1,6 +1,6 @@ |
236 |
# Copyright 1999-2012 Gentoo Foundation |
237 |
# Distributed under the terms of the GNU General Public License v2 |
238 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild,v 1.5 2012/10/28 20:15:51 cardoe Exp $ |
239 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild,v 1.6 2012/10/29 23:50:54 cardoe Exp $ |
240 |
|
241 |
EAPI="4" |
242 |
|
243 |
@@ -9,7 +9,7 @@ |
244 |
|
245 |
PYTHON_DEPEND="2" |
246 |
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user |
247 |
-#BACKPORTS=1 |
248 |
+#BACKPORTS=6cee76f0 |
249 |
|
250 |
if [[ ${PV} = *9999* ]]; then |
251 |
EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git" |
252 |
@@ -20,8 +20,7 @@ |
253 |
SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz |
254 |
${BACKPORTS:+ |
255 |
http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}" |
256 |
- #KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" |
257 |
- KEYWORDS="" |
258 |
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" |
259 |
fi |
260 |
|
261 |
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" |
262 |
@@ -30,24 +29,22 @@ |
263 |
LICENSE="GPL-2 LGPL-2 BSD-2" |
264 |
SLOT="0" |
265 |
IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux \ |
266 |
-kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl sdl \ |
267 |
-smartcard spice static systemtap tci tls usbredir +uuid vde +vhost-net \ |
268 |
-virtfs +vnc xattr xen xfs" |
269 |
- |
270 |
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32" |
271 |
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb xtensa xtensaeb" |
272 |
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus" |
273 |
+kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp \ |
274 |
+sdl smartcard spice static systemtap tci +threads tls usbredir +uuid vde \ |
275 |
++vhost-net virtfs +vnc xattr xen xfs" |
276 |
+ |
277 |
+# Block USE flag configurations known to not work |
278 |
+REQUIRED_USE="static ( !bluetooth )" |
279 |
+ |
280 |
+COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x" |
281 |
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb" |
282 |
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32" |
283 |
|
284 |
# Setup the default SoftMMU targets, while using the loops |
285 |
-# below to setup the other targets. x86_64 should be the only |
286 |
-# defaults on for qemu-kvm |
287 |
-IUSE="${IUSE} +qemu_softmmu_targets_x86_64" |
288 |
-REQUIRED_USE="|| ( qemu_softmmu_targets_x86_64" |
289 |
+# below to setup the other targets. |
290 |
+REQUIRED_USE="${REQUIRED_USE} || (" |
291 |
|
292 |
for target in ${IUSE_SOFTMMU_TARGETS}; do |
293 |
- if [ "x${target}" = "xx86_64" ]; then |
294 |
- continue |
295 |
- fi |
296 |
IUSE="${IUSE} qemu_softmmu_targets_${target}" |
297 |
REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}" |
298 |
done |
299 |
@@ -59,8 +56,6 @@ |
300 |
|
301 |
REQUIRED_USE="${REQUIRED_USE} |
302 |
static? ( !alsa !pulseaudio ) |
303 |
- amd64? ( qemu_softmmu_targets_x86_64 ) |
304 |
- x86? ( qemu_softmmu_targets_x86_64 ) |
305 |
virtfs? ( xattr )" |
306 |
|
307 |
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. |
308 |
@@ -77,6 +72,7 @@ |
309 |
rbd? ( sys-cluster/ceph[static-libs(+)] ) |
310 |
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) |
311 |
sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) |
312 |
+ seccomp? ( >=sys-libs/libseccomp-1.0.0[static-libs(+)] ) |
313 |
spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] ) |
314 |
tls? ( net-libs/gnutls[static-libs(+)] ) |
315 |
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) |
316 |
@@ -85,8 +81,6 @@ |
317 |
xfs? ( sys-fs/xfsprogs[static-libs(+)] )" |
318 |
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) |
319 |
!app-emulation/kqemu |
320 |
- !app-emulation/qemu |
321 |
- !<app-emulation/qemu-1.0 |
322 |
sys-firmware/ipxe |
323 |
>=sys-firmware/seabios-1.7.0 |
324 |
sys-firmware/sgabios |
325 |
@@ -106,11 +100,13 @@ |
326 |
xen? ( app-emulation/xen-tools )" |
327 |
|
328 |
DEPEND="${RDEPEND} |
329 |
- app-text/texi2html |
330 |
virtual/pkgconfig |
331 |
+ doc? ( app-text/texi2html ) |
332 |
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) |
333 |
static? ( ${LIB_DEPEND} )" |
334 |
|
335 |
+S="${WORKDIR}/${MY_P}" |
336 |
+ |
337 |
STRIP_MASK="/usr/share/qemu/palcode-clipper" |
338 |
|
339 |
QA_PREBUILT=" |
340 |
@@ -139,8 +135,6 @@ |
341 |
usr/bin/qemu-armeb |
342 |
usr/bin/qemu-sparc32plus" |
343 |
|
344 |
-S="${WORKDIR}/${MY_P}" |
345 |
- |
346 |
pkg_pretend() { |
347 |
if use kernel_linux && kernel_is lt 2 6 25; then |
348 |
eerror "This version of KVM requres a host kernel of 2.6.25 or higher." |
349 |
@@ -182,11 +176,6 @@ |
350 |
ewarn "on the mailing list about USE=static's place in Gentoo. As a" |
351 |
ewarn "result what worked today may not work tomorrow." |
352 |
fi |
353 |
- |
354 |
- if [[ "${I_WAS_TOLD_NOT_TO_USE_THIS_BUT_DID_ANYWAY}" != "derp" ]]; then |
355 |
- eerror "This ebuild is masked and unkeyworded. WHY are you using it!?" |
356 |
- die "This ebuild is masked and unkeyworded. WHY are you using it!?" |
357 |
- fi |
358 |
} |
359 |
|
360 |
pkg_setup() { |
361 |
@@ -256,10 +245,6 @@ |
362 |
use pulseaudio && audio_opts="pa,${audio_opts}" |
363 |
use mixemu && conf_opts="${conf_opts} --enable-mixemu" |
364 |
|
365 |
- # $(use_enable xen xen-pci-passthrough) for 1.2 |
366 |
- # $(use_enable debug debug-mon) goes away for 1.2 |
367 |
- # --disable-seccomp as in-tree seccomp is API incompatible (in-tree |
368 |
- # version is ancient) |
369 |
./configure --prefix=/usr \ |
370 |
--sysconfdir=/etc \ |
371 |
--disable-bsd-user \ |
372 |
@@ -268,7 +253,6 @@ |
373 |
--disable-strip \ |
374 |
--disable-werror \ |
375 |
--python=python2 \ |
376 |
- --disable-seccomp \ |
377 |
$(use_enable aio linux-aio) \ |
378 |
$(use_enable bluetooth bluez) \ |
379 |
$(use_enable brltty brlapi) \ |
380 |
@@ -287,6 +271,7 @@ |
381 |
$(use_enable rbd) \ |
382 |
$(use_enable sasl vnc-sasl) \ |
383 |
$(use_enable sdl) \ |
384 |
+ $(use_enable seccomp) \ |
385 |
$(use_enable smartcard smartcard) \ |
386 |
$(use_enable smartcard smartcard-nss) \ |
387 |
$(use_enable spice) \ |
388 |
@@ -325,7 +310,7 @@ |
389 |
fi |
390 |
|
391 |
if use qemu_softmmu_targets_x86_64 ; then |
392 |
- dobin /usr/bin/qemu-system-x86_64 /usr/bin/qemu-kvm |
393 |
+ dosym /usr/bin/qemu-system-x86_64 /usr/bin/qemu-kvm |
394 |
ewarn "The depreciated '/usr/bin/kvm' symlink is no longer installed" |
395 |
ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit" |
396 |
ewarn "your libvirt configs or other wrappers for ${PN}" |
397 |
@@ -344,7 +329,7 @@ |
398 |
|
399 |
use python & dobin scripts/kvm/kvm_stat |
400 |
|
401 |
- # avoid collision with libcacard |
402 |
+ # Avoid collision with app-emulation/libcacard |
403 |
use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient" |
404 |
|
405 |
# Remove SeaBIOS since we're using the SeaBIOS packaged one |
406 |
|
407 |
|
408 |
|
409 |
1.17 app-emulation/qemu/metadata.xml |
410 |
|
411 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/metadata.xml?rev=1.17&view=markup |
412 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/metadata.xml?rev=1.17&content-type=text/plain |
413 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/metadata.xml?r1=1.16&r2=1.17 |
414 |
|
415 |
Index: metadata.xml |
416 |
=================================================================== |
417 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/metadata.xml,v |
418 |
retrieving revision 1.16 |
419 |
retrieving revision 1.17 |
420 |
diff -u -r1.16 -r1.17 |
421 |
--- metadata.xml 20 Oct 2012 16:28:36 -0000 1.16 |
422 |
+++ metadata.xml 29 Oct 2012 23:50:54 -0000 1.17 |
423 |
@@ -17,6 +17,7 @@ |
424 |
<flag name='pulseaudio'>Enable pulseaudio output for sound emulation</flag> |
425 |
<flag name='rbd'>Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag> |
426 |
<flag name='sdl'>Enable the SDL-based console</flag> |
427 |
+ <flag name='seccomp'>Utilize <pkg>sys-libs/libseccomp</pkg> to enable kernel filtering of system calls to prevent malicious guests from doing damage.</flag> |
428 |
<flag name='spice'>Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag> |
429 |
<flag name='systemtap'>Enable SystemTAP/DTrace tracing</flag> |
430 |
<flag name='tci'>Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time.</flag> |