Fix REQUIRED_USE logic, and ensure drivers are only brought in with the daemon.

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

4 files changed, 27 insertions, 8 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index b984edd20bec..f87df37ec839 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.151 2012/02/10 03:59:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.152 2012/02/10 19:13:10 flameeyes Exp $
+
+  10 Feb 2012; Diego E. Pettenò <flameeyes@gentoo.org> libvirt-0.9.8.ebuild,
+  libvirt-9999.ebuild:
+  Fix REQUIRED_USE logic, and ensure drivers are only brought in with the
+  daemon.
 
   10 Feb 2012; Patrick Lauer <patrick@gentoo.org> libvirt-0.9.6.ebuild,
   libvirt-0.9.8.ebuild, libvirt-9999.ebuild:
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 5034f7f77ba9..b91252413501 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libvirtd.confd-r2 1749 RMD160 30c662b9a14a3dc635674d0aee6452076da60102 SHA1 ae7a2b801ca0f9f610c015eb0fe06640596ac614 SHA256 93040599a7cb878b54b8b963ef4963e9450bc25e982e390cef3e5b7e8039757c
 AUX libvirtd.init-r5 3572 RMD160 2899a3bc515856642eb6f0cfe6d0944454271460 SHA1 ea541974fb672621c3d75020bfa8ec4be77066e1 SHA256 6c04449123ebb5d5736e53a81325f66a0db52cc19c7a6c80ba5f599a3687569f
 DIST libvirt-0.9.6.tar.gz 17326676 RMD160 5e0837e8ee770e017e574fd002e9e489e448ca65 SHA1 9fd108e1a351d191c5d7f89458096fb35bd6413e SHA256 ce29b1cd3067b224aa834fec2a93d7613c0e72bc035760ad536a2142430bc02b
 DIST libvirt-0.9.8.tar.gz 18403525 RMD160 51bfb25dbd11a7cb5529c692d843f8ac2b1c9101 SHA1 09df699513af63b73444d776c2d02945dc9cee43 SHA256 31b20864e44bb18a2d01b7ac6569f114cbe1007689219bf24a07ddb7528abe0e
 EBUILD libvirt-0.9.6.ebuild 7907 RMD160 bf6ee27bc31c83544d172c639b05b59b3279c7dd SHA1 8ab9af963271485e43a656c2286cc431a3a15d09 SHA256 79b46ae24402a19f334fb6bdc02fab634f43c254dff0331c40aecc5b888ca04b
-EBUILD libvirt-0.9.8.ebuild 7984 RMD160 3472eba4d365151224ad1d9dc9a550c1b9fdfe46 SHA1 3f6809a2047fab97cfcd4eb83739c5b0b280cbf7 SHA256 e623589832f0f382c972ede0db15ef93958b57fae22249b111c0a757a18752cf
-EBUILD libvirt-9999.ebuild 7964 RMD160 2ffcf37c3943dcaaaf5422005937f25feb07a25e SHA1 e7f5baab0f7a2ad714ff7d72dfcad7b4df5ae1b7 SHA256 f00edf28de0cbbf360896507649d8f45ae48e927e802ae0177dcdf3b5548b843
-MISC ChangeLog 31026 RMD160 fabe048fc1d330f3888e4f8c24eb4db4d6e0ffa4 SHA1 9eb6b63ca9543672c5e4bfe92b3dfdc3ab37612d SHA256 c1748702ead847b139bfe15169625aa7e66951e7f2d9102e00d988ad4c682dc9
+EBUILD libvirt-0.9.8.ebuild 8121 RMD160 09e7a3becd8f16dcd5d56adc71a8fa4bf7758801 SHA1 752fd3182726f26d92693a0800e67b7391b4bdc9 SHA256 27cbdbbb823d19d23b687c457d986d29bd1cf78bf1d59bbf14130f71b8f5b05c
+EBUILD libvirt-9999.ebuild 8101 RMD160 0f501547e8a27b1a0a2fe504c6892efa55c365ff SHA1 8d3b5f6b1ee009c53b3d8399a2320618fad74ac1 SHA256 64737ede81f21c599452540eaddb911c463f53dbf4c31726ce5773609000982f
+MISC ChangeLog 31214 RMD160 1cdfcfcbd249ed6244d1f7dc41b0bbff74b80392 SHA1 f7b22588565724e251fea3d5656c9f4654454466 SHA256 a2e8b7a9789a445450ad10d9dc4c7b62eb2f1ee56d6bd7b91bd37429144b2f50
 MISC metadata.xml 3132 RMD160 066870c02fd835f9a633b69328367737d4cc0b71 SHA1 940cc910ef4d1a75947afef95d73a3026bb91527 SHA256 e0eb882799f41f51c9930a1142cf5427061bdacf629a028ac4e8b65c1cf67ea4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk81bCwACgkQAiZjviIA2XhuOgCdGFhDk9gypeJVoIu/4nhonLkN
+0ygAoM5UJ0P7ny9umCiOJIxd798SBV26
+=BMwv
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-0.9.8.ebuild b/app-emulation/libvirt/libvirt-0.9.8.ebuild
index c00adeafd8fe..42c7619acb8d 100644
--- a/app-emulation/libvirt/libvirt-0.9.8.ebuild
+++ b/app-emulation/libvirt/libvirt-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.8.ebuild,v 1.4 2012/02/10 03:59:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.8.ebuild,v 1.5 2012/02/10 19:13:10 flameeyes Exp $
 
 #BACKPORTS=2
 #AUTOTOOLIZE=yes
@@ -42,7 +42,9 @@ IUSE="avahi caps debug iscsi +json +libvirtd lvm +lxc macvtap nfs \
 	nls numa openvz parted pcap phyp policykit python qemu sasl selinux +udev \
 	uml virtualbox virt-network xen elibc_glibc"
 # IUSE=one : bug #293416 & bug #299011
-REQUIRED_USE="|| ( lxc openvz qemu uml virtualbox xen )"
+REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	lxc? ( libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd )
+	virtualbox? ( libvirtd ) xen? ( libvirtd )"
 
 # gettext.sh command is used by the libvirt command wrappers, and it's
 # non-optional, so put it into RDEPEND.
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 77c1b10683da..5c7f94b8a8d1 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.16 2012/02/10 03:59:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.17 2012/02/10 19:13:10 flameeyes Exp $
 
 #BACKPORTS=2
 #AUTOTOOLIZE=yes
@@ -42,7 +42,9 @@ IUSE="avahi caps debug iscsi +json +libvirtd lvm +lxc macvtap nfs \
 	nls numa openvz parted pcap phyp policykit python qemu sasl selinux +udev \
 	uml virtualbox virt-network xen elibc_glibc"
 # IUSE=one : bug #293416 & bug #299011
-REQUIRED_USE="|| ( lxc openvz qemu uml virtualbox xen )"
+REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	lxc? ( libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd )
+	virtualbox? ( libvirtd ) xen? ( libvirtd )"
 
 # gettext.sh command is used by the libvirt command wrappers, and it's
 # non-optional, so put it into RDEPEND.