From: Thomas Sachau <tommy@gentoo.org>
Date: Wed, 10 Mar 2010 18:17:27 +0000 (+0000)
Subject: Add message, if no targets are defined (bug #298287), some cleanup, remove older... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=61c7ce4e829074b13bc4626d3a61e66f7a386b3e;p=gentoo.git

Add message, if no targets are defined (bug #298287), some cleanup, remove older 0.12* versions
Package-Manager: portage-2.2_rc67-r1/cvs/Linux x86_64
---

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 7fc96dcbc78e..3ecd8345bb5e 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.21 2010/03/07 03:15:30 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.22 2010/03/10 18:17:27 tommy Exp $
+
+  10 Mar 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -qemu-kvm-0.12.1.ebuild, -qemu-kvm-0.12.1.1.ebuild,
+  -qemu-kvm-0.12.1.2.ebuild, -qemu-kvm-0.12.2.ebuild,
+  -qemu-kvm-0.12.2-r1.ebuild, qemu-kvm-0.12.3.ebuild:
+  Add message, if no targets are defined (bug #298287), some cleanup, remove
+  older 0.12* versions
 
   07 Mar 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   qemu-kvm-9999.ebuild, +files/qemu-kvm-9999-sysconfigdir.patch:
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index f5834e1bbf58..c8d3551db6b0 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -1,23 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qemu-0.11.0-mips64-user-fix.patch 313 RMD160 db016e0a48990a435dd6cf6e807145b33ada4908 SHA1 2ea913b1bcd29734a6d4011794bdb4aa3599a184 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f
 AUX qemu-kvm 61 RMD160 83882e881a067065258f562ad1e60440666c85d3 SHA1 a965f19031e303d583bd541c9d8fff2214262e6b SHA256 211d51f0a7d3d2ba8c53016c75e2b483feadbb65e383b1eec81d9cebf6a22c29
 AUX qemu-kvm-0.12.1-kvm_save_mpstate-workaround.patch 622 RMD160 d3add3022d9eba3ec07ccade6f169b4d758d23e8 SHA1 b41e9516d69c179701906f157750e72a82c650ca SHA256 f51a7b3ea49f814a5f7726daeac08e5ab641d2e0ea72e90b4b83dd914ca742ff
 AUX qemu-kvm-0.12.2-virtio-large-iovecs.patch 987 RMD160 b16ae8ffd7a4b2d32c32d0ae56c707958344b3eb SHA1 65cd9b99929e5057d636d9676f5a3435db24695f SHA256 e4ca83f65c4deb16e2c22d728e547012aa6110a00ced92a9590990307ab9f7df
 AUX qemu-kvm-9999-sysconfigdir.patch 297 RMD160 7b9d6c404e4e5bea44625b92b1956816519ca7c3 SHA1 bf7c7b7af0997100595e641fd7aee0c5ba9e9b2f SHA256 53c6f861df73e2183f373e464fdfefc55af885dc0b7d1c52d6ad9e853eead92b
 DIST qemu-kvm-0.11.1.tar.gz 4384334 RMD160 0f945f1812b3a42a5642698d2f15bd8f456612f8 SHA1 291d0b771feb4c67bce71d393868a6d1a1db345b SHA256 7df5b589fabb1f0f35a06abce7e34c81574e09ade538ba883ef5b43ccbd8458b
-DIST qemu-kvm-0.12.1.1.tar.gz 4712192 RMD160 bb457854c79951bdb0db90da30bd31ac6a033d02 SHA1 0383219e824dff766821444c42c962d21e56a63f SHA256 38b3e272704bf53c1198ccc2d1492df656bcc1da53f1e04c56d9ee4063e2286f
-DIST qemu-kvm-0.12.1.2.tar.gz 4712236 RMD160 55052450668310d6e167fe12e6a7a933cee62a3a SHA1 dee7359094757af77ea839bbfd9dca8826edcbd2 SHA256 472ddba26c30390dfcb3eb5f7925b442f6152062e919badf0a61586073eabdcc
-DIST qemu-kvm-0.12.1.tar.gz 4712004 RMD160 f2c7842301e5c68e91f291bb3d74e2019bb7ee3c SHA1 0c2a8bb7dd98a5214bbad5bc954ae3111646c8cd SHA256 c65c5afc43176b3031b52b664704269a79e40e9acdc0c1aae2bcc46875d3051a
 DIST qemu-kvm-0.12.2.tar.gz 4713699 RMD160 1581fa5ec5dc168de3667a3c28cd56ba0b2e26b8 SHA1 27bb9b55e6539c0dc6b57e08812df76b02544c62 SHA256 82a6291857f67f84da259ee30f6d46699b73e38964ef82fb6c8000386e4baf5a
 DIST qemu-kvm-0.12.3.tar.gz 4718791 RMD160 fe88117e6e32188e097a86f95bffc4b74422a5e6 SHA1 235a790056a1b751791e64dd499129b2dbf55be8 SHA256 77cccdc8938b33f3ed74763d01deaad58918c85f04a06afd10f00857b504c2b2
 EBUILD qemu-kvm-0.11.1-r1.ebuild 5797 RMD160 a3f4f239cd7a6cc9a7debfe6d347e0d9e1f288ff SHA1 60f6d85c50b14c3926e5e7e5f44e576bbf916d6a SHA256 a3d6efc3bcf9f169bbcad3ebe1dd0efbfb71ad1b185ab26c003191594b34edd4
 EBUILD qemu-kvm-0.11.1.ebuild 5725 RMD160 87f907a96b5b7cc6387de9b738c6261c57605877 SHA1 5cb4172354f07be1c0b9199b1aa2d880d5b1ef54 SHA256 7bd18bfac7eaa453b5edacc4111426ceab8a8652b311ad97cb6310a42392f5ed
-EBUILD qemu-kvm-0.12.1.1.ebuild 6650 RMD160 86561dc43d60ede309596cae7eeb99b49cead334 SHA1 2673927547239ee97de90b2432c8369ebc861c22 SHA256 1c609b9a03134c80976b22b36e15d1be368e9d0acef1497c8eef2f5136e473a2
-EBUILD qemu-kvm-0.12.1.2.ebuild 6650 RMD160 babfb672f3a782f0b72d3c038de320df6c0117a0 SHA1 9d16ab3f19a4ad6a80cf36fba629f979bdbb59df SHA256 68d839519c77e711d6b8a1c91807011cbe6b87c212649f88b2e394bcf9a1f112
-EBUILD qemu-kvm-0.12.1.ebuild 6576 RMD160 30630cd1c0148fa2f5f324ce267b80c8335d39a0 SHA1 b1d84f6d8bca3d80b492b894a5ccca41d44544e9 SHA256 862a2b69abe34a59da071393585230ce34babf256ac1800eb04fbfda928f5378
-EBUILD qemu-kvm-0.12.2-r1.ebuild 6705 RMD160 9861eb69394ed00cfa6f06519f381e6d2921c081 SHA1 0706a6118b17b7a3b22c60ae6bcb86d950a411c2 SHA256 e54c74d3024d0c6288a23c7530907a7a691d9716bf1ea531164d610c450b30f3
 EBUILD qemu-kvm-0.12.2-r2.ebuild 6839 RMD160 a9ace9aa4478ce9ed74fa61c0cecb80d0f22611a SHA1 8904c62ce54d589d9b8d817da793ddc559f2cb5c SHA256 cb39e309822fe468b362b316ad05428f7038b0c56a61a6da14334eca21f7ea8d
-EBUILD qemu-kvm-0.12.2.ebuild 6648 RMD160 333447896ae44355399f39b23e32ef2138a46741 SHA1 bac4ff49097b10afac1448d5939c5aa11e5b6567 SHA256 bdd45631910028f65be2664cf19572a78f9671504809d73f2760c52c23a44a1b
-EBUILD qemu-kvm-0.12.3.ebuild 6837 RMD160 40424585af908c62a46f331f7af75624247f9108 SHA1 2393e010d31cca98046b845ae4e4b636de640f8f SHA256 84a47c6ce72de72688e2de5f4771c5a589936648195b4fc5c82f75d2b7fd97cb
+EBUILD qemu-kvm-0.12.3.ebuild 7108 RMD160 e92da5efdd82756dd0c569774eeb1c82b434af97 SHA1 624085171f0d67517129a6cb225a76f7a8447add SHA256 33dcde730b4fc725a2241072c68b15b74a4044f28021c76c006bc165222b8617
 EBUILD qemu-kvm-9999.ebuild 6966 RMD160 ccddfa0584684e8a08a52656aa704afc59ba3da4 SHA1 abf1581414776ab93b44a69989f2502160b0cfbd SHA256 cc6d1bffac166fefe6832f7d465d6e9945df86d5de000a52105a24d44e7c43bb
-MISC ChangeLog 4468 RMD160 08123f162fd0353909aabdafe444e7aad1a331c9 SHA1 549b64fd9861360ded024c6fb429f201df608437 SHA256 d157bc564b7a3f1c2f7160e0a7f8e527aa2c09d5e0e8dbaba508b74b35f69ade
+MISC ChangeLog 4784 RMD160 a07272ae265256e6d90be24cec774b34aa1d2eeb SHA1 5432501996091552e4818a2b9c955bdecc530880 SHA256 80acbe02fc315e74079fa7bee1eb70daaa777c0f095c449f832bb9c966df81f9
 MISC metadata.xml 978 RMD160 2e120b8332c7fc1d6b4baa4149b0f13a73c74fb2 SHA1 5fe37c22d64ca52ef6d26debc46b23b415e04a7a SHA256 76676f1a327e743dd3579109250ace6012ac93ffea5d1daab0a24b194b55164f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iJwEAQECAAYFAkuX4kMACgkQG7kqcTWJkGcFKwQAgYMavXWYmwqACnvw8aie5DwO
+v8lW2X2VlHBMG0DhwXBqM/CsoyR5xuUA8trGQOngQtjeAmUoBnA/Ja5tXN5l0FHe
+YnB20xJ/xUlmmlFBgw2tNXzoWCYacYWl1WRoHALbxajJGliNfvJJovnWGA7F1Y/8
+d6+Gm8s+QOtaIiugex4=
+=7hkq
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.12.1.1.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.1.1.ebuild
deleted file mode 100644
index 56978b4cc5a6..000000000000
--- a/app-emulation/qemu-kvm/qemu-kvm-0.12.1.1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.1.1.ebuild,v 1.6 2010/02/12 17:52:13 cardoe Exp $
-
-EAPI="2"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
-	GIT_ECLASS="git"
-fi
-
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-# xen is disabled until the deps are fixed
-IUSE="+aio alsa bluetooth curl esd gnutls fdt hardened kvm-trace ncurses \
-pulseaudio sasl +sdl vde"
-
-COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} +qemu_user_targets_${target}"
-done
-
-RESTRICT="test"
-
-RDEPEND="
-	!app-emulation/kqemu
-	!app-emulation/qemu
-	!app-emulation/qemu-softmmu
-	!app-emulation/qemu-user
-	net-misc/bridge-utils
-	sys-apps/iproute2
-	sys-apps/pciutils
-	>=sys-apps/util-linux-2.16.0
-	sys-libs/zlib
-	aio? ( dev-libs/libaio )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	curl? ( net-misc/curl )
-	esd? ( media-sound/esound )
-	fdt? ( sys-apps/dtc )
-	gnutls? ( net-libs/gnutls )
-	ncurses? ( sys-libs/ncurses )
-	pulseaudio? ( media-sound/pulseaudio )
-	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( >=media-libs/libsdl-1.2.11[X] )
-	vde? ( net-misc/vde )
-"
-
-DEPEND="${RDEPEND}
-	app-text/texi2html
-	>=sys-kernel/linux-headers-2.6.29
-	gnutls? ( dev-util/pkgconfig )"
-
-kvm_kern_war() {
-	eerror "Please enable KVM support in your kernel, found at:"
-	eerror
-	eerror "  Virtualization"
-	eerror "    Kernel-based Virtual Machine (KVM) support"
-	eerror
-}
-
-pkg_setup() {
-	if 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"
-		die "qemu-kvm version not compatible"
-	else
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-			kvm_kern_warn
-		elif ! linux_chkconfig_present KVM; then
-			kvm_kern_warn
-		fi
-	fi
-
-	enewgroup kvm
-}
-
-src_prepare() {
-	# avoid fdt till an updated release appears
-	sed -i -e 's:fdt="yes":fdt="no":' configure || die
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-	# append CFLAGS while linking
-	sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
-
-	# remove part to make udev happy
-	sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
-
-	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
-}
-
-src_configure() {
-	local conf_opts audio_opts softmmu_targets user_targets
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets} ${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets} ${target}-linux-user"
-	done
-
-	if [ ! -z "${softmmu_targets}" ]; then
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-	fi
-
-	if [ ! -z "${user_targets}" ]; then
-		einfo "Building the following user targets: ${user_targets}"
-		conf_opts="${conf_opts} --enable-linux-user"
-	else
-		conf_opts="${conf_opts} --disable-linux-user"
-	fi
-
-	#config options
-	conf_opts="${conf_opts} $(use_enable aio linux-aio)"
-	use bluetooth || conf_opts="${conf_opts} --disable-bluez"
-	conf_opts="${conf_opts} $(use_enable curl)"
-	use gnutls || conf_opts="${conf_opts} --disable-vnc-tls"
-	conf_opts="${conf_opts} $(use_enable fdt)"
-	use hardened && conf_opts="${conf_opts} --enable-user-pie"
-	use kvm-trace && conf_opts="${conf_opts} --with-kvm-trace"
-	use ncurses || conf_opts="${conf_opts} --disable-curses"
-	use sasl || conf_opts="${conf_opts} --disable-vnc-sasl"
-	use sdl || conf_opts="${conf_opts} --disable-sdl"
-	use vde || conf_opts="${conf_opts} --disable-vde"
-#	conf_opts="${conf_opts} $(use_enable xen)"
-	conf_opts="${conf_opts} --disable-xen"
-	conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
-
-	# audio options
-	audio_opts="oss"
-	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}"
-	./configure --prefix=/usr \
-		--disable-strip \
-		--enable-kvm \
-		--enable-nptl \
-		--enable-uuid \
-		${conf_opts} \
-		--audio-drv-list="${audio_opts}" \
-		--target-list="${softmmu_targets} ${user_targets}" \
-		--cc=$(tc-getCC) \
-		--host-cc=$(tc-getCC) \
-		|| die "configure failed"
-
-		# this is for qemu upstream's threaded support which is
-		# in development and broken
-		# the kvm project has its own support for threaded IO
-		# which is always on and works
-#		--enable-io-thread \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc/udev/rules.d/
-	doins kvm/scripts/65-kvm.rules || die
-
-	insinto /etc/qemu/
-	insopts -m0755
-	doins kvm/scripts/qemu-ifup || die
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
-	newdoc pc-bios/README README.pc-bios || die
-	dohtml qemu-doc.html qemu-tech.html || die
-
-	dobin "${FILESDIR}"/qemu-kvm
-	dosym /usr/bin/qemu-kvm /usr/bin/kvm
-}
-
-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/qemu-kvm/qemu-kvm-0.12.1.2.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.1.2.ebuild
deleted file mode 100644
index 87a2288ab3eb..000000000000
--- a/app-emulation/qemu-kvm/qemu-kvm-0.12.1.2.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.1.2.ebuild,v 1.2 2010/02/12 17:52:13 cardoe Exp $
-
-EAPI="2"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
-	GIT_ECLASS="git"
-fi
-
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-# xen is disabled until the deps are fixed
-IUSE="+aio alsa bluetooth curl esd gnutls fdt hardened kvm-trace ncurses \
-pulseaudio sasl +sdl vde"
-
-COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} +qemu_user_targets_${target}"
-done
-
-RESTRICT="test"
-
-RDEPEND="
-	!app-emulation/kqemu
-	!app-emulation/qemu
-	!app-emulation/qemu-softmmu
-	!app-emulation/qemu-user
-	net-misc/bridge-utils
-	sys-apps/iproute2
-	sys-apps/pciutils
-	>=sys-apps/util-linux-2.16.0
-	sys-libs/zlib
-	aio? ( dev-libs/libaio )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	curl? ( net-misc/curl )
-	esd? ( media-sound/esound )
-	fdt? ( sys-apps/dtc )
-	gnutls? ( net-libs/gnutls )
-	ncurses? ( sys-libs/ncurses )
-	pulseaudio? ( media-sound/pulseaudio )
-	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( >=media-libs/libsdl-1.2.11[X] )
-	vde? ( net-misc/vde )
-"
-
-DEPEND="${RDEPEND}
-	app-text/texi2html
-	>=sys-kernel/linux-headers-2.6.29
-	gnutls? ( dev-util/pkgconfig )"
-
-kvm_kern_war() {
-	eerror "Please enable KVM support in your kernel, found at:"
-	eerror
-	eerror "  Virtualization"
-	eerror "    Kernel-based Virtual Machine (KVM) support"
-	eerror
-}
-
-pkg_setup() {
-	if 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"
-		die "qemu-kvm version not compatible"
-	else
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-			kvm_kern_warn
-		elif ! linux_chkconfig_present KVM; then
-			kvm_kern_warn
-		fi
-	fi
-
-	enewgroup kvm
-}
-
-src_prepare() {
-	# avoid fdt till an updated release appears
-	sed -i -e 's:fdt="yes":fdt="no":' configure || die
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-	# append CFLAGS while linking
-	sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
-
-	# remove part to make udev happy
-	sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
-
-	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
-}
-
-src_configure() {
-	local conf_opts audio_opts softmmu_targets user_targets
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets} ${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets} ${target}-linux-user"
-	done
-
-	if [ ! -z "${softmmu_targets}" ]; then
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-	fi
-
-	if [ ! -z "${user_targets}" ]; then
-		einfo "Building the following user targets: ${user_targets}"
-		conf_opts="${conf_opts} --enable-linux-user"
-	else
-		conf_opts="${conf_opts} --disable-linux-user"
-	fi
-
-	#config options
-	conf_opts="${conf_opts} $(use_enable aio linux-aio)"
-	use bluetooth || conf_opts="${conf_opts} --disable-bluez"
-	conf_opts="${conf_opts} $(use_enable curl)"
-	use gnutls || conf_opts="${conf_opts} --disable-vnc-tls"
-	conf_opts="${conf_opts} $(use_enable fdt)"
-	use hardened && conf_opts="${conf_opts} --enable-user-pie"
-	use kvm-trace && conf_opts="${conf_opts} --with-kvm-trace"
-	use ncurses || conf_opts="${conf_opts} --disable-curses"
-	use sasl || conf_opts="${conf_opts} --disable-vnc-sasl"
-	use sdl || conf_opts="${conf_opts} --disable-sdl"
-	use vde || conf_opts="${conf_opts} --disable-vde"
-#	conf_opts="${conf_opts} $(use_enable xen)"
-	conf_opts="${conf_opts} --disable-xen"
-	conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
-
-	# audio options
-	audio_opts="oss"
-	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}"
-	./configure --prefix=/usr \
-		--disable-strip \
-		--enable-kvm \
-		--enable-nptl \
-		--enable-uuid \
-		${conf_opts} \
-		--audio-drv-list="${audio_opts}" \
-		--target-list="${softmmu_targets} ${user_targets}" \
-		--cc=$(tc-getCC) \
-		--host-cc=$(tc-getCC) \
-		|| die "configure failed"
-
-		# this is for qemu upstream's threaded support which is
-		# in development and broken
-		# the kvm project has its own support for threaded IO
-		# which is always on and works
-#		--enable-io-thread \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc/udev/rules.d/
-	doins kvm/scripts/65-kvm.rules || die
-
-	insinto /etc/qemu/
-	insopts -m0755
-	doins kvm/scripts/qemu-ifup || die
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
-	newdoc pc-bios/README README.pc-bios || die
-	dohtml qemu-doc.html qemu-tech.html || die
-
-	dobin "${FILESDIR}"/qemu-kvm
-	dosym /usr/bin/qemu-kvm /usr/bin/kvm
-}
-
-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/qemu-kvm/qemu-kvm-0.12.1.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.1.ebuild
deleted file mode 100644
index c78c4258eb52..000000000000
--- a/app-emulation/qemu-kvm/qemu-kvm-0.12.1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.1.ebuild,v 1.7 2010/02/12 17:52:13 cardoe Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs linux-info
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+aio alsa bluetooth curl esd gnutls fdt hardened kvm-trace ncurses \
-pulseaudio sasl +sdl vde"
-#xen
-
-COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
-
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} +qemu_user_targets_${target}"
-done
-
-RESTRICT="test"
-
-RDEPEND="sys-libs/zlib
-	net-misc/bridge-utils
-	sys-apps/iproute2
-	sys-apps/pciutils
-	>=sys-apps/util-linux-2.16.0
-	aio? ( dev-libs/libaio )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	curl? ( net-misc/curl )
-	esd? ( media-sound/esound )
-	gnutls? ( net-libs/gnutls )
-	fdt? ( sys-apps/dtc )
-	ncurses? ( sys-libs/ncurses )
-	pulseaudio? ( media-sound/pulseaudio )
-	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( >=media-libs/libsdl-1.2.11[X] )
-	vde? ( net-misc/vde )
-	!app-emulation/qemu-softmmu
-	!app-emulation/qemu-user
-	!app-emulation/qemu
-	!app-emulation/kqemu"
-
-DEPEND="${RDEPEND}
-	app-text/texi2html
-	>=sys-kernel/linux-headers-2.6.29
-	gnutls? ( dev-util/pkgconfig )"
-
-kvm_kern_war() {
-	eerror "Please enable KVM support in your kernel, found at:"
-	eerror
-	eerror "  Virtualization"
-	eerror "    Kernel-based Virtual Machine (KVM) support"
-	eerror
-}
-
-pkg_setup() {
-	if 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"
-		die "qemu-kvm version not compatible"
-	else
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-			kvm_kern_warn
-		elif ! linux_chkconfig_present KVM; then
-			kvm_kern_warn
-		fi
-	fi
-
-	enewgroup kvm
-}
-
-src_prepare() {
-	# avoid fdt till an updated release appears
-	sed -i -e 's:fdt="yes":fdt="no":' configure || die
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-#	[[ -x /sbin/paxctl ]] && \
-#		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-#			Makefile.target || die
-	# append CFLAGS while linking
-	sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
-
-	# remove part to make udev happy
-	sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
-
-	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch" \
-		"${FILESDIR}"/${P}-kvm_save_mpstate-workaround.patch
-}
-
-src_configure() {
-	local conf_opts audio_opts softmmu_targets user_targets
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets} ${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets} ${target}-linux-user"
-	done
-
-	if [ ! -z "${softmmu_targets}" ]; then
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-	fi
-
-	if [ ! -z "${user_targets}" ]; then
-		einfo "Building the following user targets: ${user_targets}"
-		conf_opts="${conf_opts} --enable-linux-user"
-	else
-		conf_opts="${conf_opts} --disable-linux-user"
-	fi
-
-	#config options
-	conf_opts="${conf_opts} $(use_enable aio linux-aio)"
-	use bluetooth || conf_opts="${conf_opts} --disable-bluez"
-	conf_opts="${conf_opts} $(use_enable curl)"
-	use gnutls || conf_opts="${conf_opts} --disable-vnc-tls"
-	conf_opts="${conf_opts} $(use_enable fdt)"
-	use hardened && conf_opts="${conf_opts} --enable-user-pie"
-	use kvm-trace && conf_opts="${conf_opts} --with-kvm-trace"
-	use ncurses || conf_opts="${conf_opts} --disable-curses"
-	use sasl || conf_opts="${conf_opts} --disable-vnc-sasl"
-	use sdl || conf_opts="${conf_opts} --disable-sdl"
-	use vde || conf_opts="${conf_opts} --disable-vde"
-#	conf_opts="${conf_opts} $(use_enable xen)"
-	conf_opts="${conf_opts} --disable-xen"
-	conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
-
-	# audio options
-	audio_opts="oss"
-	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}"
-	./configure --prefix=/usr \
-		--disable-strip \
-		--enable-kvm \
-		--enable-nptl \
-		--enable-uuid \
-		${conf_opts} \
-		--audio-drv-list="${audio_opts}" \
-		--target-list="${softmmu_targets} ${user_targets}" \
-		--cc=$(tc-getCC) \
-		--host-cc=$(tc-getCC) \
-		|| die "configure failed"
-
-		# this is for qemu upstream's threaded support which is
-		# in development and broken
-		# the kvm project has its own support for threaded IO
-		# which is always on and works
-#		--enable-io-thread \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc/udev/rules.d/
-	doins kvm/scripts/65-kvm.rules || die
-
-	insinto /etc/qemu/
-	insopts -m0755
-	doins kvm/scripts/qemu-ifup || die
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
-	newdoc pc-bios/README README.pc-bios || die
-	dohtml qemu-doc.html qemu-tech.html || die
-
-	dobin "${FILESDIR}"/qemu-kvm
-	dosym /usr/bin/qemu-kvm /usr/bin/kvm
-}
-
-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/qemu-kvm/qemu-kvm-0.12.2-r1.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.2-r1.ebuild
deleted file mode 100644
index d7f109486f62..000000000000
--- a/app-emulation/qemu-kvm/qemu-kvm-0.12.2-r1.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.2-r1.ebuild,v 1.2 2010/02/12 17:52:13 cardoe Exp $
-
-EAPI="2"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
-	GIT_ECLASS="git"
-fi
-
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-# xen is disabled until the deps are fixed
-IUSE="+aio alsa bluetooth curl esd gnutls fdt hardened kvm-trace ncurses \
-pulseaudio sasl +sdl vde"
-
-COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} +qemu_user_targets_${target}"
-done
-
-RESTRICT="test"
-
-RDEPEND="
-	!app-emulation/kqemu
-	!app-emulation/qemu
-	!app-emulation/qemu-softmmu
-	!app-emulation/qemu-user
-	net-misc/bridge-utils
-	sys-apps/iproute2
-	sys-apps/pciutils
-	>=sys-apps/util-linux-2.16.0
-	sys-libs/zlib
-	aio? ( dev-libs/libaio )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	curl? ( net-misc/curl )
-	esd? ( media-sound/esound )
-	fdt? ( sys-apps/dtc )
-	gnutls? ( net-libs/gnutls )
-	ncurses? ( sys-libs/ncurses )
-	pulseaudio? ( media-sound/pulseaudio )
-	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( >=media-libs/libsdl-1.2.11[X] )
-	vde? ( net-misc/vde )
-"
-
-DEPEND="${RDEPEND}
-	app-text/texi2html
-	>=sys-kernel/linux-headers-2.6.29
-	gnutls? ( dev-util/pkgconfig )"
-
-kvm_kern_war() {
-	eerror "Please enable KVM support in your kernel, found at:"
-	eerror
-	eerror "  Virtualization"
-	eerror "    Kernel-based Virtual Machine (KVM) support"
-	eerror
-}
-
-pkg_setup() {
-	if 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"
-		die "qemu-kvm version not compatible"
-	else
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-			kvm_kern_warn
-		elif ! linux_chkconfig_present KVM; then
-			kvm_kern_warn
-		fi
-	fi
-
-	enewgroup kvm
-}
-
-src_prepare() {
-	# avoid fdt till an updated release appears
-	sed -i -e 's:fdt="yes":fdt="no":' configure || die
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-	# append CFLAGS while linking
-	sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
-
-	# remove part to make udev happy
-	sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
-
-	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
-
-	epatch "${FILESDIR}"/${P}-virtio-large-iovecs.patch
-}
-
-src_configure() {
-	local conf_opts audio_opts softmmu_targets user_targets
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets} ${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets} ${target}-linux-user"
-	done
-
-	if [ ! -z "${softmmu_targets}" ]; then
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-	fi
-
-	if [ ! -z "${user_targets}" ]; then
-		einfo "Building the following user targets: ${user_targets}"
-		conf_opts="${conf_opts} --enable-linux-user"
-	else
-		conf_opts="${conf_opts} --disable-linux-user"
-	fi
-
-	#config options
-	conf_opts="${conf_opts} $(use_enable aio linux-aio)"
-	use bluetooth || conf_opts="${conf_opts} --disable-bluez"
-	conf_opts="${conf_opts} $(use_enable curl)"
-	use gnutls || conf_opts="${conf_opts} --disable-vnc-tls"
-	conf_opts="${conf_opts} $(use_enable fdt)"
-	use hardened && conf_opts="${conf_opts} --enable-user-pie"
-	use kvm-trace && conf_opts="${conf_opts} --with-kvm-trace"
-	use ncurses || conf_opts="${conf_opts} --disable-curses"
-	use sasl || conf_opts="${conf_opts} --disable-vnc-sasl"
-	use sdl || conf_opts="${conf_opts} --disable-sdl"
-	use vde || conf_opts="${conf_opts} --disable-vde"
-#	conf_opts="${conf_opts} $(use_enable xen)"
-	conf_opts="${conf_opts} --disable-xen"
-	conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
-
-	# audio options
-	audio_opts="oss"
-	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}"
-	./configure --prefix=/usr \
-		--disable-strip \
-		--enable-kvm \
-		--enable-nptl \
-		--enable-uuid \
-		${conf_opts} \
-		--audio-drv-list="${audio_opts}" \
-		--target-list="${softmmu_targets} ${user_targets}" \
-		--cc=$(tc-getCC) \
-		--host-cc=$(tc-getCC) \
-		|| die "configure failed"
-
-		# this is for qemu upstream's threaded support which is
-		# in development and broken
-		# the kvm project has its own support for threaded IO
-		# which is always on and works
-#		--enable-io-thread \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc/udev/rules.d/
-	doins kvm/scripts/65-kvm.rules || die
-
-	insinto /etc/qemu/
-	insopts -m0755
-	doins kvm/scripts/qemu-ifup || die
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
-	newdoc pc-bios/README README.pc-bios || die
-	dohtml qemu-doc.html qemu-tech.html || die
-
-	dobin "${FILESDIR}"/qemu-kvm
-	dosym /usr/bin/qemu-kvm /usr/bin/kvm
-}
-
-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/qemu-kvm/qemu-kvm-0.12.2.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.2.ebuild
deleted file mode 100644
index a431e4427bd9..000000000000
--- a/app-emulation/qemu-kvm/qemu-kvm-0.12.2.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.2.ebuild,v 1.2 2010/02/12 17:52:13 cardoe Exp $
-
-EAPI="2"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
-	GIT_ECLASS="git"
-fi
-
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-# xen is disabled until the deps are fixed
-IUSE="+aio alsa bluetooth curl esd gnutls fdt hardened kvm-trace ncurses \
-pulseaudio sasl +sdl vde"
-
-COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} +qemu_user_targets_${target}"
-done
-
-RESTRICT="test"
-
-RDEPEND="
-	!app-emulation/kqemu
-	!app-emulation/qemu
-	!app-emulation/qemu-softmmu
-	!app-emulation/qemu-user
-	net-misc/bridge-utils
-	sys-apps/iproute2
-	sys-apps/pciutils
-	>=sys-apps/util-linux-2.16.0
-	sys-libs/zlib
-	aio? ( dev-libs/libaio )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	curl? ( net-misc/curl )
-	esd? ( media-sound/esound )
-	fdt? ( sys-apps/dtc )
-	gnutls? ( net-libs/gnutls )
-	ncurses? ( sys-libs/ncurses )
-	pulseaudio? ( media-sound/pulseaudio )
-	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( >=media-libs/libsdl-1.2.11[X] )
-	vde? ( net-misc/vde )
-"
-
-DEPEND="${RDEPEND}
-	app-text/texi2html
-	>=sys-kernel/linux-headers-2.6.29
-	gnutls? ( dev-util/pkgconfig )"
-
-kvm_kern_war() {
-	eerror "Please enable KVM support in your kernel, found at:"
-	eerror
-	eerror "  Virtualization"
-	eerror "    Kernel-based Virtual Machine (KVM) support"
-	eerror
-}
-
-pkg_setup() {
-	if 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"
-		die "qemu-kvm version not compatible"
-	else
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-			kvm_kern_warn
-		elif ! linux_chkconfig_present KVM; then
-			kvm_kern_warn
-		fi
-	fi
-
-	enewgroup kvm
-}
-
-src_prepare() {
-	# avoid fdt till an updated release appears
-	sed -i -e 's:fdt="yes":fdt="no":' configure || die
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-	# append CFLAGS while linking
-	sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
-
-	# remove part to make udev happy
-	sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
-
-	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
-}
-
-src_configure() {
-	local conf_opts audio_opts softmmu_targets user_targets
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets} ${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets} ${target}-linux-user"
-	done
-
-	if [ ! -z "${softmmu_targets}" ]; then
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-	fi
-
-	if [ ! -z "${user_targets}" ]; then
-		einfo "Building the following user targets: ${user_targets}"
-		conf_opts="${conf_opts} --enable-linux-user"
-	else
-		conf_opts="${conf_opts} --disable-linux-user"
-	fi
-
-	#config options
-	conf_opts="${conf_opts} $(use_enable aio linux-aio)"
-	use bluetooth || conf_opts="${conf_opts} --disable-bluez"
-	conf_opts="${conf_opts} $(use_enable curl)"
-	use gnutls || conf_opts="${conf_opts} --disable-vnc-tls"
-	conf_opts="${conf_opts} $(use_enable fdt)"
-	use hardened && conf_opts="${conf_opts} --enable-user-pie"
-	use kvm-trace && conf_opts="${conf_opts} --with-kvm-trace"
-	use ncurses || conf_opts="${conf_opts} --disable-curses"
-	use sasl || conf_opts="${conf_opts} --disable-vnc-sasl"
-	use sdl || conf_opts="${conf_opts} --disable-sdl"
-	use vde || conf_opts="${conf_opts} --disable-vde"
-#	conf_opts="${conf_opts} $(use_enable xen)"
-	conf_opts="${conf_opts} --disable-xen"
-	conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
-
-	# audio options
-	audio_opts="oss"
-	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}"
-	./configure --prefix=/usr \
-		--disable-strip \
-		--enable-kvm \
-		--enable-nptl \
-		--enable-uuid \
-		${conf_opts} \
-		--audio-drv-list="${audio_opts}" \
-		--target-list="${softmmu_targets} ${user_targets}" \
-		--cc=$(tc-getCC) \
-		--host-cc=$(tc-getCC) \
-		|| die "configure failed"
-
-		# this is for qemu upstream's threaded support which is
-		# in development and broken
-		# the kvm project has its own support for threaded IO
-		# which is always on and works
-#		--enable-io-thread \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc/udev/rules.d/
-	doins kvm/scripts/65-kvm.rules || die
-
-	insinto /etc/qemu/
-	insopts -m0755
-	doins kvm/scripts/qemu-ifup || die
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
-	newdoc pc-bios/README README.pc-bios || die
-	dohtml qemu-doc.html qemu-tech.html || die
-
-	dobin "${FILESDIR}"/qemu-kvm
-	dosym /usr/bin/qemu-kvm /usr/bin/kvm
-}
-
-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/qemu-kvm/qemu-kvm-0.12.3.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild
index 1a6a0532ad51..d38efdb8847f 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild,v 1.1 2010/03/02 16:56:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.3.ebuild,v 1.2 2010/03/10 18:17:27 tommy Exp $
 
 EAPI="2"
 
@@ -70,7 +70,7 @@ DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-2.6.29
 	gnutls? ( dev-util/pkgconfig )"
 
-kvm_kern_war() {
+kvm_kern_warn() {
 	eerror "Please enable KVM support in your kernel, found at:"
 	eerror
 	eerror "  Virtualization"
@@ -79,10 +79,19 @@ kvm_kern_war() {
 }
 
 pkg_setup() {
+
+	local counter="0" check
+	for check in ${IUSE_SOFTMMU_TARGETS} ; do
+		use "qemu_softmmu_targets_${check}" && counter="1"
+	done
+	for check in ${IUSE_USER_TARGETS} ; do
+		use "qemu_user_targets_${check}" && counter="1"
+	done
+	[[ ${counter} == 0 ]] && eerror "You did not set any targets, this is NOT SUPPORTED"
+
 	if 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"
-		die "qemu-kvm version not compatible"
 	else
 		if ! linux_config_exists; then
 			eerror "Unable to check your kernel for KVM support"