clean up src_unpack and src_install per bug#103633, removed mac-fdisk-0.1 since -r2 is also stable

(Portage version: 2.0.51.19)

7 files changed, 34 insertions, 93 deletions

diff --git a/sys-fs/mac-fdisk/ChangeLog b/sys-fs/mac-fdisk/ChangeLog
index c436bad8e4fe..23e977fcf211 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.10 2005/02/05 21:41:08 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/ChangeLog,v 1.11 2005/08/28 01:15:44 wormo Exp $
+
+  28 Aug 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  mac-fdisk-0.1-r2.ebuild, mac-fdisk-0.1-r3.ebuild, mac-fdisk-0.1-r4.ebuild,
+  -mac-fdisk-0.1.ebuild:
+  clean up src_unpack and src_install per bug #103633
+  removed  mac-fdisk-0.1 since -r2 is also stable
 
 *mac-fdisk-0.1-r4 (05 Feb 2005)
 
diff --git a/sys-fs/mac-fdisk/Manifest b/sys-fs/mac-fdisk/Manifest
index 4701765fef4a..1c513ca4d411 100644
--- a/sys-fs/mac-fdisk/Manifest
+++ b/sys-fs/mac-fdisk/Manifest
@@ -1,15 +1,13 @@
-MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
 MD5 fe8073907e2fc96437df76805a360c21 ChangeLog 2412
-MD5 7ab1bd026b726afb689f0ba4840ae6ee mac-fdisk-0.1-r2.ebuild 1488
-MD5 e8b192ad0f75123f7cc99b76bd77c235 mac-fdisk-0.1.ebuild 1139
-MD5 4d0cf54e4e4693e8bc87b5773f08c1a0 mac-fdisk-0.1-r4.ebuild 1265
-MD5 281b656df5874a8815307dd4d355ef90 mac-fdisk-0.1-r3.ebuild 1218
-MD5 0ea575013202e57b17c15883efd4bfea files/mac-fdisk-0.1-r3-ppc64.patch 16623
-MD5 0d93e85327577ef34c67c6b98380a4ed files/digest-mac-fdisk-0.1-r3 137
+MD5 0aba98060ddbaf1a46277184125bdd8e mac-fdisk-0.1-r2.ebuild 1382
+MD5 ec1e3c8b6f3062c612de062d44646406 mac-fdisk-0.1-r3.ebuild 1112
+MD5 265d430d1f9a367fabae75cafa38e84c mac-fdisk-0.1-r4.ebuild 1159
+MD5 52f9d8e98c8931645c57a3de1c36727d metadata.xml 156
 MD5 1e4edeb8702972aefac52a5b367e9af7 files/digest-mac-fdisk-0.1-r2 137
-MD5 3e9a3be2ca26ae1f824c97f1f4111805 files/digest-mac-fdisk-0.1 136
-MD5 d5ac7220533aeb36ef5ba7128dd2e29d files/mac-fdisk-ppc64.patch 3412
+MD5 0d93e85327577ef34c67c6b98380a4ed files/digest-mac-fdisk-0.1-r3 137
+MD5 0d93e85327577ef34c67c6b98380a4ed files/digest-mac-fdisk-0.1-r4 137
+MD5 2879da41dfb904a48517290e372885fa files/largerthan2gb.patch 345
+MD5 0ea575013202e57b17c15883efd4bfea files/mac-fdisk-0.1-r3-ppc64.patch 16623
 MD5 30a3c81f6200c4ce07ef243b12a48ed4 files/mac-fdisk-ppc.patch 3383
 MD5 70dc7bfd1ffda2901ffdf59b6ebacc58 files/mac-fdisk-ppc64-1.patch 14817
-MD5 2879da41dfb904a48517290e372885fa files/largerthan2gb.patch 345
-MD5 0d93e85327577ef34c67c6b98380a4ed files/digest-mac-fdisk-0.1-r4 137
+MD5 d5ac7220533aeb36ef5ba7128dd2e29d files/mac-fdisk-ppc64.patch 3412
diff --git a/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1 b/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1
deleted file mode 100644
index 2e7306ce3a7f..000000000000
--- a/sys-fs/mac-fdisk/files/digest-mac-fdisk-0.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5dea1f9f8d44fe89c00322c315633443 mac-fdisk_0.1-8.diff.gz 17541
-MD5 24476329fe86ef6ccf222e233e2a99f1 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 54c4b99eecb9..6ffb35bc239d 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
 # 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.7 2005/02/05 21:41:08 hansmi Exp $
+# $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 $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ src_unpack() {
 	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
+	epatch ${DISTDIR}/mac-fdisk_${PV}-${DEBRV}.diff.gz
 
 	# Hard code 2.4 headers in mac-fdisk itself - if no maintainer is found, macfdisk should
 	# be deprecated in favor or parted
@@ -31,10 +31,6 @@ src_unpack() {
 
 	# 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() {
@@ -42,11 +38,10 @@ src_compile() {
 }
 
 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
+	mv mac-fdisk.8.in mac-fdisk.8 || die
+	mv pmac-fdisk.8.in pmac-fdisk.8 || die
+	mv pdisk mac-fdisk || die
+	mv fdisk pmac-fdisk || die
 
 	into /
 	dosbin mac-fdisk pmac-fdisk || die
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 48c00fd87329..3a6380410fc3 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
 # 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.3 2005/02/05 21:41:08 hansmi Exp $
+# $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 $
 
 inherit eutils
 
@@ -21,13 +21,9 @@ src_unpack() {
 	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
+	epatch ${DISTDIR}/mac-fdisk_${PV}-${DEBRV}.diff.gz
 
 	use ppc64 && epatch ${FILESDIR}/mac-fdisk-0.1-r3-ppc64.patch
-
-	cd ${WORKDIR}
-	chown -R 0:0 *
-	chmod -R a+r-w+X,u+w *
 }
 
 src_compile() {
@@ -35,11 +31,10 @@ src_compile() {
 }
 
 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
+	mv mac-fdisk.8.in mac-fdisk.8 || die
+	mv pmac-fdisk.8.in pmac-fdisk.8 || die
+	mv pdisk mac-fdisk || die
+	mv fdisk pmac-fdisk || die
 
 	into /
 	dosbin mac-fdisk pmac-fdisk || die
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 71e2f50492ca..fe5ac319842f 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
 # 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.1 2005/02/05 21:41:08 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mac-fdisk/mac-fdisk-0.1-r4.ebuild,v 1.2 2005/08/28 01:15:44 wormo Exp $
 
 inherit eutils
 
@@ -21,15 +21,11 @@ src_unpack() {
 	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
+	epatch ${DISTDIR}/mac-fdisk_${PV}-${DEBRV}.diff.gz
 
 	use ppc64 && epatch ${FILESDIR}/mac-fdisk-0.1-r3-ppc64.patch
 
 	epatch ${FILESDIR}/largerthan2gb.patch
-
-	cd ${WORKDIR}
-	chown -R 0:0 *
-	chmod -R a+r-w+X,u+w *
 }
 
 src_compile() {
@@ -37,11 +33,10 @@ src_compile() {
 }
 
 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
+	mv mac-fdisk.8.in mac-fdisk.8 || die
+	mv pmac-fdisk.8.in pmac-fdisk.8 || die
+	mv pdisk mac-fdisk || die
+	mv fdisk pmac-fdisk || die
 
 	into /
 	dosbin mac-fdisk pmac-fdisk || die
diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1.ebuild
deleted file mode 100644
index 7e484e71e3f7..000000000000
--- a/sys-fs/mac-fdisk/mac-fdisk-0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2005 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.ebuild,v 1.5 2005/02/05 21:41:08 hansmi Exp $
-
-DEBRV=8
-DESCRIPTION="Mac/PowerMac disk partitioning utility"
-HOMEPAGE="ftp://ftp.mklinux.apple.com/pub/Other_Tools/"
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc ppc64"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	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
-	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 pmac-fdisk.8
-	dodoc README HISTORY
-}