Added a patch to get ntfsprogs to compile on 2.6 headers; closes bug #39106.

5 files changed, 43 insertions, 10 deletions

diff --git a/sys-fs/ntfsprogs/ChangeLog b/sys-fs/ntfsprogs/ChangeLog
index dbc4089c9bdb..404d27ae7e3a 100644
--- a/sys-fs/ntfsprogs/ChangeLog
+++ b/sys-fs/ntfsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/ntfsprogs
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.4 2003/11/25 10:25:30 aliz Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.5 2004/02/01 13:20:39 plasmaroo Exp $
+
+  01 Feb 2004; <plasmaroo@gentoo.org> ntfsprogs-1.8.0.ebuild,
+  files/ntfsprogs-1.8.0-2.6-headers.patch:
+  Added a patch to get ntfsprogs to compile on 2.6 headers; closes bug #39106.
 
 *ntfsprogs-1.8.0 (25 Nov 2003)
 
diff --git a/sys-fs/ntfsprogs/Manifest b/sys-fs/ntfsprogs/Manifest
index 1e08343e7f26..01a2b655d4be 100644
--- a/sys-fs/ntfsprogs/Manifest
+++ b/sys-fs/ntfsprogs/Manifest
@@ -1,7 +1,8 @@
-MD5 8afec372da7c0f6cbe4978f5fef6e5e0 ChangeLog 1508
+MD5 3cdc8ffe3151f98c68bdd509773d4e63 ChangeLog 1698
+MD5 2244a7d93a8a42ceb125aa4ed311dac1 ntfsprogs-1.8.0.ebuild 1309
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 117f411a92b07d36cd58e4cb19e206ff ntfsprogs-1.7.1.ebuild 1203
-MD5 a481b26cabc3ef2d7e70b8d9466ae38b ntfsprogs-1.8.0.ebuild 1261
+MD5 d491d3592f152cbcbb1397c14a8f9340 ntfsprogs-1.7.1.ebuild 1205
 MD5 9c54070c93405b7ad66d548e7fa2e2a4 files/digest-ntfsprogs-1.7.1 67
-MD5 48ff1b8348c199e46e4a30de49c63441 files/digest-ntfsprogs-1.8.0 67
 MD5 2954e3eda945cc153d217db1eb3a3a6e files/ntfsprogs-1.7.1-gcc3.patch 1983
+MD5 48ff1b8348c199e46e4a30de49c63441 files/digest-ntfsprogs-1.8.0 67
+MD5 280d514dfcccd2da72a970555444cf91 files/ntfsprogs-1.8.0-2.6-headers.patch 899
diff --git a/sys-fs/ntfsprogs/files/ntfsprogs-1.8.0-2.6-headers.patch b/sys-fs/ntfsprogs/files/ntfsprogs-1.8.0-2.6-headers.patch
new file mode 100644
index 000000000000..7aa1cd2efa28
--- /dev/null
+++ b/sys-fs/ntfsprogs/files/ntfsprogs-1.8.0-2.6-headers.patch
@@ -0,0 +1,27 @@
+--- ntfsprogs-1.8.0/ntfsprogs/mkntfs.c.old	2003-11-19 10:31:26.000000000 +0000
++++ ntfsprogs-1.8.0/ntfsprogs/mkntfs.c	2004-02-01 12:57:46.000000000 +0000
+@@ -78,10 +78,22 @@
+ #	define MAJOR(dev)	((dev) >> 8)
+ #	define MINOR(dev)	((dev) & 0xff)
+ #endif
++
++#ifndef SCSI_DISK_MAJOR
++#ifdef SCSI_DISK8_MAJOR
++#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \
++	((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR) || \
++	((M) >= SCSI_DISK8_MAJOR && (M) <= SCSI_DISK15_MAJOR))
++#else
++#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \
++	((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR))
++#endif
++#endif
++
+ #ifndef SCSI_BLK_MAJOR
+-#	define SCSI_BLK_MAJOR(m)	((m) == SCSI_DISK_MAJOR || \
+-					 (m) == SCSI_CDROM_MAJOR)
++#define SCSI_BLK_MAJOR(M)  (SCSI_DISK_MAJOR(M) || (M) == SCSI_CDROM_MAJOR)
+ #endif
++
+ #include <limits.h>
+ 
+ #if defined(linux) && defined(_IO) && !defined(BLKSSZGET)
diff --git a/sys-fs/ntfsprogs/ntfsprogs-1.7.1.ebuild b/sys-fs/ntfsprogs/ntfsprogs-1.7.1.ebuild
index 4042386f2c11..a365b68039a1 100644
--- a/sys-fs/ntfsprogs/ntfsprogs-1.7.1.ebuild
+++ b/sys-fs/ntfsprogs/ntfsprogs-1.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ntfsprogs-1.7.1.ebuild,v 1.3 2003/10/30 02:16:40 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ntfsprogs-1.7.1.ebuild,v 1.4 2004/02/01 13:20:39 plasmaroo Exp $
 
 DESCRIPTION="User tools for NTFS filesystems -- includes: ntsresize, mkntfs,
 ntfsfix, ntfsdefrag"
diff --git a/sys-fs/ntfsprogs/ntfsprogs-1.8.0.ebuild b/sys-fs/ntfsprogs/ntfsprogs-1.8.0.ebuild
index ad371cfee242..1f3d4a3fc9ac 100644
--- a/sys-fs/ntfsprogs/ntfsprogs-1.8.0.ebuild
+++ b/sys-fs/ntfsprogs/ntfsprogs-1.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ntfsprogs-1.8.0.ebuild,v 1.1 2003/11/25 10:25:30 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ntfsprogs-1.8.0.ebuild,v 1.2 2004/02/01 13:20:39 plasmaroo Exp $
 
 DESCRIPTION="User tools for NTFS filesystems -- includes: ntsresize, mkntfs,
 ntfsfix, ntfsdefrag"
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
 
 src_compile() {
+	epatch ${FILESDIR}/${P}-2.6-headers.patch
 	sed -i 's:head -1:head -n 1:g' configure getgccver
 
 	econf `use_enable gnome gnome-vfs` || die "Configure failed"