summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2004-03-25 00:02:46 +0000
committerTim Yamin <plasmaroo@gentoo.org>2004-03-25 00:02:46 +0000
commitcc20a86e6ab5fea426ee7cb32272eb3868281dbd (patch)
tree7b4f7689232d3cde7667ae23baf277edd6332caa
parentfixing src_uri. closes 45630 (diff)
downloadhistorical-cc20a86e6ab5fea426ee7cb32272eb3868281dbd.tar.gz
historical-cc20a86e6ab5fea426ee7cb32272eb3868281dbd.tar.bz2
historical-cc20a86e6ab5fea426ee7cb32272eb3868281dbd.zip
Added a patch to solve compilation issues on 2.6 headers. Closes bug #44888.
-rw-r--r--sys-fs/dosfstools/ChangeLog20
-rw-r--r--sys-fs/dosfstools/Manifest11
-rw-r--r--sys-fs/dosfstools/dosfstools-2.10.ebuild5
-rw-r--r--sys-fs/dosfstools/dosfstools-2.8-r3.ebuild4
-rw-r--r--sys-fs/dosfstools/files/dosfstools-2.10-2.6.headers.patch12
5 files changed, 35 insertions, 17 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/Manifest b/sys-fs/dosfstools/Manifest
index fec9faa4d2f7..afef79a66b4e 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -1,9 +1,10 @@
-MD5 cfa9b48f4144b709a891df93ab9bdb85 ChangeLog 2308
-MD5 3a1aae164da272e2b993a9c6ff46c13e dosfstools-2.8-r3.ebuild 1139
+MD5 00becc2351a2f963d00f47fe1db34f2a ChangeLog 2502
+MD5 ee5a688d4e3874982dbef43956df4350 dosfstools-2.10.ebuild 1400
MD5 96caf3a02fb0621de8dc2078717cfb21 dosfstools-2.9.ebuild 1355
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 42b423073d28b01250bc2ed1c4a9c4b5 dosfstools-2.10.ebuild 1358
-MD5 51b6aebebdca730b6a304548ec5c6da1 files/digest-dosfstools-2.8-r3 69
-MD5 8102aee0611b0b9f797c88f7cc4fd503 files/digest-dosfstools-2.9 69
+MD5 3549613f8ab922686f96e974aecc7fd0 dosfstools-2.8-r3.ebuild 1141
MD5 af6a07ad458852ef02d58a7a3658ca15 files/errno.patch 257
+MD5 6b58c7a85ca01fc79287563b903024ff files/dosfstools-2.10-2.6.headers.patch 357
MD5 9eae6c4e222bcb616db95d21959a7688 files/digest-dosfstools-2.10 70
+MD5 51b6aebebdca730b6a304548ec5c6da1 files/digest-dosfstools-2.8-r3 69
+MD5 8102aee0611b0b9f797c88f7cc4fd503 files/digest-dosfstools-2.9 69
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 */