[gentoo-commits] dev/dilfridge:master commit in: app-emulation/qemu/

[Andreas Hüttel]

commit:     a427a8a230e8e6513638d305e429689f38821098
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat Feb 25 16:47:56 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 16:47:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=a427a8a2

[app-emulation/qemu] clean out stuff I dont need

(Portage version: 2.1.10.49/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 app-emulation/qemu/ChangeLog             |  438 +-----------------------------
 app-emulation/qemu/Manifest              |   27 +-
 app-emulation/qemu/qemu-0.11.1-r1.ebuild |  150 ----------
 app-emulation/qemu/qemu-0.11.1.ebuild    |  149 ----------
 app-emulation/qemu/qemu-1.0-r2.ebuild    |  252 -----------------
 app-emulation/qemu/qemu-9999.ebuild      |  253 -----------------
 6 files changed, 20 insertions(+), 1249 deletions(-)

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 67503ad..6f1de6c 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,438 +1,8 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.103 2012/02/21 08:04:00 lu_zero Exp $
+# $Header: $
 
-*qemu-1.0-r3 (21 Feb 2012)
-
-  21 Feb 2012; Luca Barbato <lu_zero@g.o> +qemu-1.0-r3.ebuild:
-  Add qemu-user patches in
-
-  29 Jan 2012; Sergei Trofimovich <slyfox@g.o> qemu-1.0-r2.ebuild,
-  qemu-9999.ebuild:
-  Respect user's decision whether to generate debug info when build stuff
-  (related to bug #355861 by Andrew Savchenko). Drop outdated seding of
-  Makefiles.
-
-*qemu-0.11.1-r1 (28 Jan 2012)
-
-  28 Jan 2012; Sergei Trofimovich <slyfox@g.o>
-  +files/qemu-0.11.1-CVE-2012-0029-backport.patch, +qemu-0.11.1-r1.ebuild:
-  Backport fix for bug #400595 / CVE-2012-0029 (picked from qemu-kvm ebuild).
-
-  27 Jan 2012; Sergei Trofimovich <slyfox@g.o> metadata.xml,
-  qemu-9999.ebuild:
-  Added USE=xfs knob to handle XFS optimizations (uses sys-fs/xfsprogs).
-
-*qemu-1.0-r2 (26 Jan 2012)
-
-  26 Jan 2012; Sergei Trofimovich <slyfox@g.o>
-  +files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch,
-  +qemu-1.0-r2.ebuild, -qemu-0.14.0.ebuild, -qemu-1.0-r1.ebuild,
-  qemu-9999.ebuild:
-  Fix for bug #400595 / CVE-2012-0029 (picked from qemu-kvm ebuild). Restored
-  manual doc installation (upstream installs only html bits). Added USE=kvm to
-  live ebuild. Dropped old.
-
-  23 Jan 2012; Sergei Trofimovich <slyfox@g.o> qemu-9999.ebuild:
-  Whitespace.
-
-*qemu-1.0-r1 (23 Jan 2012)
-
-  23 Jan 2012; Sergei Trofimovich <slyfox@g.o> +qemu-1.0-r1.ebuild,
-  -qemu-1.0.ebuild, metadata.xml, qemu-9999.ebuild:
-  Put back optional USE=opengl flag, added USE=usbredir and prefix support.
-  Bumped up to EAPI=4 and cleaned doc installation (by WilliamH).
-
-  23 Jan 2012; William Hubbs <williamh@g.o> qemu-9999.ebuild:
-  clean up live ebuild and migrate to eapi 4 (approved by slyfox)
-
-  22 Jan 2012; Sergei Trofimovich <slyfox@g.o> qemu-1.0.ebuild:
-  Hide qemu-ppc* binaries from RWX mappings QA check.
-
-  22 Jan 2012; Sergei Trofimovich <slyfox@g.o> qemu-9999.ebuild:
-  Hide qemu-ppc* binaries from RWX mappings QA check.
-
-  22 Jan 2012; Sergei Trofimovich <slyfox@g.o> qemu-1.0.ebuild,
-  qemu-9999.ebuild:
-  Fix USE=xen to depend on app-emulation/xen-tools. app-emulation/xen does not
-  provide any libraries.
-
-  22 Jan 2012; Sergei Trofimovich <slyfox@g.o> qemu-9999.ebuild:
-  Added _all_ emulated audio cards (bug #144894 by Torsten Krah)
-
-*qemu-1.0 (22 Jan 2012)
-
-  22 Jan 2012; Sergei Trofimovich <slyfox@g.o> +qemu-1.0.ebuild,
-  qemu-9999.ebuild:
-  Version bump (requested by Anton Kochkov and others in bug #367153).
-
-  22 Jan 2012; Sergei Trofimovich <slyfox@g.o> metadata.xml,
-  qemu-9999.ebuild:
-  Added LatticeMico32 (lm32) softmmu target. Added USE="nss rbd spice threads
-  +vhost-net xattr xen" to get control of some automagic depends (bug #326491 by
-  Diego Elio Pettenò); mostly picked from qemu-kvm-9999.ebuild. Updated USE=curl
-  description (bug #354565 by klondike).
-
-  22 Jan 2012; Sergei Trofimovich <slyfox@g.o> qemu-0.11.1.ebuild,
-  qemu-0.14.0.ebuild, qemu-9999.ebuild:
-  Removed blockers on app-emulation/qemu-softmmu (dead 10 months ago) and on
-  app-emulation/qemu-kvm-spice (dead 6 months ago).
-
-  21 Jan 2012; Sergei Trofimovich <slyfox@g.o> qemu-9999.ebuild:
-  Fixed configure failure (follow upstream in renaming --enablble-user-pic to
-  --enable-pic). Added all missing linux targets except lm32 (needs proper deps
-  and a fix against --as-needed). Made ./configure params to be shown.
-
-  20 Sep 2011; Michał Górny <mgorny@g.o> qemu-9999.ebuild:
-  Migrate to git-2.
-
-*qemu-9999 (27 Jun 2011)
-
-  27 Jun 2011; Luca Barbato <lu_zero@g.o> +qemu-9999.ebuild:
-  Introduce live ebuild, useful for static qemu-user deployment
-
-  24 Mar 2011; Christoph Mende <angelos@g.o> qemu-0.11.1.ebuild:
-  Stable on amd64 wrt bug #356685
-
-  17 Mar 2011; Thomas Kahle <tomka@g.o> qemu-0.11.1.ebuild:
-  x86 stable per bug 356685
-
-  28 Feb 2011; Doug Goldstein <cardoe@g.o> -qemu-0.9.1.ebuild:
-  Remove old version
-
-  20 Feb 2011; Zac Medico <zmedico@g.o> qemu-0.14.0.ebuild:
-  Bug #355589 - Fix qemu-ifup die logic.
-
-  20 Feb 2011; Luca Barbato <lu_zero@g.o> qemu-0.14.0.ebuild:
-  Fix description
-
-*qemu-0.14.0 (19 Feb 2011)
-
-  19 Feb 2011; Luca Barbato <lu_zero@g.o> +qemu-0.14.0.ebuild,
-  metadata.xml:
-  New version, ebuild mostly in line with qemu-kvm
-
-  15 Oct 2010; Diego E. Pettenò <flameeyes@g.o> -qemu-0.9.0.ebuild,
-  qemu-0.9.1.ebuild, -qemu-0.10.0.ebuild, -qemu-0.10.1.ebuild,
-  -qemu-0.10.3.ebuild, -files/qemu-0.10.3-nopl-fix.patch,
-  -qemu-0.10.4.ebuild, -qemu-0.10.5.ebuild, -qemu-0.10.6.ebuild,
-  -qemu-0.11.0.ebuild:
-  Belated spring cleaning of ebuilds and files; this also re-sync the ppc
-  keyword with the qemu-softmmu package which this is just an alias of.
-
-  30 Jun 2010; Harald van Dijk <truedfx@g.o> qemu-0.10.3.ebuild,
-  qemu-0.10.4.ebuild, qemu-0.10.5.ebuild, qemu-0.10.6.ebuild,
-  qemu-0.11.0.ebuild, qemu-0.11.1.ebuild:
-  Fix quoting
-
-  05 Jan 2010; Diego E. Pettenò <flameeyes@g.o> qemu-0.10.3.ebuild,
-  qemu-0.10.4.ebuild, qemu-0.10.5.ebuild, qemu-0.10.6.ebuild,
-  qemu-0.11.0.ebuild, qemu-0.11.1.ebuild:
-  Fix trivial mistake. Closes bug #280121 by Kerin Millar.
-
-  15 Dec 2009; Doug Goldstein <cardoe@g.o> metadata.xml:
-  change to qemu herd
-
-*qemu-0.11.1 (06 Dec 2009)
-
-  06 Dec 2009; Luca Barbato <lu_zero@g.o> +qemu-0.11.1.ebuild:
-  Version bump
-
-  23 Nov 2009; Luca Barbato <lu_zero@g.o> qemu-0.11.0.ebuild:
-  fix bug #286012, thanks to Thomas Kister <leander256@×××××.com> for the
-  patch
-
-  22 Nov 2009; Luca Barbato <lu_zero@g.o> qemu-0.11.0.ebuild:
-  use --disable-strip instead of sed
-
-  17 Nov 2009; Luca Barbato <lu_zero@g.o> qemu-0.11.0.ebuild:
-  Fix hardened build, thanks to Xake <xake@×××××××××.net> for the patch and
-  the notice in bug #287308
-
-  05 Nov 2009; Patrick Lauer <patrick@g.o> qemu-0.11.0.ebuild:
-  Fixing bad --disable-gfx-check, closes #286370
-
-*qemu-0.11.0 (23 Oct 2009)
-
-  23 Oct 2009; Luca Barbato <lu_zero@g.o>
-  +files/qemu-0.11.0-mips64-user-fix.patch, +qemu-0.11.0.ebuild:
-  New release
-
-*qemu-0.10.6 (05 Sep 2009)
-
-  05 Sep 2009; Luca Barbato <lu_zero@g.o> +qemu-0.10.6.ebuild:
-  Version Bump
-
-*qemu-0.10.5 (07 Jun 2009)
-
-  07 Jun 2009; Luca Barbato <lu_zero@g.o> +qemu-0.10.5.ebuild:
-  New version
-
-  19 May 2009; Diego E. Pettenò <flameeyes@g.o> qemu-0.10.4.ebuild:
-  Fix doc installation: install html in the html/ subdir, install more qemu
-  doc, rename the README file (it's not qemu's proper), die on error.
-
-  19 May 2009; Luca Barbato <lu_zero@g.o> qemu-0.10.4.ebuild:
-  fix missing patch, thanks to Martin Jansa <Martin.Jansa@×××××××.cz> for
-  noticing
-
-*qemu-0.10.4 (19 May 2009)
-
-  19 May 2009; Luca Barbato <lu_zero@g.o> +qemu-0.10.4.ebuild:
-  New version
-
-  17 May 2009; Diego E. Pettenò <flameeyes@g.o> qemu-0.10.3.ebuild,
-  +files/qemu-ifdown, +files/qemu-ifup:
-  Add missing ifup/ifdown scripts, change install logic, make sure they are
-  not added executable to CVS.
-
-*qemu-0.10.3 (17 May 2009)
-
-  17 May 2009; Luca Barbato <lu_zero@g.o>
-  +files/qemu-0.10.3-nopl-fix.patch, +qemu-0.10.3.ebuild:
-  New ebuild, thanks to Xake <xake@×××××××××.net> for contributing it in bug
-  #190298
-
-*qemu-0.10.1 (22 Mar 2009)
-
-  22 Mar 2009; Luca Barbato <lu_zero@g.o> +qemu-0.10.1.ebuild:
-  Bugfix release
-
-*qemu-0.10.0 (09 Mar 2009)
-
-  09 Mar 2009; Luca Barbato <lu_zero@g.o> +qemu-0.10.0.ebuild:
-  New version
-
-  03 Sep 2008; Thomas Anderson <gentoofan23@g.o> qemu-0.9.1.ebuild:
-  stable amd64, needed to go stable becuase qemu-softmmu went stable, mfi
-
-  18 May 2008; Christian Faulhammer <opfer@g.o> qemu-0.9.1.ebuild:
-  stable x86
-
-  01 Feb 2008; Luca Barbato <lu_zero@g.o> -qemu-0.8.0.ebuild,
-  -qemu-0.8.0.20060329.ebuild, -qemu-0.8.1.ebuild, -qemu-0.8.2.ebuild:
-  Remove qemu-0.8 series
-
-  28 Jan 2008; Luca Barbato <lu_zero@g.o> qemu-0.9.1.ebuild:
-  avoid qemu-user, it is broken
-
-*qemu-0.9.1 (27 Jan 2008)
-
-  27 Jan 2008; Luca Barbato <lu_zero@g.o> +qemu-0.9.1.ebuild:
-  Version bump
-
-  20 May 2007; Christian Faulhammer <opfer@g.o> qemu-0.9.0.ebuild:
-  stable amd64, security bug 176674
-
-  16 May 2007; Luca Barbato <lu_zero@g.o> qemu-0.9.0.ebuild:
-  Marked ppc
-
-  08 May 2007; Markus Ullmann <jokey@g.o> qemu-0.9.0.ebuild:
-  Stable on x86 wrt security bug #176674
-
-*qemu-0.9.0 (06 Feb 2007)
-
-  06 Feb 2007; Luca Barbato <lu_zero@g.o> +qemu-0.9.0.ebuild:
-  New version
-
-  06 Feb 2007; Simon Stelling <blubb@g.o> qemu-0.8.2.ebuild:
-  stable on amd64; bug 159522
-
-  02 Jan 2007; Christian Faulhammer <opfer@g.o> qemu-0.8.2.ebuild:
-  stable x86, bug #159522
-
-  31 Dec 2006; Luca Barbato <lu_zero@g.o> qemu-0.8.2.ebuild:
-  Marked ppc
-
-*qemu-0.8.2 (16 Aug 2006)
-
-  16 Aug 2006; Luca Barbato <lu_zero@g.o> +qemu-0.8.2.ebuild:
-  Meta ebuild bumped
-
-  09 Jun 2006; Michael Sterrett <mr_bones_@g.o>
-  -files/qemu-0.6.0-configure.patch, -files/qemu-0.6.0-sigaction.patch,
-  -files/qemu-0.6.0-typo.patch, -files/qemu-0.6.1-20041126.patch,
-  -files/qemu-0.7.0-errno.patch, -files/kqemu-sysfs.patch,
-  -qemu-0.6.1.ebuild, -qemu-0.6.1-r1.ebuild, -qemu-0.7.0-r1.ebuild,
-  -qemu-0.7.1.ebuild, -qemu-0.7.2.ebuild:
-  clean out old versions
-
-*qemu-0.8.1 (06 May 2006)
-
-  06 May 2006; Luca Barbato <lu_zero@g.o> +qemu-0.8.1.ebuild:
-  New version
-
-  19 Apr 2006; Daniel Gryniewicz <dang@g.o> qemu-0.8.0.ebuild:
-  Marked stable on amd64 per bug# 123972
-
-  16 Apr 2006; Michael Hanselmann <hansmi@g.o> qemu-0.8.0.ebuild:
-  Stable on ppc.
-
-*qemu-0.8.0.20060329 (29 Mar 2006)
-
-  29 Mar 2006; Luca Barbato <lu_zero@g.o> metadata.xml,
-  +qemu-0.8.0.20060329.ebuild:
-  New version
-
-  29 Mar 2006; Chris White <chriswhite@g.o> qemu-0.8.0.ebuild:
-  x86 stable for qemu-0.8.0 bug #123972.
-
-  28 Jan 2006; Luca Barbato <lu_zero@g.o> -files/qemu_gcc34.patch.gz,
-  -qemu-0.6.0.ebuild:
-  cleanup
-
-*qemu-0.8.0 (23 Dec 2005)
-
-  23 Dec 2005; Luca Barbato <lu_zero@g.o> +qemu-0.8.0.ebuild:
-  New version
-
-  05 Dec 2005; <dang@g.o> qemu-0.7.0.ebuild, qemu-0.7.0-r1.ebuild,
-  qemu-0.7.1.ebuild:
-  Make amd64 keywords match qemu-softmmu
-
-*qemu-0.7.2 (11 Sep 2005)
-
-  11 Sep 2005; Luca Barbato <lu_zero@g.o> +qemu-0.7.2.ebuild:
-  New release
-
-*qemu-0.7.1 (25 Jul 2005)
-
-  25 Jul 2005; Luca Barbato <lu_zero@g.o> +qemu-0.7.1.ebuild:
-  New version
-
-*qemu-0.7.0-r1 (18 Jun 2005)
-
-  18 Jun 2005; Luca Barbato <lu_zero@g.o> +qemu-0.7.0-r1.ebuild:
-  Meta ebuild added
-
-  25 May 2005; Luca Barbato <lu_zero@g.o>
-  +files/qemu-0.7.0-errno.patch, qemu-0.7.0.ebuild:
-  Fix for the errno issues in helper2.c
-
-  18 May 2005; Luca Barbato <lu_zero@g.o> qemu-0.7.0.ebuild:
-  Add a notice about the qemu group, thanks to Leung Ki Chi 
-  <leun0003@×××××××.sg> for pointing the issue out
-
-  12 May 2005; Luca Barbato <lu_zero@g.o> qemu-0.7.0.ebuild:
-  Hardened updates from Kevin F. Quinn <co@××××××××.com>
-
-  07 May 2005; Luca Barbato <lu_zero@g.o> qemu-0.7.0.ebuild:
-  Some fixes here and there, thanks to Sok Ann Yap <sokann@×××××.com>
-
-  29 Apr 2005; Luca Barbato <lu_zero@g.o> qemu-0.7.0.ebuild:
-  Retouches and corrections, thanks to genstef as usual
-
-  29 Apr 2005; Luca Barbato <lu_zero@g.o> qemu-0.7.0.ebuild:
-  Added udev support and qemu group creation
-
-*qemu-0.7.0 (28 Apr 2005)
-
-  28 Apr 2005; Luca Barbato <lu_zero@g.o> +files/kqemu-sysfs.patch,
-  +qemu-0.7.0.ebuild:
-  New version
-
-  18 Dec 2004; Simon Stelling <blubb@g.o> qemu-0.6.1-r1.ebuild:
-  added ~amd64
-
-  28 Nov 2004; Luca Barbato <lu_zero@g.o> qemu-0.6.1-r1.ebuild:
-  Missing dep added, thanks to Frank Groeneveld <frankgroeneveld@×××.com>
-
-  28 Nov 2004; Luca Barbato <lu_zero@g.o>
-  files/qemu-0.6.1-20041126.patch:
-  Minor fix, the patch had an Header reference that cvs replaced
-
-*qemu-0.6.1-r1 (28 Nov 2004)
-
-  28 Nov 2004; Luca Barbato <lu_zero@g.o>
-  +files/qemu-0.6.1-20041126.patch, +qemu-0.6.1-r1.ebuild:
-  updated qemu to the 20041126 cvs snapshot, this should fix bug #72561
-
-  26 Nov 2004; Luca Barbato <lu_zero@g.o>
-  -files/qemu-0.5.4-jocelyn-mayer-ppc.patch, -qemu-0.5.1.ebuild,
-  -qemu-0.5.2.ebuild, -qemu-0.5.3.ebuild, -qemu-0.5.4.ebuild,
-  -qemu-0.5.5-r1.ebuild, -qemu-0.5.5.ebuild:
-  Cleanup
-
-  17 Nov 2004; Luca Barbato <lu_zero@g.o> qemu-0.6.1.ebuild:
-  Removed qemu-fast since that feature won't build on most systems
-
-  16 Nov 2004; Luca Barbato <lu_zero@g.o> qemu-0.6.1.ebuild:
-  Stray useflag removed
-
-*qemu-0.6.1 (15 Nov 2004)
-
-  15 Nov 2004; Luca Barbato <lu_zero@g.o> +qemu-0.6.1.ebuild:
-  New version, filtering qemu-fast on nptl
-
-  02 Nov 2004; Luca Barbato <lu_zero@g.o> qemu-0.6.0.ebuild:
-  Minor fix
-
-  01 Nov 2004; Luca Barbato <lu_zero@g.o>
-  +files/qemu-0.6.0-configure.patch, qemu-0.6.0.ebuild:
-  Minor fixes, some taken from Andrew Kirilenko <icedank@×××.net> from bug #69384
-
-  28 Oct 2004; Luca Barbato <lu_zero@g.o> qemu-0.6.0.ebuild:
-  Marked ppc, added some ewarn in the postinst as requested in bug #69206
-
-  25 Sep 2004; Hanno Boeck <hanno@g.o> +files/qemu_gcc34.patch.gz,
-  qemu-0.6.0.ebuild:
-  Fix for gcc 3.4.
-
-  20 Aug 2004; Luca Barbato <lu_zero@g.o>
-  +files/qemu-0.6.0-sigaction.patch, qemu-0.6.0.ebuild:
-  Remove ancient glibc workaround
-
-*qemu-0.6.0 (13 Jul 2004)
-
-  13 Jul 2004; Luca Barbato <lu_zero@g.o> +files/qemu-0.6.0-typo.patch,
-  +qemu-0.6.0.ebuild:
-  New version
-
-*qemu-0.5.5-r1 (02 Jul 2004)
-
-  02 Jul 2004; Luca Barbato <lu_zero@g.o> +qemu-0.5.5-r1.ebuild:
-  Minor change
-
-  04 Jun 2004; Michael Sterrett <mr_bones_@g.o> qemu-0.5.1.ebuild,
-  qemu-0.5.2.ebuild, qemu-0.5.3.ebuild, qemu-0.5.4.ebuild, qemu-0.5.5.ebuild:
-  pkg_postinstall -> pkg_postinst
-
-  17 May 2004; Luca Barbato <lu_zero@g.o> qemu-0.5.5.ebuild:
-  Put the qemu-fast target modal
-
-*qemu-0.5.5 (09 May 2004)
-
-  09 May 2004; Luca Barbato <lu_zero@g.o> +qemu-0.5.5.ebuild:
-  New version
-
-*qemu-0.5.4 (28 Apr 2004)
-
-  28 Apr 2004; Luca Barbato <lu_zero@g.o>
-  +files/qemu-0.5.4-jocelyn-mayer-ppc.patch, +qemu-0.5.4.ebuild:
-  New version
-
-  27 Apr 2004; Luca Barbato <lu_zero@g.o> qemu-0.5.3.ebuild:
-  Removed the softmmu target
-
-*qemu-0.5.3 (24 Apr 2004)
-
-  24 Apr 2004; Luca Barbato <lu_zero@g.o> :
-  New version
-
-  15 Mar 2004; Chuck Short <zul@g.o> qemu-0.5.2.ebuild:
-  Marked stable for x86.
-
-*qemu-0.5.2 (28 Jan 2004)
-
-  28 Jan 2004; Chuck Short<zulk@g.o> qemu-0.5.1.ebuild, qemu-0.5.2.ebuild:
-  Ebuild clean ups and new version.
-
-  28 Jan 2004; Chuck Short <zul@g.o> qemu-0.5.1.ebuild:
-  Marked stable for x86.
-
-*qemu-0.5.1 (03 Jan 2004)
-
-  03 Jan 2004; Chuck Short <zul@g.o> qemu-0.5.1.ebuild:
-  Initial version, ebuild submitted by Jocelyn Mayer <l_indien -at- magic.fr>
-  Ebuild modified by me. Closes #37047.
+  25 Feb 2012; Andreas K. Huettel <dilfridge@g.o> -qemu-0.11.1.ebuild,
+  -qemu-0.11.1-r1.ebuild, -qemu-1.0-r2.ebuild, -qemu-9999.ebuild:
+  [app-emulation/qemu] clean out stuff I dont need
 

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 932c371..fb07b7f 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,25 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX qemu-0.11.0-mips64-user-fix.patch 313 RMD160 db016e0a48990a435dd6cf6e807145b33ada4908 SHA1 2ea913b1bcd29734a6d4011794bdb4aa3599a184 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f
 AUX qemu-0.11.1-CVE-2012-0029-backport.patch 1448 RMD160 efdf7bfe481bbfec2106d4a1652ec4df3242eb97 SHA1 dd44a1c1224c90f93bfcb19c612c6920325e6624 SHA256 fb739ca478977f17b73489823b92d8964da1bb308db997596e1160900f2c9236
 AUX qemu-ifdown 478 RMD160 2187fbf352e6b84686f0cf0e9e9ebe5d26359858 SHA1 1daccb4785fe503687562798f90be1414267e27d SHA256 7d90c39184fd7531d9b8ae787122b68ac768b41afeb0ef2b3baa6461f77af03d
 AUX qemu-ifup 554 RMD160 9769d79ab6456bdd7e3e689005f629e2a67b858d SHA1 dde2b27acabe6fe23ca40f90ff6950bb12a4b506 SHA256 eae9b50680442acc29c65a245a2d26a63756ad4cb894e08cb5ea249686801f1d
 AUX qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch 1412 RMD160 53749555d464e56cfab39b0fa2e8120ab2c024db SHA1 9046e72b8c7496840e340f6fc351434b8830f191 SHA256 9a06665c47b76b2501f148713c46f8ce0b14ed03da5e6cb03c0d141f5d91900a
-DIST qemu-0.11.1.tar.gz 3830070 RMD160 4da00fa6c01d7ff6af0ee781bc9260da577ea7d3 SHA1 7b983cd18f44c6e7627532b662f010389d3bcdff SHA256 2ecd2fc0af2ce5d96067ae82cc98a08275c596de53fc929484bedee1d6e7893a
 DIST qemu-1.0-patches.tar.xz 43540 RMD160 79a39d5a8050fe8eedd5e0becb828d2ae0b465c3 SHA1 423880fb32f27e05d1382ed341e6cc4bee840dc3 SHA256 32a8b98cd5fd661268328d71efbfafd65972102b10da363193f3da98bd9b2d72
 DIST qemu-1.0.tar.gz 10848714 RMD160 3a60aef6cfebba6896bdb12c99525da5456172fd SHA1 7dcb1b3516554d6d899d7488cd444dbb7721fcee SHA256 47674b7da559d5e1b44cc401af9ac5ad962d14e9eede12567b13e4b841989737
-EBUILD qemu-0.11.1-r1.ebuild 4919 RMD160 f447972f186a5128ba80b2c8c5bce8871fa38fde SHA1 e09fd89788f6d628ac4701e31f43282023fe7c4a SHA256 571c7ea28e703e86d1ca5be1eacb7b9249b9bec16527355eed38d721e56b13ea
-EBUILD qemu-0.11.1.ebuild 4851 RMD160 14c27fb758125ffa52b22562ee910e89e8dc053b SHA1 405d7858cfb66c7ad4ca3f846ad6048f3f59d49b SHA256 0cccf6126e9ddb442ff37e1c5b3be9ba095059323cf63b9ee0f707e2876f1123
-EBUILD qemu-1.0-r2.ebuild 6912 RMD160 1155a584070a3ecabd696335c7c301b936f22d95 SHA1 96c3ce1bd440025541ef08751d03478eff78bd46 SHA256 0b9afc45f9af381e672c632faa5c15aab60b65cae4b4380aea57721df286879a
 EBUILD qemu-1.0-r3.ebuild 7131 RMD160 46719a9424c0979de36ac1009d53d8f6a2dae4cf SHA1 e7ebc7299ef16b5e1407960f30c949f96cd3fb3e SHA256 f5c61c0f4578ec11393905890611595de179ba6415dc49b031c0c20553593410
-EBUILD qemu-9999.ebuild 6846 RMD160 143fc27d9b83de0e7d3f0c0569922356db0fd090 SHA1 f1f849c7d68917ea4c174af2010e5418987c418a SHA256 7057db195e4312c6456e90603295a14debc2d869aad090b7d87bf40023273a9f
-MISC ChangeLog 15170 RMD160 ff05920e32fe2ad9e4a24523e0a1232f28c6d079 SHA1 235e268de79dcd06debd05488d58cfdb2b5ebbe9 SHA256 777a91e019b2fee4630ad169b9261a8e90dc22f25f9e47c7833a2b4be506cb8c
+MISC ChangeLog 315 RMD160 b8f96fe0713222c1d0c3e3793cf1b03b4703b88e SHA1 93dae78c6d110e97fcc29025a4985c65ce12a221 SHA256 74883e9755730b1b3c8370b263abc7a144fd83f72fbbf39b83cb74e51fce7a4d
 MISC metadata.xml 2575 RMD160 d53217a49f76391725580cb4ebb22c0ed43588bf SHA1 0b1f51a4bf30e8899cb0379e14eba26c6aa00b7f SHA256 a07e1dd5932d91789f481394b318cf20f4c5a529168b8e5adb299736a643b94b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9DT/0ACgkQYpJnKVbCxcxYpAD+OQdCIbDPRAI1FE32fvwGspD2
-+cDtjXqyXfy7gA2v8OUA+wVvjkIpR9MkGxA4WHdp2UGbAdwgs9Q+nmVyJm9/uu5z
-=gc1t
+iQIcBAEBCgAGBQJPSRC8AAoJENwGBM22xffejKYP/jOuEoR+1PYZuGotqQT9Kf8t
+LL+NBhOpatQkiyKNztN9eskG4k8p3KYKkySDzKCogcCbjxbSaKURbfn+9kLCEe+x
+Pkp9JubX1grrSU6OuAD0wzc2NXer55DGqNpVGgCkEUaRTsobr8+lqpy7EK2EEAgx
+DgmkGWdJnJ15FNF0RJbMcj41kAPjprhDUf1i9R982fOoFL+/AIjk4LcFamMPwhCi
+ZKNbmQY97y9I9W1LjJ5YKndxhkNcj4kz4HoHNKkwuUHHjeHbM7Z28oNvK/5qJHhj
+me3cIFSKmzVbXRKFnFYyjElIQkhSy/I0/0PP7IXEjVzzUlAM4OldvcyADJTbERKp
+q3XeyAVl6u8BW5uP4EQj376HLzgd9dmmrIGJmduZYG095q2gCd5kjVAZfOHjAFDB
+w38RSBQvwOTeWzx6uvokRLFKtHlo1OQuHJmStUMEJ12Ee8/ZkQR4M21IMbCvNuBZ
++ooZGqDTuj5Z+WfKTcFHsJdUfMzqiju03hGdQ4arOYXL7dEzSuun1H7y8SaK9ZdJ
+YXD/1nJacFX6AnM2oUJZ7lSxdoYBRrgwKdblOITGsgwgrN98GlCRwEW/po+rWL1F
+4KXkhGBQWJmWBR8RwQPHSuq4fFVgxRMEXggU3PrF7euK3NtgDaQZmLGEho3PdHgt
+xFlFh9/H3Nj7munKtwfq
+=tsrh
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/qemu/qemu-0.11.1-r1.ebuild b/app-emulation/qemu/qemu-0.11.1-r1.ebuild
deleted file mode 100644
index 1a9b65e..0000000
--- a/app-emulation/qemu/qemu-0.11.1-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.11.1-r1.ebuild,v 1.1 2012/01/28 11:45:00 slyfox Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs linux-info
-
-DESCRIPTION="QEMU emulator and ABI wrapper"
-HOMEPAGE="http://www.qemu.org"
-SRC_URI="http://download.savannah.gnu.org/releases/qemu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="alsa bluetooth esd gnutls ncurses pulseaudio sasl +sdl vde kqemu kvm"
-
-COMMON_TARGETS="i386 x86_64 arm cris m68k mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc"
-
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} ppcemb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc64 sparc32plus"
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} +qemu_user_targets_${target}"
-done
-
-RDEPEND="
-	!app-emulation/qemu-user
-	sys-libs/zlib
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	esd? ( media-sound/esound )
-	pulseaudio? ( media-sound/pulseaudio )
-	gnutls? ( net-libs/gnutls )
-	ncurses? ( sys-libs/ncurses )
-	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( >=media-libs/libsdl-1.2.11 )
-	vde? ( net-misc/vde )
-	kvm? ( >=sys-kernel/linux-headers-2.6.29 )
-	bluetooth? ( net-wireless/bluez )
-	kqemu? ( >=app-emulation/kqemu-1.4.0_pre1 )"
-#	fdt? ( sys-apps/dtc )
-
-DEPEND="${RDEPEND}
-		gnutls? ( dev-util/pkgconfig )
-		app-text/texi2html"
-
-src_prepare() {
-	# avoid fdt till an updated release appears
-	sed -i -e 's:fdt="yes":fdt="no":' configure
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' Makefile
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target tests/Makefile
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			Makefile.target
-	# Append CFLAGS while linking
-	sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak
-	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
-	epatch "${FILESDIR}/qemu-0.11.1-CVE-2012-0029-backport.patch"
-}
-
-src_configure() {
-	local mycc conf_opts audio_opts softmmu_targets user_targets target_list
-
-	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
-
-	conf_opts="--disable-darwin-user --disable-bsd-user --disable-strip"
-
-	if test ! -z "${softmmu_targets}" ; then
-		einfo "Building following softmmu targets: ${softmmu_targets}"
-		use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
-		use ncurses || conf_opts="$conf_opts --disable-curses"
-		use sasl || conf_opts="$conf_opts --disable-vnc-sasl"
-		use sdl || conf_opts="$conf_opts --disable-sdl"
-		use vde || conf_opts="$conf_opts --disable-vde"
-		use bluetooth || conf_opts="$conf_opts --disable-bluez"
-		use kqemu || conf_opts="$conf_opts --disable-kqemu"
-		use kvm || conf_opts="$conf_opts --disable-kvm"
-
-		audio_opts="oss"
-		use alsa && audio_opts="alsa $audio_opts"
-		use esd && audio_opts="esd $audio_opts"
-		use pulseaudio && audio_opts="pa $audio_opts"
-		use sdl && audio_opts="sdl $audio_opts"
-	else
-		einfo "Disabling softmmu emulation (no softmmu targets specified)"
-		conf_opts="$conf_opts --disable-system --disable-vnc-tls \
-		--disable-curses --disable-sdl --disable-vde \
-		--disable-kqemu --disable-kvm"
-	fi
-
-	if test ! -z "${user_targets}" ; then
-		einfo "Building following user targets: ${user_targets}"
-		conf_opts="$conf_opts --enable-linux-user"
-	else
-		einfo "Disabling usermode emulation (no usermode targets specified)"
-		conf_opts="$conf_opts --disable-linux-user"
-	fi
-
-#	use fdt || conf_opts="$conf_opts --disable-fdt"
-
-	conf_opts="$conf_opts --prefix=/usr"
-
-	target_list="${softmmu_targets} ${user_targets}"
-
-	filter-flags -fPIE
-
-	./configure ${conf_opts} \
-		--audio-drv-list="$audio_opts" \
-		--cc="$(tc-getCC)" --host-cc="$(tc-getCC)" \
-		--target-list="${target_list}" \
-		|| die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	exeinto /etc/qemu
-	doexe \
-		"${FILESDIR}/qemu-ifup" \
-		"${FILESDIR}/qemu-ifdown" \
-		|| die "qemu interface scripts failed"
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
-	newdoc pc-bios/README README.pc-bios || die
-	dohtml qemu-doc.html qemu-tech.html || die
-}
-
-pkg_postinst() {
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "qemu-ifup script from /etc/qemu."
-	echo
-}

diff --git a/app-emulation/qemu/qemu-0.11.1.ebuild b/app-emulation/qemu/qemu-0.11.1.ebuild
deleted file mode 100644
index be5385a..0000000
--- a/app-emulation/qemu/qemu-0.11.1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.11.1.ebuild,v 1.6 2012/01/22 08:00:09 slyfox Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs linux-info
-
-DESCRIPTION="QEMU emulator and ABI wrapper"
-HOMEPAGE="http://www.qemu.org"
-SRC_URI="http://download.savannah.gnu.org/releases/qemu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="alsa bluetooth esd gnutls ncurses pulseaudio sasl +sdl vde kqemu kvm"
-
-COMMON_TARGETS="i386 x86_64 arm cris m68k mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc"
-
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} ppcemb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc64 sparc32plus"
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} +qemu_user_targets_${target}"
-done
-
-RDEPEND="
-	!app-emulation/qemu-user
-	sys-libs/zlib
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	esd? ( media-sound/esound )
-	pulseaudio? ( media-sound/pulseaudio )
-	gnutls? ( net-libs/gnutls )
-	ncurses? ( sys-libs/ncurses )
-	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( >=media-libs/libsdl-1.2.11 )
-	vde? ( net-misc/vde )
-	kvm? ( >=sys-kernel/linux-headers-2.6.29 )
-	bluetooth? ( net-wireless/bluez )
-	kqemu? ( >=app-emulation/kqemu-1.4.0_pre1 )"
-#	fdt? ( sys-apps/dtc )
-
-DEPEND="${RDEPEND}
-		gnutls? ( dev-util/pkgconfig )
-		app-text/texi2html"
-
-src_prepare() {
-	# avoid fdt till an updated release appears
-	sed -i -e 's:fdt="yes":fdt="no":' configure
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' Makefile
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target tests/Makefile
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			Makefile.target
-	# Append CFLAGS while linking
-	sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak
-	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
-}
-
-src_configure() {
-	local mycc conf_opts audio_opts softmmu_targets user_targets target_list
-
-	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
-
-	conf_opts="--disable-darwin-user --disable-bsd-user --disable-strip"
-
-	if test ! -z "${softmmu_targets}" ; then
-		einfo "Building following softmmu targets: ${softmmu_targets}"
-		use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
-		use ncurses || conf_opts="$conf_opts --disable-curses"
-		use sasl || conf_opts="$conf_opts --disable-vnc-sasl"
-		use sdl || conf_opts="$conf_opts --disable-sdl"
-		use vde || conf_opts="$conf_opts --disable-vde"
-		use bluetooth || conf_opts="$conf_opts --disable-bluez"
-		use kqemu || conf_opts="$conf_opts --disable-kqemu"
-		use kvm || conf_opts="$conf_opts --disable-kvm"
-
-		audio_opts="oss"
-		use alsa && audio_opts="alsa $audio_opts"
-		use esd && audio_opts="esd $audio_opts"
-		use pulseaudio && audio_opts="pa $audio_opts"
-		use sdl && audio_opts="sdl $audio_opts"
-	else
-		einfo "Disabling softmmu emulation (no softmmu targets specified)"
-		conf_opts="$conf_opts --disable-system --disable-vnc-tls \
-		--disable-curses --disable-sdl --disable-vde \
-		--disable-kqemu --disable-kvm"
-	fi
-
-	if test ! -z "${user_targets}" ; then
-		einfo "Building following user targets: ${user_targets}"
-		conf_opts="$conf_opts --enable-linux-user"
-	else
-		einfo "Disabling usermode emulation (no usermode targets specified)"
-		conf_opts="$conf_opts --disable-linux-user"
-	fi
-
-#	use fdt || conf_opts="$conf_opts --disable-fdt"
-
-	conf_opts="$conf_opts --prefix=/usr"
-
-	target_list="${softmmu_targets} ${user_targets}"
-
-	filter-flags -fPIE
-
-	./configure ${conf_opts} \
-		--audio-drv-list="$audio_opts" \
-		--cc="$(tc-getCC)" --host-cc="$(tc-getCC)" \
-		--target-list="${target_list}" \
-		|| die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	exeinto /etc/qemu
-	doexe \
-		"${FILESDIR}/qemu-ifup" \
-		"${FILESDIR}/qemu-ifdown" \
-		|| die "qemu interface scripts failed"
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
-	newdoc pc-bios/README README.pc-bios || die
-	dohtml qemu-doc.html qemu-tech.html || die
-}
-
-pkg_postinst() {
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "qemu-ifup script from /etc/qemu."
-	echo
-}

diff --git a/app-emulation/qemu/qemu-1.0-r2.ebuild b/app-emulation/qemu/qemu-1.0-r2.ebuild
deleted file mode 100644
index 5bbdb58..0000000
--- a/app-emulation/qemu/qemu-1.0-r2.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.0-r2.ebuild,v 1.1 2012/01/26 19:01:15 slyfox Exp $
-
-EAPI=4
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git
-		http://git.qemu.org/git/qemu.git"
-	GIT_ECLASS="git-2"
-fi
-
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://wiki.qemu.org/download/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="QEMU emulator and ABI wrapper"
-HOMEPAGE="http://www.qemu.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses nss
-opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde
-+vhost-net xattr xen"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} +qemu_user_targets_${target}"
-done
-
-RESTRICT="test"
-
-RDEPEND="
-	!app-emulation/qemu-kvm
-	!app-emulation/qemu-user
-	>=dev-libs/glib-2.0
-	sys-apps/pciutils
-	>=sys-apps/util-linux-2.16.0
-	sys-libs/zlib
-	aio? ( dev-libs/libaio )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	brltty? ( app-accessibility/brltty )
-	curl? ( net-misc/curl )
-	esd? ( media-sound/esound )
-	fdt? ( >=sys-apps/dtc-1.2.0 )
-	jpeg? ( virtual/jpeg )
-	ncurses? ( sys-libs/ncurses )
-	nss? ( dev-libs/nss )
-	opengl? (
-		virtual/opengl
-		x11-libs/libX11
-	)
-	png? ( media-libs/libpng )
-	pulseaudio? ( media-sound/pulseaudio )
-	qemu-ifup? (
-		sys-apps/iproute2
-		net-misc/bridge-utils
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( >=media-libs/libsdl-1.2.11[X] )
-	spice? (
-		>=app-emulation/spice-0.9.0
-		>=app-emulation/spice-protocol-0.8.1
-	)
-	ssl? ( net-libs/gnutls )
-	usbredir? ( sys-apps/usbredir )
-	vde? ( net-misc/vde )
-	xattr? ( sys-apps/attr )
-	xen? ( app-emulation/xen-tools )
-"
-
-DEPEND="${RDEPEND}
-	app-text/texi2html
-	dev-util/pkgconfig
-	>=sys-kernel/linux-headers-2.6.35
-"
-
-# alpha ELF binary. don't let portage mess with it
-STRIP_MASK="usr/share/qemu/palcode-clipper"
-
-QA_PRESTRIPPED="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-"
-# keep sorted
-QA_WX_LOAD="${QA_PRESTRIPPED}
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-armeb
-	usr/bin/qemu-cris
-	usr/bin/qemu-i386
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32
-	usr/bin/qemu-x86_64
-"
-
-pkg_setup() {
-	use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
-}
-
-src_prepare() {
-	# bug #400595 / CVE-2012-0029
-	epatch "${FILESDIR}"/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch
-
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-	# append CFLAGS while linking
-	sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
-
-	# Fix underlinking.
-	# Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
-	sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
-}
-
-src_configure() {
-	local conf_opts audio_opts user_targets
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets} ${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets} ${target}-linux-user"
-	done
-
-	if [[ -z ${softmmu_targets} ]]; then
-		conf_opts="${conf_opts} --disable-system"
-	else
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-	fi
-
-	if [[ -n ${user_targets} ]]; then
-		einfo "Building the following user targets: ${user_targets}"
-		conf_opts="${conf_opts} --enable-linux-user"
-	else
-		conf_opts="${conf_opts} --disable-linux-user"
-	fi
-
-	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
-	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
-
-	# Add support for static builds
-	use static && conf_opts="${conf_opts} --static"
-
-	#config options
-	conf_opts="${conf_opts}
-		$(use_enable aio linux-aio)
-		$(use_enable bluetooth bluez)
-		$(use_enable brltty brlapi)
-		$(use_enable curl)
-		$(use_enable fdt)
-		$(use_enable hardened pie)
-		$(use_enable jpeg vnc-jpeg)
-		$(use_enable ncurses curses)
-		$(use_enable nss smartcard-nss)
-		$(use_enable opengl)
-		$(use_enable png vnc-png)
-		$(use_enable rbd)
-		$(use_enable sasl vnc-sasl)
-		$(use_enable sdl)
-		$(use_enable spice)
-		$(use_enable ssl vnc-tls)
-		$(use_enable threads vnc-thread)
-		$(use_enable vde)
-		$(use_enable vhost-net)
-		$(use_enable xen)
-		$(use_enable xattr attr)
-		--disable-darwin-user --disable-bsd-user
-	"
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa ${audio_opts}"
-	use esd && audio_opts="esd ${audio_opts}"
-	use pulseaudio && audio_opts="pa ${audio_opts}"
-	use sdl && audio_opts="sdl ${audio_opts}"
-
-	set -- --prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
-		--disable-strip \
-		--disable-werror \
-		--disable-kvm \
-		--disable-libiscsi \
-		--enable-nptl \
-		--enable-uuid \
-		${conf_opts} \
-		--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
-		--audio-drv-list="${audio_opts}" \
-		--target-list="${softmmu_targets} ${user_targets}" \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)"
-
-	echo ./configure "$@" # show actual options
-	./configure "$@" || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if [[ -n ${softmmu_targets} ]]; then
-		if use qemu-ifup; then
-			exeinto /etc/qemu
-			doexe "${FILESDIR}"/qemu-if{up,down}
-		fi
-	fi
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
-	newdoc pc-bios/README README.pc-bios || die
-	dohtml qemu-doc.html qemu-tech.html || die
-}
-
-pkg_postinst() {
-	use qemu-ifup || return
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "qemu-ifup script from /etc/qemu."
-	echo
-}

diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
deleted file mode 100644
index 27bdd58..0000000
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.15 2012/01/29 12:18:34 slyfox Exp $
-
-EAPI=4
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git
-		http://git.qemu.org/git/qemu.git"
-	GIT_ECLASS="git-2"
-fi
-
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://wiki.qemu.org/download/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="QEMU emulator and ABI wrapper"
-HOMEPAGE="http://www.qemu.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg kvm ncurses nss
-opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde
-+vhost-net xattr xen xfs"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} +qemu_user_targets_${target}"
-done
-
-RESTRICT="test"
-
-RDEPEND="
-	!app-emulation/qemu-kvm
-	!app-emulation/qemu-user
-	>=dev-libs/glib-2.0
-	sys-apps/pciutils
-	>=sys-apps/util-linux-2.16.0
-	sys-libs/zlib
-	aio? ( dev-libs/libaio )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	brltty? ( app-accessibility/brltty )
-	curl? ( net-misc/curl )
-	esd? ( media-sound/esound )
-	fdt? ( >=sys-apps/dtc-1.2.0 )
-	jpeg? ( virtual/jpeg )
-	ncurses? ( sys-libs/ncurses )
-	nss? ( dev-libs/nss )
-	opengl? (
-		virtual/opengl
-		x11-libs/libX11
-	)
-	png? ( media-libs/libpng )
-	pulseaudio? ( media-sound/pulseaudio )
-	qemu-ifup? (
-		sys-apps/iproute2
-		net-misc/bridge-utils
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( >=media-libs/libsdl-1.2.11[X] )
-	spice? (
-		>=app-emulation/spice-0.9.0
-		>=app-emulation/spice-protocol-0.8.1
-	)
-	ssl? ( net-libs/gnutls )
-	usbredir? ( sys-apps/usbredir )
-	vde? ( net-misc/vde )
-	xattr? ( sys-apps/attr )
-	xen? ( app-emulation/xen-tools )
-	xfs? ( sys-fs/xfsprogs )
-"
-
-DEPEND="${RDEPEND}
-	app-text/texi2html
-	dev-util/pkgconfig
-	>=sys-kernel/linux-headers-2.6.35
-"
-
-# alpha ELF binary. don't let portage mess with it
-STRIP_MASK="usr/share/qemu/palcode-clipper"
-
-QA_PRESTRIPPED="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-"
-# keep sorted
-QA_WX_LOAD="${QA_PRESTRIPPED}
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-armeb
-	usr/bin/qemu-cris
-	usr/bin/qemu-i386
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32
-	usr/bin/qemu-x86_64
-"
-
-pkg_setup() {
-	use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
-
-	use kvm && ewarn "You have enabled USE=kvm feature. Please consider using app-emulation/qemu-kvm"
-}
-
-src_prepare() {
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
-
-	# drop '-g' by default as it tends to eat
-	# A LOT (~2GB) of ram for each job #355861
-	sed -e 's/CFLAGS="-g $CFLAGS"/CFLAGS="$CFLAGS"/g' \
-		-i configure || die
-
-	# Fix underlinking.
-	# Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
-	sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
-}
-
-src_configure() {
-	local conf_opts audio_opts user_targets
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets} ${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets} ${target}-linux-user"
-	done
-
-	if [[ -z ${softmmu_targets} ]]; then
-		conf_opts="${conf_opts} --disable-system"
-	else
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-	fi
-
-	if [[ -n ${user_targets} ]]; then
-		einfo "Building the following user targets: ${user_targets}"
-		conf_opts="${conf_opts} --enable-linux-user"
-	else
-		conf_opts="${conf_opts} --disable-linux-user"
-	fi
-
-	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
-	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
-
-	# Add support for static builds
-	use static && conf_opts="${conf_opts} --static"
-
-	#config options
-	conf_opts="${conf_opts}
-		$(use_enable aio linux-aio)
-		$(use_enable bluetooth bluez)
-		$(use_enable brltty brlapi)
-		$(use_enable curl)
-		$(use_enable fdt)
-		$(use_enable hardened pie)
-		$(use_enable jpeg vnc-jpeg)
-		$(use_enable ncurses curses)
-		$(use_enable nss smartcard-nss)
-		$(use_enable opengl)
-		$(use_enable png vnc-png)
-		$(use_enable rbd)
-		$(use_enable sasl vnc-sasl)
-		$(use_enable sdl)
-		$(use_enable spice)
-		$(use_enable ssl vnc-tls)
-		$(use_enable threads vnc-thread)
-		$(use_enable vde)
-		$(use_enable vhost-net)
-		$(use_enable xen)
-		$(use_enable xattr attr)
-		$(use_enable xfs xfsctl)
-		--disable-darwin-user --disable-bsd-user
-	"
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa ${audio_opts}"
-	use esd && audio_opts="esd ${audio_opts}"
-	use pulseaudio && audio_opts="pa ${audio_opts}"
-	use sdl && audio_opts="sdl ${audio_opts}"
-
-	set -- --prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
-		--disable-strip \
-		--disable-werror \
-		$(use_enable kvm) \
-		--disable-libiscsi \
-		--enable-nptl \
-		--enable-uuid \
-		${conf_opts} \
-		--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
-		--audio-drv-list="${audio_opts}" \
-		--target-list="${softmmu_targets} ${user_targets}" \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)"
-
-	echo ./configure "$@" # show actual options
-	./configure "$@" || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if [[ -n ${softmmu_targets} ]]; then
-		if use qemu-ifup; then
-			exeinto /etc/qemu
-			doexe "${FILESDIR}"/qemu-if{up,down}
-		fi
-	fi
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-	dohtml qemu-doc.html qemu-tech.html
-}
-
-pkg_postinst() {
-	use qemu-ifup || return
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "qemu-ifup script from /etc/qemu."
-	echo
-}