PPC 2.6 headers update

6 files changed, 214 insertions, 8 deletions

diff --git a/sys-apps/chpax/Manifest b/sys-apps/chpax/Manifest
index f3f5ba631732..538af31f5b65 100644
--- a/sys-apps/chpax/Manifest
+++ b/sys-apps/chpax/Manifest
@@ -1,8 +1,20 @@
-MD5 d95ac8cbc92ddd4a9e401455d79571f7 files/digest-chpax-0.5 59
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c0adbdf0edc9b770ffcc11e036f748de ChangeLog 2931
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 7473d1cf44e5219c027ab7b882817fda chpax-0.5.ebuild 954
+MD5 ca02d338bf2a6ec01d41689482c61749 chpax-0.6.1.ebuild 1062
 MD5 2b490b5e194b831376794358060fe618 files/pax-conf.d 1767
+MD5 d95ac8cbc92ddd4a9e401455d79571f7 files/digest-chpax-0.5 59
 MD5 10acb7639b93302287f5c1b3f06bdb0d files/pax-init.d 1740
 MD5 1ae95ccec87f81057389495cbc6bb641 files/digest-chpax-0.6.1 62
-MD5 c0adbdf0edc9b770ffcc11e036f748de ChangeLog 2931
-MD5 7473d1cf44e5219c027ab7b882817fda chpax-0.5.ebuild 954
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 0cb2e7836dd08761db8cdc354caa7807 chpax-0.6.1.ebuild 1064
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iQCVAwUBQLzneJ4WFLgrx1GWAQIEKAQAoRkd6MOGSDrmogTfILNUXfq09xehalja
+kzQVp3ROt+LKqrw0VsiILS3qUeeiBhQgxjdfG0mc5lv116ZdLrV/B6bx+AYWARyF
+yLhKJo4k0Dori1UPQO7r34ucdEhVKZhxOWFLZHQF1YURtUYcze/bHmPuVoHOcTVH
+c/UEBQ0ddU4=
+=Sjo1
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/mac-fdisk/ChangeLog b/sys-apps/mac-fdisk/ChangeLog
index e243117cb42e..5c7c7e4e2374 100644
--- a/sys-apps/mac-fdisk/ChangeLog
+++ b/sys-apps/mac-fdisk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/mac-fdisk
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.8 2004/05/29 02:49:41 tgall Exp $
+# $Id: ChangeLog,v 1.9 2004/06/01 20:31:46 pvdabeel Exp $
+
+*mac-fdisk-0.1-r2 (01 Jun 2004)
+
+  01 Jun 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> 
+  mac-fdisk-0.1-r2.ebuild, files/mac-fdisk-ppc.patch:
+  patched macfdisk for 2.6 headers on ppc, ppc64 -r1 patches 
+  is not applied by default on ppc
 
   28 May 2004; Tom Gall <tgall@gentoo.org> mac-fdisk-0.1-r1.ebuild:
   fix a number of 64 bit problems
diff --git a/sys-apps/mac-fdisk/Manifest b/sys-apps/mac-fdisk/Manifest
index 2373a709f6d0..a297f4ac4a4c 100644
--- a/sys-apps/mac-fdisk/Manifest
+++ b/sys-apps/mac-fdisk/Manifest
@@ -1,8 +1,11 @@
-MD5 27cc2012d631fbf3f675fd6d6252f8f0 ChangeLog 920
-MD5 12d177cd347f36939c2552df9acda3cd mac-fdisk-0.1-r1.ebuild 1369
+MD5 50e8b00cec91fc95283f8210da1ce687 ChangeLog 1168
 MD5 7bc824c7800055cf588a9a040be8ee37 mac-fdisk-0.1.ebuild 1225
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 974c6a7b6be0d3d7d04dbcf10cefbb73 mac-fdisk-0.1-r2.ebuild 1601
+MD5 12d177cd347f36939c2552df9acda3cd mac-fdisk-0.1-r1.ebuild 1369
 MD5 3e9a3be2ca26ae1f824c97f1f4111805 files/digest-mac-fdisk-0.1 136
 MD5 1e4edeb8702972aefac52a5b367e9af7 files/digest-mac-fdisk-0.1-r1 137
 MD5 d5ac7220533aeb36ef5ba7128dd2e29d files/mac-fdisk-ppc64.patch 3412
 MD5 70dc7bfd1ffda2901ffdf59b6ebacc58 files/mac-fdisk-ppc64-1.patch 14817
+MD5 30a3c81f6200c4ce07ef243b12a48ed4 files/mac-fdisk-ppc.patch 3383
+MD5 1e4edeb8702972aefac52a5b367e9af7 files/digest-mac-fdisk-0.1-r2 137
diff --git a/sys-apps/mac-fdisk/files/digest-mac-fdisk-0.1-r2 b/sys-apps/mac-fdisk/files/digest-mac-fdisk-0.1-r2
new file mode 100644
index 000000000000..a2615b38d3a2
--- /dev/null
+++ b/sys-apps/mac-fdisk/files/digest-mac-fdisk-0.1-r2
@@ -0,0 +1,2 @@
+MD5 24476329fe86ef6ccf222e233e2a99f1 mac-fdisk_0.1.orig.tar.gz 55817
+MD5 63b0cfe92f48d12603a9c6f7421febd8 mac-fdisk_0.1-10.diff.gz 18591
diff --git a/sys-apps/mac-fdisk/files/mac-fdisk-ppc.patch b/sys-apps/mac-fdisk/files/mac-fdisk-ppc.patch
new file mode 100644
index 000000000000..d06099c7be95
--- /dev/null
+++ b/sys-apps/mac-fdisk/files/mac-fdisk-ppc.patch
@@ -0,0 +1,121 @@
+Files mac-fdisk-0.1/fdisk and /root/mac-fdisk-0.1/fdisk differ
+diff -uNr mac-fdisk-0.1/fdisk.c /root/mac-fdisk-0.1/fdisk.c
+--- mac-fdisk-0.1/fdisk.c	2004-03-30 04:34:58.394924976 +0000
++++ /root/mac-fdisk-0.1/fdisk.c	2004-03-30 03:53:26.447986904 +0000
+@@ -59,9 +59,88 @@
+  */
+ 
+ 
++/* ----------- */
++#define _PPC_TYPES_H
++#define BITS_PER_LONG 32
++
++typedef __signed__ char __s8;
++typedef signed char s8;
++typedef unsigned char u8;
++typedef unsigned char __u8;
++
++typedef __signed__ short __s16;
++typedef signed short s16;
++typedef unsigned short __u16;
++typedef unsigned short u16;
++
++typedef __signed__ int __s32;
++typedef signed int s32;
++typedef unsigned int __u32;
++typedef unsigned int u32;
++
++typedef __signed__ long __s64;
++typedef signed long s64;
++typedef unsigned long __u64;
++typedef unsigned long u64;
++
++typedef struct {
++        __u32 u[4];
++} __vector128;
++
++typedef __vector128 vector128;
++
++typedef u32 dma_addr_t;
++typedef u64 dma64_addr_t;
++
++typedef struct {
++        unsigned long entry;
++        unsigned long toc;
++        unsigned long env;
++} func_descr_t;
++
++typedef unsigned int umode_t;
++
++#define BITS_TO_LONGS(bits) \
++        (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG)
++#define DECLARE_BITMAP(name,bits) \
++        unsigned long name[BITS_TO_LONGS(bits)]
++#define CLEAR_BITMAP(name,bits) \
++        memset(name, 0, BITS_TO_LONGS(bits)*sizeof(unsigned long))
++
++struct partition {
++        unsigned char boot_ind;         /* 0x80 - active */
++        unsigned char head;             /* starting head */
++        unsigned char sector;           /* starting sector */
++        unsigned char cyl;              /* starting cylinder */
++        unsigned char sys_ind;          /* What partition type */
++        unsigned char end_head;         /* end head */
++        unsigned char end_sector;       /* end sector */
++        unsigned char end_cyl;          /* end cylinder */
++        unsigned int start_sect;        /* starting sector counting from 0 */
++        unsigned int nr_sects;          /* nr of sectors in partition */
++} __attribute__((packed));
++
++
++struct hd_geometry {
++      unsigned char heads;
++      unsigned char sectors;
++      unsigned short cylinders;
++      unsigned long start;
++};
++
++/* hd/ide ctl's that pass (arg) ptrs to user space are numbered 0x030n/0x031n */
++#define HDIO_GETGEO             0x0301  /* get device geometry */
++
++#define BLKRRPART  _IO(0x12,95) /* re-read partition table */
++
++/* ---------- */
++
++typedef unsigned short kdev_t;	/* BAD hack; kdev_t is not exported */
++
++
+ #include <unistd.h>
+ #include <stdio.h>
+-#include <stdlib.h>
++#include <stdlib.h> 
+ #include <fcntl.h>
+ #include <ctype.h>
+ #include <setjmp.h>
+@@ -70,14 +149,6 @@
+ 
+ #include <sys/ioctl.h>
+ 
+-#include <linux/types.h>
+-
+-typedef unsigned short kdev_t;	/* BAD hack; kdev_t is not exported */
+-
+-#include <linux/genhd.h>
+-#include <linux/hdreg.h>
+-#include <linux/fs.h>
+-
+ #include "fdisk.h"
+ 
+ #define hex_val(c)	({ \
+Files mac-fdisk-0.1/fdisk.o and /root/mac-fdisk-0.1/fdisk.o differ
+diff -uNr mac-fdisk-0.1/fdisklabel.c /root/mac-fdisk-0.1/fdisklabel.c
+--- mac-fdisk-0.1/fdisklabel.c	2004-03-30 04:34:58.396924672 +0000
++++ /root/mac-fdisk-0.1/fdisklabel.c	2004-03-30 01:16:31.974999800 +0000
+@@ -46,6 +46,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/param.h>
+ 
++#include <asm/types.h>
+ #include <linux/hdreg.h>
+ #include <linux/fs.h>
+ 
diff --git a/sys-apps/mac-fdisk/mac-fdisk-0.1-r2.ebuild b/sys-apps/mac-fdisk/mac-fdisk-0.1-r2.ebuild
new file mode 100644
index 000000000000..b0c99e181ff4
--- /dev/null
+++ b/sys-apps/mac-fdisk/mac-fdisk-0.1-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mac-fdisk/mac-fdisk-0.1-r2.ebuild,v 1.1 2004/06/01 20:31:46 pvdabeel Exp $
+
+inherit eutils
+
+S=${WORKDIR}/${P}
+DEBRV=10
+DESCRIPTION="Mac/PowerMac disk partitinoing utility"
+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"
+HOMEPAGE="ftp://ftp.mklinux.apple.com/pub/Other_Tools/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~ppc -x86 -amd64 -alpha -hppa -mips -sparc ~ppc64"
+DEPEND="virtual/glibc"
+
+src_unpack() {
+	cd ${WORKDIR}
+	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
+	
+	# Hard code 2.4 headers in mac-fdisk itself - if no maintainer is found, macfdisk should
+	# be deprecated in favor or parted
+	
+	[ `use ppc` ] && epatch ${FILESDIR}/mac-fdisk-ppc.patch
+	[ `use ppc64` ] && epatch ${FILESDIR}/mac-fdisk-ppc64.patch
+	
+	# this can be applied on ppc32 too:
+	[ `use ppc64` ] && epatch ${FILESDIR}/mac-fdisk-ppc64-1.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
+	dosbin pmac-fdisk
+
+	into /usr
+
+	doman mac-fdisk.8
+	doman pmac-fdisk.8
+	dodoc README
+	dodoc HISTORY
+}