summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2013-08-17 21:32:54 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2013-08-17 21:32:54 +0000
commitf44751b4333a5d99813b628ac5ab48b3b3719a64 (patch)
tree2352593e90a851d58b41b60c7b366ea750b3ab83 /app-emulation/qemu
parentx86 stable wrt bug #461896 (diff)
downloadgentoo-2-f44751b4333a5d99813b628ac5ab48b3b3719a64.tar.gz
gentoo-2-f44751b4333a5d99813b628ac5ab48b3b3719a64.tar.bz2
gentoo-2-f44751b4333a5d99813b628ac5ab48b3b3719a64.zip
Conditionalize '--enable-migration-from-qemu-kvm' (not an upstream option).
(Portage version: 2.2.0_alpha194_p2/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'app-emulation/qemu')
-rw-r--r--app-emulation/qemu/ChangeLog5
-rw-r--r--app-emulation/qemu/qemu-9999.ebuild5
2 files changed, 7 insertions, 3 deletions
diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 93e885917edb..1cbc382939ea 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,9 @@
# 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.234 2013/08/16 14:05:22 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.235 2013/08/17 21:32:54 slyfox Exp $
+
+ 17 Aug 2013; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
+ Conditionalize '--enable-migration-from-qemu-kvm' (not an upstream option).
*qemu-1.6.0 (16 Aug 2013)
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index b94ac1a229dc..fd0a21e5d3f8 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.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-9999.ebuild,v 1.57 2013/08/16 14:05:22 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.58 2013/08/17 21:32:54 slyfox Exp $
EAPI=5
@@ -328,7 +328,8 @@ 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"
+ # Gentoo-specific opts
+ [[ ${PV} = *9999* ]] || conf_opts+=" --enable-migration-from-qemu-kvm"
fi
conf_opts+=" $(use_enable debug debug-info)"