Grab fixes from upstream for building with newer kernels #163740 by Leo.

(Portage version: 2.1.2-r4)

3 files changed, 164 insertions, 4 deletions

diff --git a/dev-libs/linux-fusion/ChangeLog b/dev-libs/linux-fusion/ChangeLog
index f8d2956ef52c..f6c99e9d3128 100644
--- a/dev-libs/linux-fusion/ChangeLog
+++ b/dev-libs/linux-fusion/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/linux-fusion
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/linux-fusion/ChangeLog,v 1.3 2006/11/26 18:16:26 vapier Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/linux-fusion/ChangeLog,v 1.4 2007/01/27 11:26:05 vapier Exp $
+
+  27 Jan 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/linux-fusion-3.2-newer-kernel.patch, linux-fusion-3.2-r1.ebuild:
+  Grab fixes from upstream for building with newer kernels #163740 by Leo.
 
 *linux-fusion-3.2-r1 (26 Nov 2006)
 
diff --git a/dev-libs/linux-fusion/files/linux-fusion-3.2-newer-kernel.patch b/dev-libs/linux-fusion/files/linux-fusion-3.2-newer-kernel.patch
new file mode 100644
index 000000000000..d3a64b26df1d
--- /dev/null
+++ b/dev-libs/linux-fusion/files/linux-fusion-3.2-newer-kernel.patch
@@ -0,0 +1,155 @@
+Fixes ripped from upstream cvs
+
+http://bugs.gentoo.org/163740
+
+--- linux-fusion-3.2/linux/drivers/char/fusion/call.c
++++ linux-fusion-3.2/linux/drivers/char/fusion/call.c
+@@ -12,7 +12,9 @@
+  *	2 of the License, or (at your option) any later version.
+  */
+ 
++#ifdef HAVE_LINUX_CONFIG_H
+ #include <linux/config.h>
++#endif
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+--- linux-fusion-3.2/linux/drivers/char/fusion/entries.c
++++ linux-fusion-3.2/linux/drivers/char/fusion/entries.c
+@@ -12,7 +12,9 @@
+  *	2 of the License, or (at your option) any later version.
+  */
+ 
++#ifdef HAVE_LINUX_CONFIG_H
+ #include <linux/config.h>
++#endif
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+--- linux-fusion-3.2/linux/drivers/char/fusion/fusiondev.c
++++ linux-fusion-3.2/linux/drivers/char/fusion/fusiondev.c
+@@ -14,7 +14,9 @@
+ 
+ #include <linux/version.h>
+ #include <linux/module.h>
++#ifdef HAVE_LINUX_CONFIG_H
+ #include <linux/config.h>
++#endif
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/fs.h>
+@@ -22,6 +24,11 @@
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)
+ #include <linux/devfs_fs_kernel.h>
+ #endif
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 19)
++#include <linux/page-flags.h>
++#include <linux/mm.h>
++#endif
++
+ #include <linux/proc_fs.h>
+ #include <linux/poll.h>
+ #include <linux/init.h>
+--- linux-fusion-3.2/linux/drivers/char/fusion/fusionee.c
++++ linux-fusion-3.2/linux/drivers/char/fusion/fusionee.c
+@@ -12,7 +12,9 @@
+  *	2 of the License, or (at your option) any later version.
+  */
+ 
++#ifdef HAVE_LINUX_CONFIG_H
+ #include <linux/config.h>
++#endif
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+--- linux-fusion-3.2/linux/drivers/char/fusion/property.c
++++ linux-fusion-3.2/linux/drivers/char/fusion/property.c
+@@ -12,7 +12,9 @@
+  *	2 of the License, or (at your option) any later version.
+  */
+ 
++#ifdef HAVE_LINUX_CONFIG_H
+ #include <linux/config.h>
++#endif
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+--- linux-fusion-3.2/linux/drivers/char/fusion/reactor.c
++++ linux-fusion-3.2/linux/drivers/char/fusion/reactor.c
+@@ -12,7 +12,9 @@
+  *	2 of the License, or (at your option) any later version.
+  */
+ 
++#ifdef HAVE_LINUX_CONFIG_H
+ #include <linux/config.h>
++#endif
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+--- linux-fusion-3.2/linux/drivers/char/fusion/ref.c
++++ linux-fusion-3.2/linux/drivers/char/fusion/ref.c
+@@ -12,7 +12,9 @@
+  *	2 of the License, or (at your option) any later version.
+  */
+ 
++#ifdef HAVE_LINUX_CONFIG_H
+ #include <linux/config.h>
++#endif
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+--- linux-fusion-3.2/linux/drivers/char/fusion/shmpool.c
++++ linux-fusion-3.2/linux/drivers/char/fusion/shmpool.c
+@@ -12,7 +12,9 @@
+  *	2 of the License, or (at your option) any later version.
+  */
+ 
++#ifdef HAVE_LINUX_CONFIG_H
+ #include <linux/config.h>
++#endif
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+--- linux-fusion-3.2/linux/drivers/char/fusion/skirmish.c
++++ linux-fusion-3.2/linux/drivers/char/fusion/skirmish.c
+@@ -12,7 +12,9 @@
+  *	2 of the License, or (at your option) any later version.
+  */
+ 
++#ifdef HAVE_LINUX_CONFIG_H
+ #include <linux/config.h>
++#endif
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+--- linux-fusion-3.2/linux/drivers/char/fusion/types.h
++++ linux-fusion-3.2/linux/drivers/char/fusion/types.h
+@@ -15,9 +15,15 @@
+ #ifndef __FUSION__TYPES_H__
+ #define __FUSION__TYPES_H__
+ 
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18)
+ typedef enum {
+   false = 0,
+   true  = !false
+ } bool;
++#endif
++
++
+ 
+ #endif
+--- linux-fusion-3.2/Makefile
++++ linux-fusion-3.2/Makefile
+@@ -17,6 +17,10 @@
+   AUTOCONF_H = -include $(KERNEL_BUILD)/include/linux/autoconf.h
+ endif
+ 
++ifeq ($(shell test -e $(KERNEL_BUILD)/include/linux/config.h && echo yes),yes)
++  CPPFLAGS += -DHAVE_LINUX_CONFIG_H
++endif
++
+ .PHONY: all install clean
+ 
+ all:
diff --git a/dev-libs/linux-fusion/linux-fusion-3.2-r1.ebuild b/dev-libs/linux-fusion/linux-fusion-3.2-r1.ebuild
index 6bebe9c6dcb1..8bab905c4000 100644
--- a/dev-libs/linux-fusion/linux-fusion-3.2-r1.ebuild
+++ b/dev-libs/linux-fusion/linux-fusion-3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/linux-fusion/linux-fusion-3.2-r1.ebuild,v 1.1 2006/11/26 18:16:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/linux-fusion/linux-fusion-3.2-r1.ebuild,v 1.2 2007/01/27 11:26:05 vapier Exp $
 
 inherit linux-mod
 
@@ -24,6 +24,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/linux-fusion-3.2-newer-kernel.patch #163740
 	convert_to_m Makefile
 }