Belated spring cleaning of ebuilds and files.

Package-Manager: portage-2.2_rc96/cvs/Linux x86_64

15 files changed, 13 insertions, 1143 deletions

diff --git a/app-emulation/qemu-softmmu/ChangeLog b/app-emulation/qemu-softmmu/ChangeLog
index ebd064a6d623..714032d4c574 100644
--- a/app-emulation/qemu-softmmu/ChangeLog
+++ b/app-emulation/qemu-softmmu/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-emulation/qemu-softmmu
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.66 2009/04/24 10:59:50 lu_zero Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.67 2010/10/15 14:21:52 flameeyes Exp $
+
+  15 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -qemu-softmmu-0.9.0.ebuild, -qemu-softmmu-0.9.0-r1.ebuild,
+  -files/qemu-softmmu-0.9.0-block-qcow2.patch,
+  -files/qemu-softmmu-0.9.0-ide-cd.patch, -qemu-softmmu-0.9.1.ebuild,
+  -qemu-softmmu-0.9.1-r1.ebuild, -qemu-softmmu-0.9.1-r2.ebuild,
+  -files/qemu-softmmu-0.9.1-block-device-address-range.patch,
+  -qemu-softmmu-0.10.0.ebuild, -qemu-softmmu-0.10.1.ebuild,
+  -files/qemu-softmmu-0.10.1-nopl-fix.patch, -files/qemu-ifdown,
+  -files/qemu-ifup, metadata.xml:
+  Belated spring cleaning of ebuilds and files.
 
   24 Apr 2009; Luca Barbato <lu_zero@gentoo.org>
   +files/qemu-softmmu-0.10.1-nopl-fix.patch, qemu-softmmu-0.10.1.ebuild:
diff --git a/app-emulation/qemu-softmmu/files/qemu-ifdown b/app-emulation/qemu-softmmu/files/qemu-ifdown
deleted file mode 100755
index c173e43a9813..000000000000
--- a/app-emulation/qemu-softmmu/files/qemu-ifdown
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if [ -x /sbin/brctl ]; then
-  BRCTL="/sbin/brctl"
-elif [ -x /usr/sbin/brctl ]; then
-  BRCTL="/usr/sbin/brctl"
-else
-  echo "no bridge utils installed"
-  exit 1
-fi
-
-if [ -x /sbin/ip ]; then
-  switch=( $(/sbin/ip route list | awk '/^default / { sub(/.* dev /, ""); print $1 }') )
-  ${BRCTL} delif ${switch} $1
-  /sbin/ip link set $1 down
-else
-  switch=( $(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }') )
-  ${BRCTL} delif ${switch} $1
-  /sbin/ifconfig $1 down
-fi
diff --git a/app-emulation/qemu-softmmu/files/qemu-ifup b/app-emulation/qemu-softmmu/files/qemu-ifup
deleted file mode 100755
index 4a30e7d5645f..000000000000
--- a/app-emulation/qemu-softmmu/files/qemu-ifup
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-if [ -x /sbin/brctl ]; then
-  BRCTL="/sbin/brctl"
-elif [ -x /usr/sbin/brctl ]; then
-  BRCTL="/usr/sbin/brctl"
-else
-  echo "no bridge utils installed"
-  exit 1
-fi
-
-if [ -x /sbin/ip ]; then
-  switch=( $(/sbin/ip route list | awk '/^default / { sub(/.* dev /, ""); print $1 }') )
-  /sbin/ip link set $1 up
-else
-  switch=( $(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }') )
-  /sbin/ifconfig $1 0.0.0.0 up
-fi
-
-[[ ${switch#} -ne "1" ]] && logger -t qemu "$0 found more than one bridge connecting $1 to ${switch}"
-${BRCTL} addif ${switch} $1
-
diff --git a/app-emulation/qemu-softmmu/files/qemu-softmmu-0.10.1-nopl-fix.patch b/app-emulation/qemu-softmmu/files/qemu-softmmu-0.10.1-nopl-fix.patch
deleted file mode 100644
index bdef0efc3516..000000000000
--- a/app-emulation/qemu-softmmu/files/qemu-softmmu-0.10.1-nopl-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- i386-dis.c	2009-03-22 00:05:48.000000000 +0100
-+++ i386-dis_new.c	2009-04-21 08:31:08.000000000 +0200
-@@ -784,13 +784,13 @@
-   { "movhpX",		EX, XM, SIMD_Fixup, 'l' },
-   /* 18 */
-   { GRP14 },
--  { "(bad)",		XX, XX, XX },
--  { "(bad)",		XX, XX, XX },
--  { "(bad)",		XX, XX, XX },
--  { "(bad)",		XX, XX, XX },
--  { "(bad)",		XX, XX, XX },
--  { "(bad)",		XX, XX, XX },
--  { "(bad)",		XX, XX, XX },
-+  { "nopQ",		Ev, XX, XX },
-+  { "nopQ",		Ev, XX, XX },
-+  { "nopQ",		Ev, XX, XX },
-+  { "nopQ",		Ev, XX, XX },
-+  { "nopQ",		Ev, XX, XX },
-+  { "nopQ",		Ev, XX, XX },
-+  { "nopQ",		Ev, XX, XX },
-   /* 20 */
-   { "movL",		Rm, Cm, XX },
-   { "movL",		Rm, Dm, XX },
-@@ -1072,7 +1072,7 @@
-   /*       0 1 2 3 4 5 6 7 8 9 a b c d e f        */
-   /*       -------------------------------        */
-   /* 00 */ 1,1,1,1,0,0,0,0,0,0,0,0,0,1,0,1, /* 0f */
--  /* 10 */ 1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0, /* 1f */
-+  /* 10 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 1f */
-   /* 20 */ 1,1,1,1,1,0,1,0,1,1,1,1,1,1,1,1, /* 2f */
-   /* 30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 3f */
-   /* 40 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 4f */
diff --git a/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.0-block-qcow2.patch b/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.0-block-qcow2.patch
deleted file mode 100644
index 206480ddda45..000000000000
--- a/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.0-block-qcow2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- block-qcow2.c	2006/08/07 02:38:06	1.4
-+++ block-qcow2.c	2007/04/01 19:01:40	1.5
-@@ -1933,6 +1933,7 @@
-     qemu_free(s->refcount_table);
-     s->refcount_table = new_table;
-     s->refcount_table_size = new_table_size;
-+    s->refcount_table_offset = table_offset;
- 
-     update_refcount(bs, table_offset, new_table_size2, 1);
-     return 0;
diff --git a/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.0-ide-cd.patch b/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.0-ide-cd.patch
deleted file mode 100644
index ceae4bdf7d3f..000000000000
--- a/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.0-ide-cd.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Brandon Philips <brandon@ifup.org>
-Newsgroups: gmane.comp.emulators.qemu
-Subject: [PATCH][RFC] Fix bugs in the ATAPI cdrom driver
-Date: Fri, 17 Aug 2007 16:43:04 -0700
-Message-ID: <20070817234304.GB10490@ifup.org>
-Reply-To: qemu-devel@nongnu.org
-
-The new libata-eh in the Linux kernel is throwing a fit over the QEMU
-cdrom device for two reasons:
-
-1) DRQ can be set with ERR_STAT set.  This is a violation of the ATAPI
-state machine.
-
-2) After a TEST_UNIT_READY ATAPI command is sent ERR_STAT is getting set
-which is correct.  But, when the OS issues another ATAPI command
-ERR_STAT is still set.  Which is bad since the next expected command
-from the OS is REQUEST_SENSE to find out why ERR_STAT is set.
-
-bug this fixes: https://bugzilla.novell.com/show_bug.cgi?id=291775
-
-Signed-off-by: Brandon Philips <bphilips@suse.de>
-
----
- hw/ide.c |    7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-Index: qemu-0.9.0/hw/ide.c
-===================================================================
---- qemu-0.9.0.orig/hw/ide.c
-+++ qemu-0.9.0/hw/ide.c
-@@ -586,7 +586,9 @@ static void ide_transfer_start(IDEState 
-     s->end_transfer_func = end_transfer_func;
-     s->data_ptr = buf;
-     s->data_end = buf + size;
--    s->status |= DRQ_STAT;
-+    /* don't violate the HSM */
-+    if (!(s->status & ERR_STAT))
-+        s->status |= DRQ_STAT;
- }
- 
- static void ide_transfer_stop(IDEState *s)
-@@ -1805,6 +1807,7 @@ static void ide_ioport_write(void *opaqu
-             /* overlapping commands not supported */
-             if (s->feature & 0x02)
-                 goto abort_cmd;
-+            s->status = READY_STAT;
-             s->atapi_dma = s->feature & 1;
-             s->nsector = 1;
-             ide_transfer_start(s, s->io_buffer, ATAPI_PACKET_SIZE, 
-
-
-
diff --git a/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.1-block-device-address-range.patch b/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.1-block-device-address-range.patch
deleted file mode 100644
index d9bb1f646883..000000000000
--- a/app-emulation/qemu-softmmu/files/qemu-softmmu-0.9.1-block-device-address-range.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-diff -rup kvm-60.orig/qemu/block.c kvm-60.new/qemu/block.c
---- kvm-60.orig/qemu/block.c	2008-02-26 18:44:28.000000000 -0500
-+++ kvm-60.new/qemu/block.c	2008-02-26 18:44:52.000000000 -0500
-@@ -124,6 +124,60 @@ void path_combine(char *dest, int dest_s
-     }
- }
- 
-+static int bdrv_rd_badreq_sectors(BlockDriverState *bs,
-+                                  int64_t sector_num, int nb_sectors)
-+{
-+    return
-+        nb_sectors < 0 ||
-+        sector_num < 0 ||
-+        nb_sectors > bs->total_sectors ||
-+        sector_num > bs->total_sectors - nb_sectors;
-+}
-+
-+static int bdrv_rd_badreq_bytes(BlockDriverState *bs,
-+                                int64_t offset, int count)
-+{
-+    int64_t size = bs->total_sectors << SECTOR_BITS;
-+    return
-+        count < 0 ||
-+        size < 0 ||
-+        count > size ||
-+        offset > size - count;
-+}
-+
-+static int bdrv_wr_badreq_sectors(BlockDriverState *bs,
-+                                  int64_t sector_num, int nb_sectors)
-+{
-+    if (sector_num < 0 ||
-+        nb_sectors < 0)
-+        return 1;
-+
-+    if (sector_num > bs->total_sectors - nb_sectors) {
-+        if (bs->autogrow)
-+            bs->total_sectors = sector_num + nb_sectors;
-+        else
-+            return 1;
-+    }
-+    return 0;
-+}
-+
-+static int bdrv_wr_badreq_bytes(BlockDriverState *bs,
-+                                int64_t offset, int count)
-+{
-+    int64_t size = bs->total_sectors << SECTOR_BITS;
-+    if (count < 0 ||
-+        offset < 0)
-+        return 1;
-+
-+    if (offset > size - count) {
-+        if (bs->autogrow)
-+            bs->total_sectors = (offset + count + SECTOR_SIZE - 1) >> SECTOR_BITS;
-+        else
-+            return 1;
-+    }
-+    return 0;
-+}
-+
- 
- static void bdrv_register(BlockDriver *bdrv)
- {
-@@ -332,6 +386,10 @@ int bdrv_open2(BlockDriverState *bs, con
-     bs->read_only = 0;
-     bs->is_temporary = 0;
-     bs->encrypted = 0;
-+    bs->autogrow = 0;
-+
-+    if (flags & BDRV_O_AUTOGROW)
-+        bs->autogrow = 1;
- 
-     if (flags & BDRV_O_SNAPSHOT) {
-         BlockDriverState *bs1;
-@@ -376,6 +434,7 @@ int bdrv_open2(BlockDriverState *bs, con
-     }
-     bs->drv = drv;
-     bs->opaque = qemu_mallocz(drv->instance_size);
-+    bs->total_sectors = 0; /* driver will set if it does not do getlength */
-     if (bs->opaque == NULL && drv->instance_size > 0)
-         return -1;
-     /* Note: for compatibility, we open disk image files as RDWR, and
-@@ -441,6 +500,7 @@ void bdrv_close(BlockDriverState *bs)
-         bs->drv = NULL;
- 
-         /* call the change callback */
-+        bs->total_sectors = 0;
-         bs->media_changed = 1;
-         if (bs->change_cb)
-             bs->change_cb(bs->change_opaque);
-@@ -506,6 +566,8 @@ int bdrv_read(BlockDriverState *bs, int6
-     if (!drv)
-         return -ENOMEDIUM;
- 
-+    if (bdrv_rd_badreq_sectors(bs, sector_num, nb_sectors))
-+        return -EDOM;
-     if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
-             memcpy(buf, bs->boot_sector_data, 512);
-         sector_num++;
-@@ -546,6 +608,8 @@ int bdrv_write(BlockDriverState *bs, int
-         return -ENOMEDIUM;
-     if (bs->read_only)
-         return -EACCES;
-+    if (bdrv_wr_badreq_sectors(bs, sector_num, nb_sectors))
-+        return -EDOM;
-     if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
-         memcpy(bs->boot_sector_data, buf, 512);
-     }
-@@ -671,6 +735,8 @@ int bdrv_pread(BlockDriverState *bs, int
-         return -ENOMEDIUM;
-     if (!drv->bdrv_pread)
-         return bdrv_pread_em(bs, offset, buf1, count1);
-+    if (bdrv_rd_badreq_bytes(bs, offset, count1))
-+        return -EDOM;
-     return drv->bdrv_pread(bs, offset, buf1, count1);
- }
- 
-@@ -686,6 +752,8 @@ int bdrv_pwrite(BlockDriverState *bs, in
-         return -ENOMEDIUM;
-     if (!drv->bdrv_pwrite)
-         return bdrv_pwrite_em(bs, offset, buf1, count1);
-+    if (bdrv_wr_badreq_bytes(bs, offset, count1))
-+        return -EDOM;
-     return drv->bdrv_pwrite(bs, offset, buf1, count1);
- }
- 
-@@ -1091,6 +1159,8 @@ int bdrv_write_compressed(BlockDriverSta
-         return -ENOMEDIUM;
-     if (!drv->bdrv_write_compressed)
-         return -ENOTSUP;
-+    if (bdrv_wr_badreq_sectors(bs, sector_num, nb_sectors))
-+        return -EDOM;
-     return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors);
- }
- 
-@@ -1237,6 +1307,8 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDri
- 
-     if (!drv)
-         return NULL;
-+    if (bdrv_rd_badreq_sectors(bs, sector_num, nb_sectors))
-+        return NULL;
- 
-     /* XXX: we assume that nb_sectors == 0 is suppored by the async read */
-     if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
-@@ -1268,6 +1340,8 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDr
-         return NULL;
-     if (bs->read_only)
-         return NULL;
-+    if (bdrv_wr_badreq_sectors(bs, sector_num, nb_sectors))
-+        return NULL;
-     if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {
-         memcpy(bs->boot_sector_data, buf, 512);
-     }
-diff -rup kvm-60.orig/qemu/block.h kvm-60.new/qemu/block.h
---- kvm-60.orig/qemu/block.h	2008-01-20 07:35:04.000000000 -0500
-+++ kvm-60.new/qemu/block.h	2008-02-26 18:44:52.000000000 -0500
-@@ -45,6 +45,7 @@ typedef struct QEMUSnapshotInfo {
-                                      it (default for
-                                      bdrv_file_open()) */
- #define BDRV_O_DIRECT      0x0020
-+#define BDRV_O_AUTOGROW    0x0040 /* Allow backing file to extend when writing past end of file */
- 
- #ifndef QEMU_IMG
- void bdrv_info(void);
-diff -rup kvm-60.orig/qemu/block_int.h kvm-60.new/qemu/block_int.h
---- kvm-60.orig/qemu/block_int.h	2008-01-20 07:35:04.000000000 -0500
-+++ kvm-60.new/qemu/block_int.h	2008-02-26 18:44:52.000000000 -0500
-@@ -97,6 +97,7 @@ struct BlockDriverState {
-     int locked;    /* if true, the media cannot temporarily be ejected */
-     int encrypted; /* if true, the media is encrypted */
-     int sg;        /* if true, the device is a /dev/sg* */
-+    int autogrow;  /* if true, the backing store can auto-extend to allocate new extents */
-     /* event callback when inserting/removing */
-     void (*change_cb)(void *opaque);
-     void *change_opaque;
-diff -rup kvm-60.orig/qemu/block-qcow2.c kvm-60.new/qemu/block-qcow2.c
---- kvm-60.orig/qemu/block-qcow2.c	2008-01-20 07:35:04.000000000 -0500
-+++ kvm-60.new/qemu/block-qcow2.c	2008-02-26 18:44:52.000000000 -0500
-@@ -191,7 +191,7 @@ static int qcow_open(BlockDriverState *b
-     int len, i, shift, ret;
-     QCowHeader header;
- 
--    ret = bdrv_file_open(&s->hd, filename, flags);
-+    ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW);
-     if (ret < 0)
-         return ret;
-     if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header))
-diff -rup kvm-60.orig/qemu/block-qcow.c kvm-60.new/qemu/block-qcow.c
---- kvm-60.orig/qemu/block-qcow.c	2008-01-20 07:35:04.000000000 -0500
-+++ kvm-60.new/qemu/block-qcow.c	2008-02-26 18:44:52.000000000 -0500
-@@ -95,7 +95,7 @@ static int qcow_open(BlockDriverState *b
-     int len, i, shift, ret;
-     QCowHeader header;
- 
--    ret = bdrv_file_open(&s->hd, filename, flags);
-+    ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW);
-     if (ret < 0)
-         return ret;
-     if (bdrv_pread(s->hd, 0, &header, sizeof(header)) != sizeof(header))
-diff -rup kvm-60.orig/qemu/block-vmdk.c kvm-60.new/qemu/block-vmdk.c
---- kvm-60.orig/qemu/block-vmdk.c	2008-01-20 07:35:04.000000000 -0500
-+++ kvm-60.new/qemu/block-vmdk.c	2008-02-26 18:44:52.000000000 -0500
-@@ -375,7 +375,7 @@ static int vmdk_open(BlockDriverState *b
-         flags = BDRV_O_RDONLY;
-     fprintf(stderr, "(VMDK) image open: flags=0x%x filename=%s\n", flags, bs->filename);
- 
--    ret = bdrv_file_open(&s->hd, filename, flags);
-+    ret = bdrv_file_open(&s->hd, filename, flags | BDRV_O_AUTOGROW);
-     if (ret < 0)
-         return ret;
-     if (bdrv_pread(s->hd, 0, &magic, sizeof(magic)) != sizeof(magic))
diff --git a/app-emulation/qemu-softmmu/metadata.xml b/app-emulation/qemu-softmmu/metadata.xml
index c0983a49be36..9f40bcb8f63d 100644
--- a/app-emulation/qemu-softmmu/metadata.xml
+++ b/app-emulation/qemu-softmmu/metadata.xml
@@ -7,13 +7,8 @@
 </maintainer>
 <use>
 		<flag name='kqemu'>Enables the kernel acceleration module on a x86/x86-64 cpu</flag>
-		<flag name='kvm'>Use the KVM (Kernel Virtual Machine) infrastructure on compatible hardware</flag>
 		<flag name='alsa'>Enable alsa output for sound emulation</flag>
-		<flag name='esd'>Enable esound output for sound emulation</flag>
 		<flag name='gnutls'>Enable TLS support for the VNC console server</flag>
-		<flag name='ncurses'>Enable the ncurses-based console</flag>
-		<flag name='pulseaudio'>Enable pulseaudio output for sound emulation</flag>
 		<flag name='sdl'>Enable the SDL-based console</flag>
-		<flag name='vde'>Enable VDE-based networking</flag>
 </use>
 </pkgmetadata>
diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.10.0.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.10.0.ebuild
deleted file mode 100644
index 9cfcbca5903c..000000000000
--- a/app-emulation/qemu-softmmu/qemu-softmmu-0.10.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.10.0.ebuild,v 1.9 2009/09/23 15:35:55 patrick Exp $
-
-EAPI=1
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_PN=${PN/-softmmu/}
-MY_P=${P/-softmmu/}
-
-SRC_URI="http://savannah.nongnu.org/download/${MY_PN}/${MY_P}.tar.gz"
-
-DESCRIPTION="Open source processor emulator"
-HOMEPAGE="http://bellard.org/qemu/index.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
-
-IUSE="alsa esd gnutls ncurses pulseaudio +sdl vde kqemu"
-RESTRICT="test"
-
-RDEPEND="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 )
-	sdl? ( >=media-libs/libsdl-1.2.11 )
-	vde? ( net-misc/vde )
-	kqemu? ( >=app-emulation/kqemu-1.4.0_pre1 )"
-#	fdt? ( sys-apps/dtc )
-
-DEPEND="${RDEPEND}
-	gnutls? ( dev-util/pkgconfig )
-	app-text/texi2html"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# 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
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			Makefile.target
-	# avoid strip
-	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' Makefile
-}
-
-src_compile() {
-	local mycc conf_opts audio_opts
-
-	audio_opts="oss"
-	conf_opts="--disable-linux-user --disable-darwin-user --disable-bsd-user"
-	use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
-	use ncurses || conf_opts="$conf_opts --disable-curses"
-	use sdl || conf_opts="$conf_opts --disable-gfx-check --disable-sdl"
-	use vde || conf_opts="$conf_opts --disable-vde"
-	use kqemu || conf_opts="$conf_opts --disable-kqemu"
-#	use fdt || conf_opts="--disable-fdt"
-
-	conf_opts="$conf_opts --prefix=/usr --disable-bluez --disable-kvm"
-
-	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"
-
-	filter-flags -fpie -fstack-protector
-
-	./configure ${conf_opts} --audio-drv-list="$audio_opts" || die "econf failed"
-
-	emake || die "emake qemu failed"
-
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc/qemu
-	dobin "${FILESDIR}/qemu-ifup"
-	dobin "${FILESDIR}/qemu-ifdown"
-
-	dodoc pc-bios/README
-	dodoc qemu-doc.html
-	dodoc qemu-tech.html
-}
-
-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-softmmu/qemu-softmmu-0.10.1.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.10.1.ebuild
deleted file mode 100644
index b54620d501d2..000000000000
--- a/app-emulation/qemu-softmmu/qemu-softmmu-0.10.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.10.1.ebuild,v 1.5 2009/09/23 15:35:55 patrick Exp $
-
-EAPI=1
-
-inherit eutils flag-o-matic toolchain-funcs linux-info
-
-MY_PN=${PN/-softmmu/}
-MY_P=${P/-softmmu/}
-
-SRC_URI="http://savannah.nongnu.org/download/${MY_PN}/${MY_P}.tar.gz"
-
-DESCRIPTION="Open source processor emulator"
-HOMEPAGE="http://bellard.org/qemu/index.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
-
-IUSE="alsa esd gnutls ncurses pulseaudio +sdl vde kqemu kvm"
-RESTRICT="test"
-
-RDEPEND="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 )
-	sdl? ( >=media-libs/libsdl-1.2.11 )
-	vde? ( net-misc/vde )
-	kqemu? ( >=app-emulation/kqemu-1.4.0_pre1 )"
-#	fdt? ( sys-apps/dtc )
-
-DEPEND="${RDEPEND}
-	gnutls? ( dev-util/pkgconfig )
-	app-text/texi2html"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# 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
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			Makefile.target
-	# avoid strip
-	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' \
-		Makefile Makefile.target */Makefile
-	epatch "${FILESDIR}/${P}-nopl-fix.patch"
-}
-
-src_compile() {
-	local mycc conf_opts audio_opts
-
-	audio_opts="oss"
-	conf_opts="--disable-linux-user --disable-darwin-user --disable-bsd-user"
-	use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
-	use ncurses || conf_opts="$conf_opts --disable-curses"
-	use sdl || conf_opts="$conf_opts --disable-gfx-check --disable-sdl"
-	use vde || conf_opts="$conf_opts --disable-vde"
-	use kqemu || conf_opts="$conf_opts --disable-kqemu"
-	use kvm || conf_opts="$conf_opts --disable-kvm"
-#	use fdt || conf_opts="--disable-fdt"
-
-	conf_opts="$conf_opts --prefix=/usr --disable-bluez"
-
-	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"
-
-	filter-flags -fpie -fstack-protector
-
-	./configure ${conf_opts} \
-		--audio-drv-list="$audio_opts" \
-		--kerneldir="${KV_DIR}" \
-		--cc=$(tc-getCC) --host-cc=$(tc-getCC) \
-		|| die "econf failed"
-
-	emake || die "emake qemu failed"
-
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc/qemu
-	insopts -m0755
-	doins "${FILESDIR}/qemu-ifup"
-	doins "${FILESDIR}/qemu-ifdown"
-
-	dodoc pc-bios/README
-	dodoc qemu-doc.html
-	dodoc qemu-tech.html
-}
-
-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-softmmu/qemu-softmmu-0.9.0-r1.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.9.0-r1.ebuild
deleted file mode 100644
index eda9907e2006..000000000000
--- a/app-emulation/qemu-softmmu/qemu-softmmu-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.9.0-r1.ebuild,v 1.3 2009/09/23 15:35:55 patrick Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator"
-HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
-SRC_URI="${HOMEPAGE}${P/-softmmu/}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-alpha amd64 ppc -sparc x86"
-IUSE="sdl kqemu alsa"  #qvm86 debug nptl qemu-fast nptlonly"
-RESTRICT="strip test"
-
-DEPEND="sdl? ( media-libs/libsdl )
-	!<=app-emulation/qemu-0.7.0
-	kqemu? ( >=app-emulation/kqemu-1.3.0_pre10 )
-	app-text/texi2html"
-RDEPEND="sdl? ( media-libs/libsdl )
-		 alsa? ( media-libs/alsa-lib )"
-
-S="${WORKDIR}/${P/-softmmu/}"
-
-QA_TEXTRELS="usr/bin/qemu
-	usr/bin/qemu-system-sparc
-	usr/bin/qemu-system-arm
-	usr/bin/qemu-system-ppc
-	usr/bin/qemu-system-mips
-	usr/bin/qemu-system-x86_64"
-QA_EXECSTACK="usr/share/qemu/openbios-sparc32"
-QA_WX_LOAD="usr/share/qemu/openbios-sparc32"
-
-#set_target_list() {
-#	TARGET_LIST="i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu arm-softmmu mips-softmmu"
-#	export TARGET_LIST
-#}
-
-pkg_setup() {
-	if [ "$(gcc-major-version)" == "4" ]; then
-	eerror "qemu requires gcc-3 in order to build and work correctly"
-	eerror "please compile it switching to gcc-3."
-	eerror "We are aware that qemu can guess a gcc-3 but this feature"
-	eerror "could be harmful."
-	die "gcc 4 cannot build qemu"
-	fi
-}
-
-#RUNTIME_PATH="/emul/gnemul/"
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# 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
-	# Ensure mprotect restrictions are relaxed for emulator binaries
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			Makefile.target
-	# Prevent install of kernel module by qemu's makefile
-	sed -i 's/\(.\/install.sh\)/#\1/' Makefile
-	# avoid strip
-	sed -i 's:$(INSTALL) -m 755 -s:$(INSTALL) -m 755:' Makefile Makefile.target
-
-	epatch ${FILESDIR}/${P}-ide-cd.patch
-	epatch ${FILESDIR}/${P}-block-qcow2.patch
-}
-
-src_compile() {
-	#Let the application set its cflags
-	unset CFLAGS
-
-	# Switch off hardened tech
-	filter-flags -fpie -fstack-protector
-
-#	set_target_list
-
-	myconf="--disable-gcc-check"
-	if ! use sdl ; then
-		myconf="$myconf --disable-gfx-check"
-	fi
-	./configure \
-		--prefix=/usr \
-		--enable-slirp --enable-adlib \
-		--cc=$(tc-getCC) \
-		--host-cc=$(tc-getCC) \
-		--kernel-path=${KV_DIR} \
-		--disable-linux-user \
-		--enable-system \
-		$(use_enable sdl)\
-		$(use_enable kqemu) \
-		$(use_enable alsa) \
-		${myconf} \
-		|| die "could not configure"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make install \
-		prefix=${D}/usr \
-		bindir=${D}/usr/bin \
-		datadir=${D}/usr/share/qemu \
-		docdir=${D}/usr/share/doc/${P} \
-		mandir=${D}/usr/share/man || die
-
-	chmod -x ${D}/usr/share/man/*/*
-}
-
-pkg_postinst() {
-	einfo "You will need the Universal TUN/TAP driver compiled into"
-	einfo "kernel or as a module to use the virtual network device."
-}
diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.9.0.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.9.0.ebuild
deleted file mode 100644
index 533525bf88fb..000000000000
--- a/app-emulation/qemu-softmmu/qemu-softmmu-0.9.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.9.0.ebuild,v 1.9 2009/09/23 15:35:55 patrick Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator"
-HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
-SRC_URI="${HOMEPAGE}${P/-softmmu/}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-alpha amd64 ppc -sparc x86"
-IUSE="sdl kqemu alsa"  #qvm86 debug nptl qemu-fast nptlonly"
-RESTRICT="strip test"
-
-DEPEND="sdl? ( media-libs/libsdl )
-	!<=app-emulation/qemu-0.7.0
-	kqemu? ( >=app-emulation/kqemu-1.3.0_pre10 )
-	app-text/texi2html"
-RDEPEND="sdl? ( media-libs/libsdl )
-		 alsa? ( media-libs/alsa-lib )"
-
-S="${WORKDIR}/${P/-softmmu/}"
-
-QA_TEXTRELS="usr/bin/qemu
-	usr/bin/qemu-system-sparc
-	usr/bin/qemu-system-arm
-	usr/bin/qemu-system-ppc
-	usr/bin/qemu-system-mips
-	usr/bin/qemu-system-x86_64"
-QA_EXECSTACK="usr/share/qemu/openbios-sparc32"
-QA_WX_LOAD="usr/share/qemu/openbios-sparc32"
-
-#set_target_list() {
-#	TARGET_LIST="i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu arm-softmmu mips-softmmu"
-#	export TARGET_LIST
-#}
-
-pkg_setup() {
-	if [ "$(gcc-major-version)" == "4" ]; then
-	eerror "qemu requires gcc-3 in order to build and work correctly"
-	eerror "please compile it switching to gcc-3."
-	eerror "We are aware that qemu can guess a gcc-3 but this feature"
-	eerror "could be harmful."
-	die "gcc 4 cannot build qemu"
-	fi
-}
-
-#RUNTIME_PATH="/emul/gnemul/"
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# 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
-	# Ensure mprotect restrictions are relaxed for emulator binaries
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			Makefile.target
-	# Prevent install of kernel module by qemu's makefile
-	sed -i 's/\(.\/install.sh\)/#\1/' Makefile
-	# avoid strip
-	sed -i 's:$(INSTALL) -m 755 -s:$(INSTALL) -m 755:' Makefile Makefile.target
-
-	epatch ${FILESDIR}/${P}-ide-cd.patch
-}
-
-src_compile() {
-	#Let the application set its cflags
-	unset CFLAGS
-
-	# Switch off hardened tech
-	filter-flags -fpie -fstack-protector
-
-#	set_target_list
-
-	myconf="--disable-gcc-check"
-	if ! use sdl ; then
-		myconf="$myconf --disable-gfx-check"
-	fi
-	./configure \
-		--prefix=/usr \
-		--enable-slirp --enable-adlib \
-		--cc=$(tc-getCC) \
-		--host-cc=$(tc-getCC) \
-		--kernel-path=${KV_DIR} \
-		--disable-linux-user \
-		--enable-system \
-		$(use_enable sdl)\
-		$(use_enable kqemu) \
-		$(use_enable alsa) \
-		${myconf} \
-		|| die "could not configure"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make install \
-		prefix=${D}/usr \
-		bindir=${D}/usr/bin \
-		datadir=${D}/usr/share/qemu \
-		docdir=${D}/usr/share/doc/${P} \
-		mandir=${D}/usr/share/man || die
-
-	chmod -x ${D}/usr/share/man/*/*
-}
-
-pkg_postinst() {
-	einfo "You will need the Universal TUN/TAP driver compiled into"
-	einfo "kernel or as a module to use the virtual network device."
-}
diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1-r1.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1-r1.ebuild
deleted file mode 100644
index 6a0af212b13d..000000000000
--- a/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1-r1.ebuild,v 1.5 2009/09/23 15:35:55 patrick Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator"
-HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
-SRC_URI="${HOMEPAGE}${P/-softmmu/}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-alpha ~amd64 ppc -sparc ~x86"
-IUSE="sdl kqemu gnutls alsa"
-RESTRICT="test"
-
-DEPEND="sys-libs/zlib
-	sdl? ( media-libs/libsdl )
-	!<=app-emulation/qemu-0.7.0
-	kqemu? ( >=app-emulation/kqemu-1.3.0_pre10 )
-	gnutls? (
-		dev-util/pkgconfig
-		net-libs/gnutls
-	)
-	app-text/texi2html"
-RDEPEND="sys-libs/zlib
-	sdl? ( media-libs/libsdl )
-	gnutls? ( net-libs/gnutls )
-	alsa? ( media-libs/alsa-lib )"
-
-S="${WORKDIR}/${P/-softmmu/}"
-
-src_unpack() {
-	if [ "$(gcc-major-version)" == "4" ]; then
-		eerror "qemu requires gcc-3 in order to build and work correctly"
-		eerror "please compile it switching to gcc-3."
-		eerror "We are aware that qemu can guess a gcc-3 but this feature"
-		eerror "could be harmful."
-		die "gcc 4 cannot build qemu"
-	fi
-
-	unpack ${A}
-
-	cd "${S}"
-	# Fix CVE-2008-0928
-	epatch "${FILESDIR}/${P}-block-device-address-range.patch"
-	# 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
-	# Ensure mprotect restrictions are relaxed for emulator binaries
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			Makefile.target
-	# Prevent install of kernel module by qemu's makefile
-	sed -i 's/\(.\/install.sh\)/#\1/' Makefile
-	# avoid strip
-	sed -i 's:$(INSTALL) -m 755 -s:$(INSTALL) -m 755:' Makefile Makefile.target
-}
-
-src_compile() {
-	#Let the application set its cflags
-	unset CFLAGS
-
-	# Switch off hardened tech
-	filter-flags -fpie -fstack-protector
-
-	myconf="--disable-gcc-check"
-	if use alsa; then
-		myconf="$myconf --enable-alsa"
-	fi
-	if ! use gnutls; then
-		myconf="$myconf --disable-vnc-tls"
-	fi
-	if ! use kqemu; then
-		myconf="$myconf --disable-kqemu"
-	fi
-	if ! use sdl ; then
-		myconf="$myconf --disable-sdl --disable-gfx-check"
-	fi
-	./configure \
-		--prefix=/usr \
-		--enable-adlib \
-		--cc=$(tc-getCC) \
-		--host-cc=$(tc-getCC) \
-		--disable-linux-user \
-		--enable-system \
-		${myconf} \
-		|| die "could not configure"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make install \
-		prefix="${D}/usr" \
-		bindir="${D}/usr/bin" \
-		datadir="${D}/usr/share/qemu" \
-		docdir="${D}/usr/share/doc/${P}" \
-		mandir="${D}/usr/share/man" || die
-
-	chmod -x "${D}/usr/share/man/*/*"
-}
-
-pkg_postinst() {
-	einfo "You will need the Universal TUN/TAP driver compiled into"
-	einfo "kernel or as a module to use the virtual network device."
-}
diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1-r2.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1-r2.ebuild
deleted file mode 100644
index 489d5b06fd91..000000000000
--- a/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1-r2.ebuild,v 1.3 2009/09/23 15:35:55 patrick Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator"
-HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
-SRC_URI="${HOMEPAGE}${P/-softmmu/}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-alpha ~amd64 ~ppc -sparc ~x86"
-IUSE="sdl kqemu gnutls alsa"
-RESTRICT="test"
-
-DEPEND="sys-libs/zlib
-	sdl? ( media-libs/libsdl )
-	!<=app-emulation/qemu-0.7.0
-	kqemu? ( >=app-emulation/kqemu-1.3.0_pre10 )
-	gnutls? (
-		dev-util/pkgconfig
-		net-libs/gnutls
-	)
-	app-text/texi2html"
-RDEPEND="sys-libs/zlib
-	sdl? ( media-libs/libsdl )
-	gnutls? ( net-libs/gnutls )
-	alsa? ( media-libs/alsa-lib )"
-
-S=${WORKDIR}/${P/-softmmu/}
-
-pkg_setup() {
-	if [ "$(gcc-major-version)" == "4" ]; then
-		eerror "qemu requires gcc-3 in order to build and work correctly"
-		eerror "please compile it switching to gcc-3."
-		eerror "We are aware that qemu can guess a gcc-3 but this feature"
-		eerror "could be harmful."
-		die "gcc 4 cannot build qemu"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-CVE-2008-0928.patch" #212351
-	# 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
-	# Ensure mprotect restrictions are relaxed for emulator binaries
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			Makefile.target
-	# Prevent install of kernel module by qemu's makefile
-	sed -i 's/\(.\/install.sh\)/#\1/' Makefile
-	# avoid strip
-	sed -i 's:$(INSTALL) -m 755 -s:$(INSTALL) -m 755:' Makefile Makefile.target
-}
-
-src_compile() {
-	if use x86 ; then
-		# Force -march=pentium-mmx or lower. Fixes bug #212351.
-		local march
-		march=$(echo "${CFLAGS}" | sed 's:^.*-march=\([[:alnum:]-]\+\)\([[:blank:]].*\)\?$:\1:p;d')
-		case ${march} in
-			i386|i486|i586|pentium) ;;
-			*) # Either march is not enough low or not exists at all
-			case ${CHOST} in
-				i486-*-*)	march=i486 ;;
-				i586-*-*)	march=i586 ;;
-				*)			march=pentium-mmx ;;
-			esac ;;
-		esac
-		#Let the application set its cflags
-		unset CFLAGS
-		append-flags -march=${march}
-	else
-		#Let the application set its cflags
-		unset CFLAGS
-	fi
-
-	# Switch off hardened tech
-	filter-flags -fpie -fstack-protector
-
-	myconf="--disable-gcc-check"
-	if use alsa; then
-		myconf="$myconf --enable-alsa"
-	fi
-	if ! use gnutls; then
-		myconf="$myconf --disable-vnc-tls"
-	fi
-	if ! use kqemu; then
-		myconf="$myconf --disable-kqemu"
-	fi
-	if ! use sdl ; then
-		myconf="$myconf --disable-sdl --disable-gfx-check"
-	fi
-	# econf does not work
-	./configure \
-		--prefix=/usr \
-		--enable-adlib \
-		--cc=$(tc-getCC) \
-		--host-cc=$(tc-getCC) \
-		--disable-linux-user \
-		--enable-system \
-		${myconf} \
-		|| die "could not configure"
-
-	emake OS_CFLAGS="${CFLAGS}" || die "make failed"
-}
-
-src_install() {
-	emake install \
-		prefix="${D}/usr" \
-		bindir="${D}/usr/bin" \
-		datadir="${D}/usr/share/qemu" \
-		docdir="${D}/usr/share/doc/${P}" \
-		mandir="${D}/usr/share/man" || die
-
-	chmod -x "${D}/usr/share/man/*/*"
-}
-
-pkg_postinst() {
-	einfo "You will need the Universal TUN/TAP driver compiled into"
-	einfo "kernel or as a module to use the virtual network device."
-}
diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1.ebuild
deleted file mode 100644
index 45525de91764..000000000000
--- a/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1.ebuild,v 1.3 2009/09/23 15:35:55 patrick Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator"
-HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
-SRC_URI="${HOMEPAGE}${P/-softmmu/}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-alpha ~amd64 ~ppc -sparc ~x86"
-IUSE="sdl kqemu gnutls alsa"
-RESTRICT="test"
-
-DEPEND="sys-libs/zlib
-	sdl? ( media-libs/libsdl )
-	!<=app-emulation/qemu-0.7.0
-	kqemu? ( >=app-emulation/kqemu-1.3.0_pre10 )
-	gnutls? (
-		dev-util/pkgconfig
-		net-libs/gnutls
-	)
-	app-text/texi2html"
-RDEPEND="sys-libs/zlib
-	sdl? ( media-libs/libsdl )
-	gnutls? ( net-libs/gnutls )
-	alsa? ( media-libs/alsa-lib )"
-
-S="${WORKDIR}/${P/-softmmu/}"
-
-pkg_setup() {
-	if [ "$(gcc-major-version)" == "4" ]; then
-	eerror "qemu requires gcc-3 in order to build and work correctly"
-	eerror "please compile it switching to gcc-3."
-	eerror "We are aware that qemu can guess a gcc-3 but this feature"
-	eerror "could be harmful."
-	die "gcc 4 cannot build qemu"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# 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
-	# Ensure mprotect restrictions are relaxed for emulator binaries
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			Makefile.target
-	# Prevent install of kernel module by qemu's makefile
-	sed -i 's/\(.\/install.sh\)/#\1/' Makefile
-	# avoid strip
-	sed -i 's:$(INSTALL) -m 755 -s:$(INSTALL) -m 755:' Makefile Makefile.target
-}
-
-src_compile() {
-	#Let the application set its cflags
-	unset CFLAGS
-
-	# Switch off hardened tech
-	filter-flags -fpie -fstack-protector
-
-	myconf="--disable-gcc-check"
-	if use alsa; then
-		myconf="$myconf --enable-alsa"
-	fi
-	if ! use gnutls; then
-		myconf="$myconf --disable-vnc-tls"
-	fi
-	if ! use kqemu; then
-		myconf="$myconf --disable-kqemu"
-	fi
-	if ! use sdl ; then
-		myconf="$myconf --disable-sdl --disable-gfx-check"
-	fi
-	./configure \
-		--prefix=/usr \
-		--enable-adlib \
-		--cc=$(tc-getCC) \
-		--host-cc=$(tc-getCC) \
-		--disable-linux-user \
-		--enable-system \
-		${myconf} \
-		|| die "could not configure"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make install \
-		prefix="${D}/usr" \
-		bindir="${D}/usr/bin" \
-		datadir="${D}/usr/share/qemu" \
-		docdir="${D}/usr/share/doc/${P}" \
-		mandir="${D}/usr/share/man" || die
-
-	chmod -x "${D}/usr/share/man/*/*"
-}
-
-pkg_postinst() {
-	einfo "You will need the Universal TUN/TAP driver compiled into"
-	einfo "kernel or as a module to use the virtual network device."
-}