Moved from sys-apps/gpart to sys-block/gpart.

9 files changed, 200 insertions, 0 deletions

diff --git a/sys-block/gpart/ChangeLog b/sys-block/gpart/ChangeLog
new file mode 100644
index 000000000000..bc1fca17c923
--- /dev/null
+++ b/sys-block/gpart/ChangeLog
@@ -0,0 +1,28 @@
+# ChangeLog for sys-apps/gpart
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gpart/ChangeLog,v 1.1 2005/03/06 17:45:15 ciaranm Exp $
+
+*gpart-0.1h-r1 (06 Mar 2005)
+
+  06 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> +metadata.xml,
+  +files/gpart-0.1h-PIC.patch, +files/gpart-0.1h-errno.patch,
+  +files/gpart-0.1h-ntfs.patch, +files/gpart-0.1h-vfat.patch,
+  +gpart-0.1h-r1.ebuild:
+  Moved from sys-apps/gpart to sys-block/gpart.
+
+*gpart-0.1h-r1 (11 Feb 2005)
+
+  11 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/gpart-0.1h-errno.patch, +files/gpart-0.1h-ntfs.patch,
+  +files/gpart-0.1h-vfat.patch, +files/gpart-0.1h-PIC.patch:
+  Add fix from reiserfs for #49732 by Brice Arnould.  Grab patches from Debian
+  to fix NTFS building #49878 by Hans-Christian Armingeon.  Fix building with 
+  hardened (PIC) #43440 by John Davis.
+
+*gpart-0.1h (09 Feb 2003)
+
+  22 Apr 2003; Stefan Jones <cretin@gentoo.org> gpart-0.1h.ebuild gpart-0.1h-errno.diff :
+  Added errno patch to fix compile on nwer glibc, bug #19302
+
+  15 Feb 2003: Seth Chandler <sethbc@gentoo.org> gpart-0.1h.ebuild:
+  added gpart to portage...
diff --git a/sys-block/gpart/Manifest b/sys-block/gpart/Manifest
new file mode 100644
index 000000000000..3c26ed21e45b
--- /dev/null
+++ b/sys-block/gpart/Manifest
@@ -0,0 +1,8 @@
+MD5 3ef34ad8da62fc50ce23cda965e69f14 ChangeLog 878
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 dd19900b4954b76ab313c3c63c33b875 gpart-0.1h-r1.ebuild 963
+MD5 1d99cacbe74a8d1d559fdeb0d843359e files/gpart-0.1h-PIC.patch 394
+MD5 1ed269d6c15522200092b17a53c7a90c files/digest-gpart-0.1h-r1 136
+MD5 81eee5d9985df9bf9c23624e46cf945f files/gpart-0.1h-errno.patch 384
+MD5 ae6d86b0268618d34e618824dcd82754 files/gpart-0.1h-vfat.patch 515
+MD5 8161c02116ee4575906587eb09e35bde files/gpart-0.1h-ntfs.patch 2430
diff --git a/sys-block/gpart/files/digest-gpart-0.1h-r1 b/sys-block/gpart/files/digest-gpart-0.1h-r1
new file mode 100644
index 000000000000..24d6b303d6db
--- /dev/null
+++ b/sys-block/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-block/gpart/files/gpart-0.1h-PIC.patch b/sys-block/gpart/files/gpart-0.1h-PIC.patch
new file mode 100644
index 000000000000..6c57a9b1c66b
--- /dev/null
+++ b/sys-block/gpart/files/gpart-0.1h-PIC.patch
@@ -0,0 +1,11 @@
+--- gpart-0.1h/src/l64seek.c.orig	2005-02-11 20:29:24.000000000 -0500
++++ gpart-0.1h/src/l64seek.c	2005-02-11 20:29:46.000000000 -0500
+@@ -26,7 +26,7 @@
+ } ostck[OSTACKLEN];
+ static int		osptr = -1;
+ 
+-#if defined(__linux__) && defined(__i386__)
++#if defined(__linux__) && defined(__i386__) && ! defined(__PIC__)
+ _syscall5(int,_llseek,uint,fd,ulong,hi,ulong,lo,loff_t *,res,uint,wh)
+ #endif
+ 
diff --git a/sys-block/gpart/files/gpart-0.1h-errno.patch b/sys-block/gpart/files/gpart-0.1h-errno.patch
new file mode 100644
index 000000000000..13041c20245d
--- /dev/null
+++ b/sys-block/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-block/gpart/files/gpart-0.1h-ntfs.patch b/sys-block/gpart/files/gpart-0.1h-ntfs.patch
new file mode 100644
index 000000000000..1f887ac47135
--- /dev/null
+++ b/sys-block/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-block/gpart/files/gpart-0.1h-vfat.patch b/sys-block/gpart/files/gpart-0.1h-vfat.patch
new file mode 100644
index 000000000000..7234ac689831
--- /dev/null
+++ b/sys-block/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-block/gpart/gpart-0.1h-r1.ebuild b/sys-block/gpart/gpart-0.1h-r1.ebuild
new file mode 100644
index 000000000000..138db9616428
--- /dev/null
+++ b/sys-block/gpart/gpart-0.1h-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gpart/gpart-0.1h-r1.ebuild,v 1.1 2005/03/06 17:45:15 ciaranm 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
+	ftp://ftp.namesys.com/pub/misc-patches/gpart-0.1h-reiserfs-3.6.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-errno.patch
+	epatch "${FILESDIR}"/${P}-vfat.patch
+	epatch "${FILESDIR}"/${P}-ntfs.patch
+	epatch "${FILESDIR}"/${P}-PIC.patch
+	epatch "${WORKDIR}"/gpart-0.1h-reiserfs-3.6.patch
+	sed -i -e "/^CFLAGS/s: -O2 : ${CFLAGS} :" make.defs
+}
+
+src_install() {
+	dobin src/gpart || die
+	doman man/gpart.8
+	dodoc README CHANGES INSTALL LSM
+}
diff --git a/sys-block/gpart/metadata.xml b/sys-block/gpart/metadata.xml
new file mode 100644
index 000000000000..96a2d586367d
--- /dev/null
+++ b/sys-block/gpart/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+</pkgmetadata>