patch for 2.6.16

(Portage version: 2.1_pre7-r3)

4 files changed, 43 insertions, 5 deletions

diff --git a/app-emulation/kqemu/ChangeLog b/app-emulation/kqemu/ChangeLog
index cba178ec7d43..8a7f88946a0b 100644
--- a/app-emulation/kqemu/ChangeLog
+++ b/app-emulation/kqemu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/kqemu
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/ChangeLog,v 1.5 2006/03/29 10:46:51 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/ChangeLog,v 1.6 2006/04/02 10:25:27 lu_zero Exp $
+
+  02 Apr 2006; Luca Barbato <lu_zero@gentoo.org>
+  +files/kqemu-1.3.0_pre5-fix_module_parm.patch, kqemu-1.3.0_pre5.ebuild:
+  fix for upcoming kernels, from Joshua Baergen <joshuabaergen@gentoo.org>
 
 *kqemu-1.3.0_pre5 (29 Mar 2006)
 
diff --git a/app-emulation/kqemu/Manifest b/app-emulation/kqemu/Manifest
index 7c1a3ee9b25b..8b7fb80fc930 100644
--- a/app-emulation/kqemu/Manifest
+++ b/app-emulation/kqemu/Manifest
@@ -7,12 +7,15 @@ SHA256 1485b96ba066b0f14fb7c6fe6988e7abf7a3de56e19a7108cf039c5adf09623a files/di
 MD5 7233a99c9a7842fd87d0d8f6d372aac0 files/digest-kqemu-1.3.0_pre5 247
 RMD160 7817cc90713d7c23efb3bbb76da39e45e138a802 files/digest-kqemu-1.3.0_pre5 247
 SHA256 8a721e142d22defb401e16a7280e0e055e9484fa9cf913f8aac89e59ccb6a761 files/digest-kqemu-1.3.0_pre5 247
+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
+SHA256 47166817cfcfa7dbf3293703f25b39ad6da9fb403754b929e949278f42529915 files/kqemu-1.3.0_pre5-fix_module_parm.patch 686
 MD5 a3bbd803fb3b182c28cf3091ee026b2b kqemu-0.7.2.ebuild 2554
 RMD160 3acda96faa2bf8437a8a91f80297658ca12f59d8 kqemu-0.7.2.ebuild 2554
 SHA256 3805d18c96a80eb547bd4c37dc47c0c1313426434063f0a86cc97a8ba22f17a6 kqemu-0.7.2.ebuild 2554
-MD5 af3f9fb50e53205a9a937a7ea5e8c783 kqemu-1.3.0_pre5.ebuild 1664
-RMD160 c735c820797b41ba5cba98640cf1eb77b5fb89f4 kqemu-1.3.0_pre5.ebuild 1664
-SHA256 828f17b356ebd2d3dcd8ca6ed14ec7d6575a8094756245bb224b86c62a0f0943 kqemu-1.3.0_pre5.ebuild 1664
+MD5 42e7b48585e030159149586c123231c8 kqemu-1.3.0_pre5.ebuild 1753
+RMD160 b3615b8d8c4889e26e5d379af3eb1dbe2f2c6cc0 kqemu-1.3.0_pre5.ebuild 1753
+SHA256 7517e50ea6768a067a4b8e93b6894e071d53a01b9dc89cb30ab2d00987d58b6f kqemu-1.3.0_pre5.ebuild 1753
 MD5 898131aae735c3477ff2f9c6882f1178 metadata.xml 223
 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 metadata.xml 223
 SHA256 64a96c3c9929aec46b50a63ae1fd8c46cef4a8423f448d6f6fff09e20510c98b metadata.xml 223
diff --git a/app-emulation/kqemu/files/kqemu-1.3.0_pre5-fix_module_parm.patch b/app-emulation/kqemu/files/kqemu-1.3.0_pre5-fix_module_parm.patch
new file mode 100644
index 000000000000..414b00cc1b69
--- /dev/null
+++ b/app-emulation/kqemu/files/kqemu-1.3.0_pre5-fix_module_parm.patch
@@ -0,0 +1,25 @@
+--- kqemu-linux.c	2006-03-27 13:58:01.000000000 -0700
++++ kqemu-linux.c.new	2006-04-01 23:10:54.754966655 -0700
+@@ -3,6 +3,9 @@
+  * Copyright (c) 2004-2005 Fabrice Bellard
+  */
+ #include <linux/module.h>
++#ifndef MODULE_PARM
++	#include <linux/moduleparam.h>
++#endif
+ #include <linux/types.h>
+ #include <linux/errno.h>
+ #include <linux/fs.h>
+@@ -48,7 +51,11 @@
+ /* if 0 is used, then devfs/udev is used to automatically create the
+    device */
+ int major = 250;
+-MODULE_PARM(major,"i");
++#ifdef MODULE_PARM
++	MODULE_PARM(major,"i");
++#else
++	module_param(major, int, 0444);
++#endif
+ 
+ /* lock the page at virtual address 'user_addr' and return its
+    page index. Return -1 if error */
diff --git a/app-emulation/kqemu/kqemu-1.3.0_pre5.ebuild b/app-emulation/kqemu/kqemu-1.3.0_pre5.ebuild
index 89cd0767425d..d908e6760eed 100644
--- a/app-emulation/kqemu/kqemu-1.3.0_pre5.ebuild
+++ b/app-emulation/kqemu/kqemu-1.3.0_pre5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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_pre5.ebuild,v 1.1 2006/03/29 10:46:51 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kqemu/kqemu-1.3.0_pre5.ebuild,v 1.2 2006/04/02 10:25:27 lu_zero Exp $
 
 inherit eutils flag-o-matic linux-mod toolchain-funcs
 
@@ -31,6 +31,12 @@ pkg_setup() {
 	einfo "if you would like to see it released under the GPL"
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${P}-fix_module_parm.patch"
+}
+
 src_compile() {
 	#Let the application set its cflags
 	unset CFLAGS