Disallow parallel installation with qemu-kvm-spice.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 23 insertions, 13 deletions

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 0d9e48ab624c..80e07aea2c16 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.35 2010/08/05 15:56:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.36 2010/08/12 08:49:51 dev-zero Exp $
+
+  12 Aug 2010; Tiziano Müller <dev-zero@gentoo.org>
+  qemu-kvm-0.11.1-r1.ebuild, qemu-kvm-0.12.3-r1.ebuild,
+  qemu-kvm-0.12.4-r1.ebuild, qemu-kvm-0.12.5.ebuild, qemu-kvm-9999.ebuild:
+  Disallow parallel installation with qemu-kvm-spice.
 
   05 Aug 2010; Doug Goldstein <cardoe@gentoo.org> -qemu-kvm-0.11.1.ebuild,
   -qemu-kvm-0.12.3.ebuild, -qemu-kvm-0.12.4.ebuild,
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index fb62d691dc5e..4fb2ff9aa1a8 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -9,10 +9,10 @@ DIST qemu-kvm-0.11.1.tar.gz 4384334 RMD160 0f945f1812b3a42a5642698d2f15bd8f45661
 DIST qemu-kvm-0.12.3.tar.gz 4718791 RMD160 fe88117e6e32188e097a86f95bffc4b74422a5e6 SHA1 235a790056a1b751791e64dd499129b2dbf55be8 SHA256 77cccdc8938b33f3ed74763d01deaad58918c85f04a06afd10f00857b504c2b2
 DIST qemu-kvm-0.12.4.tar.gz 4720232 RMD160 63a18ff3b95de2b4d0dfac130cf850c1cd7caec0 SHA1 955c8dad1f65df0eb5403f40a6c92d93a0a252be SHA256 1489fe5a0def7b857256817a998768bb21662167d10e7c372312c5939e64181e
 DIST qemu-kvm-0.12.5.tar.gz 4722351 RMD160 dc2686e70384a40601589cac2f2665254240710a SHA1 c316ac8a1b040e28275bf34911fbce14209c1563 SHA256 24c085aecbc784ea8b4837ca02bfe5086c7f91c8a88a0f607826692234af583f
-EBUILD qemu-kvm-0.11.1-r1.ebuild 5802 RMD160 188295cf003751c89fa2323b143f57f13ff0a124 SHA1 56cbc1b3a5654abe68979e372d84c9efa5985661 SHA256 404cda40869f1ba8cfbd67f45e271c3bc940aa51c393dbaabaaf9b1cdf5c706a
-EBUILD qemu-kvm-0.12.3-r1.ebuild 7458 RMD160 be242c57d61934138ac184966976e8920f82da19 SHA1 79f732878641962c67034f5b6625b24bc3e1ab35 SHA256 f31657a575f03bb954b93ed1b7e991a8502c443381c61c5a64a9a68bfff3752d
-EBUILD qemu-kvm-0.12.4-r1.ebuild 7470 RMD160 e7193821e681903148303ecbc68eff418d2ab354 SHA1 8819586f093d45963a6240f09bf1a8092674a414 SHA256 fea6400fbd08aac09526fb71c1adbf67a5e6e0d9fcf1207c734f5ed88726e06b
-EBUILD qemu-kvm-0.12.5.ebuild 7606 RMD160 8931dae25c69eb1a40628fe1cffe174dfda6b4e1 SHA1 9dbb7178cf363ff42738e78d5f64c6ba55e04a49 SHA256 ad4d19d7a596635c20a5e718a5a2bb4312f90772d097bc45b6f58d82144ac169
-EBUILD qemu-kvm-9999.ebuild 7578 RMD160 1fd9e503dfad252993c18f11ae80d102b7fb32e6 SHA1 df5421c3152ba336da34b3da0798e9ca53e2361b SHA256 5ebc6c2bdaba5dddc01f56cb6236ccac84db0ed39b40c0ce7e80b746546d5fe1
-MISC ChangeLog 7742 RMD160 6180e0cae4a1467ebc6f389bcd7e02bc9c0a0e9b SHA1 c408255438a9c822292736acfe5d4822363cba4d SHA256 053d2e0465bd117f0944bded59659ff6c31ddebcdde8fe2b259b3daa15b1b845
+EBUILD qemu-kvm-0.11.1-r1.ebuild 5834 RMD160 14a6c25f17ca1585e6ae214faabbee03836c46be SHA1 fdd7b21a81beb3ab0e90631f995778bfe02c2b66 SHA256 5b13106de57e452c3b5b13e86b9eb472ed299442ab501c74e1a193b743bc0e2b
+EBUILD qemu-kvm-0.12.3-r1.ebuild 7490 RMD160 6e1372313a61822b6aa8aecd2adbb96aceced6e7 SHA1 97de1efe8be68f47f367988c463244d9201e409d SHA256 52f6e7351467fece7504b5a2a9641d737656213f68bdb82c6ac2c128873425af
+EBUILD qemu-kvm-0.12.4-r1.ebuild 7502 RMD160 c16a2e641bd879b8eabf27c2e317d250f3554d5f SHA1 e2bc0954389e96d01ef8ecc5f0e32797477f37eb SHA256 33c99cb7f99a73c9845ddfc0565c0d1a1c0b6ba3a2d25d3239c21912a2fbcb25
+EBUILD qemu-kvm-0.12.5.ebuild 7639 RMD160 f9ddc850b4f35539834de213f6063875ea1a7233 SHA1 702e1638d36b27c2571e08551268da087ca168ca SHA256 fa61415340a418deee2f100e245b674922e1e7816749ac8c26912bb2497b5ea8
+EBUILD qemu-kvm-9999.ebuild 7610 RMD160 031ed377373a4a683e534bf15d97a7f696979cbb SHA1 7c123820b986ecde8692bc8c7b2bcfa5aed39f01 SHA256 6f4506ab7d2867d447701a41f17cc78d15647221a51d2ec7ff138b0fcf9b1ead
+MISC ChangeLog 7983 RMD160 8819a863892022b01ea40422e387a815feaed82c SHA1 82454f936b9f80a176fb5731c7db576d6cb54d42 SHA256 62a82478ab31fce430279b99d46f3ef5d5c4bd8f67d9ce599dbf927009241c3a
 MISC metadata.xml 978 RMD160 2e120b8332c7fc1d6b4baa4149b0f13a73c74fb2 SHA1 5fe37c22d64ca52ef6d26debc46b23b415e04a7a SHA256 76676f1a327e743dd3579109250ace6012ac93ffea5d1daab0a24b194b55164f
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.11.1-r1.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.11.1-r1.ebuild
index b007b8533a6a..edee63055a94 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-0.11.1-r1.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.11.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.11.1-r1.ebuild,v 1.3 2010/06/30 21:46:32 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.11.1-r1.ebuild,v 1.4 2010/08/12 08:49:51 dev-zero Exp $
 
 EAPI="2"
 
@@ -48,7 +48,8 @@ RDEPEND="sys-libs/zlib
 	!app-emulation/qemu-softmmu
 	!app-emulation/qemu-user
 	!app-emulation/qemu
-	!app-emulation/kqemu"
+	!app-emulation/kqemu
+	!app-emulation/qemu-kvm-spice"
 
 DEPEND="${RDEPEND}
 	app-text/texi2html
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.12.3-r1.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.3-r1.ebuild
index 609b7bcb1745..80d5f7827a82 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-0.12.3-r1.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.12.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.12.3-r1.ebuild,v 1.2 2010/06/30 21:46:32 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.3-r1.ebuild,v 1.3 2010/08/12 08:49:51 dev-zero Exp $
 
 EAPI="2"
 
@@ -47,6 +47,7 @@ RDEPEND="
 	!app-emulation/qemu
 	!app-emulation/qemu-softmmu
 	!app-emulation/qemu-user
+	!app-emulation/qemu-kvm-spice
 	sys-apps/pciutils
 	>=sys-apps/util-linux-2.16.0
 	sys-libs/zlib
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.12.4-r1.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.4-r1.ebuild
index bba23d8b94fd..acb36b645607 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-0.12.4-r1.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.12.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.12.4-r1.ebuild,v 1.2 2010/06/30 21:46:32 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.4-r1.ebuild,v 1.3 2010/08/12 08:49:50 dev-zero Exp $
 
 EAPI="2"
 
@@ -47,6 +47,7 @@ RDEPEND="
 	!app-emulation/qemu
 	!app-emulation/qemu-softmmu
 	!app-emulation/qemu-user
+	!app-emulation/qemu-kvm-spice
 	sys-apps/pciutils
 	>=sys-apps/util-linux-2.16.0
 	sys-libs/zlib
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.12.5.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.5.ebuild
index 80588f7a6394..ee9092d85e04 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-0.12.5.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.12.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.12.5.ebuild,v 1.2 2010/08/05 15:56:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.5.ebuild,v 1.3 2010/08/12 08:49:51 dev-zero Exp $
 
 #BACKPORTS=2
 
@@ -50,6 +50,7 @@ RDEPEND="
 	!app-emulation/qemu
 	!app-emulation/qemu-softmmu
 	!app-emulation/qemu-user
+	!app-emulation/qemu-kvm-spice
 	sys-apps/pciutils
 	>=sys-apps/util-linux-2.16.0
 	sys-libs/zlib
diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
index 0126e0c28f00..620e508eff2e 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-2010 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.8 2010/06/30 21:46:32 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.9 2010/08/12 08:49:51 dev-zero Exp $
 
 EAPI="2"
 
@@ -51,6 +51,7 @@ RDEPEND="
 	!app-emulation/qemu
 	!app-emulation/qemu-softmmu
 	!app-emulation/qemu-user
+	!app-emulation/qemu-kvm-spice
 	sys-apps/pciutils
 	>=sys-apps/util-linux-2.16.0
 	sys-libs/zlib