sci-biology/psipred: Add additional dep on sci-biology/update-blast

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

7 files changed, 23 insertions, 18 deletions

diff --git a/sci-biology/psipred/ChangeLog b/sci-biology/psipred/ChangeLog
index 2b05c3ba2296..39bbff943af5 100644
--- a/sci-biology/psipred/ChangeLog
+++ b/sci-biology/psipred/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-biology/psipred
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/ChangeLog,v 1.11 2014/04/07 14:07:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/ChangeLog,v 1.12 2014/05/14 12:07:39 jlec Exp $
+
+  14 May 2014; Justin Lecher <jlec@gentoo.org> psipred-3.1.ebuild,
+  psipred-3.2.ebuild, psipred-3.2.1.ebuild, psipred-3.3.ebuild,
+  psipred-3.4.ebuild, psipred-3.5.ebuild:
+  Add additional dep on sci-biology/update-blast
 
 *psipred-3.5 (07 Apr 2014)
 
diff --git a/sci-biology/psipred/psipred-3.1.ebuild b/sci-biology/psipred/psipred-3.1.ebuild
index 481e80e7ffa5..a58d51dad191 100644
--- a/sci-biology/psipred/psipred-3.1.ebuild
+++ b/sci-biology/psipred/psipred-3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/psipred-3.1.ebuild,v 1.3 2011/05/24 12:18:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/psipred-3.1.ebuild,v 1.4 2014/05/14 12:07:39 jlec Exp $
 
 EAPI=3
 
@@ -19,7 +19,7 @@ IUSE=""
 
 RDEPEND="
 	sci-biology/ncbi-tools
-	sci-biology/ncbi-tools++"
+	|| ( sci-biology/update-blastdb sci-biology/ncbi-tools++ )"
 DEPEND=""
 
 S="${WORKDIR}"
diff --git a/sci-biology/psipred/psipred-3.2.1.ebuild b/sci-biology/psipred/psipred-3.2.1.ebuild
index 0b23fff0b1c7..9f744c40108f 100644
--- a/sci-biology/psipred/psipred-3.2.1.ebuild
+++ b/sci-biology/psipred/psipred-3.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/psipred-3.2.1.ebuild,v 1.4 2012/07/11 06:21:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/psipred-3.2.1.ebuild,v 1.5 2014/05/14 12:07:39 jlec Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ IUSE="test"
 
 RDEPEND="
 	sci-biology/ncbi-tools
-	sci-biology/ncbi-tools++"
+	|| ( sci-biology/update-blastdb sci-biology/ncbi-tools++ )"
 DEPEND=""
 
 S="${WORKDIR}"
diff --git a/sci-biology/psipred/psipred-3.2.ebuild b/sci-biology/psipred/psipred-3.2.ebuild
index 4d698781252e..1f62ae57f805 100644
--- a/sci-biology/psipred/psipred-3.2.ebuild
+++ b/sci-biology/psipred/psipred-3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/psipred-3.2.ebuild,v 1.2 2011/05/24 12:18:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/psipred-3.2.ebuild,v 1.3 2014/05/14 12:07:39 jlec Exp $
 
 EAPI=3
 
@@ -19,7 +19,7 @@ IUSE=""
 
 RDEPEND="
 	sci-biology/ncbi-tools
-	sci-biology/ncbi-tools++"
+	|| ( sci-biology/update-blastdb sci-biology/ncbi-tools++ )"
 DEPEND=""
 
 S="${WORKDIR}"
diff --git a/sci-biology/psipred/psipred-3.3.ebuild b/sci-biology/psipred/psipred-3.3.ebuild
index 4f04ddf5bcd7..a986d72680ec 100644
--- a/sci-biology/psipred/psipred-3.3.ebuild
+++ b/sci-biology/psipred/psipred-3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/psipred-3.3.ebuild,v 1.2 2012/07/11 02:33:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/psipred-3.3.ebuild,v 1.3 2014/05/14 12:07:39 jlec Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ IUSE="test"
 
 RDEPEND="
 	sci-biology/ncbi-tools
-	sci-biology/ncbi-tools++"
+	|| ( sci-biology/update-blastdb sci-biology/ncbi-tools++ )"
 DEPEND=""
 
 S="${WORKDIR}"/${PN}
diff --git a/sci-biology/psipred/psipred-3.4.ebuild b/sci-biology/psipred/psipred-3.4.ebuild
index 9a20b4ec3568..d4c5c193c7ba 100644
--- a/sci-biology/psipred/psipred-3.4.ebuild
+++ b/sci-biology/psipred/psipred-3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/psipred-3.4.ebuild,v 1.1 2013/11/05 19:34:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/psipred-3.4.ebuild,v 1.2 2014/05/14 12:07:39 jlec Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ IUSE="test"
 RDEPEND="
 	app-shells/tcsh
 	sci-biology/ncbi-tools
-	sci-biology/ncbi-tools++"
+	|| ( sci-biology/update-blastdb sci-biology/ncbi-tools++ )"
 DEPEND=""
 
 S="${WORKDIR}"/${PN}
diff --git a/sci-biology/psipred/psipred-3.5.ebuild b/sci-biology/psipred/psipred-3.5.ebuild
index bc02b7027af5..bf5b8eb69b99 100644
--- a/sci-biology/psipred/psipred-3.5.ebuild
+++ b/sci-biology/psipred/psipred-3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/psipred-3.5.ebuild,v 1.1 2014/04/07 14:07:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/psipred-3.5.ebuild,v 1.2 2014/05/14 12:07:39 jlec Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ IUSE="test"
 RDEPEND="
 	app-shells/tcsh
 	sci-biology/ncbi-tools
-	sci-biology/ncbi-tools++"
+	|| ( sci-biology/update-blastdb sci-biology/ncbi-tools++ )"
 DEPEND=""
 
 S="${WORKDIR}"/${PN}