Cleanup sources.

Package-Manager: portage-2.1.1_pre3-r1

8 files changed, 248 insertions, 19 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/Manifest b/sys-fs/mac-fdisk/Manifest
index 72ca07309b79..26a97a74fd02 100644
--- a/sys-fs/mac-fdisk/Manifest
+++ b/sys-fs/mac-fdisk/Manifest
@@ -1,23 +1,74 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
+AUX largerthan2gb.patch 345 RMD160 1b50db957b7e218d40c51081b568fc44d0623cdf SHA1 5a636840c08f19430ffb7bfb0997e00338728bb4 SHA256 c635f03493854053ba41af9bec6cc9aab5ae2b73a7906c74bb297ee63dcc1cbb
+MD5 2879da41dfb904a48517290e372885fa files/largerthan2gb.patch 345
+RMD160 1b50db957b7e218d40c51081b568fc44d0623cdf files/largerthan2gb.patch 345
+SHA256 c635f03493854053ba41af9bec6cc9aab5ae2b73a7906c74bb297ee63dcc1cbb files/largerthan2gb.patch 345
+AUX mac-fdisk-0.1-headers.patch 2218 RMD160 d9efe5117a58482a1029191820c01665ecf17e0f SHA1 570d67d3610db962308635a1ccf3f52e551f1726 SHA256 c03ebe8c9f9afc0d532682e8684f76b4a99de7edc3ca58102f1f8b361f293153
+MD5 59275685aa3f099a9a7e880eb2268ea3 files/mac-fdisk-0.1-headers.patch 2218
+RMD160 d9efe5117a58482a1029191820c01665ecf17e0f files/mac-fdisk-0.1-headers.patch 2218
+SHA256 c03ebe8c9f9afc0d532682e8684f76b4a99de7edc3ca58102f1f8b361f293153 files/mac-fdisk-0.1-headers.patch 2218
+AUX mac-fdisk-0.1-r3-ppc64.patch 16623 RMD160 900a0f8d64c5298c61a1ab38da19969344cb2529 SHA1 c6c441d51bc500074141bd0ef4b758c0eb6b1f2f SHA256 0699977d0f600552e369fa4be3c3f302e4bda9782a1c2f9343a8aa793fd7acf9
+MD5 0ea575013202e57b17c15883efd4bfea files/mac-fdisk-0.1-r3-ppc64.patch 16623
+RMD160 900a0f8d64c5298c61a1ab38da19969344cb2529 files/mac-fdisk-0.1-r3-ppc64.patch 16623
+SHA256 0699977d0f600552e369fa4be3c3f302e4bda9782a1c2f9343a8aa793fd7acf9 files/mac-fdisk-0.1-r3-ppc64.patch 16623
+AUX mac-fdisk-ppc.patch 3383 RMD160 dc4d671a968cab849efc184d0714b7ede00fdef7 SHA1 9d371b04773b74de9081fc0076f0c2fd12de8233 SHA256 6f193b87c34afcf446a5df195c888b63a71ffec752f274107d16c28ac05ac049
+MD5 30a3c81f6200c4ce07ef243b12a48ed4 files/mac-fdisk-ppc.patch 3383
+RMD160 dc4d671a968cab849efc184d0714b7ede00fdef7 files/mac-fdisk-ppc.patch 3383
+SHA256 6f193b87c34afcf446a5df195c888b63a71ffec752f274107d16c28ac05ac049 files/mac-fdisk-ppc.patch 3383
+AUX mac-fdisk-ppc64-1.patch 14817 RMD160 c68bd1b5b10d0d8634bac6bf1657733f45398fd1 SHA1 e8988d78f0fafa34814c0cf4f69516af66183eee SHA256 de2bef62838164523806418d7ddac2fd9260726b9ef060bfc77244fbed937186
+MD5 70dc7bfd1ffda2901ffdf59b6ebacc58 files/mac-fdisk-ppc64-1.patch 14817
+RMD160 c68bd1b5b10d0d8634bac6bf1657733f45398fd1 files/mac-fdisk-ppc64-1.patch 14817
+SHA256 de2bef62838164523806418d7ddac2fd9260726b9ef060bfc77244fbed937186 files/mac-fdisk-ppc64-1.patch 14817
+AUX mac-fdisk-ppc64.patch 3412 RMD160 ad5cd29afd9ca224b8f7a416ee2edd0c8c18188c SHA1 51e4644268074f8d4b899877b45b5904cb99a0b3 SHA256 ca521dc9e896fb5c44e53a663087a0c1ca3f5f6f6b5bd8e690c45cfbf8ccbcd4
+MD5 d5ac7220533aeb36ef5ba7128dd2e29d files/mac-fdisk-ppc64.patch 3412
+RMD160 ad5cd29afd9ca224b8f7a416ee2edd0c8c18188c files/mac-fdisk-ppc64.patch 3412
+SHA256 ca521dc9e896fb5c44e53a663087a0c1ca3f5f6f6b5bd8e690c45cfbf8ccbcd4 files/mac-fdisk-ppc64.patch 3412
+DIST mac-fdisk_0.1-10.diff.gz 18591 RMD160 c61fe8aa8ff2a40066f55fe5b5dc9a63cf4e7ad8 SHA1 85dc8e58f45114f225574c39779b2bb9e548aae8 SHA256 213d3113015a14bcfac159e3c73207adff55a2f726a585fdb2f87411017542e8
+DIST mac-fdisk_0.1-11.diff.gz 19529 RMD160 90ede691daf990427181dc5485172d8ca8f82c7d SHA1 e69e4ac0e827b4e6499bfddbc16573585a33fc7b SHA256 7fc6c859e8c22ae05c24397bb2bb849705ab235329c3bc5c206e7e1c03787afd
+DIST mac-fdisk_0.1-13.diff.gz 19615 RMD160 cc6ddbdee6c8bac9d03d6ae50fc6d23e29a21188 SHA1 725d13418c087059cba76cc8b227e72d7b99ada2 SHA256 a6dd96c8ddce896dac2e2b2c2eff346d339ae697cd19e2ac9676556d8bc63644
+DIST mac-fdisk_0.1.orig.tar.gz 55817 RMD160 eb70e362469268ec7644c999e0bc7a5a92675992 SHA1 47013d3d74892d53c31a73e75c32fda2bf173252 SHA256 7059fc4ba41ca2ef857e1092e9c56e910f27693d407b5c3d78f7102ad0c56a66
+EBUILD mac-fdisk-0.1-r2.ebuild 1381 RMD160 c76d26888379ae39863598003c6b140fcfc1719c SHA1 5d1e360debc25d39de24d573aca79e005a4342e7 SHA256 5dbf29966960ca4e1157ac1e523dc96b16551b1619300149a7ba22999eac49eb
 MD5 bec943d764f3b651fe374ef5ad134dbb mac-fdisk-0.1-r2.ebuild 1381
-MD5 f05e96cc90f3813bc8781843a5a9327b ChangeLog 2785
+RMD160 c76d26888379ae39863598003c6b140fcfc1719c mac-fdisk-0.1-r2.ebuild 1381
+SHA256 5dbf29966960ca4e1157ac1e523dc96b16551b1619300149a7ba22999eac49eb mac-fdisk-0.1-r2.ebuild 1381
+EBUILD mac-fdisk-0.1-r3.ebuild 1111 RMD160 e884182797677c66b35910a66fbce550bfeb3768 SHA1 f11454216d719412a9be8e7dec2a45b5ca0e6b54 SHA256 13961b00ab881389a740af4c57b32692a9edf29c85e6773c133290e588688d04
 MD5 12821ee13bfd9749e8888cf06fe66013 mac-fdisk-0.1-r3.ebuild 1111
+RMD160 e884182797677c66b35910a66fbce550bfeb3768 mac-fdisk-0.1-r3.ebuild 1111
+SHA256 13961b00ab881389a740af4c57b32692a9edf29c85e6773c133290e588688d04 mac-fdisk-0.1-r3.ebuild 1111
+EBUILD mac-fdisk-0.1-r4.ebuild 1164 RMD160 2978d78a1fb95af0d869a2b1091f4c0f15dc8784 SHA1 29b21886daf541a9e42d7b7c9af2f7f4ae05661e SHA256 b31e72f112f334a155d84d398be528a719e59ff1db1440c7cfb8acf732968d90
 MD5 7da6136097a9326236459cbaf957cfd0 mac-fdisk-0.1-r4.ebuild 1164
-MD5 0d93e85327577ef34c67c6b98380a4ed files/digest-mac-fdisk-0.1-r3 137
-MD5 30a3c81f6200c4ce07ef243b12a48ed4 files/mac-fdisk-ppc.patch 3383
-MD5 0d93e85327577ef34c67c6b98380a4ed files/digest-mac-fdisk-0.1-r4 137
-MD5 0ea575013202e57b17c15883efd4bfea files/mac-fdisk-0.1-r3-ppc64.patch 16623
-MD5 d5ac7220533aeb36ef5ba7128dd2e29d files/mac-fdisk-ppc64.patch 3412
-MD5 2879da41dfb904a48517290e372885fa files/largerthan2gb.patch 345
-MD5 1e4edeb8702972aefac52a5b367e9af7 files/digest-mac-fdisk-0.1-r2 137
-MD5 70dc7bfd1ffda2901ffdf59b6ebacc58 files/mac-fdisk-ppc64-1.patch 14817
+RMD160 2978d78a1fb95af0d869a2b1091f4c0f15dc8784 mac-fdisk-0.1-r4.ebuild 1164
+SHA256 b31e72f112f334a155d84d398be528a719e59ff1db1440c7cfb8acf732968d90 mac-fdisk-0.1-r4.ebuild 1164
+EBUILD mac-fdisk-0.1-r5.ebuild 1127 RMD160 d15ec97e422cfec87afd3925d398807f61def305 SHA1 55c0c618a4aa0cbb7f88b7fa118441ec482f8631 SHA256 1a81bc44f5bf7e263f36b081121b987629429cb170cb6bbe889efff7cc25a90e
+MD5 55749b5f07f9e04046cb76a6c3629bdc mac-fdisk-0.1-r5.ebuild 1127
+RMD160 d15ec97e422cfec87afd3925d398807f61def305 mac-fdisk-0.1-r5.ebuild 1127
+SHA256 1a81bc44f5bf7e263f36b081121b987629429cb170cb6bbe889efff7cc25a90e mac-fdisk-0.1-r5.ebuild 1127
+MISC ChangeLog 2952 RMD160 98cacbeace563dbf065a0833c9306daf66c9f1b2 SHA1 7f2e2e82ef0e5069c587644763c4f1d4e4868b97 SHA256 ec76710d0cc244938b034a48178b56f94680050f81fd3e068fbc26da96ace244
+MD5 425873460a0ee22e9d87c50cdc8843ce ChangeLog 2952
+RMD160 98cacbeace563dbf065a0833c9306daf66c9f1b2 ChangeLog 2952
+SHA256 ec76710d0cc244938b034a48178b56f94680050f81fd3e068fbc26da96ace244 ChangeLog 2952
+MISC metadata.xml 156 RMD160 a57e9e3e71bd04aa138850dc8cce8dbe9e1cd5a2 SHA1 30b3e2b32ee2b52b68ad1d77f04f2c75980bf7d4 SHA256 d57f79be439079b5c78578b17eb3ee7d20883353b1c40a716d3f1ab06af34851
+MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
+RMD160 a57e9e3e71bd04aa138850dc8cce8dbe9e1cd5a2 metadata.xml 156
+SHA256 d57f79be439079b5c78578b17eb3ee7d20883353b1c40a716d3f1ab06af34851 metadata.xml 156
+MD5 c47604df07dd0c49cca6e3e3db1224d4 files/digest-mac-fdisk-0.1-r2 503
+RMD160 573911c21af54c2aee1e78693215eb84de6fb0f5 files/digest-mac-fdisk-0.1-r2 503
+SHA256 19a2526f17d7c59a4786fe29beafaa2ce5fb5b247077fd0657a3c4dfff7a5970 files/digest-mac-fdisk-0.1-r2 503
+MD5 de27a76e0cec9cfc400ab82a253d4e93 files/digest-mac-fdisk-0.1-r3 503
+RMD160 c61eb6a7595b5120656e25b9586bf733a1eca8f2 files/digest-mac-fdisk-0.1-r3 503
+SHA256 785a6d169abbff2a82055b75bd0d81ccca889fb13d6c89c56bd4e3aaf0b0a9ea files/digest-mac-fdisk-0.1-r3 503
+MD5 de27a76e0cec9cfc400ab82a253d4e93 files/digest-mac-fdisk-0.1-r4 503
+RMD160 c61eb6a7595b5120656e25b9586bf733a1eca8f2 files/digest-mac-fdisk-0.1-r4 503
+SHA256 785a6d169abbff2a82055b75bd0d81ccca889fb13d6c89c56bd4e3aaf0b0a9ea files/digest-mac-fdisk-0.1-r4 503
+MD5 9dd208db7d1b154e282ff01e7324d24d files/digest-mac-fdisk-0.1-r5 503
+RMD160 970fb7d5a3a2a52f8606a8fbe17ecfbeb4d06934 files/digest-mac-fdisk-0.1-r5 503
+SHA256 e3eebbe6ad663851fdb4ca00a91b7094ef033277b5eaadee2d830656b9f0155f files/digest-mac-fdisk-0.1-r5 503
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFDI5RdmOfEJZHYOKcRAjGoAKCovkGLCMYPstAHblcJXrINxxZKKACdHor1
-IPY7HO2j+tY+Y2cUuUgln7w=
-=T2X3
+iD8DBQFEvpc6amhnQswr0vIRAiSCAKCLG/sHgxo2B3RCbkkQLK1AlnKFpQCggLmr
+iPpEEKcpDOrPiukpEFXWSkE=
+=e0t5
 -----END PGP SIGNATURE-----
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
+}