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

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

3 files changed, 44 insertions, 41 deletions

diff --git a/dev-lang/xsb/ChangeLog b/dev-lang/xsb/ChangeLog
index c74395048b0b..5c1578c0d1be 100644
--- a/dev-lang/xsb/ChangeLog
+++ b/dev-lang/xsb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/xsb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.27 2010/11/01 05:39:35 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.28 2010/11/02 05:59:46 keri Exp $
+
+  02 Nov 2010; <keri@gentoo.org> xsb-3.2-r1.ebuild:
+  QA - remove calls to die from econf; add calls to die to do... functions
 
   01 Nov 2010; <keri@gentoo.org> -xsb-3.0.1.ebuild,
   -files/xsb-3.0.1-chr_d.patch, -files/xsb-3.0.1-configure.patch,
diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest
index 6da82e2e337f..020e700a35ff 100644
--- a/dev-lang/xsb/Manifest
+++ b/dev-lang/xsb/Manifest
@@ -1,5 +1,5 @@
 DIST XSB.tar.gz 10808490 RMD160 66b4e79f9b47cd5db9f3f8b718929181f7f6c401 SHA1 3563a3ba4b469016697d704e65e5b17a75200710 SHA256 db190bc045a475e24a8ca305b6a77cf0a84c61ebaade1fadef09d13b7c4ee024
 DIST xsb-3.2-gentoo-patchset-3.tar.gz 21365 RMD160 507e70f906645fe4df0941a1549dde774cbebacf SHA1 06bddf984fcc5b7e60c6db97acc46609dec088d7 SHA256 92e5e3e5bd930021501909474530d1336e0c5f5f830e84f773fcf3a8cd85021a
-EBUILD xsb-3.2-r1.ebuild 4450 RMD160 ed734dd5e98ad01c452fefdbaa7c93a95ecccd28 SHA1 33a80441991f77acb9f8724e63538b2220974222 SHA256 08a9c5dceb7ae8617a3a5a13e83edfd3a7da687cc3739964e003a4da206b2428
-MISC ChangeLog 5201 RMD160 e7cbc19093cb3b8dc28c987406f1150b1fd5b636 SHA1 45faaee29fdd3776d29912ea6e1c7a049124ad04 SHA256 0c6feb40545f1ef91b43d95d48169a3f718526a51dd60357475442e9a42171ef
+EBUILD xsb-3.2-r1.ebuild 4482 RMD160 89c78ba1135643b5569a932d7ffee8aa40a46fd6 SHA1 7c7182a71332e86ac8b18c6e3fab237f1a2cb003 SHA256 b71aff88c5a31cfb1be4dccc68e58fe7a1ad0aa7b6a7fbbba6a1437d5db8f294
+MISC ChangeLog 5329 RMD160 80192dc4ce1033ab0eec3c8d2b8f320af083dc0c SHA1 77e962e2e6d3dcaf5e39a3b54aabae110757e15f SHA256 f6ec518f3d466ba6b1f6f1f5ce8460d581b0489db021c19ac2afc155e5223c2b
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
diff --git a/dev-lang/xsb/xsb-3.2-r1.ebuild b/dev-lang/xsb/xsb-3.2-r1.ebuild
index 0ad51efa9181..0b81fde06313 100644
--- a/dev-lang/xsb/xsb-3.2-r1.ebuild
+++ b/dev-lang/xsb/xsb-3.2-r1.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/xsb/xsb-3.2-r1.ebuild,v 1.4 2010/10/31 19:41:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/xsb-3.2-r1.ebuild,v 1.5 2010/11/02 05:59:46 keri Exp $
 
 MY_P="XSB"
 
@@ -54,28 +54,28 @@ src_compile() {
 		$(use_with odbc) \
 		$(use_with iodbc) \
 		$(use_enable threads mt) \
-		$(use_enable debug) \
-		|| die "econf failed"
+		$(use_enable debug)
+
 	emake || die "emake failed"
 
 	if use libwww ; then
 		cd "${S}"/packages/libwww
-		econf --with-libwww=/usr || die "econf libwww package failed"
+		econf --with-libwww=/usr
 	fi
 
 	if use mysql ; then
 		cd "${S}"/packages/dbdrivers/mysql
-		econf || die "econf mysql package failed"
+		econf
 	fi
 
 	if use odbc ; then
 		cd "${S}"/packages/dbdrivers/odbc
-		econf || die "econf odbc package failed"
+		econf
 	fi
 
 	if use xml ; then
 		cd "${S}"/packages/xpath
-		econf || die "econf xpath package failed"
+		econf
 	fi
 
 	# All XSB Packages are compiled using a single Prolog engine.
@@ -108,98 +108,98 @@ src_compile() {
 
 src_install() {
 	cd "${S}"/build
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 
 	local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV}
-	dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb
+	dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb || die
 
 	cd "${S}"/packages
 	local PACKAGES=${XSB_INSTALL_DIR}/packages
 	insinto ${PACKAGES}
-	doins *.xwam
+	doins *.xwam || die
 
 	insinto ${PACKAGES}/chr
-	doins chr/*.xwam
+	doins chr/*.xwam || die
 
 	insinto ${PACKAGES}/chr_d
-	doins chr_d/*.xwam
+	doins chr_d/*.xwam || die
 
 	insinto ${PACKAGES}/gap
-	doins gap/*.xwam
+	doins gap/*.xwam || die
 
 	insinto ${PACKAGES}/justify
-	doins justify/*.xwam
-	doins justify/*.H
+	doins justify/*.xwam || die
+	doins justify/*.H || die
 
 	insinto ${PACKAGES}/regmatch
-	doins regmatch/*.xwam
+	doins regmatch/*.xwam || die
 	insinto ${PACKAGES}/regmatch/cc
-	doins regmatch/cc/*.H
+	doins regmatch/cc/*.H || die
 
 	insinto ${PACKAGES}/sgml
-	doins sgml/*.xwam
+	doins sgml/*.xwam || die
 	insinto ${PACKAGES}/sgml/cc
-	doins sgml/cc/*.H
+	doins sgml/cc/*.H || die
 	insinto ${PACKAGES}/sgml/cc/dtd
-	doins sgml/cc/dtd/*
+	doins sgml/cc/dtd/* || die
 
 	insinto ${PACKAGES}/slx
-	doins slx/*.xwam
+	doins slx/*.xwam || die
 
 	insinto ${PACKAGES}/wildmatch
-	doins wildmatch/*.xwam
+	doins wildmatch/*.xwam || die
 	insinto ${PACKAGES}/wildmatch/cc
-	doins wildmatch/cc/*.H
+	doins wildmatch/cc/*.H || die
 
 	if use libwww ; then
 		insinto ${PACKAGES}/libwww
-		doins libwww/*.xwam
+		doins libwww/*.xwam || die
 		insinto ${PACKAGES}/libwww/cc
-		doins libwww/cc/*.H
+		doins libwww/cc/*.H || die
 	fi
 
 	if use mysql || use odbc ; then
 		insinto ${PACKAGES}/dbdrivers
-		doins dbdrivers/*.xwam
-		doins dbdrivers/*.H
+		doins dbdrivers/*.xwam || die
+		doins dbdrivers/*.H || die
 		insinto ${PACKAGES}/dbdrivers/cc
-		doins dbdrivers/cc/*.H
+		doins dbdrivers/cc/*.H || die
 		if use mysql ; then
 			insinto ${PACKAGES}/dbdrivers/mysql
-			doins dbdrivers/mysql/*.xwam
+			doins dbdrivers/mysql/*.xwam || die
 			insinto ${PACKAGES}/dbdrivers/mysql/cc
-			doins dbdrivers/mysql/cc/*.H
+			doins dbdrivers/mysql/cc/*.H || die
 		fi
 		if use odbc ; then
 			insinto ${PACKAGES}/dbdrivers/odbc
-			doins dbdrivers/odbc/*.xwam
+			doins dbdrivers/odbc/*.xwam || die
 			insinto ${PACKAGES}/dbdrivers/odbc/cc
-			doins dbdrivers/odbc/cc/*.H
+			doins dbdrivers/odbc/cc/*.H || die
 		fi
 	fi
 
 	if use perl ; then
 		insinto ${PACKAGES}/perlmatch
-		doins perlmatch/*.xwam
+		doins perlmatch/*.xwam || die
 		insinto ${PACKAGES}/perlmatch/cc
-		doins perlmatch/cc/*.H
+		doins perlmatch/cc/*.H || die
 	fi
 
 	if use xml ; then
 		insinto ${PACKAGES}/xpath
-		doins xpath/*xwam
+		doins xpath/*xwam || die
 		insinto ${PACKAGES}/xpath/cc
-		doins xpath/cc/*.H
+		doins xpath/cc/*.H || die
 	fi
 
 	if use examples ; then
 		cd "${S}"/build
-		make \
+		emake \
 			DESTDIR="${D}" \
 			install_examples="${D}"/usr/share/doc/${PF}/examples \
 			install_examples || die "make install_examples failed"
 	fi
 
 	cd "${S}"
-	dodoc FAQ README
+	dodoc FAQ README || die
 }