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

Package-Manager: portage-2.1.2-r4

4 files changed, 180 insertions, 16 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/Manifest b/dev-libs/linux-fusion/Manifest
index ffee75be1e6f..7008d1592331 100644
--- a/dev-libs/linux-fusion/Manifest
+++ b/dev-libs/linux-fusion/Manifest
@@ -5,15 +5,19 @@ AUX fusion.udev 69 RMD160 03f2273ba98a7662b65fce14f05b02e5e18239ce SHA1 f6f0a8a5
 MD5 807945b2defe80e43301e4dac97c2bcc files/fusion.udev 69
 RMD160 03f2273ba98a7662b65fce14f05b02e5e18239ce files/fusion.udev 69
 SHA256 ad02dcd8c95bb1e3b0f391021cee3cb9390157a4d2467c5d0792d051190b7222 files/fusion.udev 69
+AUX linux-fusion-3.2-newer-kernel.patch 4087 RMD160 c102004336764b911adbbc692e60be6f3cdf1121 SHA1 0d12f9ed6f4db1cddfcbfaf265c4c0e441eac47f SHA256 5797e04ffa1d7a46fbb29898417681983c7a514fd325bd4caaf9388141fde6ad
+MD5 203f7b677d0238b3af6d335acd0ff408 files/linux-fusion-3.2-newer-kernel.patch 4087
+RMD160 c102004336764b911adbbc692e60be6f3cdf1121 files/linux-fusion-3.2-newer-kernel.patch 4087
+SHA256 5797e04ffa1d7a46fbb29898417681983c7a514fd325bd4caaf9388141fde6ad files/linux-fusion-3.2-newer-kernel.patch 4087
 DIST linux-fusion-3.2.tar.gz 121884 RMD160 8aa7bac228a6b6edd6e60441bdb6fa55f3e63ac2 SHA1 ff4cb0d98edeb10723caf1f73b40a5a194d7c07b SHA256 6a54cc21cf53be919ea9274a4a7703c3d6b7dc56354c9ff02d54d0a411fce993
-EBUILD linux-fusion-3.2-r1.ebuild 1025 RMD160 16745b338304ee52d13eb9a1a085858faf9a1f7e SHA1 29f16787b08945d6fd33522bf6956f521cc10220 SHA256 e757ced857544fb237e9632646b4517e959a17bd325ff574f5e3b04716925c86
-MD5 b62d6fc7bc187b0f6132ecc253896845 linux-fusion-3.2-r1.ebuild 1025
-RMD160 16745b338304ee52d13eb9a1a085858faf9a1f7e linux-fusion-3.2-r1.ebuild 1025
-SHA256 e757ced857544fb237e9632646b4517e959a17bd325ff574f5e3b04716925c86 linux-fusion-3.2-r1.ebuild 1025
-MISC ChangeLog 659 RMD160 6011b568b756819b279391f491e4e0badf9a5b75 SHA1 3917fc581a17457cda177bf5c4ddd78cb002d84e SHA256 6894ebe2005732d37ce8cfab10deb6aee928bbd1ca894d8afbe3b58c4f000cc5
-MD5 9f8108b4c313adc86010f15115d61b76 ChangeLog 659
-RMD160 6011b568b756819b279391f491e4e0badf9a5b75 ChangeLog 659
-SHA256 6894ebe2005732d37ce8cfab10deb6aee928bbd1ca894d8afbe3b58c4f000cc5 ChangeLog 659
+EBUILD linux-fusion-3.2-r1.ebuild 1091 RMD160 e02682f15bb04f75a98f9131082d2fceefbca6c0 SHA1 06492b100d96b1df5ee250aee9ed362c847c6ec7 SHA256 2856d7d0848f636070957127c1bee5ffab2ded915014d45297a5168e8c60d060
+MD5 33e4c3a03406c542b5ae4d5564c5969b linux-fusion-3.2-r1.ebuild 1091
+RMD160 e02682f15bb04f75a98f9131082d2fceefbca6c0 linux-fusion-3.2-r1.ebuild 1091
+SHA256 2856d7d0848f636070957127c1bee5ffab2ded915014d45297a5168e8c60d060 linux-fusion-3.2-r1.ebuild 1091
+MISC ChangeLog 859 RMD160 f10a6a8c0f6c145e003764fde1d9b29a148860e1 SHA1 81bb937e60a326aecb079001644b6e156b45ac8f SHA256 94b67772e269775d3818d9900d0219a51990320fa85a7d9b8d24d1ba86f055b0
+MD5 fbdd25b6ec65847d0bfe362bf43059a1 ChangeLog 859
+RMD160 f10a6a8c0f6c145e003764fde1d9b29a148860e1 ChangeLog 859
+SHA256 94b67772e269775d3818d9900d0219a51990320fa85a7d9b8d24d1ba86f055b0 ChangeLog 859
 MISC metadata.xml 219 RMD160 7910ab018fa6822f52a49d65851c3c552e643c1f SHA1 71e51db51777c7fe8c02eee6e09625cb73704a8a SHA256 d39afbd3fcef67d20b361451ec929d19b81690517cf6b5bf63dc79f445045ace
 MD5 f698cd51f3dd4f72ae8efea493a99bac metadata.xml 219
 RMD160 7910ab018fa6822f52a49d65851c3c552e643c1f metadata.xml 219
@@ -22,9 +26,9 @@ MD5 1e12ca4104fbac4a017581c5a00c964e files/digest-linux-fusion-3.2-r1 250
 RMD160 6ded7c91e16042d6c3a60196366b304ff66c5a7f files/digest-linux-fusion-3.2-r1 250
 SHA256 be7d4a7843e5dbfa7af1cd8f04863e1f8b9eb058e8b5ad940af90feef50cfcd3 files/digest-linux-fusion-3.2-r1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFadqIamhnQswr0vIRAn+tAKCSgF7YRYpVC31P5MbOMMcEoI8aeACgmgXH
-NPiS0DyGECqz/CIoKU8X4m0=
-=6W2D
+iD8DBQFFuzb/8bi6rjpTunYRAqgiAKC/b66wGlaJ+gzv3MPwPfQ/MVldYgCcC/U3
+YgDD9UqS+oTO/j/bAbu+A9I=
+=/LwF
 -----END PGP SIGNATURE-----
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
 }