Version bump.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 578 insertions, 15 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 71c6bb1a9bab..7268d9914bd8 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.252 2014/04/19 17:41:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.253 2014/04/19 17:43:07 vapier Exp $
+
+*qemu-2.0.0 (19 Apr 2014)
+
+  19 Apr 2014; Mike Frysinger <vapier@gentoo.org> +qemu-2.0.0.ebuild:
+  Version bump.
 
   19 Apr 2014; Mike Frysinger <vapier@gentoo.org>
   +files/qemu-9999-virtfs-proxy-helper-accept.patch, qemu-9999.ebuild:
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 49a653e9525e..559ad8f0940b 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -19,6 +19,7 @@ DIST qemu-1.6.1.tar.bz2 12041317 SHA256 fc736f44aa10478223c881310a7e40fc8386547e
 DIST qemu-1.6.2.tar.bz2 12059106 SHA256 65c5196226e73e327377d741d70004d2ea8fb6799080812b6f3ed8f9269e4eb4 SHA512 bea8ebfc4b8af23f88ebc0acb2ecfe9d38ec8c8a86a94d7f20d8da21ccdbffe79b3213ad5bac2f5175e4fdc98ad149e82250d2a99f0b5415cace82e776033a64 WHIRLPOOL f49b4aa25e09fc61d26a10be9d5a1e8b8008f8a7a60d2e36f6e93c532bb60f8dcb423430ab845decd4feda5cc7683120b54e62426e36ebc1fd62c38e8eeb0db1
 DIST qemu-1.7.0.tar.bz2 12248954 SHA256 31f333a85f2d14c605a77679904a9668eaeb1b6dc7da53a1665230f46bc21314 SHA512 6ee52444b93fc2953e8080383cc0cdc618a826ddd5252bf5f6faf27d91699a414924d6015d27ea12ce1cc21e135acbc8dde595c84a4ce1e0c7173f0446f867eb WHIRLPOOL 80acb78605ccca21abf0414face6d6ba61707fd100335f5ce4c2502b6adbec96f267dc773469a20336690070285e004668e56581ea09cb25494eb5674dd60974
 DIST qemu-1.7.1.tar.bz2 12246206 SHA256 d68942a004222eebae5d156ceefb308fabd98edb282d1dde49ec810bbf01bef4 SHA512 deaa209d85b10465a69a0ffffefe1987723bb242cef64d7344adfed5de08e48f53f6096e83821a9d1221df392e3a43b44b666a86aa4fa26d3d95ba631676947b WHIRLPOOL 0a78e3bdf96a035727f0f91e1b6c0f36658e6c40b06085ac802192d65bdd2c670ba6d3f2550aa9ce6224050c3929689744e4b20bacfb33c4aaf887fba86c88ef
+DIST qemu-2.0.0.tar.bz2 12839647 SHA256 60cc1aa0cad39cec891f970bed60ca8a484f071adad4943123599ac223543a3b SHA512 8fe2e8faa66251aaea7d6017ee71675d5b05f93f92be7e2ad3e1d02af185b3d6c4069bd83a13fb1e35a3e8947aff76f22446b395f97ac18b6f7a99744202e3fa WHIRLPOOL 6b39916acdcaa5e22510afec8a972935e71064de9ff0a3f9a698a8142f66b130a24d0a38cc56a7a92dbdc78d5145abe743a9c6933f819ce9e682b7cffdac1508
 EBUILD qemu-1.4.2.ebuild 16623 SHA256 c4c38fbc3491e3dee61454b6072e354aa0a78cebe6672248ae95dcd6de1ff4be SHA512 4737718bfd51a3e086e8696d332c3537db1a09532a9095910a3343aaab90d8fe1ebf4c12992826abbb7b62faf94393d193f9e7b3574ae8d0f823c4b89233ea5b WHIRLPOOL ce04203cb2231a4c94ff7ec2113b54485015b8cf368c6d76c9b19b832d761b16b38f2ded43fc5b960472e97bf829649d80edd41a37e600ee95f9b5a36976a4cc
 EBUILD qemu-1.5.3.ebuild 17418 SHA256 db7cbeea657e6a7594c4f9c774ef6deb953d9cb94a7690222fae99eba3319bb4 SHA512 22f5fd4f245b54525b4f1564f0fd3997fe86b9c2c196fa2552771737d530815f8a513a29aff65916ed79f0d7ce96a6b8854750e94c8743990a2d342d1e20546c WHIRLPOOL a8402b49eab3b08e7d5bc9d7bd3447caaa7e32ab341254b6524b407d902c405888069e1acf16bceae172c2da87ac538b57aae4caa638a2a028ffe4ea43c8cdee
 EBUILD qemu-1.6.0-r1.ebuild 17485 SHA256 4f90b3e4cd17ecc3866151a41919edb3ab45eb2578666cf81bdab6cb2317e091 SHA512 ee90c837e2d9df2030563c370336d82494021bab5feee8092639b4fa52ff01340161b49f6cd09ab91e6f19e441c8d7593a71548581e4b5a96b41297a54dcb577 WHIRLPOOL 904319f1a700df17b867fd312f012fc961ffa0f1025467faaf2e8af3ba030dd030a3fcbfcd28809a04e25fac320b67e5ccde4bba5c123992093bd35ab844db79
@@ -26,23 +27,24 @@ EBUILD qemu-1.6.1.ebuild 17742 SHA256 93d4b5c0abe3171f4c3e1836d64f296eb125ef9c1d
 EBUILD qemu-1.6.2.ebuild 17740 SHA256 f41910723e8c7b26351d8f74cfbf76ab4efc26e1d773bafcff6eae81c8caff0a SHA512 a93596e46df82e7aaad430e4458e16c61a43f4860e32e5c7456223b571e13a182b1099bbad3d82eadc3b115b2f40a88b3fac4e80a4ecc6f5f31c27f81523e53e WHIRLPOOL 62b1bfc3cc54bfacc849b8fac63c894dee6c0a6ace4dbec745132accd59f439c2aff0604de33fe57a1ac79b1afebcd4fd7f388506f23988297459e7cb86b0d01
 EBUILD qemu-1.7.0.ebuild 17732 SHA256 0849ed680ab37adf85d7b0617a6f612b924de3c08a5e05a6d46b6f3bb3b4dfb5 SHA512 2fcf231248ed6d0990be435274a14e13c88a37b02c735891ea1db0a279a4b23144f3ff6b21230f3c2bc4b805e7cb4b2d20c368205cdecde3a5f4e36a20c504e8 WHIRLPOOL e1ed4777777538eb135ec1b496f95b2bd8b00734558635ad903ea7482d4450df9b90a0f0e0f5d0c7cff186a7b1d293e21f9d528debf374ed8c1fe10ccd3c4b0f
 EBUILD qemu-1.7.1.ebuild 17732 SHA256 4fae95d01212a960641f3fe85ec21239c73e0885a4969030f13e2a2a5413fcd7 SHA512 9a54c1d794586e06b70f37ca9f15441574dec3f6265ab69a80d61639e872b2c79121edf009cac86896dd014180065cea4103dc6bdf779ca84f88ea0df4205c47 WHIRLPOOL 81e68e5d880d2447a74215cd60171b8853d8b82ed058f8ba7f8c377a090e6aace0cf034bc983a73ea47090ffe711052e13607860717ed6d8ab83b8b13f0e48b5
+EBUILD qemu-2.0.0.ebuild 17753 SHA256 2dfdb7b950fba873996d9af05198f7d44470144e93d95fdb033dce7d7c8410df SHA512 1a1853d02db124b5d6df70fa6d6520aa8fe918bc1656d3c3dbeeb88de78d6697fd52a4ac4e49c68e370e76e7a3191338216ec4dacd2674a47cb41ebde7070892 WHIRLPOOL 6cddce5aa190f88e09ad4203a280c6e53480f2bcb0e255e1f015af18347d27a52335f53c8a80534a22543bb95b650227a372850141c5e958c9b0d4e581ea1c19
 EBUILD qemu-9999.ebuild 17703 SHA256 5870ad5124c7293604c6ef2afcf061c6998b7b80423a808fd188cacfc7555848 SHA512 2610bd33da4a0b7b7692305bce9a10e96f5d4bc4b3444642eed09da76970d1848ddf84739b0ffcc1b41381f3497eb308ec99378a57df5e9becf809827367ae42 WHIRLPOOL ffa4c58af000299b55c87accf914c2116e730b300fbabaac66ab3d8282b89d5e01df3d2a359a060f6e3b2786ddb82eae4f50193ff83ecfb02d621e06830b0ec4
-MISC ChangeLog 41690 SHA256 8ab710fee05b566ea977bccd8589c0b975f18790384a50514d5d8e7d57bf4cc7 SHA512 e0d1f991ca923ffe0fb5a58fac981d60b8100fbad8b348abf72862f4236d7aa9b3f6177e39dd19d1046ef5c72884000c92b77f8fe103341427c2025ddea83409 WHIRLPOOL 21d6930ff6e1ab722f2bc2b98e590c558d9fa1b53e1f3ff07bda08ef1d9af833c30344779a36d54cd8ea2ef55722e59cdfd0cf4e569357e478c1cc399189c324
+MISC ChangeLog 41804 SHA256 460292e5e346bb386903663b861f3fa5e3d72e410d492cfcbc64e680f8c1f68e SHA512 0e54ef8679121bc295dd940fcd1d29be2c18bc291240b3a381ce0a1dc1b8c2fd17be2755a10cb689b3ad7ec7a7bdeb49104f0d57a8cf42c05cf671bcd0ed850c WHIRLPOOL 804886b7a3cd9965167ca6f9dee8f4342f602b3d09ff390bb68830b6a00386c26ed5fa207c4f7d49df939e3bd8b7c68e2cb263791db6a854d29d8cfaaf4d068e
 MISC metadata.xml 3515 SHA256 dfde4a226457996dfb5cc86ddb77cb1514db7a7d9b1c999db77d313146b6b4df SHA512 c7c6b742cc1be5fe440bcba43693c3b5d30e8039b1f1f5aa2a179af35d18aee05439e48f768b20318e15317a0f0d300cead74ad585b82767c5d51a8e7ec3fffa WHIRLPOOL 96ec11e854a58593a4a29d66404dd10d354cf19608053b60704a7466817c8d677f8c15ba1434d6674bd7f41cf28020ee3e3a412837c62930abb4521a0e57c127
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTUrVRAAoJEPGu1DbS6WIAGr4P+wRv3H157w2wC5zMVY5YiMqS
-UW4Am4Cjm4CiDrKwlaALrHyu4YhjpV+5n4Mx2JCl4Z1WXpPvNr6m+1JlcBZi2/s3
-hPELJ98q1BfS3dLyaikzE7cqmiU5xEWay1reaWYRsz3mDHcgzpOBLeK10cxXTGAa
-pEdaCt5wgDXy2kjVVXI1Pj9xODlBjJWjkAbAx43b7Ivvx0+nB5G9lIptcwadr7WW
-i3/X18fQpJo5SDIs+L6+LQKR0T7rzzzfZ6E5KScGgSQnK2NWsZA/5yI3ls3HjWH/
-CYmNahqK1T7pEY/8RyN+HCUpfx+YoEEA/vMuCv67aCECkdHDALfwAKcPIXvU6J0G
-wqbF3SoFgTI6MYaRxI3aGrq1f+/v2pU1GRfDb/qOXK/1DzCny1SlNxvQYZ3z9+wB
-Q/RdGH3unQttA4D2cTVqpne6YsnxEt3CM9vZXTSPdFQ0e/tgd6qQKoJuw2GxTdiV
-TcTj4PSbu4ygbauZOYgASNEObnvCnQgBHKKapafLl6H58SrHI21kZO5RaKYLpoMw
-qrGgFrfpUIodziND4M1B5aqIybkSctcBRaKhI5cN72ebTzIPsy08tRs1T7PO+Zbf
-8j/YhH/5pCRmjXTGRpMWLTN4eAqlosJn9pwQsZeS0EiOrnSyuSNTLi4C/sKgk6Lq
-QS/GHNSX2juJm/htTCv3
-=GRFz
+iQIcBAEBCAAGBQJTUrWwAAoJEPGu1DbS6WIAeGAP/23gcsqRtTyJT/8Xs3hf+bjL
+fgmq1+U6RSyZpS722hq3hWvB3sVX9hIW6t/z9XefsPFmF5i1RBGtX6XstIoymvH8
+bqtDn3wiGAqC2VRI1nRx976Rl9D/Nmyys3iJmGdtCGxJyfBAKSPD0Btl1JUM1q3K
+dvPlGqBcN2GzmSHDluOHTDFl3+FRupH5uit3eC4ga/eOFisCGf4YgbfArCiq9VlO
+vIC1hkUgI139ZqkC6zVUUDbbUchCvNB6SrS8l28NG5UyFxuavN8tG53pYAtMqZTP
+CKkLLczXbczknz3ACBGjDq1h5Mt/v6ZMhWI0ZG+EJ3Jtv6pfVtczwDuGcUA+DDvQ
+bWe59R6PSLL8NHbISuTIPA6Lpj/t1uBlj8ia3bTX7sWXHklu0Jkzo66+fbp0KnCe
+FT5jIKG4KoEpZh+4IGWgP1dRWEzCz2h7EIMRqBVtzUP2wdTehxVwxHGBzLmfZ7TX
+yUNmZH1b7hrzBhYN6nWB2byKF1eRWfsg0OvP7JjmXSY36Qy7EZsDXAX/58giMFVP
+jBdwPNBTIs5/EG4hEntm7YCva+w1dmPmQyBfj3YY2G7Gj6XVLOKWm3vM4hOLrdz1
+6iCFoPafu+HMs7rBDeEjuCt5BJ5CLUHi+LvG1qhZofNnxNwMdPfRdFM2BSJuS6a5
+qC0v2zT2M8mK5/rX/nk4
+=IbHY
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/qemu-2.0.0.ebuild b/app-emulation/qemu/qemu-2.0.0.ebuild
new file mode 100644
index 000000000000..ae9cb79d42e4
--- /dev/null
+++ b/app-emulation/qemu/qemu-2.0.0.ebuild
@@ -0,0 +1,556 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v 1.1 2014/04/19 17:43:07 vapier Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{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=
+
+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 glusterfs \
+gtk iscsi +jpeg \
+kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python \
+rbd sasl +seccomp sdl selinux smartcard spice ssh static static-softmmu \
+static-user systemtap tci test +threads tls usb 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} )
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	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.4.0[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.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-2.1.0[static-libs(+)] )
+	spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
+	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
+	tls? ( net-libs/gnutls[static-libs(+)] )
+	usb? ( >=dev-libs/libusb-1.0.18[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.3.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.3.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
+}
+
+src_prepare() {
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i -r \
+		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
+	epatch "${FILESDIR}"/qemu-9999-virtfs-proxy-helper-accept.patch
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	# Fix ld and objcopy being called directly
+	tc-export AR 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+=" --disable-glusterfs"
+		conf_opts+=" $(use_enable seccomp)"
+		conf_opts+=" --disable-sdl"
+		conf_opts+=" --disable-smartcard-nss"
+		conf_opts+=" --disable-tools"
+		conf_opts+=" --disable-vde"
+		conf_opts+=" --disable-libssh2"
+		conf_opts+=" --disable-libusb"
+	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 glusterfs)"
+		conf_opts+=" $(use_enable iscsi libiscsi)"
+		conf_opts+=" $(use_enable jpeg vnc-jpeg)"
+		conf_opts+=" $(use_enable kernel_linux kvm)"
+		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 ssh libssh2)"
+		conf_opts+=" $(use_enable tls vnc-tls)"
+		conf_opts+=" $(use_enable tls vnc-ws)"
+		conf_opts+=" $(use_enable usb libusb)"
+		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}"
+	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() {
+	python_export_best
+
+	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}/scripts/qmp/qmp.py"
+
+	python_doscript "${S}/scripts/kvm/kvm_stat"
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/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}/docs/qmp/"
+
+	cd "${S}"
+	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+	dodoc docs/qmp/*.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 has been removed starting with the 1.6.2 release"
+		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)"
+}