Cleanup sources.

(Portage version: 2.1.1_pre3-r1)

7 files changed, 183 insertions, 5 deletions

diff --git a/sys-fs/mac-fdisk/ChangeLog b/sys-fs/mac-fdisk/ChangeLog
index 4c416b3875d6..dd194e27a7c8 100644
--- a/sys-fs/mac-fdisk/ChangeLog
+++ b/sys-fs/mac-fdisk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/mac-fdisk
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/ChangeLog,v 1.12 2005/09/11 02:10:13 tester Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/ChangeLog,v 1.13 2006/07/19 20:33:50 vapier Exp $
+
+*mac-fdisk-0.1-r5 (19 Jul 2006)
+
+  19 Jul 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/mac-fdisk-0.1-headers.patch, +mac-fdisk-0.1-r5.ebuild:
+  Cleanup sources.
 
   11 Sep 2005; Olivier Crête <tester@gentoo.org> mac-fdisk-0.1-r4.ebuild:
   Marked ~x86 per bug #103144
diff --git a/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r2 b/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r2
index a2615b38d3a2..e5683abf75e5 100644
--- a/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r2
+++ b/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r2
@@ -1,2 +1,6 @@
-MD5 24476329fe86ef6ccf222e233e2a99f1 mac-fdisk_0.1.orig.tar.gz 55817
 MD5 63b0cfe92f48d12603a9c6f7421febd8 mac-fdisk_0.1-10.diff.gz 18591
+RMD160 c61fe8aa8ff2a40066f55fe5b5dc9a63cf4e7ad8 mac-fdisk_0.1-10.diff.gz 18591
+SHA256 213d3113015a14bcfac159e3c73207adff55a2f726a585fdb2f87411017542e8 mac-fdisk_0.1-10.diff.gz 18591
+MD5 24476329fe86ef6ccf222e233e2a99f1 mac-fdisk_0.1.orig.tar.gz 55817
+RMD160 eb70e362469268ec7644c999e0bc7a5a92675992 mac-fdisk_0.1.orig.tar.gz 55817
+SHA256 7059fc4ba41ca2ef857e1092e9c56e910f27693d407b5c3d78f7102ad0c56a66 mac-fdisk_0.1.orig.tar.gz 55817
diff --git a/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r3 b/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r3
index e918fcc9ebcf..a61fda46c6d5 100644
--- a/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r3
+++ b/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r3
@@ -1,2 +1,6 @@
-MD5 24476329fe86ef6ccf222e233e2a99f1 mac-fdisk_0.1.orig.tar.gz 55817
 MD5 1e056ff026ba7acf3ea05baa0c1d5216 mac-fdisk_0.1-11.diff.gz 19529
+RMD160 90ede691daf990427181dc5485172d8ca8f82c7d mac-fdisk_0.1-11.diff.gz 19529
+SHA256 7fc6c859e8c22ae05c24397bb2bb849705ab235329c3bc5c206e7e1c03787afd mac-fdisk_0.1-11.diff.gz 19529
+MD5 24476329fe86ef6ccf222e233e2a99f1 mac-fdisk_0.1.orig.tar.gz 55817
+RMD160 eb70e362469268ec7644c999e0bc7a5a92675992 mac-fdisk_0.1.orig.tar.gz 55817
+SHA256 7059fc4ba41ca2ef857e1092e9c56e910f27693d407b5c3d78f7102ad0c56a66 mac-fdisk_0.1.orig.tar.gz 55817
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
index e918fcc9ebcf..a61fda46c6d5 100644
--- a/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r4
+++ b/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r4
@@ -1,2 +1,6 @@
-MD5 24476329fe86ef6ccf222e233e2a99f1 mac-fdisk_0.1.orig.tar.gz 55817
 MD5 1e056ff026ba7acf3ea05baa0c1d5216 mac-fdisk_0.1-11.diff.gz 19529
+RMD160 90ede691daf990427181dc5485172d8ca8f82c7d mac-fdisk_0.1-11.diff.gz 19529
+SHA256 7fc6c859e8c22ae05c24397bb2bb849705ab235329c3bc5c206e7e1c03787afd mac-fdisk_0.1-11.diff.gz 19529
+MD5 24476329fe86ef6ccf222e233e2a99f1 mac-fdisk_0.1.orig.tar.gz 55817
+RMD160 eb70e362469268ec7644c999e0bc7a5a92675992 mac-fdisk_0.1.orig.tar.gz 55817
+SHA256 7059fc4ba41ca2ef857e1092e9c56e910f27693d407b5c3d78f7102ad0c56a66 mac-fdisk_0.1.orig.tar.gz 55817
diff --git a/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r5 b/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r5
new file mode 100644
index 000000000000..5511aa3a3caa
--- /dev/null
+++ b/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r5
@@ -0,0 +1,6 @@
+MD5 c76dc2a0cd29c2ada580ea9008710f3b mac-fdisk_0.1-13.diff.gz 19615
+RMD160 cc6ddbdee6c8bac9d03d6ae50fc6d23e29a21188 mac-fdisk_0.1-13.diff.gz 19615
+SHA256 a6dd96c8ddce896dac2e2b2c2eff346d339ae697cd19e2ac9676556d8bc63644 mac-fdisk_0.1-13.diff.gz 19615
+MD5 24476329fe86ef6ccf222e233e2a99f1 mac-fdisk_0.1.orig.tar.gz 55817
+RMD160 eb70e362469268ec7644c999e0bc7a5a92675992 mac-fdisk_0.1.orig.tar.gz 55817
+SHA256 7059fc4ba41ca2ef857e1092e9c56e910f27693d407b5c3d78f7102ad0c56a66 mac-fdisk_0.1.orig.tar.gz 55817
diff --git a/sys-fs/mac-fdisk/files/mac-fdisk-0.1-headers.patch b/sys-fs/mac-fdisk/files/mac-fdisk-0.1-headers.patch
new file mode 100644
index 000000000000..5ca1f6e42fb7
--- /dev/null
+++ b/sys-fs/mac-fdisk/files/mac-fdisk-0.1-headers.patch
@@ -0,0 +1,112 @@
+Include a lot more headers and remove a bunch of braindead __linux__ checks
+
+--- mac-fdisk-0.1/dump.c
++++ mac-fdisk-0.1/dump.c
+@@ -30,10 +30,8 @@
+  */
+ 
+ #include <stdio.h>
+-#ifndef __linux__
+ #include <stdlib.h>
+ #include <unistd.h>
+-#endif
+ #include <string.h>
+ #include <errno.h>
+ #include <fcntl.h>
+--- mac-fdisk-0.1/errors.c
++++ mac-fdisk-0.1/errors.c
+@@ -26,9 +26,7 @@
+  */
+ 
+ #include <stdio.h>
+-#ifndef __linux__
+ #include <stdlib.h>
+-#endif
+ #include <string.h>
+ #include <stdarg.h>
+ 
+@@ -115,8 +113,8 @@
+     va_end(ap);
+ 
+ #ifdef __linux__
+-    if (value > 0 && value < sys_nerr) {
+-	fprintf(stderr, "  (%s)\n", sys_errlist[value]);
++    if (value > 0) {
++	fprintf(stderr, "  (%s)\n", strerror(value));
+     } else {
+ 	fprintf(stderr, "\n");
+     }
+@@ -144,8 +142,8 @@
+     va_end(ap);
+ 
+ #ifdef __linux__
+-    if (value > 0 && value < sys_nerr) {
+-	fprintf(stderr, "  (%s)\n", sys_errlist[value]);
++    if (value > 0) {
++	fprintf(stderr, "  (%s)\n", strerror(value));
+     } else {
+ 	fprintf(stderr, "\n");
+     }
+--- mac-fdisk-0.1/fdisk.c
++++ mac-fdisk-0.1/fdisk.c
+@@ -62,6 +62,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <fcntl.h>
+ #include <ctype.h>
+ #include <setjmp.h>
+--- mac-fdisk-0.1/fdisklabel.c
++++ mac-fdisk-0.1/fdisklabel.c
+@@ -38,6 +38,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <fcntl.h>
+ #include <ctype.h>
+ #include <setjmp.h>
+--- mac-fdisk-0.1/io.c
++++ mac-fdisk-0.1/io.c
+@@ -26,9 +26,9 @@
+  */
+ 
+ #include <stdio.h>
+-#ifndef __linux__
+ #include <stdlib.h>
+ #include <fcntl.h>
++#ifndef __linux__
+ #include <SCSI.h>
+ #else
+ #ifdef __GLIBC__
+--- mac-fdisk-0.1/partition_map.c
++++ mac-fdisk-0.1/partition_map.c
+@@ -26,10 +26,9 @@
+  */
+ 
+ #include <stdio.h>
+-#ifndef __linux__
++#include <string.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+-#endif
+ #include <errno.h>
+ 
+ #include <fcntl.h>
+--- mac-fdisk-0.1/pdisk.c
++++ mac-fdisk-0.1/pdisk.c
+@@ -32,10 +32,11 @@
+ #include <getopt.h>
+ #include <stddef.h>
+ #else
+-#include <stdlib.h>
+-#include <unistd.h>
+ #include <SIOUX.h>
+ #endif
++#include <stdlib.h>
++#include <unistd.h>
++#include <string.h>
+ #include <errno.h>
+ 
+ #ifdef __linux__
diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1-r5.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1-r5.ebuild
new file mode 100644
index 000000000000..cb619b85798d
--- /dev/null
+++ b/sys-fs/mac-fdisk/mac-fdisk-0.1-r5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2006 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-r5.ebuild,v 1.1 2006/07/19 20:33:50 vapier Exp $
+
+inherit eutils
+
+DEBRV=13
+DESCRIPTION="Mac/PowerMac disk partitioning utility"
+HOMEPAGE="ftp://ftp.mklinux.apple.com/pub/Other_Tools/"
+SRC_URI="mirror://debian/pool/main/m/mac-fdisk/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/m/mac-fdisk/${PN}_${PV}-${DEBRV}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack mac-fdisk_${PV}.orig.tar.gz
+	mv mac-fdisk-${PV}.orig ${P}
+	cd "${S}"
+	epatch "${DISTDIR}"/mac-fdisk_${PV}-${DEBRV}.diff.gz
+
+	# XXX: this needs to be fixed to not have this 'use ppc64'
+	use ppc64 && epatch ${FILESDIR}/mac-fdisk-0.1-r3-ppc64.patch
+
+	epatch "${FILESDIR}"/largerthan2gb.patch
+	epatch "${FILESDIR}"/${P}-headers.patch
+}
+
+src_install() {
+	into /
+	newsbin fdisk mac-fdisk || die
+	newsbin pdisk pmac-fdisk || die
+
+	into /usr
+	newman mac-fdisk.8.in mac-fdisk.8
+	newman pmac-fdisk.8.in pmac-fdisk.8
+	dodoc README HISTORY
+}