summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2013-07-27 04:14:19 +0000
committerDoug Goldstein <cardoe@gentoo.org>2013-07-27 04:14:19 +0000
commitfe978011896830b8f2ff0f477159b0d8145a9a79 (patch)
treeb973db273b3a5f6a811c5a5317818305d9f0b82a /app-emulation/qemu
parentAdd qemu-1.5.2 to the mask. (diff)
downloadgentoo-2-fe978011896830b8f2ff0f477159b0d8145a9a79.tar.gz
gentoo-2-fe978011896830b8f2ff0f477159b0d8145a9a79.tar.bz2
gentoo-2-fe978011896830b8f2ff0f477159b0d8145a9a79.zip
Version bump and start of the Gentoo patchset.
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key D7DFA8D318FA9AEF!)
Diffstat (limited to 'app-emulation/qemu')
-rw-r--r--app-emulation/qemu/ChangeLog8
-rw-r--r--app-emulation/qemu/qemu-1.5.2.ebuild (renamed from app-emulation/qemu/qemu-1.5.1.ebuild)11
2 files changed, 13 insertions, 6 deletions
diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 87ccbf93e311..97d5c183d5a6 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.227 2013/07/27 03:54:02 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.228 2013/07/27 04:14:19 cardoe Exp $
+
+*qemu-1.5.2 (27 Jul 2013)
+
+ 27 Jul 2013; Doug Goldstein <cardoe@gentoo.org> +qemu-1.5.2.ebuild,
+ -qemu-1.5.1.ebuild:
+ Version bump and start of the Gentoo patchset.
27 Jul 2013; Doug Goldstein <cardoe@gentoo.org>
-files/qemu-1.2.0-cflags.patch, -files/qemu-binfmt.initd, -files/qemu-kvm,
diff --git a/app-emulation/qemu/qemu-1.5.1.ebuild b/app-emulation/qemu/qemu-1.5.2.ebuild
index bc16a58e45ef..801b0e35d0b8 100644
--- a/app-emulation/qemu/qemu-1.5.1.ebuild
+++ b/app-emulation/qemu/qemu-1.5.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.5.1.ebuild,v 1.1 2013/07/19 04:42:15 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.5.2.ebuild,v 1.1 2013/07/27 04:14:19 cardoe Exp $
EAPI=5
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="ncurses,readline"
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
user udev fcaps readme.gentoo
-#BACKPORTS=6b5934f9
+BACKPORTS=2d2faaeb
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="git://git.qemu.org/qemu.git"
@@ -85,14 +85,15 @@ LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
xattr? ( sys-apps/attr[static-libs(+)] )
xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ static-user? ( >=dev-libs/glib-2.0[static-libs(+)] )
qemu_softmmu_targets_i386? (
- >=sys-firmware/ipxe-1.0.0_p20130225
+ >=sys-firmware/ipxe-1.0.0_p20130624
~sys-firmware/seabios-1.7.2.2
~sys-firmware/sgabios-0.1_pre8
~sys-firmware/vgabios-0.7a
)
qemu_softmmu_targets_x86_64? (
- >=sys-firmware/ipxe-1.0.0_p20130225
+ >=sys-firmware/ipxe-1.0.0_p20130624
~sys-firmware/seabios-1.7.2.2
~sys-firmware/sgabios-0.1_pre8
~sys-firmware/vgabios-0.7a
@@ -324,7 +325,7 @@ qemu_src_configure() {
conf_opts+=" $(use_enable xfs xfsctl)"
use mixemu && conf_opts+=" --enable-mixemu"
conf_opts+=" --audio-drv-list=${audio_opts}"
- #conf_opts+=" --enable-migration-from-qemu-kvm"
+ conf_opts+=" --enable-migration-from-qemu-kvm"
fi
conf_opts+=" $(use_enable debug debug-info)"