fix bug #185170

Package-Manager: portage-2.1.3_rc8

4 files changed, 30 insertions, 20 deletions

diff --git a/app-emulation/kqemu/ChangeLog b/app-emulation/kqemu/ChangeLog
index 9879b3752ff2..e113eb880bf8 100644
--- a/app-emulation/kqemu/ChangeLog
+++ b/app-emulation/kqemu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/kqemu
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/ChangeLog,v 1.20 2007/07/02 13:59:28 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/ChangeLog,v 1.21 2007/07/27 18:46:26 lu_zero Exp $
+
+  27 Jul 2007; Luca Barbato <lu_zero@gentoo.org>
+  +files/kqemu-1.3.0_pre11-sched_h.patch, kqemu-1.3.0_pre11.ebuild:
+  fix bug #185170, using the same patch as reported in DebianBug#434031,
+  thanks to Dominik Paulus <dominik.paulus@web.de> for pointing it
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> kqemu-0.7.2.ebuild,
   kqemu-1.3.0_pre5.ebuild, kqemu-1.3.0_pre7.ebuild, kqemu-1.3.0_pre9.ebuild,
diff --git a/app-emulation/kqemu/Manifest b/app-emulation/kqemu/Manifest
index 43972cc6298d..4b43d419380e 100644
--- a/app-emulation/kqemu/Manifest
+++ b/app-emulation/kqemu/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX kqemu-1.3.0_pre11-sched_h.patch 329 RMD160 2199965106d45c2f7b9a39b9274c051f72d418e1 SHA1 4150f3ae845612a78de27d74b8f66cd0943268e7 SHA256 e40434e2bcd8be18dfa29fc4a8a59c29c5c3287d2d93000eb05e75c0d962ab2e
+MD5 726b01cb933f8c9c7e7a150343e37342 files/kqemu-1.3.0_pre11-sched_h.patch 329
+RMD160 2199965106d45c2f7b9a39b9274c051f72d418e1 files/kqemu-1.3.0_pre11-sched_h.patch 329
+SHA256 e40434e2bcd8be18dfa29fc4a8a59c29c5c3287d2d93000eb05e75c0d962ab2e files/kqemu-1.3.0_pre11-sched_h.patch 329
 AUX kqemu-1.3.0_pre5-fix_module_parm.patch 686 RMD160 974dd24dfb1405043bc20ab218d42443e6a6cf3c SHA1 d05ed564696bdf0db9c587ee8364fd8033e9b750 SHA256 47166817cfcfa7dbf3293703f25b39ad6da9fb403754b929e949278f42529915
 MD5 bd6fecaea94c6bdf922a4661ba2f0cd3 files/kqemu-1.3.0_pre5-fix_module_parm.patch 686
 RMD160 974dd24dfb1405043bc20ab218d42443e6a6cf3c files/kqemu-1.3.0_pre5-fix_module_parm.patch 686
@@ -15,10 +16,10 @@ EBUILD kqemu-0.7.2.ebuild 2628 RMD160 d9fa0e8b83d92eedcf879714b21f70376bf46dbf S
 MD5 dcfaa6e89aeb3eeea156455845c8e4d0 kqemu-0.7.2.ebuild 2628
 RMD160 d9fa0e8b83d92eedcf879714b21f70376bf46dbf kqemu-0.7.2.ebuild 2628
 SHA256 c20127d0063ef1bf1585c9f58f57ec1b85f443799525a884cbf844ec08632c06 kqemu-0.7.2.ebuild 2628
-EBUILD kqemu-1.3.0_pre11.ebuild 1826 RMD160 0102dae5a127f362ac605c253f17a1c319851d87 SHA1 046a0d028e4fcc678ea2e94fea13ced4bbeb5619 SHA256 3a16502253a218922ea1046bfd225429c042079af231e4ed7cd37436db4dc6b6
-MD5 d5d3c694f236bb5f74fb9006dee7fb05 kqemu-1.3.0_pre11.ebuild 1826
-RMD160 0102dae5a127f362ac605c253f17a1c319851d87 kqemu-1.3.0_pre11.ebuild 1826
-SHA256 3a16502253a218922ea1046bfd225429c042079af231e4ed7cd37436db4dc6b6 kqemu-1.3.0_pre11.ebuild 1826
+EBUILD kqemu-1.3.0_pre11.ebuild 1867 RMD160 6ad6ab19d8bc967d41f9a3a814aa79aadf66e4e5 SHA1 0b1f33631574e001c75d7bd2e1eaa39b64ca0c30 SHA256 1b4f353cea9b0a5bb16449d43f1460aeef6260c782dca6b40365d77faa8e24b4
+MD5 f947dc9dfd6d50639bc6ef5b30023f8c kqemu-1.3.0_pre11.ebuild 1867
+RMD160 6ad6ab19d8bc967d41f9a3a814aa79aadf66e4e5 kqemu-1.3.0_pre11.ebuild 1867
+SHA256 1b4f353cea9b0a5bb16449d43f1460aeef6260c782dca6b40365d77faa8e24b4 kqemu-1.3.0_pre11.ebuild 1867
 EBUILD kqemu-1.3.0_pre5.ebuild 1749 RMD160 d057f5b53d79b223ecb8f08ab26ce4daf9724974 SHA1 f844b26e1dde62e5bd60e2de51e50c4ac4cf2d0d SHA256 21817506c76bd0148cf1b7382c190803d9b7b2be7759272027161835ea02be14
 MD5 fbe05b919f8a2944868e3b329f0a7e14 kqemu-1.3.0_pre5.ebuild 1749
 RMD160 d057f5b53d79b223ecb8f08ab26ce4daf9724974 kqemu-1.3.0_pre5.ebuild 1749
@@ -31,10 +32,10 @@ EBUILD kqemu-1.3.0_pre9.ebuild 2034 RMD160 148accd1e8bf8f7ab040e6e97bdfa95091b9f
 MD5 2423da799a56e7d4f8222e5946e8430e kqemu-1.3.0_pre9.ebuild 2034
 RMD160 148accd1e8bf8f7ab040e6e97bdfa95091b9f300 kqemu-1.3.0_pre9.ebuild 2034
 SHA256 a9c0feed8020d4753d32fbe1d8140468439e273ec3c01bf20f23598a6bc9fb77 kqemu-1.3.0_pre9.ebuild 2034
-MISC ChangeLog 2985 RMD160 599308b63f8aed7bb05f61d4a45363c47d39c514 SHA1 9a8825235619c66a471e92a34bb9640b0830901c SHA256 d8fc9a3bd673e2b0251989965f68fff382849a88a05a17b847ff2580a77f63a2
-MD5 de539843ae67e5f5fae092e0d52b3705 ChangeLog 2985
-RMD160 599308b63f8aed7bb05f61d4a45363c47d39c514 ChangeLog 2985
-SHA256 d8fc9a3bd673e2b0251989965f68fff382849a88a05a17b847ff2580a77f63a2 ChangeLog 2985
+MISC ChangeLog 3245 RMD160 627522f417be28ab3a0f5d7323e191f4409b4abb SHA1 e2fdc59389cf4181bfbe52c96e53863225282a4d SHA256 e5c358573288aef5d2cab790b5d6e27dfa4b6917c51cd1388fdb00a6b277965c
+MD5 2577c51504c04d44a6c68f1079ae623f ChangeLog 3245
+RMD160 627522f417be28ab3a0f5d7323e191f4409b4abb ChangeLog 3245
+SHA256 e5c358573288aef5d2cab790b5d6e27dfa4b6917c51cd1388fdb00a6b277965c ChangeLog 3245
 MISC metadata.xml 223 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 SHA1 fcf66d2b271369d296150dde06603d850623ed27 SHA256 64a96c3c9929aec46b50a63ae1fd8c46cef4a8423f448d6f6fff09e20510c98b
 MD5 898131aae735c3477ff2f9c6882f1178 metadata.xml 223
 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 metadata.xml 223
@@ -54,10 +55,3 @@ SHA256 22e6cdceb2dfe13833178041b4998ceffeb10dcba8629f7afd2835d91556e53d files/di
 MD5 37a58f187935cc508ca5425447c33342 files/digest-kqemu-1.3.0_pre9 247
 RMD160 51f7c3f6eebaf106e2e8f405d9df74ac91d49be2 files/digest-kqemu-1.3.0_pre9 247
 SHA256 6352bda7343f9aa719dcaa0a5ea9a37ab73b9bc6f35e0d373aba457785b18179 files/digest-kqemu-1.3.0_pre9 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGiQTIppoStNGKGywRAi+qAKCCYRmaZhwKPY2zatImcfQlpN7blgCcDFFx
-KMOcO5HmEL5Zh4+CGloqlTI=
-=v9/x
------END PGP SIGNATURE-----
diff --git a/app-emulation/kqemu/files/kqemu-1.3.0_pre11-sched_h.patch b/app-emulation/kqemu/files/kqemu-1.3.0_pre11-sched_h.patch
new file mode 100644
index 000000000000..575c9b50bb37
--- /dev/null
+++ b/app-emulation/kqemu/files/kqemu-1.3.0_pre11-sched_h.patch
@@ -0,0 +1,10 @@
+--- kqemu-linux.c       2007-07-25 13:41:52.000000000 +0200
++++ kqemu-linux.c.new   2007-07-25 14:02:00.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include <linux/ioctl.h>
+ #include <linux/smp_lock.h>
+ #include <linux/miscdevice.h>
++#include <linux/sched.h>
+ #include <asm/atomic.h>
+ #include <asm/processor.h>
+ #include <asm/uaccess.h>
diff --git a/app-emulation/kqemu/kqemu-1.3.0_pre11.ebuild b/app-emulation/kqemu/kqemu-1.3.0_pre11.ebuild
index 64dedfba9d0d..536d06c50c84 100644
--- a/app-emulation/kqemu/kqemu-1.3.0_pre11.ebuild
+++ b/app-emulation/kqemu/kqemu-1.3.0_pre11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/kqemu-1.3.0_pre11.ebuild,v 1.4 2007/07/02 13:59:28 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/kqemu-1.3.0_pre11.ebuild,v 1.5 2007/07/27 18:46:26 lu_zero Exp $
 
 inherit eutils flag-o-matic linux-mod toolchain-funcs
 
@@ -29,6 +29,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch ${FILESDIR}/${P}-sched_h.patch
 	sed -i 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' kqemu-linux.c
 }