Add fix from reiserfs for #49732 by Brice Arnould. Grab patches from Debian to fix NTFS building #49878 by Hans-Christian Armingeon.

(Portage version: 2.0.51-r15)

8 files changed, 135 insertions, 34 deletions

diff --git a/sys-apps/gpart/ChangeLog b/sys-apps/gpart/ChangeLog
index b632c2401c73..b117d5b897d2 100644
--- a/sys-apps/gpart/ChangeLog
+++ b/sys-apps/gpart/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/gpart
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gpart/ChangeLog,v 1.6 2004/06/24 22:08:13 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gpart/ChangeLog,v 1.7 2005/02/12 01:23:51 vapier Exp $
+
+*gpart-0.1h-r1 (11 Feb 2005)
+
+  11 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  -files/gpart-0.1h-errno.diff, +files/gpart-0.1h-errno.patch,
+  +files/gpart-0.1h-ntfs.patch, +files/gpart-0.1h-vfat.patch,
+  +gpart-0.1h-r1.ebuild, -gpart-0.1h.ebuild:
+  Add fix from reiserfs for #49732 by Brice Arnould. Grab patches from Debian
+  to fix NTFS building #49878 by Hans-Christian Armingeon.
 
 *gpart-0.1h (09 Feb 2003)
 
diff --git a/sys-apps/gpart/files/digest-gpart-0.1h b/sys-apps/gpart/files/digest-gpart-0.1h
deleted file mode 100644
index afb4e36dea6a..000000000000
--- a/sys-apps/gpart/files/digest-gpart-0.1h
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ee3a2d2dde70bcf404eb354b3d1ee6d4 gpart-0.1h.tar.gz 52352
diff --git a/sys-apps/gpart/files/digest-gpart-0.1h-r1 b/sys-apps/gpart/files/digest-gpart-0.1h-r1
new file mode 100644
index 000000000000..24d6b303d6db
--- /dev/null
+++ b/sys-apps/gpart/files/digest-gpart-0.1h-r1
@@ -0,0 +1,2 @@
+MD5 ee3a2d2dde70bcf404eb354b3d1ee6d4 gpart-0.1h.tar.gz 52352
+MD5 ed479abcb1d7612669c4275a1c445085 gpart-0.1h-reiserfs-3.6.patch.gz 3658
diff --git a/sys-apps/gpart/files/gpart-0.1h-errno.diff b/sys-apps/gpart/files/gpart-0.1h-errno.diff
deleted file mode 100644
index f62c523281f3..000000000000
--- a/sys-apps/gpart/files/gpart-0.1h-errno.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- gpart-0.1h/src/l64seek.c	2000-12-13 23:54:11.000000000 +0100
-+++ gpart-0.1h-working/src/l64seek.c	2003-04-14 18:02:51.000000000 +0200
-@@ -15,7 +15,7 @@
-  */
- 
- #include "l64seek.h"
--
-+#include <errno.h>
- 
- #define OSTACKLEN	16
- static struct
---- gpart-0.1h/src/disku.c	2001-02-07 20:04:07.000000000 +0100
-+++ gpart-0.1h-working/src/disku.c	2003-04-14 18:02:46.000000000 +0200
-@@ -20,6 +20,7 @@
- #include <string.h>
- #include <sys/ioctl.h>
- #include "gpart.h"
-+#include <errno.h>
- 
- #if defined(__linux__)
- #include <sys/mount.h>
diff --git a/sys-apps/gpart/files/gpart-0.1h-errno.patch b/sys-apps/gpart/files/gpart-0.1h-errno.patch
new file mode 100644
index 000000000000..13041c20245d
--- /dev/null
+++ b/sys-apps/gpart/files/gpart-0.1h-errno.patch
@@ -0,0 +1,20 @@
+--- gpart-0.1h/src/l64seek.c
++++ gpart-0.1h-working/src/l64seek.c
+@@ -16,6 +16,7 @@
+ 
+ #include "l64seek.h"
+ 
++#include <errno.h>
+ 
+ #define OSTACKLEN	16
+ static struct
+--- gpart-0.1h/src/disku.c
++++ gpart-0.1h-working/src/disku.c
+@@ -20,6 +20,7 @@
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #include "gpart.h"
++#include <errno.h>
+ 
+ #if defined(__linux__)
+ #include <sys/mount.h>
diff --git a/sys-apps/gpart/files/gpart-0.1h-ntfs.patch b/sys-apps/gpart/files/gpart-0.1h-ntfs.patch
new file mode 100644
index 000000000000..1f887ac47135
--- /dev/null
+++ b/sys-apps/gpart/files/gpart-0.1h-ntfs.patch
@@ -0,0 +1,75 @@
+Ripped out of debian
+
+--- gpart-0.1h.orig/src/gm_ntfs.h
++++ gpart-0.1h/src/gm_ntfs.h
+@@ -14,6 +14,9 @@
+  *
+  */
+ 
++#include <stdint.h>
++#include <asm/byteorder.h>
++
+ #ifndef _GM_NTFS_H
+ #define _GM_NTFS_H
+ 
+@@ -29,32 +32,38 @@
+ /* 'NTFS' in little endian */
+ #define NTFS_SUPER_MAGIC	0x5346544E
+ 
+-#if defined(i386) || defined(__i386__) || defined(__alpha__)
+-
+ /* unsigned integral types */
+ #ifndef NTFS_INTEGRAL_TYPES
+ #define NTFS_INTEGRAL_TYPES
+-typedef unsigned char		ntfs_u8;
+-typedef unsigned short		ntfs_u16;
+-typedef unsigned int		ntfs_u32;
+-typedef s64_t			ntfs_u64;
++typedef uint8_t			ntfs_u8;
++typedef uint16_t		ntfs_u16;
++typedef uint32_t		ntfs_u32;
++typedef uint64_t		ntfs_u64;
++typedef int8_t			ntfs_s8;
++typedef int16_t			ntfs_s16;
+ #endif /* NTFS_INTEGRAL_TYPES */
+-#endif /* defined(i386) || defined(__i386__) || defined(__alpha__) */
+-
+-
+-/* Macros reading unsigned integers from a byte pointer */
+-/* these should work for all little endian machines */
+-#define NTFS_GETU8(p)		(*(ntfs_u8*)(p))
+-#define NTFS_GETU16(p)		(*(ntfs_u16*)(p))
+-#define NTFS_GETU24(p)		(NTFS_GETU32(p) & 0xFFFFFF)
+-#define NTFS_GETU32(p)		(*(ntfs_u32*)(p))
+-#define NTFS_GETU64(p)		(*(ntfs_u64*)(p))
+-
+-/* Macros reading signed integers, returning int */
+-#define NTFS_GETS8(p)		((int)(*(char*)(p)))
+-#define NTFS_GETS16(p)		((int)(*(short*)(p)))
+-#define NTFS_GETS24(p)		(NTFS_GETU24(p) < 0x800000 ? (int)NTFS_GETU24(p) :
+-
+ 
++#define CPU_TO_LE16(a) __cpu_to_le16(a)
++#define CPU_TO_LE32(a) __cpu_to_le32(a)
++#define CPU_TO_LE64(a) __cpu_to_le64(a)
++
++#define LE16_TO_CPU(a) __cpu_to_le16(a)
++#define LE32_TO_CPU(a) __cpu_to_le32(a)
++#define LE64_TO_CPU(a) __cpu_to_le64(a)
++
++/* Macros reading unsigned integers */
++#define NTFS_GETU8(p)      (*(ntfs_u8*)(p))
++#define NTFS_GETU16(p)     ((ntfs_u16)LE16_TO_CPU(*(ntfs_u16*)(p)))
++#define NTFS_GETU24(p)     ((ntfs_u32)NTFS_GETU16(p) | \
++		           ((ntfs_u32)NTFS_GETU8(((char*)(p)) + 2) << 16))
++#define NTFS_GETU32(p)     ((ntfs_u32)LE32_TO_CPU(*(ntfs_u32*)(p)))
++#define NTFS_GETU64(p)     ((ntfs_u64)LE64_TO_CPU(*(ntfs_u64*)(p)))
++
++/* Macros reading signed integers */
++#define NTFS_GETS8(p)        ((*(ntfs_s8*)(p)))
++#define NTFS_GETS16(p)       ((ntfs_s16)LE16_TO_CPU(*(short*)(p)))
++#define NTFS_GETS24(p)       (NTFS_GETU24(p) < 0x800000 ? \
++	                                (int)NTFS_GETU24(p) : \
++					(int)(NTFS_GETU24(p) - 0x1000000))
+ 
+ #endif /* _GM_NTFS_H */
diff --git a/sys-apps/gpart/files/gpart-0.1h-vfat.patch b/sys-apps/gpart/files/gpart-0.1h-vfat.patch
new file mode 100644
index 000000000000..7234ac689831
--- /dev/null
+++ b/sys-apps/gpart/files/gpart-0.1h-vfat.patch
@@ -0,0 +1,17 @@
+Ripped out of debian
+
+--- gpart-0.1h.orig/src/gm_fat.h
++++ gpart-0.1h/src/gm_fat.h
+@@ -60,6 +60,10 @@
+ 	__u16	info_sector;	/* filesystem info sector */
+ 	__u16	backup_boot;	/* backup boot sector */
+ 	__u16	reserved2[6];	/* Unused */
+-};
+-
++} __attribute__ ((packed));
++/*  "__attribute__ ((packed))" 
++    added by davidc@debian.org,
++    as suggested by falk@zxmjz18.extern.uni-tuebingen.de 
++    Fri Jul 07 18:04:15 2000
++    in debian bug report #66893 "FAT detection broken on Alpha" */
+ #endif /* _GM_FAT_H */
diff --git a/sys-apps/gpart/gpart-0.1h.ebuild b/sys-apps/gpart/gpart-0.1h-r1.ebuild
index 531f9a6f7a54..29792f39b0e7 100644
--- a/sys-apps/gpart/gpart-0.1h.ebuild
+++ b/sys-apps/gpart/gpart-0.1h-r1.ebuild
@@ -1,28 +1,28 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gpart/gpart-0.1h.ebuild,v 1.6 2004/06/30 02:36:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gpart/gpart-0.1h-r1.ebuild,v 1.1 2005/02/12 01:23:51 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="Partition table rescue/guessing tool"
 HOMEPAGE="http://www.stud.uni-hannover.de/user/76201/gpart/"
-SRC_URI="http://www.stud.uni-hannover.de/user/76201/gpart/${P}.tar.gz"
+SRC_URI="http://www.stud.uni-hannover.de/user/76201/gpart/${P}.tar.gz
+	ftp://ftp.namesys.com/pub/misc-patches/gpart-0.1h-reiserfs-3.6.patch.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-errno.diff
-}
-
-src_compile() {
-	emake || die
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-errno.patch
+	epatch "${FILESDIR}"/${P}-vfat.patch
+	epatch "${FILESDIR}"/${P}-ntfs.patch
+	epatch "${WORKDIR}"/gpart-0.1h-reiserfs-3.6.patch
 }
 
 src_install() {