clean out old versions

Package-Manager: portage-2.1_rc4-r4

17 files changed, 8 insertions, 1131 deletions

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index fc0b3c15cdf6..220ddef892d9 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,83 +1,23 @@
-AUX kqemu-sysfs.patch 2094 RMD160 9b87cf9d9f8004a37f079fb3eda3d37275624eca SHA1 4fe3caa21a1261ca7b7b3bd354ac90f4df64a24f SHA256 4da7bb1363b9f93a1a4eec2db7c6a41febb1b0a5fa110f2bdfdadca408c67f19 size 2094
-MD5 87ec2e1fa832612fb834d7dd49cf7e5c files/kqemu-sysfs.patch 2094
-RMD160 9b87cf9d9f8004a37f079fb3eda3d37275624eca files/kqemu-sysfs.patch 2094
-SHA256 4da7bb1363b9f93a1a4eec2db7c6a41febb1b0a5fa110f2bdfdadca408c67f19 files/kqemu-sysfs.patch 2094
-AUX qemu-0.6.0-configure.patch 270 RMD160 5d426c540d4c06761978ece1e5db1d753f12bfce SHA1 4f05557b9dc332f30ca14f84a0b09de2c2532386 SHA256 5ffcd9c9974b2e712e44bbb30f9c84f21b10a47126a89fd243824bdd4a2f594b size 270
-MD5 ac8cdb7d17555b028d8bd7ace90bee3d files/qemu-0.6.0-configure.patch 270
-RMD160 5d426c540d4c06761978ece1e5db1d753f12bfce files/qemu-0.6.0-configure.patch 270
-SHA256 5ffcd9c9974b2e712e44bbb30f9c84f21b10a47126a89fd243824bdd4a2f594b files/qemu-0.6.0-configure.patch 270
-AUX qemu-0.6.0-sigaction.patch 677 RMD160 22695d059f37704d3713b78a01869714961f8da5 SHA1 880a7d2b9114e5c4ef03b25af8be7c6d905e2c21 SHA256 3eb54adeb0a05d254b39d7bc7bcb7ddd3bd48e0f7b8d7e673de86796500c52d3 size 677
-MD5 0b85ac42eaa41830ac9b4eccf4a118bd files/qemu-0.6.0-sigaction.patch 677
-RMD160 22695d059f37704d3713b78a01869714961f8da5 files/qemu-0.6.0-sigaction.patch 677
-SHA256 3eb54adeb0a05d254b39d7bc7bcb7ddd3bd48e0f7b8d7e673de86796500c52d3 files/qemu-0.6.0-sigaction.patch 677
-AUX qemu-0.6.0-typo.patch 528 RMD160 ce9d17c20e4d0e321c52605778ca4caeb880903f SHA1 d7df96c3fa98b110b6a63928044430e2a7b0a4ed SHA256 bb2130e7714a03d26bed481ef55e1f9ccbc6ccbcb8a289bf0957ae68cf5abffe size 528
-MD5 f6094ee9cd2ee3a38404680796df2b75 files/qemu-0.6.0-typo.patch 528
-RMD160 ce9d17c20e4d0e321c52605778ca4caeb880903f files/qemu-0.6.0-typo.patch 528
-SHA256 bb2130e7714a03d26bed481ef55e1f9ccbc6ccbcb8a289bf0957ae68cf5abffe files/qemu-0.6.0-typo.patch 528
-AUX qemu-0.6.1-20041126.patch 27697 RMD160 f15875f55982d957fc24ebfb731823f935cdbbaf SHA1 c1c47c85d361ccff0c9d84bc79d7a5142d56edec SHA256 cfd1e905db2c1b2cb48c58f7e9c8d893069ecb7eaed223560587fb48edcab050 size 27697
-MD5 8490b50dc53ceca8208becb949c02ebb files/qemu-0.6.1-20041126.patch 27697
-RMD160 f15875f55982d957fc24ebfb731823f935cdbbaf files/qemu-0.6.1-20041126.patch 27697
-SHA256 cfd1e905db2c1b2cb48c58f7e9c8d893069ecb7eaed223560587fb48edcab050 files/qemu-0.6.1-20041126.patch 27697
-AUX qemu-0.7.0-errno.patch 487 RMD160 0ba3efb79379c96652d0a08f33adef13695c75b7 SHA1 37317be3df18aa4843bb027d2d1e5b3ef1cf27cd SHA256 013031cd5c27de4dd4ab39f10a8be751813a313e006339a35b9722bb0939f193 size 487
-MD5 3202f7445799cce82ccaac9749e1443d files/qemu-0.7.0-errno.patch 487
-RMD160 0ba3efb79379c96652d0a08f33adef13695c75b7 files/qemu-0.7.0-errno.patch 487
-SHA256 013031cd5c27de4dd4ab39f10a8be751813a313e006339a35b9722bb0939f193 files/qemu-0.7.0-errno.patch 487
-DIST qemu-0.6.1.tar.gz 1010121 size 1010121
-EBUILD qemu-0.6.1-r1.ebuild 2143 RMD160 b001cf2005f22e8761fbb5b6474743cae06d1bdf SHA1 6d3f2c5337787efc6f52694f8e35d5a8d5b90189 SHA256 094cf884708b6c7740783d72d27c9fd9dea2373f7a3c40cb4e0db7d35f6cedce size 2143
-MD5 b035e8de3718e77cc27918198bf49fb6 qemu-0.6.1-r1.ebuild 2143
-RMD160 b001cf2005f22e8761fbb5b6474743cae06d1bdf qemu-0.6.1-r1.ebuild 2143
-SHA256 094cf884708b6c7740783d72d27c9fd9dea2373f7a3c40cb4e0db7d35f6cedce qemu-0.6.1-r1.ebuild 2143
-EBUILD qemu-0.6.1.ebuild 2071 RMD160 ad2b696c1d204db6a768f66248333a9cfed2f7cf SHA1 5bad6d0bc207828c608aff7da59d6539b8b97952 SHA256 586dfbd1550628d21c78d5330e8dae26823b633979f57ed893fcbe781ea031b3 size 2071
-MD5 e65dab4abb0028ab15d60ecd60ca4ba9 qemu-0.6.1.ebuild 2071
-RMD160 ad2b696c1d204db6a768f66248333a9cfed2f7cf qemu-0.6.1.ebuild 2071
-SHA256 586dfbd1550628d21c78d5330e8dae26823b633979f57ed893fcbe781ea031b3 qemu-0.6.1.ebuild 2071
-EBUILD qemu-0.7.0-r1.ebuild 493 RMD160 4f7e2c7253a9f5feff80ec11468056569ff70202 SHA1 099b04e12ac5365b2bfa3a23b926bf1945a5357b SHA256 9739fdc23e88ced387acffb8684c36e5fdb625517e5ccdb58dfa8e791ec41a60 size 493
-MD5 a5f64bfa0ee03fa38a4b40c6faddd0ca qemu-0.7.0-r1.ebuild 493
-RMD160 4f7e2c7253a9f5feff80ec11468056569ff70202 qemu-0.7.0-r1.ebuild 493
-SHA256 9739fdc23e88ced387acffb8684c36e5fdb625517e5ccdb58dfa8e791ec41a60 qemu-0.7.0-r1.ebuild 493
-EBUILD qemu-0.7.1.ebuild 490 RMD160 11404da48287e3e5dc6fa940e8a747e06227f035 SHA1 0bcf289e456463f657e330dce13cda6b886386f0 SHA256 79aae1e07b408ee0296e380dda0e08d7934073b6b0ac12faf5337abc5d05a186 size 490
-MD5 0acd15b543d8330d56ef04e77b5ee1a1 qemu-0.7.1.ebuild 490
-RMD160 11404da48287e3e5dc6fa940e8a747e06227f035 qemu-0.7.1.ebuild 490
-SHA256 79aae1e07b408ee0296e380dda0e08d7934073b6b0ac12faf5337abc5d05a186 qemu-0.7.1.ebuild 490
-EBUILD qemu-0.7.2.ebuild 505 RMD160 fb3e3d4a62ff7daf4998eff41f79ec457863067d SHA1 4ccd21d56171e435ce856b9d2cc56711f5a8c29c SHA256 a5ab1dce9d808be0249fb31dbc4d82f3ac9761a7d9f3b289e8d681cec2232ae1 size 505
-MD5 3d713fa1f670e463c3204f254ed6e4e8 qemu-0.7.2.ebuild 505
-RMD160 fb3e3d4a62ff7daf4998eff41f79ec457863067d qemu-0.7.2.ebuild 505
-SHA256 a5ab1dce9d808be0249fb31dbc4d82f3ac9761a7d9f3b289e8d681cec2232ae1 qemu-0.7.2.ebuild 505
-EBUILD qemu-0.8.0.20060329.ebuild 514 RMD160 bf0ae6d5fc058804fefe1147dfb66cfb052b96c6 SHA1 618e7c0eed8493f26dd4c4a309466cf97bed5480 SHA256 00210c08e4671162f0f8ea55c20013078bbd5af9c0a218474292610e2af411fb size 514
+EBUILD qemu-0.8.0.20060329.ebuild 514 RMD160 bf0ae6d5fc058804fefe1147dfb66cfb052b96c6 SHA1 618e7c0eed8493f26dd4c4a309466cf97bed5480 SHA256 00210c08e4671162f0f8ea55c20013078bbd5af9c0a218474292610e2af411fb
 MD5 a8c62969f6c8c798bd7af32458ed1d0e qemu-0.8.0.20060329.ebuild 514
 RMD160 bf0ae6d5fc058804fefe1147dfb66cfb052b96c6 qemu-0.8.0.20060329.ebuild 514
 SHA256 00210c08e4671162f0f8ea55c20013078bbd5af9c0a218474292610e2af411fb qemu-0.8.0.20060329.ebuild 514
-EBUILD qemu-0.8.0.ebuild 499 RMD160 9896d9ad68e78b96d57b5a407f4e34b3695871da SHA1 1722587d67074ff9d6eebe871c67f35939887bb6 SHA256 bd428ea0a90e1d9835b009dafbbe1df6ba58dc27cd245f40a86bcf37fb07c47b size 499
+EBUILD qemu-0.8.0.ebuild 499 RMD160 9896d9ad68e78b96d57b5a407f4e34b3695871da SHA1 1722587d67074ff9d6eebe871c67f35939887bb6 SHA256 bd428ea0a90e1d9835b009dafbbe1df6ba58dc27cd245f40a86bcf37fb07c47b
 MD5 a0135b4f0d63e62296cada799e7fb19d qemu-0.8.0.ebuild 499
 RMD160 9896d9ad68e78b96d57b5a407f4e34b3695871da qemu-0.8.0.ebuild 499
 SHA256 bd428ea0a90e1d9835b009dafbbe1df6ba58dc27cd245f40a86bcf37fb07c47b qemu-0.8.0.ebuild 499
-EBUILD qemu-0.8.1.ebuild 505 RMD160 aac613716fd85dee4b7f89a36052114b0ac24e72 SHA1 eb62ab2ae3012bb8c2015dc157919b9a0995d689 SHA256 0cdda181c720108c3d091a976aafa4eef931a3be00f39756169952c31e6d70ec size 505
+EBUILD qemu-0.8.1.ebuild 505 RMD160 aac613716fd85dee4b7f89a36052114b0ac24e72 SHA1 eb62ab2ae3012bb8c2015dc157919b9a0995d689 SHA256 0cdda181c720108c3d091a976aafa4eef931a3be00f39756169952c31e6d70ec
 MD5 7c57f4cc2a46959e0df3727ccef1900d qemu-0.8.1.ebuild 505
 RMD160 aac613716fd85dee4b7f89a36052114b0ac24e72 qemu-0.8.1.ebuild 505
 SHA256 0cdda181c720108c3d091a976aafa4eef931a3be00f39756169952c31e6d70ec qemu-0.8.1.ebuild 505
-MISC ChangeLog 5854 RMD160 d43301b5dac69fca8db69a5d494ccaa6d72316c0 SHA1 a4c6f2bd1eb00ff51e86c19e64d903260282796c SHA256 a3f69cc32a7f3bf2b3bca1d76992ad05e6627f5c79db62fac1a8d4900d067103 size 5854
-MD5 04ece73d7b48275ed4e7f4da8c0fd256 ChangeLog 5854
-RMD160 d43301b5dac69fca8db69a5d494ccaa6d72316c0 ChangeLog 5854
-SHA256 a3f69cc32a7f3bf2b3bca1d76992ad05e6627f5c79db62fac1a8d4900d067103 ChangeLog 5854
-MISC metadata.xml 222 RMD160 8d98fcaaf7c7de70e19457776c3fae33f50ba8b7 SHA1 f6a00ec35a3cf9fc6135a48521949905242baf89 SHA256 43f6f0590273110b6fa46886158dfe583245c76bb5b27cee47897e81d8decbf2 size 222
+MISC ChangeLog 6244 RMD160 7753f46ff5579348fd6ec45adbec0606a7b48234 SHA1 053ca4104789ca0bcb8a72f8808c0c7d33094e8d SHA256 74399648f094efa931c0329da60a837101d5e40e528fe2742fc338a8b221f368
+MD5 5a02e10b222b26769839b75aabbb2374 ChangeLog 6244
+RMD160 7753f46ff5579348fd6ec45adbec0606a7b48234 ChangeLog 6244
+SHA256 74399648f094efa931c0329da60a837101d5e40e528fe2742fc338a8b221f368 ChangeLog 6244
+MISC metadata.xml 222 RMD160 8d98fcaaf7c7de70e19457776c3fae33f50ba8b7 SHA1 f6a00ec35a3cf9fc6135a48521949905242baf89 SHA256 43f6f0590273110b6fa46886158dfe583245c76bb5b27cee47897e81d8decbf2
 MD5 6f636b32783a84bffd31c7be1b60cb40 metadata.xml 222
 RMD160 8d98fcaaf7c7de70e19457776c3fae33f50ba8b7 metadata.xml 222
 SHA256 43f6f0590273110b6fa46886158dfe583245c76bb5b27cee47897e81d8decbf2 metadata.xml 222
-MD5 1f8638d68cffbd8b96df97dcb0868b88 files/digest-qemu-0.6.1 63
-RMD160 71dc60f0a239582276b7ef776068330b542eddbc files/digest-qemu-0.6.1 63
-SHA256 9aeb1f15341ff89a596fb868fdec0dcb4a78adb696648737dba191d79196386e files/digest-qemu-0.6.1 63
-MD5 1f8638d68cffbd8b96df97dcb0868b88 files/digest-qemu-0.6.1-r1 63
-RMD160 71dc60f0a239582276b7ef776068330b542eddbc files/digest-qemu-0.6.1-r1 63
-SHA256 9aeb1f15341ff89a596fb868fdec0dcb4a78adb696648737dba191d79196386e files/digest-qemu-0.6.1-r1 63
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-qemu-0.7.0-r1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-qemu-0.7.0-r1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-qemu-0.7.0-r1 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-qemu-0.7.1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-qemu-0.7.1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-qemu-0.7.1 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-qemu-0.7.2 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-qemu-0.7.2 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-qemu-0.7.2 1
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-qemu-0.8.0 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-qemu-0.8.0 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-qemu-0.8.0 1
diff --git a/app-emulation/qemu/files/digest-qemu-0.6.1 b/app-emulation/qemu/files/digest-qemu-0.6.1
deleted file mode 100644
index 1d4f4df7564a..000000000000
--- a/app-emulation/qemu/files/digest-qemu-0.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f1b5e103321832d2786dd4110f6c8ae4 qemu-0.6.1.tar.gz 1010121
diff --git a/app-emulation/qemu/files/digest-qemu-0.6.1-r1 b/app-emulation/qemu/files/digest-qemu-0.6.1-r1
deleted file mode 100644
index 1d4f4df7564a..000000000000
--- a/app-emulation/qemu/files/digest-qemu-0.6.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f1b5e103321832d2786dd4110f6c8ae4 qemu-0.6.1.tar.gz 1010121
diff --git a/app-emulation/qemu/files/digest-qemu-0.7.0-r1 b/app-emulation/qemu/files/digest-qemu-0.7.0-r1
deleted file mode 100644
index 8b137891791f..000000000000
--- a/app-emulation/qemu/files/digest-qemu-0.7.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app-emulation/qemu/files/digest-qemu-0.7.1 b/app-emulation/qemu/files/digest-qemu-0.7.1
deleted file mode 100644
index 8b137891791f..000000000000
--- a/app-emulation/qemu/files/digest-qemu-0.7.1
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app-emulation/qemu/files/digest-qemu-0.7.2 b/app-emulation/qemu/files/digest-qemu-0.7.2
deleted file mode 100644
index 8b137891791f..000000000000
--- a/app-emulation/qemu/files/digest-qemu-0.7.2
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app-emulation/qemu/files/kqemu-sysfs.patch b/app-emulation/qemu/files/kqemu-sysfs.patch
deleted file mode 100644
index 05c49ca67898..000000000000
--- a/app-emulation/qemu/files/kqemu-sysfs.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- kqemu/kmod.c	2005-02-10 23:09:09.000000000 +0100
-+++ kqemu/kmod-sysfs.c	2005-02-22 19:46:44.000000000 +0100
-@@ -15,7 +15,10 @@
- #include <asm/processor.h>
- #include <asm/uaccess.h>
- #include <asm/io.h>
--
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-+#include <linux/device.h>
-+#endif
-+#include <linux/devfs_fs_kernel.h>
- #include "kqemu.h"
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,19)
-@@ -34,6 +37,10 @@
- int page_alloc_count;
- #endif
- 
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-+static struct class_simple *kqemu_class;
-+#endif
-+
- /* lock the page at virtual address 'user_addr' and return its
-    page index. Return -1 if error */
- unsigned long CDECL kqemu_lock_user_page(unsigned long user_addr)
-@@ -296,17 +303,51 @@
-         max_locked_pages = 32768;
- 
-     ret = register_chrdev(KQEMU_MAJOR, "kqemu", &kqemu_fops);
-+
-     if (ret < 0) {
-         printk("kqemu: could not get major %d\n", KQEMU_MAJOR);
-         return ret;
-     }
-+
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-+    kqemu_class = class_simple_create(THIS_MODULE, "kqemu");
-+
-+    if (IS_ERR(kqemu_class)) {
-+	unregister_chrdev(KQEMU_MAJOR, "kqemu");
-+	ret = PTR_ERR(kqemu_class);
-+	goto out_chrdev;
-+    }
-+    
-+    class_simple_device_add(kqemu_class, MKDEV(KQEMU_MAJOR, 0), NULL, "kqemu");
-+#endif
-+
-+    ret = devfs_mk_cdev(MKDEV(KQEMU_MAJOR, 0),
-+			S_IFCHR|S_IRUSR|S_IWUSR, "kqemu");
-+    if (ret)
-+	    goto out_class;
-+    
-     printk("KQEMU installed, max_instances=%d max_locked_mem=%dkB.\n",
-            KQEMU_MAX_INSTANCES, 
-            max_locked_pages * 4);
-     return 0;
-+
-+out_class:
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-+    class_simple_device_remove(MKDEV(KQEMU_MAJOR,0));
-+    class_simple_destroy(kqemu_class);
-+#endif
-+out_chrdev:
-+    unregister_chrdev(KQEMU_MAJOR, "kqemu");
-+    
-+    return ret;
- }
- 
- void cleanup_module(void)
- {
-     unregister_chrdev(KQEMU_MAJOR, "kqemu");
-+    devfs_remove("kqemu");
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-+    class_simple_device_remove(MKDEV(KQEMU_MAJOR, 0));
-+    class_simple_destroy(kqemu_class);
-+#endif
- }
diff --git a/app-emulation/qemu/files/qemu-0.6.0-configure.patch b/app-emulation/qemu/files/qemu-0.6.0-configure.patch
deleted file mode 100644
index cc927e6af0b2..000000000000
--- a/app-emulation/qemu/files/qemu-0.6.0-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qemu-0.6.0-clean/configure	2004-07-10 21:20:09.000000000 +0300
-+++ qemu-0.6.0/configure	2004-10-29 11:24:37.719578344 +0300
-@@ -255,6 +255,8 @@
- fi # cross compilation
- fi # -z $sdl
- 
-+sdl_static=no
-+
- if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
- cat << EOF
- 
diff --git a/app-emulation/qemu/files/qemu-0.6.0-sigaction.patch b/app-emulation/qemu/files/qemu-0.6.0-sigaction.patch
deleted file mode 100644
index 4f40e51635ff..000000000000
--- a/app-emulation/qemu/files/qemu-0.6.0-sigaction.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN qemu-0.6.0.orig/vl.c qemu-0.6.0/vl.c
---- qemu-0.6.0.orig/vl.c	2004-08-20 15:18:08.238568392 +0200
-+++ qemu-0.6.0/vl.c	2004-08-20 15:18:44.294087120 +0200
-@@ -68,17 +68,6 @@
- #ifdef __APPLE__
- #include <SDL/SDL.h>
- #endif
--#if defined(__linux__)
--/* SDL use the pthreads and they modify sigaction. We don't
--   want that. */
--#if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2))
--extern void __libc_sigaction();
--#define sigaction(sig, act, oact) __libc_sigaction(sig, act, oact)
--#else
--extern void __sigaction();
--#define sigaction(sig, act, oact) __sigaction(sig, act, oact)
--#endif
--#endif /* __linux__ */
- #endif /* CONFIG_SDL */
- 
- #include "disas.h"
diff --git a/app-emulation/qemu/files/qemu-0.6.0-typo.patch b/app-emulation/qemu/files/qemu-0.6.0-typo.patch
deleted file mode 100644
index 52fb55af849a..000000000000
--- a/app-emulation/qemu/files/qemu-0.6.0-typo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN qemu-0.6.0.orig/cpu-exec.c qemu-0.6.0/cpu-exec.c
---- qemu-0.6.0.orig/cpu-exec.c	2004-07-13 15:40:54.008504168 +0200
-+++ qemu-0.6.0/cpu-exec.c	2004-07-13 15:41:16.604069120 +0200
-@@ -903,7 +903,7 @@
- # define TRAP_sig(context)			EXCEPREG_sig(exception, context) /* number of powerpc exception taken */
- #endif /* __APPLE__ */
- 
--int cpu_signal_handler(int host_signum, siginfo *info, 
-+int cpu_signal_handler(int host_signum, struct siginfo *info, 
-                        void *puc)
- {
-     struct ucontext *uc = puc;
diff --git a/app-emulation/qemu/files/qemu-0.6.1-20041126.patch b/app-emulation/qemu/files/qemu-0.6.1-20041126.patch
deleted file mode 100644
index 4760653cedaf..000000000000
--- a/app-emulation/qemu/files/qemu-0.6.1-20041126.patch
+++ /dev/null
@@ -1,721 +0,0 @@
-diff -ruN /qemu-0.6.1/work/qemu-0.6.1/Changelog qemu-snapshot-2004-11-26_23/Changelog
---- /qemu-0.6.1/work/qemu-0.6.1/Changelog	2004-11-14 21:51:33.000000000 +0100
-+++ qemu-snapshot-2004-11-26_23/Changelog	2004-11-24 20:31:21.000000000 +0100
-@@ -1,3 +1,9 @@
-+version 0.6.2:
-+
-+  - better BIOS translation and HDD geometry auto-detection
-+  - user mode networking bug fix
-+  - undocumented FPU ops support
-+
- version 0.6.1:
- 
-   - Mac OS X port (Pierre d'Herbemont)
-diff -ruN /qemu-0.6.1/work/qemu-0.6.1/Makefile qemu-snapshot-2004-11-26_23/Makefile
---- /qemu-0.6.1/work/qemu-0.6.1/Makefile	2004-11-14 21:51:33.000000000 +0100
-+++ qemu-snapshot-2004-11-26_23/Makefile	2004-11-16 02:44:03.000000000 +0100
-@@ -10,18 +10,18 @@
- LDFLAGS=-g
- LIBS=
- DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
--TOOLS=qemu-img
-+TOOLS=qemu-img$(EXESUF)
- ifdef CONFIG_STATIC
- LDFLAGS+=-static
- endif
--DOCS=qemu-doc.html qemu-tech.html qemu.1
-+DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1
- 
- all: dyngen$(EXESUF) $(TOOLS) $(DOCS)
- 	for d in $(TARGET_DIRS); do \
- 	$(MAKE) -C $$d $@ || exit 1 ; \
-         done
- 
--qemu-img: qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c
-+qemu-img$(EXESUF): qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c
- 	$(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS)
- 
- dyngen$(EXESUF): dyngen.c
-@@ -30,7 +30,7 @@
- clean:
- # avoid old build problems by removing potentially incorrect old files
- 	rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h 
--	rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS qemu.pod *~ */*~
-+	rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS *.pod *~ */*~
- 	$(MAKE) -C tests clean
- 	for d in $(TARGET_DIRS); do \
- 	$(MAKE) -C $$d $@ || exit 1 ; \
-@@ -44,9 +44,7 @@
- 
- install: all 
- 	mkdir -p "$(bindir)"
--ifndef CONFIG_WIN32
- 	install -m 755 -s $(TOOLS) "$(bindir)"
--endif
- 	mkdir -p "$(datadir)"
- 	install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
-                        pc-bios/vgabios-cirrus.bin \
-@@ -57,7 +55,7 @@
- 	install -m 644 qemu-doc.html  qemu-tech.html "$(docdir)"
- ifndef CONFIG_WIN32
- 	mkdir -p "$(mandir)/man1"
--	install qemu.1 qemu-mkcow.1 "$(mandir)/man1"
-+	install qemu.1 qemu-img.1 "$(mandir)/man1"
- endif
- 	for d in $(TARGET_DIRS); do \
- 	$(MAKE) -C $$d $@ || exit 1 ; \
-@@ -78,6 +76,10 @@
- 	./texi2pod.pl $< qemu.pod
- 	pod2man --section=1 --center=" " --release=" " qemu.pod > $@
- 
-+qemu-img.1: qemu-img.texi
-+	./texi2pod.pl $< qemu-img.pod
-+	pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@
-+
- FILE=qemu-$(shell cat VERSION)
- 
- # tar release (use 'make -k tar' on a checkouted tree)
-@@ -92,6 +94,7 @@
- 	( cd / ; tar zcvf ~/qemu-$(VERSION)-i386.tar.gz \
- 	$(bindir)/qemu $(bindir)/qemu-fast \
- 	$(bindir)/qemu-system-ppc \
-+	$(bindir)/qemu-system-sparc \
- 	$(bindir)/qemu-i386 \
-         $(bindir)/qemu-arm \
-         $(bindir)/qemu-sparc \
-@@ -105,7 +108,7 @@
- 	$(datadir)/linux_boot.bin \
- 	$(docdir)/qemu-doc.html \
- 	$(docdir)/qemu-tech.html \
--	$(mandir)/man1/qemu.1 $(mandir)/man1/qemu-mkcow.1 )
-+	$(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 )
- 
- ifneq ($(wildcard .depend),)
- include .depend
-diff -ruN /qemu-0.6.1/work/qemu-0.6.1/VERSION qemu-snapshot-2004-11-26_23/VERSION
---- /qemu-0.6.1/work/qemu-0.6.1/VERSION	2004-11-14 21:51:33.000000000 +0100
-+++ qemu-snapshot-2004-11-26_23/VERSION	2004-11-24 20:31:52.000000000 +0100
-@@ -1 +1 @@
--0.6.1
-\ No newline at end of file
-+0.6.2
-\ No newline at end of file
-diff -ruN /qemu-0.6.1/work/qemu-0.6.1/block.c qemu-snapshot-2004-11-26_23/block.c
---- /qemu-0.6.1/work/qemu-0.6.1/block.c	2004-11-14 21:51:33.000000000 +0100
-+++ qemu-snapshot-2004-11-26_23/block.c	2004-11-16 02:45:27.000000000 +0100
-@@ -348,6 +348,11 @@
-                       type == BDRV_TYPE_FLOPPY));
- }
- 
-+void bdrv_set_translation_hint(BlockDriverState *bs, int translation)
-+{
-+    bs->translation = translation;
-+}
-+
- void bdrv_get_geometry_hint(BlockDriverState *bs, 
-                             int *pcyls, int *pheads, int *psecs)
- {
-@@ -361,6 +366,11 @@
-     return bs->type;
- }
- 
-+int bdrv_get_translation_hint(BlockDriverState *bs)
-+{
-+    return bs->translation;
-+}
-+
- int bdrv_is_removable(BlockDriverState *bs)
- {
-     return bs->removable;
-diff -ruN /qemu-0.6.1/work/qemu-0.6.1/block_int.h qemu-snapshot-2004-11-26_23/block_int.h
---- /qemu-0.6.1/work/qemu-0.6.1/block_int.h	2004-11-14 21:51:33.000000000 +0100
-+++ qemu-snapshot-2004-11-26_23/block_int.h	2004-11-16 02:45:27.000000000 +0100
-@@ -68,7 +68,7 @@
-     
-     /* NOTE: the following infos are only hints for real hardware
-        drivers. They are not used by the block driver */
--    int cyls, heads, secs;
-+    int cyls, heads, secs, translation;
-     int type;
-     char device_name[32];
-     BlockDriverState *next;
-diff -ruN /qemu-0.6.1/work/qemu-0.6.1/hw/cirrus_vga.c qemu-snapshot-2004-11-26_23/hw/cirrus_vga.c
---- /qemu-0.6.1/work/qemu-0.6.1/hw/cirrus_vga.c	2004-11-14 21:51:33.000000000 +0100
-+++ qemu-snapshot-2004-11-26_23/hw/cirrus_vga.c	2004-11-15 22:43:57.000000000 +0100
-@@ -737,7 +737,8 @@
-             else
-                 s->cirrus_blt_srcpitch = ((w + 7) >> 3);
- 	} else {
--	    s->cirrus_blt_srcpitch = s->cirrus_blt_width;
-+            /* always align input size to 32 bits */
-+	    s->cirrus_blt_srcpitch = (s->cirrus_blt_width + 3) & ~3;
- 	}
-         s->cirrus_srccounter = s->cirrus_blt_srcpitch * s->cirrus_blt_height;
-     }
-diff -ruN /qemu-0.6.1/work/qemu-0.6.1/hw/ide.c qemu-snapshot-2004-11-26_23/hw/ide.c
---- /qemu-0.6.1/work/qemu-0.6.1/hw/ide.c	2004-11-14 21:51:33.000000000 +0100
-+++ qemu-snapshot-2004-11-26_23/hw/ide.c	2004-11-17 23:35:32.000000000 +0100
-@@ -1826,37 +1826,45 @@
- 	uint32_t nr_sects;		/* nr of sectors in partition */
- } __attribute__((packed));
- 
--/* try to guess the IDE geometry from the MSDOS partition table */
--static void ide_guess_geometry(IDEState *s)
-+/* try to guess the disk logical geometry from the MSDOS partition table. Return 0 if OK, -1 if could not guess */
-+static int guess_disk_lchs(IDEState *s, 
-+                           int *pcylinders, int *pheads, int *psectors)
- {
-     uint8_t buf[512];
--    int ret, i;
-+    int ret, i, heads, sectors, cylinders;
-     struct partition *p;
-     uint32_t nr_sects;
- 
--    if (s->cylinders != 0)
--        return;
-     ret = bdrv_read(s->bs, 0, buf, 1);
-     if (ret < 0)
--        return;
-+        return -1;
-     /* test msdos magic */
-     if (buf[510] != 0x55 || buf[511] != 0xaa)
--        return;
-+        return -1;
-     for(i = 0; i < 4; i++) {
-         p = ((struct partition *)(buf + 0x1be)) + i;
-         nr_sects = le32_to_cpu(p->nr_sects);
-         if (nr_sects && p->end_head) {
-             /* We make the assumption that the partition terminates on
-                a cylinder boundary */
--            s->heads = p->end_head + 1;
--            s->sectors = p->end_sector & 63;
--            s->cylinders = s->nb_sectors / (s->heads * s->sectors);
-+            heads = p->end_head + 1;
-+            sectors = p->end_sector & 63;
-+            if (sectors == 0)
-+                continue;
-+            cylinders = s->nb_sectors / (heads * sectors);
-+            if (cylinders < 1 || cylinders > 16383)
-+                continue;
-+            *pheads = heads;
-+            *psectors = sectors;
-+            *pcylinders = cylinders;
- #if 0
--            printf("guessed partition: CHS=%d %d %d\n", 
--                   s->cylinders, s->heads, s->sectors);
-+            printf("guessed geometry: LCHS=%d %d %d\n", 
-+                   cylinders, heads, sectors);
- #endif
-+            return 0;
-         }
-     }
-+    return -1;
- }
- 
- static void ide_init2(IDEState *ide_state, int irq,
-@@ -1864,7 +1872,7 @@
- {
-     IDEState *s;
-     static int drive_serial = 1;
--    int i, cylinders, heads, secs;
-+    int i, cylinders, heads, secs, translation;
-     int64_t nb_sectors;
- 
-     for(i = 0; i < 2; i++) {
-@@ -1883,9 +1891,27 @@
-                 s->heads = heads;
-                 s->sectors = secs;
-             } else {
--                ide_guess_geometry(s);
--                if (s->cylinders == 0) {
--                    /* if no geometry, use a LBA compatible one */
-+                if (guess_disk_lchs(s, &cylinders, &heads, &secs) == 0) {
-+                    if (heads > 16) {
-+                        /* if heads > 16, it means that a BIOS LBA
-+                           translation was active, so the default
-+                           hardware geometry is OK */
-+                        goto default_geometry;
-+                    } else {
-+                        s->cylinders = cylinders;
-+                        s->heads = heads;
-+                        s->sectors = secs;
-+                        /* disable any translation to be in sync with
-+                           the logical geometry */
-+                        translation = bdrv_get_translation_hint(s->bs);
-+                        if (translation == BIOS_ATA_TRANSLATION_AUTO) {
-+                            bdrv_set_translation_hint(s->bs,
-+                                                      BIOS_ATA_TRANSLATION_NONE);
-+                        }
-+                    }
-+                } else {
-+                default_geometry:
-+                    /* if no geometry, use a standard physical disk geometry */
-                     cylinders = nb_sectors / (16 * 63);
-                     if (cylinders > 16383)
-                         cylinders = 16383;
-diff -ruN /qemu-0.6.1/work/qemu-0.6.1/hw/pc.c qemu-snapshot-2004-11-26_23/hw/pc.c
---- /qemu-0.6.1/work/qemu-0.6.1/hw/pc.c	2004-11-14 21:51:33.000000000 +0100
-+++ qemu-snapshot-2004-11-26_23/hw/pc.c	2004-11-16 02:45:27.000000000 +0100
-@@ -217,19 +217,23 @@
-     val = 0;
-     for (i = 0; i < 4; i++) {
-         if (hd_table[i]) {
--            int cylinders, heads, sectors;
--            uint8_t translation;
--            /* NOTE: bdrv_get_geometry_hint() returns the geometry
--               that the hard disk returns. It is always such that: 1 <=
--               sects <= 63, 1 <= heads <= 16, 1 <= cylinders <=
--               16383. The BIOS geometry can be different. */
--            bdrv_get_geometry_hint(hd_table[i], &cylinders, &heads, &sectors);
--            if (cylinders <= 1024 && heads <= 16 && sectors <= 63) {
--                /* No translation. */
--                translation = 0;
-+            int cylinders, heads, sectors, translation;
-+            /* NOTE: bdrv_get_geometry_hint() returns the physical
-+                geometry.  It is always such that: 1 <= sects <= 63, 1
-+                <= heads <= 16, 1 <= cylinders <= 16383. The BIOS
-+                geometry can be different if a translation is done. */
-+            translation = bdrv_get_translation_hint(hd_table[i]);
-+            if (translation == BIOS_ATA_TRANSLATION_AUTO) {
-+                bdrv_get_geometry_hint(hd_table[i], &cylinders, &heads, &sectors);
-+                if (cylinders <= 1024 && heads <= 16 && sectors <= 63) {
-+                    /* No translation. */
-+                    translation = 0;
-+                } else {
-+                    /* LBA translation. */
-+                    translation = 1;
-+                }
-             } else {
--                /* LBA translation. */
--                translation = 1;
-+                translation--;
-             }
-             val |= translation << (i * 2);
-         }
-diff -ruN /qemu-0.6.1/work/qemu-0.6.1/qemu-doc.texi qemu-snapshot-2004-11-26_23/qemu-doc.texi
---- /qemu-0.6.1/work/qemu-0.6.1/qemu-doc.texi	2004-11-14 21:51:33.000000000 +0100
-+++ qemu-snapshot-2004-11-26_23/qemu-doc.texi	2004-11-16 02:45:27.000000000 +0100
-@@ -343,6 +343,12 @@
- Do not start CPU at startup (you must type 'c' in the monitor).
- @item -d             
- Output log in /tmp/qemu.log
-+@item -hdachs c,h,s,[,t]
-+Force hard disk 0 physical geometry (1 <= @var{c} <= 16383, 1 <=
-+@var{h} <= 16, 1 <= @var{s} <= 63) and optionally force the BIOS
-+translation mode (@var{t}=none, lba or auto). Usually QEMU can guess
-+all thoses parameters. This option is useful for old MS-DOS disk
-+images.
- @item -isa
- Simulate an ISA-only system (default is PCI system).
- @item -std-vga
-@@ -584,81 +590,34 @@
- @node disk_images
- @section Disk Images
- 
--@subsection Raw disk images
-+Since version 0.6.1, QEMU supports many disk image formats, including
-+growable disk images (their size increase as non empty sectors are
-+written), compressed and encrypted disk images.
- 
--The disk images can simply be raw images of the hard disk. You can
--create them with the command:
-+@subsection Quick start for disk image creation
-+
-+You can create a disk image with the command:
- @example
--dd of=myimage bs=1024 seek=mysize count=0
-+qemu-img create myimage.img mysize
- @end example
--where @var{myimage} is the image filename and @var{mysize} is its size
--in kilobytes.
-+where @var{myimage.img} is the disk image filename and @var{mysize} is its
-+size in kilobytes. You can add an @code{M} suffix to give the size in
-+megabytes and a @code{G} suffix for gigabytes.
-+
-+@xref{qemu_img_invocation} for more information.
- 
- @subsection Snapshot mode
- 
- If you use the option @option{-snapshot}, all disk images are
- considered as read only. When sectors in written, they are written in
- a temporary file created in @file{/tmp}. You can however force the
--write back to the raw disk images by pressing @key{C-a s}.
--
--NOTE: The snapshot mode only works with raw disk images.
--
--@subsection Copy On Write disk images
--
--QEMU also supports user mode Linux
--(@url{http://user-mode-linux.sourceforge.net/}) Copy On Write (COW)
--disk images. The COW disk images are much smaller than normal images
--as they store only modified sectors. They also permit the use of the
--same disk image template for many users.
--
--To create a COW disk images, use the command:
--
--@example
--qemu-mkcow -f myrawimage.bin mycowimage.cow
--@end example
--
--@file{myrawimage.bin} is a raw image you want to use as original disk
--image. It will never be written to.
--
--@file{mycowimage.cow} is the COW disk image which is created by
--@code{qemu-mkcow}. You can use it directly with the @option{-hdx}
--options. You must not modify the original raw disk image if you use
--COW images, as COW images only store the modified sectors from the raw
--disk image. QEMU stores the original raw disk image name and its
--modified time in the COW disk image so that chances of mistakes are
--reduced.
--
--If the raw disk image is not read-only, by pressing @key{C-a s} you
--can flush the COW disk image back into the raw disk image, as in
--snapshot mode.
-+write back to the raw disk images by using the @code{commit} monitor
-+command (or @key{C-a s} in the serial console).
- 
--COW disk images can also be created without a corresponding raw disk
--image. It is useful to have a big initial virtual disk image without
--using much disk space. Use:
-+@node qemu_img_invocation
-+@subsection @code{qemu-img} Invocation
- 
--@example
--qemu-mkcow mycowimage.cow 1024
--@end example
--
--to create a 1 gigabyte empty COW disk image.
--
--NOTES: 
--@enumerate
--@item
--COW disk images must be created on file systems supporting
--@emph{holes} such as ext2 or ext3.
--@item 
--Since holes are used, the displayed size of the COW disk image is not
--the real one. To know it, use the @code{ls -ls} command.
--@end enumerate
--
--@subsection Convert VMware disk images to raw disk images
--
--You can use the tool @file{vmdk2raw} to convert VMware disk images to
--raw disk images directly usable by QEMU. The syntax is:
--@example
--vmdk2raw vmware_image output_image
--@end example
-+@include qemu-img.texi
- 
- @section Network emulation
- 
-diff -ruN /qemu-0.6.1/work/qemu-0.6.1/qemu-img.texi qemu-snapshot-2004-11-26_23/qemu-img.texi
---- /qemu-0.6.1/work/qemu-0.6.1/qemu-img.texi	1970-01-01 01:00:00.000000000 +0100
-+++ qemu-snapshot-2004-11-26_23/qemu-img.texi	2004-11-15 23:57:26.000000000 +0100
-@@ -0,0 +1,127 @@
-+@example
-+@c man begin SYNOPSIS
-+usage: qemu-img command [command options]
-+@c man end
-+@end example
-+
-+@c man begin OPTIONS
-+
-+The following commands are supported:
-+@table @option
-+@item create [-e] [-b @var{base_image}] [-f @var{fmt}] @var{filename} [@var{size}]
-+@item commit [-f @var{fmt}] @var{filename}
-+@item convert [-c] [-e] [-f @var{fmt}] @var{filename} [-O @var{output_fmt}] @var{output_filename}
-+@item info [-f @var{fmt}] @var{filename}
-+@end table
-+
-+Command parameters:
-+@table @var
-+@item filename
-+ is a disk image filename
-+@item base_image 
-+is the read-only disk image which is used as base for a copy on
-+    write image; the copy on write image only stores the modified data
-+
-+@item fmt 
-+is the disk image format. It is guessed automatically in most cases. The following formats are supported:
-+
-+@table @code
-+@item raw
-+
-+Raw disk image format (default). This format has the advantage of
-+being simple and easily exportable to all other emulators. If your file
-+system supports @emph{holes} (for example in ext2 or ext3 on Linux),
-+then only the written sectors will reserve space. Use @code{qemu-img
-+info} to know the real size used by the image or @code{ls -ls} on
-+Unix/Linux.
-+
-+@item qcow
-+QEMU image format, the most versatile format. Use it to have smaller
-+images (useful if your filesystem does not supports holes, for example
-+on Windows), optional AES encryption and zlib based compression.
-+@item cow
-+User Mode Linux Copy On Write image format. Used to be the only growable
-+image format in QEMU. It is supported only for compatibility with
-+previous versions. It does not work on win32.
-+@item vmdk
-+VMware 3 and 4 compatible image format. Currently only supported as
-+read-only.
-+@item cloop
-+Linux Compressed Loop image, useful only to reuse directly compressed
-+CD-ROM images present for example in the Knoppix CD-ROMs.
-+@end table
-+
-+@item size 
-+is the disk image size in kilobytes. Optional suffixes @code{M}
-+(megabyte) and @code{G} (gigabyte) are supported 
-+
-+@item output_filename
-+is the destination disk image filename 
-+
-+@item output_fmt
-+ is the destination format
-+
-+@item -c
-+indicates that target image must be compressed (qcow format only)
-+@item -e 
-+indicates that the target image must be encrypted (qcow format only)
-+@end table
-+
-+Command description:
-+
-+@table @option
-+@item create [-e] [-b @var{base_image}] [-f @var{fmt}] @var{filename} [@var{size}]
-+
-+Create the new disk image @var{filename} of size @var{size} and format
-+@var{fmt}. 
-+
-+If @var{base_image} is specified, then the image will record only the
-+differences from @var{base_image}. No size needs to be specified in
-+this case. @var{base_image} will never be modified unless you use the
-+@code{commit} monitor command.
-+
-+@item commit [-f @var{fmt}] @var{filename}
-+
-+Commit the changes recorded in @var{filename} in its base image.
-+
-+@item convert [-c] [-e] [-f @var{fmt}] @var{filename} [-O @var{output_fmt}] @var{output_filename}
-+
-+Convert the disk image @var{filename} to disk image @var{output_filename}
-+using format @var{output_fmt}. It can be optionnaly encrypted
-+(@code{-e} option) or compressed (@code{-c} option).
-+
-+Only the format @code{qcow} supports encryption or compression. The
-+compression is read-only. It means that if a compressed sector is
-+rewritten, then it is rewritten as uncompressed data.
-+
-+Encryption uses the AES format which is very secure (128 bit keys). Use
-+a long password (16 characters) to get maximum protection.
-+
-+Image conversion is also useful to get smaller image when using a
-+growable format such as @code{qcow} or @code{cow}: the empty sectors
-+are detected and suppressed from the destination image.
-+
-+@item info [-f @var{fmt}] @var{filename}
-+
-+Give information about the disk image @var{filename}. Use it in
-+particular to know the size reserved on disk which can be different
-+from the displayed size.
-+@end table
-+
-+@c man end
-+
-+@ignore
-+
-+@setfilename qemu-img
-+@settitle QEMU disk image utility
-+
-+@c man begin SEEALSO
-+The HTML documentation of QEMU for more precise information and Linux
-+user mode emulator invocation.
-+@c man end
-+
-+@c man begin AUTHOR
-+Fabrice Bellard
-+@c man end
-+
-+@end ignore
-diff -ruN /qemu-0.6.1/work/qemu-0.6.1/slirp/socket.c qemu-snapshot-2004-11-26_23/slirp/socket.c
---- /qemu-0.6.1/work/qemu-0.6.1/slirp/socket.c	2004-11-14 21:51:33.000000000 +0100
-+++ qemu-snapshot-2004-11-26_23/slirp/socket.c	2004-11-24 21:39:26.000000000 +0100
-@@ -175,8 +175,12 @@
- 	 * a close will be detected on next iteration.
- 	 * A return of -1 wont (shouldn't) happen, since it didn't happen above
- 	 */
--	if (n == 2 && nn == iov[0].iov_len)
--	   nn += recv(so->s, iov[1].iov_base, iov[1].iov_len,0);
-+	if (n == 2 && nn == iov[0].iov_len) {
-+            int ret;
-+            ret = recv(so->s, iov[1].iov_base, iov[1].iov_len,0);
-+            if (ret > 0)
-+                nn += ret;
-+        }
- 	
- 	DEBUG_MISC((dfd, " ... read nn = %d bytes\n", nn));
- #endif
-@@ -348,8 +352,12 @@
- 	}
- 	
- #ifndef HAVE_READV
--	if (n == 2 && nn == iov[0].iov_len)
--	   nn += send(so->s, iov[1].iov_base, iov[1].iov_len,0);
-+	if (n == 2 && nn == iov[0].iov_len) {
-+            int ret;
-+            ret = send(so->s, iov[1].iov_base, iov[1].iov_len,0);
-+            if (ret > 0)
-+                nn += ret;
-+        }
-         DEBUG_MISC((dfd, "  ... wrote nn = %d bytes\n", nn));
- #endif
- 	
-diff -ruN /qemu-0.6.1/work/qemu-0.6.1/target-i386/translate.c qemu-snapshot-2004-11-26_23/target-i386/translate.c
---- /qemu-0.6.1/work/qemu-0.6.1/target-i386/translate.c	2004-11-14 21:51:33.000000000 +0100
-+++ qemu-snapshot-2004-11-26_23/target-i386/translate.c	2004-11-24 20:28:52.000000000 +0100
-@@ -2958,6 +2958,8 @@
-                 gen_op_fmov_ST0_STN((opreg + 1) & 7);
-                 break;
-             case 0x09: /* fxchg sti */
-+            case 0x29: /* fxchg4 sti, undocumented op */
-+            case 0x39: /* fxchg7 sti, undocumented op */
-                 gen_op_fxchg_ST0_STN(opreg);
-                 break;
-             case 0x0a: /* grp d9/2 */
-@@ -3104,10 +3106,13 @@
-                 }
-                 break;
-             case 0x02: /* fcom */
-+            case 0x22: /* fcom2, undocumented op */
-                 gen_op_fmov_FT0_STN(opreg);
-                 gen_op_fcom_ST0_FT0();
-                 break;
-             case 0x03: /* fcomp */
-+            case 0x23: /* fcomp3, undocumented op */
-+            case 0x32: /* fcomp5, undocumented op */
-                 gen_op_fmov_FT0_STN(opreg);
-                 gen_op_fcom_ST0_FT0();
-                 gen_op_fpop();
-@@ -3163,6 +3168,9 @@
-                 gen_op_fmov_STN_ST0(opreg);
-                 break;
-             case 0x2b: /* fstp sti */
-+            case 0x0b: /* fstp1 sti, undocumented op */
-+            case 0x3a: /* fstp8 sti, undocumented op */
-+            case 0x3b: /* fstp9 sti, undocumented op */
-                 gen_op_fmov_STN_ST0(opreg);
-                 gen_op_fpop();
-                 break;
-@@ -3187,6 +3195,10 @@
-                     goto illegal_op;
-                 }
-                 break;
-+            case 0x38: /* ffreep sti, undocumented op */
-+                gen_op_ffree_STN(opreg);
-+                gen_op_fpop();
-+                break;
-             case 0x3c: /* df/4 */
-                 switch(rm) {
-                 case 0:
-diff -ruN /qemu-0.6.1/work/qemu-0.6.1/vl.c qemu-snapshot-2004-11-26_23/vl.c
---- /qemu-0.6.1/work/qemu-0.6.1/vl.c	2004-11-14 21:51:33.000000000 +0100
-+++ qemu-snapshot-2004-11-26_23/vl.c	2004-11-16 02:45:27.000000000 +0100
-@@ -2537,7 +2537,8 @@
-            "-s              wait gdb connection to port %d\n"
-            "-p port         change gdb connection port\n"
-            "-d item1,...    output log to %s (use -d ? for a list of log items)\n"
--           "-hdachs c,h,s   force hard disk 0 geometry (usually qemu can guess it)\n"
-+           "-hdachs c,h,s[,t]  force hard disk 0 physical geometry and the optional BIOS\n"
-+           "                translation (t=none or lba) (usually qemu can guess them)\n"
-            "-L path         set the directory for the BIOS and VGA BIOS\n"
- #ifdef USE_CODE_COPY
-            "-no-code-copy   disable code copy acceleration\n"
-@@ -2753,7 +2754,7 @@
-     const char *hd_filename[MAX_DISKS], *fd_filename[MAX_FD];
-     const char *kernel_filename, *kernel_cmdline;
-     DisplayState *ds = &display_state;
--    int cyls, heads, secs;
-+    int cyls, heads, secs, translation;
-     int start_emulation = 1;
-     uint8_t macaddr[6];
-     int net_if_type, nb_tun_fds, tun_fds[MAX_NICS];
-@@ -2788,6 +2789,7 @@
-     kernel_cmdline = "";
-     has_cdrom = 1;
-     cyls = heads = secs = 0;
-+    translation = BIOS_ATA_TRANSLATION_AUTO;
-     pstrcpy(monitor_device, sizeof(monitor_device), "vc");
- 
-     pstrcpy(serial_devices[0], sizeof(serial_devices[0]), "vc");
-@@ -2857,17 +2859,34 @@
-                     const char *p;
-                     p = optarg;
-                     cyls = strtol(p, (char **)&p, 0);
-+                    if (cyls < 1 || cyls > 16383)
-+                        goto chs_fail;
-                     if (*p != ',')
-                         goto chs_fail;
-                     p++;
-                     heads = strtol(p, (char **)&p, 0);
-+                    if (heads < 1 || heads > 16)
-+                        goto chs_fail;
-                     if (*p != ',')
-                         goto chs_fail;
-                     p++;
-                     secs = strtol(p, (char **)&p, 0);
--                    if (*p != '\0') {
-+                    if (secs < 1 || secs > 63)
-+                        goto chs_fail;
-+                    if (*p == ',') {
-+                        p++;
-+                        if (!strcmp(p, "none"))
-+                            translation = BIOS_ATA_TRANSLATION_NONE;
-+                        else if (!strcmp(p, "lba"))
-+                            translation = BIOS_ATA_TRANSLATION_LBA;
-+                        else if (!strcmp(p, "auto"))
-+                            translation = BIOS_ATA_TRANSLATION_AUTO;
-+                        else
-+                            goto chs_fail;
-+                    } else if (*p != '\0') {
-                     chs_fail:
--                        cyls = 0;
-+                        fprintf(stderr, "qemu: invalid physical CHS format\n");
-+                        exit(1);
-                     }
-                 }
-                 break;
-@@ -3230,8 +3249,10 @@
-                         hd_filename[i]);
-                 exit(1);
-             }
--            if (i == 0 && cyls != 0) 
-+            if (i == 0 && cyls != 0) {
-                 bdrv_set_geometry_hint(bs_table[i], cyls, heads, secs);
-+                bdrv_set_translation_hint(bs_table[i], translation);
-+            }
-         }
-     }
- 
-diff -ruN /qemu-0.6.1/work/qemu-0.6.1/vl.h qemu-snapshot-2004-11-26_23/vl.h
---- /qemu-0.6.1/work/qemu-0.6.1/vl.h	2004-11-14 21:51:33.000000000 +0100
-+++ qemu-snapshot-2004-11-26_23/vl.h	2004-11-16 02:45:27.000000000 +0100
-@@ -383,13 +383,18 @@
- #define BDRV_TYPE_HD     0
- #define BDRV_TYPE_CDROM  1
- #define BDRV_TYPE_FLOPPY 2
-+#define BIOS_ATA_TRANSLATION_AUTO 0
-+#define BIOS_ATA_TRANSLATION_NONE 1
-+#define BIOS_ATA_TRANSLATION_LBA  2
- 
- void bdrv_set_geometry_hint(BlockDriverState *bs, 
-                             int cyls, int heads, int secs);
- void bdrv_set_type_hint(BlockDriverState *bs, int type);
-+void bdrv_set_translation_hint(BlockDriverState *bs, int translation);
- void bdrv_get_geometry_hint(BlockDriverState *bs, 
-                             int *pcyls, int *pheads, int *psecs);
- int bdrv_get_type_hint(BlockDriverState *bs);
-+int bdrv_get_translation_hint(BlockDriverState *bs);
- int bdrv_is_removable(BlockDriverState *bs);
- int bdrv_is_read_only(BlockDriverState *bs);
- int bdrv_is_inserted(BlockDriverState *bs);
diff --git a/app-emulation/qemu/files/qemu-0.7.0-errno.patch b/app-emulation/qemu/files/qemu-0.7.0-errno.patch
deleted file mode 100644
index 291adc1725b5..000000000000
--- a/app-emulation/qemu/files/qemu-0.7.0-errno.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN qemu-0.7.0.orig/target-i386/helper2.c qemu-0.7.0/target-i386/helper2.c
---- qemu-0.7.0.orig/target-i386/helper2.c	2005-04-27 22:52:05.000000000 +0200
-+++ qemu-0.7.0/target-i386/helper2.c	2005-05-25 22:07:50.000000000 +0200
-@@ -17,6 +17,7 @@
-  * License along with this library; if not, write to the Free Software
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-+#include <errno.h>
- #include <stdarg.h>
- #include <stdlib.h>
- #include <stdio.h>
diff --git a/app-emulation/qemu/qemu-0.6.1-r1.ebuild b/app-emulation/qemu/qemu-0.6.1-r1.ebuild
deleted file mode 100644
index 5cd56588711a..000000000000
--- a/app-emulation/qemu/qemu-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.6.1-r1.ebuild,v 1.4 2005/01/01 14:16:15 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator"
-HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
-SRC_URI="http://fabrice.bellard.free.fr/qemu/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~ppc -alpha -sparc ~amd64"
-IUSE="softmmu sdl" # nptl qemu-fast nptlonly"
-RESTRICT="nostrip"
-
-DEPEND="virtual/libc
-	sdl? ( media-libs/libsdl )
-	app-text/texi2html"
-RDEPEND=""
-
-set_target_list() {
-	TARGET_LIST="arm-user i386-user ppc-user sparc-user" #i386-softmmu ppc-softmmu
-	use softmmu && TARGET_LIST="${TARGET_LIST} i386-softmmu ppc-softmmu"
-#	use qemu-fast && \
-#		if use nptl # && use nptlonly
-#		then
-#			ewarn "qemu-fast won't build with nptl, useflag disabled"
-#		else
-#			if use sdl ; then
-#				ewarn "qemu-fast enabled beware you need every library that"
-#				ewarn "qemu would link compiled static you may need to emerge"
-#				ewarn "again alsa-lib and nas"
-#			fi
-#			TARGET_LIST="${TARGET_LIST} i386"
-#		fi
-	export TARGET_LIST
-}
-
-#RUNTIME_PATH="/emul/gnemul/"
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-20041126.patch
-	cd ${S}
-}
-
-src_compile() {
-	set_target_list
-#		--interp-prefix=${RUNTIME_PATH}/qemu-%M
-	./configure \
-		--prefix=/usr \
-		--target-list="${TARGET_LIST}" \
-		--enable-slirp \
-		`use_enable sdl`\
-		|| die "could not configure"
-	make || 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."
-	use softmmu || \
-	(
-	ewarn "You have the softmmu useflag disabled."
-	ewarn "In order to have the full system emulator (qemu) you have"
-	ewarn "to emerge qemu again with the softmmu useflag enabled"
-	)
-}
diff --git a/app-emulation/qemu/qemu-0.6.1.ebuild b/app-emulation/qemu/qemu-0.6.1.ebuild
deleted file mode 100644
index a4e43ae4670b..000000000000
--- a/app-emulation/qemu/qemu-0.6.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.6.1.ebuild,v 1.5 2005/01/01 14:16:15 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator"
-HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
-SRC_URI="http://fabrice.bellard.free.fr/qemu/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ppc -alpha -sparc"
-IUSE="softmmu sdl" # nptl qemu-fast nptlonly"
-RESTRICT="nostrip"
-
-DEPEND="virtual/libc
-	sdl? ( media-libs/libsdl )"
-RDEPEND=""
-
-set_target_list() {
-	TARGET_LIST="arm-user i386-user ppc-user sparc-user" #i386-softmmu ppc-softmmu
-	use softmmu && TARGET_LIST="${TARGET_LIST} i386-softmmu ppc-softmmu"
-#	use qemu-fast && \
-#		if use nptl # && use nptlonly
-#		then
-#			ewarn "qemu-fast won't build with nptl, useflag disabled"
-#		else
-#			if use sdl ; then
-#				ewarn "qemu-fast enabled beware you need every library that"
-#				ewarn "qemu would link compiled static you may need to emerge"
-#				ewarn "again alsa-lib and nas"
-#			fi
-#			TARGET_LIST="${TARGET_LIST} i386"
-#		fi
-	export TARGET_LIST
-}
-
-#RUNTIME_PATH="/emul/gnemul/"
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	set_target_list
-#		--interp-prefix=${RUNTIME_PATH}/qemu-%M
-	./configure \
-		--prefix=/usr \
-		--target-list="${TARGET_LIST}" \
-		--enable-slirp \
-		`use_enable sdl`\
-		|| die "could not configure"
-	make || 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."
-	use softmmu || \
-	(
-	ewarn "You have the softmmu useflag disabled."
-	ewarn "In order to have the full system emulator (qemu) you have"
-	ewarn "to emerge qemu again with the softmmu useflag enabled"
-	)
-}
diff --git a/app-emulation/qemu/qemu-0.7.0-r1.ebuild b/app-emulation/qemu/qemu-0.7.0-r1.ebuild
deleted file mode 100644
index f7bb3bafb1ed..000000000000
--- a/app-emulation/qemu/qemu-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.7.0-r1.ebuild,v 1.2 2005/12/05 20:01:28 dang Exp $
-
-DESCRIPTION="qemu emulator and abi wrapper meta ebuild"
-HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="~app-emulation/qemu-softmmu-${PV}
-		~app-emulation/qemu-user-${PV}
-		!<=app-emulation/qemu-0.7.0"
-
diff --git a/app-emulation/qemu/qemu-0.7.1.ebuild b/app-emulation/qemu/qemu-0.7.1.ebuild
deleted file mode 100644
index f146d6a62f17..000000000000
--- a/app-emulation/qemu/qemu-0.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.7.1.ebuild,v 1.2 2005/12/05 20:01:28 dang Exp $
-
-DESCRIPTION="qemu emulator and abi wrapper meta ebuild"
-HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="~app-emulation/qemu-softmmu-${PV}
-		~app-emulation/qemu-user-${PV}
-		!<=app-emulation/qemu-0.7.0"
-
diff --git a/app-emulation/qemu/qemu-0.7.2.ebuild b/app-emulation/qemu/qemu-0.7.2.ebuild
deleted file mode 100644
index 7bd134727867..000000000000
--- a/app-emulation/qemu/qemu-0.7.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.7.2.ebuild,v 1.1 2005/09/11 02:30:43 lu_zero Exp $
-
-DESCRIPTION="qemu emulator and abi wrapper meta ebuild"
-HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE=""
-
-DEPEND="~app-emulation/qemu-softmmu-${PV}
-		~app-emulation/qemu-user-${PV}
-		!<=app-emulation/qemu-0.7.0"
-