Added detailed "die" messages (see bug #120929)

Package-Manager: portage-2.0.54

2 files changed, 36 insertions, 45 deletions

diff --git a/sci-biology/ncbi-tools/Manifest b/sci-biology/ncbi-tools/Manifest
index 25218af080af..435fd9650547 100644
--- a/sci-biology/ncbi-tools/Manifest
+++ b/sci-biology/ncbi-tools/Manifest
@@ -1,27 +1,9 @@
 MD5 20cc47f212861260c8c8a9f6c2406c5f ChangeLog 9394
-RMD160 e0ec7f976d99aae31415afbb3b07ad9f25a80e70 ChangeLog 9394
-SHA256 aca6ceda82b96db48131a3b84720d147651f823476e6922ab120e29f4d5655e3 ChangeLog 9394
 MD5 a5f54430f6f7422d75320e91068cae0b files/21ncbi-r1 232
-RMD160 ba65fe937c9a29f4cc185d99db18522343bbb28b files/21ncbi-r1 232
-SHA256 55d5d53c177200d4a9369102d3e2d8ef232f09dd8559aab6c6e4d2173e8bb411 files/21ncbi-r1 232
 MD5 9cef4ca17113d005c44d3bf3d330f747 files/digest-ncbi-tools-20050605 144
-RMD160 f2ec6aacb5969800126c308f95e09b493112739b files/digest-ncbi-tools-20050605 144
-SHA256 ca6daabc7c7f08d62f06d03cc5eeb3e1fedf3bd5429cc8a16fc31ceb56744439 files/digest-ncbi-tools-20050605 144
 MD5 2f82cbf863fc3fc2522b55f74f9c3244 files/digest-ncbi-tools-20050605-r2 207
-RMD160 59b765ffd2d8d8f6a1ba2a2e2ba2568d951e0d25 files/digest-ncbi-tools-20050605-r2 207
-SHA256 eef6f31032af69e1bf8eb4f58b57d0b8679b3870158daab07dc98b0fb8e49dbd files/digest-ncbi-tools-20050605-r2 207
 MD5 6b62beda180ee6d7d4d4a52507acc3ff files/ncbi-tools-20050605-lop.patch 701
-RMD160 1b9d8d196b1d4f27b090e616c9ac03cb9b4e6a09 files/ncbi-tools-20050605-lop.patch 701
-SHA256 9e5c57e944d23920f196f36912933653c236998729f69f28be8b55964865dfbc files/ncbi-tools-20050605-lop.patch 701
 MD5 23986a001c85eb8c2c319aacfa9cb40c files/ncbirc 33
-RMD160 3bfa36288b608b4e29252ad1972bb8c06cded3e1 files/ncbirc 33
-SHA256 8687909c83658049cbad656b6d99c8e6143365286e2fa981fbdddc87b178ab8e files/ncbirc 33
 MD5 f189a3c4ff5ae55bcee4f8ed0ace5d20 metadata.xml 254
-RMD160 f02847af149737bf8044b3de239c5bd4b42abca5 metadata.xml 254
-SHA256 3392ded43ad861595a8cfeb0441342fdbcd6e731b4793c3e8a22ff927ce09f27 metadata.xml 254
-MD5 79c626c421b1ad1a9b5231e5eae2e94d ncbi-tools-20050605-r2.ebuild 6614
-RMD160 f0920023045cbe9f694e89b3f84d3acea911ca02 ncbi-tools-20050605-r2.ebuild 6614
-SHA256 d06902e7867e1ff217af64f03023ecb2ba3081d3820591471ec67077bdab1a28 ncbi-tools-20050605-r2.ebuild 6614
+MD5 6ee259b32ffdc366ddba50f20e7e76b7 ncbi-tools-20050605-r2.ebuild 7017
 MD5 c3c0d582d093e9a1b2df2788859a647c ncbi-tools-20050605.ebuild 5677
-RMD160 e3a90edec7d05b46b213885d67182f3b067f9877 ncbi-tools-20050605.ebuild 5677
-SHA256 d35149417de2deb43789a8342667c5a10ccd950c23b051c7d202ce9bc4ff289a ncbi-tools-20050605.ebuild 5677
diff --git a/sci-biology/ncbi-tools/ncbi-tools-20050605-r2.ebuild b/sci-biology/ncbi-tools/ncbi-tools-20050605-r2.ebuild
index 3c0ef831d1b3..6933cd0935e9 100644
--- a/sci-biology/ncbi-tools/ncbi-tools-20050605-r2.ebuild
+++ b/sci-biology/ncbi-tools/ncbi-tools-20050605-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-20050605-r2.ebuild,v 1.2 2006/02/01 09:10:15 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-20050605-r2.ebuild,v 1.3 2006/02/02 02:51:41 ribosome Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -120,14 +120,15 @@ src_compile() {
 }
 
 src_install() {
-	dobin "${S}"/bin/* || die "dobin"
-	dolib "${S}"/lib/* || die "dolib"
+	dobin "${S}"/bin/* || die "Failed to install binaries."
+	dolib "${S}"/lib/* || die "Failed to install libraries."
 	mkdir -p "${D}"/usr/include/ncbi
-	cp -RL "${S}"/include/* "${D}"/usr/include/ncbi || die "includes"
+	cp -RL "${S}"/include/* "${D}"/usr/include/ncbi || \
+		die "Failed to install headers."
 
 	if use mpi; then
 		cd "${WORKDIR}"/mpiblast-1.4.0
-		make install DESTDIR="${D}" || die "mpiblast"
+		make install DESTDIR="${D}" || die "Failed to install MPI blast."
 	fi
 
 	# TODO: Web apps
@@ -138,28 +139,36 @@ src_install() {
 	# TODO: Add support for wwwblast.
 
 	# Basic documentation
-	dodoc "${S}"/{README,VERSION,doc/{*.txt,README.asn2xml}} || die "docs"
-	newdoc "${S}"/doc/fa2htgs/README README.fa2htgs || die "docs"
-	newdoc "${S}"/config/README README.config || die "docs"
-	newdoc "${S}"/network/encrypt/README README.encrypt || die "docs"
-	newdoc "${S}"/network/nsclilib/readme README.nsclilib || die "docs"
-	newdoc "${S}"/sequin/README README.sequin || die "docs"
-	doman "${S}"/doc/man/* || die "docs"
+	dodoc "${S}"/{README,VERSION,doc/{*.txt,README.asn2xml}} || \
+		die "Failed to install basic documentation."
+	newdoc "${S}"/doc/fa2htgs/README README.fa2htgs || \
+		die "Failed renaming fa2htgs documentation."
+	newdoc "${S}"/config/README README.config || \
+		die "Failed renaming config documentation."
+	newdoc "${S}"/network/encrypt/README README.encrypt || \
+		die "Failed renaming encrypt documentation."
+	newdoc "${S}"/network/nsclilib/readme README.nsclilib || \
+	die "Failed renaming nsclilib documentation."
+	newdoc "${S}"/sequin/README README.sequin || \
+		die "Failed renaming sequin documentation."
+	doman "${S}"/doc/man/* || \
+		die "Failed to install man pages."
 
 	# Hypertext user documentation
-	dohtml "${S}"/{README.htm,doc/{*.html,*.gif}} || die "dohtml"
-	insinto /usr/share/doc/${PF}/html/blast || die "insinto html"
-	doins "${S}"/doc/blast/* || die "doins html"
+	dohtml "${S}"/{README.htm,doc/{*.html,*.gif}} || \
+		die "Failed to install HTML documentation."
+	insinto /usr/share/doc/${PF}/html/blast
+	doins "${S}"/doc/blast/* || die "Failed to install blast HTML documentation."
 
 	# Developer documentation
 	if use doc; then
 		# "socks" documentation
 		SOCKS="network/socks/socks.cstc.4.2"
 		insinto /usr/share/doc/${PF}/socks
-		doins "${S}"/${SOCKS}/{CHANGES,How_to_SOCKSify,README.{1st,4.{0,1,2},DK},What_are_the_risks,What_SOCKS_expects} || die "doins"
+		doins "${S}"/${SOCKS}/{CHANGES,How_to_SOCKSify,README.{1st,4.{0,1,2},DK},What_are_the_risks,What_SOCKS_expects} || die
 		newins "${S}"/${SOCKS}/libident/README README.libident
-		doins "${S}"/${SOCKS}/sockd/sockd.conf.sample || die "doins"
-		doman "${S}"/${SOCKS}/{doc/*.{1,5,8},libident/ident.3} || die "doman"
+		doins "${S}"/${SOCKS}/sockd/sockd.conf.sample || die
+		doman "${S}"/${SOCKS}/{doc/*.{1,5,8},libident/ident.3} || die
 
 		# "regexp" documentation (No longer installed, see bug #115463.)
 		# insinto /usr/share/doc/${PF}/regexp
@@ -170,24 +179,24 @@ src_install() {
 
 		# Hypertext SDK documentation
 		insinto /usr/share/doc/${PF}/html/sdk
-		doins "${WORKDIR}"/${PN}-sdk-doc/* || die "doins"
+		doins "${WORKDIR}"/${PN}-sdk-doc/* || die
 
 		# Demo programs
 		mkdir "${D}"/usr/share/ncbi
-		mv "${S}"/demo "${D}"/usr/share/ncbi/demo || die "mv"
-		mv "${S}"/regexp/demo "${D}"/usr/share/ncbi/demo/regexp || die "mv"
-		mv "${S}"/regexp/test "${D}"/usr/share/ncbi/demo/regexp/test || die "mv"
+		mv "${S}"/demo "${D}"/usr/share/ncbi/demo || die
+		mv "${S}"/regexp/demo "${D}"/usr/share/ncbi/demo/regexp || die
+		mv "${S}"/regexp/test "${D}"/usr/share/ncbi/demo/regexp/test || die
 	fi
 
 	# Shared data (similarity matrices and such) and database directory.
 	insinto /usr/share/ncbi/data
-	doins "${S}"/data/* || die "doins"
-	dodir /usr/share/ncbi/formatdb || die "doins"
+	doins "${S}"/data/* || die "Failed to install shared data."
+	dodir /usr/share/ncbi/formatdb || die
 
 	# Default config file to set the path for shared data.
 	insinto /etc/ncbi
-	newins "${FILESDIR}"/ncbirc .ncbirc || die "doins"
+	newins "${FILESDIR}"/ncbirc .ncbirc || die "Failed to install config file."
 
 	# Env file to set the location of the config file and BLAST databases.
-	newenvd "${FILESDIR}"/21ncbi-r1 21ncbi || die "doins"
+	newenvd "${FILESDIR}"/21ncbi-r1 21ncbi || die "Failed to install env file."
 }