--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -10,1 +10,2 @@ 
-         kqemu? ( http://fabrice.bellard.free.fr/qemu/kqemu-${PV%.*}-1.tar.gz ) "
---
+         kqemu? ( http://fabrice.bellard.free.fr/qemu/kqemu-${PV%.*}-1.tar.gz )
+         qvm86? ( qvm86-20050405.tar.bz2 )"
@@ -15,1 +16,1 @@ 
-IUSE="softmmu sdl kqemu" # nptl qemu-fast nptlonly"
---
+IUSE="softmmu sdl kqemu qvm86 debug" # nptl qemu-fast nptlonly"
@@ -25,1 +26,3 @@ 
-MODULE_NAMES="kqemu(misc:${S}/kqemu)"
---
+MODULE_NAMES=""
+use kqemu && MODULE_NAMES=$MODULE_NAMES" kqemu(misc:${S}/kqemu)"
+use qvm86 && MODULE_NAMES=$MODULE_NAMES" qvm86(misc:${S}/qvm86)"
@@ -35,1 +38,1 @@ 
-	use kqemu && linux-mod_pkg_setup
---
+	( use kqemu || use qvm86 ) && linux-mod_pkg_setup
@@ -54,0 +57,5 @@ 
+	if use qvm86; then
+		mv ${WORKDIR}/qvm86 ${S}
+		cd ${S}
+		epatch qvm86/patch.qvm86
+	fi
@@ -56,1 +64,1 @@ 
-	sed -i 's/^CFLAGS=/CFLAGS+=/' Makefile Makefile.target
---
+	sed -i 's/^CFLAGS=-Wall -O2 -g/CFLAGS+=-Wall/' Makefile Makefile.target
@@ -66,2 +74,7 @@ 
-	# Force disable ANY cflag.
-	unset CFLAGS
---
+	# sse is currently broken
+	strip-flags	
+	replace-cpu-flags pentium3 pentium4 i586
+	if use debug; then 
+		append-flags -g
+	fi
+
@@ -69,1 +82,1 @@ 
-	use kqemu || myconf="${myconf} --disable-kqemu"
---
+	use kqemu || use qvm86 || myconf="${myconf} --disable-kqemu"
@@ -92,1 +105,1 @@ 
-	if use kqemu; then
---
+	if use kqemu || use qvm86; then
@@ -94,1 +107,2 @@ 
-
---
+	fi
+	if use kqemu; then
@@ -97,1 +111,0 @@ 
-
@@ -120,0 +133,5 @@ 
+	if use qvm86; then
+		linux-mod_pkg_postinst
+		einfo "make sure you have the /dev/qvm86 device generated"
+		einfo "and the kernel module loaded before running qemu"
+	fi