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

  (Bug #142873)

Package-Manager: portage-2.1-r1

3 files changed, 27 insertions, 75 deletions

diff --git a/sys-fs/mac-fdisk/Manifest b/sys-fs/mac-fdisk/Manifest
index 26a97a74fd02..4c7cd2de6b9b 100644
--- a/sys-fs/mac-fdisk/Manifest
+++ b/sys-fs/mac-fdisk/Manifest
@@ -29,26 +29,26 @@ DIST mac-fdisk_0.1-10.diff.gz 18591 RMD160 c61fe8aa8ff2a40066f55fe5b5dc9a63cf4e7
 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
-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
-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
+EBUILD mac-fdisk-0.1-r2.ebuild 1381 RMD160 9479fe87987ca620ba03a7b07ab5518004d41345 SHA1 3168221bec18de2f437accebf40c858e41a4342e SHA256 43f3218f4aca744572cb60eea08f49af5b9879e502134ac9e9871f96ac397f36
+MD5 421c349e89f33f6e4bc4ee601deb4bed mac-fdisk-0.1-r2.ebuild 1381
+RMD160 9479fe87987ca620ba03a7b07ab5518004d41345 mac-fdisk-0.1-r2.ebuild 1381
+SHA256 43f3218f4aca744572cb60eea08f49af5b9879e502134ac9e9871f96ac397f36 mac-fdisk-0.1-r2.ebuild 1381
+EBUILD mac-fdisk-0.1-r3.ebuild 1111 RMD160 e123d7d57e51b9013f4dd0fae2150cdcc5aa7faf SHA1 8570f8a1d3d8c1357273531492c4a1933fd58941 SHA256 2645e999a8e4ed0b305b532bc6d47c417bbef7d5c5fbeefc537cf9a8a73c4fe2
+MD5 55d14b0765b250bce58ef4c64d4883cb mac-fdisk-0.1-r3.ebuild 1111
+RMD160 e123d7d57e51b9013f4dd0fae2150cdcc5aa7faf mac-fdisk-0.1-r3.ebuild 1111
+SHA256 2645e999a8e4ed0b305b532bc6d47c417bbef7d5c5fbeefc537cf9a8a73c4fe2 mac-fdisk-0.1-r3.ebuild 1111
+EBUILD mac-fdisk-0.1-r4.ebuild 1163 RMD160 4aa0d95b26bb605807b31650f6fe88c20072c1eb SHA1 825fcb16589d4c0ef98cc248b4a5aaf5bf98d600 SHA256 7eeccf8cd2d61685c2686122dd89ef5c76639648b0d0e6b0017544881c4bb77d
+MD5 d4fe65bb6fa39ef4483140ed442dc369 mac-fdisk-0.1-r4.ebuild 1163
+RMD160 4aa0d95b26bb605807b31650f6fe88c20072c1eb mac-fdisk-0.1-r4.ebuild 1163
+SHA256 7eeccf8cd2d61685c2686122dd89ef5c76639648b0d0e6b0017544881c4bb77d mac-fdisk-0.1-r4.ebuild 1163
+EBUILD mac-fdisk-0.1-r6.ebuild 1126 RMD160 950cb593811a36c83de444d7c1d239e29c3d9384 SHA1 99758369a68500e2dbc1ba03abcda0bfa8f9d015 SHA256 23905af2c6bb79607df7e8632640219f2759664776a8fbba534b20982eaafe88
+MD5 1a9d8c091871fdd9330f6414ec67e1f9 mac-fdisk-0.1-r6.ebuild 1126
+RMD160 950cb593811a36c83de444d7c1d239e29c3d9384 mac-fdisk-0.1-r6.ebuild 1126
+SHA256 23905af2c6bb79607df7e8632640219f2759664776a8fbba534b20982eaafe88 mac-fdisk-0.1-r6.ebuild 1126
+MISC ChangeLog 3185 RMD160 a032adc2a1dc050dbc182a19b25aa6127df357c9 SHA1 f5c691c40078850a033a5bf557e89a7e9dc50ee2 SHA256 fabb16e9d8590e8df1b844c3925ee4ada588fe8b7ec57705e39f66abe4708b35
+MD5 7b4db6477eb5b8cb18538942edc47d49 ChangeLog 3185
+RMD160 a032adc2a1dc050dbc182a19b25aa6127df357c9 ChangeLog 3185
+SHA256 fabb16e9d8590e8df1b844c3925ee4ada588fe8b7ec57705e39f66abe4708b35 ChangeLog 3185
 MISC metadata.xml 156 RMD160 a57e9e3e71bd04aa138850dc8cce8dbe9e1cd5a2 SHA1 30b3e2b32ee2b52b68ad1d77f04f2c75980bf7d4 SHA256 d57f79be439079b5c78578b17eb3ee7d20883353b1c40a716d3f1ab06af34851
 MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
 RMD160 a57e9e3e71bd04aa138850dc8cce8dbe9e1cd5a2 metadata.xml 156
@@ -62,13 +62,13 @@ SHA256 785a6d169abbff2a82055b75bd0d81ccca889fb13d6c89c56bd4e3aaf0b0a9ea files/di
 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
+MD5 9dd208db7d1b154e282ff01e7324d24d files/digest-mac-fdisk-0.1-r6 503
+RMD160 970fb7d5a3a2a52f8606a8fbe17ecfbeb4d06934 files/digest-mac-fdisk-0.1-r6 503
+SHA256 e3eebbe6ad663851fdb4ca00a91b7094ef033277b5eaadee2d830656b9f0155f files/digest-mac-fdisk-0.1-r6 503
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFEvpc6amhnQswr0vIRAiSCAKCLG/sHgxo2B3RCbkkQLK1AlnKFpQCggLmr
-iPpEEKcpDOrPiukpEFXWSkE=
-=e0t5
+iD8DBQFE2856/NoSW7FuNV8RAhKuAJ0U+XnUwdFa9KKK60a6ijJkPxg9PwCeLeWE
+MT0rphlod4vumDgp06tvJts=
+=nQMZ
 -----END PGP SIGNATURE-----
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
deleted file mode 100644
index 5511aa3a3caa..000000000000
--- a/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1-r5
+++ /dev/null
@@ -1,6 +0,0 @@
-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-r5.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1-r5.ebuild
deleted file mode 100644
index cb619b85798d..000000000000
--- a/sys-fs/mac-fdisk/mac-fdisk-0.1-r5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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
-}