summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Albertson <ramereth@gentoo.org>2009-12-23 06:01:52 +0000
committerLance Albertson <ramereth@gentoo.org>2009-12-23 06:01:52 +0000
commitc125ac04e32e16e4378867b8b266017dea9d1ec4 (patch)
treef0ad9a2e062db91c8737bf269919d4d835ab1777 /app-emulation
parentBump to 2.28.3, remove old -- misc bugfixes and translation updates (diff)
downloadgentoo-2-c125ac04e32e16e4378867b8b266017dea9d1ec4.tar.gz
gentoo-2-c125ac04e32e16e4378867b8b266017dea9d1ec4.tar.bz2
gentoo-2-c125ac04e32e16e4378867b8b266017dea9d1ec4.zip
Fix qemu dep to resolve package blocking issue between qemu and qemu-kvm when both qemu and kvm USE flags are enabled #294179
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/libvirt/ChangeLog7
-rw-r--r--app-emulation/libvirt/libvirt-0.7.2.ebuild4
-rw-r--r--app-emulation/libvirt/libvirt-0.7.4-r1.ebuild4
-rw-r--r--app-emulation/libvirt/libvirt-0.7.4-r2.ebuild4
-rw-r--r--app-emulation/libvirt/libvirt-0.7.4.ebuild4
5 files changed, 14 insertions, 9 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/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 ) )