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 ChangeLog
Date: Thu, 30 May 2013 15:56:35
Message-Id: 20130530155630.B78DB2171D@flycatcher.gentoo.org
1 cardoe 13/05/30 15:56:30
2
3 Modified: qemu-9999.ebuild ChangeLog
4 Log:
5 Updates to the live ebuild
6
7 (Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key D7DFA8D318FA9AEF!)
8
9 Revision Changes Path
10 1.50 app-emulation/qemu/qemu-9999.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.50&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.50&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.49&r2=1.50
15
16 Index: qemu-9999.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
19 retrieving revision 1.49
20 retrieving revision 1.50
21 diff -u -r1.49 -r1.50
22 --- qemu-9999.ebuild 7 May 2013 15:56:29 -0000 1.49
23 +++ qemu-9999.ebuild 30 May 2013 15:56:30 -0000 1.50
24 @@ -1,12 +1,16 @@
25 # Copyright 1999-2013 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.49 2013/05/07 15:56:29 cardoe Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.50 2013/05/30 15:56:30 cardoe Exp $
29
30 -EAPI="4"
31 +EAPI=5
32
33 -PYTHON_DEPEND="2"
34 -inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user udev
35 -#BACKPORTS=6cee76f0
36 +PYTHON_COMPAT=( python{2_5,2_6,2_7} )
37 +PYTHON_REQ_USE="ncurses,readline"
38 +
39 +inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
40 + user udev fcaps
41 +
42 +BACKPORTS=6b5934f9
43
44 if [[ ${PV} = *9999* ]]; then
45 EGIT_REPO_URI="git://git.qemu.org/qemu.git"
46 @@ -25,12 +29,14 @@
47
48 LICENSE="GPL-2 LGPL-2 BSD-2"
49 SLOT="0"
50 -IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux \
51 -kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp \
52 -sdl selinux smartcard spice static systemtap tci +threads tls usbredir +uuid vde \
53 -+vhost-net virtfs +vnc xattr xen xfs"
54 +IUSE="+aio alsa bluetooth brltty +caps +curl debug fdt iscsi +jpeg \
55 +kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python \
56 +rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu \
57 +static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net \
58 +virtfs +vnc xattr xen xfs"
59
60 -COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
61 +COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips
62 +mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
63 IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
64 IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus"
65
66 @@ -50,13 +56,16 @@
67
68 # Block USE flag configurations known to not work
69 REQUIRED_USE="${REQUIRED_USE}
70 - static? ( !alsa !pulseaudio !bluetooth !opengl )
71 + python? ( ${PYTHON_REQUIRED_USE} )
72 + static? ( static-softmmu static-user )
73 + static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl )
74 virtfs? ( xattr )"
75
76 # Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
77 LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
78 sys-apps/pciutils[static-libs(+)]
79 sys-libs/zlib[static-libs(+)]
80 + >=x11-libs/pixman-0.28.0[static-libs(+)]
81 aio? ( dev-libs/libaio[static-libs(+)] )
82 caps? ( sys-libs/libcap-ng[static-libs(+)] )
83 curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
84 @@ -74,40 +83,46 @@
85 vde? ( net-misc/vde[static-libs(+)] )
86 xattr? ( sys-apps/attr[static-libs(+)] )
87 xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
88 -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
89 +RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
90 !app-emulation/kqemu
91 qemu_softmmu_targets_i386? (
92 sys-firmware/ipxe
93 - >=sys-firmware/seabios-1.7.0
94 + sys-firmware/seabios
95 sys-firmware/sgabios
96 sys-firmware/vgabios
97 )
98 qemu_softmmu_targets_x86_64? (
99 sys-firmware/ipxe
100 - >=sys-firmware/seabios-1.7.0
101 + sys-firmware/seabios
102 sys-firmware/sgabios
103 sys-firmware/vgabios
104 )
105 alsa? ( >=media-libs/alsa-lib-1.0.13 )
106 bluetooth? ( net-wireless/bluez )
107 brltty? ( app-accessibility/brltty )
108 + iscsi? ( net-libs/libiscsi )
109 opengl? ( virtual/opengl )
110 pulseaudio? ( media-sound/pulseaudio )
111 - python? ( =dev-lang/python-2*[ncurses] )
112 + python? ( ${PYTHON_DEPS} )
113 sdl? ( media-libs/libsdl[X] )
114 selinux? ( sec-policy/selinux-qemu )
115 - smartcard? ( dev-libs/nss )
116 - spice? ( >=app-emulation/spice-protocol-0.12.2 )
117 + smartcard? ( dev-libs/nss !app-emulation/libcacard )
118 + spice? ( >=app-emulation/spice-protocol-0.12.3 )
119 systemtap? ( dev-util/systemtap )
120 usbredir? ( >=sys-apps/usbredir-0.6 )
121 virtfs? ( sys-libs/libcap )
122 xen? ( app-emulation/xen-tools )"
123
124 DEPEND="${RDEPEND}
125 + app-text/texi2html
126 + =dev-lang/python-2*
127 virtual/pkgconfig
128 - doc? ( app-text/texi2html )
129 kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
130 - static? ( ${LIB_DEPEND} )"
131 + static-softmmu? ( ${LIB_DEPEND} )
132 + test? (
133 + dev-libs/glib[utils]
134 + sys-devel/bc
135 + )"
136
137 STRIP_MASK="/usr/share/qemu/palcode-clipper"
138
139 @@ -117,8 +132,7 @@
140 usr/share/qemu/openbios-sparc32
141 usr/share/qemu/palcode-clipper"
142
143 -QA_WX_LOAD="${QA_PRESTRIPPED}
144 - usr/bin/qemu-i386
145 +QA_WX_LOAD="usr/bin/qemu-i386
146 usr/bin/qemu-x86_64
147 usr/bin/qemu-alpha
148 usr/bin/qemu-arm
149 @@ -141,6 +155,16 @@
150 usr/bin/qemu-s390x
151 usr/bin/qemu-unicore32"
152
153 +qemu_support_kvm() {
154 + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
155 + use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
156 + use qemu_softmmu_targets_s390x; then
157 + return 0
158 + fi
159 +
160 + return 1
161 +}
162 +
163 pkg_pretend() {
164 if use kernel_linux && kernel_is lt 2 6 25; then
165 eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
166 @@ -174,21 +198,12 @@
167 check_extra_config
168 fi
169 fi
170 -
171 - if use static; then
172 - ewarn "USE=static is very much a moving target because of the packages"
173 - ewarn "we depend on will have their static libs ripped out or wrapped"
174 - ewarn "with USE=static-libs or USE=static due to continued dicsussion"
175 - ewarn "on the mailing list about USE=static's place in Gentoo. As a"
176 - ewarn "result what worked today may not work tomorrow."
177 - fi
178 }
179
180 pkg_setup() {
181 - python_set_active_version 2
182 - python_pkg_setup
183 -
184 enewgroup kvm 78
185 +
186 + python_export_best
187 }
188
189 src_prepare() {
190 @@ -196,10 +211,7 @@
191 sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
192 Makefile Makefile.target || die
193
194 - python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
195 - python_convert_shebangs -r 2 "${S}/scripts/kvm/vmxcap"
196 -
197 - epatch "${FILESDIR}"/${P}-cflags.patch
198 + epatch "${FILESDIR}"/qemu-9999-cflags.patch
199 [[ -n ${BACKPORTS} ]] && \
200 EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
201 epatch
202 @@ -213,95 +225,112 @@
203 epatch_user
204 }
205
206 -src_configure() {
207 +##
208 +# configures qemu based on the build directory and the build type
209 +# we are using.
210 +#
211 +qemu_src_configure() {
212 + debug-print-function $FUNCNAME "$@"
213 +
214 + local buildtype=$1
215 + local builddir=$2
216 local conf_opts audio_opts
217 + local static_flag="static-${buildtype}"
218
219 - for target in ${IUSE_SOFTMMU_TARGETS} ; do
220 - use "qemu_softmmu_targets_${target}" && \
221 - softmmu_targets="${softmmu_targets} ${target}-softmmu"
222 - done
223 + conf_opts="--prefix=/usr"
224 + conf_opts+=" --sysconfdir=/etc"
225 + conf_opts+=" --libdir=/usr/$(get_libdir)"
226 + conf_opts+=" --docdir=/usr/share/doc/${PF}/html"
227 + conf_opts+=" --disable-bsd-user"
228 + conf_opts+=" --disable-guest-agent"
229 + conf_opts+=" --disable-strip"
230 + conf_opts+=" --disable-werror"
231 + conf_opts+=" --python=${PYTHON}"
232
233 - for target in ${IUSE_USER_TARGETS} ; do
234 - use "qemu_user_targets_${target}" && \
235 - user_targets="${user_targets} ${target}-linux-user"
236 - done
237 + # audio options
238 + audio_opts="oss"
239 + use alsa && audio_opts="alsa,${audio_opts}"
240 + use sdl && audio_opts="sdl,${audio_opts}"
241 + use pulseaudio && audio_opts="pa,${audio_opts}"
242
243 - einfo "Building the following softmmu targets: ${softmmu_targets}"
244 + if [[ ${buildtype} == "user" ]]; then
245 + conf_opts+=" --enable-linux-user"
246 + conf_opts+=" --disable-system"
247 + conf_opts+=" --target-list=${user_targets}"
248 + conf_opts+=" --disable-blobs"
249 + conf_opts+=" --disable-bluez"
250 + conf_opts+=" --disable-curses"
251 + conf_opts+=" --disable-kvm"
252 + conf_opts+=" --disable-libiscsi"
253 + conf_opts+=" $(use_enable seccomp)"
254 + conf_opts+=" --disable-sdl"
255 + conf_opts+=" --disable-smartcard-nss"
256 + conf_opts+=" --disable-tools"
257 + conf_opts+=" --disable-vde"
258 + fi
259
260 - if [[ -n ${user_targets} ]]; then
261 - einfo "Building the following user targets: ${user_targets}"
262 - conf_opts="${conf_opts} --enable-linux-user"
263 - else
264 - conf_opts="${conf_opts} --disable-linux-user"
265 + if [[ ${buildtype} == "softmmu" ]]; then
266 + conf_opts+=" --disable-linux-user"
267 + conf_opts+=" --enable-system"
268 + conf_opts+=" --with-system-pixman"
269 + conf_opts+=" --target-list=${softmmu_targets}"
270 + conf_opts+=" $(use_enable bluetooth bluez)"
271 + conf_opts+=" $(use_enable sdl)"
272 + conf_opts+=" $(use_enable aio linux-aio)"
273 + conf_opts+=" $(use_enable brltty brlapi)"
274 + conf_opts+=" $(use_enable caps cap-ng)"
275 + conf_opts+=" $(use_enable curl)"
276 + conf_opts+=" $(use_enable fdt)"
277 + conf_opts+=" $(use_enable iscsi libiscsi)"
278 + conf_opts+=" $(use_enable jpeg vnc-jpeg)"
279 + conf_opts+=" $(use_enable kernel_linux kvm)"
280 + conf_opts+=" $(use_enable kernel_linux nptl)"
281 + conf_opts+=" $(use_enable ncurses curses)"
282 + conf_opts+=" $(use_enable opengl)"
283 + conf_opts+=" $(use_enable png vnc-png)"
284 + conf_opts+=" $(use_enable rbd)"
285 + conf_opts+=" $(use_enable sasl vnc-sasl)"
286 + conf_opts+=" $(use_enable seccomp)"
287 + conf_opts+=" $(use_enable smartcard smartcard-nss)"
288 + conf_opts+=" $(use_enable spice)"
289 + conf_opts+=" $(use_enable tls vnc-tls)"
290 + conf_opts+=" $(use_enable tls vnc-ws)"
291 + conf_opts+=" $(use_enable usbredir usb-redir)"
292 + conf_opts+=" $(use_enable uuid)"
293 + conf_opts+=" $(use_enable vde)"
294 + conf_opts+=" $(use_enable vhost-net)"
295 + conf_opts+=" $(use_enable virtfs)"
296 + conf_opts+=" $(use_enable vnc)"
297 + conf_opts+=" $(use_enable xattr attr)"
298 + conf_opts+=" $(use_enable xen)"
299 + conf_opts+=" $(use_enable xen xen-pci-passthrough)"
300 + conf_opts+=" $(use_enable xfs xfsctl)"
301 + use mixemu && conf_opts+=" --enable-mixemu"
302 + conf_opts+=" --audio-drv-list=${audio_opts}"
303 + #conf_opts+=" --enable-migration-from-qemu-kvm"
304 fi
305
306 + conf_opts+=" $(use_enable debug debug-info)"
307 + conf_opts+=" $(use_enable debug debug-tcg)"
308 + conf_opts+=" --enable-docs"
309 + conf_opts+=" $(use_enable tci tcg-interpreter)"
310 +
311 # Add support for SystemTAP
312 use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
313
314 - # Fix QA issues. QEMU needs executable heaps and we need to mark it as such
315 - #conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
316 -
317 # Add support for static builds
318 - use static && conf_opts="${conf_opts} --static --disable-pie"
319 + use ${static_flag} && conf_opts="${conf_opts} --static --disable-pie"
320
321 # We always want to attempt to build with PIE support as it results
322 # in a more secure binary. But it doesn't work with static or if
323 # the current GCC doesn't have PIE support.
324 - if ! use static && gcc-specs-pie; then
325 + if ! use ${static_flag} && gcc-specs-pie; then
326 conf_opts="${conf_opts} --enable-pie"
327 fi
328
329 - # audio options
330 - audio_opts="oss"
331 - use alsa && audio_opts="alsa,${audio_opts}"
332 - use sdl && audio_opts="sdl,${audio_opts}"
333 - use pulseaudio && audio_opts="pa,${audio_opts}"
334 - use mixemu && conf_opts="${conf_opts} --enable-mixemu"
335 -
336 - ./configure --prefix=/usr \
337 - --sysconfdir=/etc \
338 - --docdir=/usr/share/doc/${PF}/html \
339 - --disable-bsd-user \
340 - --disable-guest-agent \
341 - --disable-libiscsi \
342 - --disable-strip \
343 - --disable-werror \
344 - --python=python2 \
345 - $(use_enable aio linux-aio) \
346 - $(use_enable bluetooth bluez) \
347 - $(use_enable brltty brlapi) \
348 - $(use_enable caps cap-ng) \
349 - $(use_enable curl) \
350 - $(use_enable debug debug-info) \
351 - $(use_enable debug debug-tcg) \
352 - $(use_enable doc docs) \
353 - $(use_enable fdt) \
354 - $(use_enable jpeg vnc-jpeg) \
355 - $(use_enable kernel_linux kvm) \
356 - $(use_enable kernel_linux nptl) \
357 - $(use_enable ncurses curses) \
358 - $(use_enable opengl glx) \
359 - $(use_enable png vnc-png) \
360 - $(use_enable rbd) \
361 - $(use_enable sasl vnc-sasl) \
362 - $(use_enable sdl) \
363 - $(use_enable seccomp) \
364 - $(use_enable smartcard smartcard-nss) \
365 - $(use_enable spice) \
366 - $(use_enable tci tcg-interpreter) \
367 - $(use_enable tls vnc-tls) \
368 - $(use_enable usbredir usb-redir) \
369 - $(use_enable uuid) \
370 - $(use_enable vde) \
371 - $(use_enable vhost-net) \
372 - $(use_enable virtfs) \
373 - $(use_enable vnc) \
374 - $(use_enable xattr attr) \
375 - $(use_enable xen) \
376 - $(use_enable xen xen-pci-passthrough) \
377 - $(use_enable xfs xfsctl) \
378 - --audio-drv-list=${audio_opts} \
379 - --target-list="${softmmu_targets} ${user_targets}" \
380 + einfo "./configure ${conf_opts}"
381 + cd ${builddir}
382 + ../configure \
383 --cc="$(tc-getCC)" \
384 --host-cc="$(tc-getBUILD_CC)" \
385 ${conf_opts} \
386 @@ -313,37 +342,111 @@
387 sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
388 }
389
390 +src_configure() {
391 + softmmu_targets=
392 + user_targets=
393 +
394 + for target in ${IUSE_SOFTMMU_TARGETS} ; do
395 + use "qemu_softmmu_targets_${target}" && \
396 + softmmu_targets="${softmmu_targets},${target}-softmmu"
397 + done
398 +
399 + for target in ${IUSE_USER_TARGETS} ; do
400 + use "qemu_user_targets_${target}" && \
401 + user_targets="${user_targets},${target}-linux-user"
402 + done
403 +
404 + [[ -n ${softmmu_targets} ]] && \
405 + einfo "Building the following softmmu targets: ${softmmu_targets}"
406 +
407 + [[ -n ${user_targets} ]] && \
408 + einfo "Building the following user targets: ${user_targets}"
409 +
410 + if [[ -n ${softmmu_targets} ]]; then
411 + mkdir "${S}/softmmu-build"
412 + qemu_src_configure "softmmu" "${S}/softmmu-build"
413 + fi
414 +
415 + if [[ -n ${user_targets} ]]; then
416 + mkdir "${S}/user-build"
417 + qemu_src_configure "user" "${S}/user-build"
418 + fi
419 +}
420 +
421 +src_compile() {
422 + if [[ -n ${user_targets} ]]; then
423 + cd "${S}/user-build"
424 + default
425 + fi
426 +
427 + if [[ -n ${softmmu_targets} ]]; then
428 + cd "${S}/softmmu-build"
429 + default
430 + fi
431 +}
432 +
433 +src_test() {
434 + cd "${S}/softmmu-build"
435 + emake -j1 check
436 + emake -j1 check-report.html
437 +}
438 +
439 +qemu_python_install() {
440 + python_domodule "${S}/QMP/qmp.py"
441 +
442 + python_doscript "${S}/scripts/kvm/kvm_stat"
443 + python_doscript "${S}/scripts/kvm/vmxcap"
444 + python_doscript "${S}/QMP/qmp-shell"
445 + python_doscript "${S}/QMP/qemu-ga-client"
446 +}
447 +
448 src_install() {
449 - emake DESTDIR="${ED}" install
450 + if [[ -n ${user_targets} ]]; then
451 + cd "${S}/user-build"
452 + emake DESTDIR="${ED}" install
453 +
454 + # Install binfmt handler init script for user targets
455 + newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
456 + fi
457
458 if [[ -n ${softmmu_targets} ]]; then
459 + cd "${S}/softmmu-build"
460 + emake DESTDIR="${ED}" install
461 +
462 + if use test; then
463 + dohtml check-report.html
464 + fi
465 +
466 if use kernel_linux; then
467 udev_dorules "${FILESDIR}"/65-kvm.rules
468 fi
469
470 if use qemu_softmmu_targets_x86_64 ; then
471 - dosym /usr/bin/qemu-system-x86_64 /usr/bin/qemu-kvm
472 + newbin "${FILESDIR}/qemu-kvm-1.4" qemu-kvm
473 ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed"
474 ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
475 ewarn "your libvirt configs or other wrappers for ${PN}"
476 elif use x86 || use amd64; then
477 elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
478 - elog "of the /usr/bin/qemu-kvm symlink."
479 + elog "of the /usr/bin/qemu-kvm script."
480 fi
481 - fi
482
483 - dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
484 - newdoc pc-bios/README README.pc-bios
485 + if use python; then
486 + python_foreach_impl qemu_python_install
487 + fi
488 + fi
489
490 - use python && dobin scripts/kvm/kvm_stat
491 - use python && dobin scripts/kvm/vmxcap
492 + # Install config file example for qemu-bridge-helper
493 + insinto "/etc/qemu"
494 + doins "${FILESDIR}/bridge.conf"
495
496 - # Avoid collision with app-emulation/libcacard
497 - use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient"
498 + # Remove the docdir placed qmp-commands.txt
499 + mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/QMP/"
500
501 - # Install binfmt handler init script for user targets
502 - [[ -n ${user_targets} ]] && \
503 - newinitd "${FILESDIR}/qemu-binfmt.initd" qemu-binfmt
504 + cd "${S}"
505 + dodoc Changelog MAINTAINERS TODO docs/specs/pci-ids.txt
506 + newdoc pc-bios/README README.pc-bios
507 + dodoc QMP/qmp-commands.txt QMP/qmp-events.txt QMP/qmp-spec.txt
508
509 # Remove SeaBIOS since we're using the SeaBIOS packaged one
510 rm "${ED}/usr/share/qemu/bios.bin"
511 @@ -384,9 +487,9 @@
512 }
513
514 pkg_postinst() {
515 - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
516 - use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
517 - use qemu_softmmu_targets_s390x; then
518 + local virtfs_caps=
519 +
520 + if qemu_support_kvm; then
521 elog "If you don't have kvm compiled into the kernel, make sure you have"
522 elog "the kernel module loaded before running kvm. The easiest way to"
523 elog "ensure that the kernel module is loaded is to load it on boot."
524 @@ -399,6 +502,25 @@
525 elog
526 fi
527
528 + virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,"
529 + virtfs_caps+="cap_setgid,cap_mknod,cap_setuid"
530 +
531 + fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
532 + use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
533 +
534 elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
535 elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
536 }
537 +
538 +pkg_info() {
539 + echo "Using:"
540 + echo " $(best_version app-emulation/spice-protocol)"
541 + echo " $(best_version sys-firmware/ipxe)"
542 + echo " $(best_version sys-firmware/seabios)"
543 + if has_version sys-firmware/seabios[binary]; then
544 + echo " USE=binary"
545 + else
546 + echo " USE=''"
547 + fi
548 + echo " $(best_version sys-firmware/vgabios)"
549 +}
550
551
552
553 1.213 app-emulation/qemu/ChangeLog
554
555 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.213&view=markup
556 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.213&content-type=text/plain
557 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.212&r2=1.213
558
559 Index: ChangeLog
560 ===================================================================
561 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
562 retrieving revision 1.212
563 retrieving revision 1.213
564 diff -u -r1.212 -r1.213
565 --- ChangeLog 30 May 2013 15:06:39 -0000 1.212
566 +++ ChangeLog 30 May 2013 15:56:30 -0000 1.213
567 @@ -1,6 +1,9 @@
568 # ChangeLog for app-emulation/qemu
569 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
570 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.212 2013/05/30 15:06:39 cardoe Exp $
571 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.213 2013/05/30 15:56:30 cardoe Exp $
572 +
573 + 30 May 2013; Doug Goldstein <cardoe@g.o> qemu-9999.ebuild:
574 + Updates to the live ebuild
575
576 30 May 2013; Doug Goldstein <cardoe@g.o> qemu-1.4.2.ebuild:
577 Add a missing PYTHON_REQUIRED_USE for the conversion to python-r1 eclass.