Minor fixes and enabling kvm

(Portage version: 2.1.6.10/cvs/Linux x86_64)

3 files changed, 18 insertions, 7 deletions

diff --git a/app-emulation/qemu-softmmu/ChangeLog b/app-emulation/qemu-softmmu/ChangeLog
index b9e17b7373b1..8d26d7abccc9 100644
--- a/app-emulation/qemu-softmmu/ChangeLog
+++ b/app-emulation/qemu-softmmu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu-softmmu
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.64 2009/03/24 15:23:57 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.65 2009/03/27 21:39:03 lu_zero Exp $
+
+  27 Mar 2009; Luca Barbato <lu_zero@gentoo.org> metadata.xml,
+  qemu-softmmu-0.10.1.ebuild:
+  Minor fixes and enabling kvm
 
   24 Mar 2009; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.10.1.ebuild:
   fix ifup/ifdown installation
diff --git a/app-emulation/qemu-softmmu/metadata.xml b/app-emulation/qemu-softmmu/metadata.xml
index 7328ec82873a..c0983a49be36 100644
--- a/app-emulation/qemu-softmmu/metadata.xml
+++ b/app-emulation/qemu-softmmu/metadata.xml
@@ -7,6 +7,7 @@
 </maintainer>
 <use>
 		<flag name='kqemu'>Enables the kernel acceleration module on a x86/x86-64 cpu</flag>
+		<flag name='kvm'>Use the KVM (Kernel Virtual Machine) infrastructure on compatible hardware</flag>
 		<flag name='alsa'>Enable alsa output for sound emulation</flag>
 		<flag name='esd'>Enable esound output for sound emulation</flag>
 		<flag name='gnutls'>Enable TLS support for the VNC console server</flag>
diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.10.1.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.10.1.ebuild
index 024b1311bbb2..e6a214b23792 100644
--- a/app-emulation/qemu-softmmu/qemu-softmmu-0.10.1.ebuild
+++ b/app-emulation/qemu-softmmu/qemu-softmmu-0.10.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.10.1.ebuild,v 1.2 2009/03/24 15:23:57 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.10.1.ebuild,v 1.3 2009/03/27 21:39:03 lu_zero Exp $
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs linux-info
 
 EAPI=1
 
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
 
-IUSE="alsa esd gnutls ncurses pulseaudio +sdl vde kqemu"
+IUSE="alsa esd gnutls ncurses pulseaudio +sdl vde kqemu kvm"
 RESTRICT="test"
 
 RDEPEND="sys-libs/zlib
@@ -53,7 +53,8 @@ src_unpack() {
 		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
 			Makefile.target
 	# avoid strip
-	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' Makefile
+	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' \
+		Makefile Makefile.target */Makefile
 }
 
 src_compile() {
@@ -66,9 +67,10 @@ src_compile() {
 	use sdl || conf_opts="$conf_opts --disable-gfx-check --disable-sdl"
 	use vde || conf_opts="$conf_opts --disable-vde"
 	use kqemu || conf_opts="$conf_opts --disable-kqemu"
+	use kvm || conf_opts="$conf_opts --disable-kvm"
 #	use fdt || conf_opts="--disable-fdt"
 
-	conf_opts="$conf_opts --prefix=/usr --disable-bluez --disable-kvm"
+	conf_opts="$conf_opts --prefix=/usr --disable-bluez"
 
 	use alsa && audio_opts="alsa $audio_opts"
 	use esd && audio_opts="esd $audio_opts"
@@ -77,7 +79,11 @@ src_compile() {
 
 	filter-flags -fpie -fstack-protector
 
-	./configure ${conf_opts} --audio-drv-list="$audio_opts" || die "econf failed"
+	./configure ${conf_opts} \
+		--audio-drv-list="$audio_opts" \
+		--kerneldir="${KV_DIR}" \
+		--cc=$(tc-getCC) --host-cc=$(tc-getCC) \
+		|| die "econf failed"
 
 	emake || die "emake qemu failed"