Remove older versions

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

5 files changed, 6 insertions, 1127 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index e46b00a7076b..300873dec2a2 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.162 2013/01/12 07:42:22 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.163 2013/01/12 07:44:30 cardoe Exp $
+
+  12 Jan 2013; Doug Goldstein <cardoe@gentoo.org> -qemu-1.1.2-r1.ebuild,
+  -qemu-1.1.2-r3.ebuild, -qemu-1.2.0.ebuild:
+  Remove older versions
 
   12 Jan 2013; Doug Goldstein <cardoe@gentoo.org> qemu-1.2.1.ebuild,
   qemu-1.2.2.ebuild:
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index d937d90b2aa4..d49a3b703471 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -5,20 +5,15 @@ AUX qemu-binfmt.initd 7470 SHA256 32a4196e7b4ebf02d5717596e38630131379f69216d90a
 AUX qemu-kvm 60 SHA256 ded08eb1c74a9581912a9ca7876de6f33d1c545ed2a7d275f9b1749539feb7ee SHA512 d973d70ffeb7f4cdc61b25a30bf7174ac05b8c136234478782367a16668ff617756e9862a9cd94acd4b6636fda36410762e069a2eccca99410aa6e3b4294e363 WHIRLPOOL 41937bf752a2f643085fbd04643fb7a5cb898fabe8625d80b730c9e930f48f8d63245d5acdffbe31ecede1e1eb83fd3a73aad925f020e5c016f1b6559e7426d3
 DIST qemu-kvm-1.1.1-bp-1.tar.xz 2908 SHA256 16b7cd2e10b3a05d20006898bcfdb26eb596f7c7d3c0e18fb216cb2b2026af40 SHA512 781eae1fdc1cb7482d3d6fd1cf81e0d565588e3987fc4cab92abc06741b1b57d999b0de1fffce7270f50033b53c5707e4ef477ca3b7ddfca3dc1a432c1e15cc7 WHIRLPOOL 3f80b4cc9902021686bea823a41af136d21dd5a6b8aa59913aeb8697c3a38acc02d92ee59b9d052b6d161830a72d709fe684beb95f756a92216fe79cce4c5d9a
 DIST qemu-kvm-1.1.1.tar.gz 6599376 SHA256 c6fab57ccadcad5deb34728623840a0141a0f3c8f29d0c253db577f059c796df SHA512 1106a35212cdac1fe5b043af6754595d03232f22bf74cdab86973759adb3cff2d3d7b42290883d2d99d97d163fe274de0108a05eed906ffdc3349c0631f52492 WHIRLPOOL 4d9b2b788a7f87104032635b3b6e2cd96275b92683e3003510b0951536ed6bcb959959bc7529e3f912a7a2055b5c1710b9310d591a8b443a17a231e5b86f6105
-DIST qemu-kvm-1.1.2-2612b38e.tar.xz 4736 SHA256 c1a00380591b1b2b902c2aa1ea881c216997f18e33b466108b8c52178a829258 SHA512 f27e52bbb8f7c8c5a6f3b3de2966d7000d77178c6522a6311abd366913fc40582106b27fb7b37620c0a2a39346b6edd8827a2a4f31c654bd32adadb023ff325d WHIRLPOOL a5aefd25af0dccf177e7897690433841aaba8629ef6bf8e40a22176508ef4fec5a0f65a9b618b74bb8ab3420f36604b9a736a1a5ba665dee52e6a471693b88f3
 DIST qemu-kvm-1.1.2-6cee76f0.tar.xz 13096 SHA256 0bf503a494d78cc5a59682d22341caa594fcf89a8ce5bd222dd7c45ad009e0c3 SHA512 bb1aa5f40b24cf9860f4af2cbab8bf8d5800ca57c1dccc05f446b5001d426021a3ccc423228ce9607a20dd1fb9e5d93a62f883d5bf56c4ac25b5ebfd3b60940d WHIRLPOOL 3916563bd76d9ae50ddd168863dfada0f44289355c82491a992d2d56c9398c8392fc69a67844154dafb13f9ea315affd27909e3b675ba8b5eab32ab176700b5b
-DIST qemu-kvm-1.1.2-91ef50cf.tar.xz 32160 SHA256 ac566624692e1862065b8141f238c084bad3c6b17403e5c9507b5ba93d204aea SHA512 eddfedb3789ca94e30d5ee477f5165fcbfa10749c88844f9f7e01e3e6f99b4f0ef2fa3dc792ad50b44fe83f03af0acbd5190c35582c94c20c946478d14da0dfd WHIRLPOOL fec20d240dfc95c7dc10f75e1bca82c3cc2edae182a69e9cb6b8d36cf54127deac79e12ce5b213ec3dbfc84600242f2ad519d22b53e6497ab1d64407d3116222
 DIST qemu-kvm-1.1.2.tar.gz 6605075 SHA256 2be9cb9986c0b67ef97a2d21a51a945e91c4032b8c4229297461d8ed91f95178 SHA512 c1fc6a91276347ec2188c9fa8750b51ed14116ea0a7afc74e0ddf305e9f175a6c16d3dc6ef1ee52926c4d8b9bd0fd5465041f32ec24ce315059062a078e2df82 WHIRLPOOL f21af6107de2343c6a45cbd6aa97cbc58e36a37c37db42110397658a2c303d63e5af96b84b778b5f08e958a5e65a84088c596e1b83cbdcd4009efff64dab4d09
 DIST qemu-kvm-1.2.0-3a5940fb.tar.xz 238084 SHA256 031e290d85292e7fce1589fe492093069790c3094b7a302c71db8b2b98cbf3c6 SHA512 316a56a95c35cd304d63f6a444d0360510db79dbbf34c88f26f00998ddd0a1a35b6f6d7848abd6c7a8d7c65253e5449b3def0eefec17ad3989d2e02bc2743d8d WHIRLPOOL bcea3a5c22e7bc46b4c15580fde34de6ddcc3908dd8bb5b4d5f00724a960c5303db275c29b3741665bd47d9309d3d70294be27156958c5948cf17ece2af6da68
 DIST qemu-kvm-1.2.0-49a7da83.tar.xz 264660 SHA256 5a547eb1dc9c066e56a933bc6b921d734a05dca83d7d01a4f04376347b309b18 SHA512 73e396fdcf4c77513a114c3b3ac219147a496ee12b15d9d2b2df7fb281d8925e93f8b82a272eb63568661300cf0a1d1ba0d26760242c602408cfcb7a3f3d5931 WHIRLPOOL 1ab042d9a2f53a49945d5fbec0a94f65c63f6e6ff99c960e863fd88861eb66e81487b9b935445f67cc82bec3f3c9ec1f3ae94cff47ada3430510149b6f76c16e
 DIST qemu-kvm-1.2.0.tar.gz 6839420 SHA256 e98ab96c24337e312864f2341016695ac11cb9a04be83548a8da89596d591b05 SHA512 c21354127d4585397ab400600ab1ac9aac80cc0431bbf615c8e906819075b00373f382954fbd9fa39bf6479126d8d8e3321b3713346d04abe2c249edfa4eb6fd WHIRLPOOL 3d0662b39174eee0cd8750f6bea5baf57e2dfa82b490c3f1e54f44720ddd05ad029c3011425f651e745973ddb03aaca310bc8acf9f8e656bbb8390a262f7013c
 EBUILD qemu-1.1.1-r1.ebuild 12066 SHA256 912f613d61d247ba228f0d0ebb9427e72ab86ab04a7172d158aec26f816fa453 SHA512 faa1352c8d0ef688eb1741239b1a1cf3ecc233544f69dd95e1f2b6f464f2cc53c6b0ff7296d3df4d9aa0456d41acd271ea215766aecbdeb58b49acca8e7db1ac WHIRLPOOL 3a366b7a42a620c3e7f1f016015d1bd8c61e5c0cb05bce52bd5e2ef2962a066b29cc5b49de4481b85d5c2e4e1b0a14cfd144d37344e4935662d5bd02d7ba67a6
-EBUILD qemu-1.1.2-r1.ebuild 12048 SHA256 572125dbb877d2ed4cf8d57374b80d7833d83725dc72fe64c3f53d803a4bf3d2 SHA512 6a48b1dcbbee9e253da96b9c954e6fcbe62f602d5f689dd98f261211326eb6840f736bdb27453ded2e9ee48a4984a5d06ed5b1950ae42b3147fd6f0117b0d1ce WHIRLPOOL a5fb240b35824177ddc3267aee6c530f2e92174421b5be46b05e42c9e331b4c7d49dd258af73f7694c87a4e6c32bcec7fca25b0a5b817ffd295fac49ab05517e
 EBUILD qemu-1.1.2-r2.ebuild 12143 SHA256 5f8ab28b784d2a35b32c28600189f99e5dcee404b02446fae6506f9b76c6e2f7 SHA512 c07d08173cf04874d8c0085677eb973a02847de2057be8777dc3a6f6776fc96f992cfa43c10d7e82eb033e52b7b820e1ea4dcb71bc8d362ffec1897736d7c24b WHIRLPOOL d09c0c8f19df5e9c0bf8fc33783aef8ee9509f8091c7a35b8878550adecce576dd1b568f643486887786b2c1d69e24c5085fde03928c01fd59e110d1a409b077
-EBUILD qemu-1.1.2-r3.ebuild 12271 SHA256 1d6d342f14d573b1f10da3d1e24ef2bf456863f61d2440416ac5502cf6dd1ae9 SHA512 43f3182cb4a13e4de36f95dfe36caaa882f8f238afb46697859775107dd269d888676bef05000764f95e1848c4f7e014661da2a2ace7fa8f2259dd8a8395a7d4 WHIRLPOOL ac9f9ce5592a04990541fc959003c81ac9f4e79e03e83a56dd1ac679ddd04f74948bff04d9c1b125c2d026f1aaec23c1344e3503e5bd39671e17f75351cf21f7
-EBUILD qemu-1.2.0.ebuild 12734 SHA256 70882add7a604530bb05c169006d1ce7c2b7b8d19a1fae0e4dbda84f4c9f0678 SHA512 107b7fae751c09ad472ea698830e3dea8725788fb3dfed3391d6f202ea1549d1d14a97ce5a9fa635ea351d3f651403202eb3b3cc1ac8027597b25efd20fd2485 WHIRLPOOL f3d1fda4c3686d1ab0fbb18f18b34f8240a6ab38bb69fad6d0d1f87cb789438fcf468c9c3fa684608bb7d423ecc2d2880242cb5861fcfc41a12b7e93ec118da2
 EBUILD qemu-1.2.1.ebuild 12700 SHA256 52554f70c786efa4d2478fc99900e9064590bb9cf9b5f0b5a58221d001d7cf7b SHA512 da1d0cf9f65bf835b2d7687c3c43e68227f7e5feabe5d396d754d14e1d1d53d18c3572d51723fd6f1625101c6881efb7ab51c7a69e617d620ccaa2bacfe447f8 WHIRLPOOL 75b70c0d8dd9044f944191b5114466fefff1f6a91a007527f7f8e43da52ded42c293106643bf56790e1bd72e77df99274ea6d720c1ac706302d3908a603a151c
 EBUILD qemu-1.2.2.ebuild 12904 SHA256 f8e0a3d4ed2b0b236eb2293810a1ffc63fd8a6db306de1e992d1382f18d7e8fe SHA512 dc6833e1f829b0f94bf7584b8dc9f5f1c3706beb38feb5721e8c22135b56d3d2a1f9d4e3276eff3349fe11cd91a1f52c243a37dcab72c944c2c1bc65396a8089 WHIRLPOOL f8e29fb86390d8853e8438876eeeedef5799e0d94bef018fc419424db34592cc67f1b1f54f8029d02b44282c36d31af2092be2886b1c39ef09559ca35768a986
 EBUILD qemu-9999.ebuild 12908 SHA256 cf798b917491a56fcc07abaa0a557966b889078c3c32fadf186e4937e3583015 SHA512 9efdc3bcc3fcbb8ec4050895dbde80e66eeaa7e25af9c81c9c3b4a4eb784fa724e051364a47eb45a455f2b71e39edf21fef0be57c7c24013dc641203b8afa284 WHIRLPOOL 77dc184c8b1e44354e1e85c4e83ef2afef23d2ec7e4fd742cfc7f35d1aaf30ab587e169d21725ff6ac655eb80195fc781958bb34b7813ca6cffa3ff7478529b1
-MISC ChangeLog 26116 SHA256 44eea6418bc6e27a1ec67ea1d8ecb59797c653e4b60e4cf3338e38605a98f29f SHA512 082b146732cdbdda480f544a5c7b901c808458943c9d73b33595cc5a5c9c4bca41f9e6ea7a8a8d8a6d8173abd99085cb61fe409b9043beb9c0ee61b31553b3d4 WHIRLPOOL df5c6b89242801e478f3cc41e0211f095fcf9a6922eccb1c2040c60fd60fe7d5d153595c4c290e2aa6f7d5e658254c1a21a9bb1d7beebb390532772439d5c871
+MISC ChangeLog 26259 SHA256 f167f86e0ce933bda383b06c744ab9277d2a3396f4c82adc416cfad5ba9144ab SHA512 da42161cd70e13a476b91e06d2e082e38ab34fa0223fd85da961ef66ccba1bf85bcbc8611827f4027331150053c01af70ad4ae4442b4abbacfacab29860d208f WHIRLPOOL 034815c6d26d1ecb5caa089947f25e65c5cbf8bbb2058e37ee0ea68ef977e9fc69a72b69f855a04f543f7cf0493f3828123c4b1294d7652859f83ab7ab0d4bf5
 MISC metadata.xml 2722 SHA256 0d2c9fb51a2177ac7750c15ed830479795b67b15734ed2b916afae556a3cadf7 SHA512 3b364d79b6790c7c7c4826aff13dd380e8a914abf691431e22821337d1ab91281614beaa2736ab459b0c996893aa80e09db45eeb1f6a0b14ca251b1a645310e5 WHIRLPOOL a0521b8ee57b1d7c31133701d7e1c7348473e54d1b39708a49c31baa352f365c65dd3cba53860139551723f26ee7213b0db759b65e03b843e94e24b3723b5575
diff --git a/app-emulation/qemu/qemu-1.1.2-r1.ebuild b/app-emulation/qemu/qemu-1.1.2-r1.ebuild
deleted file mode 100644
index 0c746b7d774d..000000000000
--- a/app-emulation/qemu/qemu-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r1.ebuild,v 1.8 2013/01/11 23:54:15 cardoe Exp $
-
-EAPI="4"
-
-MY_PN="qemu-kvm"
-MY_P=${MY_PN}-${PV}
-
-PYTHON_DEPEND="2"
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user udev
-BACKPORTS=2612b38e
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz
-	${BACKPORTS:+
-		http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux \
-kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl sdl \
-smartcard spice static systemtap tci +threads tls usbredir +uuid vde +vhost-net \
-virtfs +vnc xattr xen xfs"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
-
-# Setup the default SoftMMU targets, while using the loops
-# below to setup the other targets.
-REQUIRED_USE="|| ("
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} qemu_softmmu_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} qemu_user_targets_${target}"
-done
-
-REQUIRED_USE="${REQUIRED_USE}
-	static? ( !alsa !pulseaudio !bluetooth )
-	virtfs? ( xattr )"
-
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
-	sys-apps/pciutils[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] )
-	jpeg? ( virtual/jpeg[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
-	png? ( media-libs/libpng[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
-	spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] )
-	tls? ( net-libs/gnutls[static-libs(+)] )
-	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!app-emulation/kqemu
-	>=sys-firmware/seabios-1.7.0
-	sys-firmware/sgabios
-	sys-firmware/vgabios
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	brltty? ( app-accessibility/brltty )
-	opengl? ( virtual/opengl )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( =dev-lang/python-2*[ncurses] )
-	sdl? ( media-libs/libsdl[X] )
-	smartcard? ( dev-libs/nss )
-	spice? ( >=app-emulation/spice-protocol-0.8.1 )
-	systemtap? ( dev-util/systemtap )
-	usbredir? (
-		>=sys-apps/usbredir-0.3.4
-		x86? ( <sys-apps/usbredir-0.5 )
-		)
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/texi2html )
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/${MY_P}"
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PREBUILT="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper"
-
-QA_WX_LOAD="${QA_PRESTRIPPED}
-	usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if use static; then
-		ewarn "USE=static is very much a moving target because of the packages"
-		ewarn "we depend on will have their static libs ripped out or wrapped"
-		ewarn "with USE=static-libs or USE=static due to continued dicsussion"
-		ewarn "on the mailing list about USE=static's place in Gentoo. As a"
-		ewarn "result what worked today may not work tomorrow."
-	fi
-}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	enewgroup kvm 78
-}
-
-src_prepare() {
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-
-	python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
-
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	epatch_user
-}
-
-src_configure() {
-	local conf_opts audio_opts 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
-
-	einfo "Building the following softmmu targets: ${softmmu_targets}"
-
-	if [[ -n ${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
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
-
-	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
-	#conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
-
-	# Add support for static builds
-	use static && conf_opts="${conf_opts} --static --disable-pie"
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if ! use static && gcc-specs-pie; then
-		conf_opts="${conf_opts} --enable-pie"
-	fi
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa,${audio_opts}"
-	use sdl && audio_opts="sdl,${audio_opts}"
-	use pulseaudio && audio_opts="pa,${audio_opts}"
-	use mixemu && conf_opts="${conf_opts} --enable-mixemu"
-
-	# --enable-vnc-thread will go away in 1.2
-	# $(use_enable xen xen-pci-passthrough) for 1.2
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-bsd-user \
-		--disable-guest-agent \
-		--disable-libiscsi \
-		--disable-strip \
-		--disable-werror \
-		--python=python2 \
-		$(use_enable aio linux-aio) \
-		$(use_enable bluetooth bluez) \
-		$(use_enable brltty brlapi) \
-		$(use_enable caps cap-ng) \
-		$(use_enable curl) \
-		$(use_enable debug debug-info) \
-		$(use_enable debug debug-mon) \
-		$(use_enable debug debug-tcg) \
-		$(use_enable doc docs) \
-		$(use_enable fdt) \
-		$(use_enable jpeg vnc-jpeg) \
-		$(use_enable kernel_linux kvm) \
-		$(use_enable kernel_linux kvm-device-assignment) \
-		$(use_enable kernel_linux nptl) \
-		$(use_enable ncurses curses) \
-		$(use_enable opengl) \
-		$(use_enable png vnc-png) \
-		$(use_enable rbd) \
-		$(use_enable sasl vnc-sasl) \
-		$(use_enable sdl) \
-		$(use_enable smartcard smartcard) \
-		$(use_enable smartcard smartcard-nss) \
-		$(use_enable spice) \
-		$(use_enable tci tcg-interpreter) \
-		$(use_enable threads vnc-thread) \
-		$(use_enable tls vnc-tls) \
-		$(use_enable usbredir usb-redir) \
-		$(use_enable uuid) \
-		$(use_enable vde) \
-		$(use_enable vhost-net) \
-		$(use_enable virtfs) \
-		$(use_enable vnc) \
-		$(use_enable xattr attr) \
-		$(use_enable xen) \
-		$(use_enable xfs xfsctl) \
-		--audio-drv-list=${audio_opts} \
-		--target-list="${softmmu_targets} ${user_targets}" \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		${conf_opts} \
-		|| die "configure failed"
-
-		# FreeBSD's kernel does not support QEMU assigning/grabbing
-		# host USB devices yet
-		use kernel_FreeBSD && \
-			sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	if [[ -n ${softmmu_targets} ]]; then
-		if use kernel_linux; then
-			udev_dorules "${FILESDIR}"/65-kvm.rules
-		fi
-
-		if use qemu_softmmu_targets_x86_64 ; then
-			dobin "${FILESDIR}"/qemu-kvm
-			ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed"
-			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
-			ewarn "your libvirt configs or other wrappers for ${PN}"
-		else
-			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
-			elog "of /usr/bin/qemu-kvm"
-		fi
-	fi
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	if use doc; then
-		dohtml qemu-doc.html qemu-tech.html || die
-	fi
-
-	use python && dobin scripts/kvm/kvm_stat
-
-	# Remove SeaBIOS since we're using the SeaBIOS packaged one
-	rm "${ED}/usr/share/qemu/bios.bin"
-	dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-
-	# Remove vgabios since we're using the vgabios packaged one
-	rm "${ED}/usr/share/qemu/vgabios.bin"
-	rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-	dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-	dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-	dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-	dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-	dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-
-	# Remove sgabios since we're using the sgabios packaged one
-	rm "${ED}/usr/share/qemu/sgabios.bin"
-	dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]]; then
-		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 "The ssl USE flag was renamed to tls, so adjust your USE flags."
-		elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
-	fi
-}
diff --git a/app-emulation/qemu/qemu-1.1.2-r3.ebuild b/app-emulation/qemu/qemu-1.1.2-r3.ebuild
deleted file mode 100644
index aa316946cf2e..000000000000
--- a/app-emulation/qemu/qemu-1.1.2-r3.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.2-r3.ebuild,v 1.6 2013/01/11 23:54:15 cardoe Exp $
-
-EAPI="4"
-
-MY_PN="qemu-kvm"
-MY_P=${MY_PN}-${PV}
-
-PYTHON_DEPEND="2"
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user udev
-BACKPORTS=91ef50cf
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz
-	${BACKPORTS:+
-		http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux \
-kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl sdl selinux \
-smartcard spice static systemtap tci +threads tls usbredir +uuid vde +vhost-net \
-virtfs +vnc xattr xen xfs"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
-
-# Setup the default SoftMMU targets, while using the loops
-# below to setup the other targets.
-REQUIRED_USE="|| ("
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} qemu_softmmu_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} qemu_user_targets_${target}"
-done
-
-# Block USE flag configurations known to not work
-REQUIRED_USE="${REQUIRED_USE}
-	static? ( !alsa !pulseaudio !bluetooth )
-	virtfs? ( xattr )"
-
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
-	sys-apps/pciutils[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] )
-	jpeg? ( virtual/jpeg[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
-	png? ( media-libs/libpng[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
-	spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] )
-	tls? ( net-libs/gnutls[static-libs(+)] )
-	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!app-emulation/kqemu
-	>=sys-firmware/seabios-1.7.0
-	sys-firmware/sgabios
-	sys-firmware/vgabios
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	brltty? ( app-accessibility/brltty )
-	opengl? ( virtual/opengl )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( =dev-lang/python-2*[ncurses] )
-	sdl? ( media-libs/libsdl[X] )
-	selinux? ( sec-policy/selinux-qemu )
-	smartcard? ( dev-libs/nss )
-	spice? ( >=app-emulation/spice-protocol-0.8.1 )
-	systemtap? ( dev-util/systemtap )
-	usbredir? (
-		>=sys-apps/usbredir-0.3.4
-		x86? ( <sys-apps/usbredir-0.5 )
-		)
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/texi2html )
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/${MY_P}"
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PREBUILT="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper"
-
-QA_WX_LOAD="${QA_PRESTRIPPED}
-	usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if use static; then
-		ewarn "USE=static is very much a moving target because of the packages"
-		ewarn "we depend on will have their static libs ripped out or wrapped"
-		ewarn "with USE=static-libs or USE=static due to continued dicsussion"
-		ewarn "on the mailing list about USE=static's place in Gentoo. As a"
-		ewarn "result what worked today may not work tomorrow."
-	fi
-}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	enewgroup kvm 78
-}
-
-src_prepare() {
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-
-	python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
-
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	epatch_user
-}
-
-src_configure() {
-	local conf_opts audio_opts 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
-
-	einfo "Building the following softmmu targets: ${softmmu_targets}"
-
-	if [[ -n ${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
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
-
-	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
-	#conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
-
-	# Add support for static builds
-	use static && conf_opts="${conf_opts} --static --disable-pie"
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if ! use static && gcc-specs-pie; then
-		conf_opts="${conf_opts} --enable-pie"
-	fi
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa,${audio_opts}"
-	use sdl && audio_opts="sdl,${audio_opts}"
-	use pulseaudio && audio_opts="pa,${audio_opts}"
-	use mixemu && conf_opts="${conf_opts} --enable-mixemu"
-
-	# --enable-vnc-thread will go away in 1.2
-	# $(use_enable xen xen-pci-passthrough) for 1.2
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-bsd-user \
-		--disable-guest-agent \
-		--disable-libiscsi \
-		--disable-strip \
-		--disable-werror \
-		--python=python2 \
-		$(use_enable aio linux-aio) \
-		$(use_enable bluetooth bluez) \
-		$(use_enable brltty brlapi) \
-		$(use_enable caps cap-ng) \
-		$(use_enable curl) \
-		$(use_enable debug debug-info) \
-		$(use_enable debug debug-mon) \
-		$(use_enable debug debug-tcg) \
-		$(use_enable doc docs) \
-		$(use_enable fdt) \
-		$(use_enable jpeg vnc-jpeg) \
-		$(use_enable kernel_linux kvm) \
-		$(use_enable kernel_linux kvm-device-assignment) \
-		$(use_enable kernel_linux nptl) \
-		$(use_enable ncurses curses) \
-		$(use_enable opengl) \
-		$(use_enable png vnc-png) \
-		$(use_enable rbd) \
-		$(use_enable sasl vnc-sasl) \
-		$(use_enable sdl) \
-		$(use_enable smartcard smartcard) \
-		$(use_enable smartcard smartcard-nss) \
-		$(use_enable spice) \
-		$(use_enable tci tcg-interpreter) \
-		$(use_enable threads vnc-thread) \
-		$(use_enable tls vnc-tls) \
-		$(use_enable usbredir usb-redir) \
-		$(use_enable uuid) \
-		$(use_enable vde) \
-		$(use_enable vhost-net) \
-		$(use_enable virtfs) \
-		$(use_enable vnc) \
-		$(use_enable xattr attr) \
-		$(use_enable xen) \
-		$(use_enable xfs xfsctl) \
-		--audio-drv-list=${audio_opts} \
-		--target-list="${softmmu_targets} ${user_targets}" \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		${conf_opts} \
-		|| die "configure failed"
-
-		# FreeBSD's kernel does not support QEMU assigning/grabbing
-		# host USB devices yet
-		use kernel_FreeBSD && \
-			sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	if [[ -n ${softmmu_targets} ]]; then
-		if use kernel_linux; then
-			udev_dorules "${FILESDIR}"/65-kvm.rules
-		fi
-
-		if use qemu_softmmu_targets_x86_64 ; then
-			dobin "${FILESDIR}"/qemu-kvm
-			ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed"
-			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
-			ewarn "your libvirt configs or other wrappers for ${PN}"
-		else
-			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
-			elog "of /usr/bin/qemu-kvm"
-		fi
-	fi
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	if use doc; then
-		dohtml qemu-doc.html qemu-tech.html || die
-	fi
-
-	use python && dobin scripts/kvm/kvm_stat
-
-	# Avoid collision with app-emulation/libcacard
-	use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient"
-
-	# Remove SeaBIOS since we're using the SeaBIOS packaged one
-	rm "${ED}/usr/share/qemu/bios.bin"
-	dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-
-	# Remove vgabios since we're using the vgabios packaged one
-	rm "${ED}/usr/share/qemu/vgabios.bin"
-	rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-	dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-	dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-	dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-	dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-	dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-
-	# Remove sgabios since we're using the sgabios packaged one
-	rm "${ED}/usr/share/qemu/sgabios.bin"
-	dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]]; then
-		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 "The ssl USE flag was renamed to tls, so adjust your USE flags."
-		elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
-	fi
-}
diff --git a/app-emulation/qemu/qemu-1.2.0.ebuild b/app-emulation/qemu/qemu-1.2.0.ebuild
deleted file mode 100644
index f154f5d8a77e..000000000000
--- a/app-emulation/qemu/qemu-1.2.0.ebuild
+++ /dev/null
@@ -1,381 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild,v 1.13 2013/01/11 23:54:15 cardoe Exp $
-
-EAPI="4"
-
-MY_PN="qemu-kvm"
-MY_P=${MY_PN}-${PV}
-
-PYTHON_DEPEND="2"
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user udev
-#BACKPORTS=6cee76f0
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz
-	${BACKPORTS:+
-		http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux \
-kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp \
-sdl selinux smartcard spice static systemtap tci +threads tls usbredir +uuid vde \
-+vhost-net virtfs +vnc xattr xen xfs"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
-
-# Setup the default SoftMMU targets, while using the loops
-# below to setup the other targets.
-REQUIRED_USE="|| ("
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} qemu_softmmu_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} qemu_user_targets_${target}"
-done
-
-# Block USE flag configurations known to not work
-REQUIRED_USE="${REQUIRED_USE}
-	static? ( !alsa !pulseaudio !bluetooth )
-	virtfs? ( xattr )"
-
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
-	sys-apps/pciutils[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] )
-	jpeg? ( virtual/jpeg[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
-	png? ( media-libs/libpng[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-1.0.0[static-libs(+)] )
-	spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] )
-	tls? ( net-libs/gnutls[static-libs(+)] )
-	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!app-emulation/kqemu
-	sys-firmware/ipxe
-	>=sys-firmware/seabios-1.7.0
-	sys-firmware/sgabios
-	sys-firmware/vgabios
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	brltty? ( app-accessibility/brltty )
-	opengl? ( virtual/opengl )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( =dev-lang/python-2*[ncurses] )
-	sdl? ( media-libs/libsdl[X] )
-	selinux? ( sec-policy/selinux-qemu )
-	smartcard? ( dev-libs/nss )
-	spice? ( >=app-emulation/spice-protocol-0.8.1 )
-	systemtap? ( dev-util/systemtap )
-	usbredir? (
-		>=sys-apps/usbredir-0.3.4
-		x86? ( <sys-apps/usbredir-0.5 )
-		)
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/texi2html )
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/${MY_P}"
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PREBUILT="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper"
-
-QA_WX_LOAD="${QA_PRESTRIPPED}
-	usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if use static; then
-		ewarn "USE=static is very much a moving target because of the packages"
-		ewarn "we depend on will have their static libs ripped out or wrapped"
-		ewarn "with USE=static-libs or USE=static due to continued dicsussion"
-		ewarn "on the mailing list about USE=static's place in Gentoo. As a"
-		ewarn "result what worked today may not work tomorrow."
-	fi
-}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	enewgroup kvm 78
-}
-
-src_prepare() {
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-
-	python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
-
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	epatch_user
-}
-
-src_configure() {
-	local conf_opts audio_opts 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
-
-	einfo "Building the following softmmu targets: ${softmmu_targets}"
-
-	if [[ -n ${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
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
-
-	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
-	#conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
-
-	# Add support for static builds
-	use static && conf_opts="${conf_opts} --static --disable-pie"
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if ! use static && gcc-specs-pie; then
-		conf_opts="${conf_opts} --enable-pie"
-	fi
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa,${audio_opts}"
-	use sdl && audio_opts="sdl,${audio_opts}"
-	use pulseaudio && audio_opts="pa,${audio_opts}"
-	use mixemu && conf_opts="${conf_opts} --enable-mixemu"
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-bsd-user \
-		--disable-guest-agent \
-		--disable-libiscsi \
-		--disable-strip \
-		--disable-werror \
-		--python=python2 \
-		$(use_enable aio linux-aio) \
-		$(use_enable bluetooth bluez) \
-		$(use_enable brltty brlapi) \
-		$(use_enable caps cap-ng) \
-		$(use_enable curl) \
-		$(use_enable debug debug-info) \
-		$(use_enable debug debug-tcg) \
-		$(use_enable doc docs) \
-		$(use_enable fdt) \
-		$(use_enable jpeg vnc-jpeg) \
-		$(use_enable kernel_linux kvm) \
-		$(use_enable kernel_linux nptl) \
-		$(use_enable ncurses curses) \
-		$(use_enable opengl) \
-		$(use_enable png vnc-png) \
-		$(use_enable rbd) \
-		$(use_enable sasl vnc-sasl) \
-		$(use_enable sdl) \
-		$(use_enable seccomp) \
-		$(use_enable smartcard smartcard) \
-		$(use_enable smartcard smartcard-nss) \
-		$(use_enable spice) \
-		$(use_enable tci tcg-interpreter) \
-		$(use_enable tls vnc-tls) \
-		$(use_enable usbredir usb-redir) \
-		$(use_enable uuid) \
-		$(use_enable vde) \
-		$(use_enable vhost-net) \
-		$(use_enable virtfs) \
-		$(use_enable vnc) \
-		$(use_enable xattr attr) \
-		$(use_enable xen) \
-		$(use_enable xen xen-pci-passthrough) \
-		$(use_enable xfs xfsctl) \
-		--audio-drv-list=${audio_opts} \
-		--target-list="${softmmu_targets} ${user_targets}" \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		${conf_opts} \
-		|| die "configure failed"
-
-		# FreeBSD's kernel does not support QEMU assigning/grabbing
-		# host USB devices yet
-		use kernel_FreeBSD && \
-			sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	if [[ -n ${softmmu_targets} ]]; then
-		if use kernel_linux; then
-			udev_dorules "${FILESDIR}"/65-kvm.rules
-		fi
-
-		if use qemu_softmmu_targets_x86_64 ; then
-			dosym /usr/bin/qemu-system-x86_64 /usr/bin/qemu-kvm
-			ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed"
-			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
-			ewarn "your libvirt configs or other wrappers for ${PN}"
-		else
-			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
-			elog "of the /usr/bin/qemu-kvm symlink."
-		fi
-	fi
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	if use doc; then
-		dohtml qemu-doc.html qemu-tech.html || die
-	fi
-
-	use python && dobin scripts/kvm/kvm_stat
-
-	# Avoid collision with app-emulation/libcacard
-	use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient"
-
-	# Remove SeaBIOS since we're using the SeaBIOS packaged one
-	rm "${ED}/usr/share/qemu/bios.bin"
-	dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-
-	# Remove vgabios since we're using the vgabios packaged one
-	rm "${ED}/usr/share/qemu/vgabios.bin"
-	rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-	dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-	dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-	dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-	dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-	dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-
-	# Remove sgabios since we're using the sgabios packaged one
-	rm "${ED}/usr/share/qemu/sgabios.bin"
-	dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-
-	# Remove iPXE since we're using the iPXE packaged one
-	rm "${ED}"/usr/share/qemu/pxe-*.rom
-	dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
-	dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-	dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-	dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-	dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-	dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]]; then
-		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 "The ssl USE flag was renamed to tls, so adjust your USE flags."
-		elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
-	fi
-}