[gentoo-commits] proj/releng:master commit in: app-emulation/qemu/, app-emulation/qemu/files/

[Anthony G. Basile]

commit:     8ba3585ad3576156987e3897ee8bbafb325d3bb6
Author:     Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Wed Feb 19 19:19:49 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Feb 22 14:14:49 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=8ba3585a

app-emulation/qemu: add to tree

---
 app-emulation/qemu/Manifest                        |  12 +
 app-emulation/qemu/files/65-kvm.rules              |   1 +
 app-emulation/qemu/files/bridge.conf               |  14 +
 app-emulation/qemu/files/qemu-1.5.3-openpty.patch  |  12 +
 app-emulation/qemu/files/qemu-1.7.0-ffsll.patch    |  19 +
 app-emulation/qemu/files/qemu-1.7.0-sigset_t.patch |  12 +
 app-emulation/qemu/files/qemu-9999-cflags.patch    |  13 +
 app-emulation/qemu/files/qemu-binfmt.initd-r1      | 129 +++++
 app-emulation/qemu/files/qemu-kvm-1.4              |   3 +
 app-emulation/qemu/metadata.xml                    |  52 ++
 app-emulation/qemu/qemu-1.5.3-r99.ebuild           | 552 +++++++++++++++++++++
 11 files changed, 819 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
new file mode 100644
index 0000000..92ffdfd
--- /dev/null
+++ b/app-emulation/qemu/Manifest
@@ -0,0 +1,12 @@
+AUX 65-kvm.rules 40 SHA256 c16a8dc7855880b2651f1a3ff488ecc54d4ac1036c71fffd5007021d8d18a7c5 SHA512 98aad2a2f212a7ac0ee5b60a9c92744fa462bce5f26594845c7a31d692aaaca2d52cb57bdbede7dfc60b9862c2a6510665dbb03215d5cf76e62516a283decdd6 WHIRLPOOL 937de93a23930f6b8533f0c3e0dd249c99ddf7d54446dea857607266ac0a4b435c5b4a52b2986b138bace9c0a7ade66f94116b38e2bc4767ead54bd11baf0920
+AUX bridge.conf 454 SHA256 a51850dd39923f3482e4c575b48ad9fef9c9ebb2f2176225da399b79ce48c69d SHA512 a907ee86b81a1b61033bb7621ded65112504131ef7b698c53e4014b958ee6fc79e66f63069015a01e41362cb70a7d0ed26dd9a03033cf776f4846f0e1f8f1533 WHIRLPOOL 8fcbd4abf9b8f7ca3d16fe0eaf17196ebf708dfecf85ce0f020e0de22b64905114f7b310f361826c81bb961c6b1bbbf984bff1e595bb949993b8966ccb222c35
+AUX qemu-1.5.3-openpty.patch 256 SHA256 885ff6391fc7a106b41f7d29ff103c083ecc34580ddd68918c0398bacff43aad SHA512 e5e1900d015880977fcad370b79d5030c782edf2a5794d082796714f95b431447e7d38558ffdfae5af5f7d5d5d6dc2ba3af27e0cee644a72b62651a4570009e4 WHIRLPOOL 894593cd57a96a619b53574e5e86ba72b62659e525cb615522e7ee9ff856454b7d0aee5f9c8cf08641efa5245aba3577808ec8858f4ea73f30483313eb315204
+AUX qemu-1.7.0-ffsll.patch 560 SHA256 d211b937e4c50d50c680cf7e4450079a3b3924857849d7a99da4e3adac708aa8 SHA512 00594c276865ae9d3c1b748ebcf3e5d88b8a4b10e1700b215f22de5dbd6ba06bb9ad9b461bc93ba3b8794418d4197d3af45ef5eb46b9c1829afa9ca0b1eacf13 WHIRLPOOL 475307753a39fab1bf2e82602068f9992978cf74f9c3374369d1c0329592248b31830135d07d1386d8a66a7bf539a33551ac9de04478e5a2efe4d8385689e61d
+AUX qemu-1.7.0-sigset_t.patch 403 SHA256 081866f22ed90e9e4bfb91fed7b213d923d369dcfdec229fcc8120074d9ba18a SHA512 65106e0d6f3e0b8bd8623d54d9f8795d422dcae90f682025e0b71aa56e0668c24babbbebddebb0f88227e97447c50b840bcea234d264c58a438e04ea3cfa3095 WHIRLPOOL 32a6c3dc3a967dc0882914b5cf7e10cba3be7925ae0a8ed0e85690d5c12e055544240e44efaf9ab9ce3de6620f12127331d3dd46c6ea03a4bb4d56e17d68e9db
+AUX qemu-9999-cflags.patch 347 SHA256 fe3bcbe83e81225b2c722578a0a976fcb724419d5208bbd6d02fb543e80b7e12 SHA512 e1b8be744170d61a2155b23a8394db01f8af6dc70ec033e71b2ff46f72975704836d42b96d7904e5d462289c5f8f24317f2fb28698f18a77ab1de02829e585eb WHIRLPOOL 2d972c7e40292f424fd37a4c1af04d2be095c215211ec2e1d15d8457df553342ffc02a7d39985f817fbbf5342e422d30e439c35a925341cf9b852ca7ff15a308
+AUX qemu-binfmt.initd-r1 7023 SHA256 3572c110c6f217754e638796400a5901910a2e61b8818c8569f8258b103ebcc6 SHA512 773af64fef164c00945acf5881e64a10141aa8fdc85491e57bf8dcc7c800a4f81879527998a0896a42f921edcbf5f741beb31ac2a82e45cba506c7b8461733c8 WHIRLPOOL 30382fe347248683e989c2b7fbd804ce26173b313746d80467029b2ad3594f414628f7537120b168a0e700c424d3525528eb632b07e16544c2fd07f418f3187c
+AUX qemu-kvm-1.4 68 SHA256 8b1adf198129f001e75a2311fc420c168094d1084d2163cdf6a32b3b23c96137 SHA512 706fab4d155c410acc292e67fb354ce7dcd17f7e33f2ca8c9c44035ea128f8d36f89e27cf87ebe22721f5676be9e7f2ae5484fd000183c8ffd7854e02eb3d120 WHIRLPOOL ef795330b592cef8e3d92f52a77eb77a671e6aa1a47d07531917b5c1c09e72e5df1a44aea939b086e0a3c5ef2a5cea9223556a46ceae73e55300475c42f07067
+DIST qemu-1.5.3-25d93791.tar.xz 3136 SHA256 311bf6db68e37080a7cb3ea9bd573420b783dd2484ce62a936abba39e3b58446 SHA512 023df394a5dd76e7a0363b0cf994a41f18eac0b1e15ba5aca025dd73456d05535eef729ed6febec245c2f51aa10611366ee68175d80057ce6ab92a3a1c79a191 WHIRLPOOL e8e090eb5f425ba07de3bad58155558bf8aed5db3715e4a9dc8b0b3f0913c1fcbc6e727704e66f3979f57b86b0563efdd0462069ea3f0f7b37c001c564ec3d4f
+DIST qemu-1.5.3.tar.bz2 11932631 SHA256 39364ccbe82434c4eb8c25813896a1dce2db1977080d06ce13f96aa24ee2a601 SHA512 a14c7ec22cbf94fcc53ae5bc4d663dbcb1e29e14aac7bb2bd03f7ae1afdcf528c4198856db7aba32f0c84b5b9f583137fa4c0cf386a12c8f74c9c8d7825f1c52 WHIRLPOOL b793744e935922e58ff2528ed77ad416cbef086b259dec974f9b0c9aba08949cbe958e468d67ce4606baa66e236902e186f9679e27041fbddef506267d792b15
+EBUILD qemu-1.5.3-r99.ebuild 17666 SHA256 b386ef4824abf36f0bd869cb8ba71422ec86eb9718a64f055872f787f4bc506b SHA512 c2f13a4dfdaa21762ac6a374da25582d51e42153e94ea1e35b58e0a4b8d72572d0b1032926a716e0bf0d262fffb6e2cab5f00667013fe921693c3e281916903b WHIRLPOOL e38bade926f0535686f9c9a4962587df9130fcabad9295757ebef068632917e1e231aadf47e0b0c97449d98489f8d653e83f787c3d9bfc2b1bbe47d9803772e4
+MISC metadata.xml 3516 SHA256 5ee91d2ad67fa84993869317278d95577e7dc94fa2fccd3635f5b8c2ce543ef1 SHA512 62e3c9d519cfa8e1c100efd2c39f5a7940abb5eeb0fd3ce0fa2b0c175eeeb4942a5521282fbb07056bf80c37ea7c81e1e78e8aa42cd313d0a9b24f327f2a5103 WHIRLPOOL aabc5374e1aeaf3907c638290d04fc7ba47bd7f71b0b3962281743c2dcd782d29e865579b8cba21cae2b117936175780346cc937dcd63eded58099f2448a3d43

diff --git a/app-emulation/qemu/files/65-kvm.rules b/app-emulation/qemu/files/65-kvm.rules
new file mode 100644
index 0000000..c2f7317
--- /dev/null
+++ b/app-emulation/qemu/files/65-kvm.rules
@@ -0,0 +1 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"

diff --git a/app-emulation/qemu/files/bridge.conf b/app-emulation/qemu/files/bridge.conf
new file mode 100644
index 0000000..2bde37e
--- /dev/null
+++ b/app-emulation/qemu/files/bridge.conf
@@ -0,0 +1,14 @@
+# This should have the following permissions: root:qemu 0640
+
+# allow br0
+# Uncommenting the above would allow users in the 'qemu' group
+# to add devices to 'br0'
+
+# allow virbr0
+# Uncommenting the above would allow users in the 'qemu' group
+# to add devices to 'virbr0'
+
+# include /etc/qemu/bob.conf
+# Uncommenting the above would allow users in the 'bob' group
+# to have permissions defined in it, iff it has the following
+# permissions: root:bob 0640

diff --git a/app-emulation/qemu/files/qemu-1.5.3-openpty.patch b/app-emulation/qemu/files/qemu-1.5.3-openpty.patch
new file mode 100644
index 0000000..5c71c5b
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-1.5.3-openpty.patch
@@ -0,0 +1,12 @@
+Patch taken from sabotage linux
+--- qemu-1.7.0.org/util/qemu-openpty.c
++++ qemu-1.7.0/util/qemu-openpty.c
+@@ -47,6 +47,8 @@
+ #elif defined CONFIG_SOLARIS
+ # include <termios.h>
+ # include <stropts.h>
++#else
++# include <termios.h>
+ #endif
+ 
+ #ifdef __sun__

diff --git a/app-emulation/qemu/files/qemu-1.7.0-ffsll.patch b/app-emulation/qemu/files/qemu-1.7.0-ffsll.patch
new file mode 100644
index 0000000..481bd72
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-1.7.0-ffsll.patch
@@ -0,0 +1,19 @@
+taken from sabotage linux
+--- qemu-1.7.0.org/hw/virtio/vhost.c
++++ qemu-1.7.0/hw/virtio/vhost.c
+@@ -22,6 +22,15 @@
+ #include "exec/address-spaces.h"
+ #include "hw/virtio/virtio-bus.h"
+ 
++#ifndef HAVE_FFSLL
++static int ffsll(long long i) {
++    unsigned long long x = i & -i;
++    if (x <= 0xffffffff) return ffs (i);
++    else return 32 + ffs (i >> 32);
++}
++#endif
++
++
+ static void vhost_dev_sync_region(struct vhost_dev *dev,
+                                   MemoryRegionSection *section,
+                                   uint64_t mfirst, uint64_t mlast,

diff --git a/app-emulation/qemu/files/qemu-1.7.0-sigset_t.patch b/app-emulation/qemu/files/qemu-1.7.0-sigset_t.patch
new file mode 100644
index 0000000..1d5d173
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-1.7.0-sigset_t.patch
@@ -0,0 +1,12 @@
+taken from sabotage linux
+--- qemu-1.7.0.org/linux-user/syscall.c
++++ qemu-1.7.0/linux-user/syscall.c
+@@ -400,7 +400,7 @@
+ #endif
+ #define __NR_sys_ppoll __NR_ppoll
+ _syscall5(int, sys_ppoll, struct pollfd *, fds, nfds_t, nfds,
+-          struct timespec *, timeout, const __sigset_t *, sigmask,
++          struct timespec *, timeout, const sigset_t *, sigmask,
+           size_t, sigsetsize)
+ #endif
+ 

diff --git a/app-emulation/qemu/files/qemu-9999-cflags.patch b/app-emulation/qemu/files/qemu-9999-cflags.patch
new file mode 100644
index 0000000..08a6c9f
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-9999-cflags.patch
@@ -0,0 +1,13 @@
+diff --git a/configure b/configure
+index 82f6e71..7e19aaf 100755
+--- a/configure
++++ b/configure
+@@ -3131,8 +3131,6 @@ fi
+ if test "$gcov" = "yes" ; then
+   CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
+   LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
+-elif test "$debug" = "no" ; then
+-  CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $CFLAGS"
+ fi
+ 
+ 

diff --git a/app-emulation/qemu/files/qemu-binfmt.initd-r1 b/app-emulation/qemu/files/qemu-binfmt.initd-r1
new file mode 100644
index 0000000..4b1dba5
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-binfmt.initd-r1
@@ -0,0 +1,129 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/files/qemu-binfmt.initd-r1,v 1.3 2013/02/17 22:05:22 vapier Exp $
+
+# enable automatic i386/ARM/M68K/MIPS/SPARC/PPC/s390 program execution by the kernel
+
+depend() {
+    after procfs
+}
+
+start() {
+   ebegin "Registering qemu-user binaries"
+
+   if [ ! -d /proc/sys/fs/binfmt_misc ] ; then
+      modprobe -q binfmt_misc
+   fi
+
+   if [ ! -d /proc/sys/fs/binfmt_misc ] ; then
+       eend $? "You need support for 'misc binaries' in your kernel!" || return
+   fi
+
+   if [ ! -f /proc/sys/fs/binfmt_misc/register ] ; then
+      mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc >/dev/null 2>&1
+      eend $? || return
+   fi
+
+   # probe cpu type
+   cpu=`uname -m`
+   case "$cpu" in
+      i386|i486|i586|i686|i86pc|BePC|x86_64)
+         cpu="i386"
+         ;;
+      m68k)
+         cpu="m68k"
+         ;;
+      mips*)
+         cpu="mips"
+      ;;
+      "Power Macintosh"|ppc|ppc64)
+         cpu="ppc"
+      ;;
+      armv[4-9]*)
+         cpu="arm"
+      ;;
+      sparc*)
+         cpu="sparc"
+      ;;
+   esac
+
+   # register the interpreter for each cpu except for the native one
+   if [ $cpu != "i386" -a -x "/usr/bin/qemu-i386" ] ; then
+      echo ':i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386:P' > /proc/sys/fs/binfmt_misc/register
+      echo ':i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "alpha" -a -x "/usr/bin/qemu-alpha" ] ; then
+      echo ':alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "arm" -a -x "/usr/bin/qemu-arm" ] ; then
+      echo   ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "arm" -a -x "/usr/bin/qemu-armeb" ] ; then
+      echo   ':armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "sparc" -a -x "/usr/bin/qemu-sparc" ] ; then
+      echo   ':sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "ppc" -a -x "/usr/bin/qemu-ppc" ] ; then
+      echo   ':ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "m68k" -a -x "/usr/bin/qemu-m68k" ] ; then
+      echo   'Please check cpu value and header information for m68k!'
+      echo   ':m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "mips" -a -x "/usr/bin/qemu-mips" ] ; then
+      # FIXME: We could use the other endianness on a MIPS host.
+      echo   ':mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "mips" -a -x "/usr/bin/qemu-mipsel" ] ; then
+      echo   ':mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "mips" -a -x "/usr/bin/qemu-mipsn32" ] ; then
+      echo   ':mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "mips" -a -x "/usr/bin/qemu-mipsn32el" ] ; then
+      echo   ':mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "mips" -a -x "/usr/bin/qemu-mips64" ] ; then
+      echo   ':mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "mips" -a -x "/usr/bin/qemu-mips64el" ] ; then
+      echo   ':mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "sh" -a -x "/usr/bin/qemu-sh4" ] ; then
+      echo    ':sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-sh4:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "sh" -a -x "/usr/bin/qemu-sh4eb" ] ; then
+      echo    ':sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sh4eb:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   if [ $cpu != "s390x" -a -x "/usr/local/bin/qemu-s390x" ] ; then
+      echo   ':s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-s390x:P' > /proc/sys/fs/binfmt_misc/register
+   fi
+   eend $?
+}
+
+stop() {
+   ebegin "Unregistering qemu-user binaries"
+   local arches
+
+   arches="${arches} i386 i486"
+   arches="${arches} alpha"
+   arches="${arches} arm armeb"
+   arches="${arches} sparc"
+   arches="${arches} ppc"
+   arches="${arches} m68k"
+   arches="${arches} mips mipsel mipsn32 mipsn32el mips64 mips64el"
+   arches="${arches} sh4 sh4eb"
+   arches="${arches} s390x"
+
+   for a in ${arches}; do
+      if [ -f /proc/sys/fs/binfmt_misc/$a ] ; then
+         echo '-1' > /proc/sys/fs/binfmt_misc/$a
+      fi
+   done
+
+   eend $?
+}
+
+# vim: ts=4 :

diff --git a/app-emulation/qemu/files/qemu-kvm-1.4 b/app-emulation/qemu/files/qemu-kvm-1.4
new file mode 100644
index 0000000..08da00b
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-kvm-1.4
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/qemu-system-x86_64 -machine accel=kvm "$@"

diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
new file mode 100644
index 0000000..b80eaf7
--- /dev/null
+++ b/app-emulation/qemu/metadata.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>qemu</herd>
+  <maintainer>
+  	<email>cardoe@g.o</email>
+	<name>Doug Goldstein</name>
+  </maintainer>
+  <use>
+    <flag name='accessibility'>Adds support for braille displays using brltty</flag>
+    <flag name='aio'>Enables support for Linux's Async IO</flag>
+    <flag name='alsa'>Enable alsa output for sound emulation</flag>
+	<flag name='curl'>Support ISOs / -cdrom directives vis HTTP or HTTPS.</flag>
+    <flag name='fdt'>Enables firmware device tree support</flag>
+	<flag name='glusterfs'>Enables GlusterFS cluster fileystem via
+		<pkg>sys-cluster/glusterfs</pkg></flag>
+	<flag name='iscsi'>Enable direct iSCSI support via
+		<pkg>net-libs/libiscsi</pkg> instead of indirectly via the Linux
+		block layer that <pkg>sys-block/open-iscsi</pkg> does.</flag>
+	<flag name='mixemu'>Enable audio mixer emulation. On Fedora, known to cause performance problems when using SDL output and ALSA. For OSS, locks the sound device from other applications.</flag>
+    <flag name='ncurses'>Enable the ncurses-based console</flag>
+    <flag name='pulseaudio'>Enable pulseaudio output for sound emulation</flag>
+    <flag name='rbd'>Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag>
+    <flag name='sdl'>Enable the SDL-based console</flag>
+	<flag name='seccomp'>Utilize <pkg>sys-libs/libseccomp</pkg> to enable kernel filtering of system calls to prevent malicious guests from doing damage.</flag>
+    <flag name='spice'>Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag>
+	<flag name='ssh'>Enable SSH based block device support via <pkg>net-libs/libssh2</pkg></flag>
+	<flag name='static-softmmu'>Builds the Software MMU (system) targets as static binaries</flag>
+	<flag name='static-user'>Build the User targets as static binaries</flag>
+	<flag name='static'>Enables both 'static-softmmu' and 'static-user'</flag>
+	<flag name='systemtap'>Enable SystemTAP/DTrace tracing</flag>
+	<flag name='tci'>Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time.</flag>
+    <flag name='tls'>Enable TLS support for the VNC console server.
+		For 1.4 and newer this also enables WebSocket support.</flag>
+    <flag name='jpeg'>Enable jpeg image support for the VNC console server</flag>
+    <flag name='png'>Enable png image support for the VNC console server</flag>
+	<flag name='usb'>Enable USB passthrough via <pkg>dev-libs/libusbx</pkg></flag>
+    <flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB
+        devices to another machine over TCP</flag>
+    <flag name='uuid'>Enable UUID support in the vdi block driver</flag>
+    <flag name='vde'>Enable VDE-based networking</flag>
+    <flag name='vhost-net'>Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag>
+	<flag name='virtfs'>Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup</flag>
+    <flag name='xattr'>
+      Add support for getting and setting POSIX extended attributes, through
+      <pkg>sys-apps/attr</pkg>. Requisite for the virtfs backend.
+    </flag>
+    <flag name='xen'>Enables support for Xen backends</flag>
+	<flag name='xfs'>Support xfsctl() notification and syncing for XFS backed
+		virtual disks.</flag>
+  </use>
+</pkgmetadata>

diff --git a/app-emulation/qemu/qemu-1.5.3-r99.ebuild b/app-emulation/qemu/qemu-1.5.3-r99.ebuild
new file mode 100644
index 0000000..dfd48ce
--- /dev/null
+++ b/app-emulation/qemu/qemu-1.5.3-r99.ebuild
@@ -0,0 +1,552 @@
+# 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.3.ebuild,v 1.3 2013/09/15 09:29:18 ago 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=25d93791
+
+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 arm x86"
+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 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(+)] <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-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
+	epatch "${FILESDIR}"/qemu-1.5.3-openpty.patch
+	epatch "${FILESDIR}"/qemu-1.7.0-sigset_t.patch
+	epatch "${FILESDIR}"/qemu-1.7.0-ffsll.patch
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	append-flags "-Dflock64=flock -D__SIGRTMIN=32 -D__SIGRTMAX=\(NSIG-1\)"
+	append-flags "-DF_EXLCK=4 -DF_SHLCK=8"
+
+	# 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+=" --disable-glusterfs"
+		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 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 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)"
+}