gentoo resync : 29.08.2018

6 files changed, 12 insertions, 12 deletions

diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 66142918b56a..e5eb47960cbb 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/psipred/Manifest b/sci-biology/psipred/Manifest
index 934b3df14296..cef1367df245 100644
--- a/sci-biology/psipred/Manifest
+++ b/sci-biology/psipred/Manifest
@@ -6,8 +6,8 @@ DIST psipred3.4.tar.gz 1102416 BLAKE2B 9797f4181357bb26455253370aca39857c39a2c4b
 DIST psipred3.5.tar.gz 1101579 BLAKE2B 2fd86841cbc4bb86045b51f8283550832df8356ee88a6ef2c85281b5810debb23ac53652ddc5ffc9bd6f8e9e7248ce39ccee23400ff8fb49cd05b877d730b553 SHA512 a7b3f7d149f6a29cf0b48bdb900f6983d42af01132d8b54a7be88994d09fcf27dbe57115d41ec9654da6daf6898d5986d08fbdcefa3a4c81af0d358500cd40c2
 DIST psipred321.tar.gz 747151 BLAKE2B 8b58a2c45efc92e049622784e1ca39a622ecfb5f660554cf3a26ab9a7e85feb3e453935fca12f0a68328e5e736becdae737f80407730ea9315f4e79b19f71e8b SHA512 b742f5fd3151bd624452bf37761fa66d364ea5b28d9d005ae6ce6f52fc6f2b17df31d6f1e600bd6c57776a1812f22b1eafbca781b430811a010d74f157a75cd1
 DIST tdbdata.tar.gz 40241247 BLAKE2B c85a2fde9b29a14e1da27be1a7ea5fe1704f72b66cd79514dd50a3a0d2d8aab9341f7d5075f6d1896cefa54ca83948387b902b38780181777dc505a9a15b4aab SHA512 f96d7ffbb77e129251e27f62b7f099d944bacd14935e03fc52c9f0b262cce1ad477ad43520a93b407951fb8f5dd3ba2e27ff6b5ae8a637ec03bc02f8c7c3990c
-EBUILD psipred-3.2.1.ebuild 1109 BLAKE2B 7b0b36de41275e0da80e830ed7294181cb36586189adbf5640987785203d249dcf691e83067a6cc07a3452cc2ab39a2fe835cd27c9d58c9286660fc846133935 SHA512 9971b494b499b494b2a764672a074573184956fad453971b7dcb962a0728493c8339e9fba484fbb0062e2436b72516035f74d363909b3b8e85ee6060061f95a0
-EBUILD psipred-3.3.ebuild 1206 BLAKE2B da987c4a178ba51b300da549c30bc17f65a6aa0ef3c22d827f9101a36cc2ea9dab7ad4b8af3211166d8c7a81d14bcde6e72236ab7707cc5d32f1340d11e9ad0e SHA512 56a3c75dd285784b36d546a3722451915527ba33821d070feb16997212749b7a8a85eaa4940dee1665bc2c28bbc4968bf3d470283852e0224c2a3a01e6347188
-EBUILD psipred-3.4.ebuild 1223 BLAKE2B 2b287a7f5db23106db40b3cfdc787c6bae707f81d47f8b1b729672404e289a063eb6befbf3ff2a2c6c1e414a6c23a2abb8a3a4f82fb0291ac01ec0497ad83c43 SHA512 3c657fe871ed89e1138a0a305ab339fdcd92d32e23fd512f8833f849ebcc725f313eadf6236d4bbf5843dab469eb5471e9fc9a0d20113a02e38475d792c60521
-EBUILD psipred-3.5.ebuild 1223 BLAKE2B 2b287a7f5db23106db40b3cfdc787c6bae707f81d47f8b1b729672404e289a063eb6befbf3ff2a2c6c1e414a6c23a2abb8a3a4f82fb0291ac01ec0497ad83c43 SHA512 3c657fe871ed89e1138a0a305ab339fdcd92d32e23fd512f8833f849ebcc725f313eadf6236d4bbf5843dab469eb5471e9fc9a0d20113a02e38475d792c60521
+EBUILD psipred-3.2.1.ebuild 1077 BLAKE2B 9964a292420cf395be39b1757e591f2ca76f315c2fc6da8876a9339ec4e305815de1722c6eb4ba602242465a7754a2805159065d21417564c9b2e6fbc85bc127 SHA512 9906fa010d56bbc6b8f0967d4153272a400933ceca83c09e361290e6010d663d90d4099ccac85ed327948aca9f4e337ea839ac58dee97f50163768199b3bd7a0
+EBUILD psipred-3.3.ebuild 1174 BLAKE2B 4b0d3baa6fa748306bb32bea9bd397b4b8f1d009bc78253d4182ec66945b385734d1aa88fa561eef44336d9333e4e9c831c805fc677c7f51fc55a980456048dc SHA512 9a79023c9abbfe9b39243aae76192853ee7efde1bcbeb5a554e3014c86fca08e8f668b543e1c2894538dc37a76fea85755cb0edf871cefdc27db7377e216f7a3
+EBUILD psipred-3.4.ebuild 1191 BLAKE2B a9d1be16864e5bf05c73595648cc161ca508a8e8b6582a50aa76aeda971a4fd79daa5081569b7fc93b854afa9e119fa274befac8c32cbcbd331f3b722a717b41 SHA512 181b9c23a3263ca9febe3a78cfe207b65368d670abbc64b3d084584275d7bf56d0f87076b3ff2e7e9c9b5695145f9ad1e4759e62e090ec174477aab5321ff3fc
+EBUILD psipred-3.5.ebuild 1191 BLAKE2B a9d1be16864e5bf05c73595648cc161ca508a8e8b6582a50aa76aeda971a4fd79daa5081569b7fc93b854afa9e119fa274befac8c32cbcbd331f3b722a717b41 SHA512 181b9c23a3263ca9febe3a78cfe207b65368d670abbc64b3d084584275d7bf56d0f87076b3ff2e7e9c9b5695145f9ad1e4759e62e090ec174477aab5321ff3fc
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-biology/psipred/psipred-3.2.1.ebuild b/sci-biology/psipred/psipred-3.2.1.ebuild
index 556b98801f31..1bcb58744638 100644
--- a/sci-biology/psipred/psipred-3.2.1.ebuild
+++ b/sci-biology/psipred/psipred-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -18,7 +18,7 @@ IUSE="test"
 
 RDEPEND="
 	sci-biology/ncbi-tools
-	|| ( sci-biology/update-blastdb sci-biology/ncbi-tools++ )"
+	sci-biology/update-blastdb"
 DEPEND=""
 
 S="${WORKDIR}"
diff --git a/sci-biology/psipred/psipred-3.3.ebuild b/sci-biology/psipred/psipred-3.3.ebuild
index 16c7fbd503a0..4e0b0102837b 100644
--- a/sci-biology/psipred/psipred-3.3.ebuild
+++ b/sci-biology/psipred/psipred-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -21,7 +21,7 @@ IUSE="test"
 
 RDEPEND="
 	sci-biology/ncbi-tools
-	|| ( sci-biology/update-blastdb sci-biology/ncbi-tools++ )"
+	sci-biology/update-blastdb"
 DEPEND=""
 
 S="${WORKDIR}"/${PN}
diff --git a/sci-biology/psipred/psipred-3.4.ebuild b/sci-biology/psipred/psipred-3.4.ebuild
index 7b71d435ae20..d1d6a547d17f 100644
--- a/sci-biology/psipred/psipred-3.4.ebuild
+++ b/sci-biology/psipred/psipred-3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,7 @@ IUSE="test"
 RDEPEND="
 	app-shells/tcsh
 	sci-biology/ncbi-tools
-	|| ( sci-biology/update-blastdb sci-biology/ncbi-tools++ )"
+	sci-biology/update-blastdb"
 DEPEND=""
 
 S="${WORKDIR}"/${PN}
diff --git a/sci-biology/psipred/psipred-3.5.ebuild b/sci-biology/psipred/psipred-3.5.ebuild
index 7b71d435ae20..d1d6a547d17f 100644
--- a/sci-biology/psipred/psipred-3.5.ebuild
+++ b/sci-biology/psipred/psipred-3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,7 @@ IUSE="test"
 RDEPEND="
 	app-shells/tcsh
 	sci-biology/ncbi-tools
-	|| ( sci-biology/update-blastdb sci-biology/ncbi-tools++ )"
+	sci-biology/update-blastdb"
 DEPEND=""
 
 S="${WORKDIR}"/${PN}