QA - remove die from econf call; add die to do... function calls

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 21 insertions, 19 deletions

diff --git a/dev-lang/mozart/ChangeLog b/dev-lang/mozart/ChangeLog
index fe8f8c6ce7ae..82b2f06d7529 100644
--- a/dev-lang/mozart/ChangeLog
+++ b/dev-lang/mozart/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/mozart
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.29 2010/11/18 08:01:21 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.30 2010/11/19 04:55:39 keri Exp $
+
+  19 Nov 2010; <keri@gentoo.org> mozart-1.4.0.ebuild:
+  QA - remove die from econf call; add die to do... function calls
 
   18 Nov 2010; <keri@gentoo.org> mozart-1.4.0.ebuild,
   -files/mozart-1.4.0-const-cast.patch, -files/mozart-1.4.0-contrib.patch,
diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index f774c25c55ab..e95067792b23 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -14,6 +14,6 @@ DIST mozart-1.4.0.20080704-doc.tar.gz 4085020 RMD160 1d0c9787ec1bbf28881060a2c36
 DIST mozart-1.4.0.20080704-src.tar.gz 11848201 RMD160 090c0af3cba9db422c58c37d5fa3e703c8cc82d7 SHA1 5a12a1d66c871f01dc1223aa614d4e0bf7717b3f SHA256 5da73d80b5aa7fa42edca64159a1a076323f090e5c548f3747f94d0afc60b223
 EBUILD mozart-1.3.2-r1.ebuild 3353 RMD160 23eeed57eaa52152a1a80cf9342e2214b179a45d SHA1 a6f67779202464e8b3f424b3c2572fe4bef110d5 SHA256 8a6217db4b59b407e88c4dfcd74bdbc36821881cf8486eb3f83000009d5b227c
 EBUILD mozart-1.3.2.ebuild 2844 RMD160 b82d5f5f606dbb7159a8f9731f5666da49be2ccd SHA1 32c9b7b398be5dfa41765f1c2ed05646e4b7fd15 SHA256 812d800140a4ad6677f35e7be0f433a20c6eb0ace5411a81eb05bdedb9003fc7
-EBUILD mozart-1.4.0.ebuild 2987 RMD160 c466de6e331d203491fc06bd999635f7e82de7c8 SHA1 b52c8565c31705dd7c73fea36cb01eb450559f67 SHA256 7e504e682b1bf8ef74f4652212d01a51f7014ba87b1bb75f21f8c3dffb9179ff
-MISC ChangeLog 5104 RMD160 fcb35dbc0dd20d6322fd0ace6d4fc9dc610c4cde SHA1 c9273b4eeb4424777e5e59983274649ad2fdba88 SHA256 e706b4b1fa0ce593ef06687ce4caa93772dc4a75958b708a5592dda12013b53a
+EBUILD mozart-1.4.0.ebuild 3052 RMD160 e9562bf605ad3869d182ee49264463376fe568f9 SHA1 3fccdb63337146dde6f81bc8c307fb35ceba8180 SHA256 bc43b7a628ec4f51f03d080f97b8cdf54827c0ced1bc0ffc9396d5d68fd911b0
+MISC ChangeLog 5226 RMD160 a607f28b8f11fab67f0f375f6f6fae06f8501ef7 SHA1 57241b747c7d437bbb6dabe87bedc14c78cee8b9 SHA256 7da53b5f89b88f0d12736c6785eb5f0fff06da8808d162b4ab29efc99f8bb5f6
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
diff --git a/dev-lang/mozart/mozart-1.4.0.ebuild b/dev-lang/mozart/mozart-1.4.0.ebuild
index 093a762f89f2..1bc57536fcd7 100644
--- a/dev-lang/mozart/mozart-1.4.0.ebuild
+++ b/dev-lang/mozart/mozart-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.4.0.ebuild,v 1.10 2010/11/18 08:01:21 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.4.0.ebuild,v 1.11 2010/11/19 04:55:39 keri Exp $
 
 inherit elisp-common eutils
 
@@ -63,8 +63,7 @@ src_compile() {
 		$(use_enable tk contrib-tk) \
 		$(use_enable emacs compile-elisp) \
 		$(use_enable static link-static) \
-		$(use_enable threads threaded) \
-		|| die "econf failed"
+		$(use_enable threads threaded)
 
 	emake bootstrap || die "emake bootstrap failed"
 }
@@ -82,17 +81,17 @@ src_install() {
 		ELISPDIR="${D}${SITELISP}/${PN}" \
 		install || die "emake install failed"
 
-	dosym /usr/lib/mozart/bin/convertTextPickle /usr/bin/convertTextPickle
-	dosym /usr/lib/mozart/bin/oldpickle2text /usr/bin/oldpickle2text
-	dosym /usr/lib/mozart/bin/oz /usr/bin/oz
-	dosym /usr/lib/mozart/bin/ozc /usr/bin/ozc
-	dosym /usr/lib/mozart/bin/ozd /usr/bin/ozd
-	dosym /usr/lib/mozart/bin/ozengine /usr/bin/ozengine
-	dosym /usr/lib/mozart/bin/ozl /usr/bin/ozl
-	dosym /usr/lib/mozart/bin/ozplatform /usr/bin/ozplatform
-	dosym /usr/lib/mozart/bin/oztool /usr/bin/oztool
-	dosym /usr/lib/mozart/bin/pickle2text /usr/bin/pickle2text
-	dosym /usr/lib/mozart/bin/text2pickle /usr/bin/text2pickle
+	dosym /usr/lib/mozart/bin/convertTextPickle /usr/bin/convertTextPickle || die
+	dosym /usr/lib/mozart/bin/oldpickle2text /usr/bin/oldpickle2text || die
+	dosym /usr/lib/mozart/bin/oz /usr/bin/oz || die
+	dosym /usr/lib/mozart/bin/ozc /usr/bin/ozc || die
+	dosym /usr/lib/mozart/bin/ozd /usr/bin/ozd || die
+	dosym /usr/lib/mozart/bin/ozengine /usr/bin/ozengine || die
+	dosym /usr/lib/mozart/bin/ozl /usr/bin/ozl || die
+	dosym /usr/lib/mozart/bin/ozplatform /usr/bin/ozplatform || die
+	dosym /usr/lib/mozart/bin/oztool /usr/bin/oztool || die
+	dosym /usr/lib/mozart/bin/pickle2text /usr/bin/pickle2text || die
+	dosym /usr/lib/mozart/bin/text2pickle /usr/bin/text2pickle || die
 
 	if use emacs; then
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
@@ -100,10 +99,10 @@ src_install() {
 	fi
 
 	if use doc ; then
-		dohtml -r "${WORKDIR}"/mozart/doc/*
+		dohtml -r "${WORKDIR}"/mozart/doc/* || die
 	fi
 
-	dodoc README
+	dodoc README || die
 }
 
 pkg_postinst() {