Avoid automagic dependency over nss for the new smartcard feature; see bug #379149.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 85be48a07cff294e882db958af283d2acc59d000..417f8e8a67539f18a720919a74eac077097c3d80 100644 (file)
--- 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/Manifest b/app-emulation/qemu-kvm/Manifest
index e8ea1a10484a2efc208cc05da12d3afdbf0cc01b..8e1e0b9dd947e148b3b381346d83a872f4c014bb 100644 (file)
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qemu-0.11.0-mips64-user-fix.patch 313 RMD160 db016e0a48990a435dd6cf6e807145b33ada4908 SHA1 2ea913b1bcd29734a6d4011794bdb4aa3599a184 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f
 AUX qemu-kvm 61 RMD160 83882e881a067065258f562ad1e60440666c85d3 SHA1 a965f19031e303d583bd541c9d8fff2214262e6b SHA256 211d51f0a7d3d2ba8c53016c75e2b483feadbb65e383b1eec81d9cebf6a22c29
 AUX qemu-kvm-0.12.3-fix-crash-with-sdl.patch 4003 RMD160 1e8965e94537e24d0903a7a096c91e35f7013118 SHA1 a6a36da9613d90d45148aa133392bd342b83d1cd SHA256 aeca9f133c021726c0e3ce2a58843ee12d592669143d0b75e46b8e301b5cf102
@@ -9,7 +12,14 @@ DIST qemu-kvm-0.14.1.tar.gz 5321321 RMD160 e3d69b4756bb0e45d14baad72d85827d949e0
 DIST qemu-kvm-0.15.0.tar.gz 5916130 RMD160 71e32e95368b84e9441a9a1d051b03ed9b04d3ed SHA1 b009c05461fed20f3f3c3a03b153c457e33683d4 SHA256 828e771bffa540b0fbfe6fa5250adc92d5416720134d1f55a45c7926d83a4478
 EBUILD qemu-kvm-0.13.0-r2.ebuild 7933 RMD160 92674548b241a1e698820ab892e145ea9cf10c11 SHA1 d2ab36fb81a4d63a1726ffec53eb83f35a986e0b SHA256 794d92dbcbef069f140051091a17853ddabe11baa1b55bc76bfc7319e7ece635
 EBUILD qemu-kvm-0.14.1-r2.ebuild 9073 RMD160 4791ae5e962aec333845734e0dd61bf9c0155e32 SHA1 db12166eef29c1720499639bdde5a06a75cb6d44 SHA256 6efc717a015b12a6fb8bda70b4e382e730cfb96752870785549095184b5570a3
-EBUILD qemu-kvm-0.15.0.ebuild 9111 RMD160 727bfae5c25aa750bc508533174816e45a40e4d7 SHA1 1ac3f7f25db437582bd33fbd689baac771d3dd0f SHA256 94b496da66d48ded58cc8f001fa90d6ea7344a3bebd26005ac4ede0d7cb28b55
-EBUILD qemu-kvm-9999.ebuild 9110 RMD160 5151dac8f14c0596c0277acaa563f9dc60973b86 SHA1 6bf8f6a43beb09f9a0824dd3fae48b774ef364f7 SHA256 931c8f6bd9722a5a7cf0b4ce2b057c2c3012069e0705a4908498f44caea3455a
-MISC ChangeLog 14095 RMD160 864785365597f906972c8d6af846b475fb55b9ca SHA1 a1247a185018361a9b439ffa519598418f0a9f0f SHA256 812653e9bf9d3fac6529ee7e939926cb1751c286b0672bb7220d6d11f7655411
-MISC metadata.xml 1492 RMD160 aca7aa5f18297340d955e4f015c521d2fa82ac31 SHA1 2b141c7a4a4dba5eb734dc48537d6b8356320410 SHA256 7a450ebff5eec77efb6b8a209ca44c4e648c37932914ae243b869ef7dbb17c9e
+EBUILD qemu-kvm-0.15.0.ebuild 9199 RMD160 b18c4fc3d1711c6f972dabff14316f7d4706fa12 SHA1 f6a0fe18978f140d95e32d11e9c143ef085f5a50 SHA256 3c83818286c0c4eb5f179751380df19d186543b08edb1ed6dcb50bb367f33982
+EBUILD qemu-kvm-9999.ebuild 9198 RMD160 b4949e471ef4f7c3b397de4d05b2ec9bcc7a987b SHA1 2f5586eb0fa3bc40fea447507d5158f09c932e51 SHA256 ff41959092a9784ae241c5d125a96b3ded1e97e5b726f146ba5adfb69b168d6a
+MISC ChangeLog 14305 RMD160 62a49107402b025b0da899fa05338e031bb3c3d0 SHA1 19a35ab5f073bdd5f37e3c278a18c28bf1b24dc5 SHA256 123f2d86223bd8162e57fe3d6a2fa3b6a1d49abccaf250bee95a19d1bdcb055d
+MISC metadata.xml 1611 RMD160 8bc6cdfa2cd516d70d5be2adb8275a5b2569a7b6 SHA1 beb7592327820e34e76492c7ff1fd1abcab9d5a8 SHA256 630949fce89466e90376744ad5b4fd92155a6da6a008d2de8397a2953db2137f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk5HwXsACgkQAiZjviIA2Xh25gCeOKjF1t4XumLwbcClDk9AwMFs
+VysAoMYwtaD+Fr6/GXzJMxVjmBCLyzWT
+=Wpoe
+-----END PGP SIGNATURE-----

diff --git a/app-emulation/qemu-kvm/metadata.xml b/app-emulation/qemu-kvm/metadata.xml
index 200e7b4cf816d38a43eea84d7a1b1774f8b0f2b5..4b8cefa76a5a6d8dcd2dc747a23509d55f449a03 100644 (file)
--- 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 b62128c7b266efabdb671a5e3925020e80f8005f..18da5fe5ac3a3b4d0a4fef65a9cd913f4c78d601 100644 (file)
--- 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 becb3642a4f44e5f96b2e7837ebeac1e4043a28d..435706cfa69178f9744b043c6f76e8fc0c1d2b6d 100644 (file)
--- 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)"