Added a patch to solve compilation issues on 2.6 headers. Closes bug #44888.

4 files changed, 29 insertions, 12 deletions

diff --git a/sys-fs/dosfstools/ChangeLog b/sys-fs/dosfstools/ChangeLog
index 8376e9025024..b38319c98039 100644
--- a/sys-fs/dosfstools/ChangeLog
+++ b/sys-fs/dosfstools/ChangeLog
@@ -1,24 +1,29 @@
 # ChangeLog for sys-fs/dosfstools
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/ChangeLog,v 1.9 2004/02/15 17:31:05 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/ChangeLog,v 1.10 2004/03/25 00:02:46 plasmaroo Exp $
+
+  25 Mar 2004; <plasmaroo@gentoo.org> dosfstools-2.10.ebuild,
+  files/dosfstools-2.10-2.6.headers.patch:
+  Added a patch to solve compilation issues on 2.6 headers.
+  Closes bug #44888.
 
   15 Feb 2004; Dylan Carlson <absinthe@gentoo.org> dosfstools-2.9.ebuild:
-  added ~amd64 keyword.
+  Added ~amd64 keyword.
 
   23 Jan 2004; <gustavoz@gentoo.org> dosfstools-2.10.ebuild:
-  stable on sparc
+  Stable on sparc.
 
   23 Jan 2004; <agriffis@gentoo.org> dosfstools-2.10.ebuild:
-  stable on ia64 for elilo
+  Stable on ia64 for elilo.
 
   09 Jan 2004; <gustavoz@gentoo.org> dosfstools-2.10.ebuild:
-  stable for hppa
+  Stable for hppa.
 
   07 Jan 2004; Jon Portnoy <avenj@gentoo.org> dosfstools-2.10.ebuild :
   AMD64 keywords.
 
   01 Jan 2004; Martin Holzer <mholzer@gentoo.org> dosfstools-2.10.ebuild:
-  x86 stable
+  X86 stable.
 
 *dosfstools-2.10 (21 Dec 2003)
 
@@ -32,7 +37,7 @@
 
   16 Sep 2003; Seemant Kulleen <seemant@gentoo.org> dosfstools-2.8-r3.ebuild,
   dosfstools-2.9.ebuild, files/errno.patch:
-  move to sys-fs
+  Moved to sys-fs.
 
 *dosfstools-2.9 (08 Sep 2003)
 
@@ -57,7 +62,6 @@
   Fixed HOMEPAGE
 
   3 May 2002; Donny Davies <woodchip@gentoo.org> :
-
   Add LICENSE, SLOT.
 
 *dosfstools-2.8-r1 (1 Feb 2002)
diff --git a/sys-fs/dosfstools/dosfstools-2.10.ebuild b/sys-fs/dosfstools/dosfstools-2.10.ebuild
index ae2119265cdb..655628e49e95 100644
--- a/sys-fs/dosfstools/dosfstools-2.10.ebuild
+++ b/sys-fs/dosfstools/dosfstools-2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.10.ebuild,v 1.7 2004/02/23 15:56:47 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.10.ebuild,v 1.8 2004/03/25 00:02:46 plasmaroo Exp $
 
 inherit eutils
 
@@ -15,8 +15,9 @@ KEYWORDS="x86 ~ppc sparc ~alpha hppa amd64 ia64"
 DEPEND="virtual/glibc"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
+	unpack ${A}; cd ${S}
 	epatch ${FILESDIR}/errno.patch
+	epatch ${FILESDIR}/${P}-2.6.headers.patch
 	sed -i "s:PREFIX\ \=:PREFIX\ \=\ \/usr:" Makefile
 	sed	-i "s:\/usr\/man:\/share\/man:" Makefile
 
diff --git a/sys-fs/dosfstools/dosfstools-2.8-r3.ebuild b/sys-fs/dosfstools/dosfstools-2.8-r3.ebuild
index 795fabbb756d..e928c1900bdd 100644
--- a/sys-fs/dosfstools/dosfstools-2.8-r3.ebuild
+++ b/sys-fs/dosfstools/dosfstools-2.8-r3.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/dosfstools/dosfstools-2.8-r3.ebuild,v 1.1 2003/09/17 02:43:10 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.8-r3.ebuild,v 1.2 2004/03/25 00:02:46 plasmaroo Exp $
 
 inherit eutils
 
diff --git a/sys-fs/dosfstools/files/dosfstools-2.10-2.6.headers.patch b/sys-fs/dosfstools/files/dosfstools-2.10-2.6.headers.patch
new file mode 100644
index 000000000000..9022fec0d58f
--- /dev/null
+++ b/sys-fs/dosfstools/files/dosfstools-2.10-2.6.headers.patch
@@ -0,0 +1,12 @@
+--- dosfsck/boot.org   2004-03-04 06:45:51.368946816 +0000
++++ dosfsck/boot.c   2004-03-04 06:45:24.838979984 +0000
+@@ -14,6 +14,10 @@
+ #include "io.h"
+ #include "boot.h"
+ 
++#ifndef MSDOS_FAT12
++#define MSDOS_FAT12 MAX_FAT12
++#endif // !MSDOS_FAT12
++
+ #define ROUND_TO_MULTIPLE(n,m) ((n) && (m) ? (n)+(m)-1-((n)-1)%(m) : 0)
+     /* don't divide by zero */