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

(Portage version: -svn/cvs/Linux i686)

2 files changed, 21 insertions, 15 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/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"
 }