diff options
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/qemu-kvm/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/qemu-kvm/metadata.xml | 11 | ||||
| -rw-r--r-- | app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild | 6 | ||||
| -rw-r--r-- | app-emulation/qemu-kvm/qemu-kvm-9999.ebuild | 6 |
4 files changed, 20 insertions, 10 deletions
diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog index 85be48a07cff..417f8e8a6753 100644 --- a/app-emulation/qemu-kvm/ChangeLog +++ b/app-emulation/qemu-kvm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/qemu-kvm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.63 2011/08/12 15:41:01 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.64 2011/08/14 12:37:14 flameeyes Exp $ + + 14 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> qemu-kvm-0.15.0.ebuild, + qemu-kvm-9999.ebuild, metadata.xml: + Avoid automagic dependency over nss for the new smartcard feature; see bug + #379149. 12 Aug 2011; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-0.15.0.ebuild, qemu-kvm-9999.ebuild: diff --git a/app-emulation/qemu-kvm/metadata.xml b/app-emulation/qemu-kvm/metadata.xml index 200e7b4cf816..4b8cefa76a5a 100644 --- a/app-emulation/qemu-kvm/metadata.xml +++ b/app-emulation/qemu-kvm/metadata.xml @@ -10,16 +10,17 @@ <flag name='fdt'>Enables firmware device tree support</flag> <flag name='jpeg'>Enable JPEG compression for the VNC console server</flag> <flag name='ncurses'>Enable the ncurses-based console</flag> + <flag name='nss'>Build support for Smartcard devices emulation using <pkg>dev-libs/nss</pkg></flag> <flag name='png'>Enable PNG compression for the VNC console server</flag> <flag name='pulseaudio'>Enable pulseaudio output for sound emulation</flag> <flag name='qemu-ifup'>Provides the qemu-ifup script for use with QEMU's built in bridging</flag> - <flag name='rbd'>Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag> - <flag name='sdl'>Enable the SDL-based console</flag> - <flag name='spice'>Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag> + <flag name='rbd'>Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag> + <flag name='sdl'>Enable the SDL-based console</flag> + <flag name='spice'>Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag> <flag name='ssl'>Enable TLS support for the VNC console server</flag> - <flag name='vde'>Enable VDE-based networking</flag> - <flag name='vhost-net'>Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag> + <flag name='vde'>Enable VDE-based networking</flag> + <flag name='vhost-net'>Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag> <flag name='xen'>Enables support for Xen backends</flag> </use> </pkgmetadata> diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild index b62128c7b266..18da5fe5ac3a 100644 --- a/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild +++ b/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild,v 1.2 2011/08/12 15:41:01 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild,v 1.3 2011/08/14 12:37:14 flameeyes Exp $ #BACKPORTS=2 @@ -28,7 +28,7 @@ HOMEPAGE="http://www.linux-kvm.org" LICENSE="GPL-2" SLOT="0" # xen is disabled until the deps are fixed -IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses \ +IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss \ png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde \ +vhost-net xen" # static, depends on libsdl being built with USE=static-libs, which can not @@ -75,6 +75,7 @@ RDEPEND=" fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) + nss? ( dev-libs/nss ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) @@ -198,6 +199,7 @@ src_configure() { conf_opts="${conf_opts} $(use_enable hardened user-pie)" conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)" conf_opts="${conf_opts} $(use_enable ncurses curses)" + conf_opts="${conf_opts} $(use_enable nss smartcard-nss)" conf_opts="${conf_opts} $(use_enable png vnc-png)" conf_opts="${conf_opts} $(use_enable rbd)" conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)" diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild index becb3642a4f4..435706cfa691 100644 --- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild +++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.18 2011/08/12 15:41:01 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.19 2011/08/14 12:37:14 flameeyes Exp $ #BACKPORTS=2 @@ -28,7 +28,7 @@ HOMEPAGE="http://www.linux-kvm.org" LICENSE="GPL-2" SLOT="0" # xen is disabled until the deps are fixed -IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses \ +IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss \ png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde \ +vhost-net xen" # static, depends on libsdl being built with USE=static-libs, which can not @@ -75,6 +75,7 @@ RDEPEND=" fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) + nss? ( dev-libs/nss ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) @@ -198,6 +199,7 @@ src_configure() { conf_opts="${conf_opts} $(use_enable hardened user-pie)" conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)" conf_opts="${conf_opts} $(use_enable ncurses curses)" + conf_opts="${conf_opts} $(use_enable nss smartcard-nss)" conf_opts="${conf_opts} $(use_enable png vnc-png)" conf_opts="${conf_opts} $(use_enable rbd)" conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)" |