Bump to kvm-88-r1

 - Fix hard-coded share path; bug #279013
 - Fix build with esd/pulse; bug #278652
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

6 files changed, 53 insertions, 702 deletions

diff --git a/app-emulation/kvm/ChangeLog b/app-emulation/kvm/ChangeLog
index a5105866152e..42338886402b 100644
--- a/app-emulation/kvm/ChangeLog
+++ b/app-emulation/kvm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/kvm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/ChangeLog,v 1.36 2009/07/21 18:26:49 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/ChangeLog,v 1.37 2009/07/25 14:19:52 dang Exp $
+
+*kvm-88-r1 (25 Jul 2009)
+
+  25 Jul 2009; Daniel Gryniewicz <dang@gentoo.org> -kvm-81.ebuild,
+  -kvm-82.ebuild, -kvm-83.ebuild, -kvm-85-r1.ebuild, +kvm-88-r1.ebuild:
+  Bump to kvm-88-r1
+  - Fix hard-coded share path; bug #279013
+  - Fix build with esd/pulse; bug #278652
 
 *kvm-88 (21 Jul 2009)
 
diff --git a/app-emulation/kvm/Manifest b/app-emulation/kvm/Manifest
index 9b4e5ced683e..2394eb0e1082 100644
--- a/app-emulation/kvm/Manifest
+++ b/app-emulation/kvm/Manifest
@@ -1,22 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kvm-83-vtd.patch 1286 RMD160 0dffa8d385f88c7452c5fbee9e8af8373f6b3ea7 SHA1 696d03063413ecb17658452957fbf2fcc44f9ce0 SHA256 b0fcda4000c1f8e52098593838127a180599f535cea318880169cf9d0b890c73
-DIST kvm-81.tar.gz 4292487 RMD160 726abaf75da51d391c59e73669e9013035b178ce SHA1 3982fd20e3469d1279b5e70efcef9682758eb839 SHA256 19d71a028af2d019ed713a3a74d52a20ccbbe73ae6426ec256b7c71ddbecf9ad
-DIST kvm-82.tar.gz 4301055 RMD160 c463160047f4de95b2d9ad45456a3166e754793e SHA1 9b4ea2c910683667d787ff623d001aa98d0d009e SHA256 fa9bc496db07d4eef738b0feaf3f72986a24b006f89be3b720ffecf4d14365ba
-DIST kvm-83.tar.gz 4318840 RMD160 56c5b00a86e665647b1e338b593131871a4dbecf SHA1 aee1c8fdd788a26fdeefe40f81a0e13168e28611 SHA256 8c08827a4d150d765d466d745e08a7ebd7bd7f06e4a4ba56bcf335c12afe2134
 DIST kvm-84.tar.gz 4453159 RMD160 2b03bba6dd1249c5792cc27350615f5ddb737055 SHA1 ebdceb52227e2473ffefcadc7c4eaaa4190c2f7e SHA256 934a2d670314580e192f6c8d83e7aef2b071e46a2cd021f1f10bf74b8987988e
-DIST kvm-patches-20081216.tar.gz 23095 RMD160 f82d44f6eff2e49a59ff391e197f3b2fb8e951c6 SHA1 b49b82813162218ab8f08aa1905f63ee4f4d277b SHA256 e8197f8176756d9d8352f4d6eae7443b8977cefc92435c30538a7095d4704be8
-DIST kvm-patches-20090104.tar.gz 23149 RMD160 1ce67d586a2a93cd7bf3e45161c24daeff9f1314 SHA1 b0013ddf9a2faeb35a519d263ffadaa795cff50d SHA256 384dfbf579aa3adef52e8050e29806cbf0bf6bc36c27dbd08f7584c5c8a2286f
-DIST kvm-patches-20090126.tar.gz 22957 RMD160 5769eddc537265e9e095d4d062e167770642a44b SHA1 c120fa3990a58798995ad04eb6a137f2a5678ab2 SHA256 96105571525ca3f6eccdca857893a98989a182e97ee83803cce8948d73299b98
 DIST kvm-patches-20090218.tar.gz 4129 RMD160 aaa3a90f722b496f69f5506ce2c5412fc3e740fc SHA1 f7b87872540cc70a29856cb50e7e1bf878df9e30 SHA256 7897c184094af1bb24676eeba0da68ae55488dfda8e02564626b3f76c60a760f
 DIST kvm-patches-20090314.tar.gz 4457 RMD160 3d74233629553a606c9a53c3f2687a0bf6262c46 SHA1 ff4f3d05d63f152e4c1fa1331fedf5e80926f249 SHA256 3baa3faf93b9b31bce630910e6e8cedaf4b8d2f1cbdf487fe7c7f79e6f258924
 DIST kvm-patches-20090721.tar.gz 1734 RMD160 92c556e5e330b9272963b9b9acec4885c09a0337 SHA1 4cbb6870d52fd57d6d61a2dfe36f0df08afa5f75 SHA256 ffe358c838eaffbd24b6ea3ae2af14661463fe840fc091d11c1b5e67a46ad376
+DIST kvm-patches-20090725.tar.gz 2466 RMD160 9497217f8b1e3e8165b2643965a6ece3f4301ec3 SHA1 85cf2fcc21dd598d8a2dfce081c75f2d0feb1ef1 SHA256 98199d6b7d5e9c3211a8abd2ecb87715c1e0260b683a07b356331a6bb08b94f1
 DIST qemu-kvm-devel-85.tar.gz 4288372 RMD160 f618dd6e3f43b24392f059a5eccc04cb56b894a5 SHA1 8f1816d1510e2f9d41bc686d19652612e9c2a68a SHA256 8050f7312056d43d1fa4a6efabb75cba30e8fb4134d683188646c7b6b37c8a5d
 DIST qemu-kvm-devel-88.tar.gz 4364002 RMD160 654683522dc670fc8743e415b8f5b2cb32bed092 SHA1 4ad9af298d3d6ae25e3c5f6b1cd9bb03a7ad8315 SHA256 d407fc0760684e812e72451661acd620c0ac44b896c8bc9d0cf83565dca1987d
-EBUILD kvm-81.ebuild 6987 RMD160 04e49add21d35b73596d55da2edfcb7a1d6eb827 SHA1 127758cad0ee811097243d5670360546b2025023 SHA256 959fed2f1016b076978e5d445ee0d1b7ee3f3600c4ade902376f2c1e08bdaa33
-EBUILD kvm-82.ebuild 6943 RMD160 dce99d97271acbfc9e9c4badc53f3a467f3cdf50 SHA1 d199578cbe35e2cd607827e758fbff7e43983c53 SHA256 7a5ca2532ace1b8cac98cc957b07fbce7dbfcaa8cff078c5b6034fd00034db6a
-EBUILD kvm-83.ebuild 7019 RMD160 7d563725375da18c0d86196c1ab5ac52e5630e6e SHA1 e336fd3ee10680ee2caa37995becb219096f69be SHA256 01bd007c6844fffa93e04bd474bdf1ddb8560e692fe00d74215322cf0fb44700
 EBUILD kvm-84.ebuild 7064 RMD160 2c15c4866c504d26aa7117ebdb5a9a9cb7b73f98 SHA1 620204d39a2a7cb1dffe7a46886304418f8f4a3a SHA256 d80adf7abc6ddb0a852ef2b6cacc84fdcb71867d3c7499ebb36993a201a69d3d
-EBUILD kvm-85-r1.ebuild 6532 RMD160 810e63e33a4f86a0a8c3942ecf07a09cd7362c84 SHA1 f7e1da841f4bee8680e1e0faf6c6662a367926dd SHA256 eb8d958edcd1268ec17215d3160b4d64ba1df6c1652495d1b033d0454c6282de
 EBUILD kvm-85-r2.ebuild 6541 RMD160 636e23181f330d543ce691f8c8e1db3eecf723b9 SHA1 cbeccf5a51586d1af2997850f0af93c033c0541d SHA256 10c05b411aa996fac2e85d65e543aef42914a38ea2596a8fc65af0403dd94e71
+EBUILD kvm-88-r1.ebuild 6223 RMD160 4c9484f1ad56283b428cea6b41cdc9dc3fb1fe67 SHA1 25ea10473257835d51863d4a0383c17431a4e8c0 SHA256 4c340d94b9d44e9236a93d2703719f59e1e084a6a31108ae3c2c100ea3e60040
 EBUILD kvm-88.ebuild 6225 RMD160 aa97eaf16d4876a81c6059958a766d2983bacd9d SHA1 c52452c2aedd9908f54ad7b572b8cf9ab58670bb SHA256 ccb7fd395fcd4326a4aa9c480fb25c1fc1a954968a436848ec904027685478f9
-MISC ChangeLog 9151 RMD160 f6d65a273469abe702204646d5dada12d930e31f SHA1 782075261b3fbd8fc13ef136b4e4e6d2d7d2b022 SHA256 62e2b11bbda774befed69c9fd1ffe2b854ad0fa2e8c4c8621eb0da8537c5f0a3
+MISC ChangeLog 9422 RMD160 f020b46393dd1dd0beac13152bc55b5e3a2d2b92 SHA1 6571bad4c0f3789ba287457db80acf35b3ca1426 SHA256 18b91de31a8692cc7060eecfccbbf6fb9f6653f9f68a32cdc922898edfcee57c
 MISC metadata.xml 1282 RMD160 2c8cc65da23f96cfd73f757000192d4af7b29e9f SHA1 3b84cbafe2190715df0310fe8bde8dc6d483e6df SHA256 af8ea32fd7dedeb7401d4df31016c3e6a4a12d9720577bbb9673d4ae22b3dc54
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iD8DBQFKaxTAomPajV0RnrERAkXSAJ9bqP2KbvY6lXL88qjWrwfMUozbQwCfUt0h
+YI79KCCIBk5PRH9juvGxJOs=
+=42UE
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/kvm/kvm-81.ebuild b/app-emulation/kvm/kvm-81.ebuild
deleted file mode 100644
index 50b65792eb25..000000000000
--- a/app-emulation/kvm/kvm-81.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-81.ebuild,v 1.4 2009/05/14 14:40:02 dang Exp $
-
-EAPI="1"
-
-inherit eutils flag-o-matic toolchain-funcs linux-mod
-
-# Patchset git repo is at http://github.com/dang/kvm-patches/tree/master
-PATCHSET="kvm-patches-20081216"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	http://apollo.fprintf.net/downloads/${PATCHSET}.tar.gz"
-
-DESCRIPTION="Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-# Add bios back when it builds again
-IUSE="alsa esd gnutls havekernel +modules ncurses pulseaudio +sdl test vde"
-RESTRICT="test"
-
-RDEPEND="sys-libs/zlib
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	esd? ( media-sound/esound )
-	pulseaudio? ( media-sound/pulseaudio )
-	gnutls? ( net-libs/gnutls )
-	ncurses? ( sys-libs/ncurses )
-	sdl? ( >=media-libs/libsdl-1.2.11 )
-	vde? ( net-misc/vde )"
-
-#    bios? (
-#        sys-devel/dev86
-#        dev-lang/perl
-#        sys-power/iasl
-#    )
-DEPEND="${RDEPEND}
-	gnutls? ( dev-util/pkgconfig )
-	app-text/texi2html"
-
-QA_TEXTRELS="usr/bin/kvm"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if use havekernel && use modules ; then
-		ewarn "You have the 'havekernel' and 'modules' use flags enabled."
-		ewarn "'havekernel' trumps 'modules'; the kvm modules will not"
-		ewarn "be built.  You must ensure you have a compatible kernel"
-		ewarn "with the kvm modules on your own"
-	elif use havekernel ; then
-		ewarn "You have the 'havekernel' use flag set.  This means you"
-		ewarn "must ensure you have a compatible kernel on your own."
-	elif use modules ; then
-		if ! linux_chkconfig_present KVM; then
-			eerror "KVM now needs CONFIG_KVM built into your kernel, even"
-			eerror "if you're using the external modules from this package."
-			eerror "Please enable KVM support in your kernel, found at:"
-			eerror
-			eerror "  Virtualization"
-			eerror "    Kernel-based Virtual Machine (KVM) support"
-			eerror
-			die "KVM support not detected!"
-		fi
-		BUILD_TARGETS="all"
-		MODULE_NAMES="kvm(kvm:${S}/kernel:${S}/kernel/x86)"
-		MODULE_NAMES="${MODULE_NAMES} kvm-intel(kvm:${S}/kernel:${S}/kernel/x86)"
-		MODULE_NAMES="${MODULE_NAMES} kvm-amd(kvm:${S}/kernel:${S}/kernel/x86)"
-		linux-mod_pkg_setup
-	elif kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-		eerror "Either upgrade your kernel, or enable the 'modules' USE flag."
-		die "kvm version not compatible"
-	elif ! linux_chkconfig_present KVM; then
-		eerror "Please enable KVM support in your kernel, found at:"
-		eerror
-		eerror "  Virtualization"
-		eerror "    Kernel-based Virtual Machine (KVM) support"
-		eerror
-		eerror "or enable the 'modules' USE flag."
-		die "KVM support not detected!"
-	fi
-
-	if use sdl && ! built_with_use media-libs/libsdl X ; then
-		die "You need to rebuild media-libs/libsdl with the X use flag"
-	fi
-
-	enewgroup kvm
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' qemu/Makefile
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		qemu/Makefile qemu/Makefile.target
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			qemu/Makefile.target
-	# avoid strip
-	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' qemu/Makefile
-
-	# apply patchset
-	EPATCH_SOURCE="${WORKDIR}/${PATCHSET}"
-	EPATCH_SUFFIX="patch"
-	epatch
-}
-
-src_compile() {
-	local mycc conf_opts audio_opts
-
-	audio_opts="oss"
-	use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
-	use ncurses || conf_opts="$conf_opts --disable-curses"
-	use sdl || conf_opts="$conf_opts --disable-gfx-check --disable-sdl"
-	use vde || conf_opts="$conf_opts --disable-vde"
-	use alsa && audio_opts="alsa $audio_opts"
-	use esd && audio_opts="esd $audio_opts"
-	use pulseaudio && audio_opts="pa $audio_opts"
-	use sdl && audio_opts="sdl $audio_opts"
-	use modules && conf_opts="$conf_opts --kerneldir=$KV_DIR"
-	conf_opts="$conf_opts --disable-gcc-check"
-	conf_opts="$conf_opts --prefix=/usr"
-	#conf_opts="$conf_opts --audio-drv-list=\"$audio_opts\""
-
-	./configure ${conf_opts} --audio-drv-list="$audio_opts" || die "econf failed"
-
-	emake libkvm || die "emake libkvm failed"
-
-	if use test; then
-		emake user || die "emake user failed"
-	fi
-
-	mycc=$(cat qemu/config-host.mak | egrep "^CC=" | cut -d "=" -f 2)
-
-	filter-flags -fpie -fstack-protector
-
-	# If using gentoo's compiler set the SPEC to non-hardened
-	if [ ! -z ${GCC_SPECS} -a -f ${GCC_SPECS} ]; then
-		local myccver=$(${mycc} -dumpversion)
-		local gccver=$($(tc-getBUILD_CC) -dumpversion)
-
-		#Is this a SPEC for the right compiler version?
-		myspec="${GCC_SPECS/${gccver}/${myccver}}"
-		if [ "${myspec}" == "${GCC_SPECS}" ]; then
-			shopt -s extglob
-			GCC_SPECS="${GCC_SPECS/%hardened*specs/vanilla.specs}"
-			shopt -u extglob
-		else
-			unset GCC_SPECS
-		fi
-	fi
-
-#    if use bios; then
-#        emake bios || die "emake bios failed"
-#        emake vgabios || die "emake vgabios failed"
-#    fi
-
-	emake qemu || die "emake qemu failed"
-
-	if use modules && ! use havekernel ; then
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	# kcmd so we don't install kernel modules which weren't build
-	emake DESTDIR="${D}" kcmd='#' install || die "make install failed"
-
-	exeinto /usr/bin/
-	doexe "${S}/kvm_stat"
-
-	mv "${D}"/usr/share/man/man1/qemu.1 "${D}"/usr/share/man/man1/kvm.1
-	mv "${D}"/usr/share/man/man1/qemu-img.1 "${D}"/usr/share/man/man1/kvm-img.1
-	mv "${D}"/usr/share/man/man8/qemu-nbd.8 "${D}"/usr/share/man/man8/kvm-nbd.8
-	mv "${D}"/usr/bin/qemu-img "${D}"/usr/bin/kvm-img
-	mv "${D}"/usr/bin/qemu-nbd "${D}"/usr/bin/kvm-nbd
-
-	insinto /etc/udev/rules.d/
-	doins scripts/65-kvm.rules
-
-	insinto /etc/kvm/
-	insopts -m0755
-	newins scripts/qemu-ifup kvm-ifup
-	newins scripts/qemu-ifdown kvm-ifdown
-
-	dodoc qemu/pc-bios/README
-	newdoc qemu/qemu-doc.html kvm-doc.html
-	newdoc qemu/qemu-tech.html kvm-tech.html
-
-	if use modules && ! use havekernel ; then
-		linux-mod_src_install
-	fi
-}
-
-pkg_postinst() {
-	elog "If you don't have kvm compiled into the kernel, make sure you have"
-	elog "the kernel module loaded before running kvm. The easiest way to"
-	elog "ensure that the kernel module is loaded is to load it on boot."
-	elog "For AMD CPUs the module is called 'kvm-amd'"
-	elog "For Intel CPUs the module is called 'kvm-intel'"
-	elog "Please review /etc/conf.d/modules for how to load these"
-	elog
-	elog "Make sure your user is in the 'kvm' group"
-	elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-	elog
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "kvm-ifup script from /etc/kvm."
-	echo
-}
diff --git a/app-emulation/kvm/kvm-82.ebuild b/app-emulation/kvm/kvm-82.ebuild
deleted file mode 100644
index c49980c43a4e..000000000000
--- a/app-emulation/kvm/kvm-82.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-82.ebuild,v 1.3 2009/05/14 14:40:02 dang Exp $
-
-EAPI="1"
-
-inherit eutils flag-o-matic toolchain-funcs linux-mod
-
-# Patchset git repo is at http://github.com/dang/kvm-patches/tree/master
-PATCHSET="kvm-patches-20090104"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	http://apollo.fprintf.net/downloads/${PATCHSET}.tar.gz"
-
-DESCRIPTION="Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-# Add bios back when it builds again
-IUSE="alsa esd gnutls havekernel +modules ncurses pulseaudio +sdl test vde"
-RESTRICT="test"
-
-RDEPEND="sys-libs/zlib
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	esd? ( media-sound/esound )
-	pulseaudio? ( media-sound/pulseaudio )
-	gnutls? ( net-libs/gnutls )
-	ncurses? ( sys-libs/ncurses )
-	sdl? ( >=media-libs/libsdl-1.2.11 )
-	vde? ( net-misc/vde )"
-
-#    bios? (
-#        sys-devel/dev86
-#        dev-lang/perl
-#        sys-power/iasl
-#    )
-DEPEND="${RDEPEND}
-	gnutls? ( dev-util/pkgconfig )
-	app-text/texi2html"
-
-QA_TEXTRELS="usr/bin/kvm"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if use havekernel && use modules ; then
-		ewarn "You have the 'havekernel' and 'modules' use flags enabled."
-		ewarn "'havekernel' trumps 'modules'; the kvm modules will not"
-		ewarn "be built.  You must ensure you have a compatible kernel"
-		ewarn "with the kvm modules on your own"
-	elif use havekernel ; then
-		ewarn "You have the 'havekernel' use flag set.  This means you"
-		ewarn "must ensure you have a compatible kernel on your own."
-	elif use modules ; then
-		if ! linux_chkconfig_present KVM; then
-			eerror "KVM now needs CONFIG_KVM built into your kernel, even"
-			eerror "if you're using the external modules from this package."
-			eerror "Please enable KVM support in your kernel, found at:"
-			eerror
-			eerror "  Virtualization"
-			eerror "    Kernel-based Virtual Machine (KVM) support"
-			eerror
-			die "KVM support not detected!"
-		fi
-		BUILD_TARGETS="all"
-		MODULE_NAMES="kvm(kvm:${S}/kernel:${S}/kernel/x86)"
-		MODULE_NAMES="${MODULE_NAMES} kvm-intel(kvm:${S}/kernel:${S}/kernel/x86)"
-		MODULE_NAMES="${MODULE_NAMES} kvm-amd(kvm:${S}/kernel:${S}/kernel/x86)"
-		linux-mod_pkg_setup
-	elif kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-		eerror "Either upgrade your kernel, or enable the 'modules' USE flag."
-		die "kvm version not compatible"
-	elif ! linux_chkconfig_present KVM; then
-		eerror "Please enable KVM support in your kernel, found at:"
-		eerror
-		eerror "  Virtualization"
-		eerror "    Kernel-based Virtual Machine (KVM) support"
-		eerror
-		eerror "or enable the 'modules' USE flag."
-		die "KVM support not detected!"
-	fi
-
-	if use sdl && ! built_with_use media-libs/libsdl X ; then
-		die "You need to rebuild media-libs/libsdl with the X use flag"
-	fi
-
-	enewgroup kvm
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' qemu/Makefile
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		qemu/Makefile qemu/Makefile.target
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			qemu/Makefile.target
-	# avoid strip
-	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' qemu/Makefile
-
-	# apply patchset
-	EPATCH_SOURCE="${WORKDIR}/${PATCHSET}"
-	EPATCH_SUFFIX="patch"
-	epatch
-}
-
-src_compile() {
-	local mycc conf_opts audio_opts
-
-	audio_opts="oss"
-	use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
-	use ncurses || conf_opts="$conf_opts --disable-curses"
-	use sdl || conf_opts="$conf_opts --disable-gfx-check --disable-sdl"
-	use vde || conf_opts="$conf_opts --disable-vde"
-	use alsa && audio_opts="alsa $audio_opts"
-	use esd && audio_opts="esd $audio_opts"
-	use pulseaudio && audio_opts="pa $audio_opts"
-	use sdl && audio_opts="sdl $audio_opts"
-	use modules && conf_opts="$conf_opts --kerneldir=$KV_DIR"
-	conf_opts="$conf_opts --prefix=/usr"
-	#conf_opts="$conf_opts --audio-drv-list=\"$audio_opts\""
-
-	./configure ${conf_opts} --audio-drv-list="$audio_opts" || die "econf failed"
-
-	emake libkvm || die "emake libkvm failed"
-
-	if use test; then
-		emake user || die "emake user failed"
-	fi
-
-	mycc=$(cat qemu/config-host.mak | egrep "^CC=" | cut -d "=" -f 2)
-
-	filter-flags -fpie -fstack-protector
-
-	# If using gentoo's compiler set the SPEC to non-hardened
-	if [ ! -z ${GCC_SPECS} -a -f ${GCC_SPECS} ]; then
-		local myccver=$(${mycc} -dumpversion)
-		local gccver=$($(tc-getBUILD_CC) -dumpversion)
-
-		#Is this a SPEC for the right compiler version?
-		myspec="${GCC_SPECS/${gccver}/${myccver}}"
-		if [ "${myspec}" == "${GCC_SPECS}" ]; then
-			shopt -s extglob
-			GCC_SPECS="${GCC_SPECS/%hardened*specs/vanilla.specs}"
-			shopt -u extglob
-		else
-			unset GCC_SPECS
-		fi
-	fi
-
-#    if use bios; then
-#        emake bios || die "emake bios failed"
-#        emake vgabios || die "emake vgabios failed"
-#    fi
-
-	emake qemu || die "emake qemu failed"
-
-	if use modules && ! use havekernel ; then
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	# kcmd so we don't install kernel modules which weren't build
-	emake DESTDIR="${D}" kcmd='#' install || die "make install failed"
-
-	exeinto /usr/bin/
-	doexe "${S}/kvm_stat"
-
-	mv "${D}"/usr/share/man/man1/qemu.1 "${D}"/usr/share/man/man1/kvm.1
-	mv "${D}"/usr/share/man/man1/qemu-img.1 "${D}"/usr/share/man/man1/kvm-img.1
-	mv "${D}"/usr/share/man/man8/qemu-nbd.8 "${D}"/usr/share/man/man8/kvm-nbd.8
-	mv "${D}"/usr/bin/qemu-img "${D}"/usr/bin/kvm-img
-	mv "${D}"/usr/bin/qemu-nbd "${D}"/usr/bin/kvm-nbd
-
-	insinto /etc/udev/rules.d/
-	doins scripts/65-kvm.rules
-
-	insinto /etc/kvm/
-	insopts -m0755
-	newins scripts/qemu-ifup kvm-ifup
-	newins scripts/qemu-ifdown kvm-ifdown
-
-	dodoc qemu/pc-bios/README
-	newdoc qemu/qemu-doc.html kvm-doc.html
-	newdoc qemu/qemu-tech.html kvm-tech.html
-
-	if use modules && ! use havekernel ; then
-		linux-mod_src_install
-	fi
-}
-
-pkg_postinst() {
-	elog "If you don't have kvm compiled into the kernel, make sure you have"
-	elog "the kernel module loaded before running kvm. The easiest way to"
-	elog "ensure that the kernel module is loaded is to load it on boot."
-	elog "For AMD CPUs the module is called 'kvm-amd'"
-	elog "For Intel CPUs the module is called 'kvm-intel'"
-	elog "Please review /etc/conf.d/modules for how to load these"
-	elog
-	elog "Make sure your user is in the 'kvm' group"
-	elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-	elog
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "kvm-ifup script from /etc/kvm."
-	echo
-}
diff --git a/app-emulation/kvm/kvm-83.ebuild b/app-emulation/kvm/kvm-83.ebuild
deleted file mode 100644
index efb81b049d5a..000000000000
--- a/app-emulation/kvm/kvm-83.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-83.ebuild,v 1.4 2009/05/14 14:40:02 dang Exp $
-
-EAPI="1"
-
-inherit eutils flag-o-matic toolchain-funcs linux-mod
-
-# Patchset git repo is at http://github.com/dang/kvm-patches/tree/master
-PATCHSET="kvm-patches-20090126"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	http://apollo.fprintf.net/downloads/${PATCHSET}.tar.gz"
-
-DESCRIPTION="Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-# Add bios back when it builds again
-IUSE="alsa esd gnutls havekernel +modules ncurses pulseaudio +sdl test vde"
-RESTRICT="test"
-
-RDEPEND="sys-libs/zlib
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	esd? ( media-sound/esound )
-	pulseaudio? ( media-sound/pulseaudio )
-	gnutls? ( net-libs/gnutls )
-	ncurses? ( sys-libs/ncurses )
-	sdl? ( >=media-libs/libsdl-1.2.11 )
-	vde? ( net-misc/vde )"
-
-#    bios? (
-#        sys-devel/dev86
-#        dev-lang/perl
-#        sys-power/iasl
-#    )
-DEPEND="${RDEPEND}
-	gnutls? ( dev-util/pkgconfig )
-	app-text/texi2html"
-
-QA_TEXTRELS="usr/bin/kvm"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if use havekernel && use modules ; then
-		ewarn "You have the 'havekernel' and 'modules' use flags enabled."
-		ewarn "'havekernel' trumps 'modules'; the kvm modules will not"
-		ewarn "be built.  You must ensure you have a compatible kernel"
-		ewarn "with the kvm modules on your own"
-	elif use havekernel ; then
-		ewarn "You have the 'havekernel' use flag set.  This means you"
-		ewarn "must ensure you have a compatible kernel on your own."
-	elif use modules ; then
-		if ! linux_chkconfig_present KVM; then
-			eerror "KVM now needs CONFIG_KVM built into your kernel, even"
-			eerror "if you're using the external modules from this package."
-			eerror "Please enable KVM support in your kernel, found at:"
-			eerror
-			eerror "  Virtualization"
-			eerror "    Kernel-based Virtual Machine (KVM) support"
-			eerror
-			die "KVM support not detected!"
-		fi
-		BUILD_TARGETS="all"
-		MODULE_NAMES="kvm(kvm:${S}/kernel:${S}/kernel/x86)"
-		MODULE_NAMES="${MODULE_NAMES} kvm-intel(kvm:${S}/kernel:${S}/kernel/x86)"
-		MODULE_NAMES="${MODULE_NAMES} kvm-amd(kvm:${S}/kernel:${S}/kernel/x86)"
-		linux-mod_pkg_setup
-	elif kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-		eerror "Either upgrade your kernel, or enable the 'modules' USE flag."
-		die "kvm version not compatible"
-	elif ! linux_chkconfig_present KVM; then
-		eerror "Please enable KVM support in your kernel, found at:"
-		eerror
-		eerror "  Virtualization"
-		eerror "    Kernel-based Virtual Machine (KVM) support"
-		eerror
-		eerror "or enable the 'modules' USE flag."
-		die "KVM support not detected!"
-	fi
-
-	if use sdl && ! built_with_use media-libs/libsdl X ; then
-		die "You need to rebuild media-libs/libsdl with the X use flag"
-	fi
-
-	enewgroup kvm
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' qemu/Makefile
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		qemu/Makefile qemu/Makefile.target
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			qemu/Makefile.target
-	# avoid strip
-	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' qemu/Makefile
-
-	# Fix building with vtd; bug #256685
-	epatch "${FILESDIR}"/${P}-vtd.patch
-
-	# apply patchset
-	EPATCH_SOURCE="${WORKDIR}/${PATCHSET}"
-	EPATCH_SUFFIX="patch"
-	epatch
-}
-
-src_compile() {
-	local mycc conf_opts audio_opts
-
-	audio_opts="oss"
-	use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
-	use ncurses || conf_opts="$conf_opts --disable-curses"
-	use sdl || conf_opts="$conf_opts --disable-gfx-check --disable-sdl"
-	use vde || conf_opts="$conf_opts --disable-vde"
-	use alsa && audio_opts="alsa $audio_opts"
-	use esd && audio_opts="esd $audio_opts"
-	use pulseaudio && audio_opts="pa $audio_opts"
-	use sdl && audio_opts="sdl $audio_opts"
-	use modules && conf_opts="$conf_opts --kerneldir=$KV_DIR"
-	conf_opts="$conf_opts --prefix=/usr"
-	#conf_opts="$conf_opts --audio-drv-list=\"$audio_opts\""
-
-	./configure ${conf_opts} --audio-drv-list="$audio_opts" || die "econf failed"
-
-	emake libkvm || die "emake libkvm failed"
-
-	if use test; then
-		emake user || die "emake user failed"
-	fi
-
-	mycc=$(cat qemu/config-host.mak | egrep "^CC=" | cut -d "=" -f 2)
-
-	filter-flags -fpie -fstack-protector
-
-	# If using gentoo's compiler set the SPEC to non-hardened
-	if [ ! -z ${GCC_SPECS} -a -f ${GCC_SPECS} ]; then
-		local myccver=$(${mycc} -dumpversion)
-		local gccver=$($(tc-getBUILD_CC) -dumpversion)
-
-		#Is this a SPEC for the right compiler version?
-		myspec="${GCC_SPECS/${gccver}/${myccver}}"
-		if [ "${myspec}" == "${GCC_SPECS}" ]; then
-			shopt -s extglob
-			GCC_SPECS="${GCC_SPECS/%hardened*specs/vanilla.specs}"
-			shopt -u extglob
-		else
-			unset GCC_SPECS
-		fi
-	fi
-
-#    if use bios; then
-#        emake bios || die "emake bios failed"
-#        emake vgabios || die "emake vgabios failed"
-#    fi
-
-	emake qemu || die "emake qemu failed"
-
-	if use modules && ! use havekernel ; then
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	# kcmd so we don't install kernel modules which weren't build
-	emake DESTDIR="${D}" kcmd='#' install || die "make install failed"
-
-	exeinto /usr/bin/
-	doexe "${S}/kvm_stat"
-
-	mv "${D}"/usr/share/man/man1/qemu.1 "${D}"/usr/share/man/man1/kvm.1
-	mv "${D}"/usr/share/man/man1/qemu-img.1 "${D}"/usr/share/man/man1/kvm-img.1
-	mv "${D}"/usr/share/man/man8/qemu-nbd.8 "${D}"/usr/share/man/man8/kvm-nbd.8
-	mv "${D}"/usr/bin/qemu-img "${D}"/usr/bin/kvm-img
-	mv "${D}"/usr/bin/qemu-nbd "${D}"/usr/bin/kvm-nbd
-
-	insinto /etc/udev/rules.d/
-	doins scripts/65-kvm.rules
-
-	insinto /etc/kvm/
-	insopts -m0755
-	newins scripts/qemu-ifup kvm-ifup
-	newins scripts/qemu-ifdown kvm-ifdown
-
-	dodoc qemu/pc-bios/README
-	newdoc qemu/qemu-doc.html kvm-doc.html
-	newdoc qemu/qemu-tech.html kvm-tech.html
-
-	if use modules && ! use havekernel ; then
-		linux-mod_src_install
-	fi
-}
-
-pkg_postinst() {
-	elog "If you don't have kvm compiled into the kernel, make sure you have"
-	elog "the kernel module loaded before running kvm. The easiest way to"
-	elog "ensure that the kernel module is loaded is to load it on boot."
-	elog "For AMD CPUs the module is called 'kvm-amd'"
-	elog "For Intel CPUs the module is called 'kvm-intel'"
-	elog "Please review /etc/conf.d/modules for how to load these"
-	elog
-	elog "Make sure your user is in the 'kvm' group"
-	elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-	elog
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "kvm-ifup script from /etc/kvm."
-	echo
-}
diff --git a/app-emulation/kvm/kvm-85-r1.ebuild b/app-emulation/kvm/kvm-88-r1.ebuild
index e43d5fb48190..04c1e4e74cdd 100644
--- a/app-emulation/kvm/kvm-85-r1.ebuild
+++ b/app-emulation/kvm/kvm-88-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-85-r1.ebuild,v 1.2 2009/04/28 17:45:24 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-88-r1.ebuild,v 1.1 2009/07/25 14:19:52 dang Exp $
 
 EAPI="2"
 
@@ -10,9 +10,9 @@ MY_PN="qemu-${PN}-devel"
 MY_P="${MY_PN}-${PV}"
 
 # Patchset git repo is at http://github.com/dang/kvm-patches/tree/master
-PATCHSET="kvm-patches-20090218"
+PATCHSET="kvm-patches-20090725"
 SRC_URI="mirror://sourceforge/kvm/${MY_P}.tar.gz
-	http://apollo.fprintf.net/downloads/${PATCHSET}.tar.gz"
+	http://dev.gentoo.org/~dang/files/${PATCHSET}.tar.gz"
 
 DESCRIPTION="Kernel-based Virtual Machine userland tools"
 HOMEPAGE="http://www.linux-kvm.org"
@@ -21,10 +21,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 # Add bios back when it builds again
-IUSE="alsa esd gnutls havekernel +modules ncurses pulseaudio +sdl test vde"
+IUSE="alsa bluetooth esd gnutls havekernel +modules ncurses pulseaudio +sdl vde"
 RESTRICT="test"
 
 RDEPEND="sys-libs/zlib
+	sys-apps/pciutils
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	esd? ( media-sound/esound )
 	pulseaudio? ( media-sound/pulseaudio )
@@ -32,6 +33,7 @@ RDEPEND="sys-libs/zlib
 	ncurses? ( sys-libs/ncurses )
 	sdl? ( >=media-libs/libsdl-1.2.11[X] )
 	vde? ( net-misc/vde )
+	bluetooth? ( net-wireless/bluez )
 	modules? ( =app-emulation/kvm-kmod-${PV} )"
 
 #    bios? (
@@ -78,15 +80,13 @@ pkg_setup() {
 src_prepare() {
 	cd "${S}"
 	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' qemu/Makefile
+	sed -i '/$(DESTDIR)$(docdir)/d' Makefile
 	# Alter target makefiles to accept CFLAGS set via flag-o
 	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		qemu/Makefile qemu/Makefile.target
+		Makefile Makefile.target
 	[[ -x /sbin/paxctl ]] && \
 		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			qemu/Makefile.target
-	# avoid strip
-	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' qemu/Makefile
+			Makefile.target
 
 	# Kernel patch; doesn't apply
 	rm "${WORKDIR}/${PATCHSET}"/07_all_kernel-longmode.patch
@@ -97,10 +97,6 @@ src_prepare() {
 	EPATCH_SOURCE="${WORKDIR}/${PATCHSET}"
 	EPATCH_SUFFIX="patch"
 	epatch
-
-	# Fix docs manually
-	sed -i -e 's/QEMU/KVM/g;s/qemu/kvm/g;s/Qemu/Kvm/g;s/kvm-options.texi/qemu-options.texi/' \
-		qemu/qemu-doc.texi qemu/qemu-img.texi qemu/qemu-nbd.texi
 }
 
 src_configure() {
@@ -109,31 +105,22 @@ src_configure() {
 	audio_opts="oss"
 	use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
 	use ncurses || conf_opts="$conf_opts --disable-curses"
-	use sdl || conf_opts="$conf_opts --disable-gfx-check --disable-sdl"
+	use sdl || conf_opts="$conf_opts --disable-sdl"
 	use vde || conf_opts="$conf_opts --disable-vde"
+	use bluetooth || conf_opts="$conf_opts --disable-bluez"
 	use alsa && audio_opts="alsa $audio_opts"
 	use esd && audio_opts="esd $audio_opts"
 	use pulseaudio && audio_opts="pa $audio_opts"
 	use sdl && audio_opts="sdl $audio_opts"
 	conf_opts="$conf_opts --prefix=/usr"
-	if has_multilib_profile && [[ "${DEFAULT_ABI}" == "x86" ]] ; then
-		conf_opts="$conf_opts --arch=i686"
-	fi
-
-	# set up asm symlink; not done now there's no kernel source
-	cd kernel/include && ln -sf asm-x86 asm && cd ../..
+	conf_opts="$conf_opts --disable-strip"
+	conf_opts="$conf_opts --disable-xen"
 
 	./configure ${conf_opts} --audio-drv-list="$audio_opts" || die "econf failed"
 }
 
 src_compile() {
-	emake libkvm || die "emake libkvm failed"
-
-	if use test; then
-		emake user || die "emake user failed"
-	fi
-
-	mycc=$(cat qemu/config-host.mak | egrep "^CC=" | cut -d "=" -f 2)
+	mycc=$(cat config-host.mak | egrep "^CC=" | cut -d "=" -f 2)
 
 	filter-flags -fpie -fstack-protector
 
@@ -153,37 +140,40 @@ src_compile() {
 		fi
 	fi
 
-#    if use bios; then
-#        emake bios || die "emake bios failed"
-#        emake vgabios || die "emake vgabios failed"
-#    fi
-
-	emake qemu || die "emake qemu failed"
+	emake || die "emake failed"
 }
 
 src_install() {
+	# Fix docs manually (dynamically generated during compile)
+	sed -i -e 's/QEMU/KVM/g;\
+			s/qemu/kvm/g;\
+			s/Qemu/Kvm/g;\
+			s/kvm-\([a-z\-]*\)\.texi/qemu-\1\.texi/g' \
+		*.texi *.1 *.8
+
 	emake DESTDIR="${D}" install || die "make install failed"
 
-	exeinto /usr/bin/
-	doexe "${S}/kvm_stat"
+	dobin "${S}/kvm_stat"
 
 	mv "${D}"/usr/share/man/man1/qemu.1 "${D}"/usr/share/man/man1/kvm.1
 	mv "${D}"/usr/share/man/man1/qemu-img.1 "${D}"/usr/share/man/man1/kvm-img.1
 	mv "${D}"/usr/share/man/man8/qemu-nbd.8 "${D}"/usr/share/man/man8/kvm-nbd.8
 	mv "${D}"/usr/bin/qemu-img "${D}"/usr/bin/kvm-img
 	mv "${D}"/usr/bin/qemu-nbd "${D}"/usr/bin/kvm-nbd
+	mv "${D}"/usr/bin/qemu-io "${D}"/usr/bin/kvm-io
+	rm "${D}"/usr/share/kvm/openbios-{sparc32,sparc64,ppc}
 
 	insinto /etc/udev/rules.d/
-	doins scripts/65-kvm.rules
+	doins kvm/scripts/65-kvm.rules
 
 	insinto /etc/kvm/
 	insopts -m0755
-	newins scripts/qemu-ifup kvm-ifup
-	newins scripts/qemu-ifdown kvm-ifdown
+	newins kvm/scripts/qemu-ifup kvm-ifup
+	newins kvm/scripts/qemu-ifdown kvm-ifdown
 
-	dodoc qemu/pc-bios/README
-	newdoc qemu/qemu-doc.html kvm-doc.html
-	newdoc qemu/qemu-tech.html kvm-tech.html
+	dodoc pc-bios/README
+	newdoc qemu-doc.html kvm-doc.html
+	newdoc qemu-tech.html kvm-tech.html
 }
 
 pkg_postinst() {