8 files changed, 94 insertions, 16 deletions
diff --git a/sys-fs/mac-fdisk/ChangeLog b/sys-fs/mac-fdisk/ChangeLog
index 5b849637d721..c436bad8e4fe 100644
--- a/sys-fs/mac-fdisk/ChangeLog
+++ b/sys-fs/mac-fdisk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/mac-fdisk
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/ChangeLog,v 1.9 2004/12/16 10:37:51 corsair Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/ChangeLog,v 1.10 2005/02/05 21:41:08 hansmi Exp $
+
+*mac-fdisk-0.1-r4 (05 Feb 2005)
+
+  05 Feb 2005; Michael Hanselmann <hansmi@gentoo.org>
+  +files/largerthan2gb.patch, +mac-fdisk-0.1-r4.ebuild:
+  New revision with support for files larger than 2 GB, see bug 80095. Added
+  again to ~ppc.
 
   16 Dec 2004; Markus Rothe <corsair@gentoo.org> mac-fdisk-0.1-r3.ebuild:
   Stable on ppc64
diff --git a/sys-fs/mac-fdisk/Manifest b/sys-fs/mac-fdisk/Manifest
index 6671bb51c353..4701765fef4a 100644
--- a/sys-fs/mac-fdisk/Manifest
+++ b/sys-fs/mac-fdisk/Manifest
@@ -1,12 +1,15 @@
-MD5 399a7988fc8e344c2ed684bbbb50bb26 ChangeLog 2174
-MD5 740e63521b7dddcf17ac4429a364040b mac-fdisk-0.1.ebuild 1139
 MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
-MD5 84b22298b96cf1a5eea391b0a0c743d9 mac-fdisk-0.1-r2.ebuild 1490
-MD5 d7b80fb051b04fa19ad2de057cab67de mac-fdisk-0.1-r3.ebuild 1219
+MD5 fe8073907e2fc96437df76805a360c21 ChangeLog 2412
+MD5 7ab1bd026b726afb689f0ba4840ae6ee mac-fdisk-0.1-r2.ebuild 1488
+MD5 e8b192ad0f75123f7cc99b76bd77c235 mac-fdisk-0.1.ebuild 1139
+MD5 4d0cf54e4e4693e8bc87b5773f08c1a0 mac-fdisk-0.1-r4.ebuild 1265
+MD5 281b656df5874a8815307dd4d355ef90 mac-fdisk-0.1-r3.ebuild 1218
+MD5 0ea575013202e57b17c15883efd4bfea files/mac-fdisk-0.1-r3-ppc64.patch 16623
+MD5 0d93e85327577ef34c67c6b98380a4ed files/digest-mac-fdisk-0.1-r3 137
+MD5 1e4edeb8702972aefac52a5b367e9af7 files/digest-mac-fdisk-0.1-r2 137
 MD5 3e9a3be2ca26ae1f824c97f1f4111805 files/digest-mac-fdisk-0.1 136
 MD5 d5ac7220533aeb36ef5ba7128dd2e29d files/mac-fdisk-ppc64.patch 3412
-MD5 70dc7bfd1ffda2901ffdf59b6ebacc58 files/mac-fdisk-ppc64-1.patch 14817
-MD5 1e4edeb8702972aefac52a5b367e9af7 files/digest-mac-fdisk-0.1-r2 137
 MD5 30a3c81f6200c4ce07ef243b12a48ed4 files/mac-fdisk-ppc.patch 3383
-MD5 0d93e85327577ef34c67c6b98380a4ed files/digest-mac-fdisk-0.1-r3 137
-MD5 0ea575013202e57b17c15883efd4bfea files/mac-fdisk-0.1-r3-ppc64.patch 16623
+MD5 70dc7bfd1ffda2901ffdf59b6ebacc58 files/mac-fdisk-ppc64-1.patch 14817
+MD5 2879da41dfb904a48517290e372885fa files/largerthan2gb.patch 345
+MD5 0d93e85327577ef34c67c6b98380a4ed files/digest-mac-fdisk-0.1-r4 137
diff --git a/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r4 b/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r4
new file mode 100644
index 000000000000..e918fcc9ebcf
--- /dev/null
+++ b/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r4
@@ -0,0 +1,2 @@
+MD5 24476329fe86ef6ccf222e233e2a99f1 mac-fdisk_0.1.orig.tar.gz 55817
+MD5 1e056ff026ba7acf3ea05baa0c1d5216 mac-fdisk_0.1-11.diff.gz 19529
diff --git a/sys-fs/mac-fdisk/files/largerthan2gb.patch b/sys-fs/mac-fdisk/files/largerthan2gb.patch
new file mode 100644
index 000000000000..4a7e2e83e3bd
--- /dev/null
+++ b/sys-fs/mac-fdisk/files/largerthan2gb.patch
@@ -0,0 +1,14 @@
+--- fdisk.h-orig	1997-01-14 21:34:13.000000000 +0100
++++ fdisk.h	2004-12-13 15:36:42.575004576 +0100
+@@ -2,6 +2,11 @@
+    fdisk.h
+ */
+ 
++#ifdef __linux__
++#define _FILE_OFFSET_BITS 64
++#define _LARGE_FILES
++#endif
++
+ #define SECTOR_SIZE	512
+ #define NETBSD_PARTITION 0xa5
+ #define cround(n)	(((n) + display_factor * unit_flag) / display_factor)
diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1-r2.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1-r2.ebuild
index 16814225c803..54c4b99eecb9 100644
--- a/sys-fs/mac-fdisk/mac-fdisk-0.1-r2.ebuild
+++ b/sys-fs/mac-fdisk/mac-fdisk-0.1-r2.ebuild
@@ -1,6 +1,6 @@
-# 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-fs/mac-fdisk/mac-fdisk-0.1-r2.ebuild,v 1.6 2004/09/03 19:16:59 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/mac-fdisk-0.1-r2.ebuild,v 1.7 2005/02/05 21:41:08 hansmi Exp $
 
 inherit eutils
 
diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1-r3.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1-r3.ebuild
index 31f35394fea6..48c00fd87329 100644
--- a/sys-fs/mac-fdisk/mac-fdisk-0.1-r3.ebuild
+++ b/sys-fs/mac-fdisk/mac-fdisk-0.1-r3.ebuild
@@ -1,6 +1,6 @@
-# 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-fs/mac-fdisk/mac-fdisk-0.1-r3.ebuild,v 1.2 2004/12/16 10:37:51 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/mac-fdisk-0.1-r3.ebuild,v 1.3 2005/02/05 21:41:08 hansmi Exp $
 
 inherit eutils
 
diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1-r4.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1-r4.ebuild
new file mode 100644
index 000000000000..71e2f50492ca
--- /dev/null
+++ b/sys-fs/mac-fdisk/mac-fdisk-0.1-r4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/mac-fdisk-0.1-r4.ebuild,v 1.1 2005/02/05 21:41:08 hansmi Exp $
+
+inherit eutils
+
+DEBRV=11
+DESCRIPTION="Mac/PowerMac disk partitioning utility"
+HOMEPAGE="ftp://ftp.mklinux.apple.com/pub/Other_Tools/"
+SRC_URI="http://http.us.debian.org/debian/pool/main/m/mac-fdisk/${PN}_${PV}.orig.tar.gz
+	http://http.us.debian.org/debian/pool/main/m/mac-fdisk/${PN}_${PV}-${DEBRV}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~ppc64 ~ppc"
+IUSE=""
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack mac-fdisk_${PV}.orig.tar.gz
+	mv mac-fdisk-${PV}.orig ${P}
+	cd ${S}
+	cat ${DISTDIR}/mac-fdisk_${PV}-${DEBRV}.diff.gz | gzip -dc | patch -p1 || die
+
+	use ppc64 && epatch ${FILESDIR}/mac-fdisk-0.1-r3-ppc64.patch
+
+	epatch ${FILESDIR}/largerthan2gb.patch
+
+	cd ${WORKDIR}
+	chown -R 0:0 *
+	chmod -R a+r-w+X,u+w *
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	mv pdisk.8 pdisk.8.in
+	ln mac-fdisk.8.in mac-fdisk.8 || die
+	ln pmac-fdisk.8.in pmac-fdisk.8 || die
+	ln pdisk mac-fdisk || die
+	ln fdisk pmac-fdisk || die
+
+	into /
+	dosbin mac-fdisk pmac-fdisk || die
+
+	into /usr
+	doman mac-fdisk.8 pmac-fdisk.8
+	dodoc README HISTORY
+}
diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1.ebuild
index 638030d89aee..7e484e71e3f7 100644
--- a/sys-fs/mac-fdisk/mac-fdisk-0.1.ebuild
+++ b/sys-fs/mac-fdisk/mac-fdisk-0.1.ebuild
@@ -1,6 +1,6 @@
-# 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-fs/mac-fdisk/mac-fdisk-0.1.ebuild,v 1.4 2004/08/08 00:47:33 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/mac-fdisk-0.1.ebuild,v 1.5 2005/02/05 21:41:08 hansmi Exp $
 
 DEBRV=8
 DESCRIPTION="Mac/PowerMac disk partitioning utility"