Updated with upstream patch for kernel 2.6.26 incompatible pointer type

and disabled experimental threaded kmod helper.
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.1 x86_64

4 files changed, 65 insertions, 7 deletions

diff --git a/sys-cluster/pvfs2/ChangeLog b/sys-cluster/pvfs2/ChangeLog
index d220bd85c549..4276a1cc93fc 100644
--- a/sys-cluster/pvfs2/ChangeLog
+++ b/sys-cluster/pvfs2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/pvfs2
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/ChangeLog,v 1.17 2008/07/28 20:51:16 pchrist Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/ChangeLog,v 1.18 2008/09/04 02:22:12 nerdboy Exp $
+
+  04 Sep 2008; Steve Arnold <nerdboy@gentoo.org> +files/pvfs2-super.c.patch,
+  pvfs2-2.7.1.ebuild:
+  Updated with upstream patch for kernel 2.6.26 incompatible pointer type -
+  http://www.beowulf-underground.org/pipermail/pvfs2-users/2008-July/002506.html
+  Also disabled experimental threaded kmod helper.
 
   28 Jul 2008; Panagiotis Christopoulos <pchrist@gentoo.org> metadata.xml:
   Update metadata.xml to include USE flag descriptions. Entries taken from
diff --git a/sys-cluster/pvfs2/Manifest b/sys-cluster/pvfs2/Manifest
index b2c7151325a3..9a06fc2d4584 100644
--- a/sys-cluster/pvfs2/Manifest
+++ b/sys-cluster/pvfs2/Manifest
@@ -13,9 +13,10 @@ AUX pvfs2-server-init.d-2.7.0 1665 RMD160 1659d01727ded4d46b27d42731fcd8961a4e77
 AUX pvfs2-server.conf 988 RMD160 34c3413aed1e488c803928d9c2f94e9f5daa6450 SHA1 2637011019ecc1274cc3f039eb4870b74e118aaa SHA256 d20259d26773fdbcebc815eb47cc21ce01b5c6b6036bc843b7e9718cccb0eaed
 AUX pvfs2-server.rc 2814 RMD160 4027463eca4ddc593519c27e8f4e3b101601e2d9 SHA1 87f7dc30eb6c262acaa4a247df11674dacec76bc SHA256 c9a0bc9d2c49bd1e30712bb6621e4c9a6622206e0d8a4487cc3a5eece0b0171f
 AUX pvfs2-split-kernapps.patch 628 RMD160 b7a9a6cb0f227ba9f9105f8fdd23f76eed9760c5 SHA1 c405197e3f08e8ee1ad4ff1e0bd2e418f087ea3b SHA256 314a3da9e4afbc53af500291823492d1084a1b0a15dda52a3329835bcd66e7fa
+AUX pvfs2-super.c.patch 1509 RMD160 543316efdea79f5f9669bfdf0de825275875508c SHA1 f1305a211dd736df3c43ef3da4a8d32d927abbd5 SHA256 e5aa142b7254653fd713a62ba7f7b70ce82d29779629f2735b1ede934b18ccee
 DIST pvfs-2.7.0.tar.gz 2249993 RMD160 bc694aaf83029ea6cde4b2c64225f63203e2b862 SHA1 e5c3de5eec880fbaec7984ad1eee36f60564414e SHA256 5c781ba3943b7fa604617ba08a8da7651ac4b82fdc910b01ae7cfd6f32e87f85
 DIST pvfs-2.7.1.tar.gz 4466847 RMD160 483a956391af89bba38363bf64705f249ab040eb SHA1 2ce63310588945866c7c3ef3b040f64d87dc75e5 SHA256 3bcd34e839b5ba5d0645804721a4beb7f472363b95e9193094c205dfb6fcce7f
 EBUILD pvfs2-2.7.0-r2.ebuild 5464 RMD160 ed8d398ef6b766e5d15c117778f3293322a4a257 SHA1 7e342dcdb34648c6d0068a27d5108d580974157e SHA256 c0ec3844fbdc27ce25bb0b809ed60afed38c16c8d4474c0fdde736d5a1ddd5ce
-EBUILD pvfs2-2.7.1.ebuild 4568 RMD160 eddde887e477919a756b4e9fe84c6a5402ce9928 SHA1 17a01ca0ba15530374d2907288b7c6a8de6d65fa SHA256 a0ee15b26eb6e8b00fac975f778a464ecc25ed0c2add389b9b6bc300aeaa78af
-MISC ChangeLog 4679 RMD160 56313ac9fe69dbbb55f8fe08eabecc06ec47329d SHA1 62343e8bf2b6a8bae53ca93b7c55d3a5f191fce7 SHA256 3eb15eba062a20c5234ace66780638fc29cefa93fb2224064dc91dd456df5876
+EBUILD pvfs2-2.7.1.ebuild 4582 RMD160 d328993bdc3b390df820afe5c032cc6f5aa2405e SHA1 d8ae12b4cd99600ab20a087dbd69717fd105cbbb SHA256 c68e4ce21bc05b795c9637ad11f2f9361a2ec1d366885dc34f4b60a13d3e418c
+MISC ChangeLog 4987 RMD160 3573ac3961b2d021df3fe211203f8f3d0b4bfebe SHA1 f26697bb5a9a60d12ae94998b5f2b7ba195e9c5b SHA256 833e683a6ad16a5061b6556b6acef1620619511cd5e905d309d4342b32931715
 MISC metadata.xml 329 RMD160 55ab1f4f176fea30bad15744c65e29cfbee55228 SHA1 9f1334a1c54763f7c84fb92398e3909deabf4452 SHA256 62300b4ec860ce46b3d2c8cc5100d148f9d21997d73ccbbbfff0cee4cc9a7037
diff --git a/sys-cluster/pvfs2/files/pvfs2-super.c.patch b/sys-cluster/pvfs2/files/pvfs2-super.c.patch
new file mode 100644
index 000000000000..342813b769be
--- /dev/null
+++ b/sys-cluster/pvfs2/files/pvfs2-super.c.patch
@@ -0,0 +1,50 @@
+Index: src/kernel/linux-2.6/super.c
+===================================================================
+RCS file: /projects/cvsroot/pvfs2/src/kernel/linux-2.6/super.c,v
+retrieving revision 1.102
+diff -a -u -r1.102 super.c
+--- src/kernel/linux-2.6/super.c	10 Jun 2008 14:35:23 -0000	1.102
++++ src/kernel/linux-2.6/super.c	23 Jul 2008 18:14:20 -0000
+@@ -7,6 +7,7 @@
+ #include "pvfs2-kernel.h"
+ #include "pvfs2-bufmap.h"
+ #include "pvfs2-internal.h"
++#include "linux/version.h"
+ 
+ /* list for storing pvfs2 specific superblocks in use */
+ LIST_HEAD(pvfs2_superblocks);
+@@ -320,6 +321,7 @@
+ 
+ #endif /* PVFS2_LINUX_KERNEL_2_4 */
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
+ /* called when the VFS removes this inode from the inode cache */
+ static void pvfs2_put_inode(
+     struct inode *inode)
+@@ -349,6 +351,7 @@
+ #endif
+     }
+ }
++#endif
+ 
+ #ifdef HAVE_STATFS_LITE_SUPER_OPERATIONS
+ static int pvfs2_statfs_lite(
+@@ -852,14 +855,18 @@
+     clear_inode: pvfs2_clear_inode,
+     put_inode: pvfs2_put_inode,
+ #else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
+     .drop_inode = generic_delete_inode,
++#endif
+     .alloc_inode = pvfs2_alloc_inode,
+     .destroy_inode = pvfs2_destroy_inode,
+ #ifdef HAVE_READ_INODE
+     .read_inode = pvfs2_read_inode,
+ #endif
+     .dirty_inode = pvfs2_dirty_inode,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
+     .put_inode = pvfs2_put_inode,
++#endif
+     .statfs = pvfs2_statfs,
+     .remount_fs = pvfs2_remount,
+ #ifdef HAVE_FIND_INODE_HANDLE_SUPER_OPERATIONS
\ No newline at end of file
diff --git a/sys-cluster/pvfs2/pvfs2-2.7.1.ebuild b/sys-cluster/pvfs2/pvfs2-2.7.1.ebuild
index 4fef26d64ae1..4cdf15c7f1a6 100644
--- a/sys-cluster/pvfs2/pvfs2-2.7.1.ebuild
+++ b/sys-cluster/pvfs2/pvfs2-2.7.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/pvfs2-2.7.1.ebuild,v 1.4 2008/05/29 00:24:45 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/pvfs2-2.7.1.ebuild,v 1.5 2008/09/04 02:22:12 nerdboy Exp $
 
-inherit linux-mod autotools toolchain-funcs
+inherit linux-mod toolchain-funcs
 
 MY_PN="${PN%[0-9]*}"
 MY_P="${MY_PN}-${PV}"
@@ -11,7 +11,7 @@ S="${WORKDIR}/${MY_P}"
 DESCRIPTION="Parallel Virtual File System version 2"
 HOMEPAGE="http://www.pvfs.org/"
 SRC_URI="ftp://ftp.parl.clemson.edu/pub/pvfs2/${MY_P}.tar.gz"
-IUSE="gtk server static doc ssl examples apidocs threads"
+IUSE="apidocs doc examples gtk server ssl static"
 RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
 		ssl? ( dev-libs/openssl )
 		sys-libs/db"
@@ -44,7 +44,6 @@ pkg_setup() {
 		$(use_enable static static-server)
 		$(use_enable gtk karma)
 		$(use_enable server)
-		$(use_enable threads threaded-kmod-helper)
 		$(use_with ssl openssl /usr/$(get_libdir))"
 }
 
@@ -60,6 +59,8 @@ src_unpack() {
 
 	# Support for >=linux-2.6.25, should be unnecessary next release.
 	sed -i 's/  Q=@echo >.*/  Q=@/' src/kernel/linux-2.6/Makefile.in
+	# upstream patch for 2.6.26 kernels
+	epatch "${FILESDIR}"/${PN}-super.c.patch
 }
 
 src_compile() {