Version bump. Install more python scripts for debugging purposes with USE=python. Fix man pages not being installed. bug #435534

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

3 files changed, 546 insertions, 16 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 977e481e8d8a..60c14dc093e5 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,12 @@
 # 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.210 2013/05/23 17:24:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.211 2013/05/30 02:57:12 cardoe Exp $
+
+*qemu-1.4.2 (30 May 2013)
+
+  30 May 2013; Doug Goldstein <cardoe@gentoo.org> +qemu-1.4.2.ebuild:
+  Version bump. Install more python scripts for debugging purposes with
+  USE=python. Fix man pages not being installed. bug #435534
 
   23 May 2013; Agostino Sarubbo <ago@gentoo.org> qemu-1.4.0-r1.ebuild:
   Stable for amd64, wrt bug #468920
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index c8d5740d8977..e3fa3ea94d43 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 65-kvm.rules 40 SHA256 c16a8dc7855880b2651f1a3ff488ecc54d4ac1036c71fffd5007021d8d18a7c5 SHA512 98aad2a2f212a7ac0ee5b60a9c92744fa462bce5f26594845c7a31d692aaaca2d52cb57bdbede7dfc60b9862c2a6510665dbb03215d5cf76e62516a283decdd6 WHIRLPOOL 937de93a23930f6b8533f0c3e0dd249c99ddf7d54446dea857607266ac0a4b435c5b4a52b2986b138bace9c0a7ade66f94116b38e2bc4767ead54bd11baf0920
 AUX bridge.conf 454 SHA256 a51850dd39923f3482e4c575b48ad9fef9c9ebb2f2176225da399b79ce48c69d SHA512 a907ee86b81a1b61033bb7621ded65112504131ef7b698c53e4014b958ee6fc79e66f63069015a01e41362cb70a7d0ed26dd9a03033cf776f4846f0e1f8f1533 WHIRLPOOL 8fcbd4abf9b8f7ca3d16fe0eaf17196ebf708dfecf85ce0f020e0de22b64905114f7b310f361826c81bb961c6b1bbbf984bff1e595bb949993b8966ccb222c35
@@ -13,6 +13,8 @@ DIST qemu-1.4.0-4114896d.tar.xz 25852 SHA256 9df38a4a7a595093e88b63a112bb06af4bb
 DIST qemu-1.4.0.tar.bz2 10419510 SHA256 066297ed77408fb7588889c271a85cf3c259ad55c939315988e6062d7708eda8 SHA512 8ad0f1409d94283303abdc80e319fcfaad7818cade7c77fcba1b1adde411726ad166c5cc62a561414afb22b3bff956c4ec0cc7d0fec36542dd86dc347506ce72 WHIRLPOOL b0ecc866dd042a8af25f49419be680d7fb313230f99036ca8f22b20663da5b669cce7be89957fb583dc75bdcf73e905d7bd31904351f05d21816137c03c5be25
 DIST qemu-1.4.1-a2231a9d.tar.xz 5192 SHA256 5c6dacc243f55d00817dcc4fa24555c48665719bb4a1ea9f3d3542bea7606c52 SHA512 102e751d1dc972324a835fd2f2c88431856189a98505a9f8c1993b3bc5da390fed1cda04f719040c1c62b5cf4a7715d8d9fb15d6ceb511af5cf7cccd0dab0c09 WHIRLPOOL 8c22d6300c01a4afc9000bb0ab1c5a7626b61decb356d08731c715c417808a2801c3ca8c0192851a2f5ccfe36e30fc94da193365aaf69fdfbc44956c63c61142
 DIST qemu-1.4.1.tar.bz2 10417738 SHA256 75063a9326221607de3599e89fb5af80f2d8080ddc55ca253fff113843432df1 SHA512 b655d2816b9393ca30bbba2bc8a30076e1c933d593653a1f61b4d5f3aaa9b8eb390fa3aa6f3486f1d066b1e078a3d9e1a280d0e8dac68745b128ddc01ca1b149 WHIRLPOOL d45d290eb2877038f945d3aee88d28b5c81feb43b1ca4c8941b87fc225e4cfb7b7a601af8b8e639e831b7f41823b4d1723ca9149c0c072eb168907aa67e017be
+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-kvm-1.2.0-7c9a3a87.tar.xz 268436 SHA256 ed9d8f358cc82e920f6d424de25a82165503cd7e6715bc23312bc2eba6dda771 SHA512 dd5f69835c9fb00c7c36f90e83c7380ac1e3712ef8929f465ed18393da0187020f41d49963584a887199d032ec4783be14b8787c6165d723df94204a70346217 WHIRLPOOL c3e0760c6fdc68b616a0d6e654ec6fa8bdedda9a817fecd7723e168d293eb7bc864864c824b6bb3d61054a0b925302ca59a3c0850e98840dfbd0dbc06c254f82
 DIST qemu-kvm-1.2.0-9489a8c0-1.tar.xz 268020 SHA256 3ac9715a6bb50d8e363ea0a225a23472d326c31189637eb7ad25fef47afe526d SHA512 9ea7da5384af22525db40fef62a480e551395907df6bf2420e1ccdaceddb24515f0e463e16e929b6da34ab0c2f0e5e567ef097f186a46c0d2fcc2d0d17fc3045 WHIRLPOOL 89ece68af896212cb9a868f6bb0d0df397d22131e3ae147f575177b39f015860ea0895a1edf938f46d3e2322182f131abc0767b07d8c05565a7ff40420f65464
 DIST qemu-kvm-1.2.0.tar.gz 6839420 SHA256 e98ab96c24337e312864f2341016695ac11cb9a04be83548a8da89596d591b05 SHA512 c21354127d4585397ab400600ab1ac9aac80cc0431bbf615c8e906819075b00373f382954fbd9fa39bf6479126d8d8e3321b3713346d04abe2c249edfa4eb6fd WHIRLPOOL 3d0662b39174eee0cd8750f6bea5baf57e2dfa82b490c3f1e54f44720ddd05ad029c3011425f651e745973ddb03aaca310bc8acf9f8e656bbb8390a262f7013c
@@ -21,23 +23,20 @@ EBUILD qemu-1.2.2-r3.ebuild 15190 SHA256 dee162a8d9aad7f7767ea403b4c4e1eae201e73
 EBUILD qemu-1.2.2-r4.ebuild 15456 SHA256 f82c406d900409cfcb74620abb145f2bed057b3356d6cb0e9aa2266cc18bb1c7 SHA512 8f561608469a5a49b176d1e0793c76d899763c11e965bbf54b7905deb6e862cf07b592e77ed509edff936e89a280ad6c8fe5204896b173c12d4111492987ba4a WHIRLPOOL dff35d9cb0689af35a0f840c0bcf91cd0f67192a1631351a5255648dbc67e624ee55f36345079abb7c3401bf9a2a076a07df27231ff72ee7cc742692ee2e2bf8
 EBUILD qemu-1.4.0-r1.ebuild 16271 SHA256 cc28c5e7ad8b1858fcc17147fb8e4811343d833cf13a0b760be996aa11eb3cb7 SHA512 9cf91d8f160ff282b93f7d649361049af11ffe3af19695d6d981be0f5bbf609b08688925ab995dbdb9734b21b534bdf2e967c1c22549c9aac3eab40f6ce829f4 WHIRLPOOL 20c0de4d82559238b121173681596b4e00e0176c59fff65b4e00c33d89bb6e2235b36977f0a8e4d7a558fc14697f96cd49de40596100503323a70c4a0b746c62
 EBUILD qemu-1.4.1.ebuild 16276 SHA256 3308c9933342a48a72e83914eb0c9451cc6f3ed8f80d6e0edf75a415fde525b9 SHA512 216d37206fce39568d2be08967f3a84a50ac4ec1609352783046f4fe187a2e82be3622b89c280eacba51371d6840408eb4043b83bd0c8ffc1aa45f4ad99efbbb WHIRLPOOL 017d29e27f677e54a1dc7d29beea8fea5ff0e1ab1d13a55786d090c51d52efbfe162c20a6048b36f1be54a66444552dbd8304383d200fe23ab813038459f6637
+EBUILD qemu-1.4.2.ebuild 16555 SHA256 bdcf6842fc090e200ad36fb150b3455806093d25b9c79d7293c5b053af07b5c1 SHA512 fef2869e1dd4cdc1b6eef62ddcc35f7b588b534a4ec32489ea3e20027d35afc3f3e51b3e6b6e368d69b6f870362d00447294c1c95c1204c1369dc8c9252f2d01 WHIRLPOOL 983859af9fe312d00516e0bfbe850f05454675d6e9263991c3dfae4b2ff4c9efe6c67703cef59fe062e1ed6912521086315f72d38ffbbfdc9aa096944c9cfced
 EBUILD qemu-9999.ebuild 13667 SHA256 32eeabc28c6c3b4c45d79d0c2e197bb87182dcb92b5e952aa5d9b2337708a0b1 SHA512 f8a0e9c53abc1a4d061146ad35b5f516dadb3f7c2057d581150fa0cb6587ccc06bbbb9cb579de08b5ea6ecf00cfcc0ee531c2d5734ea2279589f70765ab0f94a WHIRLPOOL 447e4b0d977b5a17854ff9db4ae682170059940984e6bd4fdfa5c5f9ea682dd3f06e866cbead01fead417610f78a1f799a7932751573fc2865ee38e0442f257c
-MISC ChangeLog 34385 SHA256 1c77d9d6f94130af85efab4341d43c805037f4b33ac52d6887450e8d2efe8184 SHA512 9519ad4a37eac520412096f7433b61688705da7ae28adf7006d4d501fb1a84cb68547cf8389d6e7db96aaedee534ff311d3bc7445126c0ea0b78424657846b76 WHIRLPOOL 929314fbbc9d50a896d8a503ce6024e20c1e4b43aa094060f4550accd7b8e1e3c5c070cb5863b8f771dad44dbd9ead7e99079f0dc272bc4aa09725f04b9ec8c8
+MISC ChangeLog 34619 SHA256 2e3ead0a407f0047cd64ed2f19fc8819ca45ce3a5fad988735d33bb42ee2563b SHA512 e1384b763b0e42b84808ec6ab476d42ca93867356251dcd070b568d3e54bf629beea3b345dc03cefcbe100c1a5d5bc0901319a70e69dda71fcab619f48a142f8 WHIRLPOOL a1a93494cbd0b5bf57b5bfb051bfc1d516d4e9078f885786f6a268b582dff7545318713e5ec2ba4ee6a39debef5c15f19e591a8531f68d076c37f3d1c5e2f898
 MISC metadata.xml 3228 SHA256 46bcb93b5ec650271b1f2b6de24c5b98214de01b6ec90180011c453e881caaf6 SHA512 e3951867195bc3eaf95492b848040c1739898daf9e3015186d3c6f9ccf59251874f3d7ca90a8a8364935dad7deea90e0153ad108b6bccf8469026c654336ddb1 WHIRLPOOL 6cc8dee4ddeff9c0dc9ce6532b0aa2b92b3f80c101f366dbcb9cec6bd4e3639aab5867019e0b4efafa60b54f08294f807f90f2529bd374170fdae36071043679
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRnlC6AAoJELp701BxlEWfgxcP/i/2HoJMLa2uDlJBQ1oBSUX9
-jWmSiVCcbjH9C4HA0f68FtqGx2ruiRksfqe84lZ8OrqDmNcOiT37GVFNjrYNbgxY
-SpeNkSRZNWNtl6YUUXGCsgr5ERMi/4/ll3dtQg34iDAkeBuNcsI9Pn3/fdYtnNdJ
-7ePQPScq0MJjiahGDCZcqhVFV3rtjR4sjhTfmvwa393xOXCka1B9ipAZ+KS9lwFM
-GwnhPaYSCsIh+xel4ow9wH9Mraw7VwHZ7rOVDvSZ3NqFGK0Zg2aVIfGJI5JMWF6n
-WLQggO/502w2IvM4Qus/kzLtOtdiIkHHUtczmgf6rZO96XduSO0GIKjJf6wPUx0p
-rBz/KVLnS0cxtXkhLII3c6XfICA9EQ7wc+MNmsrTMh0il08j6XzNDNqW8fC9LkNS
-+G9TC/dqV5MxHSp/oXCuNd3C0z/zHHZxtZAQCPLBIWa4M4FEIr/q1pRijJv8jvhO
-H9mc/uBspzC7yL6pbNwVukluuC5BVrhpj3gAOD1GFESM6eTB4jDkkqgZ2h3O4UZ1
-DkMOIJu23yx18pjPjXKsa2SW3Ik7HI5FzQvVLftxMMQ6nLetlkHXjrmuQkWUAuze
-IFrNyzGLIcUw8K/9zdScZx7O3sPc20Nb54LPJoP6h/dTpAwvkqHkP++u8+zMZoN2
-JzpXFVgJxgY3WOnKnGKW
-=2sRv
+iQF7BAEBCABmBQJRpsAMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE
+N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prvV4gH91KSDQDauYmiHuwjyPSUox91
+DATXozMdrMIEof1Q+5sJhaUrVKnIfReXhp3PYPkGPCaCitClOrKTf8nyafVRsncG
+XKD5p9jHkValRGoJoC1zGC5x6FxZu007bQ92cLHMkMnb07kW9Bt8KYgNk/otbQXY
+Gh+EgRpwQCeddOMnl0KSUGA6SyzhI9YlxJ3PXef/0qAtYtzTfJ8CZouJ6ULTxAXe
+2Vn3S8yqmJ0LuCDvct+qmcz+tgH+uZIy5VB9FwbtLLRkXYzScAw9t/kNgwLJb/2q
+XnAe6qLoaNXH3IeQpjRGcFc8jcTyWMAVtexJDfDV6xiGpxCixmR8Qrh/KeJa4g==
+=qNYF
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/qemu-1.4.2.ebuild b/app-emulation/qemu/qemu-1.4.2.ebuild
new file mode 100644
index 000000000000..0f73291c94f6
--- /dev/null
+++ b/app-emulation/qemu/qemu-1.4.2.ebuild
@@ -0,0 +1,525 @@
+# 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.4.2.ebuild,v 1.1 2013/05/30 02:57:12 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
+
+BACKPORTS=6b5934f9
+
+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="+aio alsa bluetooth brltty +caps +curl debug fdt 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 or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb 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
+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? ( static-softmmu static-user )
+	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl )
+	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(+)]} )
+	!app-emulation/kqemu
+	qemu_softmmu_targets_i386? (
+		sys-firmware/ipxe
+		~sys-firmware/seabios-1.7.2.1
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
+	)
+	qemu_softmmu_targets_x86_64? (
+		sys-firmware/ipxe
+		~sys-firmware/seabios-1.7.2.1
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
+	)
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	brltty? ( app-accessibility/brltty )
+	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}
+	app-text/texi2html
+	=dev-lang/python-2*
+	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"
+
+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"
+
+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 sdl)"
+		conf_opts+=" $(use_enable aio linux-aio)"
+		conf_opts+=" $(use_enable brltty 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)"
+		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 TODO 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/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
+	fi
+}
+
+pkg_postinst() {
+	local virtfs_caps=
+
+	if qemu_support_kvm; 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
+	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
+
+	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."
+}
+
+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)"
+}