(#121066) Port to modular X. Add some die messages to -r2 so the die's aren't completely unhelpful. Fix the path expansion for html docs so it doesn't break the installation -- not sure how it got committed as is: {*.html *.gif} is missing a comma.

(Portage version: 2.1_pre4-r1)

3 files changed, 39 insertions, 36 deletions

diff --git a/sci-biology/ncbi-tools/ChangeLog b/sci-biology/ncbi-tools/ChangeLog
index 6f516752bdac..f3446d09456c 100644
--- a/sci-biology/ncbi-tools/ChangeLog
+++ b/sci-biology/ncbi-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-biology/ncbi-tools
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ChangeLog,v 1.37 2006/01/21 18:03:06 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ChangeLog,v 1.38 2006/02/01 09:10:15 spyderous Exp $
+
+  01 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  ncbi-tools-20050605.ebuild, ncbi-tools-20050605-r2.ebuild:
+  (#121066) Port to modular X. Add some die messages to -r2 so the die's
+  aren't completely unhelpful. Fix the path expansion for html docs so it
+  doesn't break the installation -- not sure how it got committed as is:
+  {*.html *.gif} is missing a comma.
 
   21 Jan 2006; Olivier Fisette <ribosome@gentoo.org>
   -ncbi-tools-20050605-r1.ebuild:
diff --git a/sci-biology/ncbi-tools/ncbi-tools-20050605-r2.ebuild b/sci-biology/ncbi-tools/ncbi-tools-20050605-r2.ebuild
index 48724ff87ce3..3c0ef831d1b3 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-2005 Gentoo Foundation
+# 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.1 2005/12/14 20:24:03 ribosome Exp $
+# $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 $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -19,9 +19,7 @@ DEPEND="app-shells/tcsh
 	dev-lang/perl
 	media-libs/libpng
 	mpi? ( virtual/mpi )
-	X? ( virtual/x11
-		virtual/motif
-	)"
+	X? ( virtual/motif )"
 
 S="${WORKDIR}/ncbi"
 
@@ -122,14 +120,14 @@ src_compile() {
 }
 
 src_install() {
-	dobin "${S}"/bin/* || die
-	dolib "${S}"/lib/* || die
+	dobin "${S}"/bin/* || die "dobin"
+	dolib "${S}"/lib/* || die "dolib"
 	mkdir -p "${D}"/usr/include/ncbi
-	cp -RL "${S}"/include/* "${D}"/usr/include/ncbi || die
+	cp -RL "${S}"/include/* "${D}"/usr/include/ncbi || die "includes"
 
 	if use mpi; then
 		cd "${WORKDIR}"/mpiblast-1.4.0
-		make install DESTDIR="${D}" || die
+		make install DESTDIR="${D}" || die "mpiblast"
 	fi
 
 	# TODO: Web apps
@@ -140,28 +138,28 @@ src_install() {
 	# TODO: Add support for wwwblast.
 
 	# Basic documentation
-	dodoc "${S}"/{README,VERSION,doc/{*.txt,README.asn2xml}} || die
-	newdoc "${S}"/doc/fa2htgs/README README.fa2htgs || die
-	newdoc "${S}"/config/README README.config || die
-	newdoc "${S}"/network/encrypt/README README.encrypt || die
-	newdoc "${S}"/network/nsclilib/readme README.nsclilib || die
-	newdoc "${S}"/sequin/README README.sequin || die
-	doman "${S}"/doc/man/* || die
+	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"
 
 	# Hypertext user documentation
-	dohtml "${S}"/{README.html,doc/{*.html *.gif}} || die
-	insinto /usr/share/doc/${PF}/html/blast || die
-	doins "${S}"/doc/blast/* || die
+	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"
 
 	# 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 "${S}"/${SOCKS}/{CHANGES,How_to_SOCKSify,README.{1st,4.{0,1,2},DK},What_are_the_risks,What_SOCKS_expects} || die "doins"
 		newins "${S}"/${SOCKS}/libident/README README.libident
-		doins "${S}"/${SOCKS}/sockd/sockd.conf.sample || die
-		doman "${S}"/${SOCKS}/{doc/*.{1,5,8},libident/ident.3} || die
+		doins "${S}"/${SOCKS}/sockd/sockd.conf.sample || die "doins"
+		doman "${S}"/${SOCKS}/{doc/*.{1,5,8},libident/ident.3} || die "doman"
 
 		# "regexp" documentation (No longer installed, see bug #115463.)
 		# insinto /usr/share/doc/${PF}/regexp
@@ -172,24 +170,24 @@ src_install() {
 
 		# Hypertext SDK documentation
 		insinto /usr/share/doc/${PF}/html/sdk
-		doins "${WORKDIR}"/${PN}-sdk-doc/* || die
+		doins "${WORKDIR}"/${PN}-sdk-doc/* || die "doins"
 
 		# Demo programs
 		mkdir "${D}"/usr/share/ncbi
-		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
+		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"
 	fi
 
 	# Shared data (similarity matrices and such) and database directory.
 	insinto /usr/share/ncbi/data
-	doins "${S}"/data/* || die
-	dodir /usr/share/ncbi/formatdb || die
+	doins "${S}"/data/* || die "doins"
+	dodir /usr/share/ncbi/formatdb || die "doins"
 
 	# Default config file to set the path for shared data.
 	insinto /etc/ncbi
-	newins "${FILESDIR}"/ncbirc .ncbirc || die
+	newins "${FILESDIR}"/ncbirc .ncbirc || die "doins"
 
 	# Env file to set the location of the config file and BLAST databases.
-	newenvd "${FILESDIR}"/21ncbi-r1 21ncbi || die
+	newenvd "${FILESDIR}"/21ncbi-r1 21ncbi || die "doins"
 }
diff --git a/sci-biology/ncbi-tools/ncbi-tools-20050605.ebuild b/sci-biology/ncbi-tools/ncbi-tools-20050605.ebuild
index f5477f492ef7..2dffbf36a223 100644
--- a/sci-biology/ncbi-tools/ncbi-tools-20050605.ebuild
+++ b/sci-biology/ncbi-tools/ncbi-tools-20050605.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.ebuild,v 1.10 2005/11/09 05:03:53 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-20050605.ebuild,v 1.11 2006/02/01 09:10:15 spyderous Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -17,9 +17,7 @@ IUSE="doc X"
 DEPEND="app-shells/tcsh
 	dev-lang/perl
 	media-libs/libpng
-	X? ( virtual/x11
-		virtual/motif
-	)"
+	X? ( virtual/motif )"
 
 S="${WORKDIR}/ncbi"