Fix qemu dep to resolve package blocking issue between qemu and qemu-kvm when both qemu and kvm USE flags are enabled #294179

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 23 insertions, 18 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index dc693dd62aaf..270292cd5a74 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.43 2009/12/15 16:38:59 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.44 2009/12/23 06:01:52 ramereth Exp $
+
+  23 Dec 2009; Lance Albertson <ramereth@gentoo.org> libvirt-0.7.2.ebuild,
+  libvirt-0.7.4.ebuild, libvirt-0.7.4-r1.ebuild, libvirt-0.7.4-r2.ebuild:
+  Fix qemu dep to resolve package blocking issue between qemu and qemu-kvm when
+  both qemu and kvm USE flags are enabled #294179
 
   15 Dec 2009; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   change to virtualization herd
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 22080513bba6..f7576de1dd28 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -16,16 +16,16 @@ AUX libvirtd.init 2045 RMD160 b544578c242c6f84e2cf07682a06ce261bf40b8a SHA1 8197
 DIST libvirt-0.7.2.tar.gz 8689842 RMD160 2464e94d6b22508be44ae57033312b37214bf835 SHA1 db7bbf23152ab8cd5890cf6ff942f715d96621ce SHA256 75841838dfb83772192a55ad459695824274190a98e4e24b6e80cbb3063977f6
 DIST libvirt-0.7.4-backports-1.tar.bz2 4859 RMD160 72aae4d105e48ad9de95b358a1ba2ef071a8ba0b SHA1 7546c3b84664206375854be36ebfb8759df7e39f SHA256 3e58c5d22fe40c8a26f677ca0c5d67db34dc05e813e024b59bc1ebb3b11138ed
 DIST libvirt-0.7.4.tar.gz 8880507 RMD160 16a6718bf5d71935d4e47524a29671ff03db9ff8 SHA1 0677a9bf365cbf6a5c1b8559e040b4ea4b5b1e59 SHA256 91e3af2f660baa96a3014b2fd3942784df34bafac38b918b6eb325c9e9771316
-EBUILD libvirt-0.7.2.ebuild 4495 RMD160 dcad24bd3a7e07c70b070813ff3d4cf7262edc64 SHA1 223135be2c3567b7fe1c58d727baa118a1b286e9 SHA256 f045ba5e907b7ea3b1a83dacdfadb35daf3ea151c42670af442975d77b581978
-EBUILD libvirt-0.7.4-r1.ebuild 4990 RMD160 f7f28c9ef9e489d15c9c8f6d3f63ec08d505e104 SHA1 8646b43b18329b37b6d16d28db6d360514e4bef3 SHA256 ba8242ed11b455f28cd5ba7e02999779d058b69b90fce3d6543d4f8c105f3b37
-EBUILD libvirt-0.7.4-r2.ebuild 5134 RMD160 8c54d01392d95773ae1a5804e26f52344e801d42 SHA1 1f1bcf63e3d03722aa8361a74737791e9db107cc SHA256 fde9d2e25f08a2ec82660cba8553499a51e8d89e5a9408cfce4e8589c7d9fde1
-EBUILD libvirt-0.7.4.ebuild 4696 RMD160 8b7e62d29813ead347e4688805758c9b932e19ba SHA1 e25294293f2641ec9a9e26d88686029ff89a45a6 SHA256 900f752aff82290c28dc19854adced011a1f9cdd29902ede4dbf3aaf597517f2
-MISC ChangeLog 9991 RMD160 12e82234f5358fd14963f19bde2b54523cddab00 SHA1 e019b83aff0fa74663c125a1810614cc0898313e SHA256 13711fdb35635e248682bd636135d3fbf517c5c6ee019cdfc3425c9185165573
+EBUILD libvirt-0.7.2.ebuild 4504 RMD160 7636d56f2c3673e99f668208cf70c0206311b6eb SHA1 ca51cd49aa2d0ad8d45a58ccd5e81c458e2e2171 SHA256 5481e4e93230a10bfa2158205d5d011379c5709b4d88b5ea66473b8dc4d9623e
+EBUILD libvirt-0.7.4-r1.ebuild 4996 RMD160 3f88e749e996be7d80e9c25d89474b77db285022 SHA1 8d1e0c5f79e5b7f2f9c00ef794c81da3517df8bb SHA256 19f5c5223933e358da42c39d67f20cab40a8fea7a2ae4172ca3bda03d4656a30
+EBUILD libvirt-0.7.4-r2.ebuild 5140 RMD160 830466ccb33ad5360adbf624b56906c749f331b4 SHA1 b734cf7d5a66e83af43a31a96a4f67a9d1c949c6 SHA256 02e4a093ea73ede46ecd7fdfd3f0d0fd46e23db17396d78ab1bbb90ed6e94a8e
+EBUILD libvirt-0.7.4.ebuild 4705 RMD160 9c5b85c91feeb5a3339fd34c2c69ccde0b8be1b7 SHA1 08db144f04f615c5873a0ace1aef2f7cad1aae5e SHA256 d808e75202d6b3f8b3fa0917ee0d0afd0c2464564b28e79c9e3e54d6335ad008
+MISC ChangeLog 10273 RMD160 788db747d3280a6c599de4bd81fcfcb7c90c5cfb SHA1 0c0311c921bda9a66dbc2683c12090fa431f3d37 SHA256 6c1a88888c54d9880ab71410269f16e4815e6aafdfc1f697e6b2224b4942fe7d
 MISC metadata.xml 1885 RMD160 3219449de973fe0a7a29178acfe0d5a5ebc83f8a SHA1 b5ff53b7f09130299132dd5e5b40cecd0a154130 SHA256 897053276a627e23d61e899b109bdfca3c606ff8a3c5e2afd184b0a7d5f48466
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAksnu6gACgkQoeSe8B0zEfyeGACbBMsptRDkrhnkaPobmqRaV4UR
-SMMAniH9u+vRPAJbEMeMf5Z+SSnwmuPt
-=SsMk
+iD8DBQFLMiLYQW+hXSf0t0IRAtY1AKDN5ynwGpWkXRtMFqjh9HsX4EW2tQCeNuHG
+T3vrRrlPniGOvmQWJm8T9u4=
+=u/mp
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-0.7.2.ebuild b/app-emulation/libvirt/libvirt-0.7.2.ebuild
index f17a926ac5e5..51990e224969 100644
--- a/app-emulation/libvirt/libvirt-0.7.2.ebuild
+++ b/app-emulation/libvirt/libvirt-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.7.2.ebuild,v 1.5 2009/11/23 00:15:25 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.7.2.ebuild,v 1.6 2009/12/23 06:01:52 ramereth Exp $
 
 EAPI="2"
 
@@ -40,7 +40,7 @@ RDEPEND="sys-libs/readline
 	parted? ( >=sys-apps/parted-1.8 )
 	phyp? ( net-libs/libssh2 )
 	policykit? ( >=sys-auth/policykit-0.6 )
-	qemu? ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 )
+	qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	selinux? ( sys-libs/libselinux )
 	virtualbox? ( || ( >=app-emulation/virtualbox-ose-2.2.0 >=app-emulation/virtualbox-bin-2.2.0 ) )
diff --git a/app-emulation/libvirt/libvirt-0.7.4-r1.ebuild b/app-emulation/libvirt/libvirt-0.7.4-r1.ebuild
index ec9081dd2999..d747b7273d3e 100644
--- a/app-emulation/libvirt/libvirt-0.7.4-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-0.7.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.7.4-r1.ebuild,v 1.1 2009/12/08 14:25:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.7.4-r1.ebuild,v 1.2 2009/12/23 06:01:52 ramereth Exp $
 
 EAPI="2"
 
@@ -38,7 +38,7 @@ RDEPEND="sys-libs/readline
 	parted? ( >=sys-apps/parted-1.8 )
 	phyp? ( net-libs/libssh2 )
 	policykit? ( >=sys-auth/policykit-0.6 )
-	qemu? ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 )
+	qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	selinux? ( sys-libs/libselinux )
 	virtualbox? ( || ( >=app-emulation/virtualbox-ose-2.2.0 >=app-emulation/virtualbox-bin-2.2.0 ) )
diff --git a/app-emulation/libvirt/libvirt-0.7.4-r2.ebuild b/app-emulation/libvirt/libvirt-0.7.4-r2.ebuild
index 69e8ee90b49f..61ea50f9854a 100644
--- a/app-emulation/libvirt/libvirt-0.7.4-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-0.7.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.7.4-r2.ebuild,v 1.1 2009/12/11 12:33:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.7.4-r2.ebuild,v 1.2 2009/12/23 06:01:52 ramereth Exp $
 
 BACKPORTS=1
 
@@ -41,7 +41,7 @@ RDEPEND="sys-libs/readline
 	parted? ( >=sys-apps/parted-1.8 )
 	phyp? ( net-libs/libssh2 )
 	policykit? ( >=sys-auth/policykit-0.6 )
-	qemu? ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 )
+	qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	selinux? ( sys-libs/libselinux )
 	virtualbox? ( || ( >=app-emulation/virtualbox-ose-2.2.0 >=app-emulation/virtualbox-bin-2.2.0 ) )
diff --git a/app-emulation/libvirt/libvirt-0.7.4.ebuild b/app-emulation/libvirt/libvirt-0.7.4.ebuild
index c9b0f45ae574..75ab2d54825a 100644
--- a/app-emulation/libvirt/libvirt-0.7.4.ebuild
+++ b/app-emulation/libvirt/libvirt-0.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.7.4.ebuild,v 1.1 2009/11/23 01:52:33 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.7.4.ebuild,v 1.2 2009/12/23 06:01:52 ramereth Exp $
 
 EAPI="2"
 
@@ -39,7 +39,7 @@ RDEPEND="sys-libs/readline
 	parted? ( >=sys-apps/parted-1.8 )
 	phyp? ( net-libs/libssh2 )
 	policykit? ( >=sys-auth/policykit-0.6 )
-	qemu? ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 )
+	qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) )
 	sasl? ( dev-libs/cyrus-sasl )
 	selinux? ( sys-libs/libselinux )
 	virtualbox? ( || ( >=app-emulation/virtualbox-ose-2.2.0 >=app-emulation/virtualbox-bin-2.2.0 ) )