Add patch to allow reiserfsprogs to compile on 2.6 kernel headers and also fixed the 'dodoc' as two non-existent files were mentioned in the command.

3 files changed, 39 insertions, 13 deletions

diff --git a/sys-fs/reiserfsprogs/Manifest b/sys-fs/reiserfsprogs/Manifest
index 3df8582795dc..7f8359b937bd 100644
--- a/sys-fs/reiserfsprogs/Manifest
+++ b/sys-fs/reiserfsprogs/Manifest
@@ -1,19 +1,20 @@
 MD5 96609e21615defef781ff3cfe0daea0a ChangeLog 5339
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 11567e340bc76efef4e59b15e3f82c2e reiserfsprogs-3.6.10.ebuild 824
-MD5 38c27e98e08abd00cfbb45bd9c2c17b3 reiserfsprogs-3.6.11-r1.ebuild 1128
-MD5 8e94675368b7eefbe96b2291d13ca612 reiserfsprogs-3.6.11.ebuild 835
 MD5 222550931a80e6c9b5834828c48bee8f reiserfsprogs-3.6.3.ebuild 681
 MD5 381caedad1d5286be4954152ec37f25e reiserfsprogs-3.6.4-r1.ebuild 1374
-MD5 17c5a5f2cea42601e349f5d74f8b0491 reiserfsprogs-3.6.8.ebuild 815
+MD5 8c06a4e4ae039bc3dd2a88a8d3334fc2 reiserfsprogs-3.6.11.ebuild 858
+MD5 11567e340bc76efef4e59b15e3f82c2e reiserfsprogs-3.6.10.ebuild 824
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 b9a6819ea2b1ac522c42cc983e609023 reiserfsprogs-3.6.9.ebuild 828
-MD5 b4eeb93b06e335142e6fd3984030f841 files/blk_size.patch 1254
-MD5 5e0eb61e5ed2aacbd317342fc3acfb7b files/digest-reiserfsprogs-3.6.10 72
-MD5 c29a2b313930bcc6a2c0fba4354c0520 files/digest-reiserfsprogs-3.6.11 72
+MD5 17c5a5f2cea42601e349f5d74f8b0491 reiserfsprogs-3.6.8.ebuild 815
+MD5 38c27e98e08abd00cfbb45bd9c2c17b3 reiserfsprogs-3.6.11-r1.ebuild 1128
+MD5 69ece3a13ceb67d23ad84f8578b83dff files/reiserfsprogs-3.6.11-2.6.patch 574
+MD5 989813ab05fd2ad4954bf998811d9a29 files/reiserfsprogs-3.6.4-bitops.patch 1278
 MD5 c29a2b313930bcc6a2c0fba4354c0520 files/digest-reiserfsprogs-3.6.11-r1 72
+MD5 f71b5a7289045ceb19f83e04ff079e09 files/digest-reiserfsprogs-3.6.8 71
+MD5 209924bdef4a9feb2bd452f3ca3b06dc files/reiserfsprogs-3.6.5-flush_buffers-bug.patch 3086
 MD5 a8b0f4b8e4a5f18892ccfd1dc32cc7d3 files/digest-reiserfsprogs-3.6.3 71
+MD5 b4eeb93b06e335142e6fd3984030f841 files/blk_size.patch 1254
+MD5 c29a2b313930bcc6a2c0fba4354c0520 files/digest-reiserfsprogs-3.6.11 72
 MD5 7895b3d698cdc1cc5b4aecdfc2c49e30 files/digest-reiserfsprogs-3.6.4-r1 71
-MD5 f71b5a7289045ceb19f83e04ff079e09 files/digest-reiserfsprogs-3.6.8 71
+MD5 5e0eb61e5ed2aacbd317342fc3acfb7b files/digest-reiserfsprogs-3.6.10 72
 MD5 b629f9fda4c59bc96a8606649751964b files/digest-reiserfsprogs-3.6.9 71
-MD5 989813ab05fd2ad4954bf998811d9a29 files/reiserfsprogs-3.6.4-bitops.patch 1278
-MD5 209924bdef4a9feb2bd452f3ca3b06dc files/reiserfsprogs-3.6.5-flush_buffers-bug.patch 3086
diff --git a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.11-2.6.patch b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.11-2.6.patch
new file mode 100644
index 000000000000..a7a16421b71d
--- /dev/null
+++ b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.11-2.6.patch
@@ -0,0 +1,23 @@
+--- reiserfsprogs-3.6.11/lib/misc.c	2003-07-31 15:58:24.000000000 +0100
++++ reiserfsprogs-3.6.11/lib/misc.c.plasmaroo	2003-12-29 20:33:55.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include <utime.h>
+ #include <ctype.h>
+ #include <linux/hdreg.h>
++#include <linux/version.h>
+ #include <dirent.h>
+ 
+ #include <asm/ioctl.h>
+@@ -36,7 +37,11 @@
+ #include "misc.h"
+ 
+ /* Debian modifications by Ed Boraas <ed@debian.org> */
+-#include <sys/mount.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++	#include <linux/fs.h>
++#else
++	#include <sys/mount.h>
++#endif
+ /* End Debian mods */
+ 
+ 
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.11.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.11.ebuild
index 754be766f565..570225ae7081 100644
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.11.ebuild
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiserfsprogs/reiserfsprogs-3.6.11.ebuild,v 1.4 2003/12/17 04:04:31 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiserfsprogs/reiserfsprogs-3.6.11.ebuild,v 1.5 2003/12/29 20:50:48 plasmaroo Exp $
 
 inherit flag-o-matic eutils
 
@@ -16,6 +16,8 @@ LICENSE="GPL-2"
 KEYWORDS="ia64 x86 ~amd64 ~ppc ~sparc ~alpha ppc64"
 
 src_compile() {
+	epatch ${FILESDIR}/${P}-2.6.patch
+
 	./configure --prefix=/ || die "Failed to configure"
 	emake || die "Failed to compile"
 }
@@ -23,7 +25,7 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die "Failed to install"
 	dodir /usr/share
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
+	dodoc COPYING ChangeLog INSTALL README
 
 	cd ${D}
 	mv man usr/share