Added a patch to get e2fsprogs to compile with 2.6 headers; closing bug #31419.

4 files changed, 32 insertions, 6 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index ae4f582f65fe..3cbce7a84200 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.8 2003/12/21 16:06:14 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.9 2003/12/24 11:43:13 plasmaroo Exp $
+
+  24 Dec 2003; <plasmaroo@gentoo.org> e2fsprogs-1.34.ebuild,
+  files/e2fsprogs-1.34-kernel-2.6-fix.patch:
+  Added a patch to get e2fsprogs to compile with 2.6 headers; closing bug #31419.
 
   21 Dec 2003; Martin Holzer <mholzer@gentoo.org> e2fsprogs-1.34.ebuild:
   x86 stable
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 6fbf751cd632..0fb61e96bb2d 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,10 +1,11 @@
-MD5 074bfd2e266d74b14d676b08e368ba75 ChangeLog 5052
+MD5 cae5e363c74dee5e6bd3df6e107b27b1 ChangeLog 5243
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 8ef73e3fdb521aeb05e01a6d63624277 e2fsprogs-1.32-r2.ebuild 2331
 MD5 eb01e246e04dd6b7a3f412a831e1f2bf e2fsprogs-1.33.ebuild 2515
-MD5 865817ce8165d8fb040f6d9c2683296b e2fsprogs-1.34.ebuild 2592
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 310870eaa7938b343c41eb7dbb0a8f93 e2fsprogs-1.34.ebuild 2667
 MD5 db361eb5cdf39ddae07e9f794d308b42 files/digest-e2fsprogs-1.32-r2 67
+MD5 1a896f2697b055d4b8b4139c3482ac9e files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316
+MD5 46ff23c57e090a64063ab99cc5bea0e2 files/e2fsprogs-1.34-kernel-2.6-fix.patch 738
 MD5 3307c0c209b26bf447ff2840b7118862 files/digest-e2fsprogs-1.33 67
 MD5 9c39bba6702e492a7a01624ae60587bc files/digest-e2fsprogs-1.34 67
 MD5 0b77829b4c6500ac9722143384ddda95 files/e2fsprogs-1.27ea-0.8.21.diff 15214
-MD5 1a896f2697b055d4b8b4139c3482ac9e files/e2fsprogs-1.32-mk_cmds-cosmetic.patch 316
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild
index d52f80a85fb7..527bb2dde0e4 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.34.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/e2fsprogs/e2fsprogs-1.34.ebuild,v 1.10 2003/12/21 16:06:14 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.34.ebuild,v 1.11 2003/12/24 11:43:13 plasmaroo Exp $
 
 inherit eutils
 
@@ -27,6 +27,8 @@ src_unpack() {
 	unpack ${A}
 	# Fix a cosmetic error in mk_cmds's help output.
 	cd ${S}; epatch ${FILESDIR}/e2fsprogs-1.32-mk_cmds-cosmetic.patch
+	# Needed for 2.6 support:
+	epatch ${FILESDIR}/${P}-kernel-2.6-fix.patch
 	# Userpriv fix. Closes #27348
 	chmod u+w po/*.po
 }
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.34-kernel-2.6-fix.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.34-kernel-2.6-fix.patch
new file mode 100644
index 000000000000..afb9c7a27f1e
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.34-kernel-2.6-fix.patch
@@ -0,0 +1,19 @@
+diff -X /usr/src/dontdiff -urN e2fsprogs-old/misc/util.c e2fsprogs-1.34/misc/util.c
+--- e2fsprogs-old/misc/util.c	Sat May  3 15:46:47 2003
++++ e2fsprogs-1.34/misc/util.c	Tue Sep 30 06:56:11 2003
+@@ -108,13 +108,8 @@
+ #define MAJOR(dev)	((dev)>>8)
+ #define MINOR(dev)	((dev) & 0xff)
+ #endif
+-#ifndef SCSI_BLK_MAJOR
+-#define SCSI_BLK_MAJOR(M)  ((M) == SCSI_DISK_MAJOR || (M) == SCSI_CDROM_MAJOR)
+-#endif
+-	if (((MAJOR(s.st_rdev) == HD_MAJOR &&
+-	      MINOR(s.st_rdev)%64 == 0) ||
+-	     (SCSI_BLK_MAJOR(MAJOR(s.st_rdev)) &&
+-	      MINOR(s.st_rdev)%16 == 0))) {
++	if (MAJOR(s.st_rdev) == HD_MAJOR &&
++	    MINOR(s.st_rdev)%64 == 0) {
+ 		printf(_("%s is entire device, not just one partition!\n"),
+ 		       device);
+ 		proceed_question();