QA: die on failure, spelling fix; add prefix keywords

Package-Manager: portage--svn/cvs/Linux i686

3 files changed, 33 insertions, 17 deletions

diff --git a/dev-util/wiggle/ChangeLog b/dev-util/wiggle/ChangeLog
index 9b5f9ecc1454..c78b7694cd32 100644
--- a/dev-util/wiggle/ChangeLog
+++ b/dev-util/wiggle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/wiggle
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/ChangeLog,v 1.18 2008/05/15 23:51:12 drac Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/ChangeLog,v 1.19 2010/01/10 22:30:18 abcd Exp $
+
+  10 Jan 2010; Jonathan Callen <abcd@gentoo.org> wiggle-0.6-r3.ebuild:
+  QA: die on failure, spelling fix; add prefix keywords
 
   15 May 2008; Samuli Suominen <drac@gentoo.org> wiggle-0.6-r3.ebuild:
   Because we get more warnings with GCC 4.3, disable -Werror from Makefile
diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
index ba08f1291f40..e570c14c8bf9 100644
--- a/dev-util/wiggle/Manifest
+++ b/dev-util/wiggle/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST wiggle-0.6-patches-20060513.tar.bz2 11850 RMD160 f9a267dd57ffb45ed8c4c24cb1aa0f8fb5fa15a1 SHA1 9c7ca333087b84fd831833cb262d153844acfb4e SHA256 1477859efaa4a999c545e1ca6875f90feeb0c41231b5b1888a24485a215cddf3
 DIST wiggle-0.6.tar.gz 514638 RMD160 7e2686b4887f17c6bdc0e13f3a4e45e62f30805a SHA1 2ed54a1d462f3e80029df83aebe3f0054c5aa4c9 SHA256 639f8bd48c58b1fa4f24a65bc8aa3e53219e7d48726e63e7c40f0701d1d89b9c
-EBUILD wiggle-0.6-r3.ebuild 1840 RMD160 98dc712009e57d946008443ff4db2486b4e042b5 SHA1 c858efd36fc36fb9045121a7c4aaf296bc3227bc SHA256 28269063ee93ffe5aea16d2b202deda5ba472b09567399f7838597bf63bca5b1
-MISC ChangeLog 2189 RMD160 48ba914e7db6c9094964989d4e6af48014574cbb SHA1 56c34da72784dd0fe41a7320bc6cdb4e386a72d1 SHA256 0b11d451a487a2e54afe19c0d5e35c1dc3452659e89d9b6a39809528f20f3217
+EBUILD wiggle-0.6-r3.ebuild 2182 RMD160 2ea6fcb3cce9157c7e4bcfd1572b2457f448aba0 SHA1 3d3cfb50662951fee503b4ac46277232e8806c88 SHA256 02339c358346d78059c0d70a62815b24a57eb59d8f0496187b8b4315ba28da80
+MISC ChangeLog 2317 RMD160 0fd53e2b30916c07fe7da92783296b50c2956058 SHA1 0dbb11b8bd42c3437045e7dabd5a31b7b433087a SHA256 a76908633b8e1f68fa6aaeecdb6d4b3b5029a7934f083f9700389a87284a1b3a
 MISC metadata.xml 279 RMD160 f84566b5a463b59cc5ddd8a2210a54de9492ed2f SHA1 98caf044b8fce3f5ff202c7f7b71f0dcb9d51947 SHA256 785db7b7f8e4f9a526dc574ce2aa10024cc83af170f38ec9af9f56c23fc15543
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktKVQQACgkQOypDUo0oQOr/pQCcCB3D6jogy/U5I5k7N7SyHIPQ
++0sAn17b0B+rgGt16oI3KtL+pxhurZDR
+=TnSz
+-----END PGP SIGNATURE-----
diff --git a/dev-util/wiggle/wiggle-0.6-r3.ebuild b/dev-util/wiggle/wiggle-0.6-r3.ebuild
index b03892d7f4a4..7b87cece6ebb 100644
--- a/dev-util/wiggle/wiggle-0.6-r3.ebuild
+++ b/dev-util/wiggle/wiggle-0.6-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/wiggle-0.6-r3.ebuild,v 1.5 2008/05/15 23:51:12 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/wiggle/wiggle-0.6-r3.ebuild,v 1.6 2010/01/10 22:30:18 abcd Exp $
 
 inherit eutils fixheadtails toolchain-funcs
 
@@ -13,8 +13,8 @@ SRC_URI="http://cgi.cse.unsw.edu.au/~neilb/source/wiggle/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="test"
 
 # The 'p' tool does support bitkeeper, but I'm against just dumping it in here
 # due to it's size.  I've explictly listed every other dependancy here due to
@@ -31,13 +31,14 @@ RDEPEND="dev-util/diffstat
 	sys-devel/patch"
 DEPEND="${RDEPEND}
 	sys-apps/groff
-	sys-process/time"
+	test? ( sys-process/time )"
 
 PATCHLIST="001NoQuietTime 002SpecFile 003Recommit 004ExtractFix 005Pchanges
 007Stuff 010BestBugFix"
 # excluded: 006NoDebug 008NewMerge2 009Stuff
 
 src_unpack() {
+	use prefix || EPREFIX=
 	unpack ${A}
 	cd "${S}"
 	for i in ${PATCHLIST}; do
@@ -45,10 +46,13 @@ src_unpack() {
 	done;
 
 	# Fix the reference to the help file so `p help' works
-	sed -i 's,$0.help,/usr/share/wiggle/p.help,' p
+	sed -i "s:\$0.help:${EPREFIX}/usr/share/wiggle/p.help:" p || die "sed failed on p"
 
-	# Don't add Neil Brown's default sign off lign to every patch
-	sed -i '/$CERT/,+4s,^,#,' p
+	# Don't add Neil Brown's default sign off line to every patch
+	sed -i '/$CERT/,+4s,^,#,' p || die "sed failed on p"
+
+	# Use prefixed time binary
+	sed -i "s:/usr/bin/time:${EPREFIX}/usr/bin/time:" dotest || die "sed failed on dotest"
 
 	ht_fix_file p
 }
@@ -59,10 +63,9 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	dobin p
-	dodoc ANNOUNCE INSTALL TODO DOC/diff.ps notes
+	dobin wiggle p || die "failed to install binaries"
+	doman wiggle.1 || die "failed to install man page"
+	dodoc ANNOUNCE INSTALL TODO DOC/diff.ps notes || die "failed to install docs"
 	insinto /usr/share/wiggle
-	doins p.help
+	doins p.help || die "failed to install help file"
 }