Remove older version

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xD7DFA8D318FA9AEF!

3 files changed, 13 insertions, 554 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 0c90e3834f5a..f1fb83bcd78e 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,9 @@
 # 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.231 2013/08/14 04:13:58 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.232 2013/08/14 04:15:29 cardoe Exp $
+
+  14 Aug 2013; Doug Goldstein <cardoe@gentoo.org> -qemu-1.5.2.ebuild:
+  Remove older version
 
 *qemu-1.5.2-r2 (14 Aug 2013)
 
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 87ed0e42b2f9..12e58448ddf9 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -8,27 +8,25 @@ AUX qemu-binfmt.initd-r1 7023 SHA256 3572c110c6f217754e638796400a5901910a2e61b88
 AUX qemu-kvm-1.4 68 SHA256 8b1adf198129f001e75a2311fc420c168094d1084d2163cdf6a32b3b23c96137 SHA512 706fab4d155c410acc292e67fb354ce7dcd17f7e33f2ca8c9c44035ea128f8d36f89e27cf87ebe22721f5676be9e7f2ae5484fd000183c8ffd7854e02eb3d120 WHIRLPOOL ef795330b592cef8e3d92f52a77eb77a671e6aa1a47d07531917b5c1c09e72e5df1a44aea939b086e0a3c5ef2a5cea9223556a46ceae73e55300475c42f07067
 DIST qemu-1.4.2-6b5934f9.tar.xz 3132 SHA256 76af332ea3a731d04d5d2d909c4372250a156993ca56046dc607a7d43caa747e SHA512 c74cc6c3485cc19809676e7dc796d9f1d5b3d12decf1f0c61a948504471ac85f8b488c1acd0400b02827b1ad6b9745a6b47317c284365122ca772a842852f27e WHIRLPOOL 50dd6e7eed3902547dfae6c6cd73505232ed8abafc523c7df7e65a02cf9b29b3e7a29f4ce286b157c027f82e198ef23dd44a83c6925204317c7bb4d6e350617b
 DIST qemu-1.4.2.tar.bz2 10416877 SHA256 acae6c92b740ff89c0e31eca23338d4abd733432e51b081017757579b30ecf90 SHA512 aa296b3d06321c81b32fdd2fdcdf07f3c377123f18eadca977335592b64a4f2417eea421fe417b57e468741f707bda31ba907364d762983393272997fdef8999 WHIRLPOOL 782f3c6d8776210450a0c0ac24942d8e1c41995aeb8e910add704f8f6d95ae3392ee942c6b661d4674367d0e443453c7f29356b2b4c71be4ffed54436f90de8a
-DIST qemu-1.5.2-2d2faaeb.tar.xz 4112 SHA256 8bcfb9d68307da6232b75894e5cd415e0b74afbd6eddda1df4583231c8c8d2d1 SHA512 c2f8f7456bf5dd1c9047e9468254de8b83330546fa2a64c2342801a9e6944232d78a1f57b03862c942706aa6c3460d9239699c2dccf19c34ffdfbfbc81185a89 WHIRLPOOL 655372d513cb79cfacba659a191a0a1db26dbf97aff7c6f955bc1ee089d8360100e2c0088c69251da9e93f75eb0032917d43e57f5fc651b7bfa28ae6a3d1f06c
 DIST qemu-1.5.2-e26b4ba6.tar.xz 21348 SHA256 877cc321b3bd5e30aaa7a481b359e16845ad731927a49df1fb2d5b0cfbfd0ad6 SHA512 1f015c5d9ca37475bddf9d474255b10ae3f03d01280270211deb1195a2ef288e6a1bbff9490cb4173a7af4b02787469278816fd5dee69d8e11d601b5a46b0e53 WHIRLPOOL 86a249c1339bb241a1534e5047bab696b8c26ad491eda073ee57ce1f9104df54ab7e251cd5ad9568a1381307b118029b7619bf689dec36f454d3f77f2f2f402a
 DIST qemu-1.5.2-fd9f079c.tar.xz 34768 SHA256 d4772e9ece1e4a633d122df622a7cb21b7b3765f23140bee17a0091438cee82b SHA512 5b490a43b34aaf8b61eb3b7def642b2c28884bcc543a3ad60ebc54c809f5cef23c74e92c95a35221268faea1408b10dbbac6f9dace52c0fe09a729e450ccb96b WHIRLPOOL 729ed05a6aadd2dce1d63ceef2331334c62440d62ee6920622ebf25cf691f02bdfba3a547596f744522040bd5fa3e3b5c42f318a5fe26fe36863e797764e6b98
 DIST qemu-1.5.2.tar.bz2 11932902 SHA256 f661147d190ab8432045058a660d810f13dc528fe7017ce578e9f2da2997a250 SHA512 cae47d34b99d3d3ded688b5a434ba69a377a838dddd367d10e4a71cd697305870c9671e4291490c0028b8143870b0998469e508cd28922fbebd8ea5f86f591b9 WHIRLPOOL bd5e8063c40e3e2fc43934e3649562f594f249002209bf09e05fda06155d423587d714862c8b55f9b2621f3ce20154f4e81b5c73df65ef2513ae824ae5bbcee9
 EBUILD qemu-1.4.2.ebuild 16623 SHA256 3b047896a49c702a60f7df1bb0a2a3cfc1f8a6b5ec43ee29ee57047625115c7d SHA512 60a9d6ce25cb2182f81c30c49f16e863d4509be8ccfd96cabc4bfb7375777690bea265d5f977a530aef5d5ba6812c8d5e4190c815cc38c78e10d67b3685ad127 WHIRLPOOL 69c09d7df3a1965879c71d411e6ddd9649c82e1145a250e9aaf8ce0fc888ecc02dcc440cae794e878f350b88c34d5b73e363ff7aa41417a435fd0a7e2db59fff
 EBUILD qemu-1.5.2-r1.ebuild 17389 SHA256 d70195826b6e596f8a49d7a124e88d514488f8bc3d20af423c970a34951b92ce SHA512 2bc5bf7e8ad6119d6a3128c17a8e01fcc23d426a0d2d35d5aae5e23389224ed14d3ac925783f3de90eae365869f52071add322a1f7a5da7be7d4b4e308830fdb WHIRLPOOL f2e4f38c51b17516fd8aa01739c4caac7ee649c858f13ab3e38ecf2cbeb0e539a246cb57b03ad668b8e4057a366de27cbdb56e74ac2ac7de80d2998fe62f2b7a
 EBUILD qemu-1.5.2-r2.ebuild 17389 SHA256 da669d4ca79a069aea1c57b4b990f29f354e87e430720f776be20a6d20f0f2e7 SHA512 0bb960198bbc1c0626ce71c6a4acb7caf52ee76296cf1d25bd262892fa0461c443b9e20bcfb90374a6b7204a570c4d8735e10203e443aea981cfceddf4f202e5 WHIRLPOOL 0600664a193bb3a3e06719185e9bc2abe59f2e3e843f1274b30d2a8c075dc1d62b4d36836c97b2d128d41f28b5b6a289ddf2bda2b8ae2fc4f652099abf2b41a1
-EBUILD qemu-1.5.2.ebuild 17236 SHA256 646321c1dccb49084e12ef49702dee4ddb83e958151ddcf8dbd5d9d7862fa2b1 SHA512 29bfc4b9d7d5499ea4f0b90de041101df10ec0244181f4032617ecec8cebc85f4c3ebbdcb11fa6b082e78b6b11b384646c2e5d4af2f05c4b6107e3a6e69f5d05 WHIRLPOOL 9eae12bf727cab89caf9982bf0e840d606bf84f3b4c195480fdd3a2cc415c829fd13917e46b2172cf4f81d9af7d1cfba9e3542dce241cada543e2a2795887761
 EBUILD qemu-9999.ebuild 16718 SHA256 ff71524998b25d4e50defa8c8efdc83df3953e560c66e88d1a6324a2e7ba6fa2 SHA512 d7e1550e202853efc7d38771a93d7e21d708bd3dc8aed507e4532d5091a5cd4413ee67ed21cce161cf4fef894ae151f20bbbabf551fe5c9a4a66c38f81868ec9 WHIRLPOOL ce048a5b8798e72a96de1bb9eca49cdaa7be1eddd5fbfb5b3a88fa6180a43a563d6b957cf6b64008b9a1c945e992a5b721ef90ad688d799beb5f5139d2ddab2d
-MISC ChangeLog 37889 SHA256 2115d106ccb43b14c72eceba9b066b850f94a5ad5b13a8b93d62cc411ec25455 SHA512 84bfb6a2cb3a83c2dd1b8e584f01953bc0816064ad95d719e35d1b051410f7760ea98346309e45c41b5c9eb0e35a874fe38059b17ea62288cf79cef5568a5faf WHIRLPOOL 8b11006c2ad4f0c83e33b34768e9edfd71287a46d4c6e3c1adda358b3f08150724177fb17d8e1dfdc55256e256560b528c7240305e3393635365a7706c4312a4
+MISC ChangeLog 37983 SHA256 cb95e16d616642ba52ef89be07bddb74d72d6657344aae58327ec18a216c6806 SHA512 4100f80237597f5fa7691d4970feea4c9b7f0dcfaecd35da783018d422183377e0515fa8d2723ce172b6bb50155bb1156f1288a6a8fc547ee789521e1af3c52b WHIRLPOOL 0f093308fcbfb39816ea6cb3660143919d6a69091f512c9947e36b09700e0b7dadd66f81007dbe284b57fa992a300df5e692efa26d32daf57dd5a41baf290707
 MISC metadata.xml 3419 SHA256 77b0c4ef04debd695c5772f20f6a5eba7e07ea241380c91081fa9ea7a1ba91c0 SHA512 40b4cc90ae43f8d53ac4a95092296dbf32fcd33e9132865f053a0b23823c781132261c17ec4d350ef899dae9b4e2ab2f87e2a5d6e067b419ab256d712b1510b4 WHIRLPOOL ac3c88fed17bc04f1427ff76a6c7d7a2dfc241917cb8e45e0698d2cf7d51419d699870910a65d3773e53257231414d8e339d848377b3d4a2a4dbfd44320912f0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQF8BAEBCABmBQJSCwQLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJSCwRjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE
-N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prv4hwH/0Cc64QBHTXBEgyNB5de1zyL
-wx/4tD2UmHY0MbqryVNmiIFaOXpZHKUxk9FgvKfxzrYUOaKUZOwsF2ctBw3JXqJf
-kqOdicDqyK3Xabqq90mXz35TFYUGQfnDw3DHO322PhY6mcs77hS869wXrZNKjHEq
-r/jkueeQNbqYy0xU4E2QXT0GH2me+q1ZfkkQ6vP42kk+/YilbvMI5gKPhtf4Sujf
-hKPIFFf5TTYCmQ4VycwdJ6YS5sWm65HjZhbaCd5OgH9mcsYQtvbCjl11ZLIo7nRl
-DbkGEcPleajaTh+KcNTYiGG2Mlb/TllYTihIQvyt5O694JHWJUbAQFhjiaQRR0M=
-=MrY8
+N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prv/eMH/jqwe/KPkZy8zW6mOU11pIy+
+HDQn1KWCTTBl9R8ej+AvUcFJz+DEho91eR902oA/S3PDKT08/uhQv/EtWGP5kjF+
+kB1M6Y6pqQ0HJrNHT+4eVzrJ5gpOIx2t0x884J30iJvjsqNBlFCq9WNbLBtqhCbp
+ffgml6oBe4qDfot4sPF33ZEPTHuX9RYBL0x9mN8xt6Fc0fOidDuM0Ot/2vQmntim
+qrR1oWsR+Cw78hvMn0drpq9Ruc8f2k+X+f0XFhJK9Mj/2FSRVMINEdCAw7C9iXpO
+1ufSixWpS/9jxyJktt1z+YspUObASJ33KSKpDX22rVTEkdp/dkc6tbOshZtMxvI=
+=F/o1
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/qemu-1.5.2.ebuild b/app-emulation/qemu/qemu-1.5.2.ebuild
deleted file mode 100644
index 801b0e35d0b8..000000000000
--- a/app-emulation/qemu/qemu-1.5.2.ebuild
+++ /dev/null
@@ -1,542 +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.5.2.ebuild,v 1.1 2013/07/27 04:14:19 cardoe Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
-PYTHON_REQ_USE="ncurses,readline"
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
-	user udev fcaps readme.gentoo
-
-BACKPORTS=2d2faaeb
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
-	${BACKPORTS:+
-		http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="accessibility +aio alsa bluetooth +caps +curl debug fdt gtk iscsi +jpeg \
-kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python \
-rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu \
-static-user systemtap tci test +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 mips64 mips64el or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
-
-# 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
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} qemu_user_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_user_targets_${target}"
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-# Block USE flag configurations known to not work
-REQUIRED_USE="${REQUIRED_USE}
-	python? ( ${PYTHON_REQUIRED_USE} )
-	static? ( static-softmmu static-user )
-	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
-	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(+)]
-	>=x11-libs/pixman-0.28.0[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.1[static-libs(+)] )
-	spice? ( >=app-emulation/spice-0.12.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-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-user? ( >=dev-libs/glib-2.0[static-libs(+)] )
-	qemu_softmmu_targets_i386? (
-		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.2.2
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	qemu_softmmu_targets_x86_64? (
-		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.2.2
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	accessibility? ( app-accessibility/brltty )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/vte:2.90
-	)
-	iscsi? ( net-libs/libiscsi )
-	opengl? ( virtual/opengl )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	sdl? ( media-libs/libsdl[X] )
-	selinux? ( sec-policy/selinux-qemu )
-	smartcard? ( dev-libs/nss !app-emulation/libcacard )
-	spice? ( >=app-emulation/spice-protocol-0.12.3 )
-	systemtap? ( dev-util/systemtap )
-	usbredir? ( >=sys-apps/usbredir-0.6 )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools )"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	=dev-lang/python-2*
-	sys-apps/texinfo
-	virtual/pkgconfig
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static-softmmu? ( ${LIB_DEPEND} )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)"
-
-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
-	usr/share/qemu/s390-ccw.img"
-
-QA_WX_LOAD="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-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or32
-	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
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
-you have the kernel module loaded before running kvm. The easiest way to
-ensure that the kernel module is loaded is to load it on boot.\n
-For AMD CPUs the module is called 'kvm-amd'\n
-For Intel CPUs the module is called 'kvm-intel'\n
-Please review /etc/conf.d/modules for how to load these\n\n
-Make sure your user is in the 'kvm' group\n
-Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-
-qemu_support_kvm() {
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
-		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
-		use qemu_softmmu_targets_s390x; then
-		return 0
-	fi
-
-	return 1
-}
-
-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
-}
-
-pkg_setup() {
-	enewgroup kvm 78
-
-	python_export_best
-}
-
-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
-
-	epatch "${FILESDIR}"/qemu-9999-cflags.patch
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	# Fix ld and objcopy being called directly
-	tc-export LD OBJCOPY
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	epatch_user
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function $FUNCNAME "$@"
-
-	local buildtype=$1
-	local builddir=$2
-	local conf_opts audio_opts
-	local static_flag="static-${buildtype}"
-
-	conf_opts="--prefix=/usr"
-	conf_opts+=" --sysconfdir=/etc"
-	conf_opts+=" --libdir=/usr/$(get_libdir)"
-	conf_opts+=" --docdir=/usr/share/doc/${PF}/html"
-	conf_opts+=" --disable-bsd-user"
-	conf_opts+=" --disable-guest-agent"
-	conf_opts+=" --disable-strip"
-	conf_opts+=" --disable-werror"
-	conf_opts+=" --python=${PYTHON}"
-
-	# 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}"
-
-	if [[ ${buildtype} == "user" ]]; then
-		conf_opts+=" --enable-linux-user"
-		conf_opts+=" --disable-system"
-		conf_opts+=" --target-list=${user_targets}"
-		conf_opts+=" --disable-blobs"
-		conf_opts+=" --disable-bluez"
-		conf_opts+=" --disable-curses"
-		conf_opts+=" --disable-kvm"
-		conf_opts+=" --disable-libiscsi"
-		conf_opts+=" $(use_enable seccomp)"
-		conf_opts+=" --disable-sdl"
-		conf_opts+=" --disable-smartcard-nss"
-		conf_opts+=" --disable-tools"
-		conf_opts+=" --disable-vde"
-	fi
-
-	if [[ ${buildtype} == "softmmu" ]]; then
-		conf_opts+=" --disable-linux-user"
-		conf_opts+=" --enable-system"
-		conf_opts+=" --with-system-pixman"
-		conf_opts+=" --target-list=${softmmu_targets}"
-		conf_opts+=" $(use_enable bluetooth bluez)"
-		conf_opts+=" $(use_enable gtk)"
-		use gtk && conf_opts+=" --with-gtkabi=3.0"
-		conf_opts+=" $(use_enable sdl)"
-		conf_opts+=" $(use_enable aio linux-aio)"
-		conf_opts+=" $(use_enable accessibility brlapi)"
-		conf_opts+=" $(use_enable caps cap-ng)"
-		conf_opts+=" $(use_enable curl)"
-		conf_opts+=" $(use_enable fdt)"
-		conf_opts+=" $(use_enable iscsi libiscsi)"
-		conf_opts+=" $(use_enable jpeg vnc-jpeg)"
-		conf_opts+=" $(use_enable kernel_linux kvm)"
-		conf_opts+=" $(use_enable kernel_linux nptl)"
-		conf_opts+=" $(use_enable ncurses curses)"
-		conf_opts+=" $(use_enable opengl glx)"
-		conf_opts+=" $(use_enable png vnc-png)"
-		conf_opts+=" $(use_enable rbd)"
-		conf_opts+=" $(use_enable sasl vnc-sasl)"
-		conf_opts+=" $(use_enable seccomp)"
-		conf_opts+=" $(use_enable smartcard smartcard-nss)"
-		conf_opts+=" $(use_enable spice)"
-		conf_opts+=" $(use_enable tls vnc-tls)"
-		conf_opts+=" $(use_enable tls vnc-ws)"
-		conf_opts+=" $(use_enable usbredir usb-redir)"
-		conf_opts+=" $(use_enable uuid)"
-		conf_opts+=" $(use_enable vde)"
-		conf_opts+=" $(use_enable vhost-net)"
-		conf_opts+=" $(use_enable virtfs)"
-		conf_opts+=" $(use_enable vnc)"
-		conf_opts+=" $(use_enable xattr attr)"
-		conf_opts+=" $(use_enable xen)"
-		conf_opts+=" $(use_enable xen xen-pci-passthrough)"
-		conf_opts+=" $(use_enable xfs xfsctl)"
-		use mixemu && conf_opts+=" --enable-mixemu"
-		conf_opts+=" --audio-drv-list=${audio_opts}"
-		conf_opts+=" --enable-migration-from-qemu-kvm"
-	fi
-
-	conf_opts+=" $(use_enable debug debug-info)"
-	conf_opts+=" $(use_enable debug debug-tcg)"
-	conf_opts+=" --enable-docs"
-	conf_opts+=" $(use_enable tci tcg-interpreter)"
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
-
-	# Add support for static builds
-	use ${static_flag} && 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_flag} && gcc-specs-pie; then
-		conf_opts="${conf_opts} --enable-pie"
-	fi
-
-	einfo "./configure ${conf_opts}"
-	cd ${builddir}
-	../configure \
-		--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_configure() {
-	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
-
-	[[ -n ${softmmu_targets} ]] && \
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-
-	[[ -n ${user_targets} ]] && \
-		einfo "Building the following user targets: ${user_targets}"
-
-	if [[ -n ${softmmu_targets} ]]; then
-		mkdir "${S}/softmmu-build"
-		qemu_src_configure "softmmu" "${S}/softmmu-build"
-	fi
-
-	if [[ -n ${user_targets} ]]; then
-		mkdir "${S}/user-build"
-		qemu_src_configure "user" "${S}/user-build"
-	fi
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-}
-
-src_test() {
-	cd "${S}/softmmu-build"
-	emake -j1 check
-	emake -j1 check-report.html
-}
-
-qemu_python_install() {
-	python_domodule "${S}/QMP/qmp.py"
-
-	python_doscript "${S}/scripts/kvm/kvm_stat"
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/QMP/qmp-shell"
-	python_doscript "${S}/QMP/qemu-ga-client"
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets
-		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		if use test; then
-			dohtml check-report.html
-		fi
-
-		if use kernel_linux; then
-			udev_dorules "${FILESDIR}"/65-kvm.rules
-		fi
-
-		if use qemu_softmmu_targets_x86_64 ; then
-			newbin "${FILESDIR}/qemu-kvm-1.4" 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}"
-		elif use x86 || use amd64; then
-			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
-			elog "of the /usr/bin/qemu-kvm script."
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	# Remove the docdir placed qmp-commands.txt
-	mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/QMP/"
-
-	cd "${S}"
-	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-	dodoc QMP/qmp-commands.txt QMP/qmp-events.txt QMP/qmp-spec.txt
-
-	# Remove SeaBIOS since we're using the SeaBIOS packaged one
-	rm "${ED}/usr/share/qemu/bios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-	fi
-
-	# 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"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		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
-	fi
-
-	# Remove sgabios since we're using the sgabios packaged one
-	rm "${ED}/usr/share/qemu/sgabios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-	fi
-
-	# Remove iPXE since we're using the iPXE packaged one
-	rm "${ED}"/usr/share/qemu/pxe-*.rom
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../ipxe/8086100e.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
-	fi
-
-	qemu_support_kvm && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	local virtfs_caps=
-
-	if qemu_support_kvm; then
-		readme.gentoo_print_elog
-		ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
-		ewarn "save states will be removed in the next release (1.6.x)"
-		ewarn
-		ewarn "It is recommended that you migrate any VMs that may be running"
-		ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
-		ewarn "any saved states with a newer qemu."
-		ewarn 
-		ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
-	fi
-
-	virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,"
-	virtfs_caps+="cap_setgid,cap_mknod,cap_setuid"
-
-	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version sys-firmware/seabios[binary]; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/vgabios)"
-}