gentoo resync : 23.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-23 10:22:15 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-23 10:22:15 +0100
commit: 8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree: 230f3135ceaace633cf93e9838b185c4a6664c2e /sci-libs
parent: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)
81 files changed, 675 insertions, 1307 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 5d520f83b552..3d896cea5503 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/Shapely/Manifest b/sci-libs/Shapely/Manifest
index 7193e0a8410f..25f79e46458b 100644
--- a/sci-libs/Shapely/Manifest
+++ b/sci-libs/Shapely/Manifest
@@ -1,6 +1,6 @@
 AUX Shapely-1.6.4_p2-test_operations.patch 722 BLAKE2B 661659bc1d2f8c8a5d6b77f0ca746024aa9724f2c25047d8203d591a4f793982d4cf9bebaa6abcaf48c0cf1b266ef941b986897d26bece39519f8fcaf5dcaf96 SHA512 c1e9eda0cf8dbfbcee2d6994f470559507c754fa2bf03973ac692ca6bd2fcf62ce05e15116515877e8900a89c55c6b2bf6e70b74e2cfced8d3852608901b34db
 DIST Shapely-1.6.4.post2.tar.gz 225745 BLAKE2B 96e995db6dd1464bac7c2562efdc7f298a5f23c388e44f334db685b1cfa1025ff403db870e11328977a267483726504e03b6d7c47fe4234a3a5966a13b2b7311 SHA512 027c816ef2104f654569ca658b52b87c60e5ba6a45927fcc51c23dd1922f3f9f7fdcea3601160b0a999e39611617142833ccac790777093be8b96a0d9083f78f
 DIST Shapely-1.7.0.tar.gz 281419 BLAKE2B 1a4e84104f21d2f5a5eb810883a89deb20fd47cf146efed884994786364b29bb5a194b063a50ae21842c07c335cbbee0c3d1a1e4ff4e43e0d083080fe33815ac SHA512 4d944fc6727e11d004ef7ba0325c159aa5ae03043f17b029ab0a399d6dcd361c4d299ad864a045a99b0229e333d5b42634bc6fd1ed94b914b7cf58fb886af2de
-EBUILD Shapely-1.6.4_p2-r1.ebuild 1230 BLAKE2B 29cb26d4278e745a60a2ade9de8aa9017bc717334f6c1ca8a29a994260fab52a5d8854cfc080813b5192ce7d5d3f37408f85a2382ec61b43c7e7deacba5d122a SHA512 890f69a44cd91c69c1e486c4c8b6e8a3388a213b15de9249770abd4df98272e46a0ec8383b1ab916f1f66b6e98fa1cc3ebcc9b7a1e8d37c8a3c7df86ba59eae9
+EBUILD Shapely-1.6.4_p2-r1.ebuild 1237 BLAKE2B b51a668790e3cfeb75a7088bb25f57d8b4aa5a52e8d056d87693db69cacfa56c2f33c40509475f118bb77b9d583f62028b58a9dd9940417ba135739fbecd69bd SHA512 2695c1473dc5c02ba056f12dbb4c43d98209976411f69dd03c04550abc9d5dae00b703dcaa3238d08010cb7d9b90cec66bbe45f3a39aadf1f58e122a33a7b1bd
 EBUILD Shapely-1.7.0.ebuild 771 BLAKE2B b4a44431198e9a5ff19b0389a43d4485ebffb630590f6706744b73236f0ace0408e7120804b37b1deaa7a8e51a010bdb8261579ebc8675f38b5bb93092b56e02 SHA512 18d77d5124d8725f3b537f2bca0099177d12ad9c04df054273ca4fb22e71982415c16604ff604e9ac7f1eb46f60c57f70ef1d333914ee2db4942a15096d720ac
 MISC metadata.xml 774 BLAKE2B 418f9b236cefcea8bd6d1e4a7b7d85b2f0ff55060a6e4c75597d4db592a51e843264817643e8d0758bb82a35f1fc60bf99353561590233485122bb4869e584ce SHA512 7f580b0fbdb663892f4454815e29ceae0d31ce4d29659de7e4478f7ff86fc03625eaf65c643dbd24d4ffc30a7f0b6f535658b4d084dc25c3c47cbca92d7fc210
diff --git a/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild b/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild
index 236a29449e75..a9ad4b613f26 100644
--- a/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild
+++ b/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="BSD"
diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
index 6ae9f314a39b..f45d468b6609 100644
--- a/sci-libs/amd/Manifest
+++ b/sci-libs/amd/Manifest
@@ -1,3 +1,3 @@
 DIST amd-2.4.6.tar.bz2 343925 BLAKE2B 296579d888b61e84ec798206fbb6f89fd923f0d762e84e7a1e2e2a5fb502f4822f89a2a4b631dc42fa829e845bf3980886185650e8de28774400e0c351805061 SHA512 6960a557e6c2f82ca2e68e48ddcb502e1527235a3ca34df2f5f7f63f0f12afacedb15fefe4a39768fe7a2c70308793544b5b24b6f2be2c6b934b0c0e0e796d57
-EBUILD amd-2.4.6.ebuild 781 BLAKE2B f4647eb197bc38a2fa0f9dcd38ecf71afde48cac512d46a31d21c87b4e94a32e480983bdcb456970aaf07c02f43c028fa0261ed00b07bd718313372171a824e0 SHA512 73b3a9d3d76d8661194a3ecace1de7856fe584fb73882214a24c3bec0d24cdf5a9a4a2126dfe0f7d81028d2e9ed71d8c88d716cc71dd1015a6c11156095421a1
+EBUILD amd-2.4.6.ebuild 782 BLAKE2B 132b5cf2afcb271fb78428144032ce990940d67034c458ba1ca03eaf11fb565f89dd4cb5b9b6c9ec73f08a6779052fd691d6f7c4b3627e9cdc6726b690d3f634 SHA512 41388ed82c77de69ce0dbc1926023b330c32ab45d2503ca6ace21aa2003d37950e77621173e24949af4e679854966d189215d6a729929c282db626b28585ef3a
 MISC metadata.xml 492 BLAKE2B ac6367af33dd797e703e3370d6369db5286b11f862b5387258e9edd860554049c7d9e2bf2186c86e24a7fc29c3f1122f330c0a3cf0420f13085757cff0a388b3 SHA512 1c53658e87337e1e43149c363c901dabfdde52b647891d8026a7ce9ddcd5e36b0121948d169d446e5a78d05c26301bd4f8c7c06665506ebc0999c259b709a6b6
diff --git a/sci-libs/amd/amd-2.4.6.ebuild b/sci-libs/amd/amd-2.4.6.ebuild
index e63da81355ad..669231443d00 100644
--- a/sci-libs/amd/amd-2.4.6.ebuild
+++ b/sci-libs/amd/amd-2.4.6.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit fortran-2
 
 DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
-HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
 SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
diff --git a/sci-libs/arpack/Manifest b/sci-libs/arpack/Manifest
index 643744e18c0e..adf657e11baf 100644
--- a/sci-libs/arpack/Manifest
+++ b/sci-libs/arpack/Manifest
@@ -1,10 +1,10 @@
-DIST arpack-3.4.0.tar.gz 942149 BLAKE2B 8c67a26b4c805e40475a23963e16624a112a0f5a243b9e7e346ae64f08d81a2ab0fd363e874ae3180a4ff4fcc1b7c039d432737b8efa7ea4d244976665d299ef SHA512 4577a960ed0783ed2c0eb5e1871c21b9e23e75fbbfa10da1584cd3716f2699c0d633bb0e2019c0aa8809917684ef18d32508b76cb1edfc62b1179d5bbc2b68ba
 DIST arpack-3.5.0.tar.gz 949853 BLAKE2B fa28090cd745983ee362ab17e0d9f5ab503ec8403f37d38d1263d25ff7849dead7feb10667707aabb3db6d76d9d33397de13cd65fab18a45e7aadd544525cc76 SHA512 67181c783e61d5d2214ccbfa0de8efd55148537feca30376760f7009995694f68c9fc14991306fa19ad67598497510b6e0d42b68dc56dd581dc2a798e3a4b369
+DIST arpack-3.7.0.tar.gz 989570 BLAKE2B bdab72f080d223ebbe5a279102d54fc196aac3ad1b8360be0e3814cb5e14e8f26a1f37b4b27b66db4b88b0c651c039666aa94a98fcdb34977feea7fc7d10808c SHA512 cc07cdd1fba4881907b507ff6b6c9bce9e3dadd8ef744194f08ee718a6210c039ac0c51c12edd720503f8e59bcd11c178fc323e1a59696be8c3b8262cf47a452
 DIST arpack-ng_3.1.5.tar.gz 1516406 BLAKE2B 14dea27dbe7d17144871c62db58467642f4602ec479f63b1dcfe67e22b73b146691cb5bb01c90323507a65c499077d0fee3fec0a15c5d654ccca9d3f67975a06 SHA512 4876b0babb89bbcc39e92b63d4537b860e9cd0b8a188937d3ba815041b7261623cdac25c91c8bef20ebce4271f822307c492cf6c9f22ec3d740218405337a515
 DIST tutorial.ps.gz 105599 BLAKE2B 99570e6a0cc1c020b9c271e8ce1cc224f69ff5333cc818c10b063dc8ffbaf66a9f5c6ede99541b4212286d422146b1c4e332eba7e1635c99efa0e4c2620f0630 SHA512 a7b8fefd1a572ed477ae208d49094c1c65c9368990d12de9b3528e33fed546c947659f74e54a810d04154b4a1b0f9a94bcba4db0cf59d379e20786a261066aa4
 DIST ug.ps.gz 248543 BLAKE2B ac010aef470060636fa00360636ba093f0d24d219fa927c79fb1726b798160eda74fa8b4be6c7dff94f5759efcf30afa99ad310e7959115e028738beb8aa125d SHA512 3349117fb10b07207ffbab2ffa31b406d026855ea4c16e8649b14c7d70bc94e11b5730672e34acd654817799136d4bd76569ac50ec78d787df5582d18ed61328
 EBUILD arpack-3.1.5.ebuild 1550 BLAKE2B 0b18c51eff62ef6f0d25cd4692dfe0c6fe4b7148276427c69aa07eb487596ae624384140cb7d7cfe8939d8edd21ec4c361904220a309a5ca061e92e41faf0f35 SHA512 201b1020fda26b59b2b8c9b989500039a7d73718d4fd9531234f1a20e1972d33ba1ac827139ef0e453452cc6d358c7eabd568b2fab10ca2597d3bc2a473c292b
-EBUILD arpack-3.4.0.ebuild 1404 BLAKE2B bf8e09e30ec596ab74d018e18070024bc08f9330111b79df485319cfa4fb11c233e5e6fcf028494954944da04d29106f30705bb61319381adfbc023a94d9b375 SHA512 7bd4c57f74ac17f1f50943e521c67aef50c65d16fb6b065a4a955e4cfab53fb7bb0a58e4925e9dc2e2eb8747ee9ffd4b5217f3e84c6b3ed5d23f2c0ae30c06ac
 EBUILD arpack-3.5.0.ebuild 1475 BLAKE2B 280c8b025a95d2f50ae9403c64c68681f40a65d55a25720c6fd5146be664b1b9b6dd46fc8089785e47d023f230a2a5ffe149c6e93e1367b2050bfad9d4d9112e SHA512 932ddcac59c36b5dbf86adc8fb79b73ab4ed7b4090efbd159db524af8e82c6b16c9afbe3d5306345d17a675951d79497f014619663ba40a55f01634e593e6c0f
+EBUILD arpack-3.7.0.ebuild 1504 BLAKE2B a9d73824f2ff6a395b933b748b4b4568aabd214e68a8c1a09af87d5f2c114e17be0024915f401ea738800714e20fd211ffd7402b58df0a677b9971a76bce667a SHA512 dff4e79e127fd60ac666a97477e6415b381738317534cd481f9a2676d0b2acdec485324fadb72d5e4bdcc0e7a22710cfec19ee0a0139b1fd996e565262179b7d
 EBUILD arpack-9999.ebuild 1247 BLAKE2B bbbec3f3b0fce5ffc831382cd9257e7db4a2c118cc64ec7954d457dbab5943f546258a61a22f2d2bb3a6617df0b61e26869698c1aba2c0bbb1b871d85b78cedd SHA512 00dba333d657689664eff0120eeaef5f9753d9169ee644004aea7099279c1d443be9c170a9d2ef570d8d2f2be7b795914767547150d95ca1cec17f05eef51fe1
 MISC metadata.xml 974 BLAKE2B c9121a0b23acddc3268d4bdbf4537104217a00d09263d29b6cc6f832c87f9a9775f6fab567976078dc1dfa54f2bac627d792b1819a9ea698f3a1534bc52c39da SHA512 c3e094cab53fb61c9acf3eff6ca0c0fc53a71ec135315ba833fbfe6a5ae9481f2b4de5270ccd19ec84cf85dfb18df179e1e234d268eef1af98be218575dcd4bf
diff --git a/sci-libs/arpack/arpack-3.4.0.ebuild b/sci-libs/arpack/arpack-3.7.0.ebuild
index dfec8e3b0d4c..3ab97b1fd718 100644
--- a/sci-libs/arpack/arpack-3.4.0.ebuild
+++ b/sci-libs/arpack/arpack-3.7.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples mpi"
 
 RDEPEND="
@@ -33,6 +33,7 @@ src_prepare() {
 }
 
 src_configure() {
+	# Fix should land in 3.8.0
 	test-flag-FC -fallow-argument-mismatch &&
 		append-fflags -fallow-argument-mismatch
 
@@ -56,4 +57,7 @@ src_install() {
 			dodoc -r PARPACK/EXAMPLES/MPI
 		fi
 	fi
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/btf/Manifest b/sci-libs/btf/Manifest
index a1ee9eeacd3a..f40b46c795e7 100644
--- a/sci-libs/btf/Manifest
+++ b/sci-libs/btf/Manifest
@@ -1,3 +1,3 @@
 DIST btf-1.2.6.tar.bz2 285699 BLAKE2B 4addeea7b9abe87281f826a67a8a372118579f498057c888008ac93da1cdbfcf8554af6e843d92a07989ff0b24f537588f933fcc33c97317f47536980e551531 SHA512 39c08ec9bf2a85915aeed040dc02c42c10adf5034c3797910dc7cb6942ac6e2ccea47cea4ab0c37e8ed3eb8eac8d2ce946d281c9ec643cccd282af7be5276960
-EBUILD btf-1.2.6.ebuild 577 BLAKE2B cf610a37da10e117c9fb9fb08bd3ec5210b2aeaf4092d6a26a21abc3d36dea0a551690d364b2f6a09ec2373ad6c50deae119c4d2778c278c38eaca66bb702290 SHA512 a9ba52113f48e4792a4cc96a4cf0147f77b0c96992dd9e529b4891233984cdeb0bb4b65bac7ce018481babb76b5b46da661517ee9b01985dcdf8f3bf01b01980
+EBUILD btf-1.2.6.ebuild 578 BLAKE2B 42646c00aa8d0d35aba39369497e73a9f078e8e1d2701748963ab6999650c6e231078b71a896be809c40fcce734f8076b6baaa22ca9ee774d1bbc0348761a7d1 SHA512 368703b4cc6de2830aa19af24ee6dc270f9b6df0462915c578145c2c5816e7443d8e7fadd91fdcfac2c52f84732a2d14fbeb0c38619b9a02ace3ba23a7e8e055
 MISC metadata.xml 534 BLAKE2B b44c9cb7157ca2496f928f0d4580619991bc3ecc235fef6bca6072e0cd58c2be758f85dd0e4e62552218052db67fe7a24d15c7700a2bcebc88328feb6db93f52 SHA512 90699362212549e8b25ceffbf0df32253d10b5ea2203613d3bbffe5c2e7b228135579be0a63c563083846e8960d9b0594b3e230bd5ecd34100f42b08edd34b50
diff --git a/sci-libs/btf/btf-1.2.6.ebuild b/sci-libs/btf/btf-1.2.6.ebuild
index 74a9c5ca9227..d2eaa752c274 100644
--- a/sci-libs/btf/btf-1.2.6.ebuild
+++ b/sci-libs/btf/btf-1.2.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Algorithm for matrix permutation into block triangular form"
-HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
 SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest
index 5aa5b0e61a39..70a6cdaaf4f2 100644
--- a/sci-libs/camd/Manifest
+++ b/sci-libs/camd/Manifest
@@ -1,3 +1,3 @@
 DIST camd-2.4.6.tar.bz2 317071 BLAKE2B 8f982050a20f00c9443063a0473caa4aa27efe005fe07b503cb68b29499152561fc9d30d00783607b1e8fb8af88707eabfe22d192b80e375b8a6d04d7a9a26d7 SHA512 c4020ed3e063d04f5d7d1a301719b1a5b5b912d505858f046654c9d283c41ff01d55f668fb7f7179a6ac636f5a5b80f71cac5eb5b1e5cae0ede97d946d62a1d0
-EBUILD camd-2.4.6.ebuild 728 BLAKE2B 7b81c500ff5353cc46d899d60875419380cbb802374d8b2baef0406f55b3f66bc4584b3e1949218fd60e5fdb5874e03a5960ad72cec987d687f874f9cdcd72bb SHA512 26506b332fcb761bfb50c5bc4cc7e0515e2fd13524254687f63b2ec303366b29bb02f2dbd72d9bb1aa2ff20b95ad65b9e32fc115b0c27eabea1767e289f06b44
+EBUILD camd-2.4.6.ebuild 729 BLAKE2B bdc951c763877fe0dc0fa73d6ba0a1deaaa5379917ee0e385e0478a632e481e2263c8276eb3c559ac4196bde3a9275723249e54883d64e311cff697f0e5838ca SHA512 f74c783ec10f374ef67ad9c8e32112b60804a7bc7e179928bf960647001041c77588bb456a4ecb577a64713fa27d86059429b1e01174e89164b6a5c9667f46c2
 MISC metadata.xml 494 BLAKE2B 456f4ab539ab7303849cfabfda3e07987874a833e5691d6c3336ebb8a86cc6d5cc5fe8c20b65d8e5fdd8da1c947b9e7ff8eedfd2cc17da6040ff5d109b1b110d SHA512 6402783aec0922669bbf45477074644a9b10f44b0b06bf86ad9b4ecbab124076ee7f19c2c68c6eb3bf21a1569a3410f1ed0ac12f653dd5808559da133613d09f
diff --git a/sci-libs/camd/camd-2.4.6.ebuild b/sci-libs/camd/camd-2.4.6.ebuild
index 81a19dcab527..4ac1627a0b35 100644
--- a/sci-libs/camd/camd-2.4.6.ebuild
+++ b/sci-libs/camd/camd-2.4.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
-HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
 SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 4452978fc67b..9848b2dc4d11 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,3 +1,3 @@
 DIST cartopy-0.18.0.tar.gz 14191937 BLAKE2B bb10791ef2534dad404cc492e378161a4a078813b09d6e2c16d0d465c7dcfbaa7f24d3818cfe0f1f46e7683bdf2e00440640534835ce064492d5321489e355bc SHA512 912d5ab57c96b9e6c51b3ad26f94d77e495eb9c3a8fb8a68bdd957c11b1bc8a3ddc97e76e0d8a5ec9afca9302b01fe5753f4208ec3829df8741ee0ebbaafe30f
-EBUILD cartopy-0.18.0.ebuild 1673 BLAKE2B 03d69e93286d5dde048bab3a55ca251a1f0fe615c5e3f53037135649c361264fa50b041b3d9d21e843ab3f9f4fe33cf42b05f67ed222ea4a93e1600036efaf35 SHA512 4c008ffe7f6daa2369ac9818a370dd636bdb0e178ca115150a1e419f6fbeb157dfb18458adf2dabeaf85e5b0a4d0ef6bd3e1460069e8d62d5b57640ae1184cb6
+EBUILD cartopy-0.18.0.ebuild 1675 BLAKE2B 3159117c6844415b01d8943e51676cf010095de759391243176e3255ffd134c5b5f0d28921c513c3052a35096025ac0df25080d499519fc040d0a6e41ab05dbd SHA512 2dbc3396e318a336834dc8512747673463342b789f7f81a2fba45dfa31ec7332ae031d7f2d137d1687e22ad918029e47d3dca4db45273296191b9e3a7390540c
 MISC metadata.xml 602 BLAKE2B 92e179b5503c84c6e567e7adb48917ca6140a7c04a0f5613b5aa3a9c19623d61abed95c325b41ca0d5a99b046c2891511796de49c3117c4ce9c969069bb2c5f0 SHA512 8677cb5685dee0b5868c1b14ffc13ac93e3b26ab741ceb684c7c48caf02f159a7a6613402e0396b9b0bc256c39b6446cbb7779521324447d96ed524fb8ca664d
diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild b/sci-libs/cartopy/cartopy-0.18.0.ebuild
index 2fb1a4020f2f..bc9c5426b8f1 100644
--- a/sci-libs/cartopy/cartopy-0.18.0.ebuild
+++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	sci-libs/Shapely[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	dev-python/pillow[jpeg,${PYTHON_USEDEP}]
 	sci-libs/gdal[python,${PYTHON_USEDEP}]
 "
diff --git a/sci-libs/ccolamd/Manifest b/sci-libs/ccolamd/Manifest
index 1a7ae88b15e4..70b8ccca5d5c 100644
--- a/sci-libs/ccolamd/Manifest
+++ b/sci-libs/ccolamd/Manifest
@@ -1,3 +1,3 @@
 DIST ccolamd-2.9.6.tar.bz2 305744 BLAKE2B 0d741ead328a1e888715672ddb617cc96a559f46f2379e1d7792b70868dd290de19b3047e3ed4dd2711084c9afc523d18ecb375aa4ee8a4a12950cee08f238b8 SHA512 cf6f210d26ddb1be454cac377a773b73b75261a74e1e3985565f57f45659b1c11b747829c5bbe99c4bc3e8b364d7b2b3c109e00f6d7e8e41afd713312ebf103c
-EBUILD ccolamd-2.9.6.ebuild 657 BLAKE2B 4c90822b5d78b431748dcf50590e6f3a682f9029048e9705b48d563497a3ad0534b2524cfc2e93e10eca53d047e76868e5ece49d31ce92fe1500a1776f51ac62 SHA512 9f10d4c7edd82dfc2b4b248393f149a65593d35d9b63b4886eac1d610e0ebc7899f663cdbfde217943d9280ac49b1825da46a075f7d5cab3f69fff0489cc6e04
+EBUILD ccolamd-2.9.6.ebuild 658 BLAKE2B a77a7f597a078d61762ce0294fd8d6f0d95662dfddefd09306bc5112e1f9fb6382a6da6bd72608f9a187949c2dcb81777d86baf6621a2ca1ccedbc9b155d3ae9 SHA512 0cad34fb75ad6c534c2fdc4f9aacb04d625e9448b8c77a4b7bc47befa5a144e1d510ea66d076024e75af128a4fef9d86d8c3ca43549201d8b3fee30a971f26e8
 MISC metadata.xml 470 BLAKE2B b20ae7c51907e135898a4ca6eee1454c1760d8f6c061d6d8c9bdf6082773e003326c65ba4489831139bc9af96f2321a09b22fbe106aa87b8f6dbb4781163edb9 SHA512 99c2d290fea618dfd8997209d8e6db971a2ab74d1be5fb270f2177c9843b0f324710491977c7cf2427806295d05e341ece4399afd8a0d43bca8b42b0fdea7beb
diff --git a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
index e86d7e510aa6..592a43771f56 100644
--- a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
+++ b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Constrained Column approximate minimum degree ordering algorithm"
-HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
 SRC_URI="http://202.36.178.9/sage//${P}.tar.bz2"
 
 LICENSE="BSD"
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index ce81a9eb5383..df4fb4d66876 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -1,6 +1,6 @@
 AUX cholmod-1.7.4-parmetis32.patch 702 BLAKE2B 241d68fa25ac2ab3f9a425702559736fb15657eda82c5ba0a413174c146c09e0be167746f866a64189d027892d180445adcf92f55fc913c9bff0085f87051c94 SHA512 a1694a7f42f10c7619e23817e93f76df35bc208200918b74a6dd68bb4662d57ce2f3665be424ad4b5c8a4ea9c3957676c48716aa0e47d9fb19337dc43e759ecc
 DIST cholmod-2.1.2.tar.bz2 656458 BLAKE2B 83a574ad7d3755428d8d732f3f60b07908b8315d73d5a3d3aaf9aac50b54590c532389dd90efc569e67639993095706eb546e72313b735e35af34a1fea398be2 SHA512 7aca97de4c60ff2d7a76a776be4c2d61243a159a51b9e147fa2480f2aaf61a5d966eb0f1cb57c0145510437f6c478fa30384b741709d0a02432b74ada3e78089
 DIST cholmod-3.0.13.tar.bz2 696002 BLAKE2B 40a065fe1a3585897b3ca554a25fa80ffc68ac70798f2f803e34a231ec4f532d113a3d00ab7ab61f5eb02503a84e1459cdb7e96cb0b0d1dc6975ed3d533104fe SHA512 c6c80d099386bac27e385a1b8ee8941cd2fb4f2dcfcf302b4b17d6477ac9ee17ad8030aae9191f92576dfaeb521e2c98ec24e867281c2405e42f95580e14f0ab
-EBUILD cholmod-2.1.2.ebuild 1759 BLAKE2B d4ca1e4c852e8c96aaddf7e293019f321a8e9df9eb5d300ecbaac4a915e599d880405b5b2e0eff0900472865d92bf6c9c45f12d343a94edab08aeb5e11373ad4 SHA512 99bc36f5f1d988d4676a373149593d4b79664d1a1120698d7720acf9977426aaa611b3f8a67f67944aef45fc0fce141a9327a93a71c1f52daba2e2be722cfb9e
-EBUILD cholmod-3.0.13.ebuild 1671 BLAKE2B 8b3399232f914aee8a41d0a2ec0f96c7b69223cc40208d7d077b654814309596e876048fd77092a90a947104e7265b709a8779687e2d686d4587d7d1586a6962 SHA512 0b92dfef439259654f61b709cc5302fc8ad94c1b69b27f35bb2928b9e45b9b0749f3a57f902814449c2e37b6767d7c33c3b13314f83ae4d2c54311fde56d1c73
+EBUILD cholmod-2.1.2.ebuild 1760 BLAKE2B 4843142c993deb0246fe7aa3b333b0ff3f4c8c64f1b3582ba6c7df5fe287514ca124cc0939c60820c52476c6759440a1db812b677dd8cc9f23cfd93e4695099f SHA512 9884339cb38f0095eb9e087659b98cd6cd62425e11621cd40849a8b7e40965169f3b3be4fb2217f50b491327b83f7554ab5c8fbd55427a2ee1a293ad55b5428f
+EBUILD cholmod-3.0.13.ebuild 1672 BLAKE2B 09acac2ecf87fa376e53b52733e3b45f9a72884f318fa01a9bc516c9dc50d81416bc8ad004353a66ef4bf97db3ac2008dc758034a38a9aef36e543b89aecb233 SHA512 e87be48fd0ac76db3edbb812220ba6f8a2c88b52fd9091e6508d8cf584fc5cec0ab7e280ec2e0d4702fbebaaf0af197219c68f6966766c2ad8b3c7901cf8a417
 MISC metadata.xml 920 BLAKE2B d78c2990bf35b95155adefe8a7b6d3213cd7187d031abbe91f1e12cb2ab438fce1ec34743a21a20b649255c691b87b6033f8bf8eec30b670456c105ad80f2c9a SHA512 64083142e54e0d9df8fb93c8a9ef810c4a6c85546ed8d96413acbadcbe3120d528e15895786e303094874448eeb4b411ce457147f452f781c6184aea985f5e9a
diff --git a/sci-libs/cholmod/cholmod-2.1.2.ebuild b/sci-libs/cholmod/cholmod-2.1.2.ebuild
index 0c7f5b868903..1a52bba26f00 100644
--- a/sci-libs/cholmod/cholmod-2.1.2.ebuild
+++ b/sci-libs/cholmod/cholmod-2.1.2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit autotools-utils multilib toolchain-funcs
 
 DESCRIPTION="Sparse Cholesky factorization and update/downdate library"
-HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
 SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 
 LICENSE="minimal? ( LGPL-2.1 ) !minimal? ( GPL-2 )"
diff --git a/sci-libs/cholmod/cholmod-3.0.13.ebuild b/sci-libs/cholmod/cholmod-3.0.13.ebuild
index bf568d5872ad..4fdcecff8207 100644
--- a/sci-libs/cholmod/cholmod-3.0.13.ebuild
+++ b/sci-libs/cholmod/cholmod-3.0.13.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Sparse Cholesky factorization and update/downdate library"
-HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
 SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )"
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index 6017cdc72ae6..0546aadc2197 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -3,7 +3,7 @@ DIST dealii-9.1.1-offline_documentation.tar.gz 211103151 BLAKE2B ef7cf48aa8019a2
 DIST dealii-9.1.1.tar.gz 19911088 BLAKE2B e8488833f11339ccffd4791b9b46ab77f1982cbbdeb11fab7f6b74ca2e17c3d648a2940f4462d0ac9c68bd619b3c4f43b4d8052d2903cbb9cae2fece93d81987 SHA512 02dd91e2b0f395960f900f4cbe00bd307a4762ffbc5f3838dcc34828937e96727efbbcc66fc3d357d6b00b0dddcbc6cd7709c4c03f067d92a8f72d4631b88bf1
 DIST dealii-9.2.0-offline_documentation.tar.gz 277987911 BLAKE2B d14e15bc252f481707b04e9ca3fd05b5469035537a099466a8272fa1d56833c99d845871534df75bbb2efb29063e738700a5a2815b653cdd14b49b3a93add368 SHA512 9680731b4d837561c3682a65391b442cfb8d2a947b0e4e37cad1df83877b371997d084eac52e2bf34b190ea54996d41ddd89bee79fff24d710199417f3f345ab
 DIST dealii-9.2.0.tar.gz 24688964 BLAKE2B 60a8ede72a49cb2e658b3d6d53fb332a96f44a7fb9bb499ba54175138d49f38a9b75d9bea2eaddcaa3f50d97ce53961692b35f89578f535d32301680e6f1d68b SHA512 7c76435e45c9c302c4f95f588229f5a9b81f0450bd029729553c706a25dfd16f5c02c50fd2618d7e285d18927b63426110d2c6a074242b91cf789bd4bc77acc5
-EBUILD dealii-9.1.1.ebuild 5117 BLAKE2B 34f64a3b243be3c1ee3575b02ae90b895eb41d943b0e91cf05f5209287f107fec13a2c75e14c08045f67feca30e627593ad0e6c0da695e56a1e335a0717974b0 SHA512 695cc9c803d9348f276cf9544dbdbd2729ef080ed2f7ab122d1e500b755a954e4680813f623556c3caf83d7a989968f6fe1228e03950e8e617fd26c6539c80a6
-EBUILD dealii-9.2.0.ebuild 5233 BLAKE2B 0883544d93f43cec78bbbb45a2eecaa817d932bcf4aacf22347cb4a52d62b1fb3d5b44a0ccba7b426c3279807c67e8fd74e21c3f2e418270331a97c3e903172c SHA512 0b2269670e392941aed4a37235979f6e39ac15474e94caba55752563c2c8c945b7dd19173abe3518c2ef6560a4f15e6b31ddc65423e5a53f5e67b59d02b526f6
-EBUILD dealii-9999.ebuild 5013 BLAKE2B 397b871df5bf15d90c5359dc04dc00237ab2140d71f0ab0e51266e775de19838abaa893ebf2da22d30025d4058b0a97420d2a5139f92a6a071ef606863f0bbbd SHA512 f5ef22a021dc4dd9fd2fa80de3e7c1678d70636392d7cc4d894858efb3b6e46f06e6b8d7eb7a01e38be0b47c5d826cfa50d6eb191713fc0486c39fb9a179d417
+EBUILD dealii-9.1.1.ebuild 5120 BLAKE2B a23cb065059ca83bb13bdb67e86ccf6c6ac19d66fd0e201901d1ca7b45861f2d059c8b6f56d5e47458d5d1dabe2afac4e3bbf618c82698cd5187c6b01a28fd75 SHA512 fa2ccf93315f87bd534433ad4a3aaf2b2af0a7ed918c16a293ab8a16b55e058c233c5dd432572a31d127ea0b2c7fba0f25569aa55c87597d37b47ebc856a4726
+EBUILD dealii-9.2.0.ebuild 5236 BLAKE2B 4b5c4e35542818ea2cffd3f93c769540c1e59ebfb01475f56981b1b85146370557036d88abd55cc7be0c05bc487e92a9c575c1334aa1dab0b3f2b1ac6422a7f7 SHA512 815402db6879d98116f56c6ab819b1c10cac5510c8123d19157023919825fdac578bfc5259cffc2876b2126fb14d3f70b3f5b7816c8a55dae82dcae22519810f
+EBUILD dealii-9999.ebuild 5016 BLAKE2B 0b6b046276f67c5a74830d923bab1b47920ce23f897e583525e1d1e5ed5f7d58f687697d9c045af0951d57e8d71400403d69ffa747f2c4a4d441506668b4b087 SHA512 ea5f868b952b686360c7fc7c987a6e41f9c80781e8519ceba1fba59565ccbdea95d6852ca3694f4671fc2aee9ecfc2f4ed7016d687d005c7de71e08a25bfb3fb
 MISC metadata.xml 2636 BLAKE2B 8874dd9c20a2dbd781f4a157b3639b1d66faf1b3f32dc6ac1c42fea274c0035b9632108117472b62d9161fab705f5a365aeaaaa44f555a5c2658ebd0a0fff045 SHA512 149082068c7287346a42b901501eddeea6feaaf9cc91c46681f63e63c68dd2a7e3161c3520417a44dc7eec7e673c76c6e967b5b46e898714ce65c4ea4924d25d
diff --git a/sci-libs/dealii/dealii-9.1.1.ebuild b/sci-libs/dealii/dealii-9.1.1.ebuild
index e575e5ad533f..40009692cefe 100644
--- a/sci-libs/dealii/dealii-9.1.1.ebuild
+++ b/sci-libs/dealii/dealii-9.1.1.ebuild
@@ -79,7 +79,7 @@ src_configure() {
 	local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
 
 	local mycmakeargs=(
-		-DDEAL_II_PACKAGE_VERSION=9999
+		-DDEAL_II_PACKAGE_VERSION="${PV}"
 		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
 		-DDEAL_II_ALLOW_AUTODETECTION=OFF
 		-DDEAL_II_ALLOW_BUNDLED=OFF
diff --git a/sci-libs/dealii/dealii-9.2.0.ebuild b/sci-libs/dealii/dealii-9.2.0.ebuild
index c13b60b49523..e93536af9ef5 100644
--- a/sci-libs/dealii/dealii-9.2.0.ebuild
+++ b/sci-libs/dealii/dealii-9.2.0.ebuild
@@ -82,7 +82,7 @@ src_configure() {
 	local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
 
 	local mycmakeargs=(
-		-DDEAL_II_PACKAGE_VERSION=9999
+		-DDEAL_II_PACKAGE_VERSION="${PV}"
 		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
 		-DDEAL_II_ALLOW_AUTODETECTION=OFF
 		-DDEAL_II_ALLOW_BUNDLED=OFF
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index e7437c82a96d..961516337a8c 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -80,7 +80,7 @@ src_configure() {
 	local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
 
 	local mycmakeargs=(
-		-DDEAL_II_PACKAGE_VERSION=9999
+		-DDEAL_II_PACKAGE_VERSION="${PV}"
 		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
 		-DDEAL_II_ALLOW_AUTODETECTION=OFF
 		-DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
diff --git a/sci-libs/ignition-fuel-tools/Manifest b/sci-libs/ignition-fuel-tools/Manifest
index c1c988868f1e..aa52505d4deb 100644
--- a/sci-libs/ignition-fuel-tools/Manifest
+++ b/sci-libs/ignition-fuel-tools/Manifest
@@ -1,3 +1,3 @@
 DIST ignition-fuel-tools4_4.1.0.tar.gz 451260 BLAKE2B aef6b1ca08e0d0c2099593c5d13842c5f73b6f041aea23aae57cc563ec624139331c45012f044212a53dfe82bfab6316caa51896785dd7e905c0950b3b91ca93 SHA512 7116460749870968508a0368435edfcc28f54128b2def0d93fa48e6f6ac961d27e0f0ff52ff70979ee4e626ee4cc0d5b421180487c1973ed844a1b16479466d3
-EBUILD ignition-fuel-tools-4.1.0.ebuild 966 BLAKE2B 4d9f4eb00c1fa6cb33721c77b9275aba8375cfaa0094f569ef3109c88b963b14b8bfe9eef8477ad6a0c8f084568927cbf82a4a8d08f20fffcd4ba3dc3bf32460 SHA512 c47e5db59608786489fa92140f1a9b228391ec9267ca6f089623ce197d9e36b99f31f346898e2411835f58da99a60ed82b16f8ea102f8190643b3adcfd9b177a
+EBUILD ignition-fuel-tools-4.1.0-r1.ebuild 988 BLAKE2B a0f7386e513c37ebbfaad0ba7116c700ec9f06a22575cecd3fb8d87434728fca1f7e302f18755680632a09483caf3951b7dd5eaaf713bb9eca5528fc371ab553 SHA512 c0c47b3a1dab0a4a5fea1f91ece7460b220881dff3d1391671f3397b08be52ccb1b74fce7d4dd0796019dbee6eb60e61c082b634387c2295fc6ea22d462799f3
 MISC metadata.xml 345 BLAKE2B 4d36d3550c362906a0ac3c9c3a982af9225f67c9302d960ceec5f7e22ab7171759ca30f9316b3382ba0393a2ea815dbc55dbf1c2e6f088e24daa0b2e1d18c669 SHA512 24462ba3a87e46b012bf22476afc5f130ffa1c89394d905fa104a26d51f8f7cb7a7fd5ac065d5ad2207bc6d8e2a885d87ac5cfeb13a538018a43dcc5eefb608d
diff --git a/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0.ebuild b/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0-r1.ebuild
index f19f9dec6f47..1441ea0a5dad 100644
--- a/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0.ebuild
+++ b/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0-r1.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 	dev-libs/libzip:=
 	sci-libs/ignition-common:3=
 	net-libs/ignition-msgs:5=
+		dev-libs/protobuf:=
 "
 #igncurl
 DEPEND="${RDEPEND}
diff --git a/sci-libs/keras-preprocessing/Manifest b/sci-libs/keras-preprocessing/Manifest
index 6d4bf4a6e329..ec7e99953347 100644
--- a/sci-libs/keras-preprocessing/Manifest
+++ b/sci-libs/keras-preprocessing/Manifest
@@ -1,5 +1,5 @@
 DIST keras-preprocessing-1.0.9.tar.gz 46476 BLAKE2B af80a6647bb56f8c4dba93120bc2b70db36d2c6a0e36c3be9a4843e5c36c9ffe50db1cd9396eecd47f6c0595c110825d70d2e6b28a29a0a199b5cfcc499e4440 SHA512 93ef9b294638bfeaea82170b323f08b261a2519f5ee8b9aac7d88e5b32c6486646d91075cea71bfbc27780c8af55125319873361f0431d48b451e574d1e7a400
 DIST keras-preprocessing-1.1.0.tar.gz 50631 BLAKE2B 235a1a7d296684e5405c6472026a53b1930923e74065529ba6921e91bf8849d35c02378f8eeabc4f532a4e25937e8fd8f712a59067c5b358afe10b88e1531fcb SHA512 68c71e82ea2139d3db4142c86a2c404e4d65a9a881f72b07b4ccf28733b93a9e4837f91534a20c3ca5128600d8b885cc8723181d96c9045d5280ad7f84091cbb
-EBUILD keras-preprocessing-1.0.9.ebuild 593 BLAKE2B cda6b2634c7c417f0a990fff0f2e82c41c143295222f41344fee956a6d77c4c1835a583e4ae7f2cab72918670511cc578e7e56cb26a202a328bb39d484f3229f SHA512 4b2ac3246b7c5bd3276cb33a224f39328610788897163cedb91934c7516e60e353b497228f622fc15f2f4199c4777a693045300a9e19483e48ded6cff45bf371
-EBUILD keras-preprocessing-1.1.0.ebuild 593 BLAKE2B cda6b2634c7c417f0a990fff0f2e82c41c143295222f41344fee956a6d77c4c1835a583e4ae7f2cab72918670511cc578e7e56cb26a202a328bb39d484f3229f SHA512 4b2ac3246b7c5bd3276cb33a224f39328610788897163cedb91934c7516e60e353b497228f622fc15f2f4199c4777a693045300a9e19483e48ded6cff45bf371
+EBUILD keras-preprocessing-1.0.9.ebuild 595 BLAKE2B bc5f3052d03249c8210460d2b15a3252b4f4818fe8924f885a0cdad36ee429fd22c2f5e31c93306e6014ef42bc8a0c18cc92c4aed579f0c2791570fef63a4765 SHA512 8cb56546d094f03c846d5cf32fb4c38266cc8029e6caca76005f07b3afc5f2a77a28aa571742f77fb640a06e14aa2909d9b319061484e76f08d9230d3552d821
+EBUILD keras-preprocessing-1.1.0.ebuild 595 BLAKE2B bc5f3052d03249c8210460d2b15a3252b4f4818fe8924f885a0cdad36ee429fd22c2f5e31c93306e6014ef42bc8a0c18cc92c4aed579f0c2791570fef63a4765 SHA512 8cb56546d094f03c846d5cf32fb4c38266cc8029e6caca76005f07b3afc5f2a77a28aa571742f77fb640a06e14aa2909d9b319061484e76f08d9230d3552d821
 MISC metadata.xml 585 BLAKE2B a2f92ac4e2b9af055313a13de9bcbaee7ab7ca2efa4790c82027aece4b629bfa7a73c5ed0286b0f24f1853330057527009afe6ab1722f19d9c504a9d0737e827 SHA512 371cc3f5897bd28c62642a8857a22e775e24aa917bc0e58bb4de4e0a2a6580174ba35cfda2e8dd83599e2180fdfb3f11a953e7076c6d87073e1465b145b115e9
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild
index 58c165ae5018..c0bf90c60e2e 100644
--- a/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild
+++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild
index 58c165ae5018..c0bf90c60e2e 100644
--- a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild
+++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index 086bade8b942..cc878fedd996 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,4 +1,6 @@
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
+DIST lapack-3.9.0.tar.gz 7534567 BLAKE2B 408013a11a72e0262d144adfdf6db28a6efa3bb5446f9ff959bb88fe10459dfa621149ed0144630a55e73e3b5be3c704269a716eb195f6db7b39d345b4db8270 SHA512 424956ad941a60a4b71e0d451ad48db12a692f8a71a90f3ca7f71d6ecc1922f392746ea84df1c47a46577ed2db32e9e47ec44ad248207c5ac7da179becb712ef
 EBUILD lapack-3.8.0-r1.ebuild 3011 BLAKE2B a8efb95f7d55e08b16cd1e784fdf25b57f45ce1182fd5b461384bef75ae3abc5efc49066ab9f1e015c2861f0ff1fb5039db079bb48bb18899ce521a6f07798d2 SHA512 d46ec6260889139d1b721a88de7e2b428742238fde74555dc933d02820835fe804394f401ebf6d605b08016da803ac33f726545fea2f567ece89c99d0113cb2e
 EBUILD lapack-3.8.0.ebuild 2959 BLAKE2B 415318e59b79d7bca4a4faefcc7f6b080287589eab098cbd32d72d77ad31b28ba9d6536527308340feeb6141cb8439bed73d18fd7f3b4b403cbcb5e3661765f1 SHA512 aed62d7a3b58f0bb4e658ddae720ce3b872aa5416b9aa54b30cca1beb2c4350a8ce0899ba7de1cf7e4782e459baf56b8ba4ac2306b8f9e6fb0ab412d2da88ffb
+EBUILD lapack-3.9.0.ebuild 3047 BLAKE2B cc386a1a3b1ced9bdff9cb76d4cbddd5711aa427c7b6548bd04bd5af0678944f57ea15832ed17a9562838a39f2347c4ea65900b6117893fadf430da61492e60f SHA512 d1d93475f5f9ace05c5ebff892cd52336c5cdc3cd2cf8c13f2366e102471c17ee8011c9bc584ef2af1ab3b66886d8a3980e50eeacd2500677aa68de3cddc39a2
 MISC metadata.xml 1490 BLAKE2B bcb933b7cc3c3ae6f33e7c8ae9ef12475477ecd3351901cfba5dc955430def35df18e5ab41624cb99f2c1551fc38153138195e4e95ab40d3cf92e5685ce68fc5 SHA512 a99af3086d63488e7a2b8cda2f3727ce31eb0e62dd75a9cf64e44a203068866a06c7d6e119665e663c49a1afccb7a70982fd831735d958b73b6dcdf52c8ef5b1
diff --git a/sci-libs/lapack/lapack-3.9.0.ebuild b/sci-libs/lapack/lapack-3.9.0.ebuild
new file mode 100644
index 000000000000..cc1fc963b7ce
--- /dev/null
+++ b/sci-libs/lapack/lapack-3.9.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+#CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+
+DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
+HOMEPAGE="http://www.netlib.org/lapack/"
+SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="lapacke doc eselect-ldso test"
+# TODO: static-libs 64bit-index
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	eselect-ldso? ( >=app-eselect/eselect-blas-0.2
+	>=app-eselect/eselect-lapack-0.2 )
+	!app-eselect/eselect-cblas
+	!sci-libs/blas-reference
+	!sci-libs/cblas-reference
+	!sci-libs/lapack-reference
+	!sci-libs/lapacke-reference
+	virtual/fortran
+	doc? ( app-doc/blas-docs )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCBLAS=ON
+		-DLAPACKE=$(usex lapacke)
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	use eselect-ldso || return
+	# Create private lib directory for eselect::blas (ld.so.conf)
+	dodir /usr/$(get_libdir)/blas/reference
+	dosym ../../libblas.so usr/$(get_libdir)/blas/reference/libblas.so
+	dosym ../../libblas.so.3 usr/$(get_libdir)/blas/reference/libblas.so.3
+	dosym ../../libcblas.so usr/$(get_libdir)/blas/reference/libcblas.so
+	dosym ../../libcblas.so.3 usr/$(get_libdir)/blas/reference/libcblas.so.3
+
+	# Create private lib directory for eselect::lapack (ld.so.conf)
+	dodir /usr/$(get_libdir)/lapack/reference
+	dosym ../../liblapack.so usr/$(get_libdir)/lapack/reference/liblapack.so
+	dosym ../../liblapack.so.3 usr/$(get_libdir)/lapack/reference/liblapack.so.3
+}
+
+pkg_postinst() {
+	use eselect-ldso || return
+
+	local me=reference libdir=$(get_libdir)
+	# check eselect-blas
+	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
+	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_blas} == ${me} || -z ${current_blas} ]]; then
+		eselect blas set ${libdir} ${me}
+		elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
+	else
+		elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
+		elog "To use blas [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect blas set ${libdir} ${me}"
+	fi
+
+	# check eselect-lapack
+	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
+	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_lapack} == ${me} || -z ${current_lapack} ]]; then
+		eselect lapack set ${libdir} ${me}
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+	else
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+		elog "To use lapack [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect lapack set ${libdir} ${me}"
+	fi
+}
+
+pkg_postrm() {
+	use eselect-ldso || return
+
+	eselect blas validate
+	eselect lapack validate
+}
diff --git a/sci-libs/libexcelformat/Manifest b/sci-libs/libexcelformat/Manifest
index 50d687f9c645..94118998368b 100644
--- a/sci-libs/libexcelformat/Manifest
+++ b/sci-libs/libexcelformat/Manifest
@@ -1,3 +1,3 @@
 DIST libexcelformat-101016.tar.bz2 47980 BLAKE2B 6b6d003d5322d66193655c506e6841af5c3a826558c3f15c9253078975d2d1138f6173753bdc35ec27c6030e23ed76463cc396d6fd0923cdfcc34daf4fd2db84 SHA512 40d43e7b0c15d00026fde3927b3f6fdf9ea110c43141f1a25f3a8ed9ccf6a2acd1de68e25fc54d0c030364d4a4e300aa267332b9d2ac0fb0a422858715156576
-EBUILD libexcelformat-101016.ebuild 545 BLAKE2B b8e4c1ef3f5adc4759bf022b05607211746a8ee7b96c06a7b4edef25a2f4064675e611d13a3429b9d223880cb4eb0c9253d4a69bc71d9b42ab28223d8ac543ca SHA512 f01ca8a20e2ed4a65cb7adbe308d72e15a532633870627c08fb840359053c85de2dab071acac51b84f0d8b994e24e1aa0fc4d6ecfbe8cdc774edd2b9196fbd14
+EBUILD libexcelformat-101016.ebuild 551 BLAKE2B 8a80c008837ea7c29a91c2b2d9505f1f7deb8cc796a2d5d1e84913d299206734fff0ae57e94398dec15c24d7ae3abb2ae4e56c2b88b410f2579be799bc090445 SHA512 48d2bc44cebb07a8ae7236a471ba8bb2d38ea08e044e094261de68af6e9f074c9b48997333d7cb67d8eff28c426f2b6faffdc53164889b34f74100f910f0888e
 MISC metadata.xml 253 BLAKE2B e769e1636e1375309c31bf26fcfdcb1ef46b7a69346fd59011620907237204b3b7ced37cb3450c502f5b19aa1adf36f291412ee47e242ecbfc18c26bfa478f42 SHA512 819062e1ccefa39fc7f577279b08e781b9631eb14b7794db691ab92263c013ca432d279ac08671b19c80f7effb8c67528e5221278c573dd29dc0354bbff4a77e
diff --git a/sci-libs/libexcelformat/libexcelformat-101016.ebuild b/sci-libs/libexcelformat/libexcelformat-101016.ebuild
index 6b346b4f29f2..c3014bcdc051 100644
--- a/sci-libs/libexcelformat/libexcelformat-101016.ebuild
+++ b/sci-libs/libexcelformat/libexcelformat-101016.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="reading, writing, and editing of XLS (BIFF8 format) files using C++"
-HOMEPAGE="http://www.codeproject.com/KB/office/ExcelFormat.aspx"
+HOMEPAGE="https://www.codeproject.com/Articles/42504/ExcelFormat-Library"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 SLOT="0"
diff --git a/sci-libs/libh2o/Manifest b/sci-libs/libh2o/Manifest
index 9e165fac64c1..00bf81b855a9 100644
--- a/sci-libs/libh2o/Manifest
+++ b/sci-libs/libh2o/Manifest
@@ -1,4 +1,3 @@
 DIST libh2o-0.2.1.tar.bz2 290418 BLAKE2B a1de444e13d8ceb65af73eb7fc8f0b35ff59377fa72417b1cf2ee4d919a44d31f356ed14dc0bf9c04ca6f3e5cce71bed7552e98a30f5b134f7a5d322845bf105 SHA512 e2fb14171aa401e85edcef6be36bfd2af31a7da2db03bc77c41fd58962a8e2616bbbd43adb268c262b848d044c9d33016c504ce770f5cfe0d585d05dacc63e2a
-EBUILD libh2o-0.2.1-r1.ebuild 597 BLAKE2B 2374db74af4e9cd5c40c9bf8dc438db95b62bd469ecdef2f575aac298c5e730338ed267952ccde02537565d2b11ca330859c4373dab77c36f4008f8d9c99b82a SHA512 2b648c1a16d8059c02fdcf1c3c57d26cb926ea66831473e0497bbe9b4419c53e5fc42eaf4d194d4731bc3c5441210a329fd316aa6bd524b8f1f1945d784bbb30
-EBUILD libh2o-9999.ebuild 638 BLAKE2B 8cc669e90631baa193f0af2600d1fa409f84ac4ac5f0c955e6782b421dcccbe9dc1d99e5eec40112b67ff25d801a6c51f1e5f206cbe4991ea2a71a95d66e6050 SHA512 1dd674261ab0423d1d66f61e48731ae3209e11d30d56d836ad29b589d17e82ad9803d831035b46dc6ff316a22bc101ff4628be85c42aa7f9a56d856805250fac
+EBUILD libh2o-0.2.1-r1.ebuild 587 BLAKE2B b58502b2f065eb9314d51969b9ba7bb480df8964da12b7fa932fb4d95088ea7b7ebb41cf8e20ad842e322891f505f0a6d9221829c10b2a33d8ee3805cb921794 SHA512 b8606ee73f004b326f6cef57b3a230c9d194c15e06e1692854e833c9132d1e240ccbb01817cd42b32d090b425de2d2ad7edd79e2c2ff2dfd85bf9acf8e239e5a
 MISC metadata.xml 501 BLAKE2B 6eb77e4e388dd5c0cabe3d85563c8bd58b8053ed68f33b4b36d78836ff3507a9168ec568aa7aa179acfe9bda97ac755db13c5fa615b89356c5d293191cf2c736 SHA512 87be30fa6955758d194d0f50b1102d337157cfad6ba35ef346afa7e960c9885f2bbdefd5432fb783aa99339702986d7e287db8a3cec1398e8d5fbb57e78806f9
diff --git a/sci-libs/libh2o/libh2o-0.2.1-r1.ebuild b/sci-libs/libh2o/libh2o-0.2.1-r1.ebuild
index 2b52c92af381..9ef03933234f 100644
--- a/sci-libs/libh2o/libh2o-0.2.1-r1.ebuild
+++ b/sci-libs/libh2o/libh2o-0.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,12 +12,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug static-libs"
 
-DEPEND="virtual/pkgconfig"
+RDEPEND="!www-servers/h2o"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	local myconf=(
 		$(use_enable debug)
-		$(use_enable static-libs static)
 	)
 
 	econf "${myconf[@]}"
diff --git a/sci-libs/libh2o/libh2o-9999.ebuild b/sci-libs/libh2o/libh2o-9999.ebuild
deleted file mode 100644
index 731e477a3910..000000000000
--- a/sci-libs/libh2o/libh2o-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools git-r3
-
-DESCRIPTION="Library of routines for IF97 water & steam properties"
-HOMEPAGE="https://github.com/mgorny/libh2o/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/mgorny/libh2o.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug static-libs"
-
-DEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/libh2oxx/Manifest b/sci-libs/libh2oxx/Manifest
index 598d904bd54e..91ae9fd62001 100644
--- a/sci-libs/libh2oxx/Manifest
+++ b/sci-libs/libh2oxx/Manifest
@@ -1,4 +1,3 @@
 DIST libh2oxx-0.2.tar.bz2 266320 BLAKE2B b63363dfa5ec1a63a3fa35b0dcf8bf79b84d33a8fdd1452c4ae2b7e2c3ed14d5e24bc732ff5cf240557ab7e92558f2aa41f005b1bfe2f7efa294dde21bd1c0b9 SHA512 37b5eb713eed9a41f001add0ed3415fb4e1d6a19917de7fe36017f9a8b102394ac86b47fa845b18d7c4c63ad94e270f28e0883c9e9503c1952fdefbfdb6cc3a3
-EBUILD libh2oxx-0.2-r1.ebuild 599 BLAKE2B 32339fb44bd05cba08923727741d8599dfa6c6cbd3f78f9ece8256ddfe48c8669f77d15e60cfd3a6ae0c6c32ca3ed078f2bfda8cfc7b9bc999deeb7eb2d7e507 SHA512 cf78484e2ba2ad412d06282a5a2b6e383eb4d6d93cb81690bc53c7b0188caa6e6d10046915edb08853d91857d6cbde0ed477e6e9167a8905a10039d16d00554e
-EBUILD libh2oxx-9999.ebuild 640 BLAKE2B 437011e0add2d627aeb00ce2463eed6142c895f573363cc3261b602a90f3c8432f164eb0cbcc4f285ab7cf64bb91247596b332aa26e7edc053eeb5a7ddacf10a SHA512 5d95dc5282690e55e5fa99304771e6bf67d26801d71fc8cf0a2c30e8f9a04412a1c282265113a0f337a49f35a786cb41bd6f5564fbf530b02738e68a5fd50761
+EBUILD libh2oxx-0.2-r1.ebuild 552 BLAKE2B 9a1c0fa1d5d4ff646e0cf04cd0bc24c98949897482f37f1393562d26a99a0246ba2908e5e1d18e8e63a9aa3bec0bfcaf456f57d34af6d6e17c662ccebb96454f SHA512 e64c5f555f5a0cfea71f0ed7da0ec4cf966f4130e23fd8f105893f06c786e7174673b1892162dba926cfabbea4bcd56b8537412571ff87dab4797aba5342a84a
 MISC metadata.xml 505 BLAKE2B 5e8794a8c28c717046b54793fe07bf87208716702a00aa40ce702e63607f7ea778ac6ae74dfa69831e2795e0d0fd24ef1cd8793280d4997946953df130584f4b SHA512 bc7138f060c6c2dfe3ec7d0fd2150e895bded77ccdb143f866f20aa7d2c683fb94a88163928a70cf9cb7974695b0358303b4bc4ca4709bae0dfab7578c0b880a
diff --git a/sci-libs/libh2oxx/libh2oxx-0.2-r1.ebuild b/sci-libs/libh2oxx/libh2oxx-0.2-r1.ebuild
index 7dcb50db90ff..041756e0f45f 100644
--- a/sci-libs/libh2oxx/libh2oxx-0.2-r1.ebuild
+++ b/sci-libs/libh2oxx/libh2oxx-0.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mgorny/libh2oxx/releases/download/${P}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug static-libs"
+IUSE="debug"
 
 RDEPEND=">=sci-libs/libh2o-0.2:0="
 DEPEND="${RDEPEND}"
@@ -18,7 +18,6 @@ DEPEND="${RDEPEND}"
 src_configure() {
 	local myconf=(
 		$(use_enable debug)
-		$(use_enable static-libs static)
 	)
 
 	econf "${myconf[@]}"
diff --git a/sci-libs/libh2oxx/libh2oxx-9999.ebuild b/sci-libs/libh2oxx/libh2oxx-9999.ebuild
deleted file mode 100644
index a9e3eef7129e..000000000000
--- a/sci-libs/libh2oxx/libh2oxx-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools git-r3
-
-DESCRIPTION="C++ bindings for libh2o"
-HOMEPAGE="https://github.com/mgorny/libh2oxx/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/mgorny/libh2oxx.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug static-libs"
-
-RDEPEND=">=sci-libs/libh2o-0.2:0="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/libint/Manifest b/sci-libs/libint/Manifest
index 9ec9e38ba37a..0f25fe10bf50 100644
--- a/sci-libs/libint/Manifest
+++ b/sci-libs/libint/Manifest
@@ -1,6 +1,8 @@
 AUX libint-1.1.6-as-needed.patch 2733 BLAKE2B 9ffec6e80030c1226387f51fb3e0409d22521d4af8747943430eeab85f8b3bd9c2b18394ef1b08a0818931e120198c3811fc79d326d4e307f820d5192ebf78e2 SHA512 69281b26c69f5cae1e33f53c58b8a7b383ae83fa8309db03a505e6df3ca018acdf5e4998b42c9d4d1cfda2eaaf36903c1a39211664358506a90cde7e1012ee8d
 DIST libint-1.1.6.tar.gz 256404 BLAKE2B c754e25f0c3bc6c52eb434beafd2cb794a2e715003ee9409d76e8ae06e0ce19a42a9331ad4db9be2745d6820e7248210d10b4c004146e99192fd16fd2c31966d SHA512 cb39d73e89431c324e32d4a71593fe913c7ae2132677d4600e63ce1ed99e8e431758f0aa3d130991da841e98a1064fa931eb0e82dbe80af4c0ece10ee3a4f2d7
 DIST libint-2.0.5.tar.gz 3209528 BLAKE2B 348dd7e2bf17504e19522f053e4dc25936702e7feea1342954af1fc3656711b38b70676c0ac574ee37bb74b37ca30b323d29d156c90711a127b7404b0ca8d5cd SHA512 d7717a6337b73645dcb77d3c0731df17884b4c662b0d52061b7b80ac0ebd9de344e6c301294f714db09e7b6e3dff5b4b6958ef06122303df52d0ebb6a011cf24
+DIST libint-2.6.0.tar.gz 24743255 BLAKE2B 3ab7baba012828485c6c8425bce100e1ab50d2a3c8443ea2ef5cf173d58d8aa211a07e837b10a7f89d7e57f2e15b9384060bbf7b9885f32e9426525e65e15960 SHA512 56343c64b0dfb829702f4bb2fe14a04ad063acd7cb8b5a21cd1a45a830944c1ee98c888c9a28d6746b1bc17459aefcfb0aafe6ef310bfe554056212ad19e43ef
 EBUILD libint-1.1.6.ebuild 955 BLAKE2B 3b9e1a5074e9d8ff91ad97b7682a0cd658abe256c331c9b270056148aba64fd0e0eb9a0f93388b25d880c9ef017408e768888fe5463900e8264f85e0c843645a SHA512 53f1b0ffc316cb021f05ca6432c24ea8c316bcb87f02149a7a0f8b6401c845d13a5f20b4fa954eee0c25c32b5325bc1f01de8ac183492c9b6f36994c7fddc491
 EBUILD libint-2.0.5.ebuild 1264 BLAKE2B 0529b5a36ffe36834704b5ddcd4c1ddfa35c19fab7c3ae1f2ec0c937f52e696610a4ebd642cb6f6c3d285f438b283c47a9ced694495739aa11095381221d5f23 SHA512 8fdc559388dc21827832087f0b7e749654dcd2da492c83059674a38ed8b63f296c120ad6282a6d5daa63f27a45aad2e1a30a5f303874e98f9daff131c7c1310e
+EBUILD libint-2.6.0.ebuild 1142 BLAKE2B dbcf21cb24b82b024aaf58ccdfc50db19fb942b72cdfca95be9feba3b549ba84749cc6d948afbb0687335c710c4cc0ca275fb65ed0e30d7bdc028cc6e8c18883 SHA512 f48c2a64fcf9bdda80d98d71c750df875ff0b9c031c7407e39985c83b06a151d184d5ce5831786e3b403ece06e2abb206b507f3b506e685cadf50e543c95928c
 MISC metadata.xml 612 BLAKE2B bc2b11edd30d0db99860d1d005c56c428c75be96224fa3285fd3cde6f35af0f142b445254214af00308a29ee8965505a8dfe14ffb2e80b57ca42ef20c91bf100 SHA512 db9172c0e887d45f42914159eae83c0f11b40fbafac31395c782ff959cdccad8a62a8d468cec66d6e362cd8ea09aa3b05057d19fff8a1f94b9bd472be97d04b0
diff --git a/sci-libs/libint/libint-2.6.0.ebuild b/sci-libs/libint/libint-2.6.0.ebuild
new file mode 100644
index 000000000000..a81caff037d7
--- /dev/null
+++ b/sci-libs/libint/libint-2.6.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils fortran-2 toolchain-funcs
+
+DESCRIPTION="Matrix elements (integrals) evaluation over Cartesian Gaussian functions"
+HOMEPAGE="https://github.com/evaleev/libint"
+SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="2"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs doc"
+
+DEPEND="
+	dev-libs/boost
+	dev-libs/gmp[cxx]
+	doc? (
+		dev-texlive/texlive-latex
+		dev-tex/latex2html
+	)"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-cxx=$(tc-getCXX) \
+		--with-cxx-optflags="${CXXFLAGS}" \
+		--with-cxxgen-optflags="${CXXFLAGS}" \
+		--with-cxxdepend=$(tc-getCXX) \
+		--with-ranlib=$(tc-getRANLIB) \
+		--with-ar=$(tc-getAR) \
+		--with-ld=$(tc-getLD) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}"
+
+	use doc && emake html pdf
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		DOCS=( doc/progman/progman.pdf )
+		HTML_DOCS=( doc/progman/progman/*.{html,png,css} )
+		einstalldocs
+	fi
+}
diff --git a/sci-libs/minfx/Manifest b/sci-libs/minfx/Manifest
deleted file mode 100644
index 1e7d3ead46b7..000000000000
--- a/sci-libs/minfx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST minfx-1.0.11.tar.gz 62102 BLAKE2B 1a7a7be4d3a9290be84ec73786712ff99b605d72c13a0c32cd6965df3412d8a1f0de4f0bd9ebc0e4fd231b573fe8b3b9e6862586598452de1a4088cdbd2ffb85 SHA512 1eb3136f363be4e8798bc01e638777ef4713ddc33521980923f0157c7b25cbbb03762b571cea9231f64764a93085ce90b4c521b32d71845a18d5be60b8318976
-EBUILD minfx-1.0.11.ebuild 383 BLAKE2B cbc41df86f45983fdca9a9680c755f5e0f44faa4f21969145c149196e26a10bbb62ff7c409748a6160f77eabb89e4616d8027ea6a35699aa754fb884afa306ab SHA512 b48b6650b4d70d2bee6e828a9b5ae7bca5f4b192adf1369a21e2ca850d846b94dfb07c5703afff9c84ce5692b8b6daab53b814d48cc46b55ec4d4f1ab936bf17
-MISC metadata.xml 517 BLAKE2B 0716933a4c886a8245b8a93d2d2e8a7378124f420a6e068b57472de3dc977aab93848b16635f162ffea8a8770e3bf9cba5b0a7a803ef1e01de03c40961f62667 SHA512 656aaca8e83634c0dd4669bc62c9ada5db7a5882eafc33cec13f20dd5429bc7a24c34641f65ecb68bf39d9152fee381747ad1f15234a9e6a16e82d1cd0b160b1
diff --git a/sci-libs/minfx/metadata.xml b/sci-libs/minfx/metadata.xml
deleted file mode 100644
index 3140425edf5e..000000000000
--- a/sci-libs/minfx/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci-chemistry@gentoo.org</email>
-		<name>Gentoo Chemistry Project</name>
-	</maintainer>
-	<longdescription>
-		The minfx project is a python package for numerical optimisation,
-		being a large collection of standard minimisation algorithms. The name minfx
-		is simply a shortening of the mathematical expression min f(x).
-	</longdescription>
-</pkgmetadata>
diff --git a/sci-libs/minfx/minfx-1.0.11.ebuild b/sci-libs/minfx/minfx-1.0.11.ebuild
deleted file mode 100644
index af544263d47d..000000000000
--- a/sci-libs/minfx/minfx-1.0.11.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Numerical optimisation library"
-HOMEPAGE="http://gna.org/projects/minfx"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/sci-libs/mumps/Manifest b/sci-libs/mumps/Manifest
index 6abd5ae57218..2e2c58e04ee3 100644
--- a/sci-libs/mumps/Manifest
+++ b/sci-libs/mumps/Manifest
@@ -1,3 +1,5 @@
 DIST MUMPS_5.1.2.tar.gz 3351215 BLAKE2B 1c77c2a217c101245a9a96a59be6b9bfd67ceffa603d807b5a7173026c5c33e2c4de78c14833d7b7f0a90130b9ebc0ac9c7d4ebfbf881d0bd2210a542887c239 SHA512 38a63b14a8df835be68b5fa310b39aa1815799220d56c176e4005797800959e9e08c9a6bf11d308ab82ea40b6f34d36072cebe7c1de39e0c314eb138b93f1b74
-EBUILD mumps-5.1.2.ebuild 5612 BLAKE2B 0a7a3103d6573f9eac9e6d1c6d7986b6352a83aa57043b1764079c0bed118bcab3a114bc87a6f3aff511f925785ad39f0eb1a874948c857fbe702c09bf9a249a SHA512 88c4e5dd4e93fdfe3f6d9c9d5421a28c7661053a95838649812fc727c956b137473a7fa4243b24db3f2928d63a67ac9a0ac718ee156c6ae5b17fe275bb33eda6
+DIST MUMPS_5.3.3.tar.gz 3912935 BLAKE2B 03b88e23b8dd49832c43aef4717edd440328ca7c63eed9005a6baa008090f63089e7a259fb8091ce462e249196c2a1de0ec1e864173e3ecc3265d5a9cef8b869 SHA512 fb2da6acfd0a413ed5a9b2ea346a191ecea4a057f26a8c3b8ed2400843753a354055eb911e53d9f6ed5a6818e653ab926579c1a4a261b791c5ae421fcd5a7945
+EBUILD mumps-5.1.2-r1.ebuild 5662 BLAKE2B 3d02525978545228ef97ccccbd18bb20e73747391f2b8fb0148eaf24d7802f03793d1246b9bbd65a07820fc33fe28e82c5b50e612022d9912e5edadad95db772 SHA512 c3dda6400a3ca6ecae6043a6abb1206860c9ca76331d3dc35073161258591e693a8423f68908066b750c619fa9f66d2899dc5800c5fce20fd26e633e68c4a280
+EBUILD mumps-5.3.3.ebuild 5668 BLAKE2B ac94c8370e4eae81715b0088553fe55b33440bb142cf09360dcebd71d0e3bcfa583708fd538d16484347aba3a810e0fc591a87e50873be03e8d27bcbda78ac37 SHA512 cccdf44c816d1a0a284837200ef63634d886a4e719c820fb90fd39e04567f6ff1bdb7e66f5cc2551364612a78444780841ed9a907129b1fc862ad5d4dc6f718b
 MISC metadata.xml 864 BLAKE2B 78db103b861071cbad317a65db2bb1c7eafc6c3936728cf3854ea05e92210abbf552e01dcbc974dc5238fc1a432ad7ff48fab3d662ea6081ff70fd86263ac11b SHA512 c285d7ed4bd26bb603f40f9d5e4e7262aea8a2679d14f65a4f8959a9bf2c622310422790e6221708fa227cd2c3bb2f4ba140eb5f23acc71b3f1ca20c04c4711a
diff --git a/sci-libs/mumps/mumps-5.1.2.ebuild b/sci-libs/mumps/mumps-5.1.2-r1.ebuild
index 477d6dbaeef7..de59b9307470 100644
--- a/sci-libs/mumps/mumps-5.1.2.ebuild
+++ b/sci-libs/mumps/mumps-5.1.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs flag-o-matic versionator fortran-2 multilib
+inherit fortran-2 toolchain-funcs
 
 MYP=MUMPS_${PV}
 
@@ -18,20 +18,28 @@ IUSE="doc examples metis mpi +scotch static-libs"
 
 RDEPEND="
 	virtual/blas
-	metis? ( || ( >=sci-libs/metis-5 >=sci-libs/parmetis-4 )
-		mpi? ( >=sci-libs/parmetis-4 ) )
-	scotch? ( <sci-libs/scotch-6[mpi=] )
-	mpi? ( sci-libs/scalapack )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	metis? (
+		   || ( >=sci-libs/metis-5 >=sci-libs/parmetis-4 )
+		   mpi? ( >=sci-libs/parmetis-4 )
+	)
+	mpi? ( sci-libs/scalapack )
+	scotch? ( >=sci-libs/scotch-6.0.1:=[mpi=] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MYP}"
 
+get_version_component_count() {
+	local cnt=( $(ver_rs 1- ' ') )
+	echo ${#cnt[@]}
+}
+
 static_to_shared() {
-	local libstatic=${1}; shift
+	local libstatic=${1}
+	shift
 	local libname=$(basename ${libstatic%.a})
-	local soname=${libname}$(get_libname $(get_version_component_range 1-2))
+	local soname=${libname}$(get_libname $(ver_cut 1-2))
 	local libdir=$(dirname ${libstatic})
 
 	einfo "Making ${soname} from ${libstatic}"
@@ -45,9 +53,12 @@ static_to_shared() {
 			-shared -Wl,-soname=${soname} \
 			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
 			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-		[[ $(get_version_component_count) -gt 1 ]] && \
-			ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version))
-		ln -s ${soname} ${libdir}/${libname}$(get_libname)
+
+		if [[ $(get_version_component_count) -ge 1 ]] ; then
+			ln -s ${soname} ${libdir}/${libname}$(get_libname $(ver_cut 1)) || die
+		fi
+
+		ln -s ${soname} ${libdir}/${libname}$(get_libname) || die
 	fi
 }
 
@@ -90,14 +101,14 @@ src_configure() {
 	if use scotch && use mpi; then
 		sed -i \
 			-e "s:#\s*\(LSCOTCH\s*=\).*:\1-lptesmumps -lptscotch -lptscotcherr:" \
-			-e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${EROOT}usr/include/scotch:" \
+			-e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${ESYSROOT}/usr/include/scotch:" \
 			Makefile.inc || die
 		LIBADD="${LIBADD} -lptesmumps -lptscotch -lptscotcherr"
 		ord="${ord} -Dptscotch"
 	elif use scotch; then
 		sed -i \
 			-e "s:#\s*\(LSCOTCH\s*=\).*:\1-lesmumps -lscotch -lscotcherr:" \
-			-e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${EROOT}usr/include/scotch:" \
+			-e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${ESYSROOT}/usr/include/scotch:" \
 			Makefile.inc || die
 		LIBADD="${LIBADD} -lesmumps -lscotch -lscotcherr"
 		ord="${ord} -Dscotch"
@@ -134,6 +145,7 @@ src_compile() {
 		LIBADD+=" -Llibseq -lmpiseq"
 		static_to_shared libseq/libmpiseq.a
 	fi
+
 	static_to_shared lib/libpord.a ${LIBADD}
 	static_to_shared lib/libmumps_common.a ${LIBADD}
 
@@ -141,6 +153,7 @@ src_compile() {
 	for i in c d s z; do
 		static_to_shared lib/lib${i}mumps.a -Llib -lmumps_common ${LIBADD}
 	done
+
 	if use static-libs; then
 		emake clean
 		emake -j1 alllib
@@ -149,12 +162,14 @@ src_compile() {
 
 src_test() {
 	emake all
+
 	local dotest
 	if use mpi; then
 		dotest="mpirun -np 2"
 	else
 		export LD_LIBRARY_PATH="${S}/libseq:${LD_LIBRARY_PATH}"
 	fi
+
 	cd examples
 	${dotest} ./ssimpletest < input_simpletest_real || die
 	${dotest} ./dsimpletest < input_simpletest_real || die
@@ -163,13 +178,14 @@ src_test() {
 	einfo "The solutions should be close to (1,2,3,4,5)"
 	${dotest} ./c_example || die
 	einfo "The solution should be close to (1,2)"
-	make clean
+	emake clean
 }
 
 src_install() {
 	dolib.so lib/lib*$(get_libname)*
 	use static-libs && dolib.a lib/lib*.a
 	insinto /usr
+
 	doins -r include
 	if ! use mpi; then
 		dolib.so libseq/lib*$(get_libname)*
@@ -177,10 +193,10 @@ src_install() {
 		doins libseq/*.h
 		use static-libs && dolib.a libseq/libmpiseq.a
 	fi
+
 	dodoc README ChangeLog VERSION
 	use doc && dodoc doc/*.pdf
 	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
+		dodoc -r examples
 	fi
 }
diff --git a/sci-libs/mumps/mumps-5.3.3.ebuild b/sci-libs/mumps/mumps-5.3.3.ebuild
new file mode 100644
index 000000000000..43b0f37be670
--- /dev/null
+++ b/sci-libs/mumps/mumps-5.3.3.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fortran-2 toolchain-funcs
+
+MYP=MUMPS_${PV}
+
+DESCRIPTION="MUltifrontal Massively Parallel sparse direct matrix Solver"
+HOMEPAGE="http://mumps.enseeiht.fr/"
+SRC_URI="http://mumps.enseeiht.fr/${MYP}.tar.gz"
+S="${WORKDIR}/${MYP}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples metis mpi +scotch static-libs"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	virtual/blas
+	metis? (
+		   || ( >=sci-libs/metis-5 >=sci-libs/parmetis-4 )
+		   mpi? ( >=sci-libs/parmetis-4 )
+	)
+	mpi? ( sci-libs/scalapack )
+	scotch? ( >=sci-libs/scotch-6.0.1:=[mpi=] )
+"
+DEPEND="${RDEPEND}"
+
+get_version_component_count() {
+	local cnt=( $(ver_rs 1- ' ') )
+	echo ${#cnt[@]} || die
+}
+
+static_to_shared() {
+	local libstatic=${1}
+	shift
+	local libname=$(basename ${libstatic%.a})
+	local soname=${libname}$(get_libname $(ver_cut 1-2))
+	local libdir=$(dirname ${libstatic})
+
+	einfo "Making ${soname} from ${libstatic}"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
+			-Wl,-all_load -Wl,${libstatic} \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+	else
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-shared -Wl,-soname=${soname} \
+			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+
+		if [[ $(get_version_component_count) -ge 1 ]] ; then
+			ln -s ${soname} ${libdir}/${libname}$(get_libname $(ver_cut 1)) || die
+		fi
+
+		ln -s ${soname} ${libdir}/${libname}$(get_libname) || die
+	fi
+}
+
+src_prepare() {
+	sed -e "s;^\(CC\s*=\).*;\1$(tc-getCC);" \
+		-e "s;^\(FC\s*=\).*;\1$(tc-getFC);" \
+		-e "s;^\(FL\s*=\).*;\1$(tc-getFC);" \
+		-e "s;^\(AR\s*=\).*;\1$(tc-getAR) cr ;" \
+		-e "s;^\(RANLIB\s*=\).*;\1$(tc-getRANLIB);" \
+		-e "s;^\(LIBBLAS\s*=\).*;\1$($(tc-getPKG_CONFIG) --libs blas);" \
+		-e "s;^\(INCPAR\s*=\).*;\1;" \
+		-e 's;^\(LIBPAR\s*=\).*;\1$(SCALAP);' \
+		-e "s;^\(OPTF\s*=\).*;\1${FFLAGS} -DALLOW_NON_INIT \$(PIC);" \
+		-e "s;^\(OPTC\s*=\).*;\1${CFLAGS} \$(PIC);" \
+		-e "s;^\(OPTL\s*=\).*;\1${LDFLAGS};" \
+		Make.inc/Makefile.inc.generic > Makefile.inc || die
+	# fixed a missing copy of libseq to libdir
+
+	default
+}
+
+src_configure() {
+	LIBADD="$($(tc-getPKG_CONFIG) --libs blas) -Llib -lpord"
+	local ord="-Dpord"
+	if use metis && use mpi; then
+		sed -i \
+			-e "s;#\s*\(LMETIS\s*=\).*;\1$($(tc-getPKG_CONFIG) --libs parmetis);" \
+			-e "s;#\s*\(IMETIS\s*=\).*;\1$($(tc-getPKG_CONFIG) --cflags parmetis);" \
+			Makefile.inc || die
+		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs parmetis)"
+		ord="${ord} -Dparmetis"
+	elif use metis; then
+		sed -i \
+			-e "s;#\s*\(LMETIS\s*=\).*;\1$($(tc-getPKG_CONFIG) --libs metis);" \
+			-e "s;#\s*\(IMETIS\s*=\).*;\1$($(tc-getPKG_CONFIG) --cflags metis);" \
+			Makefile.inc || die
+		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs metis)"
+		ord="${ord} -Dmetis"
+	fi
+	if use scotch && use mpi; then
+		sed -i \
+			-e "s;#\s*\(LSCOTCH\s*=\).*;\1-lptesmumps -lptscotch -lptscotcherr;" \
+			-e "s;#\s*\(ISCOTCH\s*=\).*;\1-I${ESYSROOT}/usr/include/scotch;" \
+			Makefile.inc || die
+		LIBADD="${LIBADD} -lptesmumps -lptscotch -lptscotcherr"
+		ord="${ord} -Dptscotch"
+	elif use scotch; then
+		sed -i \
+			-e "s;#\s*\(LSCOTCH\s*=\).*;\1-lesmumps -lscotch -lscotcherr;" \
+			-e "s;#\s*\(ISCOTCH\s*=\).*;\1-I${ESYSROOT}/usr/include/scotch;" \
+			Makefile.inc || die
+		LIBADD="${LIBADD} -lesmumps -lscotch -lscotcherr"
+		ord="${ord} -Dscotch"
+	fi
+	if use mpi; then
+		sed -i \
+			-e "s;^\(CC\s*=\).*;\1mpicc;" \
+			-e "s;^\(FC\s*=\).*;\1mpif90;" \
+			-e "s;^\(FL\s*=\).*;\1mpif90;" \
+			-e "s;^\(SCALAP\s*=\).*;\1$($(tc-getPKG_CONFIG) --libs scalapack);" \
+			Makefile.inc || die
+		export LINK=mpif90
+		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs scalapack)"
+	else
+		sed -i \
+			-e 's;-Llibseq;-L$(topdir)/libseq;' \
+			-e 's;PAR);SEQ);g' \
+			-e "s;^\(SCALAP\s*=\).*;\1;" \
+			-e 's;^LIBSEQNEEDED =;LIBSEQNEEDED = libseqneeded;g' \
+			Makefile.inc || die
+		export LINK="$(tc-getFC)"
+	fi
+	sed -i -e "s;^\s*\(ORDERINGSF\s*=\).*;\1 ${ord};" Makefile.inc || die
+}
+
+src_compile() {
+	# Workaround #462602
+	export FAKEROOTKEY=1
+
+	# -j1 because of static archive race
+	emake -j1 alllib PIC="-fPIC"
+	if ! use mpi; then
+		#$(tc-getAR) crs lib/libmumps_common.a libseq/*.o || die
+		LIBADD+=" -Llibseq -lmpiseq"
+		static_to_shared libseq/libmpiseq.a
+	fi
+
+	static_to_shared lib/libpord.a ${LIBADD}
+	static_to_shared lib/libmumps_common.a ${LIBADD}
+
+	local i
+	for i in c d s z; do
+		static_to_shared lib/lib${i}mumps.a -Llib -lmumps_common ${LIBADD}
+	done
+
+	if use static-libs; then
+		emake clean
+		emake -j1 alllib
+	fi
+}
+
+src_test() {
+	emake all
+
+	local dotest
+	if use mpi; then
+		dotest="mpirun -np 2"
+	else
+		export LD_LIBRARY_PATH="${S}/libseq:${LD_LIBRARY_PATH}"
+	fi
+
+	cd examples
+	${dotest} ./ssimpletest < input_simpletest_real || die
+	${dotest} ./dsimpletest < input_simpletest_real || die
+	${dotest} ./csimpletest < input_simpletest_cmplx || die
+	${dotest} ./zsimpletest < input_simpletest_cmplx || die
+	einfo "The solutions should be close to (1,2,3,4,5)"
+	${dotest} ./c_example || die
+	einfo "The solution should be close to (1,2)"
+	emake clean
+}
+
+src_install() {
+	dolib.so lib/lib*$(get_libname)*
+	use static-libs && dolib.a lib/lib*.a
+	insinto /usr
+
+	doins -r include
+	if ! use mpi; then
+		dolib.so libseq/lib*$(get_libname)*
+		insinto /usr/include/mpiseq
+		doins libseq/*.h
+		use static-libs && dolib.a libseq/libmpiseq.a
+	fi
+
+	dodoc README ChangeLog VERSION
+	use doc && dodoc doc/*.pdf
+	if use examples; then
+		dodoc -r examples
+	fi
+}
diff --git a/sci-libs/numkit/Manifest b/sci-libs/numkit/Manifest
index 6b229fb44ac2..be542e84a551 100644
--- a/sci-libs/numkit/Manifest
+++ b/sci-libs/numkit/Manifest
@@ -1,3 +1,3 @@
 DIST numkit-1.1.2.tar.gz 243442 BLAKE2B e5d1e4d85b7646acf47a1e332cbb08f849272ada30bcd65fc5995cd000683f802eb882603e4e7043b159d30ca73395988b83c1fc16d6303ea32731bfdea12db5 SHA512 694a56f64282bbbffed975eabeb2716ac924fbf47f5fb62934ba3b57e6415e5f4b079345fd4eee670990fbf7abe1f945b98472aba034d8c7ff259676da58c034
-EBUILD numkit-1.1.2.ebuild 772 BLAKE2B f8f409b7793630688a6cc88ed42b8b6d555f102fd46a57ffef523a8a7bccdccabf6693210af6a8ab7315b8309be9b3e5793702a8bf4d3425b6b4bb734b1c3197 SHA512 0f9fb67e691d2f70c168b61706541b714bfaae65a7969ed404f82a142bef2781e1db33d99e378a3a2096f6d08b2b1fca1c519c52067bca4f4aa2f34fa36d3f09
+EBUILD numkit-1.1.2.ebuild 774 BLAKE2B 1c28d521dbdc626d0a8e4a1c3bd66fea57a66ea9cb9de7e5bf6e62b015c19bfb363fd69ec983ee1369825a74cf9945baf2e6b99c6a93207aec8d378edb9274a5 SHA512 8e47c8ff4cbfa2295df81245688b176bdb82852369a8ea66e599fba5ca977244755410d1363ccd62086985f5479704c6e7be567cd8ce6795534806510c93378f
 MISC metadata.xml 474 BLAKE2B 7467f534225c3c84437c0306f716e64c9740607a9c18afae941af472c867fb29e3bf8e7371caaabd200a0a583c6502f5c6dc2dc6efa8508b91e15a372c90048f SHA512 7df51b689b986305f1a266361661871f2f0da60e1bda3c77d98f1f45d9ba4e2614930f283e2ef73fe861e519931fbc8b1724f2692c4759ddfa78e9cc89b1efeb
diff --git a/sci-libs/numkit/numkit-1.1.2.ebuild b/sci-libs/numkit/numkit-1.1.2.ebuild
index 8fb64e296e68..60e7576d3c8e 100644
--- a/sci-libs/numkit/numkit-1.1.2.ebuild
+++ b/sci-libs/numkit/numkit-1.1.2.ebuild
@@ -29,5 +29,5 @@ IUSE=""
 BDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.9[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.0[${PYTHON_USEDEP}]"
+	>=dev-python/scipy-1.0[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index dea2b0401cca..69a615fb3c80 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,5 +1,8 @@
 AUX dont-clobber-fflags.patch 1251 BLAKE2B 7451d67e8676be33c2070b9eea767d24d961eff708eec3f6544b68228963166138f844f51dde8d48f723412ce0fcb6d0da427d298c652156da56d34073a1c82c SHA512 d06cd469749c88c69e2bdab01b5c0c67105a756a6d4c3704842335261ad57f6e898ceb73943487396178ae99ccf2ee3e551ae5881996af54e36fb951c6be43dc
+AUX openblas-0.3.10-dont-clobber-fflags.patch 1209 BLAKE2B 8759226f8a2b9371a89434f14e5db6e10b079dec5b260b438811f476ceeded67bcf2a596c7f4892ec2b3388a3437c9cd276592bb01ebb84af69977002e0bbe88 SHA512 6b239e750a6c5baf6dfca58dc8036a1de34efd917839558d2b2ff1d6fab00067dfe953bfb0837d8f19e1f52cf5ab7f92f9e3f65f3963fd3ae9052c0a00d6065d
 AUX shared-blas-lapack.patch 5557 BLAKE2B 1e41b18e5a9c12eec9283c835e9b09e4ca89c6512f47a2f158f29c8a8a822d0365ad350177e379bec13f7c7574d8debd55a2f612027ff661c67ac7b226bb2370 SHA512 baa23f0c2bc8b7bc3384d7b8fa20eb5e095f20e1d8859badb55e680ccd435a851da6099b20aa203e46d62096ac93663ea130bea04dabf19432522e53139d393b
+DIST openblas-0.3.10.tar.gz 12246979 BLAKE2B 507aa3f058b841f477720cff98480afda5c3e236b688fb1a12ff45ce20c42c6e84c786d62a5db7e6de6d133d40286e58777fcb51d6542b7030629d55ba12086f SHA512 64a5f983b2f6e02cdb6e0f14433498cc5daa1ccfb49246f7a2dcd38f9982fa608f2abea069fe0e35012af8c1441c43d1f6418eaccd40795f5002fed1c36ce05d
 DIST openblas-0.3.9.tar.gz 12189745 BLAKE2B 3cc4c6a403d6a52845cf4ff8cef254f57587e17e3d09bfb6ed7c02ad06a6002e50b340177c73a944c2a621c12b7f494c516025751c194d019662c0b4db17f4dc SHA512 c6b8ee465f1cf53b37f21ec3ff9a28d5cafe20fec59d8c1bff5923a9e1989dfa5ae8c032a5d43988fe7722ed08c64c7957a3d30e6ae917e2e7aa2977a91e67a3
+EBUILD openblas-0.3.10.ebuild 4100 BLAKE2B 4c5ea233e1d6efa39f0095aa346ca4ca4fcfd7456a862bf299ad2e161e3e5a5946ba20e5495168e9452cea26031418ea78b17bf82a09cad6b7aedda775fe4722 SHA512 d6a6096a691890f9e96c53d6dc41bbca5d4e33ff4fb988cb8dfb2b2fa18bdee38f2b4d777ca9c745ff99fc81660536df0b334eae667ac9fd92fda4c1ac47ec08
 EBUILD openblas-0.3.9-r1.ebuild 4075 BLAKE2B fe030c9249e08b2695cdacc10042ba128a184e2f21193d21a602bff4ec6d307fadae33937b721cb7aec7151e31e4427df95e08f639698492cd4154a43e04261d SHA512 dd96938cb36e36989e600955d4171241f66d2eb8725ba3e193cc08c7222fc6f0fea977358679eb6890d8dac6699aff1a601160ef425defd991c86381b35efd2c
 MISC metadata.xml 1460 BLAKE2B 22d1770bd4a58a0be80b7b1b04a7a6909d6bc7ff166a242c46294a1d39f5adf928c9e6f00835b79ef1c2df1747efa3b04d9b380a964581eeb963ea17e453ec9b SHA512 da3e981cab096d3bc18077ac210ccb1b91350418969549467c22f286196b18fb080eeb8a6183247b47de65cbd0a7fb67a16f2e46911aac6c5e9e9f01c193764f
diff --git a/sci-libs/openblas/files/openblas-0.3.10-dont-clobber-fflags.patch b/sci-libs/openblas/files/openblas-0.3.10-dont-clobber-fflags.patch
new file mode 100644
index 000000000000..4890b7377ab5
--- /dev/null
+++ b/sci-libs/openblas/files/openblas-0.3.10-dont-clobber-fflags.patch
@@ -0,0 +1,26 @@
+Rebased version of previous patch below.
+----
+From 05c96dad9b26cc1f00831661dc55139dcc9d5680 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Thu, 11 Jun 2020 18:32:17 -0400
+Subject: [PATCH 1/1] Makefile: don't clobber fortran flags while building
+ lapack.
+
+When a user has the FFLAGS environment variable set, it clobbers the
+flags used to compile lapack. This can lead to "rare and hard to
+reproduce crashes" or test failures, as we have observed in Gentoo.
+
+Issue: https://github.com/xianyi/OpenBLAS/issues/2657
+diff --git a/Makefile b/Makefile
+index e113026..dd8b655 100644
+--- a/Makefile
++++ b/Makefile
+@@ -263,7 +263,7 @@ prof_lapack : lapack_prebuild
+ lapack_prebuild :
+ ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
+ 	-@echo "FC          = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc
+-	-@echo "FFLAGS      = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
++	-@echo "override FFLAGS      = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
+ 	-@echo "FFLAGS_DRV  = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
+ 	-@echo "POPTS       = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
+ 	-@echo "FFLAGS_NOOPT       = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc
diff --git a/sci-libs/openblas/openblas-0.3.10.ebuild b/sci-libs/openblas/openblas-0.3.10.ebuild
new file mode 100644
index 000000000000..9d96c6fa9fd0
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.3.10.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic fortran-2 toolchain-funcs
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="dynamic eselect-ldso index-64bit openmp pthread test"
+REQUIRED_USE="?? ( openmp pthread )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	eselect-ldso? ( >=app-eselect/eselect-blas-0.2
+			!app-eselect/eselect-cblas
+			>=app-eselect/eselect-lapack-0.2 )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/shared-blas-lapack.patch"
+	"${FILESDIR}/${PN}-0.3.10-dont-clobber-fflags.patch"
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	use openmp && tc-check-openmp
+
+	# We need to filter these while building the library, and not just
+	# while building the test suite. Will hopefully get fixed upstream:
+	# https://github.com/xianyi/OpenBLAS/issues/2657
+	use test && filter-flags "-fbounds-check" "-fcheck=bounds" "-fcheck=all"
+
+	export CC=$(tc-getCC) FC=$(tc-getFC)
+
+	use dynamic && \
+		export DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1
+
+	# disable submake with -j
+	export MAKE_NB_JOBS=-1
+
+	# Set these to "nothing" to prevent the default optimization flags
+	# from being added in Makefile.system.
+	export COMMON_OPT=" " FCOMMON_OPT=" "
+
+	USE_THREAD=0
+	if use openmp; then
+		USE_THREAD=1; USE_OPENMP=1;
+	elif use pthread; then
+		USE_THREAD=1; USE_OPENMP=0;
+	fi
+	export USE_THREAD USE_OPENMP
+
+	export PREFIX="${EPREFIX}/usr"
+}
+
+src_unpack() {
+	default
+
+	mv "${WORKDIR}"/*OpenBLAS* "${S}" || die
+
+	if use index-64bit; then
+		cp -aL "${S}" "${S}-index-64bit" || die
+	fi
+}
+
+src_compile() {
+	# We have to try extra hard to override AR for now.
+	# https://github.com/xianyi/OpenBLAS/issues/2654
+	emake AR="$(tc-getAR)"
+	emake AR="$(tc-getAR)" -Cinterface shared-blas-lapack
+	if use index-64bit; then
+		emake -C"${S}-index-64bit" INTERFACE64=1 LIBPREFIX=libopenblas64
+	fi
+}
+
+src_test() {
+	emake tests
+}
+
+src_install() {
+	emake install DESTDIR="${ED}" OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
+		OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir)
+	dodoc GotoBLAS_*.txt *.md Changelog.txt
+
+	if use eselect-ldso; then
+		insinto /usr/$(get_libdir)/blas/openblas/
+		doins interface/libblas.so.3
+		dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so
+		doins interface/libcblas.so.3
+		dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so
+
+		insinto /usr/$(get_libdir)/lapack/openblas/
+		doins interface/liblapack.so.3
+		dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
+	fi
+
+	if use index-64bit; then
+		insinto /usr/$(get_libdir)/
+		dolib.so "${S}-index-64bit"/libopenblas64*.so*
+	fi
+}
+
+pkg_postinst() {
+	use eselect-ldso || return
+	local libdir=$(get_libdir) me="openblas"
+
+	# check blas
+	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
+	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
+		eselect blas set ${libdir} ${me}
+		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+	else
+		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+		elog "To use blas [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect blas set ${libdir} ${me}"
+	fi
+
+	# check lapack
+	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
+	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
+		eselect lapack set ${libdir} ${me}
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+	else
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+		elog "To use lapack [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect lapack set ${libdir} ${me}"
+	fi
+}
+
+pkg_postrm() {
+	if use eselect-ldso; then
+		eselect blas validate
+		eselect lapack validate
+	fi
+}
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 4ee7221aa9fc..2a98b929093d 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,9 +1,10 @@
 AUX plplot-5.12.0-safe-string.patch 791 BLAKE2B 8a3b37dd236d3086fe0780dd0e10d670884f706b4e6164980d8197de1a3f49fc0ef2ee15cd9f499c50b14a454bf62a6d6aee1512522ab5a3fe16c8fb93fc042f SHA512 c531a57ef2203c01f5d44f0bd1edc5101c740986987e454019fe42f4905dbd9b5f13ad93e91e3c73c95c320e9128ac4696021e258dc523fc9f5559348eda9129
+AUX plplot-5.15.0-QPainterPath-include.patch 190 BLAKE2B 097e21f0a5a8c5d941f95f089529762d080fb18880f607b00e8c0a33ebb37ef2efa1be025274a2d7ad1cca5590f060560c7679424cb5f2c572de919f9a168ea8 SHA512 52d656294fe75ebf28102575e191a4e43f0cba0b1d39826bb3eabd3044d83c00dd1a774d3df3de4eea6fba7af8138842352f76218cb9fdceb444be487c9f14f6
 AUX plplot-5.15.0-ieee.patch 1243 BLAKE2B 291274ae674f3471fdf081619c2b8e14caec490b391413e52bc8b424f596757297b48b9af09647196adc3069f81750652d05d8da5582092ad13e92d56af05c01 SHA512 e242ff53ac490f17b898cf8184446a342bd9ca36f6245f4142cefe275aa2f5865e13428cdbc8663e80a56d7f0c438492b3529dd7c3dd0400d380d99928c58318
 AUX plplot-5.15.0-multiarch.patch 2544 BLAKE2B 288fc0f26f1f30cdbb786642ca5a59d8ba29958ffa690f87622748d4fa47ba098bce6671988e55f59526113dba08370ef15b0bc516552a9dee6918f430444dd5 SHA512 f98ea4f09cfaff7b1b2ad78940a10c5368ad29f402daca34a9a1ee2eeb3b275137576db884f1304ddc4c48ca83c032b9b2b10132a850839fba9c176bb27255a7
 AUX plplot-5.15.0-ocaml-rpath.patch 9583 BLAKE2B b475580f9e4da0ab660dc2d0dfbdbbfbd277787a12421cf24c31453952257111c06e790a7f728f9b97ef16a8c4ea5a5e856e852f54cd81445a1f5b2aadb9df9d SHA512 5262e9922829ee3ec223b60b794de728e15104ba176f1a1e2fe4ba14929b08943cc5f00d166441c0e8ed5dfb09902044e3c62d944efdcf4bc3be604a56cb424a
 AUX plplot-5.15.0-ocaml.patch 3424 BLAKE2B ba1c9f758c319a76b0a457a287ee6934ee39300401e2d9a364c70446e12af679ce55c22eda0bf7aa7cb621fd4c76f56268afa649ba935a716495049f41706187 SHA512 1387625d1e784fb92ab3279a342c08d8f85fc055e0c69ce1af9656492102072c7a1d5a6498f8758dc3fd35e0543e80b65cd315641886f9baff60f7740583a0e3
 AUX plplot-5.9.6-python.patch 379 BLAKE2B cf08250c851c3405517183e8f3425f42ede2f850cc8bcd89828e3e1b89035731a8a3face0988750e9f9e5dce2fa0404b23b2721c5b315ff61aeac552fd6e05f2 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4
 DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B 41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8
-EBUILD plplot-5.15.0-r1.ebuild 7198 BLAKE2B 1d1c10a0dbaab6c46eea53eff8b9ae31b35706a8b9cbcf068924c32c15aabb1194cc3475be6502e2b88d9665f2f008f78c8840c403dbd3a547c9841fb0304bca SHA512 17875564fe755e1faa69f8390c9635e66bf18e85390a8cf39e9e98219fe546c9628589d6ca282dfe5f9b72088d1398800aa78190ae19d3377ed6bdfd60094818
+EBUILD plplot-5.15.0-r1.ebuild 7253 BLAKE2B c0691e11665afad9288ff37d92561a92f8903bed0f7afdb86ea20284234fef2111ddab4c73206d4da6a808632735ab191fd7eb01432e58cf97b636d54db1f5d9 SHA512 4943a5e374eafe0e39a7d40a616eef2ddf86d570858b51edda0d96f55695fa1d0c1869a8c12befbf1dd181939b9ce07393ae4164af00eb612b22cd1696341446
 MISC metadata.xml 1420 BLAKE2B dc6f6e5f857b508989abed1b3769f42b7fb6de047d6b42f2614fa0c6cbabf9e7924185c94f1e5296cb34b3b51db1d580594add1592d26ed30239510b83ca1a42 SHA512 9af98d19c793ce18e7ee8c6f1a4346455008c907905c2fab8551d074429b8feab8b86161dca63943066bf0b238646e3b5d3d0161a57d313208ae1b155e6a212d
diff --git a/sci-libs/plplot/files/plplot-5.15.0-QPainterPath-include.patch b/sci-libs/plplot/files/plplot-5.15.0-QPainterPath-include.patch
new file mode 100644
index 000000000000..3c6b85b1714e
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.15.0-QPainterPath-include.patch
@@ -0,0 +1,10 @@
+--- a/include/qt.h
++++ b/include/qt.h
+@@ -67,6 +67,7 @@
+ #include <QMainWindow>
+ #include <QPicture>
+ #include <QMutex>
++#include <QPainterPath>
+ 
+ #include "plDevs.h"
+ #include "plplotP.h"
diff --git a/sci-libs/plplot/plplot-5.15.0-r1.ebuild b/sci-libs/plplot/plplot-5.15.0-r1.ebuild
index f0f9d5c4247a..7f16c4d0e29c 100644
--- a/sci-libs/plplot/plplot-5.15.0-r1.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r1.ebuild
@@ -108,6 +108,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.15.0-multiarch.patch
 	"${FILESDIR}"/${PN}-5.15.0-ocaml.patch
 	"${FILESDIR}"/${PN}-5.12.0-safe-string.patch
+	"${FILESDIR}"/${PN}-5.15.0-QPainterPath-include.patch
 )
 
 pkg_setup() {
diff --git a/sci-libs/qd/Manifest b/sci-libs/qd/Manifest
index d7cf10e8efb7..838902fb72b9 100644
--- a/sci-libs/qd/Manifest
+++ b/sci-libs/qd/Manifest
@@ -2,6 +2,6 @@ AUX qd-2.3.17-fix-build-system.patch 6245 BLAKE2B 8ab1ddc9ee18ad3c434e20716f3cfa
 AUX qd-2.3.22-fix-build-system.patch 6617 BLAKE2B 6712f53a1b46a4d1f74d45380330ff5b15b7f2216f61245d467748557f607f670fbb0d977f4e6455c93c383ef6eb466e243177d29a3227ba89cf34ec836c54d2 SHA512 e70d4b87342840fb63cab04e63ceddb790d5509f65188894cbedb077042e2dbb6e7e18a108589fb77e8ec6253ba6b70680f637ce30c62575aa4a0eb7fbed36ce
 DIST qd-2.3.17.tar.gz 1445774 BLAKE2B f2af961db49747475a96dc0abecbcffcf88e43265b6ae21b4d6539ac7ce1086bb40e2cfd795dc9c78dd4b0f790a1a51c5b53d6bbfa224c5d3484d58a222c1872 SHA512 9c6f5dc8d5ad7c9c3d0ec626f7089eb760f31fb14b36daee9c6ba403ab146ff7ce99e01a8750960117a34d662c11620db2ec999e9cf44eb0f80e9224e365d496
 DIST qd-2.3.22.tar.gz 1427456 BLAKE2B 628fb88b8cb105baa689380e4084cc2e327415674fcebca59721cc163e1043f39e48c1b2a2bdc68ba402d311f37e71c9e3c390a119515128e0296aa413c850d5 SHA512 2228b6ed019d1462939957d0d0f64ab2ecfa98ac5aefecf56e9dbcf0c6ed63bdd895b86019fbb0dfdbc22d047c4c2d4e42ff91ca18846b5c1bdaa1ad28a55c2b
-EBUILD qd-2.3.17.ebuild 1115 BLAKE2B 6ebd934567315a22b214b358e5654e95095f25725281a1c8bbe38d28e886d665a780e861b2d4f0ea794a64d3f428a2bbd02450c2b9a6e287bdf94d1cf9548f55 SHA512 75b4f56a31b0f3c3c4e581e7325371f133932b0d9b8d2e26c297f9b05d7c34a1ab51bcbb1be96842094cabf713efb47f8fe197a2d2f91d828c7c2fb1e64015e2
-EBUILD qd-2.3.22.ebuild 1107 BLAKE2B ac2e8ec6296965e285e975ec3fd43e4a6ba65fcd38526448c5cb2ba0583a09afb85f6133d6d5f00abdbc02495ec45124983d6ba1ceb50c6d11761182bf6310df SHA512 1144e880a100d2cd6f4d84514cc18deadf070ed63024498e346ac26ae8212a365236358d4193ace25654093a61c18811c260da86ad0c3fe335cdee12f21b0817
+EBUILD qd-2.3.17.ebuild 1110 BLAKE2B 194c20aea3517889f8ead218c3ff715141a21203a7b8754c062cdb408877cc90fcc5fc3d82860b0d1e9bc8f91558acf1413c90c46150345f0b61bcb0db21ef3f SHA512 ff3d0b75725368e08bba5488ae35f1aeb190ba43a07053fc0bea13789c6725c99e34b90a0b87bbc350ba439f1f1db4a15ea82413f5dae52b105d05ad3f25cd4d
+EBUILD qd-2.3.22.ebuild 1102 BLAKE2B aa7e8ba96034d3f1541be3bc4ce7cebb6c92af3107ad83fa55c30891280cd4842ae8eb31f2020af459fb5c71934d66f92fef83d4a08b586425b03f92e485af2c SHA512 6c8af78a2dc0c12957ff8e66745f31870c4eb43f831ca79fd96eed22d54f8b59c403156d14e6fe7d77fcfc51672e876a6e0e6ded9e1b6c95d8691a17d13efa9f
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/qd/qd-2.3.17.ebuild b/sci-libs/qd/qd-2.3.17.ebuild
index c63f70cc5236..2e7467e99c79 100644
--- a/sci-libs/qd/qd-2.3.17.ebuild
+++ b/sci-libs/qd/qd-2.3.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran
 inherit autotools fortran-2
 
 DESCRIPTION="Quad-double and double-double float arithmetics"
-HOMEPAGE="http://crd-legacy.lbl.gov/~dhbailey/mpdist/"
+HOMEPAGE="https://www.davidhbailey.com/dhbsoftware/"
 SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
 
 SLOT="0"
diff --git a/sci-libs/qd/qd-2.3.22.ebuild b/sci-libs/qd/qd-2.3.22.ebuild
index aca6e4aa6610..ba78c43a2ef1 100644
--- a/sci-libs/qd/qd-2.3.22.ebuild
+++ b/sci-libs/qd/qd-2.3.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran
 inherit autotools fortran-2
 
 DESCRIPTION="Quad-double and double-double float arithmetics"
-HOMEPAGE="http://crd-legacy.lbl.gov/~dhbailey/mpdist/"
+HOMEPAGE="https://www.davidhbailey.com/dhbsoftware/"
 SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
 
 SLOT="0"
diff --git a/sci-libs/scikits_image/Manifest b/sci-libs/scikits_image/Manifest
index 3e1046a428d5..501062ae8314 100644
--- a/sci-libs/scikits_image/Manifest
+++ b/sci-libs/scikits_image/Manifest
@@ -1,3 +1,3 @@
 DIST scikit-image-0.13.0.tar.gz 26101533 BLAKE2B c28284f64abd58c7bafa8f5f0c781496e8bb28af79c5c730df7cbf2fede958eb88ea420fd7f89e7b8d0d91719a98dd0935af3b2cc50fe501cc8d8d1d0ee56cb9 SHA512 923015e373c406ae2fbbfdf83ce8b91e83790bdf7842c4439fdc9fd58cffe46efc0cfc7a1b0b06e1b2d092a909a6f085335640850883e7608dbccd1074046550
-EBUILD scikits_image-0.13.0-r1.ebuild 1814 BLAKE2B 27dbeba670d96b189f2d27a9598fb0e99c9656867790389fd92d75405d25e5ce09c9e8a55f8b1c6cc376bf3edf6ac914c6d5ef0365c009b20599b11403ba48a0 SHA512 6daa315b9cc4437384c2cdd304bf57c807507259fb7425ccf43b872a2ce1e5351dad936d7cf150d85cffc50096d51139e91c76191b82f9a64b3e487dae73c6e6
+EBUILD scikits_image-0.13.0-r1.ebuild 1816 BLAKE2B d0c8f32aa0f8e561567c605856c22125c408a722c1c953196234ef26ec7e77c9e203df29b052a98f176b7c4e17ec6cb9598fbc3205dd9f620d25d625ad73ca11 SHA512 a5ebd9e3edab500f6f45703a91c2c5f3ddc14416648a3765c0cd13cd0ccb9fa7624c34ebdb68625bc3238303059c814c0d7fafe0c675ff631a8e127f093ba45b
 MISC metadata.xml 834 BLAKE2B d6ed9731e0bfffb39fb127b1ccaa9d449e7cedc4038a5a4a915624fadad131d39df0d1d7123951539074758095d35c1b9730bb4a3da2278b02630903645eb769 SHA512 1c615479bc22c8c66b4f7a2189e38c69f9b8722f051c68473439069ef89598f0505dbd94fe06cbe56a07e41a1a6552f4d8d666703676ef9a165dbcf462e09e40
diff --git a/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild b/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild
index 875c4e86fa4c..6764d75ad7cf 100644
--- a/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild
+++ b/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pywavelets[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	sci-libs/scipy[sparse,${PYTHON_USEDEP}]
+	dev-python/scipy[sparse,${PYTHON_USEDEP}]
 	freeimage? ( media-libs/freeimage )
 	pyamg? ( dev-python/pyamg[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index d082029a266a..ecff55c949f6 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -4,8 +4,8 @@ DIST scikit-learn-0.19.0.tar.gz 9341628 BLAKE2B c9e0c12558e81efb6f5cfddead028980
 DIST scikit-learn-0.20.2.tar.gz 10275187 BLAKE2B 6865fd101f99930e014f4a2a89616e1ee917df27a5a1b0a931d47503d7df509fe6490799e876a5d68b1cb76a35c6f85e4acbb31a28adfc528720fe9a69e108a7 SHA512 5e0bdea3c40e38880683c6a49cdf2f4c0d40c1f5436c1d8209d613440d5d9d13b9a608e73943a890ef3effaddd930b5c171c45d29700afb8629285ba4aad414f
 DIST scikit-learn-0.20.4.tar.gz 11684276 BLAKE2B 791fd5c7e3ebfdb9bf01524be46b19341b5750fdc5352de9e50cc395a34cf91551825352f18f235b658b55b38829981884fca9f0535a1c505adeb18ac5d87ceb SHA512 a94c254440641a987df1eaec63302639b8e6f56705ec426c350070658141dd574b502eb1e4b94ae9c766c1becfd911f08bb97d5c87d39b0546d8444ed281b06a
 DIST scikits_learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e666fbb51e33954fdf700292650204fd9d1ab4fc4d1695890d02a24ad68f4dcc2d3cde8f0827eca70c6fb9a6f0e5c0d9c04fd5 SHA512 20bcda5c65f76bce9b71c5b5fb1b499f7f3a7a3f6fa5fade80a38dc658cb434e16e9d5a4906a9657157a5cc90a6d51080575d6e510207baa9f8b06c4fa761d5b
-EBUILD scikits_learn-0.19.0-r1.ebuild 2836 BLAKE2B 06bc03dbe61c8afbf4c83f006d23bd4255979fa7a1091aceb9a78b051dee64f721215122196e66dc93b4a47fdac0337e2a75544693104825ea38879837fbbb30 SHA512 3c87b6a8cc2fd1af8614b809f5ff533d2db2f1d1240162a697aaa392b9143d6ac1e5680d423c104fd71051c70bc3fd4caa874b80a4c866341a6bd70bad575454
-EBUILD scikits_learn-0.20.2.ebuild 2888 BLAKE2B 91ecea16f8ca17dcd04519b510c61deb9e78d14362ea3e4f4902bce7a7189577ccb96dc92b530b547389a7c65b957ffa705ca25b680c777453fa1c29c876eefd SHA512 3deb10f3314abb6e82a4e118362724147f09b2104db90cdb7bfe98d804828136a590f0aec53ec873a3c8d718009ff946c660e9efd750d3d550be91c0847e03fc
-EBUILD scikits_learn-0.20.4.ebuild 2888 BLAKE2B 91ecea16f8ca17dcd04519b510c61deb9e78d14362ea3e4f4902bce7a7189577ccb96dc92b530b547389a7c65b957ffa705ca25b680c777453fa1c29c876eefd SHA512 3deb10f3314abb6e82a4e118362724147f09b2104db90cdb7bfe98d804828136a590f0aec53ec873a3c8d718009ff946c660e9efd750d3d550be91c0847e03fc
-EBUILD scikits_learn-0.22.2_p1.ebuild 1771 BLAKE2B 58255129e8173118593b5231ea4cf2160363a1f7a07bb808b20b305b6396ce41f728bfbcbda96cebf7f27914af01c402404b3015827cf56c235cd53efe1c8118 SHA512 57e4e346bac7c6c665ec6ac482cae986fa54b5210e5699421a560ceb13f549163ef11b4927fde45a0c53da05a8674b72b5292696cdf7328c2e3c3584923818dd
+EBUILD scikits_learn-0.19.0-r1.ebuild 2840 BLAKE2B 28ea9aafe02b625f767fdee2411626044a2ef81bbca47a02e07ae959a4d8a59e62d1b33ad213ca8df28245546ae9f3799b1863e41f93dede03140e13fb842bbb SHA512 bfdadfd9a145460d38d2929ffad1e5e487c238ae7609993983ec058687e4abe3ed6eb56e3f3981587c4db163acb74f432d050ee89077e44edf5add2cf83812a6
+EBUILD scikits_learn-0.20.2.ebuild 2892 BLAKE2B e93d86e111aee0f94da2aa95a4c64ea6b58cca96ee806d23519322f3e6bdbb5c3fc529f035266abf83b46abfa1461fd83e1f760e66142cded0a07788314b33d4 SHA512 ce59b40301a261fa90b3646a8c1cc8b473b4fb5b29469df2fda1b951c9dbd17ea043f2a9838dcf12c22761952c83b0ea05d44ff51628d84d4760a13cf39827ae
+EBUILD scikits_learn-0.20.4.ebuild 2892 BLAKE2B e93d86e111aee0f94da2aa95a4c64ea6b58cca96ee806d23519322f3e6bdbb5c3fc529f035266abf83b46abfa1461fd83e1f760e66142cded0a07788314b33d4 SHA512 ce59b40301a261fa90b3646a8c1cc8b473b4fb5b29469df2fda1b951c9dbd17ea043f2a9838dcf12c22761952c83b0ea05d44ff51628d84d4760a13cf39827ae
+EBUILD scikits_learn-0.22.2_p1.ebuild 1773 BLAKE2B 782f6502c22d3e7b4956700ef3c82d0ebc7217fd7d53f78833e8ed8b1f3a5339aa599ac8b2532663abc0be497ee333324a74900ef55d9c362bb9d4d5625c274c SHA512 aa87ac0527c8767a56091dc7d257e03aacac2ef9dff3eea188d8354f7bcc0e4f4fd0cfdf2df525d597f184c953c0b0a8b9cd0f7e3519cf8f8dc77096dc6f5cd6
 MISC metadata.xml 605 BLAKE2B 46a657647a79f0a23cc07b39877b1e57158cdf94d9478c3aa4e7af0dbdbf60acf996d1431076697db764d42bec0d5e0517c1247e91dc36e85823a45784d00e71 SHA512 e14b6835108fa80eca44bab635c9a229da65f048ffcee16cd4ad7736c3a0fb364c94ff0bd9630030653bd3cd78d8dced191c43c7e5aacb3a7f6e61ac45b5bb3d
diff --git a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
index 467c21244943..87abf6b9c1e3 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	dev-python/nose[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	sci-libs/scikits[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	virtual/blas:=
 	virtual/cblas:=
 "
@@ -37,7 +37,7 @@ DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	virtual/blas:=
 	virtual/cblas:=
 "
diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
index fc65c21b1d47..728231683290 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-python/nose[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	sci-libs/scikits[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	virtual/blas:=
 	virtual/cblas:=
 "
@@ -38,7 +38,7 @@ DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	virtual/blas:=
 	virtual/cblas:=
 "
diff --git a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
index fc65c21b1d47..728231683290 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-python/nose[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	sci-libs/scikits[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	virtual/blas:=
 	virtual/cblas:=
 "
@@ -38,7 +38,7 @@ DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	virtual/blas:=
 	virtual/cblas:=
 "
diff --git a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
index 1c4068d298ca..b60be666ce0d 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
+++ b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/wheel[${PYTHON_USEDEP}]
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	sci-libs/scikits[${PYTHON_USEDEP}]
 	virtual/blas:=
 	virtual/cblas:=
diff --git a/sci-libs/scikits_timeseries/Manifest b/sci-libs/scikits_timeseries/Manifest
index d40aa188f61e..d3b3f19fe117 100644
--- a/sci-libs/scikits_timeseries/Manifest
+++ b/sci-libs/scikits_timeseries/Manifest
@@ -1,4 +1,4 @@
 DIST scikits.timeseries-0.91.3-html_docs.zip 907495 BLAKE2B e06c295bb4b093c2d7d5e767a8c03cb71e84ef3207790203c920ad9a9d57488f926c7a761ffb41fbc6829a9847327d40fa202776fa36fe473663066e41ecdee4 SHA512 9fb474e2a13dee865801fa5aa5f05bb74ea2387b7e14d716210898d9b338b63b7f1935f7a5514d72ffcd6f4a8552054094244fab199e18c819815d4b19cd3f23
 DIST scikits.timeseries-0.91.3.tar.gz 323771 BLAKE2B 74c14a1ec903dd02f8b3134867d4e371bac00d1a7b22de38962c3ca27afb603296b415e3ab2f21114b9c34890c24ea10379e5465d557778c6c794470235a311e SHA512 ea7292bf4d9bcce416b6f0e2c99fc40afe97a3a0210c535bd68f43a4a553d8a30cb77ce00f96ffc26340d5ff837faf5d480ea775385769495eccb5a196a88617
-EBUILD scikits_timeseries-0.91.3-r2.ebuild 1121 BLAKE2B 22697059322eb61c6707906f02be976810941232352a1c85c8a58870e2522d4d6a0abde6557e5e07875b96974bd1a7f89e2da5dccd374ea9b58d7338536aebd2 SHA512 09397a2f16c28a1270a4a4d064cc1420c87b4a4e8c4a8b139018903fedec460c9956d268fd17dc6e710a46952f951489ecdfdaf3524ef82b1c51f6dffaf70a8a
+EBUILD scikits_timeseries-0.91.3-r2.ebuild 1123 BLAKE2B dd2f832df5a5a4560839fd068c9c558a72d8cc231132beee8a1285224a83b1cdc084067307bb26479fcb0178d562476d7f841e6afd6a48300ef3ca4554c4a5f7 SHA512 48767ad775de962a55d3d05202993917444469ff952527ff2352a8ee7e51b470309cf277d18ee3655bfb1634f440b29be97928b278676c449306edcac9e4707c
 MISC metadata.xml 673 BLAKE2B 432205d6049ba9bcc3355436a0017b30b66c0865afed8900e5f62846885050958ff193d2524fb9818141dca6cce2a912cf11cea4075a10abce4ed6bff3964f28 SHA512 1bd1de5dfc98873bf2df5d6fa42a02b5d4c0736d965b712909ccb991d8caff4fc71827bc292643a659566c64578e2a52a780ddec2eead4339d3481683b778d43
diff --git a/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild b/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild
index b1dd82b36296..0b7cea51568b 100644
--- a/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild
+++ b/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 RDEPEND="
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	sci-libs/scikits[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/pytables[${PYTHON_USEDEP}]"
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
deleted file mode 100644
index 0d594184be31..000000000000
--- a/sci-libs/scipy/Manifest
+++ /dev/null
@@ -1,21 +0,0 @@
-DIST scipy-1.1.0-html.zip 49851258 BLAKE2B 528df7ed8aa8e56662f436f31ee9e1d6d72d6fe962f9f0f6f84b7a2704b53009ce333b2102ec73bb7795110f8a61b18246aab95b1e21055f2b68c0ff2225b7bb SHA512 a03894a22a67c1359ee6206e9e1c9de1f926a7f829f5039f161e78df735708da09b0e51cdad3bf36bfede701d0bc5dc44f8cc0f249b6bfb80c9d8c9fe23aed46
-DIST scipy-1.1.0-ref.pdf 34360806 BLAKE2B f82807879d5d36d91d74e8983a0f4104bcb4b69cb7787fe5190f73fbbfcb8635a9399686b3c75736d3b0b5dd877b5280ff6fba728520e3b47c13ffc7835f8cd6 SHA512 c792064c986dffafa3c5d0741f30715028e655761d099f0fdd472270cf34642b367dfa2178ddceba13043a471e3aeb1db20d65308dbb40c704dab576aaadeb3e
-DIST scipy-1.1.0.tar.gz 15583560 BLAKE2B 477753e622ee26a3bc8c2cb6829410152df84b29ce17a6d53a66348f5536f7993fedf5d32b782405b54b3af3feabf9bc91c381ed39546076849c2fdb71039404 SHA512 72fe32c6c009613cb78202598e5db14f8e630b3218839cfe18d43d40550d94cc5aa100c6f5d41f40e86ae148e9b6a13431bb91b0f9be44b0569ccd7b725fe973
-DIST scipy-1.4.1-html.zip 61414053 BLAKE2B e1f0c1a7a8941958512dcc3c0f40ef4a590bab0b44b33f842bc6e1c5d103c17f223d8b0a2f4e564f57645d601d4d74005c1ec605be2dd3bf4db19d2ac1f614d1 SHA512 9eeae83cd723d63aa1dc7a610ce3118cb68a2336be24cbfeaa8e57b34de413b2efa2fdad0978eb5bdac0ebca6b15f564b9509637efbd87d1007c969ae954e3ae
-DIST scipy-1.4.1-ref.pdf 41100747 BLAKE2B 8e56af69d0bffbe6eff73bfc5bb674aed3b80bdd80d59b58a1835f996c992306a059c2992d74c411e762490c526262753d33273613ed389928845c65eb6546b2 SHA512 76946f3b506fe22a595b70e5a418982257dd59db1a2e9af508cc1cab59d47ba4fc5951388e676f2a513043a6b3391ef853242e78d7feb99a6c21d19f6dca2b58
-DIST scipy-1.4.1.tar.gz 24555206 BLAKE2B e35f6234404839cbd24d463c8cc2f1ea66aed91534e700fd54a623df40d069b14fc220f96af04c78d13b773bfc5461559e59b0bd9b836d7953f9249ccd7cae54 SHA512 79407a2cbb4ba29c0941570181df4d7835e5791e50a3abef9b63c2fc5b15308a2e4964eb71cdebbee8cd2dcb8e497cf92fe50ee21fb12cac3013ea5e0466b25d
-DIST scipy-1.5.0-html.zip 23579592 BLAKE2B 6e35a881967d38db67278d6990fbb1912238bca05c7064585aaaf849861371680c2cd5d3e9a150301c29984aa12db0eeebf5f23cb7d2a438edb28fed9654ac79 SHA512 a1dcf9c2d003b1f722a216c8bf0fda7022765c01505343e86da64ec9a4dbda4eb7da74ad09147e5b79e610f090740d19bda6017d6f894f2566547a42e8aa97b3
-DIST scipy-1.5.0-ref.pdf 33694300 BLAKE2B a7701cdfd8f6da71b59efcefca5c080426b175976429cb64d47f05f42795fea3abb6764c2e2d1807f215c9e00ccd5b2de254f1c68269b266492dfaf76f887972 SHA512 3208ab84421fbec0597931c6050666e9da7d21c6e73a685f084e9570a39539e9c2e5f7fbdfe27951b2ba8e51a1bc42b06ddd6c906a6a13c81a34a16dc0672dda
-DIST scipy-1.5.0.tar.gz 25573194 BLAKE2B f505e5f0627687aeefe0af0886b03eead9f6426f17bca21a3f73cc0d4957ac574e0123b86424ccf0d5f8f4a963b707a1443ddcd6e149f2a4e747daa55b1be95c SHA512 4c981a3125a88593cbc5a17417022a5db8f6ccb4c1c24e78afeb9bb26428b81d2d0fe9965caa418753b1bbbda2fa30533fa1307aac6ab168458d68f7b46049be
-DIST scipy-1.5.1-html.zip 23582280 BLAKE2B 97b256bc7367836f35ce7e0ac47436dd72c1afe249dea1a2f437ea883e74ecb8f5bbe22e20bb804aac66b86fb35e8b4f0e329c44d9d601318ef1accc82e8e850 SHA512 eb0c7736d2bdc9f45926d19f4a22e1168d0f06e21b338cd7e7884af79c7634885350c510251d4cd1629b2a294003e93f8e71bafd8ec64c1aea4d4174c3946597
-DIST scipy-1.5.1-ref.pdf 33698325 BLAKE2B 6ff0d13474acf2960352580765c86ef54faa9bb616b4b8097665fa3b8a3a6033acb524d5bb76757b23d0ea9550b556293509a91e5cbeb7b0a388ea75d1bec29b SHA512 c0fbebb5dec19aebe7783507ccebf28134227096caad915e1f28f963386a07b1246fa624e4680691809c5ba31a09d3dd6e4f27f9e86f5985f8a7eecb1eea82d3
-DIST scipy-1.5.1.tar.gz 25575560 BLAKE2B e431a54f1810590b75d0f115bdbcd3c561d0d918664d91654fa4f2583d4d2807deae36b3293be0a5add650fb5d99f744e1d893d369f6053741d863e2826dcc3c SHA512 d46abaaa52e5521d8f3f6d79f58c8473a8649faa01e93d250d2ee19d5778e31c13aaa855bd8f059ddc1424ae13001f15a41f240fa6b0acf3ffd911ea30da1040
-DIST scipy-1.5.2-html.zip 23166876 BLAKE2B a90d6a2eb25c56147c0c1cccb58cddd230c20cd70dcc5c39b7307acaeac5320ff1c6ed46e3027ec40f604db503a90620cf87212e45f3158c667ec20d95bac649 SHA512 35c675821675844b163eacdaf448173edb78adb5e9f3e438a70809b8b59425a987fd3ed7d6f7863612111ece4a6a36504279ef4492166f5e24a9b2c7ea9d21e7
-DIST scipy-1.5.2-ref.pdf 33462200 BLAKE2B 5784612eb41221a02520778d72341702a7dd4ee8c0147592e170054107219b03af4ccebe1f5e2a57f90f3b892455f95ec45d8eac8e4a7155e21e9ae0526b302f SHA512 15961b7280eb903d2db7a05915b94b3c298cabf68a6694da217680e23fe621885dd169dc88a033ee001a89bc6e6b13ef787ec61009f6ffe38aeaa2dfb84f8a47
-DIST scipy-1.5.2.tar.gz 25423944 BLAKE2B 0a4987da0cde4f33bbb0e2be571b59e9064b1c6554c61c1655100abdecfde54d64845cd30c5b3fcac3ae7426572757aa9a66065dd3b48e6e4cdd4d0ea847868e SHA512 45463df30a0f6270d9f4cf52235f31607904a6ae1375e12600e7f1ab2d27b1dc25a6211b49dceb71506be22c756890adaf9f81d9e6be7455def86c9caf0dc923
-EBUILD scipy-1.1.0.ebuild 4112 BLAKE2B 1dec8bf858c2051c3ca18bd77759b5add6ee996331e14f1a8c1831be44f5a5b95340bdefccfba44f0753bef43e07ec445e93d2955dce05e305dc5cba505b0846 SHA512 e99d842e6d558907e0e17164edba323e94ff8fe12bbcab8f9c3f840c25a36822f9d507a2fd3ae30870aefbe8e143a2b90155c8c094bb91b62f99b89edf2fa2d2
-EBUILD scipy-1.4.1.ebuild 4150 BLAKE2B 4f7ee074825feb1c58c2d297b6817137c95b2c12b97112adfe4006996e6ca6a20325cc2b7e19c99ba09cf0dd9fc42cec9c917bc3abae0a89e4152a834326c9e6 SHA512 2f7473b792726c709f1a62b2d465168ffeba66891117c1d203f1dc2f1b2de6f9dfd945580e539ffdc2e5d8254bfcd0a05d5abdc0b1216b4e94a5b31f2adeb5bb
-EBUILD scipy-1.5.0.ebuild 4152 BLAKE2B c1c4fbf70af27fdc995b90fb21d1bc662a2454199c98b4268620df83190f73ccd56dfecc12da83044d152c837871340fdc793df5a0ccd10aa2575ea9e7f57a76 SHA512 1706a60626cc50424b66450f60b2b625e1bc015a4155694f0426df73723c7154de382d821acd8d705eddd535911088a6621891c651623132c3a2420d077d8629
-EBUILD scipy-1.5.1.ebuild 4152 BLAKE2B c1c4fbf70af27fdc995b90fb21d1bc662a2454199c98b4268620df83190f73ccd56dfecc12da83044d152c837871340fdc793df5a0ccd10aa2575ea9e7f57a76 SHA512 1706a60626cc50424b66450f60b2b625e1bc015a4155694f0426df73723c7154de382d821acd8d705eddd535911088a6621891c651623132c3a2420d077d8629
-EBUILD scipy-1.5.2.ebuild 4393 BLAKE2B 2275f198af444b4650a3cfedba5920d83953bf93314f281d451fe72cdb3aaaf1cb9b854f5a654e39d2056a8975b081bc79d90cdc58144f5aa10650d706487db5 SHA512 56762eea7116319f68c5e058a40800f461c08726682845b5666db76116c1f315b7a1f5dad0118d36584c798b9b2ec0fd81d171b1d575e574603134f95c089d8f
-MISC metadata.xml 1038 BLAKE2B a17718312d2d1ead8646e838b2704c14a9f21be8c59fbc0cd8544ab45bdb28005443be05f3a9f5671581f0f28e3cf7507131e2baad5e7b128a452d1ca3fae19e SHA512 2ee6a44a4f32d34f52eb1a0bb787907c31d22c15af597c8db8820df72cafcbba72201c5157b60dede7df4ff0ba48847e8f764c5a67a0b7efacabe1b9fa9bd74a
diff --git a/sci-libs/scipy/metadata.xml b/sci-libs/scipy/metadata.xml
deleted file mode 100644
index f1d093c366af..000000000000
--- a/sci-libs/scipy/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-  SciPy is an open source library of scientific tools for Python. SciPy
-  supplements the popular numpy module, gathering a variety of high level
-  science and engineering modules together as a single package.
-  SciPy includes modules for graphics and plotting, optimization,
-  integration, special functions, signal and image processing, genetic
-  algorithms, ODE solvers, and others.
-</longdescription>
-  <use>
-    <flag name="sparse">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="pypi">scipy</remote-id>
-    <remote-id type="sourceforge">scipy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-libs/scipy/scipy-1.1.0.ebuild b/sci-libs/scipy/scipy-1.1.0.ebuild
deleted file mode 100644
index 119210dc4f00..000000000000
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-DOC_PV=${PV}
-
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="https://www.scipy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-IUSE="doc sparse test"
-RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND="
-	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:0=
-	virtual/cblas
-	virtual/lapack
-	sparse? ( sci-libs/umfpack:0= )"
-DEPEND="${CDEPEND}
-	dev-lang/swig
-	>=dev-python/cython-0.22[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${CDEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt THANKS.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use sparse && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
-
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-	cat >> site.cfg <<-EOF || die
-		[blas]
-		include_dirs = $(pc_incdir cblas)
-		library_dirs = $(pc_libdir cblas blas):${libdir}
-		blas_libs = $(pc_libs cblas blas)
-		[lapack]
-		library_dirs = $(pc_libdir lapack):${libdir}
-		lapack_libs = $(pc_libs lapack)
-	EOF
-
-	# Drop hashes to force rebuild of cython based .c code
-	rm cythonize.dat || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# bug 721860
-	test-flag-FC -fallow-argument-mismatch &&
-		append-fflags -fallow-argument-mismatch
-}
-
-python_compile() {
-	# FIXME: parallel python building fails, bug #614464
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile \
-		${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
-	"${PYTHON}" -c \
-		'import numpy as np; print("relaxed strides checking:", np.ones((10,1),order="C").flags.f_contiguous)' \
-		|| die
-	"${EPYTHON}" -c \
-		"import scipy, sys; r = scipy.test('fast', verbose=2); sys.exit(r)" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && \
-		local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer. Example:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild b/sci-libs/scipy/scipy-1.4.1.ebuild
deleted file mode 100644
index 90fb741b4d73..000000000000
--- a/sci-libs/scipy/scipy-1.4.1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE="threads(+)"
-
-DOC_PV=${PV}
-
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="https://www.scipy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc sparse test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:0=
-	virtual/cblas
-	virtual/lapack
-	sparse? ( sci-libs/umfpack:0= )"
-DEPEND="${CDEPEND}
-	dev-lang/swig
-	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${CDEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt THANKS.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use sparse && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
-
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-	cat >> site.cfg <<-EOF || die
-		[blas]
-		include_dirs = $(pc_incdir cblas)
-		library_dirs = $(pc_libdir cblas blas):${libdir}
-		blas_libs = $(pc_libs cblas blas)
-		[lapack]
-		library_dirs = $(pc_libdir lapack):${libdir}
-		lapack_libs = $(pc_libs lapack)
-	EOF
-	cat >> setup.cfg <<-EOF || die
-		[options]
-		zip_safe = False
-	EOF
-
-	# Drop hashes to force rebuild of cython based .c code
-	rm cythonize.dat || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# bug 721860
-	test-flag-FC -fallow-argument-mismatch &&
-		append-fflags -fallow-argument-mismatch
-}
-
-python_compile() {
-	# FIXME: parallel python building fails, bug #614464
-	export MAKEOPTS=-j1
-
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile \
-		${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
-	PYTHONPATH=. "${EPYTHON}" -c "
-import scipy, sys
-r = scipy.test('fast', verbose=2)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && \
-		local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-	python_optimize
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer. Example:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/sci-libs/scipy/scipy-1.5.0.ebuild b/sci-libs/scipy/scipy-1.5.0.ebuild
deleted file mode 100644
index 21948a8eb2c5..000000000000
--- a/sci-libs/scipy/scipy-1.5.0.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE="threads(+)"
-
-DOC_PV=${PV}
-
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="https://www.scipy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc sparse test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:0=
-	virtual/cblas
-	virtual/lapack
-	sparse? ( sci-libs/umfpack:0= )"
-DEPEND="${CDEPEND}
-	dev-lang/swig
-	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${CDEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt THANKS.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use sparse && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
-
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-	cat >> site.cfg <<-EOF || die
-		[blas]
-		include_dirs = $(pc_incdir cblas)
-		library_dirs = $(pc_libdir cblas blas):${libdir}
-		blas_libs = $(pc_libs cblas blas)
-		[lapack]
-		library_dirs = $(pc_libdir lapack):${libdir}
-		lapack_libs = $(pc_libs lapack)
-	EOF
-	cat >> setup.cfg <<-EOF || die
-		[options]
-		zip_safe = False
-	EOF
-
-	# Drop hashes to force rebuild of cython based .c code
-	rm cythonize.dat || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# bug 721860
-	test-flag-FC -fallow-argument-mismatch &&
-		append-fflags -fallow-argument-mismatch
-}
-
-python_compile() {
-	# FIXME: parallel python building fails, bug #614464
-	export MAKEOPTS=-j1
-
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile \
-		${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
-	PYTHONPATH=. "${EPYTHON}" -c "
-import scipy, sys
-r = scipy.test('fast', verbose=2)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && \
-		local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-	python_optimize
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer. Example:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/sci-libs/scipy/scipy-1.5.1.ebuild b/sci-libs/scipy/scipy-1.5.1.ebuild
deleted file mode 100644
index 21948a8eb2c5..000000000000
--- a/sci-libs/scipy/scipy-1.5.1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE="threads(+)"
-
-DOC_PV=${PV}
-
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="https://www.scipy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc sparse test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:0=
-	virtual/cblas
-	virtual/lapack
-	sparse? ( sci-libs/umfpack:0= )"
-DEPEND="${CDEPEND}
-	dev-lang/swig
-	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${CDEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt THANKS.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use sparse && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
-
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-	cat >> site.cfg <<-EOF || die
-		[blas]
-		include_dirs = $(pc_incdir cblas)
-		library_dirs = $(pc_libdir cblas blas):${libdir}
-		blas_libs = $(pc_libs cblas blas)
-		[lapack]
-		library_dirs = $(pc_libdir lapack):${libdir}
-		lapack_libs = $(pc_libs lapack)
-	EOF
-	cat >> setup.cfg <<-EOF || die
-		[options]
-		zip_safe = False
-	EOF
-
-	# Drop hashes to force rebuild of cython based .c code
-	rm cythonize.dat || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# bug 721860
-	test-flag-FC -fallow-argument-mismatch &&
-		append-fflags -fallow-argument-mismatch
-}
-
-python_compile() {
-	# FIXME: parallel python building fails, bug #614464
-	export MAKEOPTS=-j1
-
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile \
-		${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
-	PYTHONPATH=. "${EPYTHON}" -c "
-import scipy, sys
-r = scipy.test('fast', verbose=2)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && \
-		local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-	python_optimize
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer. Example:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/sci-libs/scipy/scipy-1.5.2.ebuild b/sci-libs/scipy/scipy-1.5.2.ebuild
deleted file mode 100644
index a3d305b08469..000000000000
--- a/sci-libs/scipy/scipy-1.5.2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE="threads(+)"
-
-DOC_PV=${PV}
-
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="https://www.scipy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc sparse test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:0=
-	virtual/cblas
-	virtual/lapack
-	sparse? ( sci-libs/umfpack:0= )"
-DEPEND="${CDEPEND}
-	dev-lang/swig
-	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${CDEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt THANKS.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use sparse && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
-
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-	cat >> site.cfg <<-EOF || die
-		[blas]
-		include_dirs = $(pc_incdir cblas)
-		library_dirs = $(pc_libdir cblas blas):${libdir}
-		blas_libs = $(pc_libs cblas blas)
-		[lapack]
-		library_dirs = $(pc_libdir lapack):${libdir}
-		lapack_libs = $(pc_libs lapack)
-	EOF
-	cat >> setup.cfg <<-EOF || die
-		[options]
-		zip_safe = False
-	EOF
-
-	# Drop hashes to force rebuild of cython based .c code
-	rm cythonize.dat || die
-
-	# TODO
-	sed -e 's:test_magic_square_sparse_no_presolve:_&:' \
-		-i scipy/optimize/tests/test_linprog.py || die
-	sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
-		-i scipy/stats/tests/test_continuous_basic.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# bug 721860
-	test-flag-FC -fallow-argument-mismatch &&
-		append-fflags -fallow-argument-mismatch
-}
-
-python_compile() {
-	# FIXME: parallel python building fails, bug #614464
-	export MAKEOPTS=-j1
-
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile \
-		${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
-	PYTHONPATH=. "${EPYTHON}" -c "
-import scipy, sys
-r = scipy.test('fast', verbose=2)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && \
-		local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-	python_optimize
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer. Example:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index 2fc1c6b42165..6d029a62eb35 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -1,8 +1,5 @@
-AUX scotch-5.1.12b-as-needed.patch 4878 BLAKE2B 1fa95b1d7e03a8d2c3fe6840428b07974dcb2bffe30f17ace62e7998397a27f77b12c497d6bbf9c568b1b81bab785fc7588ac33567e82b9c5a84721bd7a1ac85 SHA512 9f5bf65999978d851b0c61de2235af982e6d1d057af5906d328f2a4b83775f8dd567f1386eecc186d6ec1287d8e84215a88b879ec77de4ac6de5b129ad263411
 AUX scotch-6.0.4-as-needed.patch 6168 BLAKE2B 5b008f9035379d91cd8ffde6d64a22b021fd5070a106592abefac78a0522282fbd0dd7f8b439b0452c0d15c57891c9d4eb4415120ea95788fe74e149e6069fc3 SHA512 cd58425866a1726f776318e3792e72d7250686f033ceeda57f0f007fdb4c5e1c2bc3c9346630e39f16023f2a3d70cd106b357c21e5406a1c44b49a316655d8dd
 AUX scotch-6.0.4-flex-2.6.3-fix.patch 1623 BLAKE2B 9d86299eb543147ce7e736779b05c3b8113c12b54fbaf46a2b99a6cef2b670fc1b448d059858f954f37acf72c7c268acf1793de89f193d02f8b61d3f5d4ca1e5 SHA512 1a2a5a363e1dd59e1cced76928da15132cd1c8af57d6d0ad0eec04e02d029c6ae275e202e8c87bc65ff0188f41e379865829b5b61e4f1e44a885d48c4462b09e
-DIST scotch_5.1.12b_esmumps.tar.gz 3989632 BLAKE2B c529601d68bf7a5497d363a746ad46e0c5b4d0831cd9e128ce10a09580215d5370e3766ceb1c2550985b554e2ae6c125149b11f376b32881fc66c052885c814d SHA512 8d6e085029f1ec13b74bd583b8fb378db9aef8a005b96bfb726b68a4608caeb31bf7ecaf1af27566e2e4a38dfea03a017d5c2e8dd262562b238cfb113b223671
 DIST scotch_6.0.4_esmumps.tar.gz 4804966 BLAKE2B 63c058fac9206e70975463b1748eb5ce7cd2ba01d9fcbb28eba8f5914ac49a71fcf87941fafd6047712fa519f3b5523ce199bdf5228a8b094bbb465dd64a1083 SHA512 0fcf639ab1a09451256444005f1a4a739403159e3ab22c34fbcedc481be387cd4c86be6fb029b4b5816220564f64f662434bf7f1d3921ed18be081ae2a7a9ee2
-EBUILD scotch-5.1.12b.ebuild 4446 BLAKE2B 6c02eb7b272e22e2c62e95daf9a99745420a69233d0b95bc9479556ba08b6cdc36339272a0cd16eec51934125c3f50afa9873a5a03b21fbd63a87592889726bd SHA512 8020ca4ed7709607e1bc9f4cf21b96efd03ad413912304d70bde02606b1c2cba6abcb6e3a14ae0ff59c19ab82a40efb02567bafe1bce53d0e39d192f3aff1dbb
-EBUILD scotch-6.0.4-r2.ebuild 4910 BLAKE2B b71de7fd6f6471efe2dbd3037d78aaeb5e6dcda6b1e529014335eebf5714775a79dc4a342e1793042f5e82c2ad181546a2a8a74c067ecec86d1f65e0ea7126e3 SHA512 9909700133b6c8a5ef4094066b19c69fe85a07f413dd0e970f9016567aa161a1963f453cd11aa0e96c1f569b2681aa498cac6b5469a05cff3f614d8b4123412d
-MISC metadata.xml 1199 BLAKE2B c5d721a43a47c20cf10d18bf0f9e1a2db04a2473bf772d6b64a8360a897ddfea8904b0bb65443fbf0738a4580d867477d9b58f8e720c8bd39933d461bd744b85 SHA512 78345510290afd5d47a88595c3d2b07cbdb6f99d1341c6433095750bd27bb0f81fbe5e98cb6ffd23b5c8c2e0a346d1a2f25b5bf2f83093dff471906fdadc4eee
+EBUILD scotch-6.0.4-r2.ebuild 4985 BLAKE2B 3baaddc8fac4e76c1bd525533e52f5a34f952768c6fa2fe44e30d36e7d401aa87254357894dc99bf0b7992b7df4b335d2f03573e5a779dfe8005522921c218de SHA512 23e09c7c275b38dab64665b959e1002857068536bf41f50a4743474b2ac2f8dcc5473fecf7ced3a1ec8f9a44b1a14cae99f0a8628aa3b6c18326c1743de96391
+MISC metadata.xml 1274 BLAKE2B e140dd2a836530be2e4f61dd42200172d1b5c54608fd77d743ab349546ae1d9cb06d3be48c847fc646b31be3df78928d08168a53e90fe6a103cceb799a4429dd SHA512 7a0f3fdfdc71568a0a0ce2972ba93f2b17dce7725f0eeb56f046fa94dfc62747ffa0a33186e91265d6f46ab35c201ae49481db1077dac6c4866df818fb2b7136
diff --git a/sci-libs/scotch/files/scotch-5.1.12b-as-needed.patch b/sci-libs/scotch/files/scotch-5.1.12b-as-needed.patch
deleted file mode 100644
index 73888d8797e7..000000000000
--- a/sci-libs/scotch/files/scotch-5.1.12b-as-needed.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -Nur src.orig/esmumps/Makefile src/esmumps/Makefile
---- src.orig/esmumps/Makefile	2012-03-12 00:14:14.536109811 +0000
-+++ src/esmumps/Makefile	2012-03-12 04:26:12.884108074 +0000
-@@ -44,7 +44,7 @@
- 				$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(includedir) $(<) -o $(@) -L$(libdir) $(LDFLAGS) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit
-+		 		$(CC) $(CFLAGS) -I$(includedir) $(<) -L$(libdir) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
- 
- ##
- ##  Project rules.
-@@ -57,9 +57,9 @@
- 					libesmumps$(LIB)							\
- 					main_esmumps$(EXE)
- 
--ptscotch			:	clean
-+ptscotch			:	clean common.h
- 					$(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC=$(CCP) SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps	\
--					libesmumps$(LIB)										\
-+					libptesmumps$(LIB)										\
- 					main_esmumps$(EXE)
- 
- install				:
-@@ -142,7 +142,7 @@
- 					common.h				\
- 					esmumps.h
- 
--libesmumps$(LIB)		:	graph_graph$(OBJ)			\
-+lib$(ESMUMPSLIB)$(LIB)		:	graph_graph$(OBJ)			\
- 					order$(OBJ)				\
- 					order_scotch_graph$(OBJ)		\
- 					dof$(OBJ)				\
-diff -Nur src.orig/libscotch/Makefile src/libscotch/Makefile
---- src.orig/libscotch/Makefile	2012-03-12 00:14:14.496108751 +0000
-+++ src/libscotch/Makefile	2012-03-12 01:32:28.562403624 +0000
-@@ -43,7 +43,7 @@
- 				$(CC) $(CFLAGS) $(CLIBFLAGS) -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
-+		 		$(CC) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LDFLAGS) -o $(@)
- 
- ##
- ##  Project rules.
-@@ -2543,7 +2543,7 @@
- 					mapping.h				\
- 					order.h					\
- 					parser.h
--			 		$(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
-+			 		$(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<)  $(LDFLAGS) -o $(@)
- 
- scotch.h			:	dummysizes$(EXE)			\
- 					library.h
-diff -Nur src.orig/libscotchmetis/Makefile src/libscotchmetis/Makefile
---- src.orig/libscotchmetis/Makefile	2012-03-12 00:14:14.456107691 +0000
-+++ src/libscotchmetis/Makefile	2012-03-12 01:35:00.166422784 +0000
-@@ -44,7 +44,7 @@
- 				$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) $(LDFLAGS)
-+		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) $(LDFLAGS) -o $(@) 
- 
- ##
- ##  Project rules.
-diff -Nur src.orig/scotch/Makefile src/scotch/Makefile
---- src.orig/scotch/Makefile	2012-03-12 00:14:14.536109811 +0000
-+++ src/scotch/Makefile	2012-03-12 00:50:22.033571205 +0000
-@@ -41,13 +41,13 @@
- include ../Makefile.inc
- 
- %$(EXE)	:	%$(OBJ)
--		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
- 
- %$(OBJ)	:	%.c
- 				$(CC) $(CFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
- 
- ##
- ##  Project rules.
-@@ -205,7 +205,7 @@
- 					$(libdir)/libptscotch$(LIB)		\
- 					$(libdir)/libptscotcherrexit$(LIB)	\
- 					dgmap.h
--			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
- 
- dgscat$(EXE)			:	dgscat.c				\
- 					../libscotch/module.h			\
-@@ -315,7 +315,7 @@
- 					gout_o.c				\
- 					$(includedir)/scotch.h			\
- 					$(libdir)/libscotch$(LIB)
--					$(CC) $(CFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -o $(@) -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS)
-+					$(CC) $(CFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS) -o $(@) 
- 
- gpart$(EXE)			:	gmap.c					\
- 					../libscotch/module.h			\
-@@ -324,7 +324,7 @@
- 					$(libdir)/libscotch$(LIB)		\
- 					$(libdir)/libscotcherrexit$(LIB)	\
- 					gmap.h
--			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
- 
- 
- gscat$(EXE)			:	gscat.c					\
diff --git a/sci-libs/scotch/metadata.xml b/sci-libs/scotch/metadata.xml
index 48cba73d79f1..acd9751ef399 100644
--- a/sci-libs/scotch/metadata.xml
+++ b/sci-libs/scotch/metadata.xml
@@ -11,7 +11,7 @@
 </maintainer>
 <use>
   <flag name="int64">Build the 64 bits integer library (needed for &gt; 2^31 vertices)</flag>
-  <flag name="tools">Build and install extra exec tools</flag>
+  <flag name="tools">Provides the graph, mesh, architecture, mapping/ordering, output handling programs (see Scotch User's Guide).</flag>
 </use>
 <longdescription lang="en">
   SCOTCH is a software package and libraries for graph, mesh and
diff --git a/sci-libs/scotch/scotch-5.1.12b.ebuild b/sci-libs/scotch/scotch-5.1.12b.ebuild
deleted file mode 100644
index 7188b5ab48f2..000000000000
--- a/sci-libs/scotch/scotch-5.1.12b.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs versionator flag-o-matic multilib
-
-# use esmumps version to allow linking with mumps
-MYP="${PN}_${PV}_esmumps"
-# download id on gforge changes every goddamn release
-DID=28978
-
-DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
-HOMEPAGE="http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/"
-# broken ssl cert, so mirroring
-#SRC_URI="http://gforge.inria.fr/frs/download.php/${DID}/${MYP}.tar.gz"
-SRC_URI="http://dev.gentooexperimental.org/~patrick/${MYP}.tar.gz"
-
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples int64 mpi static-libs tools"
-
-DEPEND="sys-libs/zlib
-	mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MYP/b}"
-
-static_to_shared() {
-	local libstatic=${1}; shift
-	local libname=$(basename ${libstatic%.a})
-	local soname=${libname}$(get_libname $(get_version_component_range 1-2))
-	local libdir=$(dirname ${libstatic})
-
-	einfo "Making ${soname} from ${libstatic}"
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
-			-Wl,-all_load -Wl,${libstatic} \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-	else
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-shared -Wl,-soname=${soname} \
-			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-		[[ $(get_version_component_count) -gt 1 ]] && \
-			ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version))
-		ln -s ${soname} ${libdir}/${libname}$(get_libname)
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	sed -e "s/gcc/$(tc-getCC)/" \
-		-e "s/-O3/${CFLAGS} -pthread/" \
-		-e "s/ ar/ $(tc-getAR)/" \
-		-e "s/ranlib/$(tc-getRANLIB)/" \
-		src/Make.inc/Makefile.inc.i686_pc_linux2 > src/Makefile.inc || die
-	use int64 && append-cflags -DIDXSIZE64
-}
-
-src_compile() {
-	emake -C src CLIBFLAGS=-fPIC
-	static_to_shared lib/libscotcherr.a
-	static_to_shared lib/libscotcherrexit.a
-	static_to_shared lib/libscotch.a -Llib -lz -lm -lrt -lscotcherr
-	static_to_shared lib/libesmumps.a -Llib -lscotch
-	static_to_shared lib/libscotchmetis.a -Llib -lscotch
-
-	if use mpi; then
-		emake -C src CLIBFLAGS=-fPIC ptscotch
-		export LINK=mpicc
-		static_to_shared lib/libptscotcherr.a
-		static_to_shared lib/libptscotcherrexit.a
-		static_to_shared lib/libptscotch.a -Llib -lptscotcherr -lz -lm -lrt
-		static_to_shared lib/libptesmumps.a -Llib -lptscotch
-		static_to_shared lib/libptscotchparmetis.a -Llib -lptscotch
-	fi
-	if use static-libs; then
-		emake -C src clean
-		emake -C src
-		use mpi && emake -C src ptscotch
-	fi
-}
-
-src_install() {
-	dolib.so lib/lib*$(get_libname)*
-	use static-libs && dolib.a lib/*.a
-
-	insinto /usr/include/scotch
-	doins include/*
-
-	cat <<-EOF > scotchmetis.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: scotchmetis
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch
-		Private: -lm -lz -lrt
-		Cflags: -I\${includedir}/scotch
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins scotchmetis.pc
-
-	# not sure it is actually a full replacement of metis
-	#alternatives_for metis scotch 0 \
-	#	/usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc
-
-	if use mpi; then
-		cat <<-EOF > ptscotchparmetis.pc
-			prefix=${EPREFIX}/usr
-			libdir=\${prefix}/$(get_libdir)
-			includedir=\${prefix}/include
-			Name: ptscotchparmetis
-			Description: ${DESCRIPTION}
-			Version: ${PV}
-			URL: ${HOMEPAGE}
-			Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch
-			Private: -lm -lz -lrt
-			Cflags: -I\${includedir}/scotch
-			Requires: scotchmetis
-		EOF
-			insinto /usr/$(get_libdir)/pkgconfig
-			doins ptscotchparmetis.pc
-			# not sure it is actually a full replacement of parmetis
-			#alternatives_for metis-mpi ptscotch 0 \
-			#	/usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc
-	fi
-
-	dodoc README.txt
-
-	if use tools; then
-		local b m
-		pushd bin > /dev/null
-		for b in *; do
-			newbin ${b} scotch_${b}
-		done
-		popd > /dev/null
-
-		pushd man/man1 > /dev/null
-		for m in *; do
-			newman ${m} scotch_${m}
-		done
-		popd > /dev/null
-	fi
-
-	use doc && dodoc doc/*.pdf
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* tgt grf
-	fi
-}
diff --git a/sci-libs/scotch/scotch-6.0.4-r2.ebuild b/sci-libs/scotch/scotch-6.0.4-r2.ebuild
index 9f16ee0554d2..09ea23318f8d 100644
--- a/sci-libs/scotch/scotch-6.0.4-r2.ebuild
+++ b/sci-libs/scotch/scotch-6.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,26 +7,28 @@ inherit eutils toolchain-funcs versionator flag-o-matic multilib
 
 # use esmumps version to allow linking with mumps
 MYP="${PN}_${PV}_esmumps"
-# download id on gforge changes every goddamn release
+# download id on gforge changes every release(!)
 DID=34618
 SOVER=$(get_major_version)
 
 DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
 HOMEPAGE="http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/"
 SRC_URI="http://gforge.inria.fr/frs/download.php/${DID}/${MYP}.tar.gz"
+S="${WORKDIR}/${P/-/_}"
 
 LICENSE="CeCILL-2"
 SLOT="0/${SOVER}"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc int64 mpi static-libs tools threads"
+IUSE="doc int64 mpi static-libs test tools threads"
+# bug #532620
+REQUIRED_USE="test? ( threads )"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	sys-libs/zlib
 	mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${P/-/_}
-
 static_to_shared() {
 	local libstatic=${1}; shift
 	local libname=$(basename ${libstatic%.a})
diff --git a/sci-libs/shogun/Manifest b/sci-libs/shogun/Manifest
index d5ce0126646d..476c2250092a 100644
--- a/sci-libs/shogun/Manifest
+++ b/sci-libs/shogun/Manifest
@@ -2,5 +2,5 @@ AUX shogun-4.1.0-remove-C-linkage.patch 825 BLAKE2B c95a7a322b669aa51a9a33470088
 AUX shogun-5.0.0-fix-buildsystem.patch 2889 BLAKE2B 63593dcf5f077310c31983446d5060c15c23d45d3eb5e3780c0d7a53074ccef57da79fb115ce67b109ed94f2e58aa1e5804bdbd1d0d0a13c05de716de7ed1058 SHA512 3119a95e8fe76804eb113361e09260bbb951679faeb3360d378c0a9afcdbf322ac75f02da6e4c799102949abbd97006f2bbb7550b5f5b01fa8b4335ac530f377
 DIST shogun-5.0.0.tar.bz2 2448509 BLAKE2B 85352d782740b4c671bb6081e0445bb7e801e27e36fdc0f82658b937fd6658c41016e4a91841ddb09ae9062b77d32f290f56b191318c1c34bf0812d1b9a8b364 SHA512 fa8d9dee4596acce12022540a6927cbdb62e08f8468c8be3790de07ebf3a53055032bcc532b28334ca83284c38f2b0153602634f12bafe4019acb9121b9ff236
 DIST shogun-data-0.9.tar.bz2 287533841 BLAKE2B 796830262205961b88715f4eb60a47ff2ad108426b7af8e4e1a0733920962ad8154a1ab9892356e9793be24d415fcbc358960210f089a0173f55a0091ea3c0d1 SHA512 ab501640e2db650603899c857866b451fac5c7bbbc7b4ef98559581928869cea49aa326dfca1bb398eee7ebc8843dcc8ee3105c9f462718f1af672aac6b9340a
-EBUILD shogun-5.0.0-r1.ebuild 3949 BLAKE2B 463854879e2d7a446ad0b655b0d9a702783c5ecb1247c2403ee9e0f40b02fa562671007b4d3335c547d4ca1449d472045430cda4c7325c9cd232fbf849fd39ad SHA512 b0a8e38dfb714f128c52ce61d2bae4f4dbd61deefd2b830d97d1172eeec469f251e13e657992e2e2a97fb55da5140fba477e8ce4dc4f3a5659141b7ca42f60e1
+EBUILD shogun-5.0.0-r1.ebuild 3951 BLAKE2B 41165437edeb2f42204323c59cef31013e2decb0b2666b64baab9c8f6ab1382a9d5467f8dd52f4f67f31e242b15a4eecf94af19283289b3a0be49d3333bde74d SHA512 4e3136be78a8f23a75f340625bc9ee12b68ad929e6fdae491e8cf49d0ca73fee48abf0536af2932cb04659d0454d4e4b2428f6a778a206dc8ce866ea80c93c42
 MISC metadata.xml 1627 BLAKE2B 871fc71cd8ae67ef94fa060b50f249b233333ec934db4d8ad238f24408e491f071d1271903f57ad2548923b2091c0f2738a7ce3f269d5c24fd10300aaf179047 SHA512 babaf4f8a5d4a7d83e678d2ba1cb4f29a15a928740e7c2b312fe03ffd2c909f1f867a071573954269a03bd8f915f38f82c4c11782573ae08be6ec053cf3b54c6
diff --git a/sci-libs/shogun/shogun-5.0.0-r1.ebuild b/sci-libs/shogun/shogun-5.0.0-r1.ebuild
index 1db83f206fad..d4e67145a5f1 100644
--- a/sci-libs/shogun/shogun-5.0.0-r1.ebuild
+++ b/sci-libs/shogun/shogun-5.0.0-r1.ebuild
@@ -72,7 +72,7 @@ DEPEND="${RDEPEND}
 	python? (
 		>=dev-lang/swig-3.0.12
 		test? (
-			sci-libs/scipy
+			dev-python/scipy
 		)
 	)
 	R? ( >=dev-lang/swig-3.0.12 )
diff --git a/sci-libs/ufconfig/Manifest b/sci-libs/ufconfig/Manifest
index 6d46fdc5ba3d..4bfb4c8d05dc 100644
--- a/sci-libs/ufconfig/Manifest
+++ b/sci-libs/ufconfig/Manifest
@@ -1,3 +1,3 @@
 DIST UFconfig-3.7.1.tar.gz 8523 BLAKE2B fee3520b4c1305c4684ef4d0fd6cbcc27cd6db957b838642241f75cd6de4468fb5dd61282a0c1484318e56c5b06b8354a78eed2e6df6a5d21e4250883ad1c42a SHA512 a9d562205b6d047d8064d6f61e4f9fdb782774637f0522abef6031e8633c7372db108c69b48098e8b41ffdf786ce7bda0d8df9a3dee634dfb11b5e6073996a22
-EBUILD ufconfig-3.7.1.ebuild 1581 BLAKE2B 043af8bec29a738399339390a9bd561afb9280f2797aa081b677d1969dccd4e55d8b48d0180bc9353d0598387c852e29f2b3f2b8b94485b240eedc5ec2c101b5 SHA512 17a5b074504254fd10b9bbe6be9fe6797a9bc0b4165482bf53c4b42c1940998a8fcccb268cb6581c8b0730d99d3ccaba12f5f64e54f962d20412037ea202e99a
+EBUILD ufconfig-3.7.1.ebuild 1616 BLAKE2B d5d1d7b2b76e78b3840e5596ca3e0c82ecff02a560e37acd2f169e5f48ee842df06cb05651cf5bdf9ed5d092231c5bc8815e28f09099aaf3a33bbc3cc5b7e4b9 SHA512 e897064043d3678f0547a8d7020cf9e62abc7d46d8a78e8982ca0fe11e960dd246c06773829fad32e72a23168df34a3142d341c9db7090be95618472a93f1d52
 MISC metadata.xml 455 BLAKE2B ef292722ed6835d852c0eec069e85bde94e717df3b834ebced68ae5a0d63fce105b2d6c7beb8aeff495b054ac849017cb3d5c1a47643f2058feef549bba4991e SHA512 e5e8a1c204cb3651501705adcd10789c9a1e093ade44625745f0c40244f6fab7c7774da47d23a7eb0f7aa23adb1074bcc80335385567cd41ffee0c130a14900d
diff --git a/sci-libs/ufconfig/ufconfig-3.7.1.ebuild b/sci-libs/ufconfig/ufconfig-3.7.1.ebuild
index 0481ccd35d98..4298dfb1fab8 100644
--- a/sci-libs/ufconfig/ufconfig-3.7.1.ebuild
+++ b/sci-libs/ufconfig/ufconfig-3.7.1.ebuild
@@ -1,35 +1,39 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit multilib toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 MY_PN=UFconfig
 DESCRIPTION="Common configuration scripts for the SuiteSparse libraries"
 HOMEPAGE="http://www.cise.ufl.edu/research/sparse/UFconfig"
 SRC_URI="http://www.cise.ufl.edu/research/sparse/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="static-libs"
-DEPEND=""
-
-S="${WORKDIR}/${MY_PN}"
 
 src_compile() {
-	echo  "$(tc-getCC) ${CFLAGS} -fPIC -c UFconfig.c -o UFconfig.lo"
+	elog "Running: $(tc-getCC) ${CFLAGS} -fPIC -c UFconfig.c -o UFconfig.lo"
 	$(tc-getCC) ${CFLAGS} -fPIC -c UFconfig.c -o UFconfig.lo || die
+
 	local sharedlink="-shared -Wl,-soname,libufconfig$(get_libname ${PV})"
-	[[ ${CHOST} == *-darwin* ]] && \
+	if [[ ${CHOST} == *-darwin* ]]; then
 		sharedlink="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libufconfig$(get_libname ${PV})"
-	echo "$(tc-getCC) ${LDFLAGS} ${sharedlink} -o libufconfig$(get_libname ${PV}) UFconfig.lo"
+	fi
+
+	elog "Running: $(tc-getCC) ${LDFLAGS} ${sharedlink} -o libufconfig$(get_libname ${PV}) UFconfig.lo"
 	$(tc-getCC) ${LDFLAGS} ${sharedlink} -o libufconfig$(get_libname ${PV}) UFconfig.lo || die
+
 	if use static-libs; then
-		echo "$(tc-getCC) ${CFLAGS} -c UFconfig.c -o UFconfig.o"
+		elog "Running: $(tc-getCC) ${CFLAGS} -c UFconfig.c -o UFconfig.o"
 		$(tc-getCC) ${CFLAGS} -c UFconfig.c -o UFconfig.o || die
-		echo "$(tc-getAR) libufconfig.a UFconfig.o"
-		$(tc-getAR) cr libufconfig.a UFconfig.o
+
+		elog "Running: $(tc-getAR) libufconfig.a UFconfig.o"
+		$(tc-getAR) cr libufconfig.a UFconfig.o || die
 	fi
 }
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-23 10:22:15 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-23 10:22:15 +0100
commit	8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree	230f3135ceaace633cf93e9838b185c4a6664c2e /sci-libs
parent	9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)