gentoo resync : 06.01.2018

15 files changed, 63 insertions, 36 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index b99aa945d7bc..5f957f9d0ee6 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/blas-reference/Manifest b/sci-libs/blas-reference/Manifest
index b34f514413fe..bf18b786f1cd 100644
--- a/sci-libs/blas-reference/Manifest
+++ b/sci-libs/blas-reference/Manifest
@@ -8,6 +8,6 @@ DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01
 DIST lapack-3.7.0.tgz 7359812 BLAKE2B 20aa42e22d8c920d1360afe41ceec7b36f6cd5fbe43ca9d7848ef7cc45a64a0314cb1321941c1a7c03654f41e28ec805445882ded0ca0ea07674e70b66cba6b5 SHA512 e4f4c7d0ba8a096eeb813160c6dbcdd535647df6b2ad5beac9181908158956b31d1a9554ec9b9836fd44fe7404c1f377b297cbb20d744f20d70e357fd246c91b
 DIST lapack-lite-3.1.1.tgz 5332509 BLAKE2B 5a8ea98e9956f2bc1fc8dbb1ede18178d43d1f418e324f2798daf2197a2f7f7a1841ea0a0d68f1affa3c9c0a37b024f82222bd2fd6072ca827c70c9c441191c7 SHA512 492b932ef313339ce6b4e63ac8f778489e6870b0eb85f7b086f3c844e75f98e7f85382c7556dfa368ab8320b6f02d1df8ccfcb40b5c0b7c2d74518b7c309e75c
 EBUILD blas-reference-20070226-r4.ebuild 1960 BLAKE2B 31a8ba7cc32d6db15b70e66dcb1e1ac753c622848d9fb532623a1a8e3e03fb84114ff1f5dcb28d6eec0c3cb9152f7eafdd1b209b39eafc309cc042b198df867e SHA512 00fa4c79ec1e3607f58a91ce9fea701a681e1a35258f59e437ea46daa7e72348eb7a3e84a49b9810a26f3b70eef4098f391e714fce1514ad5ed696ac709ce2ca
-EBUILD blas-reference-20151113-r1.ebuild 2347 BLAKE2B 3e1f4f4a878021ddc37063c1ae9d83f7c33ac39e22e101af6ac64864f0e0bcd4a1ab65b409ef33290f21430d06901aab29417765e6daf293de00e3e082f4d767 SHA512 0d26f418364f8c3d3bd44a3d476a8462eedb8faf2153400818b4297d5f590a3e8f3cbb94d8edefcfd63e4163b5df29d18142565a3e4cea129797c13fc8ce9e1b
-EBUILD blas-reference-20161223.ebuild 2583 BLAKE2B 17c2933b68a109d71496847a3bb91b832fba99cd8e135c2e0d433bd538cf7af160d1411eba457cded1b9a4d585f35b43ca6cd6de7b2714f3a1bbc9328e9626c6 SHA512 e5550fb5f01ce7063548e245874f4551d931fc2cac2002ccf286afed9156994e76b6ae038ae4f82b5f818d1624667a95941b2499a92704fb4b9c5234ac2b8772
+EBUILD blas-reference-20151113-r1.ebuild 2434 BLAKE2B e50bb59e974d893fa0c4a8d8440a3afe4c9e946c5565fe9456d25c9161b0d391ef2daea0f38fc5f40bcb8a3c2d0d45f3b233a415fc81da1e9240bae694d33881 SHA512 df2992f47c432b0ea9e1d0268d52989293506f8f852e978b87a5c57c6edcef390f96a37191228c297df28e4aff5fde4ddc53425fd88c5fb9340400961ef9f4ba
+EBUILD blas-reference-20161223.ebuild 2670 BLAKE2B 585ba9712215422301179cf187f54443c45f228409f97cbb791217e3b7a5bca4b0efdde3882f136489457d1bd9805460894d32ec396a269ec11236d4fe7d14fa SHA512 85d6150b70019ffa992f95bc6d3e775e2c00b27edf3068566355a2ab1f2d9e41706d91088741b4e16b257c8a92dc6c15a785f7cbfc774850841d06ce837e30a5
 MISC metadata.xml 801 BLAKE2B 68ea5978073c01c861253ffd064179a25dc63771c9cabc0b3de200e5333c93a5d55caf8cde1234b643007b690b2a96fa207314117f790b367bd089c997722676 SHA512 78ca8d7459ba5bc81f5f821d9020023d01610d1fd55157bf566890a5c80ff8f83ca1139304319ee41b04f04b559c9e377037c04a1fbdd8dfde3e62f7ca6ff9fe
diff --git a/sci-libs/blas-reference/blas-reference-20151113-r1.ebuild b/sci-libs/blas-reference/blas-reference-20151113-r1.ebuild
index 274ff2078119..4b9722513640 100644
--- a/sci-libs/blas-reference/blas-reference-20151113-r1.ebuild
+++ b/sci-libs/blas-reference/blas-reference-20151113-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,9 +17,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
-DEPEND="app-eselect/eselect-blas"
-RDEPEND="${DEPEND}
-	doc? ( app-doc/blas-docs )
+RDEPEND="
+	app-eselect/eselect-blas
+	doc? ( app-doc/blas-docs )"
+DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 S="${WORKDIR}/${LPN}-${LPV}"
@@ -54,6 +55,11 @@ src_compile() {
 	cmake-utils_src_compile -C BLAS
 }
 
+src_test() {
+	local BUILD_DIR="${WORKDIR}/${P}_build/BLAS"
+	cmake-utils_src_test
+}
+
 src_install() {
 	cmake-utils_src_install -C BLAS
 
diff --git a/sci-libs/blas-reference/blas-reference-20161223.ebuild b/sci-libs/blas-reference/blas-reference-20161223.ebuild
index 65ef230c1372..f9afcc3aec12 100644
--- a/sci-libs/blas-reference/blas-reference-20161223.ebuild
+++ b/sci-libs/blas-reference/blas-reference-20161223.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,9 +17,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
-DEPEND="app-eselect/eselect-blas"
-RDEPEND="${DEPEND}
-	doc? ( app-doc/blas-docs )
+RDEPEND="
+	app-eselect/eselect-blas
+	doc? ( app-doc/blas-docs )"
+DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 S="${WORKDIR}/${LPN}-${LPV}"
@@ -54,6 +55,11 @@ src_compile() {
 	cmake-utils_src_compile -C BLAS
 }
 
+src_test() {
+	local BUILD_DIR="${WORKDIR}/${P}_build/BLAS"
+	cmake-utils_src_test
+}
+
 src_install() {
 	cmake-utils_src_install -C BLAS
 
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index ca3ba9ae028b..90726a253c3e 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -10,7 +10,7 @@ AUX gdal-2.2.3-soname.patch 2062 BLAKE2B 159b3d8eec126a141ff21c908d45193411bdbcc
 DIST gdal-2.0.2.tar.gz 11643726 BLAKE2B aac80990d800acb8b0881caf84229a3c73b57aad1acbd05adb911c9c2ca56fff145eae5a77dcaa934003a22188178883381db5a4c10e7fc082b8f4d98aa146c6 SHA512 b3fedc8d1d0522d2a6fd22fbc722c551ebf2e4326f64b76c9c43cd3848f7c97a0636c691ee383b3f3c872dc79cd0e216527d3985c6aac3103395fde657db1266
 DIST gdal-2.0.3.tar.gz 11589011 BLAKE2B 2b9d319be24e377aff751c7ae4d6c89812c47fe2a0b9476936b2f3423e4f5593034a6303346e05709c9a7cffd71703ae80f72c689218ae0337794d35afcb3a1d SHA512 3ed2a084fa146fab8d5f5e039480ab935edaefebe9e55f85bf637a4487a3f56951c93055395850e7bf35d5a6d6e901f741ae01ad64be87597aabfad52f1c5e90
 DIST gdal-2.2.3.tar.gz 13754766 BLAKE2B d9482e7ee40bb5558fbbb43b750dfb95344abe45142c19e1f767535d3fc127fa9d6ed4496d730a25cb4132980efbffb4685e8663798fa05515b8548edb689e42 SHA512 841e5ba3c1a442b678dcaabac719ea7707b817f3dc717a34430dc7ba1f2c27fa88e27b7a8645075fae6e16373b36e6c50f674bdd6b70d10059e6bc4be7a72046
-EBUILD gdal-2.0.2-r3.ebuild 7197 BLAKE2B fa48ff77631d9f9587c0afefc0c074805cb77568255d0e1e42871c2d94af6d2f50566dcf834b0caf39ab12c0c4a07f9680c9ad4ffe97a9ffe4a155d84c9a8eb7 SHA512 8f023f59866cc90738c836686738fc0109bd2c7b46bc6b24771aa15a1736767e31cc662e96171c5ff24e1e0c8e75b1361a2b5db33eb2dbe7538b04c9b66b76e9
-EBUILD gdal-2.0.3.ebuild 7546 BLAKE2B da3c74d1a5f0ff1045769432d638fd5460f313c4867a72122c6cfb32de5246418735275e69cbaf166491bb087afc41a83c7cd09548365cfc9f3799893dd42dfe SHA512 39aaa6de5686014d96a7bd874d6eccb29ee4eccc83e329ae3e52fc9e2f1ca0f22ca83b7cb8ac269942c3f16e674978881ce0b3c556e544ac7dd287afc07ebdb7
+EBUILD gdal-2.0.2-r3.ebuild 7176 BLAKE2B 9c312840c67110cd7dc5b8fb42fe4828e06cb761440dfacfb1fad8d6c9f3d98432e3e3d57623ac1ca09db8f26da5700ca1ee69da3de2b9cfd33857b8a86569f8 SHA512 b5e7fc804e892cf60b8b6ccafb3357def5434be1c6f9b47028f877de002b4e6b654429cb62d2274e0f9fe2a5c0fa7b3877c93c9ccddebe1cccb603eeda3f1cb9
+EBUILD gdal-2.0.3.ebuild 7525 BLAKE2B aa70d3e8b2bfb3213ea247f9c3c838a72cdf5e74061b6b4aa873726e14242f1d9635fc45436bebbbcaad443c89f0ad01546d02ad0f3d98238f2f8d4a006c2600 SHA512 eef801d86c845a1b880dee6aa20381ff06175d0c6b88431230e23ef772a5618455361dc6f38c5a7808d5dc97eb51cfb1fd9bf751b2d875d44d387f60fbf7685f
 EBUILD gdal-2.2.3.ebuild 7449 BLAKE2B a97c987d0063f884077a6b3388be8d121aec3234d51a14abfd76188fcdcd4199c436bd6841f1e1892d20c7eb908b62841eb5df6df9527cb50b62c176a212c175 SHA512 58788ab996560f7abb2e34f7859906c30ba9bdf63a1337e155b42550c178cd2223c84643453d957f8bd38b02f846626e14a96359b97958587cc5a0b36a6ab031
 MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee
diff --git a/sci-libs/gdal/gdal-2.0.2-r3.ebuild b/sci-libs/gdal/gdal-2.0.2-r3.ebuild
index 4a713012e981..836f98c0938c 100644
--- a/sci-libs/gdal/gdal-2.0.2-r3.ebuild
+++ b/sci-libs/gdal/gdal-2.0.2-r3.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-WANT_AUTOCONF="2.5"
-
 GENTOO_DEPEND_ON_PERL="no"
 PYTHON_COMPAT=( python2_7 python3_4 )
 DISTUTILS_OPTIONAL=1
diff --git a/sci-libs/gdal/gdal-2.0.3.ebuild b/sci-libs/gdal/gdal-2.0.3.ebuild
index 74f1aa7ecb35..ee3dfedc4d87 100644
--- a/sci-libs/gdal/gdal-2.0.3.ebuild
+++ b/sci-libs/gdal/gdal-2.0.3.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-WANT_AUTOCONF="2.5"
-
 GENTOO_DEPEND_ON_PERL="no"
 PYTHON_COMPAT=( python2_7 python3_{4,5} )
 DISTUTILS_OPTIONAL=1
diff --git a/sci-libs/mmdb/Manifest b/sci-libs/mmdb/Manifest
index 4e76a77df291..207427681b12 100644
--- a/sci-libs/mmdb/Manifest
+++ b/sci-libs/mmdb/Manifest
@@ -6,5 +6,5 @@ DIST mmdb2-2.0.5.tar.gz 733138 BLAKE2B 8197fbd0331aa770144e9fa56ac6a3a89f58fb226
 EBUILD mmdb-1.25.5-r1.ebuild 487 BLAKE2B 6d600888c83ce61aa55575f4b1593b4144b741521ce345220f350e429efd5e734d73c10a77470ed676818f0ed9fa2710b9dab0168a2997a6b0f0aa7c7fa82c88 SHA512 983840011e3e1fe935b61b5687d80d21c2358b3b521768551f34c3c81a16522e6ba024d0d470d83d67dff17ae1bc6294c30855a269c29dbf0f91d84e8c2de62f
 EBUILD mmdb-1.25.6.1.ebuild 486 BLAKE2B 55ecf364e9567c6d98961eef9cd59a05fcfe7b83e1c7eb8286dafeeb951c43adfca391c9b44b055147fa3a5bea3324b02dccbc092d8f328ec2685c4152fa2501 SHA512 590b8d4cad702f7b7f6f37bac4eb50f56b09dae6c62e54143d5a6b6ea6fa172faada73119d3609c03f0bf7b93232a879f200b31d3d81cc4871e678e5bb66aa07
 EBUILD mmdb-2.0.1.ebuild 484 BLAKE2B 320fa1dfb1c044c237b78c902af2ba2bcbc8f98b453ae416ea69f624d8873a8087bee4895547546d4a958bce6767115622f288bac33bccb00e9c19822ed8b999 SHA512 a0cd76203854c4b8963e9d3ee5846d3538887b4f8d3d12644591d98b3659ce1b1ec95fecf118e76e21ca7f885e9ab8575976d1a66976ffe2262a71f5c5a97bee
-EBUILD mmdb-2.0.5.ebuild 459 BLAKE2B e008e224cb896fb6be50806abab9123985753e75d5e6d4d265d6fc8387409a12d212691c473e65cc98578606152222e94feb6787f595ecf68c9f29d77a343726 SHA512 76e69c6b3c64f7e1ae68a0f92f4ab0377c4a3fb0e194b438ba53c3ad543cca7dba679702a0fb9df964eb1d4a5cd0596b2fee2956bbd0aa8754ba490344040659
+EBUILD mmdb-2.0.5-r1.ebuild 647 BLAKE2B 0613e0e8ca1597c315d87c96988ead8536e989388c6d85320f40408b2d54395cb8b0e8e190a80ecfed2990f6800f02ce123f566d3a3da34d9c5c9cc3646693ab SHA512 ca4927b4895437ae755a19c1e5572dde25bc7572cbc50e6b707d4a55a06452d072c4f9c280f633e53059f1f8f2b31c302711227c762204d7e028e7a9c28eff7c
 MISC metadata.xml 347 BLAKE2B c20fb359d6159c1526170b6a97b97413e4d13d6cd824ca18ffa1605e5afb5df030e88bed371d3716489dab5a23c6f482d995df74f31d2853ab0845c44f92f405 SHA512 4638d7dff2f4e4b84c0acb9f4084141bede8166faf8354ef61656597f69584493f64f7552c3f79849d8d910cdfb93292ad1625589e1f9aa175ea4e2e26af90f8
diff --git a/sci-libs/mmdb/mmdb-2.0.5.ebuild b/sci-libs/mmdb/mmdb-2.0.5-r1.ebuild
index c19513a77290..d9a8ad2243da 100644
--- a/sci-libs/mmdb/mmdb-2.0.5.ebuild
+++ b/sci-libs/mmdb/mmdb-2.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,3 +15,16 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+}
diff --git a/sci-libs/neartree/Manifest b/sci-libs/neartree/Manifest
index 6b4a37f782c9..9f5facefe6d8 100644
--- a/sci-libs/neartree/Manifest
+++ b/sci-libs/neartree/Manifest
@@ -1,4 +1,4 @@
 AUX CMakeLists.txt 713 BLAKE2B e27870916b4f17c7cc17d0b1b385e797d8e8a87e195e71a848b0ca9b05f4f881c5e8716167de27e26a58db880e10c6b138cb17201ed1c3b7eba9e542ae69c470 SHA512 038c8e23c642c6e5f6651b9c2cf29f8764a983294b9add97f9af8ac5d14ee52c1b47afa45791a21e8d783cb0e74801df17a34c1fbb08df1d7dd27ef2b4825b94
 DIST neartree-5.1.1.tar.gz 167695 BLAKE2B 238f9d4f6c900938b53d692b9694044685cd2d906776c95c33f4f3619a35ed33ef2b85ddc7c2876219c7faa3930c234a3854266f539cd0a4b48d15b4a5e96040 SHA512 36f2ab878319153440914325bed67d111dafcac724cbef73d439285f4ad82979b05d2987fa3802c440aa4a037499bf7961ef9b09fa3658364731b5a405854b00
-EBUILD neartree-5.1.1.ebuild 734 BLAKE2B 09d137199a155ca7a5c1548bf1af2b51eaefa92e9c2b2927872b5705801ad7966a80a84978316c64a188c46b1701f48669a77927a25554d5bebf2235f83e3141 SHA512 34041ea452599886cf6de1b0da7e5fa0f2fe472198ddf07eae08741459639b0dda8a0f94c5e058fcdb063ba52e52e4016d6a55f11986ed39c07f048c0f01b279
+EBUILD neartree-5.1.1.ebuild 734 BLAKE2B 38fc1363fa89f30f5aa805c9d800f4be8e9d81b2095c3327de850263ed21fc8dfe34763ba18eae0c6d836dd32416c57b08924e6d8d952d834b979a9301968d54 SHA512 69b7d429378360b91404df353b682e7df5a02095b3f239f373b4948972208ad25369180e38a3c45360cac3a521144c15c77406860597793fd8df109afd673a33
 MISC metadata.xml 331 BLAKE2B 4e9085e10412f2d378efb037793cb9c8469b2b2aad9e00f34c0b54943f9042978ef0acce7b1afc7396ae9033bbd4068801797eedb484bcbcf898108724fb42a1 SHA512 3c16cfbd9d2ccac961a78b3d0cd4a0424933f2002a536a25fb192a5347e320282381c92a8f939c1e8c3437ef23a9c843c2b09369a6a6cd6fd7e38a51731d14d9
diff --git a/sci-libs/neartree/neartree-5.1.1.ebuild b/sci-libs/neartree/neartree-5.1.1.ebuild
index eff4bd3646ce..0d1ac6098867 100644
--- a/sci-libs/neartree/neartree-5.1.1.ebuild
+++ b/sci-libs/neartree/neartree-5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,8 +22,8 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	cmake-utils_src_prepare
 	cp "${FILESDIR}"/CMakeLists.txt . || die
+	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/sci-libs/rosetta-db/Manifest b/sci-libs/rosetta-db/Manifest
index 5b9b5fe106fc..c275d017c95e 100644
--- a/sci-libs/rosetta-db/Manifest
+++ b/sci-libs/rosetta-db/Manifest
@@ -1,3 +1,3 @@
-DIST rosetta3.4_database.tgz 212443671 SHA256 4573c2cb43be0fd805ae9dee6a40948c92e829207a52e419552080400e94b2e4 SHA512 c057cabcc95e6ff2278517e04d0fe8c7968a5c29d17ceb7bc75ac6e655b0a798d4ca819b313616c69b6cc18252c12b9af083d9cab9d4e30dac4c32db2f058b81 WHIRLPOOL e856396bd4fcd937fbb643a59c6689079fc3157c48b47b7848cd954267fa68972ee7dbb05fb9d5ee14fc72b064d4b58ae596d0fa7e3e192b3c7aa0b371dc9b43
-EBUILD rosetta-db-3.4.ebuild 700 BLAKE2B 6475734374ad37a28ff4bb27b9c1515772d6325caf221eb7a679ac52ba9b0a54726590454dd0ad52ead2b1084b8bad384f7ff471de825a2a5bbac807f841a2d1 SHA512 fbf3a3b3b9a1a9fa4ace3fe99e671fb84b3c84612d8cfe9572e93f9946b352a842c22d9b4b87dfa59a42fe8a36a1a054e95e44859a81e0f3b1e0067f9e0678ca
+DIST rosetta3.4_database.tgz 212443671 BLAKE2B 92aeb833bab050f8122dc9fdbff153cb27c4993bea4e55dddfd5a2628c7e5fd55ac5da3d8b132a2e3fe83e1a9b6b417ad361eef2afffa3792b2d15de31ddd051 SHA512 c057cabcc95e6ff2278517e04d0fe8c7968a5c29d17ceb7bc75ac6e655b0a798d4ca819b313616c69b6cc18252c12b9af083d9cab9d4e30dac4c32db2f058b81
+EBUILD rosetta-db-3.4.ebuild 700 BLAKE2B dffe713dd1595a4ce2f5a838ce5cbcf87a67b3e9d100792707d1c4baf0a77e60d9767592552b1fc3dea9b0cc4ad06e64ce3395a8a2e3dc374bd1b4089cb17c20 SHA512 8dcdf907bd7be8aa5a8811caeecf35aab86b2918c0d44b9a7dc6fcf28a6ca0738d846cc5719a2b5af3580cf6a1bd7a3ab6276f3cb0b517590a9d0fa9ec93a400
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-libs/rosetta-db/rosetta-db-3.4.ebuild b/sci-libs/rosetta-db/rosetta-db-3.4.ebuild
index aaaf7603fccd..3a9e83a354bd 100644
--- a/sci-libs/rosetta-db/rosetta-db-3.4.ebuild
+++ b/sci-libs/rosetta-db/rosetta-db-3.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit eutils
 
diff --git a/sci-libs/rosetta-fragments/Manifest b/sci-libs/rosetta-fragments/Manifest
index 59614f96798d..b6d772234248 100644
--- a/sci-libs/rosetta-fragments/Manifest
+++ b/sci-libs/rosetta-fragments/Manifest
@@ -1,5 +1,5 @@
 AUX rosetta-fragments-3.1-chemshift.patch 1721 BLAKE2B fe06e82eb2888767a0f16a8e045c78ccdcbb142b48d9da334bc1465acd5cf5850e3511552b224272c30908e24cfbfcc0d0ba88f0ebc094b9438a30174ac1ca4b SHA512 3475a4fd7a433d4d380ccd5ab11cf32f326fafc828d1bead0dbb0e03f5e53c613bf57c7950e090d8a2eb34c4ba93ecf25b25afcc9f251ff5f943e6b7e3112bb1
 AUX rosetta-fragments-3.1-nnmake.patch 7030 BLAKE2B a3ca2811e9831d4fd49e981374783448060b09aab2749c366b438b66a3c5114c4cdf86cdcd2d9277ff52b3cfb004fa5d6510292b730af4eb3e15f9b70e83a70e SHA512 de6d41f68911a5beddc8a15c9ce33013b03462642229aaf3b09ae4123c281260fa725bbd55593eea305b05d2ed21e1d17394686ee4e42bda20825d71d9367501
-DIST rosetta3.1_fragments.tgz 221931894 SHA256 2211cab76e4848d80d6fd311e97535de220a865d8afc72d8ca12f90b7d4641bf SHA512 a2b2646c916ea1b98e2c7267c1eadb1fd6cb76d015c24bd4e8318ce127cb5d96ca56bfdd76821e1dd884e03d59631f544e221b9f541ad4063a99e96dbb029da1 WHIRLPOOL 32d0758e6782da8088178e11af5bfe23b457e98a3ab9a8cbb583d4e4aa48e5d1ef9005825ff62944c5c755a0ac99b3ff88fb7c1d1b249940110287969ff0118a
-EBUILD rosetta-fragments-3.1-r1.ebuild 1133 BLAKE2B 6e87ce77558b2c4945f616a204271fbc327a71c6af47cb1ebdd8cb7e799c78ec28c7802c4acc308ae04f6a3292b31776f2efddd4545e598aa71450133e7618a1 SHA512 7d424dcfeed1d073c27c2ba5a86d75877c597bfea95f40ab7acff767d41786b66576dbedb0a626e84d00ca63cd0f9131227d3ff200c35ad6b4d33ff485be5ab7
+DIST rosetta3.1_fragments.tgz 221931894 BLAKE2B 0fb5764f24f3386cdbce9afce7da3f81cce91a6a0a57a265e5dbe0bf06146e4ab057c02961ed0dd8074f86309257bcf5b42ca0d1c6adf92c9f8ebf36b3f25f5d SHA512 a2b2646c916ea1b98e2c7267c1eadb1fd6cb76d015c24bd4e8318ce127cb5d96ca56bfdd76821e1dd884e03d59631f544e221b9f541ad4063a99e96dbb029da1
+EBUILD rosetta-fragments-3.1-r1.ebuild 1121 BLAKE2B f3c72392d53d730bd785250fdb0f871c8bebf90968522df86b9b9dcc32388b67a49022fc4d892cd649e46af9cf303d6385411611b52aac37a774b4dbe1b63644 SHA512 cd91b3a9ea94bb402c0f3adf8615ae58a116c246a98d1dd8022836c5d7dde61b9f9738a0c3f45a6219f133b9e10dcb150398f8e7413aa0e963c8544967354fcd
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-libs/rosetta-fragments/rosetta-fragments-3.1-r1.ebuild b/sci-libs/rosetta-fragments/rosetta-fragments-3.1-r1.ebuild
index 055c225edf1d..7f57da918ba9 100644
--- a/sci-libs/rosetta-fragments/rosetta-fragments-3.1-r1.ebuild
+++ b/sci-libs/rosetta-fragments/rosetta-fragments-3.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit eutils flag-o-matic prefix toolchain-funcs
 
@@ -17,22 +17,25 @@ IUSE=""
 DEPEND=""
 RDEPEND="
 	sci-biology/ncbi-tools
-	|| ( sci-biology/update-blastdb sci-biology/ncbi-tools++ )
+	sci-biology/update-blastdb
 	sci-biology/psipred"
 
 RESTRICT="fetch"
 
 S="${WORKDIR}"/${PN/-/_}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-nnmake.patch
+	"${FILESDIR}"/${P}-chemshift.patch
+)
+
 pkg_nofetch() {
 	einfo "Go to ${HOMEPAGE} and get ${PN}.tgz and rename it to ${A}"
 	einfo "which must be placed in ${DISTDIR}"
 }
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-nnmake.patch \
-		"${FILESDIR}"/${P}-chemshift.patch
+	default
 	tc-export F77
 	eprefixify nnmake/*.pl
 }
@@ -52,5 +55,8 @@ src_install() {
 
 	insinto /usr/share/${PN}
 	doins -r *_database
-	dodoc fragments.README nnmake/{nnmake.README,vall/*.pl} chemshift/chemshift.README
+	dodoc \
+		fragments.README \
+		nnmake/{nnmake.README,vall/*.pl} \
+		chemshift/chemshift.README
 }