From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 25 Sep 2005 10:09:11 +0000 (+0000)
Subject: add proper quoting, use make_wrapper, and add proper error checking
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b95b74891d99609007b05e2599d8780b93d5b757;p=gentoo.git

add proper quoting, use make_wrapper, and add proper error checking
Package-Manager: portage-2.0.52-r1 http://www.bash.org/?136501
---

diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 5e2c52d4faa6..49266dd1dfad 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,11 +1,21 @@
-MD5 2a022ba9afcf119abbfeb7cce8d60c40 p7zip-4.27.ebuild 1364
-MD5 63b3652045bfe3ef43c505e35eced205 p7zip-4.20-r1.ebuild 1024
-MD5 7dc260e51b3493dde5e2bb75e004afe2 ChangeLog 4066
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 66daf69a44c4ec8add00f66d8ee0661d metadata.xml 221
+MD5 4666c0fec3c5867536b14d2040d5f2a4 p7zip-4.27.ebuild 1348
 MD5 9366cbb83b1cef1ad42a9a45cd46c029 p7zip-4.20.ebuild 942
-MD5 50e648aabf8c53fdcf5629d5db174dbc files/7z 140
-MD5 e76d85861cf61f0ff8524a4e1aef33fa files/7za 142
+MD5 7dc260e51b3493dde5e2bb75e004afe2 ChangeLog 4066
+MD5 63b3652045bfe3ef43c505e35eced205 p7zip-4.20-r1.ebuild 1024
 MD5 1defb955ab99c1352cd6d52a4839bff6 files/digest-p7zip-4.20 67
+MD5 1defb955ab99c1352cd6d52a4839bff6 files/digest-p7zip-4.20-r1 67
+MD5 50e648aabf8c53fdcf5629d5db174dbc files/7z 140
 MD5 4ed52dc9ef4b9514b9a07b51b450257a files/digest-p7zip-4.27 67
 MD5 5cd8b1eac59c69d93fd0380607d295fc files/p7zip-4.16_x86_static.patch 276
-MD5 1defb955ab99c1352cd6d52a4839bff6 files/digest-p7zip-4.20-r1 67
+MD5 e76d85861cf61f0ff8524a4e1aef33fa files/7za 142
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDNnd+gIKl8Uu19MoRArX1AJ4wY32GOs9gP4rI0jL4MxjCb2s2GACbBriw
+zOu8oQx2PXGC1sFFKLGHH/c=
+=JKmn
+-----END PGP SIGNATURE-----
diff --git a/app-arch/p7zip/p7zip-4.27.ebuild b/app-arch/p7zip/p7zip-4.27.ebuild
index 2070b8d2e47e..b4c5bd618692 100644
--- a/app-arch/p7zip/p7zip-4.27.ebuild
+++ b/app-arch/p7zip/p7zip-4.27.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/app-arch/p7zip/p7zip-4.27.ebuild,v 1.3 2005/09/25 09:29:39 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.27.ebuild,v 1.4 2005/09/25 10:09:11 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -17,8 +17,8 @@ S=${WORKDIR}/${PN}_${PV}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	use static && epatch ${FILESDIR}/p7zip-4.16_x86_static.patch
+	cd "${S}"
+	use static && epatch "${FILESDIR}"/p7zip-4.16_x86_static.patch
 	sed -i \
 		-e "/^CXX=/s:g++:$(tc-getCXX):" \
 		-e "/^CC=/s:gcc:$(tc-getCC):" \
@@ -32,24 +32,21 @@ src_compile() {
 
 src_install() {
 	# this wrappers can not be symlinks, p7zip should be called with full path
-	dobin ${FILESDIR}/7za || die "dobin 7za"
-	dobin ${FILESDIR}/7z || die "dobin 7z"
+	make_wrapper 7za "/usr/lib/${PN}/7za"
+	make_wrapper 7z "/usr/lib/${PN}/7z"
 
-	dodir /usr/lib/${PN}
 	exeinto /usr/lib/${PN}
-	doexe bin/7z bin/7za bin/7zCon.sfx
-	dodir /usr/lib/${PN}/Codecs
+	doexe bin/7z bin/7za bin/7zCon.sfx || die "doexe bins"
 	exeinto /usr/lib/${PN}/Codecs
-	doexe bin/Codecs/*
-	dodir /usr/lib/${PN}/Formats
+	doexe bin/Codecs/* || die "doexe Codecs"
 	exeinto /usr/lib/${PN}/Formats
-	doexe bin/Formats/*
+	doexe bin/Formats/* || die "doexe Formats"
 
-	doman man1/7z.1
-	doman man1/7za.1
+	doman man1/7z.1 man1/7za.1
+	dodoc ChangeLog README TODO
 
-	if use doc; then
-		dodoc ChangeLog README TODO DOCS/*.txt
+	if use doc ; then
+		dodoc DOCS/*.txt
 		dohtml -r DOCS/MANUAL/*
 	fi
 }