Minor fixes and enabling kvm

Package-Manager: portage-2.1.6.10/cvs/Linux x86_64

4 files changed, 21 insertions, 10 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/Manifest b/app-emulation/qemu-softmmu/Manifest
index fc07b66b300b..9e0a871d1581 100644
--- a/app-emulation/qemu-softmmu/Manifest
+++ b/app-emulation/qemu-softmmu/Manifest
@@ -10,12 +10,12 @@ DIST qemu-0.10.1.tar.gz 3658024 RMD160 f1dcd14a6981180b40b3048769bf861ac86fa0b3
 DIST qemu-0.9.0.tar.gz 1901741 RMD160 4296542b6da18a6ac93d20787330d3c1c2ac0a19 SHA1 1e57e48a06eb8729913d92601000466eecef06cb SHA256 491facf9335654967ee53d8fb3540a274bfcbdcc225506bd38c4ee8e9ab405c1
 DIST qemu-0.9.1.tar.gz 2804104 RMD160 ee7bdb55a4540df2082d4bde9ebfd2f4e6f201a5 SHA1 630ea20b5989f0df00128de7f7be661c573ed041 SHA256 4756d0b4a4dc7dd88354bc6b37d381e4462dd328d0feef94803e90c0455835a5
 EBUILD qemu-softmmu-0.10.0.ebuild 3030 RMD160 793bb3412a5a5f2f1ccd77e66efad1acd5ee25b0 SHA1 7217891921c09486d490d9f4929585596a12b1a8 SHA256 5c5e028bf24d2d45c926a5bb94a9f7a803b98e3ad1debe6163e365d59c6c4905
-EBUILD qemu-softmmu-0.10.1.ebuild 3046 RMD160 803eba8503e2c0a7166d7221e8cf81f84a060f34 SHA1 953c48f771f0af2d5dceaa9f5a250e11730d7164 SHA256 f2b75fd2f5d24f5f87fe1a3daff521e2a17d07215cc7647fb9b1ece3ff0e71d2
+EBUILD qemu-softmmu-0.10.1.ebuild 3206 RMD160 e36a513e2d5dbe79fde121f09eaa0c43fd411aa4 SHA1 03fda51effddf89d1fe58b70afb55f0680a490ad SHA256 a460488251dc9f25038552453d98e78034f35c7e31f138a6e0f16ce3e7419deb
 EBUILD qemu-softmmu-0.9.0-r1.ebuild 3175 RMD160 8a7d2bc7dd359671e5350537da075fc169168b60 SHA1 681d7c1f8ff28c30a4e9135e1e54d4075cd8fe7b SHA256 a381f8a2e983e6e6266657adab2cc59605bb3efc416dec4b7f901a51e0666412
 EBUILD qemu-softmmu-0.9.0.ebuild 3129 RMD160 dc0666aa7499db65af3f78d0d94a4253750927d5 SHA1 7493550b324f11ee72aa5ca994cdd207eb383c6f SHA256 ddd4eb920698c27d70a27d20eb1877b37a7824689340821f8cfe16698100942c
 EBUILD qemu-softmmu-0.9.1-r1.ebuild 2896 RMD160 4e5761b2f708d974b2026a006efb1cf9d23486da SHA1 426134eaa5e212c2e45ac36cbb87676a42371ae0 SHA256 261458bbcef7d5dc13dabad1cfddfd6656d8b57fd10e34011f88db6ed07ab502
 EBUILD qemu-softmmu-0.9.1-r2.ebuild 3445 RMD160 fff1fc780161c0b38bc4eb9dd12c05db5082ceb5 SHA1 263f864e0c73aecd80443009f9f8a82cc9c194a0 SHA256 b891d2a46654663015db4d9ad0bc0dfa7ff8c45d6a76e350004e036df9f020c0
 EBUILD qemu-softmmu-0.9.1-r3.ebuild 3497 RMD160 307e4ffb5529ef7fcae85143bc24b1215ef397ad SHA1 fed449d32e6d30cf4cca64a0dabc7f97ecc5f8ab SHA256 3dec7492e786102a0e766cde65fcb3f54c84e8bcdef03042fb82eca2ac0550e7
 EBUILD qemu-softmmu-0.9.1.ebuild 2824 RMD160 b264432c59a2c5a30c7ae4d5467574cbc9552b02 SHA1 48b5d381eea4ddfa2422ec5f5cd8487c3e9cdd97 SHA256 a390898d852e421e0921782da93974ba0d20a9f65879e875da0afda2ea7efb05
-MISC ChangeLog 10851 RMD160 f2debfc770e466b28a45d180cb3121872672e560 SHA1 97bfccd2523e2a13fcb675ef8931e2815b79d2d0 SHA256 9b80232dccf1f1f466ae0a5a34630166a00126f452f3796c8f247d919dd76a7a
-MISC metadata.xml 781 RMD160 74450132e66859323be46c121f5eecefb17bf582 SHA1 e1b83da2aeb047e497f2296c8a75d5ff29e3ee72 SHA256 09da74da4568ada6f342113ee454230473c8324cb74957028bf6f1d8864cac22
+MISC ChangeLog 10976 RMD160 8b9423057928162385e5286305bee510818f82ac SHA1 f9345acddb229d17ae583abf0294b4c52ded49a8 SHA256 4335580f102971ecf163e83ee2a57df1b20b60604fa7f1b9215620162032d181
+MISC metadata.xml 882 RMD160 259583b24a6eec2cbcca323e754f677041d44d54 SHA1 690460cdb502fd47b51eb1d51938d1c7629f7918 SHA256 8584426258959783d4da117036fa1d773b91b8f90d6a3c1ee7d065446e3d91f8
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"