modified to die on failed patches and on make errors

Package-Manager: portage-2.0.51.22-r1

3 files changed, 19 insertions, 26 deletions

diff --git a/app-editors/nvu/ChangeLog b/app-editors/nvu/ChangeLog
index d314842297b0..8159e186d9bd 100644
--- a/app-editors/nvu/ChangeLog
+++ b/app-editors/nvu/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/nvu
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/ChangeLog,v 1.6 2005/04/29 23:15:25 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/ChangeLog,v 1.7 2005/06/01 12:29:50 anarchy Exp $
+
+  01 Jun 2005; Jory A. Pratt <anarchy@gentoo.org> nvu-1.0_pre.ebuild:
+  modified ebuild to include die if patches or make fails
 
   29 Apr 2005; Tom Martin <slarti@gentoo.org> nvu-0.90-r1.ebuild:
   Marked stable on amd64 and sparc, resolves bug 90773.
diff --git a/app-editors/nvu/Manifest b/app-editors/nvu/Manifest
index 88a59938b7ec..e293a5dfd649 100644
--- a/app-editors/nvu/Manifest
+++ b/app-editors/nvu/Manifest
@@ -1,26 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e9c762022c4c0acc94c89e000a69aa53 ChangeLog 3369
-MD5 ff6b8f0a36c4b037f82406291ded2b97 nvu-1.0_pre.ebuild 2757
-MD5 a242ea1eef3d40a59e5c249fc8063345 nvu-0.90.ebuild 2301
 MD5 115af5ff4677b00f8a860748338ce4bf metadata.xml 310
-MD5 c05340442ff08d09be9375f467bd735b nvu-0.90-r1.ebuild 2299
 MD5 e3b4ccc9cb447cc7e5827c82f31d2579 nvu-0.81.ebuild 2301
-MD5 fedceb24f98d16efe7580f4c2877afca files/nvu.desktop 182
-MD5 91bb5e61f505e2e53aa42345431c8fa7 files/mozconfig2 2160
-MD5 565f1133c57a789f0cf51c02510a6f9c files/mozconfig-1.0PR 1367
-MD5 841f7a0a89c5d8be3841444ce2dd0b85 files/nvu-0.50-dir.patch 713
+MD5 78d81682c908f764a35575008ff71a83 nvu-1.0_pre.ebuild 2851
+MD5 9da9be901c42b19d4364f2e81a9cc175 ChangeLog 3499
+MD5 a242ea1eef3d40a59e5c249fc8063345 nvu-0.90.ebuild 2301
+MD5 c05340442ff08d09be9375f467bd735b nvu-0.90-r1.ebuild 2299
+MD5 2c903c369e8f7450ba419eb7ea8050f1 files/digest-nvu-0.81 71
 MD5 ffdec5b2a9933225ba5f03bafd9fcc2a files/digest-nvu-0.90 71
 MD5 ed3ccc4c9deab00dc6df2930061efd76 files/digest-nvu-1.0_pre 72
-MD5 ffdec5b2a9933225ba5f03bafd9fcc2a files/digest-nvu-0.90-r1 71
-MD5 7880f1109c0f8a9df0830238e70b0d62 files/nvu-0.50-nvu.patch 674
-MD5 2c903c369e8f7450ba419eb7ea8050f1 files/digest-nvu-0.81 71
+MD5 565f1133c57a789f0cf51c02510a6f9c files/mozconfig-1.0PR 1367
+MD5 91bb5e61f505e2e53aa42345431c8fa7 files/mozconfig2 2160
+MD5 841f7a0a89c5d8be3841444ce2dd0b85 files/nvu-0.50-dir.patch 713
 MD5 952edf776beb47f9ddeeed1eb3a9407f files/nvu-0.50-freetype-compile.patch 13641
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCcsAdCHk4+ZoBpvsRAiunAJ96/u7MvJzOUAzzwJricwpNZWrIjgCff+ub
-R1Wd53UYnQSLTxChZz4s5wI=
-=DxVf
------END PGP SIGNATURE-----
+MD5 7880f1109c0f8a9df0830238e70b0d62 files/nvu-0.50-nvu.patch 674
+MD5 fedceb24f98d16efe7580f4c2877afca files/nvu.desktop 182
+MD5 ffdec5b2a9933225ba5f03bafd9fcc2a files/digest-nvu-0.90-r1 71
diff --git a/app-editors/nvu/nvu-1.0_pre.ebuild b/app-editors/nvu/nvu-1.0_pre.ebuild
index 35e7b74c4f1c..973424bc3427 100644
--- a/app-editors/nvu/nvu-1.0_pre.ebuild
+++ b/app-editors/nvu/nvu-1.0_pre.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-editors/nvu/nvu-1.0_pre.ebuild,v 1.2 2005/04/15 00:00:16 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/nvu-1.0_pre.ebuild,v 1.3 2005/06/01 12:29:50 anarchy Exp $
 
 inherit eutils mozilla flag-o-matic
 
@@ -26,8 +26,8 @@ src_unpack() {
 	cd ${S}
 	# Fix those darn directories!  Make something more "standard"
 	# That can extend to future versions with much more ease. - Chris
-	epatch ${FILESDIR}/nvu-0.50-dir.patch
-	epatch ${FILESDIR}/nvu-0.50-freetype-compile.patch
+	epatch ${FILESDIR}/nvu-0.50-dir.patch | die "failed to apply dir. patch"
+	epatch ${FILESDIR}/nvu-0.50-freetype-compile.patch || die "failed to patch for freetype"
 
 	# I had to manually edit the mozconfig.linux file as it
 	# has some quirks... just copy the darn thing over :) - Chris
@@ -59,7 +59,7 @@ src_compile() {
 	filter-flags '-O*'
 	# epatch ${FILESDIR}/nvu-0.80-mozconfig.patch
 
-	make -f client.mk build_all
+	make -f client.mk build_all || die "Make failed"
 }
 
 src_install() {