summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2012-10-30 20:53:33 +0000
committerDoug Goldstein <cardoe@gentoo.org>2012-10-30 20:53:33 +0000
commit3402e5e1042ac09e02a81868efe81c17fa6f6474 (patch)
tree1e7070d562ca8297d646b87126428958542c3888
parentstrip-flags: revert previous commit as it was unnecessary; fix _is_flagq to h... (diff)
downloadgentoo-2-3402e5e1042ac09e02a81868efe81c17fa6f6474.tar.gz
gentoo-2-3402e5e1042ac09e02a81868efe81c17fa6f6474.tar.bz2
gentoo-2-3402e5e1042ac09e02a81868efe81c17fa6f6474.zip
Fix old blocker that's not necessary now that we have the qemu-kvm move.
(Portage version: 2.1.11.9/cvs/Linux x86_64)
-rw-r--r--app-emulation/qemu/ChangeLog6
-rw-r--r--app-emulation/qemu/qemu-1.1.1-r1.ebuild4
-rw-r--r--app-emulation/qemu/qemu-1.1.2-r1.ebuild4
-rw-r--r--app-emulation/qemu/qemu-1.1.2-r2.ebuild4
4 files changed, 8 insertions, 10 deletions
diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 8a5dbd2f0a91..8774b13a4509 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.137 2012/10/29 23:50:54 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.138 2012/10/30 20:53:33 cardoe Exp $
+
+ 30 Oct 2012; Doug Goldstein <cardoe@gentoo.org> qemu-1.1.1-r1.ebuild,
+ qemu-1.1.2-r1.ebuild, qemu-1.1.2-r2.ebuild:
+ Fix old blocker that's not necessary now that we have the qemu-kvm move.
29 Oct 2012; Doug Goldstein <cardoe@gentoo.org> qemu-1.2.0.ebuild,
qemu-9999.ebuild:
diff --git a/app-emulation/qemu/qemu-1.1.1-r1.ebuild b/app-emulation/qemu/qemu-1.1.1-r1.ebuild
index de5e531f3d6d..5c959fabfa4e 100644
--- a/app-emulation/qemu/qemu-1.1.1-r1.ebuild
+++ b/app-emulation/qemu/qemu-1.1.1-r1.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/qemu/qemu-1.1.1-r1.ebuild,v 1.3 2012/10/28 09:27:24 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.1-r1.ebuild,v 1.4 2012/10/30 20:53:33 cardoe Exp $
EAPI="4"
@@ -60,8 +60,6 @@ REQUIRED_USE="static? ( !alsa !pulseaudio )
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
RDEPEND="
!app-emulation/kqemu
- !app-emulation/qemu
- !<app-emulation/qemu-1.0
>=dev-libs/glib-2.0
media-libs/libpng
sys-apps/pciutils
diff --git a/app-emulation/qemu/qemu-1.1.2-r1.ebuild b/app-emulation/qemu/qemu-1.1.2-r1.ebuild
index 4b116fe13966..1b74d3727ce1 100644
--- a/app-emulation/qemu/qemu-1.1.2-r1.ebuild
+++ b/app-emulation/qemu/qemu-1.1.2-r1.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/qemu/qemu-1.1.2-r1.ebuild,v 1.2 2012/10/28 09:27:24 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r1.ebuild,v 1.3 2012/10/30 20:53:33 cardoe Exp $
EAPI="4"
@@ -78,8 +78,6 @@ LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
!app-emulation/kqemu
- !app-emulation/qemu
- !<app-emulation/qemu-1.0
>=sys-firmware/seabios-1.7.0
sys-firmware/sgabios
sys-firmware/vgabios
diff --git a/app-emulation/qemu/qemu-1.1.2-r2.ebuild b/app-emulation/qemu/qemu-1.1.2-r2.ebuild
index f1d76ab09be8..d31727f60595 100644
--- a/app-emulation/qemu/qemu-1.1.2-r2.ebuild
+++ b/app-emulation/qemu/qemu-1.1.2-r2.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/qemu/qemu-1.1.2-r2.ebuild,v 1.2 2012/10/28 09:27:24 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r2.ebuild,v 1.3 2012/10/30 20:53:33 cardoe Exp $
EAPI="4"
@@ -78,8 +78,6 @@ LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
!app-emulation/kqemu
- !app-emulation/qemu
- !<app-emulation/qemu-1.0
>=sys-firmware/seabios-1.7.0
sys-firmware/sgabios
sys-firmware/vgabios