mac-fdisk and mac-pdisk got swapped in -r5, put them back to normal

  (Bug #142873)

(Portage version: 2.1-r1)

6 files changed, 62 insertions, 7 deletions

diff --git a/sys-fs/mac-fdisk/ChangeLog b/sys-fs/mac-fdisk/ChangeLog
index dd194e27a7c8..78f2c0cd7e78 100644
--- a/sys-fs/mac-fdisk/ChangeLog
+++ b/sys-fs/mac-fdisk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/mac-fdisk
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/ChangeLog,v 1.14 2006/08/08 23:47:45 wormo Exp $
+
+*mac-fdisk-0.1-r6 (10 Aug 2006)
+
+  08 Aug 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  -mac-fdisk-0.1-r5.ebuild, +mac-fdisk-0.1-r6.ebuild:
+  mac-fdisk and mac-pdisk got swapped in -r5, put them back to normal
+  (Bug #142873)
 
 *mac-fdisk-0.1-r5 (19 Jul 2006)
 
diff --git a/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r6 b/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r6
new file mode 100644
index 000000000000..5511aa3a3caa
--- /dev/null
+++ b/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r6
@@ -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/mac-fdisk-0.1-r2.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1-r2.ebuild
index 6ffb35bc239d..4f384a9cb943 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-2005 Gentoo Foundation
+# 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-r2.ebuild,v 1.8 2005/08/28 01:15:44 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/mac-fdisk-0.1-r2.ebuild,v 1.9 2006/08/08 23:47:45 wormo 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 3a6380410fc3..c501bf0f7434 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-2005 Gentoo Foundation
+# 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-r3.ebuild,v 1.4 2005/08/28 01:15:44 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/mac-fdisk-0.1-r3.ebuild,v 1.5 2006/08/08 23:47:45 wormo 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
index 2dbe0d32f1a0..b1db0e547c0d 100644
--- a/sys-fs/mac-fdisk/mac-fdisk-0.1-r4.ebuild
+++ b/sys-fs/mac-fdisk/mac-fdisk-0.1-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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-r4.ebuild,v 1.3 2005/09/11 02:10:13 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/mac-fdisk-0.1-r4.ebuild,v 1.4 2006/08/08 23:47:45 wormo Exp $
 
 inherit eutils
 
diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1-r6.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1-r6.ebuild
new file mode 100644
index 000000000000..24f5218c6493
--- /dev/null
+++ b/sys-fs/mac-fdisk/mac-fdisk-0.1-r6.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-r6.ebuild,v 1.1 2006/08/08 23:47:45 wormo 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 pdisk mac-fdisk || die
+	newsbin fdisk pmac-fdisk || die
+
+	into /usr
+	newman mac-fdisk.8.in mac-fdisk.8
+	newman pmac-fdisk.8.in pmac-fdisk.8
+	dodoc README HISTORY
+}