gentoo resync : 13.06.2020

90 files changed, 694 insertions, 1561 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 56dfc79b3152..20af60d3fbc6 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/alglib/Manifest b/sci-libs/alglib/Manifest
index 4b7d41084f0e..d37d206ede6b 100644
--- a/sci-libs/alglib/Manifest
+++ b/sci-libs/alglib/Manifest
@@ -1,5 +1,5 @@
 AUX CMakeLists.txt-3.8.2 1159 BLAKE2B bd12bd65ddc7e60d1e84b04d5c01391420accf099f17801680446856e817bd606315ee54a44b0bd559fe0a9fce35dfab8b9dfa2dd7edc406d57563ea0f77999a SHA512 193661b9f949972048132bc07b4619c2f0d38135d6f0030621cd8aabf87e9e78a6bec18cdb4fb9cb9e547fee9f4387e21ba3a02d45c41033a9c0be9221cf7d3c
 AUX alglib-3.10.0-disable-minlm-test.patch 709 BLAKE2B 160bd6a598eb9c822b16da6455bae980cf6bfd77c9889c0d2385b896ec502030741c1f6a929f48a49c73fe35e696cf83b97d72a007e91899bd61d369b195b9e9 SHA512 00d62278a65f30d97dd7df8ac20d17dbc40117c25e2cef64652f2afd0bda7c277f8600ccfa7036da8a4a4173e0f0f433d898b87c04ab6d2d89e2547f8a305ee9
 DIST alglib-3.10.0.cpp.gpl.tgz 1991101 BLAKE2B 884b80becce676285b7bc1f26ed8917c4c82f53b41c0350dfc8bff6573e2e6f12183e82fc317b54a8021b1f931eb7d5b55944902d0816f7097fdc05632128bdc SHA512 f02b3db5ab8dee841f27186b6693997c4e6876e75310b0a31a04593dbcb41d300920404e32e7aecb39c8dd15e54cfee05b725caa27397a67b453f6e64cd1ef5e
-EBUILD alglib-3.10.0-r1.ebuild 745 BLAKE2B 1d77135cb47c82ee77da0a636c323d5f7089604a6bdbca4342b6c28cf449add451f18445d55b121bf4d9a11a580259907c3115602f8b3ed8bf9049873fae12f1 SHA512 44365e9f263d6159742b154c738343e3be154b0855b8e0398bbab5ec4e7c576a36ac46ecd10fdad9f10baaaade08d8b226f4343746ac6c42b8c4469cec070827
+EBUILD alglib-3.10.0-r1.ebuild 747 BLAKE2B d308644af5f0d8cd54e3b9d97d0cfd7bb5904a6994509a2d1316710833d6f59433a021b44e01e5aa58048622f5dabcf20c2e4aa5ab5f1c1120273b45d2feeed7 SHA512 cb9cf3f23a1b13377eb15db1e6c37835eaa5ad9957cdcedaf6391725061bc0e233b8e6924edc7c0a63a3bbc3477f03a780c206538816625dcd32148424993270
 MISC metadata.xml 1592 BLAKE2B 96df655b24fc1e27a90f6a31388135e9ec14965eef850c14468797dbb19670ef4695219459b2af337613a92cc25a7eb12a1b07f95a3e1e4b058d9f9c38ded770 SHA512 e16165304d85c3201c428b46bb85006281a2faac170f6b7f2966bc683f57387a0d4b68eddd6ad2d4ed9d26af992f4f9b2616c761f0bf1102c6749a8025478844
diff --git a/sci-libs/alglib/alglib-3.10.0-r1.ebuild b/sci-libs/alglib/alglib-3.10.0-r1.ebuild
index 0c87b718bd2d..234a3c9e71fa 100644
--- a/sci-libs/alglib/alglib-3.10.0-r1.ebuild
+++ b/sci-libs/alglib/alglib-3.10.0-r1.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=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit cmake-utils flag-o-matic
 
 DESCRIPTION="Numerical analysis and data processing library"
-HOMEPAGE="http://www.alglib.net/"
-SRC_URI="http://www.alglib.net/translator/re/${P}.cpp.gpl.tgz"
+HOMEPAGE="https://www.alglib.net/"
+SRC_URI="https://www.alglib.net/translator/re/${P}.cpp.gpl.tgz"
 
 SLOT="0/3.8"
 LICENSE="GPL-2+"
diff --git a/sci-libs/arpack/Manifest b/sci-libs/arpack/Manifest
index 7eea9e4c3d23..1f2d52aed235 100644
--- a/sci-libs/arpack/Manifest
+++ b/sci-libs/arpack/Manifest
@@ -4,7 +4,7 @@ DIST arpack-ng_3.1.5.tar.gz 1516406 BLAKE2B 14dea27dbe7d17144871c62db58467642f46
 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 1355 BLAKE2B d0d678d83c207f139008dd307a4f47f27d7f3161f525826490e0037bae021112802746629b064fc808c399cf14b11ef1fd5c554aae8cf2067b580fedb49d12a8 SHA512 12284a85d1434db427bb29ab589116667f4e388eac59eb19a0184f14f64c496052c6ae28cd8be189677b3b849aeddc5ad698c4b16fca2d2ea54cf9e876a8eaea
-EBUILD arpack-3.5.0.ebuild 1360 BLAKE2B f27b73327d50e85de51733c5b1ff4348c39a805fbd22112d57fab68ebe62e46655610f59d4b82df67da7e37bf4a10fb497b59a50de4f4df64d1cb9bb01a4a17c SHA512 4e858b3a711180820c423a57bf977c90947b162f458ed74cc85904d844d6efb0422af3a9c3e8aec03cd3d2c708bff1f99ec74d71a47ca77dd0f21085382b380b
-EBUILD arpack-9999.ebuild 1310 BLAKE2B d1153a2ab23165a18266ea7c7dcbb78a55a816645dbb0f37c0a9ed065fce28cd49af53b50a7b6314d79bcffb1e3c9aa4e942752dd2fc4cdcc3ac883671ee1bfc SHA512 83fff44b0d876d88b5836d4c3a1bbbaf05834e31a8914e57e130ea574c14bfd094d3dd64502924bb50c802a008d1d42f97b9634d8ed5211f9e8ee27b265bb98e
+EBUILD arpack-3.4.0.ebuild 1409 BLAKE2B 42a9a3d01a7fc373ee4c3edc4ab8edb205f9eb8c816fea15e0aff395d92bac6fbead0d1a9be0ac59259c9c3c338821f9934f8e65aeaf02e09055a46609a48ec0 SHA512 07ee37e88468f532e57845940215c095cbdf44ce29fb653be6b501358b10b3740ccf6d623d39b94ab24daf65789959863826e16361425506e0c7fbe93e246b21
+EBUILD arpack-3.5.0.ebuild 1416 BLAKE2B f39c101a99897fef9b47f810a6b96dea1501ab513d6a5c6ce363299d4b2a2543e472ca3a6fc7e900e73b549e194e43ad3501027961434ae9351964ac99b55582 SHA512 ecf01e335a5319330c2bf5f2021797cd80ee84afa867917da5ae6040dc3271eebf28cc7c256bb3e82e993d5508cc64eb97c77e23fd9c20d4f344dd74cc32e9a0
+EBUILD arpack-9999.ebuild 1310 BLAKE2B 2220a5ae7998bde895b498b9ae9df4546f29e2ef0e2264c33ac0de7f63661af860c7d52656e3f04d6d69759d34de280bf7236a8e96e078b8f5ade48a70ce0356 SHA512 cb88ce20b40c71a78a163187d91760faf999bd7efe537de36cd59e797c5e3f1b647f740e9acad2fb80e307ab6f89bfd628ccf13f04647ac671d3a7823a7c6407
 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.4.0.ebuild
index bdb9445f39b9..0b424e228681 100644
--- a/sci-libs/arpack/arpack-3.4.0.ebuild
+++ b/sci-libs/arpack/arpack-3.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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
+inherit autotools eutils flag-o-matic fortran-2 toolchain-funcs
 
 DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems"
 HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/ https://github.com/opencollab/arpack-ng"
@@ -33,6 +33,7 @@ src_prepare() {
 }
 
 src_configure() {
+	append-fflags -fallow-argument-mismatch
 	econf \
 		--disable-static \
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
@@ -47,11 +48,11 @@ src_install() {
 	newdoc DOCUMENTS/README README.doc
 	use doc && dodoc "${WORKDIR}"/*.ps
 	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r EXAMPLES
+		docinto /usr/share/doc/${PF}
+		dodoc -r EXAMPLES
 		if use mpi; then
-			insinto /usr/share/doc/${PF}/EXAMPLES/PARPACK
-			doins -r PARPACK/EXAMPLES/MPI
+			docinto /usr/share/doc/${PF}/EXAMPLES/PARPACK
+			dodoc -r PARPACK/EXAMPLES/MPI
 		fi
 	fi
 }
diff --git a/sci-libs/arpack/arpack-3.5.0.ebuild b/sci-libs/arpack/arpack-3.5.0.ebuild
index 91539e12556e..097be6e89f8f 100644
--- a/sci-libs/arpack/arpack-3.5.0.ebuild
+++ b/sci-libs/arpack/arpack-3.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils fortran-2 toolchain-funcs
+inherit autotools eutils flag-o-matic fortran-2 toolchain-funcs
 
 DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems"
 HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/ https://github.com/opencollab/arpack-ng"
@@ -33,8 +33,9 @@ src_prepare() {
 }
 
 src_configure() {
+	append-fflags -fallow-argument-mismatch
 	econf \
-		--disable-static
+		--disable-static \
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
 		$(use_enable mpi)
@@ -47,11 +48,11 @@ src_install() {
 	newdoc DOCUMENTS/README README.doc
 	use doc && dodoc "${WORKDIR}"/*.ps
 	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r EXAMPLES
+		docinto /usr/share/doc/${PF}
+		dodoc -r EXAMPLES
 		if use mpi; then
-			insinto /usr/share/doc/${PF}/EXAMPLES/PARPACK
-			doins -r PARPACK/EXAMPLES/MPI
+			docinto /usr/share/doc/${PF}/EXAMPLES/PARPACK
+			dodoc -r PARPACK/EXAMPLES/MPI
 		fi
 	fi
 }
diff --git a/sci-libs/arpack/arpack-9999.ebuild b/sci-libs/arpack/arpack-9999.ebuild
index e81afe18fb49..e295ad66c2cd 100644
--- a/sci-libs/arpack/arpack-9999.ebuild
+++ b/sci-libs/arpack/arpack-9999.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=7
@@ -47,11 +47,11 @@ src_install() {
 	dodoc DOCUMENTS/*.doc
 	newdoc DOCUMENTS/README README.doc
 	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r EXAMPLES
+		docinto /usr/share/doc/${PF}
+		dodoc -r EXAMPLES
 		if use mpi; then
-			insinto /usr/share/doc/${PF}/EXAMPLES/PARPACK
-			doins -r PARPACK/EXAMPLES/MPI
+			docinto /usr/share/doc/${PF}/EXAMPLES/PARPACK
+			dodoc -r PARPACK/EXAMPLES/MPI
 		fi
 	fi
 }
diff --git a/sci-libs/btf/Manifest b/sci-libs/btf/Manifest
index a65f45059888..f3d01a84db48 100644
--- a/sci-libs/btf/Manifest
+++ b/sci-libs/btf/Manifest
@@ -1,5 +1,5 @@
 DIST btf-1.2.0.tar.bz2 290915 BLAKE2B b9bd3781bfd4fc4924ffb7ee52dc517a6f2ee169daca2a254510d4fddbc9a312fb40de4cadb9ac119c1dee6e3042e9c349ca805f509a958613472f1e423a7bea SHA512 4c2dcd5abf7a72485267a666e679545a5bfa8a20dfbf75a939c92547bdf960d40b6ae93cad23ac44f791e515a13f26c1dae446d3ba6e89b3d1f87d91d4dba50c
 DIST btf-1.2.6.tar.bz2 285699 BLAKE2B 4addeea7b9abe87281f826a67a8a372118579f498057c888008ac93da1cdbfcf8554af6e843d92a07989ff0b24f537588f933fcc33c97317f47536980e551531 SHA512 39c08ec9bf2a85915aeed040dc02c42c10adf5034c3797910dc7cb6942ac6e2ccea47cea4ab0c37e8ed3eb8eac8d2ce946d281c9ec643cccd282af7be5276960
 EBUILD btf-1.2.0.ebuild 542 BLAKE2B 0c68190981b2db131e18e5c1084e0d5e6fa1db4aaa33ce417078f88b028452ca9bbc4f50b68c14879cc12e0255a1c79178621c5c025251b6f1acba71cf014a4c SHA512 740f280706e53eb3f3803dd1c6c8a9cfbc8044c4125191a68d5134c851946852553bdd0011ad38b45e2725d33b57c5a705c35f769dd61a2f990c532e0daa0b5c
-EBUILD btf-1.2.6.ebuild 576 BLAKE2B d1764b2aa02fc114ad8bb562d1c44a6669cf3ee7442ca12cfeb2dc16476a06eba50d38a49627a33aa984c8e5c0a2147b62874c568c72d357a48be104a8b9882a SHA512 cc43c214d7d31a7d2da737f513f580a9c391aa8a8cd0050065be569d5ddd8dcca6458ec9d789454b31efffe2dfae34d54b8b433f0105843ff78f1fbc05973a2c
+EBUILD btf-1.2.6.ebuild 583 BLAKE2B c16851dd487b6d30936c4dc242bf6832477bf3e770c19e8da3a195c8fcfbdd77b45f9dbf0c040147b5ea01912dbe6e385aafd64ff6691ebc7b333c9ed4987bdd SHA512 7131c4cd6d69b6dfb13acf854475cd943a63bcc7d3898c187f2b04a1a25ce4acd4c1f0871ae11423133a6545cdcd4d2b765bbfae1b3deb6f58cbaafd1d406905
 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 085477593c5c..6d1b0659d374 100644
--- a/sci-libs/btf/btf-1.2.6.ebuild
+++ b/sci-libs/btf/btf-1.2.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest
index 0fb37542e657..04e5bc622aac 100644
--- a/sci-libs/cxsparse/Manifest
+++ b/sci-libs/cxsparse/Manifest
@@ -2,5 +2,5 @@ AUX cxsparse-3.2.0-header.patch 531 BLAKE2B 7b8738c26a48aa01541db4978cc195f093da
 DIST cxsparse-3.1.2.tar.bz2 2004570 BLAKE2B 4f1874e83faa1d831fce3847b82aeb67ae96e59b635489eceed3ed08a0fd0aaef7b0c9e40142f96ae5c7820a75bfb58b4d6a741c742b5a85dd6d8e4d78960be9 SHA512 dd3c5e31997564387b6145eaf2069c01e2ae8de384cd775a13ac7ccf03a83b6d0b8bf156a6645547f230dd13fc159d14203a4adcbe65703c154f35ecb161b6e9
 DIST cxsparse-3.2.0.tar.bz2 2080196 BLAKE2B 9b89469c45e518077c4348ad3efd8d89d248e4c039057c0286ee44b493ab595075894d01530cbfbe845b91ef5e43cfbfdd102721cfeefe943a1cb4bc5f171843 SHA512 9931dac5b319b61a39ccb5f34309acb4240602b5f55d029c790ed0b7319a373cb925c4b83994526af4bc5b19b88c723f04581068d1fc80960a290c9d6d1e1aef
 EBUILD cxsparse-3.1.2-r1.ebuild 753 BLAKE2B a3d892c3b4d585445b255ec89283b610964cf7e87bdb65a8920cebcc7c947e206bd374e6a235051c46e01afffe826ec2f4f872531bf2473ecf2fbaf30e4d34d5 SHA512 48404fb91b86177ed8c275ac1936cd03e20217e3927ac06a93c112a683040cddb5fbd5c68f954f65ef6413a5233ee1524df5dd02213d092699ff08cfa535e7e3
-EBUILD cxsparse-3.2.0.ebuild 804 BLAKE2B d8b006c157f231ea2921db2ef6c385cb04616869125a5b8cc75635f8ad8cb001bbfac734745babacb4447c5209564a2d02d1b6e7423ca759c5957e4b5b5b06ba SHA512 d3ae803a2617814ffcd4cab52e830a2412e9a6395889d1da17af9461b60e99c57d5d7d6e6136820ba9f6d7e24d2478e733fc547b4dae2d02559fe51a63546cce
+EBUILD cxsparse-3.2.0.ebuild 811 BLAKE2B c3b57bd6d8cbb18f08d37cbac82eaf2f74739b296fae3e932d4f27dae73cfd7e3307bc3f532f7790c6457e25af07c3fb663bf8bfc6c6e11fc67575ed3b42c3de SHA512 1e88738b5bb8ad0a57774f7c6fa37ef426127c34854611388879e7158fc1a7e144a59347a47790223a7b6f77ec87f50cb9f3771c2781faa6bfae863b42110193
 MISC metadata.xml 449 BLAKE2B 18e0d692b302702a20ecfe5ae10b8d48de7582649feeda3fe9c0bbcbbf6e6876f620bd490dabf788276a378d60b3bd0c1ee19a6fa439f37dff9269e8fd74d12d SHA512 908237dbe24a16831fc04faaff76d06bc4f0ae8605a551a98763d72ecbd19dcdbf2c74f320ccaf296c69bcacb3cda51b600ca0a9a8b481858723c2dd34a3754c
diff --git a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
index 5c8ca14041e8..0abd3b6775cb 100644
--- a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
+++ b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index e96e05f8d6ab..5e197d86a26b 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 5116 BLAKE2B ad49b4166826e292ba7efebf8533e938edf8073b62079134ebf6fea63f22cdc7621721ae4815ab6aff10d6247014a5f9cced41c61f4a4ff0c78dd3290aa39be2 SHA512 26cbd0e61fcd81a582c364cfaef4352ce9a9b8339d1680e84a27be67c0d406d4cebd77862eed187b752821ed6dfabd6766857e23d9a55ce989c5afbd2601bc1f
-EBUILD dealii-9.2.0.ebuild 5232 BLAKE2B f6578f1f2a2589ac417273e02d1c035a49cfb555756d07960ccd71405c1bfaa87c6587ef6d6727e4934c5835b958a1a97b3c2b26806cb1fc4e76938228a93761 SHA512 07d9ef7b9f3e6a12cf0309e6559ad39fb323be87c1efd70721f44348e0a8de67d57b33233cab21ec3892c823fd57159dd13ac5aa8f7d6dee74ee4879564a9a62
-EBUILD dealii-9999.ebuild 5232 BLAKE2B f6578f1f2a2589ac417273e02d1c035a49cfb555756d07960ccd71405c1bfaa87c6587ef6d6727e4934c5835b958a1a97b3c2b26806cb1fc4e76938228a93761 SHA512 07d9ef7b9f3e6a12cf0309e6559ad39fb323be87c1efd70721f44348e0a8de67d57b33233cab21ec3892c823fd57159dd13ac5aa8f7d6dee74ee4879564a9a62
+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 5233 BLAKE2B 0883544d93f43cec78bbbb45a2eecaa817d932bcf4aacf22347cb4a52d62b1fb3d5b44a0ccba7b426c3279807c67e8fd74e21c3f2e418270331a97c3e903172c SHA512 0b2269670e392941aed4a37235979f6e39ac15474e94caba55752563c2c8c945b7dd19173abe3518c2ef6560a4f15e6b31ddc65423e5a53f5e67b59d02b526f6
 MISC metadata.xml 2636 BLAKE2B 904145ebd056a89ab5a376c38b2c132275303a575d987259f4b0de9bd016fa6194a31b995ed2c516a315367b40300875f769297451768e3f0c659fcd97a8fd9d SHA512 631e38056db1583ed6966110a9b6f6ae83dca41a573040d4f9e0d5fc56dea3052bcb6893b80419508f3d5adc3dad79eb95a5e3e15feed831e7a064c2f5dbaed6
diff --git a/sci-libs/dealii/dealii-9.1.1.ebuild b/sci-libs/dealii/dealii-9.1.1.ebuild
index d3dc212526bc..e575e5ad533f 100644
--- a/sci-libs/dealii/dealii-9.1.1.ebuild
+++ b/sci-libs/dealii/dealii-9.1.1.ebuild
@@ -11,7 +11,7 @@ inherit cmake-utils eutils multilib
 CMAKE_REMOVE_MODULES_LIST=""
 
 DESCRIPTION="Solving partial differential equations with the finite element method"
-HOMEPAGE="http://www.dealii.org/"
+HOMEPAGE="https://www.dealii.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
diff --git a/sci-libs/dealii/dealii-9.2.0.ebuild b/sci-libs/dealii/dealii-9.2.0.ebuild
index 14d898de7089..c13b60b49523 100644
--- a/sci-libs/dealii/dealii-9.2.0.ebuild
+++ b/sci-libs/dealii/dealii-9.2.0.ebuild
@@ -11,7 +11,7 @@ inherit cmake-utils eutils multilib
 CMAKE_REMOVE_MODULES_LIST=""
 
 DESCRIPTION="Solving partial differential equations with the finite element method"
-HOMEPAGE="http://www.dealii.org/"
+HOMEPAGE="https://www.dealii.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 14d898de7089..c13b60b49523 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -11,7 +11,7 @@ inherit cmake-utils eutils multilib
 CMAKE_REMOVE_MODULES_LIST=""
 
 DESCRIPTION="Solving partial differential equations with the finite element method"
-HOMEPAGE="http://www.dealii.org/"
+HOMEPAGE="https://www.dealii.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index 469912daa2f4..1b07c09561d0 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,9 +1,5 @@
 DIST dlib-19.16.tar.gz 10411975 BLAKE2B 93047590a4d8f4685970d3db6841cbf9cc90ca8a5e50f0929a106d887e5db1b4fd96bbe14380537a3e28369a8db6d9d8c067e7768000ac3c7d0f225b46369326 SHA512 4e040ef88acff05e1a48e499b813c876b22ad3f989d076bdf19969d01036b62e51a0dff30b70046910ba31dfa1b1c2450a7fad41ae3142b7285ed74b8d584887
-DIST dlib-19.4.tar.gz 7226923 BLAKE2B 2d72936fc46d559a80288e7f88a64c372fb5f8dcfc69b57abee8a27519f3084fa0cf4193261dd9758f9eb718e755d46a17655e38cb74aaa0046855f11676e157 SHA512 23bf80353f9b6ce07b6a3a7df05016705645c18bcf2b3ead567935008ea12c9f6dc0722d9bbacc009bd26f78eb43c1cbecf776bfed5a3445c1f2e8e208f201e2
-DIST dlib-19.7.tar.gz 7670615 BLAKE2B 13343f3b99bf5dd7a9c032de09eff47f1675bbc978a93edfbd952196b2347e4a887a8eed805f22985477b10ecfa1df85fc568e32f1a00b17b0292a0a51db9764 SHA512 a3877066e04a411d96e910f4229c60a86971a9290e840aa4a5b2f0b102e9b8c37bfede259b80b71ba066d21eb0aa2565808e51d0eab6397ff5fd2bac60dcedd5
 DIST dlib-19.9.tar.gz 8892457 BLAKE2B d18548e09f8169bbc9d7f339599bd58b940410839b259a8d7be9cb999f82e634ad5cd0539adb45239dab821ea1029493d24ae9990ca32c75c744e2c5d9e218f6 SHA512 1e2123c22e1b13cc84108fa627bfa92eadc9dee63f93a9f45676bbf2b752c8728117d915ac327f5223b0cdbce87dd3bef2f4d8d5ed3f8f5a314ffa9e8962a246
-EBUILD dlib-19.16.ebuild 2975 BLAKE2B 4ded3ab6329c15b3ab34765bb69c4cd7f48bd2e24315b6eea7136a0685309ece5eae7541ff1d8d0b6dde110a9c98675ef7a8a3ddac4b9bb0427c1cdcc7cee866 SHA512 359ef635af4ca95b541e4205092afbe00e5d753f45f7e9d3103ea7bd5012d931bfa97a8d2b3cf98545f966644cfef325d9fe23e2e3bfa3f7cb2fc494a4d3f602
-EBUILD dlib-19.4.ebuild 1821 BLAKE2B 22b259faf3b3eb0ae4ce4fbd0930f81f2ef0ac79a249c8af45a23476e290ab08ce6b27c9bf918890bf7e994994eb6371f5a16fb2dc4cbbe698ae2b16a739d83e SHA512 a56e6c3b13248450dfbe243b561873d1147e2d3a94832c5d092934868c3e0233b4b90b95ba2b1c57d8362605b065c208c860024e4026ba71670038b7b2eb2dc9
-EBUILD dlib-19.7.ebuild 1819 BLAKE2B 3e259e1dfb027149dcff41ffe2dc861e3072991755d3d7a545fffc6a61f844566e02a9482305472cc62cf7623c8eec6c7794afe26cef9b2983cd6a0327760ba4 SHA512 993f94efc9712bac9bcd584bf6e8d918d7638fd6d2a13d127c8f41c484d9fe4c10c40063c2516925a543f4e6894c639c858cc8416162d9f8aee4b27c71011e43
+EBUILD dlib-19.16-r1.ebuild 2843 BLAKE2B ae97763c222aff271a8726f9aa2b0653b9a3f7a9952f45e7715e2a3b175c7cf46ed780463e767e6f0ec11a9307d0d7c933a72a0b4335cecb109cb34cea9fa5b7 SHA512 0b201837d08d22452e8b292bdb8f0fdea967b8e4758fe1c0b6bf9dc4d599bab7fb88a2ec01886e0f306f263327207b16c60d80ff3f63c1c0723e8498699828aa
 EBUILD dlib-19.9.ebuild 2062 BLAKE2B 8d693459b90472916c37d9d20febf48c7120116d368346277926e7ad9ec5b0aa3c5ccdf9f1d7e1cb62ff22b7cb8fcf269ab43087b51a3d149be79f002db54db0 SHA512 370d72e972404a9a709dd499203abb7652f85126cda4b400dc59d1396badbeb331a117120889eae0835eb7fe311cae4bb11f6c0f590dd2fa3fe05d7383822a6d
 MISC metadata.xml 1002 BLAKE2B 899d622186d6ed4ab0c8c448bdbe312be12f0eeeec5e4d4ae031de4dcb26d73f0489b697375893d4c4bd16651c6b2d40ac156b67be0b376ec270d7d99a6f465a SHA512 1977d192107b78b97d5336d3e5b2e43a7ea12ede631a864ce14aeab2f9d328526f815fab0d62ae1417842cdfe9e1e7c0494fcf79be535dbfc4e3ca9342447b5c
diff --git a/sci-libs/dlib/dlib-19.16.ebuild b/sci-libs/dlib/dlib-19.16-r1.ebuild
index cb682127de97..5b0ca7e80ee9 100644
--- a/sci-libs/dlib/dlib-19.16.ebuild
+++ b/sci-libs/dlib/dlib-19.16-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_OPTIONAL=1
-inherit cmake-utils cuda distutils-r1
+inherit cmake cuda distutils-r1
 
 DESCRIPTION="Numerical and networking C++ library"
 HOMEPAGE="http://dlib.net/"
@@ -14,34 +14,31 @@ SRC_URI="https://github.com/davisking/dlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Boost-1.0"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas cuda debug examples gif jpeg lapack mkl png python sqlite static-libs test X cpu_flags_x86_avx cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
+IUSE="cblas cuda debug examples gif jpeg lapack mkl png python sqlite test X cpu_flags_x86_avx cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
+REQUIRED_USE="python? ( png ${PYTHON_REQUIRED_USE} )"
+
 RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # doc needs a bunch of deps not in portage
-
 RDEPEND="
-	cblas? ( virtual/cblas:= )
+	cblas? ( virtual/cblas )
 	cuda? ( dev-libs/cudnn:= )
 	gif? ( media-libs/giflib:= )
 	jpeg? ( virtual/jpeg:0= )
-	lapack? ( virtual/lapack:= )
-	mkl? ( sci-libs/mkl:= )
+	lapack? ( virtual/lapack )
+	mkl? ( sci-libs/mkl )
 	png? ( media-libs/libpng:0= )
 	python? ( ${PYTHON_DEPS} )
-	sqlite? ( dev-db/sqlite:3= )
-	X? ( x11-libs/libX11:= )"
-DEPEND="${RDEPEND}
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	)"
+	sqlite? ( dev-db/sqlite:3 )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}"
+BDEPEND="python? ( test? ( dev-python/pytest[${PYTHON_USEDEP}] ) )"
 
 DOCS=( docs/README.txt )
 
 src_prepare() {
 	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	use python && distutils-r1_src_prepare
 }
 
@@ -76,12 +73,12 @@ src_configure() {
 		-DUSE_SSE2_INSTRUCTIONS="$(usex cpu_flags_x86_sse2)"
 		-DUSE_SSE4_INSTRUCTIONS="$(usex cpu_flags_x86_sse4_1)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 	use python && distutils-r1_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	use python && distutils-r1_src_compile
 }
 
@@ -92,16 +89,16 @@ python_test() {
 src_test() {
 	mkdir "${BUILD_DIR}"/dlib/test || die
 	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
-	cmake "${S}"/dlib/test && emake
+	cmake "${S}"/dlib/test || die
+	emake
 	./dtest --runall || die
 	popd > /dev/null || die
 	use python && distutils-r1_src_test
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use python && distutils-r1_src_install
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
 	if use examples; then
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}
diff --git a/sci-libs/dlib/dlib-19.4.ebuild b/sci-libs/dlib/dlib-19.4.ebuild
deleted file mode 100644
index 8e755d5722ee..000000000000
--- a/sci-libs/dlib/dlib-19.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils cuda
-
-DESCRIPTION="Numerical and networking C++ library"
-HOMEPAGE="http://dlib.net/"
-SRC_URI="https://github.com/davisking/dlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas debug cuda examples gif jpeg lapack mkl png
-	 sqlite static-libs test X"
-RESTRICT="!test? ( test )"
-
-# doc needs a bunch of deps not in portage
-
-RDEPEND="
-	cblas? ( virtual/cblas:= )
-	cuda? ( dev-libs/cudnn:= )
-	jpeg? ( virtual/jpeg:0= )
-	lapack? ( virtual/lapack:= )
-	mkl? ( sci-libs/mkl:= )
-	png? ( media-libs/libpng:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	X? ( x11-libs/libX11:= )
-"
-DEPEND="test? ( ${RDEPEND} )"
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
-	sed -i -e '/LICENSE.txt/d' dlib/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-DDLIB_ENABLE_ASSERTS="$(usex debug)"
-		-DDLIB_ENABLE_STACK_TRACE="$(usex debug)"
-		-DDLIB_GIF_SUPPORT="$(usex gif)"
-		-DDLIB_JPEG_SUPPORT="$(usex jpeg)"
-		-DDLIB_PNG_SUPPORT="$(usex png)"
-		-DDLIB_LINK_WITH_SQLITE3="$(usex sqlite)"
-		-DDLIB_NO_GUI_SUPPORT="$(usex X OFF ON)"
-		-DDLIB_USE_BLAS="$(usex cblas)"
-		-DDLIB_USE_CUDA="$(usex cuda)"
-		-DDLIB_USE_LAPACK="$(usex lapack)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	mkdir "${BUILD_DIR}"/dlib/test || die
-	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
-	cmake "${S}"/dlib/test && emake
-	./dtest --runall || die
-	popd > /dev/null || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc docs/README.txt
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/sci-libs/dlib/dlib-19.7.ebuild b/sci-libs/dlib/dlib-19.7.ebuild
deleted file mode 100644
index 470c52a217e6..000000000000
--- a/sci-libs/dlib/dlib-19.7.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils cuda
-
-DESCRIPTION="Numerical and networking C++ library"
-HOMEPAGE="http://dlib.net/"
-SRC_URI="https://github.com/davisking/dlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas debug cuda examples gif jpeg lapack mkl png sqlite static-libs test X"
-RESTRICT="!test? ( test )"
-
-# doc needs a bunch of deps not in portage
-
-RDEPEND="
-	cblas? ( virtual/cblas:= )
-	cuda? ( dev-libs/cudnn:= )
-	jpeg? ( virtual/jpeg:0= )
-	lapack? ( virtual/lapack:= )
-	mkl? ( sci-libs/mkl:= )
-	png? ( media-libs/libpng:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	X? ( x11-libs/libX11:= )
-"
-DEPEND="test? ( ${RDEPEND} )"
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
-	sed -i -e '/LICENSE.txt/d' dlib/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-DDLIB_ENABLE_ASSERTS="$(usex debug)"
-		-DDLIB_ENABLE_STACK_TRACE="$(usex debug)"
-		-DDLIB_GIF_SUPPORT="$(usex gif)"
-		-DDLIB_JPEG_SUPPORT="$(usex jpeg)"
-		-DDLIB_PNG_SUPPORT="$(usex png)"
-		-DDLIB_LINK_WITH_SQLITE3="$(usex sqlite)"
-		-DDLIB_NO_GUI_SUPPORT="$(usex X OFF ON)"
-		-DDLIB_USE_BLAS="$(usex cblas)"
-		-DDLIB_USE_CUDA="$(usex cuda)"
-		-DDLIB_USE_LAPACK="$(usex lapack)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	mkdir "${BUILD_DIR}"/dlib/test || die
-	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
-	cmake "${S}"/dlib/test && emake
-	./dtest --runall || die
-	popd > /dev/null || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc docs/README.txt
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 69fa2a7a7950..457ff9ba902a 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -9,7 +9,7 @@ DIST fftw-3.3.6-pl2.tar.gz 4185261 BLAKE2B e2f877c13ab441ddf1ae731cf3ebdc5d1565f
 DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73695742459079ebf050dfa4c371484ea65324fd4b7d374f70d88a5942ff8abaad167b0d44d485bf1dc9e208c SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
 EBUILD fftw-2.1.5-r9.ebuild 3146 BLAKE2B 8f899d8142cd8a90a887240756c501e2d736385d636734a9ddbcebb0b0d479e8006d5cbc75d20f41aa4deacfad469870ec5d387082da20f7a75333d667c190f1 SHA512 7648d4c60ad453a2b8be1a687918278941b54a99c06b59af5121dcdf259eb40f423969ab6d5b861668c4216fdfd9167043c72c51d3fbfb8e0da0cb50da6ce945
 EBUILD fftw-3.3.6_p2.ebuild 4459 BLAKE2B 0585c2fe679f1c849e60be3cf7ad87b5af8aac4d0e342fd064cd6d82c8c29f36fafc430222eb38de5f6bfaaa65547163d132635a818201b8f78d689aed33f957 SHA512 0f19ac77caf1a9e5e449b21498b582a7e6061ddc15754d4e626c89589477109cab56167aba8d9dd13c4729d390e713d5edf28095824a4a1b25520a6c8c1c37ab
-EBUILD fftw-3.3.8-r1.ebuild 4608 BLAKE2B dd7ca3f608059b79e03c1c38eaa507ea6f41a4e4fa9ae5e8c2d2ae6782fe3b6e76e226b1c48b43352764bb66a114edf79b457d438ee1fec399920b3199420ca6 SHA512 6f3250cdd35c1a828d5dd33b079db4df4463e829a65894fd22ddd68ca73eddcf469fba1ea74783cf7052af67b44b7fe45b575c815b6fe928692fcbd8a324e26a
-EBUILD fftw-3.3.8.ebuild 4487 BLAKE2B 3f88b09f0973e09ebd253128086307354e03d091cc8095dbcd2672582dec2fdeca3965324a1ce6860aba9500397a2a1ce494547793073557981238b41b7f501a SHA512 4998722cd488e98041d4a8ec4bf3a0888358c5558a44da0e1dbd9be9b1e42d7ce0ebb9c18179d48b324b3ffaaea2473b350b407d5f7af3ad44515176dfd72d30
-EBUILD fftw-9999.ebuild 4482 BLAKE2B 3d15c541c7ebd4da4d8c5db3d138ed34ac762fd69bc5deeeeab6be45b979568152558b42c67ede7ea61ff6166bc1e52b2e47374d9b845f931e29a4ca3d9bf4e7 SHA512 1121948acc7270f310aba04212848b2f4ae918a96c137cdaa7117296566272b67e90bf439e17cbaa1b3f25e2604be8fcb5c7f035ea3162c640847f3e0eba999a
+EBUILD fftw-3.3.8-r1.ebuild 4644 BLAKE2B 9e5f88d97b5ac5cdcc7d8d8f4ed730f0310ad2a128e344123690b7ea7a19993b335d327b6b447236c2fe57ded6f331448b89d784c10ec662390b2f821278b7fc SHA512 2251e51e93cc9fab3fde5302baa2806ae9da3fa2cad305925459eafbd24cdeed5a9f7f4d65c523df8eba82ed7d20124bbb25874edc7bcf7de6602f54d3f66caa
+EBUILD fftw-3.3.8.ebuild 4523 BLAKE2B e449bb3e635e45930f18e36ca1cc2989b8d6f7bb6e53f6c937406a461e16badb64833e625327e1ef0c6a39ca8c9ba6360b2712a72e23de298bd774016e6c57ea SHA512 6ac197a894ceb0f29d4e3e22ac45cc48007d62230ee9448260c54a04d77595a7c702fd7884d7f9dd4a8b737adfe99534f268f004eae91de90dbe21e7daeec220
+EBUILD fftw-9999.ebuild 4518 BLAKE2B 41047e346e12e633d2faa45341cff1eb02959295f3000d0c5dc2b74ae366a72ef9c9b5724193c3c4b9ee2e7de4a2c76f2f19451156cae8d7ca6c201c9aab60dc SHA512 122471201bc246cc815abaf074a310ec9e91a9e3bbd9b58ceb3572114318e18f6e3def64d4e027d0022163565d35ba792daa1cc7e4b85150dd4cd7c62ec59422
 MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98
diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
index f8105f1e1b41..150c67d958e3 100644
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+IUSE="cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -94,7 +94,7 @@ multilib_src_configure() {
 			# altivec, sse, single-paired only work for single
 			myconf+=(
 				--enable-single
-				$(use_enable altivec)
+				$(use_enable cpu_flags_ppc_altivec altivec)
 				$(use_enable cpu_flags_x86_avx avx)
 				$(use_enable cpu_flags_x86_avx2 avx2)
 				$(use_enable cpu_flags_x86_sse sse)
diff --git a/sci-libs/fftw/fftw-3.3.8.ebuild b/sci-libs/fftw/fftw-3.3.8.ebuild
index b0783f5d9cb0..e54af4af14bf 100644
--- a/sci-libs/fftw/fftw-3.3.8.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8.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=6
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+IUSE="cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -94,7 +94,7 @@ multilib_src_configure() {
 			# altivec, sse, single-paired only work for single
 			myconf+=(
 				--enable-single
-				$(use_enable altivec)
+				$(use_enable cpu_flags_ppc_altivec altivec)
 				$(use_enable cpu_flags_x86_avx avx)
 				$(use_enable cpu_flags_x86_avx2 avx2)
 				$(use_enable cpu_flags_x86_sse sse)
diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index 9266b28d174d..d92ed1ac2ad5 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+IUSE="cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -94,7 +94,7 @@ multilib_src_configure() {
 			# altivec, sse, single-paired only work for single
 			myconf+=(
 				--enable-single
-				$(use_enable altivec)
+				$(use_enable cpu_flags_ppc_altivec altivec)
 				$(use_enable cpu_flags_x86_avx avx)
 				$(use_enable cpu_flags_x86_avx2 avx2)
 				$(use_enable cpu_flags_x86_sse sse)
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 8b53b73baefd..0d329cd938cf 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,3 +1,3 @@
 DIST geos-3.8.1.tar.bz2 2505407 BLAKE2B 43053ea9e29d190f41c37d5d382b689ef477e0256cfd5705f4f2f316cac21a1674660bcf0900c51db72909c41d46be7a41d297958de48e108ae6d6bd1ca9d247 SHA512 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056
-EBUILD geos-3.8.1.ebuild 1112 BLAKE2B afa7d180906c86844c2b0f7a9b7305b30b32b91fef8f691449830e720a3547018440e323918e2453c8f138e7b2390246f97c83ba999a4cb6c5afa353ed2ae57a SHA512 78a60b83eed54e0882b2b168a85558c3fe6b24e208b8f6a70c9971f9e9015ad108ec6d591e898ae058e320478d702edecda44e9ed0c6f4ae14b76b2900f87278
+EBUILD geos-3.8.1.ebuild 1113 BLAKE2B 7e7529e6272b6d9eeeec6230c0f945a368b55b3094e304372dceeab5e846c80350331b687300243a24c92e3b265ef5fbf136a972abecf28e940a31e71399dfda SHA512 c95a5d2a6d67b2abb3fb2d227abacf836496404220e67008dda3e28f60fa4aefd5e9fb86a96380445a97442ee16f937cf2c2d368c9581b968af8dfc58ab09619
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.8.1.ebuild b/sci-libs/geos/geos-3.8.1.ebuild
index d8be59bbb02f..baade73842c7 100644
--- a/sci-libs/geos/geos-3.8.1.ebuild
+++ b/sci-libs/geos/geos-3.8.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="http://trac.osgeo.org/geos/"
+HOMEPAGE="https://trac.osgeo.org/geos/"
 SRC_URI="http://download.osgeo.org/geos/${PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
diff --git a/sci-libs/klu/Manifest b/sci-libs/klu/Manifest
index 35489902da5d..1efb1aed9801 100644
--- a/sci-libs/klu/Manifest
+++ b/sci-libs/klu/Manifest
@@ -1,5 +1,5 @@
 DIST klu-1.2.1.tar.bz2 612428 BLAKE2B 807bfc56deb5c4cbefd2f6c118cd8e929ba9b02d9b88e8eee8b9443991f16a2a3e9b4e1fa888b2b6e450aeda9fc4d12d6a5480f9f25bf366312f57cd8f380af0 SHA512 2837ade61596b5e738d0dd16a5486fd2b0089ec9ddeae4fa3b2c3671de6637c7cf2d55e44c0103c9393caa3f046039a76d9abc5b8094d236523db0c58cc58b70
 DIST klu-1.3.9.tar.bz2 635596 BLAKE2B 6c6c84cf1b30e78cbaaee6bebed21c806d1672bee5f7ea061e7ef057ff56fd456e8517ca2ff1018a14ebcbc8f96b9e87989e22d8996817394666e6d8d2d727dd SHA512 b7fd862fe8443596758c27f9c918e367b3b3816340836e74cf8d97a2e755fbe07d133778eea3d054bc70243fa15c2bd71f4fd90c1179879661ba2d624b8f0706
 EBUILD klu-1.2.1.ebuild 656 BLAKE2B 53d38f9b4a6b80b98c50a0eecf85ce3e0eb6ffa65134ef68d7c7b67c1ea1f402f11f8870f1a1720b9583c79c952c7820eae652ecd3ebf9bb399fa7f2d20c27fa SHA512 2e0dbdfb47e311c4f537aa9e064e2a383b5aa783b67c3ece14023b88512167bc9f897f707129d6a57de207152804d80e181398b7ca17ebd7a7e20985672fd717
-EBUILD klu-1.3.9.ebuild 645 BLAKE2B ce3bd69512dea6bc4afb5f0ea3bca390a2fbac4ac03bd76389fb33c1a8c69604752150a0c36d498db35f7bae2a812eaf93d2a8073c95d3f4454b53c00f47ad33 SHA512 47a63ca14063291a78a73688d29b9c7be4d9da51f4de705c1fb045e859db62ef5282fdf2140d397da224ffe3b228d4e57e391677aa413a67f71b3bda1016e4e9
+EBUILD klu-1.3.9.ebuild 652 BLAKE2B acc4ec5d390bf989f0eecfdff60b8183faec3badcf44f0fade78314f5b40ce26c12cab521e608a9935314dbbbd1d20a8691792190596dd1bcfb5e984bdf15804 SHA512 d29ddc8c1ae5eea76cd2e84bd7e4eebeaa3cf1ec365bf5e98f3d45afdcc696b32bb1f00ed41ac968e7afc6b041ac9701fb27c01e345dde36551c9697db37b668
 MISC metadata.xml 460 BLAKE2B f4d619f68a16bcbaaf2b44a9fd1156cc88dd02d38609da2e56f8b242df9744fbbe4b7befff2ae34f084b5895ab9a537e62182015008e596fddda33ea891698b5 SHA512 1e01a7e6576552beac665a8a0affe21809785f33316767ef6e0bcc59dd019e5100f1ed16ca1bd91ee1daf102de2122ed57ff0980dd6b4f21270f8c4c5f832db7
diff --git a/sci-libs/klu/klu-1.3.9.ebuild b/sci-libs/klu/klu-1.3.9.ebuild
index 42c4aa31b6d3..3222f16c3e55 100644
--- a/sci-libs/klu/klu-1.3.9.ebuild
+++ b/sci-libs/klu/klu-1.3.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index 1846f5710017..f4c10efc1db9 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,4 +1,4 @@
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
 EBUILD lapack-3.8.0-r1.ebuild 3018 BLAKE2B 6db2da7db3213d7899b2becf2eebf348443d0730b5e3277545380aafdbc93bab9b75d5fa398e1daa7a4b4ed9740bb93138d3206c37ea6df89bc11b1e5d610cc4 SHA512 4e7762e8298aa856aeadb5496d578efcdef2b2ee3163b8ac8ad5423746a8a878475aa9629912bb2ddf00ebb81be68f4a0f2a67a098a052420dd1824a3d19fe6f
-EBUILD lapack-3.8.0.ebuild 2960 BLAKE2B 8e5bf248f8b35220f9c0f342cd346d13768903c085ac1cd0f50031c9c119aedf10be81c0dfafe3759b91dd7d4033728160c0b54ff108931426b7eeb5ad773464 SHA512 5e2d5833d072d1e66c9d36dbc0d3ad4f27a8032e8dd5ca2b9d535bdd1dac9d69d63968eb7b0654a21cb80ce72f0cf6c2ec61f09bbc9caeae732784f8e8619149
+EBUILD lapack-3.8.0.ebuild 2959 BLAKE2B 415318e59b79d7bca4a4faefcc7f6b080287589eab098cbd32d72d77ad31b28ba9d6536527308340feeb6141cb8439bed73d18fd7f3b4b403cbcb5e3661765f1 SHA512 aed62d7a3b58f0bb4e658ddae720ce3b872aa5416b9aa54b30cca1beb2c4350a8ce0899ba7de1cf7e4782e459baf56b8ba4ac2306b8f9e6fb0ab412d2da88ffb
 MISC metadata.xml 1490 BLAKE2B bcb933b7cc3c3ae6f33e7c8ae9ef12475477ecd3351901cfba5dc955430def35df18e5ab41624cb99f2c1551fc38153138195e4e95ab40d3cf92e5685ce68fc5 SHA512 a99af3086d63488e7a2b8cda2f3727ce31eb0e62dd75a9cf64e44a203068866a06c7d6e119665e663c49a1afccb7a70982fd831735d958b73b6dcdf52c8ef5b1
diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild
index 3167f4c22b5e..7b7241aeb315 100644
--- a/sci-libs/lapack/lapack-3.8.0.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/${PN}/${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"
+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"
 # TODO: static-libs 64bit-index
 
diff --git a/sci-libs/ldl/Manifest b/sci-libs/ldl/Manifest
index 33ba31a112a5..5e4a5bb54696 100644
--- a/sci-libs/ldl/Manifest
+++ b/sci-libs/ldl/Manifest
@@ -1,5 +1,5 @@
 DIST ldl-2.1.0.tar.bz2 336442 BLAKE2B 8516e37ac66c329397739fb5d7ee0b3a5cc1a286d780062a749901a13b30dca52e131647e66a721be1f1e2ddd022ecc7c9d6ec5da81acc9c98afa53a06978367 SHA512 ad532e3481e48b9c3587ca0cba3d58a89a2174e3a0d523dcac6d420e04aa5da1cb8517bb14556d0a593110350fdc02aea3677eec41eb74821a3a63552418d0b5
 DIST ldl-2.2.6.tar.bz2 342923 BLAKE2B 7acf1a82824de013fe9a7742fb2d5c44c86de96e95d1d7408106d4af420dc3655ab7533eb80592b52523245c7545bc246bf129712547ff6eba856a807c78b6ad SHA512 266c9e62c474a6a9b2d7f74aa580e313fbe4b322197236ba6fbbab6d1756348cf146c1d807ea6d8d0e5941cedc48298e8437aaf386dd6c433dcaf41a9d0b7371
 EBUILD ldl-2.1.0.ebuild 676 BLAKE2B 304a185bf67e6d05cb2de2f94fe4c62f773aa4bb9e93e20f20f766afcd49426ce7842f8397654a39e01c1b7741552720c8a8e4a83f29da724cd57db0ceb52d3c SHA512 d11d0a25d7dc3d54045b3dbb0fbb0a489f609d066122261a4b0531dfe33552c129a6ff57afac41c7d0d0a93385886c00d8c8b8004df5ecef19a9d23157b96a07
-EBUILD ldl-2.2.6.ebuild 637 BLAKE2B ca028428a52d47a0f16f77398073eea94994b370d363ce43603b35f074cd268a7a38417bfa64701812742c982ec323423c6955aa694220fd044a23fe4a222075 SHA512 67d028cdafcbeaec9c77eae218a0dde6d9444b46b41a0e1f9b8bf81952f565074498f4266dcad9c02d78c3417c813cee4d74ffcba0c14731ea657d6d0d73fe3b
+EBUILD ldl-2.2.6.ebuild 644 BLAKE2B 446abc2d8bd61598da6c5dc998482c0f0e266eef983a002a4c2ab0079bab980f8fded0df818ef72fff922925eeb1fda1f3d5648715b91d1f0c2adc74cd4de99c SHA512 3f4d63be8724d4a7c4246e441833b99bdf72937c556d387804d7ab7d44d8aa5ee0274b07c7c9b7dbf2471add2412d7110404d3a399d2c929466645cfa29b92d0
 MISC metadata.xml 891 BLAKE2B bb9634b4bf10c97b042f24fdd8e6427ae29ebf462d6ab8e2d29e882c683eb88e77ac1960f6cac7b674c85e4934f2f3a3b2e1924bf198f07adf6eb2e7410622b0 SHA512 b03a1a031499fe56e45d73fe5e63585cdddc75ed6a9f3e5ce4327eb02f8bee235366c23648b22959ea43ce79f16811ce28d1abfbc2c8cbb465d2986cde9cdda9
diff --git a/sci-libs/ldl/ldl-2.2.6.ebuild b/sci-libs/ldl/ldl-2.2.6.ebuild
index 6a1f2acf3873..97dc7300636b 100644
--- a/sci-libs/ldl/ldl-2.2.6.ebuild
+++ b/sci-libs/ldl/ldl-2.2.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest
index 29ff4811076e..8b8774454d36 100644
--- a/sci-libs/libxc/Manifest
+++ b/sci-libs/libxc/Manifest
@@ -2,6 +2,6 @@ DIST libxc-2.1.3.tar.gz 750044 BLAKE2B 6d6bb348bd8f7e25d6a3857fc40f0d7d3a7fe22c0
 DIST libxc-2.2.3.tar.gz 734714 BLAKE2B c5c4c3aec3373b8b481de8ec1779366b6916899e0b77964cbde0e83904b351e009b14a3ff64e9f020640e6ebf68d78828615b8abf83a46fdf86ea16480083643 SHA512 bfcd88c1946e459227e9b1a32c513f0e68ae7a5497925ac6e692085542526ebad9fe2cd5722077c839c06dbaaceca601c7f615ee6936e638eb150a9d68278d5a
 DIST libxc-3.0.0.tar.gz 8388775 BLAKE2B e82a7310c583c39b6c2313668a5d3a3d5ae7bf71ad450e9ac6241d1601bf1bb429abf98787f7e0c3c252e881c381b895e277d18619b57c46f2f910d7e079941c SHA512 42173341f917c2aed6954f76885d2a9149d7212d2525becf77072b9878753c28d752b5cf6b2c79c90a88d8aa033f0aa94fa9753eb67108e9325cee6919cece52
 EBUILD libxc-2.1.3.ebuild 1399 BLAKE2B 0f29fb75ce1f39d57b59ed7dd29d8ac35916ad33056e67e79d7b1a38e4f37edd059e9defe257772c55deef489664df99b38cba06c3f1a6cd6829893892d80aa2 SHA512 570f9ef713887b6f8dce2e9cd694d7b8026b30ed04ee7463b65ef5ee35227035ae3e413636095fc60097e436345d0bfddeca060e013933e43b024c6fd0671c24
-EBUILD libxc-2.2.3.ebuild 1398 BLAKE2B 245a0bdd3b8c224e65414780d098bc56c6cf008ae5071d3c1d58855f2cfe413f9ea32233ab4ac84815b14f6aecc670d5b9c37fb1029fcb3039167ae450d74849 SHA512 a012b81405faa47c0130a86cb472065c31606080158b06411b933e82c79a12388313760871109c7234ba13ba853b137192479ee3698ebb463bc539d4a9978682
+EBUILD libxc-2.2.3.ebuild 1397 BLAKE2B f4340eb57cc1fcd055320ac514be7126fc67070653c19a14c16a6ed7268a0964efbd1a2182b5138ca246b1c43a92e2404edb844e16ebda33518f579443a8ae2c SHA512 5f676f34ae91e59146d9cf868074ea3cb5de617e313b31379432532f8047dd3516e2ebdb80afb6c9977bd1f2776e939d4a7f6f17fd7e5fe86da54df3db0416ec
 EBUILD libxc-3.0.0.ebuild 1399 BLAKE2B 0f29fb75ce1f39d57b59ed7dd29d8ac35916ad33056e67e79d7b1a38e4f37edd059e9defe257772c55deef489664df99b38cba06c3f1a6cd6829893892d80aa2 SHA512 570f9ef713887b6f8dce2e9cd694d7b8026b30ed04ee7463b65ef5ee35227035ae3e413636095fc60097e436345d0bfddeca060e013933e43b024c6fd0671c24
 MISC metadata.xml 1339 BLAKE2B 4c98e1fa7345593b8f160ba4ad84ea3a5eb321437715137e94a1926b92a53ce87c41b27e8fd0edb5c479293e24f9049956100f0070ae7a27550144ff697b63ac SHA512 95e03f10949c2a2350063cc1666bc232f166b10669f5b1d050da91b6119b8280d69aca0f35527ab938c71666bb78019640426ab0acab18bd335e6fff2345e128
diff --git a/sci-libs/libxc/libxc-2.2.3.ebuild b/sci-libs/libxc/libxc-2.2.3.ebuild
index a7776b7b1e8d..377fce27feed 100644
--- a/sci-libs/libxc/libxc-2.2.3.ebuild
+++ b/sci-libs/libxc/libxc-2.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="fortran static-libs -test"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 18b63ca9034f..96cd5d09d210 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -1,6 +1,4 @@
-AUX mkl-10.0.2.018-openmpi.patch 332 BLAKE2B d438bc03fa7f4750ac32423075f960c8bff90230fe303932deecf96a7fe3023fafc59e90cd187711f972d6a3020c87b925fd16868532a0367540ce9a85d2a1f9 SHA512 5efb139622a6f0e8f03c5a76a12298685a9dfe9e816b8eaabd2874fda6c0d468a111a46df8e6885cd62a40ec611c322a99762a805dc74a4c684c85fdf222b530
-AUX mkl-10.0.2.018-tests.patch 528 BLAKE2B 483a6ccc83c04594e265680078e6515f0d3a601dad5c02d8140e800dc79635a8851a42cbad3d972f115e040d02b2a6414c8a4c01bc05490fcaf1f12350144c4f SHA512 6dd716f5d6764cd79c6de22703729d77be71f35e5f600a11f01ccff06c87309471ac5289e68ef40ae830d5917cbd20d4b2b9f1b5554384977f1b83c4b3556382
+AUX mkl-10.0.2.018-openmpi.patch 331 BLAKE2B 2472d459c1e3e90f6efaa1bf0941a02f2c71b24712be71fbc6be23dd53743468b8af88df49e49510344aff7b7f334940bfd5574f146eb5c82dc79a2bb0920f34 SHA512 b097815a369e8d743e77fd45ff52ad1cbe5f6d608e4bbe43d9c2cb54301c0d76960b7ce314bdbd5cd06c51e32332c9275360fe811b93df712710e359a4afab60
 DIST l_mkl_p_10.0.5.025.tgz 230389719 BLAKE2B 622dd0076c8e6d747f170685b6a378db95aa2453d15a53c93ef863729bb8dc76409d7bf72f8bab8ef9a07d8efe1e448cb9e7fc8e6f0c0b2cbbf0a0f6944e2a86 SHA512 621c3bfdecb57313e375424e391c0630a29efd70196e3e4bfc5b4ddd03aa45fda4761523652d875f2e60d466a0010c06659306b11f20966fba4943c308fa6f84
 EBUILD mkl-10.0.5.025-r1.ebuild 9829 BLAKE2B ac549f14e7c68b899a05369cc1c52670de2fabe5c07cb9def15f040e57b16eb1471a738c6db1d4133b06b38e59826bd62b494c289afda17e19cb79c923a7486d SHA512 2e09cf66221de13e9331ec0935944a878cb4de36fa36c580abd883ee7aff0d194b705935bb6e1e86b8e9d6ba3f86590e6048bbd1b0127a624e63fca1f944668b
-EBUILD mkl-10.0.5.025.ebuild 9958 BLAKE2B 266471c412fb94d3afa16c70c3354f801217bf1e13c63c91ba2a6a09ff6df563e48ec0e611ef7198f3fd807744197dafdacc7acbedd23da881efd6bcb0389d72 SHA512 cc58f9d6099a6abefa15ec0f83c2665001ea9897a6650e816cc214017a62fab863218803a697e50176e1eeb6e9b7ea8828b25308fed27d1c6e04adfd97a0f5ce
 MISC metadata.xml 882 BLAKE2B 420f779849ebf2b4191156df6328233e0d474fe7ed1ced6505cfa3136b780a4029eb7f7df52a357287376252704d7215c98f2562689061e4fe5d1b420f2fcb22 SHA512 9909f91bb7389c3bcecc25935f7d7fc03c4b91c26990a188e3597be0818d94aec644f7cc9786cf673321c1136738e4738ae775019ab423019450e49725788be8
diff --git a/sci-libs/mkl/files/mkl-10.0.2.018-openmpi.patch b/sci-libs/mkl/files/mkl-10.0.2.018-openmpi.patch
index 6f7f9edebb0f..0519b5fdebdb 100644
--- a/sci-libs/mkl/files/mkl-10.0.2.018-openmpi.patch
+++ b/sci-libs/mkl/files/mkl-10.0.2.018-openmpi.patch
@@ -1,5 +1,5 @@
---- interfaces/fftw2x_cdft/makefile.orig	2008-03-11 23:26:26.287984332 +0000
-+++ interfaces/fftw2x_cdft/makefile	2008-03-13 10:56:44.755095617 +0000
+--- a/interfaces/fftw2x_cdft/makefile	2008-03-11 23:26:26.287984332 +0000
++++ b/interfaces/fftw2x_cdft/makefile	2008-03-13 10:56:44.755095617 +0000
 @@ -172,6 +172,15 @@
  endif
  
diff --git a/sci-libs/mkl/files/mkl-10.0.2.018-tests.patch b/sci-libs/mkl/files/mkl-10.0.2.018-tests.patch
deleted file mode 100644
index 975170f7dbc0..000000000000
--- a/sci-libs/mkl/files/mkl-10.0.2.018-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- tests/scalapack/make.inc.orig	2008-03-13 22:36:06.119890888 +0000
-+++ tests/scalapack/make.inc	2008-03-13 22:54:58.201781899 +0000
-@@ -59,6 +59,9 @@
- IFACE_PART = _ilp64
- COPTS = -DMKL_ILP64
- FOPTS = -i8
-+ifeq ($(compiler),gnu)
-+FOPTS = -fdefault-integer-8
-+endif
- else
- ADD_IFACE = _lp64
- IFACE_PART = _lp64
-@@ -203,7 +206,7 @@
- # Compiler flags
- F77FLAGS=-w -u $(OPTS)
- ifeq ($(comp),gnu)
--F77FLAGS=$(OPTS) -ff90 -fno-globals -Wno-globals
-+F77FLAGS=$(OPTS)
- endif
- # Remove objects variable
- RMOBJ=rm -f *.o core work.pc*
diff --git a/sci-libs/mkl/mkl-10.0.5.025.ebuild b/sci-libs/mkl/mkl-10.0.5.025.ebuild
deleted file mode 100644
index d731a62613d5..000000000000
--- a/sci-libs/mkl/mkl-10.0.5.025.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit check-reqs eutils fortran-2 multilib toolchain-funcs
-
-PID=1232
-PB=${PN}
-P_ARCHIVE=l_${PN}_p_${PV}
-
-DESCRIPTION="Intel(R) Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="https://software.intel.com/en-us/mkl"
-SRC_URI="http://registrationcenter-download.intel.com/irc_nas/${PID}/${P_ARCHIVE}.tgz"
-
-SLOT="0"
-LICENSE="Intel-SDP"
-KEYWORDS="-* amd64 ~ia64 x86"
-IUSE="doc fftw fortran95 int64 mpi"
-
-RESTRICT="bindist strip mirror"
-
-DEPEND="
-	app-eselect/eselect-blas
-	app-eselect/eselect-cblas
-	app-eselect/eselect-lapack"
-RDEPEND="${DEPEND}
-	doc? ( app-doc/blas-docs app-doc/lapack-docs )
-	mpi? ( virtual/mpi )"
-
-MKL_DIR=/opt/intel/${PN}/${PV}
-INTEL_LIC_DIR=/opt/intel/licenses
-
-CHECKREQS_DISK_BUILD=3500M
-
-QA_PREBUILT="opt/intel/${PN}/${PV}/*"
-
-get_fcomp() {
-	case $(tc-getFC) in
-		*gfortran* )
-			FCOMP="gfortran" ;;
-		ifort )
-			FCOMP="ifc" ;;
-		* )
-			FCOMP=$(tc-getFC) ;;
-	esac
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	fortran-2_pkg_setup
-	# Check the license
-	if [[ -z ${MKL_LICENSE} ]]; then
-		MKL_LICENSE="$(grep -ls MKern ${ROOT}${INTEL_LIC_DIR}/* | tail -n 1)"
-		MKL_LICENSE=${MKL_LICENSE/${ROOT}/}
-	fi
-	if  [[ -z ${MKL_LICENSE} ]]; then
-		eerror "Did not find any valid mkl license."
-		eerror "Register at ${HOMEPAGE} to receive a license"
-		eerror "and place it in ${INTEL_LIC_DIR} or run:"
-		eerror "export MKL_LICENSE=/my/license/file emerge mkl"
-		die "license setup failed"
-	fi
-
-	# Check if we have enough free diskspace to install
-	CHECKREQS_DISK_BUILD="1100M"
-	check-reqs_pkg_setup
-
-	# Check and setup fortran
-	if use fortran95; then
-		# blas95 and lapack95 don't compile with gfortran < 4.2
-		[[ $(tc-getFC) =~ (gfortran|g77) ]] && [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] &&
-		die "blas95 and lapack95 don't compile with gfortran < 4.2"
-	fi
-	MKL_FC="gnu"
-	[[ $(tc-getFC) =~ if ]] && MKL_FC="intel"
-
-	# build profiles according to what compiler is installed
-	MKL_CC="gnu"
-	[[ $(tc-getCC) == icc ]] && MKL_CC="intel"
-
-	if has_version sys-cluster/mpich; then
-		MKL_MPI=mpich
-	elif has_version sys-cluster/mpich2; then
-		MKL_MPI=mpich2
-	elif has_version sys-cluster/openmpi; then
-		MKL_MPI=openmpi
-	else
-		MKL_MPI=intelmpi
-	fi
-	get_fcomp
-}
-
-src_unpack() {
-	default
-	cd "${WORKDIR}/${P_ARCHIVE}"/install || die
-
-	cp ${MKL_LICENSE} "${WORKDIR}"/ || die
-	MKL_LIC="$(basename ${MKL_LICENSE})"
-
-	# binary blob extractor installs rpm leftovers in /opt/intel
-	addwrite /opt/intel
-	# undocumented features: INSTALLMODE_mkl=NONRPM
-
-	# We need to install mkl non-interactively.
-	# If things change between versions, first do it interactively:
-	# tar xf l_*; ./install.sh --duplicate mkl.ini;
-	# The file will be instman/mkl.ini
-	# Then check it and modify the ebuild-created one below
-	# --norpm is required to be able to install 10.x
-	cat > mkl.ini <<-EOF
-		[MKL]
-		EULA_ACCEPT_REJECT=ACCEPT
-		FLEXLM_LICENSE_LOCATION=${WORKDIR}/${MKL_LIC}
-		INSTALLMODE_mkl=NONRPM
-		INSTALL_DESTINATION=${S}
-	EOF
-	einfo "Extracting ..."
-	./install \
-		--silent ./mkl.ini \
-		--installpath "${S}" \
-		--log log.txt &> /dev/null
-
-	if [[ -z $(find "${S}" -name libmkl.so) ]]; then
-		eerror "Could not find extracted files"
-		eerror "See ${PWD}/log.txt to see why"
-		die "extracting failed"
-	fi
-}
-
-src_prepare() {
-	# remove left over
-	rm -f /opt/intel/.*mkl*.log /opt/intel/intel_sdp_products.db || die
-
-	# remove unused stuff and set up intel names
-	rm -rf "${WORKDIR}"/l_* || die
-
-	# allow openmpi to work
-	epatch "${FILESDIR}"/${PN}-10.0.2.018-openmpi.patch
-	# make scalapack tests work for gfortran
-	#epatch "${FILESDIR}"/${PN}-10.0.2.018-tests.patch
-	case ${ARCH} in
-		x86)	MKL_ARCH=32
-				MKL_KERN=ia32
-				rm -rf lib*/{em64t,64} || die
-				;;
-
-		amd64)	MKL_ARCH=em64t
-				MKL_KERN=em64t
-				rm -rf lib*/{32,64} || die
-				;;
-
-		ia64)	MKL_ARCH=64
-				MKL_KERN=ipf
-				rm -rf lib*/{32,em64t} || die
-				;;
-	esac
-	MKL_LIBDIR=${MKL_DIR}/lib/${MKL_ARCH}
-	# fix env scripts
-	sed -i \
-		-e "s:${S}:${MKL_DIR}:g" \
-		tools/environment/*sh || die "sed support file failed"
-}
-
-src_compile() {
-	cd "${S}"/interfaces || die
-	if use fortran95; then
-		einfo "Compiling fortan95 static lib wrappers"
-		local myconf="lib${MKL_ARCH}"
-		[[ $(tc-getFC) =~ gfortran ]] && \
-			myconf="${myconf} FC=gfortran"
-		if use int64; then
-			myconf="${myconf} interface=ilp64"
-			[[ $(tc-getFC) =~ gfortran ]] && \
-				myconf="${myconf} FOPTS=-fdefault-integer-8"
-		fi
-		local x
-		for x in blas95 lapack95; do
-			pushd ${x} > /dev/null || die
-			emake ${myconf}
-			popd > /dev/null || die
-		done
-	fi
-
-	if use fftw; then
-		local fftwdirs="fftw2xc fftw2xf fftw3xc fftw3xf"
-		local myconf="lib${MKL_ARCH} compiler=${MKL_CC}"
-		if use mpi; then
-			fftwdirs="${fftwdirs} fftw2x_cdft"
-			myconf="${myconf} mpi=${MKL_MPI}"
-		fi
-		einfo "Compiling fftw static lib wrappers"
-		local x
-		for x in ${fftwdirs}; do
-			pushd ${x} > /dev/null || die
-			emake ${myconf}
-			popd > /dev/null || die
-		done
-	fi
-}
-
-src_test() {
-	cd "${S}"/tests
-	local myconf
-	local testdirs="blas cblas"
-	use int64 && myconf="${myconf} interface=ilp64"
-	# buggy with g77 and gfortran
-	#if use mpi; then
-	#	testdirs="${testdirs} scalapack"
-	#	myconf="${myconf} mpi=${MKL_MPI}"
-	#fi
-	for x in ${testdirs}; do
-		pushd ${x}
-		einfo "Testing ${x}"
-		emake \
-			compiler=${MKL_FC} \
-			${myconf} \
-			so${MKL_ARCH}
-		popd
-	done
-}
-
-mkl_make_generic_profile() {
-	cd "${S}" || die
-	# produce eselect files
-	# don't make them in FILESDIR, it changes every major version
-	cat  > eselect.blas <<-EOF
-		${MKL_LIBDIR}/libmkl_${MKL_KERN}.a /usr/@LIBDIR@/libblas.a
-		${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libblas.so
-		${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libblas.so.0
-	EOF
-	cat  > eselect.cblas <<-EOF
-		${MKL_LIBDIR}/libmkl_${MKL_KERN}.a /usr/@LIBDIR@/libcblas.a
-		${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libcblas.so
-		${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libcblas.so.0
-		${MKL_DIR}/include/mkl_cblas.h /usr/include/cblas.h
-	EOF
-	cat > eselect.lapack <<-EOF
-		${MKL_LIBDIR}/libmkl_lapack.a /usr/@LIBDIR@/liblapack.a
-		${MKL_LIBDIR}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so
-		${MKL_LIBDIR}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so.0
-	EOF
-}
-
-# usage: mkl_add_profile <profile> <interface_lib> <thread_lib> <rtl_lib>
-mkl_add_profile() {
-	cd "${S}" || die
-	local prof=${1}
-	local x
-	for x in blas cblas lapack; do
-		cat > ${x}-${prof}.pc <<-EOF
-			prefix=${MKL_DIR}
-			libdir=${MKL_LIBDIR}
-			includedir=\${prefix}/include
-			Name: ${x}
-			Description: Intel(R) Math Kernel Library implementation of ${x}
-			Version: ${PV}
-			URL: ${HOMEPAGE}
-		EOF
-	done
-	cat >> blas-${prof}.pc <<-EOF
-		Libs: -Wl,--no-as-needed -L\${libdir} ${2} ${3} -lmkl_core ${4} -lpthread
-	EOF
-	cat >> cblas-${prof}.pc <<-EOF
-		Requires: blas
-		Libs: -Wl,--no-as-needed -L\${libdir} ${2} ${3} -lmkl_core ${4} -lpthread
-		Cflags: -I\${includedir}
-	EOF
-	cat >> lapack-${prof}.pc <<-EOF
-		Requires: blas
-		Libs: -Wl,--no-as-needed -L\${libdir} ${2} ${3} -lmkl_core -lmkl_lapack ${4} -lpthread
-	EOF
-	insinto ${MKL_LIBDIR}
-	for x in blas cblas lapack; do
-		doins ${x}-${prof}.pc
-		cp eselect.${x} eselect.${x}.${prof} || die
-		echo "${MKL_LIBDIR}/${x}-${prof}.pc /usr/@LIBDIR@/pkgconfig/${x}.pc" \
-			>> eselect.${x}.${prof}
-		eselect ${x} add $(get_libdir) eselect.${x}.${prof} ${prof}
-	done
-}
-
-mkl_make_profiles() {
-	local clib="gf"
-	has_version 'dev-lang/ifc' && clib+=" intel"
-	local slib="-lmkl_sequential"
-	local rlib="-liomp5"
-	local pbase=${PN}
-	local c
-	for c in ${clib}; do
-		local ilib="-lmkl_${c}_lp64"
-		use x86 && ilib="-lmkl_${c}"
-		local tlib="-lmkl_${c/gf/gnu}_thread"
-		local comp="${c/gf/gfortran}"
-		comp="${comp/intel/ifort}"
-		mkl_add_profile ${pbase}-${comp} ${ilib} ${slib}
-		mkl_add_profile ${pbase}-${comp}-threads ${ilib} ${tlib} ${rlib}
-		if use int64; then
-			ilib="-lmkl_${c}_ilp64"
-			mkl_add_profile ${pbase}-${comp}-int64 ${ilib} ${slib}
-			mkl_add_profile ${pbase}-${comp}-threads-int64 ${ilib} ${tlib} ${rlib}
-		fi
-	done
-}
-
-src_install() {
-	dodir ${MKL_DIR}
-
-	# install license
-	if  [[ ! -f ${INTEL_LIC_DIR}/${MKL_LIC} ]]; then
-		insinto ${INTEL_LIC_DIR}
-		doins "${WORKDIR}"/${MKL_LIC}
-	fi
-
-	# install main stuff: cp faster than doins
-	einfo "Installing files..."
-	local cpdirs="benchmarks doc examples include interfaces lib man tests"
-	local doinsdirs="tools"
-	cp -pPR ${cpdirs} "${D}"${MKL_DIR} \
-		|| die "installing mkl failed"
-	insinto ${MKL_DIR}
-	doins -r ${doinsdirs}
-	dosym mkl_cblas.h ${MKL_DIR}/include/cblas.h
-
-	# install blas/lapack profiles
-	mkl_make_generic_profile
-	mkl_make_profiles
-
-	# install env variables
-	cat > 35mkl <<-EOF
-		MKLROOT=${MKL_DIR}
-		LDPATH=${MKL_LIBDIR}
-		MANPATH=${MKL_DIR}/man
-	EOF
-	doenvd 35mkl
-}
-
-pkg_postinst() {
-	# if blas profile is mkl, set lapack and cblas profiles as mkl
-	local blas_prof=$(eselect blas show | cut -d' ' -f2)
-	local def_prof="mkl-gfortran-threads"
-	has_version 'dev-lang/ifc' && def_prof="mkl-ifort-threads"
-	use int64 && def_prof="${def_prof}-int64"
-	for x in blas cblas lapack; do
-		local cur_prof=$(eselect ${x} show | cut -d' ' -f2)
-		if [[ -z ${cur_prof} ||	${cur_prof} == ${def_prof} ]]; then
-			# work around eselect bug #189942
-			local configfile="${ROOT}"/etc/env.d/${x}/$(get_libdir)/config
-			[[ -e ${configfile} ]] && rm -f ${configfile}
-			eselect ${x} set ${def_prof}
-			elog "${x} has been eselected to ${def_prof}"
-		else
-			elog "Current eselected ${x} is ${current_lib}"
-			elog "To use one of mkl profiles, issue (as root):"
-			elog "\t eselect ${x} set <profile>"
-		fi
-		if [[ ${blas_prof} == mkl* && ${cur_prof} != ${blas_prof} ]]; then
-			eselect blas set ${def_prof}
-			elog "${x} is now set to ${def_prof} for consistency"
-		fi
-	done
-	if [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]]; then
-		elog "Multi-threading OpenMP for GNU compilers only available"
-		elog "with gcc >= 4.2. Make sure you have a compatible version"
-		elog "and select it with gcc-config before selecting gnu profiles"
-	fi
-}
diff --git a/sci-libs/oc/Manifest b/sci-libs/oc/Manifest
index 61464a41a963..2ac36354f0c5 100644
--- a/sci-libs/oc/Manifest
+++ b/sci-libs/oc/Manifest
@@ -1,3 +1,3 @@
 DIST oc-2.0.tar.gz 1104073 BLAKE2B a93fdf15fe085345dc547da51e5f99b4db18baab6126be73aa240e8c5092be0501abc606f556879c09bd41fe1ea4cb78df3c84472e2de3342853d67848b6aeb3 SHA512 e583fbacc8929ef5b2ae0d0f675816b8f46056b11987f8285688a7321d3dfd244a748be00f009f1b2c2b7f95e5a6ecc8eb8e907f81415e849f10a5ff138e82a4
-EBUILD oc-2.0.ebuild 634 BLAKE2B 0c505c9eb442f8f9ba382922fe2101b4f72e7c41fcec1539d3ab9c34567e6684c3156dd4652f98aead84bf568a7108b78b396770400a289acc59c254b09c426c SHA512 e51e7c1df679874dde3bc333de5ffa34adaafee3e023dd72758e6162c958539f78252e3bdd696cba75394e2d076079f5a9395c7bb21323716cfee76b1c9d246d
+EBUILD oc-2.0.ebuild 636 BLAKE2B 3a0834ab6eef87baab8f4dae8a2eeebb483888bb773efec173554d263dbbe8bd4aa1cf68da577b5a6a114cdf70c6187f77d41641171ab671f8b96d30904a9a79 SHA512 a6d9692deaa2544de2eeb843449c787dd98462cdc64520e4b068aa77a98e75c761f0452066a4a311a6700375e4d5146cd638868e63fe57a3a65bbc8fa13df2dd
 MISC metadata.xml 488 BLAKE2B 879f6287b16b3b05952542e86469779f217ae2f2481557aa5047e041773816de985a2bb3eb035a18d29c9de2d11e2c96e60ae39462c8ddbdd6595a928cac9560 SHA512 bce557be392b00cdf54e6448ed69c555497e67484fdd9663e72c041fb6ab2c4f8ba82469a9d950be7393358a07dbeb1d4f5528d221c738ecafac43029cfddc92
diff --git a/sci-libs/oc/oc-2.0.ebuild b/sci-libs/oc/oc-2.0.ebuild
index 24434e06661f..ee688999d5dd 100644
--- a/sci-libs/oc/oc-2.0.ebuild
+++ b/sci-libs/oc/oc-2.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Network Data Access Protocol client C library"
-HOMEPAGE="http://opendap.org/"
-SRC_URI="http://opendap.org/pub/OC/source/${P}.tar.gz"
+HOMEPAGE="https://opendap.org/"
+SRC_URI="https://opendap.org/pub/OC/source/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/sci-libs/oce/Manifest b/sci-libs/oce/Manifest
index fe29e968db28..084a5f6595b7 100644
--- a/sci-libs/oce/Manifest
+++ b/sci-libs/oce/Manifest
@@ -1,4 +1,4 @@
 AUX oce-0.18.3-test-fix.patch 1273 BLAKE2B 40c3fec8e3d5b703c39a2eee32d663e6dc7c6a1bad6a9885608679cb86f8047d6a50e1f625beac50dca045393f0d0290b5ca9d56a7498ba869a4af5028eb1fa0 SHA512 822bee12ee259801a3a242d3877fa3c6dd07043f65857d635a4790cdfd936be4016d1441e4dd3b8e7ff1cd1d187d1ab8fc7634e39376e91d06d8666d38632689
 DIST OCE-0.18.3.tar.gz 24633768 BLAKE2B c1923fb6310ea30318251fedac371655a575bf4dfcc4c38e7c748d316416e08c33a3f27bd5db7f5b437265cf2f518651d69a6920f9f487dc7e0065a6406c653f SHA512 6fdeb6ca4ce25361379872ccc465799d4a43407974c4f626b32df695e582b9e553cce17af6a6a7ff46ebed9b813d910ad23eb308a5356dabb9b9bbd4f42a8636
-EBUILD oce-0.18.3-r1.ebuild 1809 BLAKE2B d2c1de828d9b1845077f114fe78af3061bcb3d30d15217144c21c6b7f2cadade1b0b3370f8802602ef6397c39956c58f7a0a933e237955afbb197fe2486b3369 SHA512 9537e2bf8ff0234ddbb87c9e4ac42021545167e544f10f947b8f24cdf90bbb319247f213d75ffdf36419e5a8df111d302d44f57586442184f1b124e3d2d23dfe
+EBUILD oce-0.18.3-r2.ebuild 1753 BLAKE2B 082fa7ed288dadee1c41b1101b2b7b39f25a2a8bd7885c48b41d2e6e47cc5be27fdab6a0b93a1a802a284c9875a429544c54ef3d3feebfafe474f3ce4cb431a8 SHA512 5b7f1ca1b72a45dc034ca6440ce9eb7474acd880947097a6fe14b2889992ddc844cfe0d89905883bc0eed3b9858a6af76342aa51cd4943be0231b8b9810515f7
 MISC metadata.xml 900 BLAKE2B aec66b3c98aaaadf1727f4522a79ad01e8d195ac62799a5112a2d61ca9d916635ff110f99840f97ebad81a1324780d15218757c1b982536ae9e14945699e6b5b SHA512 86a44a573579df2416b949b62fe931172681f36bf7af9f90f7224e3fc433cb7091c3ef757581337aa87d80962a4800fa03e005e5360233f570f7d926553735ba
diff --git a/sci-libs/oce/oce-0.18.3-r1.ebuild b/sci-libs/oce/oce-0.18.3-r2.ebuild
index 0835a64d2bf5..1ff4e66c4a60 100644
--- a/sci-libs/oce/oce-0.18.3-r1.ebuild
+++ b/sci-libs/oce/oce-0.18.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eutils check-reqs multilib java-pkg-opt-2
+inherit cmake check-reqs java-pkg-opt-2
 
 DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
 HOMEPAGE="https://github.com/tpaviot/oce"
@@ -15,8 +15,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="examples freeimage gl2ps +openmp tbb vtk"
 REQUIRED_USE="?? ( openmp tbb )"
 
-MY_P="oce-OCE-${PV}"
-S="${WORKDIR}/${MY_P}"
 DEPEND="
 	dev-lang/tcl:0=
 	dev-lang/tk:0=
@@ -31,7 +29,7 @@ DEPEND="
 	freeimage? ( media-libs/freeimage )
 	gl2ps? ( x11-libs/gl2ps )
 	tbb? ( dev-cpp/tbb )
-	vtk? ( =sci-libs/vtk-8.1*[boost,imaging,qt5,python,rendering,views,xdmf2] )"
+	vtk? ( =sci-libs/vtk-8*[boost,imaging,qt5,python,rendering,views,xdmf2] )"
 RDEPEND="${DEPEND}"
 
 CHECKREQS_MEMORY="256M"
@@ -39,12 +37,14 @@ CHECKREQS_DISK_BUILD="3584M"
 
 PATCHES=( "${FILESDIR}"/"${P}-test-fix.patch" )
 
+S="${WORKDIR}/oce-OCE-${PV}"
+
 pkg_setup() {
 	check-reqs_pkg_setup
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -65,11 +65,11 @@ src_configure() {
 	use openmp && mycmakeargs+=(
 		-DOCE_MULTITHREAD_LIBRARY="OPENMP"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# If user asked for samples let's copy them to the docs folder
 	if use examples ; then
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 2c21b42dd6be..aea16f086ed1 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,8 +1,5 @@
+AUX dont-clobber-fflags.patch 1251 BLAKE2B 7451d67e8676be33c2070b9eea767d24d961eff708eec3f6544b68228963166138f844f51dde8d48f723412ce0fcb6d0da427d298c652156da56d34073a1c82c SHA512 d06cd469749c88c69e2bdab01b5c0c67105a756a6d4c3704842335261ad57f6e898ceb73943487396178ae99ccf2ee3e551ae5881996af54e36fb951c6be43dc
 AUX shared-blas-lapack.patch 5557 BLAKE2B 1e41b18e5a9c12eec9283c835e9b09e4ca89c6512f47a2f158f29c8a8a822d0365ad350177e379bec13f7c7574d8debd55a2f612027ff661c67ac7b226bb2370 SHA512 baa23f0c2bc8b7bc3384d7b8fa20eb5e095f20e1d8859badb55e680ccd435a851da6099b20aa203e46d62096ac93663ea130bea04dabf19432522e53139d393b
-DIST openblas-0.3.6.tar.gz 11923774 BLAKE2B 0133b83a4449fd7f86d6379129be4e4477df338d0a402a7787eec317838922b175315c6e6b014a2c7ed6aa1c58509a28f6b48c641e043af067434c4315f1fdb1 SHA512 e432ae8bfbdc8e8c6336553e05181ab38576164c140ef2a6ddb2a66479f724bd4e60a2c90f7bc15bf18eefa7045e7775dedae421fb71296b8d250132c2407b07
-DIST openblas-0.3.7.tar.gz 11991860 BLAKE2B c4eebcbdda8c15ce384195bd2a57d3638b9a8fa9a0484dc3af9dcef0543e7bbfd8444b65ede36379f2182a9bd3df085070210d289c916dfa428da7ab6889eb43 SHA512 424d1c9c6fd97f6af4fdb7d7dce320cf5eab867a027e576531e39df934358736c4efab88782f781ec8f4afa8d992544040e3bbff3a4736c20cf4256d3a8e517d
 DIST openblas-0.3.9.tar.gz 12189745 BLAKE2B 3cc4c6a403d6a52845cf4ff8cef254f57587e17e3d09bfb6ed7c02ad06a6002e50b340177c73a944c2a621c12b7f494c516025751c194d019662c0b4db17f4dc SHA512 c6b8ee465f1cf53b37f21ec3ff9a28d5cafe20fec59d8c1bff5923a9e1989dfa5ae8c032a5d43988fe7722ed08c64c7957a3d30e6ae917e2e7aa2977a91e67a3
-EBUILD openblas-0.3.6.ebuild 3527 BLAKE2B b96c8f9ea59e8c485e956f234e421f4468e2be9c168dce8d9ed035ea34a87fb2bd1630595cad5f35de38f004b14eb524d2ef09e2d57e1516aa60febafc063928 SHA512 d0d36364c374348f6d19640d9025f8b23ccb78cff10290433411a1eee37345e35b6b4dd80991cf0411dac042e8151ba4f4f5a0cb724ffa80063ca3e32f778eac
-EBUILD openblas-0.3.7.ebuild 3527 BLAKE2B b96c8f9ea59e8c485e956f234e421f4468e2be9c168dce8d9ed035ea34a87fb2bd1630595cad5f35de38f004b14eb524d2ef09e2d57e1516aa60febafc063928 SHA512 d0d36364c374348f6d19640d9025f8b23ccb78cff10290433411a1eee37345e35b6b4dd80991cf0411dac042e8151ba4f4f5a0cb724ffa80063ca3e32f778eac
-EBUILD openblas-0.3.9.ebuild 3527 BLAKE2B b96c8f9ea59e8c485e956f234e421f4468e2be9c168dce8d9ed035ea34a87fb2bd1630595cad5f35de38f004b14eb524d2ef09e2d57e1516aa60febafc063928 SHA512 d0d36364c374348f6d19640d9025f8b23ccb78cff10290433411a1eee37345e35b6b4dd80991cf0411dac042e8151ba4f4f5a0cb724ffa80063ca3e32f778eac
-MISC metadata.xml 884 BLAKE2B a2fa7ef571e7fa3a5390f73e40f58fe54b156e9a706c046e88b844de341b0689b8a5fe996fa31ea48f913bfbf064271983d065dd1ada7109212240bcb766317a SHA512 088a07f3bb464717bd8403c9547def9c361b1d0c9f3e5d3398d93c7d8f7b54b4ec47ec82b4d72409ad926a6e49fc297cdbe43b7ea199cf1d64ac27091930868d
+EBUILD openblas-0.3.9-r1.ebuild 4076 BLAKE2B 672d56f31f5148e878eb6b4cd2b5200e1d844d9f3e5e8d0bd0583c3052c4b15fa42fcbf4195c6a3c3a855b6b68f2a6e20f8bb129cff40ea268895972bd3b44e4 SHA512 82087864918ad0ac4777b88d5b5ec2036b7b2040d5b30af8247d960b8f460561d7215ca459087fe012ca537e65ac6fbb98c542d5bd1f57a1a9f25c940b33dc85
+MISC metadata.xml 1460 BLAKE2B 22d1770bd4a58a0be80b7b1b04a7a6909d6bc7ff166a242c46294a1d39f5adf928c9e6f00835b79ef1c2df1747efa3b04d9b380a964581eeb963ea17e453ec9b SHA512 da3e981cab096d3bc18077ac210ccb1b91350418969549467c22f286196b18fb080eeb8a6183247b47de65cbd0a7fb67a16f2e46911aac6c5e9e9f01c193764f
diff --git a/sci-libs/openblas/files/dont-clobber-fflags.patch b/sci-libs/openblas/files/dont-clobber-fflags.patch
new file mode 100644
index 000000000000..21bbec4b1b3b
--- /dev/null
+++ b/sci-libs/openblas/files/dont-clobber-fflags.patch
@@ -0,0 +1,31 @@
+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
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index a22e16ba..2bae565e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -248,7 +248,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 "POPTS       = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
+ 	-@echo "FFLAGS_NOOPT       = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc
+ 	-@echo "PNOOPT      = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc
+-- 
+2.26.2
+
diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index fa16b081f106..0661dad2eee9 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -1,24 +1,40 @@
 <?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="person">
-		<email>lumin@debian.org</email>
-		<name>Mo Zhou</name>
-	</maintainer>
-	<longdescription lang="en">
-		OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.
-	</longdescription>
-	<use>
-		<flag name="dynamic">Build dynamic architecture detection at run time (for multi targets)</flag>
-		<flag name="eselect-ldso">Enable BLAS/LAPACK runtime switching</flag>
-		<flag name="index-64bit">Compile a separate INTERFACE64 OpenBLAS</flag>
-		<flag name="pthread">Build with pthread threading model</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">xianyi/OpenBLAS</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>lumin@debian.org</email>
+    <name>Mo Zhou</name>
+  </maintainer>
+  <longdescription lang="en">
+    OpenBLAS is an optimized Basic Linear Algebra Subprograms (BLAS)
+    library based on GotoBLAS2 1.13 BSD version. It was forked when
+    Mr. Kazushige Goto left TACC and GotoBLAS became unmaintained. In
+    general, BLAS is the computational kernel ("the bottom of the food
+    chain") in linear algebra or scientific applications. Thus, if
+    your BLAS implementation is highly optimized, the whole
+    application can substantially benefit. OpenBLAS has optimized code
+    for modern architectures, and has accrued many other features and
+    bug fixes beyond GotoBLAS.
+  </longdescription>
+  <use>
+    <flag name="dynamic">
+      Build dynamic architecture detection at run time (for multi targets)
+    </flag>
+    <flag name="eselect-ldso">
+      Enable BLAS/LAPACK runtime switching
+    </flag>
+    <flag name="index-64bit">
+      Compile a separate INTERFACE64 OpenBLAS
+    </flag>
+    <flag name="pthread">
+      Build with pthread threading model
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">xianyi/OpenBLAS</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/openblas/openblas-0.3.7.ebuild b/sci-libs/openblas/openblas-0.3.7.ebuild
deleted file mode 100644
index 9aa17003313d..000000000000
--- a/sci-libs/openblas/openblas-0.3.7.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit fortran-2 toolchain-funcs
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-SRC_URI="https://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${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"
-REQUIRED_USE="?? ( openmp pthread )"
-
-RDEPEND="
-	eselect-ldso? ( >=app-eselect/eselect-blas-0.2
-			!app-eselect/eselect-cblas
-			>=app-eselect/eselect-lapack-0.2 )"
-
-DEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/shared-blas-lapack.patch" )
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use openmp && tc-check-openmp
-	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
-
-	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() {
-	emake
-	emake -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="${D}" OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
-		OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir)
-	dodoc GotoBLAS_*.txt *.md Changelog.txt
-
-	if use eselect-ldso; then
-		dodir /usr/$(get_libdir)/blas/openblas/
-		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
-
-		dodir /usr/$(get_libdir)/lapack/openblas/
-		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/openblas/openblas-0.3.6.ebuild b/sci-libs/openblas/openblas-0.3.9-r1.ebuild
index 9aa17003313d..b0daf6becad6 100644
--- a/sci-libs/openblas/openblas-0.3.6.ebuild
+++ b/sci-libs/openblas/openblas-0.3.9-r1.ebuild
@@ -2,17 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit fortran-2 toolchain-funcs
+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/tarball/v${PV} -> ${P}.tar.gz"
+SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV} -> ${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"
+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
@@ -21,11 +22,20 @@ RDEPEND="
 
 DEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/shared-blas-lapack.patch" )
+PATCHES=(
+	"${FILESDIR}/shared-blas-lapack.patch"
+	"${FILESDIR}/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 && \
@@ -34,6 +44,10 @@ pkg_setup() {
 	# 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;
@@ -54,8 +68,10 @@ src_unpack() {
 }
 
 src_compile() {
-	emake
-	emake -Cinterface shared-blas-lapack
+	# 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
@@ -71,14 +87,12 @@ src_install() {
 	dodoc GotoBLAS_*.txt *.md Changelog.txt
 
 	if use eselect-ldso; then
-		dodir /usr/$(get_libdir)/blas/openblas/
 		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
 
-		dodir /usr/$(get_libdir)/lapack/openblas/
 		insinto /usr/$(get_libdir)/lapack/openblas/
 		doins interface/liblapack.so.3
 		dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
diff --git a/sci-libs/openblas/openblas-0.3.9.ebuild b/sci-libs/openblas/openblas-0.3.9.ebuild
deleted file mode 100644
index 9aa17003313d..000000000000
--- a/sci-libs/openblas/openblas-0.3.9.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit fortran-2 toolchain-funcs
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-SRC_URI="https://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${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"
-REQUIRED_USE="?? ( openmp pthread )"
-
-RDEPEND="
-	eselect-ldso? ( >=app-eselect/eselect-blas-0.2
-			!app-eselect/eselect-cblas
-			>=app-eselect/eselect-lapack-0.2 )"
-
-DEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/shared-blas-lapack.patch" )
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use openmp && tc-check-openmp
-	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
-
-	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() {
-	emake
-	emake -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="${D}" OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
-		OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir)
-	dodoc GotoBLAS_*.txt *.md Changelog.txt
-
-	if use eselect-ldso; then
-		dodir /usr/$(get_libdir)/blas/openblas/
-		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
-
-		dodir /usr/$(get_libdir)/lapack/openblas/
-		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/orocos-bfl/Manifest b/sci-libs/orocos-bfl/Manifest
index 41acf77aab0c..bccb1fdf372b 100644
--- a/sci-libs/orocos-bfl/Manifest
+++ b/sci-libs/orocos-bfl/Manifest
@@ -1,3 +1,3 @@
 DIST orocos-bfl-0.8.0-src.tar.bz2 212899 BLAKE2B 86e4161ffd627a8546a70ce0a577aa965475e70429861578e46aa4e67ca06c42784790c65c712ad7da80b6e414901731b222f712a7983f112b4026f9c3acdd15 SHA512 045bbc415feec66206774a8bdea3843a7edf233d221bd639b1dcc01906386ff55f114a9685e1008b741ae895e6aef33641a1eab67cb106d23a085d77f1a937d5
-EBUILD orocos-bfl-0.8.0.ebuild 1305 BLAKE2B c2a386d9f649d426cf1c51df88c0ecf8e88d58cb6cc4047740533a8731f0ac29328cab3352d491b28695294dd59ffafc631a78abbc3cbbc3fe26fd99b3c9b359 SHA512 4c81ad611714506c0340f3d6cb493f1d4cd510dccffc774f05864d8fed5c4343280147b87f9d1c1f5657c350953ed8fd6ac6ebd2320ec3a6cf155c6cb7c9a9f1
+EBUILD orocos-bfl-0.8.0.ebuild 1307 BLAKE2B f2557d604813f731232e194419022b4f0678b89989af981599506ae158bc87bcab2277ba31213fa9b57b7a879d7d8c1a96ee9aeeaa3040eab4ca11cc2299596d SHA512 c5deb5cdfa05654b01852c4f19063b942d5253b582b995cccfa55722351a06565b6df01cb0eedaf43738185207754487338d8c218462a445a1b0088cf57edb8c
 MISC metadata.xml 603 BLAKE2B 18aa0b2928931ace7b5af80d4efa46d1f63023e9c30f45499a0cf416cfe74927570292d95641eed606a4d66858460d3a7f6de43ba061a5049e1aee2758e7ee8a SHA512 e4c29ba5a7a3cbe373fcbb4b69ca3ce99e6e092585f3d27af31469949f4ca28a6bf2d4b1850271ddc7c7bc2c70b43bf27411e9fcdef2039c3e0f0949523ded6c
diff --git a/sci-libs/orocos-bfl/orocos-bfl-0.8.0.ebuild b/sci-libs/orocos-bfl/orocos-bfl-0.8.0.ebuild
index 9b1481d44678..bc79a85db067 100644
--- a/sci-libs/orocos-bfl/orocos-bfl-0.8.0.ebuild
+++ b/sci-libs/orocos-bfl/orocos-bfl-0.8.0.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
@@ -6,8 +6,8 @@ EAPI=5
 inherit cmake-utils
 
 DESCRIPTION="Bayesian Filtering Library"
-HOMEPAGE="http://orocos.org/bfl"
-SRC_URI="http://people.mech.kuleuven.be/~tdelaet/bfl_tar/${P}-src.tar.bz2"
+HOMEPAGE="https://orocos.org/bfl"
+SRC_URI="https://people.mech.kuleuven.be/~tdelaet/bfl_tar/${P}-src.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/sci-libs/orocos_kdl/Manifest b/sci-libs/orocos_kdl/Manifest
index 29473615bef2..6a76399448fc 100644
--- a/sci-libs/orocos_kdl/Manifest
+++ b/sci-libs/orocos_kdl/Manifest
@@ -1,6 +1,6 @@
 DIST orocos_kinematics_dynamics-1.3.1.tar.gz 202471 BLAKE2B 46b7bdb62c09e9077b84d914b4d780995f27d486d9c734ef2ee1f8b8c2219265cdba5e63830225e2435b5760b79f00d478670e95b71666959afa773f8bcfe5ce SHA512 93abd9dd5aef3710f784f9db8eea4738458bffa5295923993e2d77656c18f7354559412fb7eb5f1e9da7112de19aa36d3f0f68f149852f955bce960fd3b719e7
 DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
-EBUILD orocos_kdl-1.3.1-r1.ebuild 1645 BLAKE2B 3e62191752f89fac3d0834f487152fe96aee63324c3084a7561e0133316c204beccacb70090eb7ffb7cafbdc9a473d4eda7504d6082677c48b96712961ea5951 SHA512 5fae87c172ceee4806ff38fadafab94cfbe5b586109917356a18be4a7cab30e1e9d3726a71ba3865330aecc81b3dfd43c2555b3dc76354bc573c321ff75204fd
-EBUILD orocos_kdl-1.4.0.ebuild 1648 BLAKE2B f5191706dc5cf443c3088dcf96d2ffb705f5934c8fd9258fb009ebc7309f13f0433379cf98ea128cbc23037b0235e79ef9cc650dab271d8584457c1082362d0b SHA512 c68229f5e2687697826d8d89305c78b948398b56041098d3856e53aefdb28a6bf137900a0f6b27e9ff47da03e9e9190c07896ead1323ddc994aea05a10d6917d
-EBUILD orocos_kdl-9999.ebuild 1648 BLAKE2B f5191706dc5cf443c3088dcf96d2ffb705f5934c8fd9258fb009ebc7309f13f0433379cf98ea128cbc23037b0235e79ef9cc650dab271d8584457c1082362d0b SHA512 c68229f5e2687697826d8d89305c78b948398b56041098d3856e53aefdb28a6bf137900a0f6b27e9ff47da03e9e9190c07896ead1323ddc994aea05a10d6917d
+EBUILD orocos_kdl-1.3.1-r1.ebuild 1646 BLAKE2B da6283dc04b4edaf59a88818764dab2d65756c3702a6cafe67a495e767be7932a89d8fc4f0f3fc32c0ea6f49841a1dddad0f117f043a44f6ebbb91e7ec047707 SHA512 bbeb90da6a14f6d7d1656535207bacce3385b300fcfa017acda21d674a9f8fcbf752bb020a82432d397484c3344cddaea1836c57946a6f71a4c3a8117ca4e5e0
+EBUILD orocos_kdl-1.4.0.ebuild 1649 BLAKE2B 724d04a6ba1eb9726a0321f090d8300f5d77ef675fad7656a4b94e5885409fbb92c71b89f1301969d2c007bb2d3c0901c05667ea1b51f6c5d63b834a6a894634 SHA512 fdb4f9996afac17294ce5c00390e91f9709025f746cb6551123f279e1b899e352054007f13ba140ae07ee7633987bed292fa0ccc9d510022e192957c89d6bc4f
+EBUILD orocos_kdl-9999.ebuild 1649 BLAKE2B 724d04a6ba1eb9726a0321f090d8300f5d77ef675fad7656a4b94e5885409fbb92c71b89f1301969d2c007bb2d3c0901c05667ea1b51f6c5d63b834a6a894634 SHA512 fdb4f9996afac17294ce5c00390e91f9709025f746cb6551123f279e1b899e352054007f13ba140ae07ee7633987bed292fa0ccc9d510022e192957c89d6bc4f
 MISC metadata.xml 934 BLAKE2B d82ddb6554a65a4221e67f46cfc6ff218c8caff71662090cd22332bc8f77c88b54c0ed8a7ccde53f00c6ef9c7faa386a82ca4654652ed7876c84105cd4426451 SHA512 09dc8b8c362da950ea685ee6cb2d7eb3ee400f34fca286fa0bf064f3cc4338a5ad2ca8917c951211e9407122a3bd7a1f23e5d394bfed901d6f69e9caefe5eaed
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
index a2d743e268b4..e45b79724fb4 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.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
@@ -20,7 +20,7 @@ else
 fi
 
 DESCRIPTION="Kinematics and Dynamics Library (KDL)"
-HOMEPAGE="http://www.orocos.org/kdl"
+HOMEPAGE="https://www.orocos.org/kdl"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="doc test examples models"
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild
index d3860db1a16d..80637a8fa224 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-1.4.0.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-1.4.0.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
@@ -20,7 +20,7 @@ else
 fi
 
 DESCRIPTION="Kinematics and Dynamics Library (KDL)"
-HOMEPAGE="http://www.orocos.org/kdl"
+HOMEPAGE="https://www.orocos.org/kdl"
 LICENSE="LGPL-2.1"
 SLOT="0/14"
 IUSE="doc test examples models"
diff --git a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild b/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
index d3860db1a16d..80637a8fa224 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-9999.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-9999.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
@@ -20,7 +20,7 @@ else
 fi
 
 DESCRIPTION="Kinematics and Dynamics Library (KDL)"
-HOMEPAGE="http://www.orocos.org/kdl"
+HOMEPAGE="https://www.orocos.org/kdl"
 LICENSE="LGPL-2.1"
 SLOT="0/14"
 IUSE="doc test examples models"
diff --git a/sci-libs/scikits/Manifest b/sci-libs/scikits/Manifest
index cf5a81b059d4..4125fd76b5d2 100644
--- a/sci-libs/scikits/Manifest
+++ b/sci-libs/scikits/Manifest
@@ -1,4 +1,4 @@
 DIST scikits.example-0.1.tar.gz 2401 BLAKE2B 4c67adb2e74be9c94d68e99bf44017eb75c054608b69045523c5cfeee18edb01384640e8ed3cba4765bc181e7dfb9a2e70d1a97ad2b6176d2df7112172adce55 SHA512 9e5534a9f12f5a11e7f9d7c3d4f16cdbfa34293b29882e6bc9ec597b6e7ac306cc65e2b197da8c0bfc8e319b01db31f34b06018b5420c3ad68e8cc3f490259e1
 EBUILD scikits-0.1-r1.ebuild 738 BLAKE2B 567a32a5ab294ba1d053bcbebf68da3998c633f9e6a943180bc968a2ac0b2ea5140ace14456b77f499ecc4b20dd82417e74c8a5959c8245e43cfd95ec2fc9f0d SHA512 c2c03a129d86ca4e68a99302375a811abfa4a750750425713c91d51ef58ba203bbd46e4ddd2f9f2841b9d61f4a5c06da6b8bb9b2111e56111d581028d73d535b
-EBUILD scikits-0.1-r2.ebuild 742 BLAKE2B 7a9f7681cd5688149fed5f7a54abc1e955006e0dd466c0301892a2d0e2e78c433788112cfab1d7eb6e851dca08def7840ddeb919b82cbdb7c7b44010781d95ee SHA512 fa4fbb0adbc65ea1a747ed150b67d0d5457e2ed689df46b04d658ae6a8a4f6082c66335c6e70a090e1fddb3d914e284fa365897cd5f7f92f842f4cd81370ff03
+EBUILD scikits-0.1-r2.ebuild 749 BLAKE2B da0b7d7ae2ee6d0e8af2d277b17de955a52fb8323691209c855324171a3266c2ba6e54f92ff04ea6becb7a5f9cded3a890f677e391fbf3f65e6bdceeac357074 SHA512 9af97c5f23da57c0b7013e56618451a349503c96dc3fa0fbbe4ead73a35033744a5426d53abdf64b90fb176a711b738e601c1678df38944cb5051b35a610eb28
 MISC metadata.xml 454 BLAKE2B 65b13370ebd7fdc79632a088b403f493076c87a0ccc49b64946c7ed0050fcfd85f7ac0fce2fa853e1be0944d0ee1628470dadb4124448e7a746bdb864ffe9977 SHA512 b33fed7d1199471c4a86dadf1aa90951035fe49c76df9310de4ed13c391b92782230308a55a33c7fa88f5bd42b8718fe5f6ac88c0a8c1818848a447c4c1d0eb8
diff --git a/sci-libs/scikits/scikits-0.1-r2.ebuild b/sci-libs/scikits/scikits-0.1-r2.ebuild
index fd16206e1caa..921faa267648 100644
--- a/sci-libs/scikits/scikits-0.1-r2.ebuild
+++ b/sci-libs/scikits/scikits-0.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}.example/${PN}.example-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index eb90fd3650db..f4d13ab78455 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -7,5 +7,5 @@ DIST scikits_learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e6
 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 1757 BLAKE2B 608ddd71de9cf35581e880e972ed4b93a3a1126ac7aa112ca6072ada218e4fc6fcaae060d1699347fd981d7f2d11f885d984a521857bcb03bc79b28d5c2605a3 SHA512 0c3fd91a18eb48545a0bb02ebc2739ac04873d46151101ec7eecac30e7ad2c9b67392d4919fb60e626dada56655cb53ef3558e32a71bf77505bc6ab1121386fa
+EBUILD scikits_learn-0.22.2_p1.ebuild 1764 BLAKE2B d3e6613bb5b314db9a52d68197a6dd82e65afcec908c55e5156598cdaab93fa4e6b9f3b972fad326a423b62508410926bfef38128c1c7b617842c9ed28f5f91b SHA512 2667395c3add51180d1c5886100daad3ae6607db383da139be626272de662dbd4870e647bb97171d416b175e5a50e04ea962346f8d80b8dd6b4f608d1bbf3e28
 MISC metadata.xml 605 BLAKE2B 46a657647a79f0a23cc07b39877b1e57158cdf94d9478c3aa4e7af0dbdbf60acf996d1431076697db764d42bec0d5e0517c1247e91dc36e85823a45784d00e71 SHA512 e14b6835108fa80eca44bab635c9a229da65f048ffcee16cd4ad7736c3a0fb364c94ff0bd9630030653bd3cd78d8dced191c43c7e5aacb3a7f6e61ac45b5bb3d
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 3e4407171f76..aaf2a275fbbf 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
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 809afb60e31f..150d44f869cb 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -5,6 +5,5 @@ DIST scipy-1.4.1-html.zip 61414053 BLAKE2B e1f0c1a7a8941958512dcc3c0f40ef4a590ba
 DIST scipy-1.4.1-ref.pdf 41100747 BLAKE2B 8e56af69d0bffbe6eff73bfc5bb674aed3b80bdd80d59b58a1835f996c992306a059c2992d74c411e762490c526262753d33273613ed389928845c65eb6546b2 SHA512 76946f3b506fe22a595b70e5a418982257dd59db1a2e9af508cc1cab59d47ba4fc5951388e676f2a513043a6b3391ef853242e78d7feb99a6c21d19f6dca2b58
 DIST scipy-1.4.1.tar.gz 24555206 BLAKE2B e35f6234404839cbd24d463c8cc2f1ea66aed91534e700fd54a623df40d069b14fc220f96af04c78d13b773bfc5461559e59b0bd9b836d7953f9249ccd7cae54 SHA512 79407a2cbb4ba29c0941570181df4d7835e5791e50a3abef9b63c2fc5b15308a2e4964eb71cdebbee8cd2dcb8e497cf92fe50ee21fb12cac3013ea5e0466b25d
 EBUILD scipy-1.1.0.ebuild 3988 BLAKE2B eb0714420ffe87dcd9d8704316be2feb69e24c4f8c76ada3c6d4c87c7d8617d887f18b030e9dd907ce1b5eb4684932f72a987c2449a9dbcc45270e462e1b8b87 SHA512 85823a954133330fc038e7a9b936b1454d3a2e368d709041f0f9195b9bb839a2e3aeef2f0d2a942b09df265d04cc5d4b474377e57ca4281317340272bfffce16
-EBUILD scipy-1.4.1.ebuild 4070 BLAKE2B 91670aaa9dff2358f32b116a14e98435e9dfebce8730e0d74ecb52d528644f0dc596212af0092d970b8918e1311262e11f3a36c35d499da62f1b918865122d8a SHA512 0bcbddf8264d87fc38fe582904c18b9e8cbba49e4dbab4bc5371690540f38b191f7a55b89de5190105aba2ca07901751ea32075176094a1fd092053f6ac25d6e
-EBUILD scipy-9999.ebuild 3601 BLAKE2B 3a86b12c2989b9e64ff97119fbb6cea242179287362010f7d3e82ad0298c207a6318217f81626d18549252383a04cc107861b0283420eae2c1ce990fb7252f18 SHA512 3128f47231149e78818440f2ade24d4ca5c51f8e4a89c93e3e4da2fb2303e60a50f2f65b3c5bc32b42ebd0bd25c77cbb7017f2750367eaf7a21ffd3adcef947a
-MISC metadata.xml 931 BLAKE2B 3e358fcc4354b870a4794f13ed6c840f2c55ffdf4d6306977e6db3606b73e7df9b682a18973f0aa2a1d0d9eabb2d7d40c6aa5c6026813385361700bdc227afd8 SHA512 ae95726c4c661a2e5708a98b347f8ea25708574bbaf8ec86f315069551d6a0d68a43279b214be8b54cd20e5aacea1a9abd40a2de43d51f292a830cab0955d625
+EBUILD scipy-1.4.1.ebuild 4023 BLAKE2B aea0614894314a155782ea43dd444828291b3ad3a537a8072e98d5e4adab932c577fa0c8c440c2d16dbb5b80dd660fedc2b5e27086b689ce9cc4ac7eb1b973c3 SHA512 b78d0d2722d35757938d607b02076e1999e41a25e1f59a6b5033c20e142ece4ec3476c6d68f3e4ffdc6ab258829fb0611a9da1cd119650397a09ac3219eee5a1
+MISC metadata.xml 1038 BLAKE2B a17718312d2d1ead8646e838b2704c14a9f21be8c59fbc0cd8544ab45bdb28005443be05f3a9f5671581f0f28e3cf7507131e2baad5e7b128a452d1ca3fae19e SHA512 2ee6a44a4f32d34f52eb1a0bb787907c31d22c15af597c8db8820df72cafcbba72201c5157b60dede7df4ff0ba48847e8f764c5a67a0b7efacabe1b9fa9bd74a
diff --git a/sci-libs/scipy/metadata.xml b/sci-libs/scipy/metadata.xml
index a4d8cf789821..f1d093c366af 100644
--- a/sci-libs/scipy/metadata.xml
+++ b/sci-libs/scipy/metadata.xml
@@ -5,6 +5,10 @@
     <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
diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild b/sci-libs/scipy/scipy-1.4.1.ebuild
index 5de99c92dbd7..8babb5d3237a 100644
--- a/sci-libs/scipy/scipy-1.4.1.ebuild
+++ b/sci-libs/scipy/scipy-1.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}
@@ -21,9 +21,9 @@ SRC_URI="
 
 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 )"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 CDEPEND="
 	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
@@ -99,6 +99,10 @@ python_prepare_all() {
 		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
@@ -118,13 +122,11 @@ python_compile() {
 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}"
+	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() {
diff --git a/sci-libs/scipy/scipy-9999.ebuild b/sci-libs/scipy/scipy-9999.ebuild
deleted file mode 100644
index 574e02209628..000000000000
--- a/sci-libs/scipy/scipy-9999.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-DOC_PV=${PV}
-
-inherit fortran-2 distutils-r1 flag-o-matic git-r3 multiprocessing toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="https://www.scipy.org/"
-EGIT_REPO_URI="https://github.com/scipy/scipy.git"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="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.23.4[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )
-	"
-
-RDEPEND="${CDEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt THANKS.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-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_compile() {
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile \
-		"-j $(makeopts_jobs)" \
-		${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"
-	einfo "Run test I"
-	"${PYTHON}" -c \
-		'import numpy as np; print("relaxed strides checking:", np.ones((10,1),order="C").flags.f_contiguous)' \
-		|| die
-	einfo "Run test II"
-	# https://github.com/scipy/scipy/issues/5426
-	"${EPYTHON}" -c \
-		"import scipy, sys; r = scipy.test('fast', verbose=2, raise_warnings='release'); sys.exit(0 if r.wasSuccessful() else 1)" \
-		|| die "Tests fail with ${EPYTHON}"
-#	"${EPYTHON}" -c \
-#		"import scipy, sys; r = scipy.test('fast',verbose=2); sys.exit(0 if r.wasSuccessful() else 1)" \
-#		|| die "Tests fail with ${EPYTHON}"
-}
-
-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/spqr/Manifest b/sci-libs/spqr/Manifest
index 06b7fc018af0..8567aff42fbb 100644
--- a/sci-libs/spqr/Manifest
+++ b/sci-libs/spqr/Manifest
@@ -4,5 +4,5 @@ DIST spqr-1.3.1.tar.bz2 1115795 BLAKE2B 027509745cd336d3ccff27a4f36e51493fb9008f
 DIST spqr-2.0.9.tar.bz2 2161068 BLAKE2B a662983d2543a65ce36a367749db5585308acb56b016f69a35c46a84e9c12a678f57a3cfd459cc2e887fff2819b00f99981efaadb73831f1b4c54cbef5e1c367 SHA512 54b203e0d68b266473b8a2b7b3b3a55476df54a3ebd5748b70faa7bad1d0a5a7387197f0674ba5f9a5d45887daa736117f8d6ffbbc2eb02482b3374a3babf721
 EBUILD spqr-1.2.3-r1.ebuild 909 BLAKE2B bf187af15da7e38f9b79f089768236f04c8794373d043b1fc13562ce0c5466bd80777bc0299973003306b87db45a7a9f3b2a4fdf6161ee2e11df2f3219d5de58 SHA512 752f56b943603df13cdfa90c428eb379adf004f893b1fd966193b6a650c07c0af1a8236f6d015fd451b848bddc5a9f18b408adcbd521c76f0e90792ebb585cbc
 EBUILD spqr-1.3.1.ebuild 752 BLAKE2B a96d5e8a948366fef4cc7fa2ba7d618f19f1bd17998a162e7501fe75fead8c697efe96cb0f78ed7a9329aa6d73bffea3106bdae9aeba489df92634c21b5ec98e SHA512 b97e9f20ceae34ce31edeed18eeaf1d809fbdaf883e5496ebd277f6c11b46fc139375cfca13718661fa36b127909a6e61cd9ee62d3b2b728d2dd402eb3593c97
-EBUILD spqr-2.0.9.ebuild 1016 BLAKE2B 68f3fda3615507c1318381e36bd626433f459c81df300ed6fe4ec046bfe64031d2df48185082484e7aed40db328883700e4a4e559d6d0380ec9e52aabbb66373 SHA512 b4d87d842d2a9af276c4ee00e43294021209c2dcad61ff6a11dec09fab471a64f918ee08b2dd127e82c81ae93c72c695d30c1a2f3ec9a6852cea4f1d3eaf279f
+EBUILD spqr-2.0.9.ebuild 1023 BLAKE2B ed6a0ac25f2429914de6698a642d81581925c3d508158c85d939d0d97ccd1bf078f0a24496c0a690e744e99a688cb3f266c0ffe58007220cf78ca897ffec2033 SHA512 a5b32420ecc94feac2372975f6115e5e25e15a3e1ea9f44cf4a87ae577b67f1548da01ff34e62b70b87b3aa5fb75b7c41ec09fc29c3d6e28f441e2b556c7e45e
 MISC metadata.xml 962 BLAKE2B b7d87c2d66c17b1d3071b8b0a17e39fe77897a9af7e79caf784cd1c370c70467010718ad3ef60314dc6f0db5703b4a0035294fac5fc2552e9bb595132b7991ed SHA512 a8cbc5b0168b847b814c54b874d159fcfd349780d9b64907ffdb1d572babbee8b64f422328fa583ba9f7e0a60846249385acbccf5db2944f7c05bcd33f4ce757
diff --git a/sci-libs/spqr/spqr-2.0.9.ebuild b/sci-libs/spqr/spqr-2.0.9.ebuild
index 342617b94340..b29415ba3f9c 100644
--- a/sci-libs/spqr/spqr-2.0.9.ebuild
+++ b/sci-libs/spqr/spqr-2.0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc partition static-libs tbb"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/suitesparse/Manifest b/sci-libs/suitesparse/Manifest
index 020a9d46280f..1a4832e7b92a 100644
--- a/sci-libs/suitesparse/Manifest
+++ b/sci-libs/suitesparse/Manifest
@@ -1,4 +1,4 @@
 EBUILD suitesparse-4.0.2.ebuild 762 BLAKE2B b2eb7df499c9ac1f8e27f0bf90fa8178303090ea3819fc3945603b94d3c3a4259823f7f46f2d824d9d69ec6d457cd1c03a9781e98e4b04706147fd0adc6e2083 SHA512 57ac75b2b86bd6f5476144db5561c0d3197ecdfedccdd7673952c928f6d0c85858c348d8e2821384e802a107870157a0fd7aade95ca7d30aea374642af7af3a2
 EBUILD suitesparse-4.2.1.ebuild 762 BLAKE2B 598b35b6165b24cc5e34f9df5ab3f695d79cee04f693c55d0d302ca5d7e2d52f193ba99fc459af97cfd2fd9badc293e6d814b578b17277a35255a0a16e94fb78 SHA512 7232069fb3d9f5ebc31424d1c88a930b27756a4a111993c8c607b7c5e1df59e089e5c5f578e331f77837c910ad81718166d7c922fe95a571722885c6ff1cc951
-EBUILD suitesparse-5.4.0.ebuild 773 BLAKE2B 8d71d61679e73442355959a70431986ad38915a7489ed693a06dece32f39dde4a6888a76d68bd22b255486c095070f5aed61e0434b86aa50a8fc441b6be9f25c SHA512 520851e7268837838983b29c3ed740a80e8941fea40ebf397924e665b9e24c28421336a55f51ca0cc854bf1a67ae1eef6963fb6e32d04d197e0fe7e113840820
+EBUILD suitesparse-5.4.0.ebuild 780 BLAKE2B 15cc7b93a9e063f453b4f51bdd87781b89626a495eb520e2a0b35f57942df906787ba49c2ad3483bcc0801606288653a830ce9b1e0303343c6676cb6bfc49a58 SHA512 2204fc147fb22de262f24cb90feace1a837542aa28ac135fdd2c1448d55cb3c8f818478355080a63356164e70362d51e2c98b5444d0e34bf5deafeb0d8a2c50e
 MISC metadata.xml 1995 BLAKE2B 34721d419d77f93f3dac7d99cde6d41f8ea9ed7bdb87a8b88b02da1a151b9dce4b415da56176ba07ef83f55692b9520aea2dd2eaa0b90f5e6847585908e8c4be SHA512 855650d41560fa1a9ad9dd6d7136328f744eb07ea086a275485edb147da394787a92c56890bd8a8613ef2dbf94a32d9c94698c54916461150c5013504817aa03
diff --git a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
index afae8da50f4c..fc9edc66953d 100644
--- a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
+++ b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
 LICENSE="metapackage"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc lapack partition tbb"
 DEPEND=""
 RDEPEND="
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index 0fcf43d6b20b..aa4725544047 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -10,7 +10,7 @@ DIST sundials-4.1.0.tar.gz 17221960 BLAKE2B 598c7adc9e37fcfb1f44a3235f58af489ad9
 DIST sundials-5.0.0.tar.gz 18820465 BLAKE2B 77bc7bd489b52ff316f3e889aad4ec27830c42650591270443d45a0aa958d06663e93931a8933ca2d228619263219be4d7441cb473eaaedeab958ae47418a44e SHA512 4962adabcde19207b5044d1e63758d58b5d3cfeefcd0eae65ddfe5499931bf19fa98bafbd4742045cc255f6b4a45653f41df7a7739f86d6eb47c79c9312b4471
 DIST sundials-5.1.0.tar.gz 18496945 BLAKE2B bfe2c88bd1a43c6e0b50e30a4498d23da9e495b4a27e67ff309a032f892cfd8ce54010f567f26b1ecd40a2e21e9364f0b75d0b5dde2771c9e35ad4912e7abf64 SHA512 ad2fef1197fe5680651b63a1da8fab0087416c943f9142e6d0ac8388113fb7e33a7297847f550585d7e8fed1d33111ab85235b3a2f94ac81004f5f3eb584c021
 DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f
-EBUILD sundials-3.2.1.ebuild 2053 BLAKE2B 5bb930c92705f0b30ef23379da27379c16e19d6ff58239d6da988cdd1463b64757313c6bb2f569229ffd98d979a863c8257e71dcd3696c108bb4e3dd992a4c12 SHA512 fd8f7a523d855d38d132b054d4b6fb6addb7e5f8266bf0eaf932a91cff1200ff4c665a3dafb5ea73d05989eef376b29f145c385cef426ac8e4c847231ce3e668
+EBUILD sundials-3.2.1.ebuild 2122 BLAKE2B 14b9cb8eaef1bb2a8dd749a5be242f7a026a040d316828aee9f6aab481df29fb5102862bacfbe7fd83c4ba74b10f633b3e76a754dcb2eccf7ae7d634d1886ff6 SHA512 e076b7de37302cd96f6c4b01931e02d4627b69514c69b1a8275373ac11196a6b19602a96f56c1be527ee1ed501dd4fd0df2517bda45d9721f15a6ba05e3fe606
 EBUILD sundials-4.0.2.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb496473ad526db55b185bba569ebd17e5899b44b3841920152d65e690b863ac03a2030912850cbee8b956f17eeb SHA512 9931d3f771b41b7630513136a716326992e86182237053c6fc09f92f4598f2ce5906d35d095a952b785446bbe97038c50c926370ee99ad70449be11fca47cbac
 EBUILD sundials-4.1.0.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb496473ad526db55b185bba569ebd17e5899b44b3841920152d65e690b863ac03a2030912850cbee8b956f17eeb SHA512 9931d3f771b41b7630513136a716326992e86182237053c6fc09f92f4598f2ce5906d35d095a952b785446bbe97038c50c926370ee99ad70449be11fca47cbac
 EBUILD sundials-5.0.0.ebuild 1990 BLAKE2B 52ab23123248a3bc590ce5dea0bc0583bf3cd0b5587e8cbcda392a5f5b14b6229f88a247d3e2889cf8351e7f41290a09be1186857ebffaa31a3a513534d6994d SHA512 f1788b29f519eb1af18c2e2409e14bbce54e96b69144d9267840b9a9678c4fb6039dd44f03af987fb207498e23d631b4f689de0427bb77e8ef0eae6fdc360bdd
diff --git a/sci-libs/sundials/sundials-3.2.1.ebuild b/sci-libs/sundials/sundials-3.2.1.ebuild
index 18dd6bbaa8d4..36bca3f96aa9 100644
--- a/sci-libs/sundials/sundials-3.2.1.ebuild
+++ b/sci-libs/sundials/sundials-3.2.1.ebuild
@@ -47,19 +47,23 @@ src_configure() {
 		-DHYPRE_ENABLE="$(usex hypre)"
 		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
 		-DKLU_ENABLE="$(usex sparse)"
-		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
 		-DLAPACK_ENABLE="$(usex lapack)"
 		-DMPI_ENABLE="$(usex mpi)"
 		-DOPENMP_ENABLE="$(usex openmp)"
 		-DPTHREAD_ENABLE="$(usex threads)"
 		-DSUPERLUMT_ENABLE="$(usex superlumt)"
-		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
-		-DSUPERLUMT_LIBRARY="superlu_mt"
 		-DEXAMPLES_ENABLE="$(usex examples)"
 		-DEXAMPLES_INSTALL=ON
 		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
 		-DUSE_GENERIC_MATH=ON
 	)
+	use sparse && mycmakeargs+=(
+		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
+	)
+	use superlumt && mycmakeargs+=(
+		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
+		-DSUPERLUMT_LIBRARY="superlu_mt"
+	)
 	cmake-utils_src_configure
 }
 
diff --git a/sci-libs/ta-lib/Manifest b/sci-libs/ta-lib/Manifest
index df3c7661b457..3c4a5c8c9499 100644
--- a/sci-libs/ta-lib/Manifest
+++ b/sci-libs/ta-lib/Manifest
@@ -1,4 +1,4 @@
 AUX ta-lib-0.4.0-asneeded.patch 3304 BLAKE2B 5350248ae6511136ed09f66faca62021175b4c98030e271f98f08ad948b8b7795eeba84d44b4e808217da76e163a1f1cbcd1dde052de6a8f2351d53947728328 SHA512 aa43a9cd5382eb43cce2dd64325a36fd88bdae7969c3c191ddbbc7ed726145d7cd1cca17196093c7b4af63a95d3a118d6f2e93ff5d021105091056a325042123
 DIST ta-lib-0.4.0-src.tar.gz 1330299 BLAKE2B 2acc09c2a01c02912dd4ea9a72296376dcb4b434723508829d3b97fcb77baaf8d4eaa44a84fbdb094119890fc1949fc52f759345101d8848032c3814576623c7 SHA512 d7ae2acd830cd23b58bded8a90759edfabc73923fbed3cc09501c121cc937caf728c29678f456c2dc7e72fabb52166bccc19ab51ab1131c7d8d35c201c94ed4c
-EBUILD ta-lib-0.4.0.ebuild 679 BLAKE2B e7f8cb0f03219836d0fffaa0d5dc90d3fb2911485ad7b46a75b68fe3a6ef3f5ddb5610275c0449cfb7f92cb17b261cdbe2d525fbfef101b471d8cd8ac070747f SHA512 e178ea0cdab132427d2eb5fbb11e76150c8b8a6382d6ce9d01e5f02f515c8c119989405ea5a7624fa0c3580e70cd7d35976bee5b9d0d23bce5de86490d162457
+EBUILD ta-lib-0.4.0.ebuild 680 BLAKE2B 39f49bcc48aa0555ce6dcce4ab9b65198b48b052e93901bca53b61c68455327ca339cb65dec102de69ca5b3c1bd16b3d485c678bba6ec9e5690d2d8eb50fb864 SHA512 570ad457f5a9c1367179e2aaddae6760308d012747bc9f0c16976a84586ad5ba82000f96256d41c4b755ef4d7f3f4d6fb888b83160f81f0b162d65def8546403
 MISC metadata.xml 243 BLAKE2B 400c5a1dd01546d5bf24cbf3a8944fa5f83d60ebe181ae799e2d3ce7c862458369524793540d78cd0c8e15b77df23cb90db634b7b7c8ede5373a53a03fe49b33 SHA512 7ce6628e1ef9623673a4981aaaca3a1a3e9f030b6826929de1307bc1ea6d18b31bb5f14e8aefa60a6ecf34c874b4cb18ba8d64e869e151cf750b79e76e394bcf
diff --git a/sci-libs/ta-lib/ta-lib-0.4.0.ebuild b/sci-libs/ta-lib/ta-lib-0.4.0.ebuild
index 7a7a581a503c..508a8a64f8d4 100644
--- a/sci-libs/ta-lib/ta-lib-0.4.0.ebuild
+++ b/sci-libs/ta-lib/ta-lib-0.4.0.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=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="Technical Analysis Library for analyzing financial markets trends"
-HOMEPAGE="http://www.ta-lib.org/"
+HOMEPAGE="https://www.ta-lib.org/"
 SRC_URI="mirror://sourceforge/ta-lib/${P}-src.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/tensorflow-estimator/Manifest b/sci-libs/tensorflow-estimator/Manifest
index 1b542e7b95ec..c2f00271feff 100644
--- a/sci-libs/tensorflow-estimator/Manifest
+++ b/sci-libs/tensorflow-estimator/Manifest
@@ -8,5 +8,5 @@ DIST tensorflow-estimator-2.2.0.tar.gz 627362 BLAKE2B 125792fc2167b8af837a99b08a
 EBUILD tensorflow-estimator-1.15.1.ebuild 1328 BLAKE2B b629259c42c606f8620f3efb2b56c253dca488c59c5c4df52a241c1e279856484e8fc289cc011044fff2ad4d80138234a20782d9a396ce84716f453530cacdbe SHA512 722e5579e71df900c0702980197e1eb532ace50817769363b42d9ba413037c339eeae61e625b6fdf53efbd95d821fc83ea7ed12a62e77a1bcc945abcc8916148
 EBUILD tensorflow-estimator-2.0.1.ebuild 1853 BLAKE2B 13a0aa24ad860e69af5c8e180d939bd074c909bfcef47d5e9d16074cf010927f51bb64e6a48a7db00a5a817db70f4aa7071a32e89439b6864cc406a3cc13c59e SHA512 295825f9278094596f880fe69898791b00b68f71b4e7b6fd2efdb7357d2090ace62eb0d45b7b649f222544c789d8375bba73776a5428b587ba01367024af6615
 EBUILD tensorflow-estimator-2.1.ebuild 1853 BLAKE2B 13a0aa24ad860e69af5c8e180d939bd074c909bfcef47d5e9d16074cf010927f51bb64e6a48a7db00a5a817db70f4aa7071a32e89439b6864cc406a3cc13c59e SHA512 295825f9278094596f880fe69898791b00b68f71b4e7b6fd2efdb7357d2090ace62eb0d45b7b649f222544c789d8375bba73776a5428b587ba01367024af6615
-EBUILD tensorflow-estimator-2.2.0.ebuild 1853 BLAKE2B 13a0aa24ad860e69af5c8e180d939bd074c909bfcef47d5e9d16074cf010927f51bb64e6a48a7db00a5a817db70f4aa7071a32e89439b6864cc406a3cc13c59e SHA512 295825f9278094596f880fe69898791b00b68f71b4e7b6fd2efdb7357d2090ace62eb0d45b7b649f222544c789d8375bba73776a5428b587ba01367024af6615
+EBUILD tensorflow-estimator-2.2.0-r1.ebuild 1978 BLAKE2B 790ff6c1a2facc9e5b652b346a9ad24b445494f156a90465d3fa278e49376122da03f182fd4264f2e1f17488f326353e58810122996fbd33b4deabb7ed1986b1 SHA512 419fdbe02e00fdabe285f122be8ac574181366fc5f48fcf56616a37c69867cf6b530ea7dae8f5cfd8c6114a1ccb945699e4e4674ea7a14ad4d6bc14619c6693c
 MISC metadata.xml 580 BLAKE2B fb81098968d0fdf34a3f28dabee76df16be5393cb9ea79ee4fa670af985ef3f70bb83f14be84a0cc0e564e6626007c2977851f8299460b483f88325be155f4cc SHA512 6aef6523502a3bcf0b2ca59cf7480b92032b53020cccfa715203e5a48c960ecc92c94fa75f98a234da2d51662d43e0c1a85a1537f3ab67287cdb8183476a0efa
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0-r1.ebuild
index 32a54df07f94..20a13ee1c5ad 100644
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0.ebuild
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0-r1.ebuild
@@ -43,22 +43,27 @@ src_unpack() {
 src_prepare() {
 	bazel_setup_bazelrc
 	default
+	python_copy_sources
 }
 
 src_compile() {
 	export JAVA_HOME=$(java-config --jre-home)
 
-	ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package
-	ebazel shutdown
+	do_compile() {
+		ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package
+		ebazel shutdown
 
-	local srcdir="${T}/src"
-	mkdir -p "${srcdir}" || die
-	bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die
+		local srcdir="${T}/src-${EPYTHON/./_}"
+		mkdir -p "${srcdir}" || die
+		bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die
+	}
+
+	python_foreach_impl run_in_build_dir do_compile
 }
 
 src_install() {
 	do_install() {
-		cd "${T}/src" || die
+		cd "${T}/src-${EPYTHON/./_}" || die
 		esetup.py install
 		python_optimize
 	}
diff --git a/sci-libs/tnt/Manifest b/sci-libs/tnt/Manifest
index 0a8334aff5d9..f08a7faad77a 100644
--- a/sci-libs/tnt/Manifest
+++ b/sci-libs/tnt/Manifest
@@ -1,3 +1,3 @@
 DIST tnt_3_0_12.zip 50166 BLAKE2B 8ecefb46e6ab577cce3881a829d88c8eb61c10ba4a7f33d4408555ac9c76b3b11d2442255920336f2a7fd6eda508d3a4f420e66a0821ae8276fddc78f013e8b4 SHA512 3be00d37880ffc191022db13993c3946e913e92409cef1ff5f53b74cab5ea09782d131056d89bcbd0990939967b5d93ebe93e8a7db956be2fb9e8a7356dafbfd
-EBUILD tnt-3.0.12.ebuild 468 BLAKE2B 1a9172265bb6dcdafcab7b3bf4062b9daa49a55941d14be1910ab9f69068c55cc7071b971b3ffaf715751b2a72ae628be80429cfcbd76371c5edc441b0370acd SHA512 344d935b84cdb9a8639490d4cb0ace4dba4a8b3f806b0df7b1cf640fc03ab5880210db31d89bb03cd072d3af69661188a1685a2b2eea4dcceb09d2becb1cb14e
+EBUILD tnt-3.0.12.ebuild 470 BLAKE2B 8017b59bba7dc76af07ced23b002228f9fdad71eb6f51682c1f10d043b5d2a013cf420d093aa93912eb43ba9e7285e8bfe7eb4cbc927ae979510691193838e3d SHA512 9b35e408f1bbfd7f07f2c9c81a82418c5086b0830bb4e2362432d47c8ccf8d06f0d1cb9c27fc8e85bc15f1e3c2007885f0b1813476caf5884f358d0dcc99c574
 MISC metadata.xml 772 BLAKE2B b9c0850d5a8ed470472cbe42d302d144741d0a9ff97842bb33880cebeb50f85ca6bc48fd7d0f16c891f3e0eaef2bb23b1245cd0e666652d1d27fbdcbd4d4351d SHA512 f6dc74a205271d244c31c2b4533ea35498aaa4489d81990b52e2a1e8be75b8f02eb7e70ccf0d92af3638c2a11a9f8102e6b973aa70ddc87507d9f7a7bf5eb191
diff --git a/sci-libs/tnt/tnt-3.0.12.ebuild b/sci-libs/tnt/tnt-3.0.12.ebuild
index 9de7e6dca2ee..591cc6535bd5 100644
--- a/sci-libs/tnt/tnt-3.0.12.ebuild
+++ b/sci-libs/tnt/tnt-3.0.12.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=7
@@ -6,8 +6,8 @@ EAPI=7
 MY_P="${PN}_$(ver_rs 1-3 '_')"
 
 DESCRIPTION="Template Numerical Toolkit: C++ headers for array and matrices"
-HOMEPAGE="http://math.nist.gov/tnt/"
-SRC_URI="http://math.nist.gov/tnt/${MY_P}.zip"
+HOMEPAGE="https://math.nist.gov/tnt/"
+SRC_URI="https://math.nist.gov/tnt/${MY_P}.zip"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/sci-libs/trilinos/Manifest b/sci-libs/trilinos/Manifest
index 9f1d16a04ad2..4cd8b33cfbfe 100644
--- a/sci-libs/trilinos/Manifest
+++ b/sci-libs/trilinos/Manifest
@@ -3,5 +3,5 @@ DIST trilinos-12.14.1.tar.gz 129036436 BLAKE2B e7401df2ff8408a7af4a8e90d93b1929d
 DIST trilinos-12.18.1-patches-r0.tar.xz 6236 BLAKE2B fdcdedde68ef855aa98671223ad2c42467284ad7ca364e2b5ca715094a6efacc463f2d1812ee63ac980ca87dbe16bb2ac04835f52efa1df34651a608cb5407e9 SHA512 e6db2be4642b8f9797b0be6dd05641ae469dd5117b1b04da54ed955bd56473d6aaa69d59dfd7869db1e7059d2d9b2cb2d9269dd5ef863663eabb90c5c256b987
 DIST trilinos-12.18.1.tar.gz 152007573 BLAKE2B 5dc2ee432d777712fb4ca1dc2d7ad68015f523fdbcbd4f55388a89d31c0946a1c5031b3e8f906952cf6b2f4f16928e6da5f17b1f6ee0f0e5669cfce5c8a09367 SHA512 e2a57df57e8e98ed97bbde9c1e768738f0eaccc32466aff6daa308573a860b3debee89bd570c113ca0f6a6458ff562aa6596ddf657236c368b7b2e26a4b4466b
 EBUILD trilinos-12.14.1.ebuild 6148 BLAKE2B d8ef14be03e34742e59292426af03336fb3997f3e50b02e0d6a9d6114a5d67c7d3530e93f44e645e247f395343b1a3045383714f8408a41a0434cf125f6006c5 SHA512 b96f197cfd8435366940237eba40dd8cd48e950e6c814ebcb18b6c04125f374d4475cecaea3c25a2ec60b3685e3db2d52ac025a9f6031111c67039cfa00be2d8
-EBUILD trilinos-12.18.1.ebuild 6246 BLAKE2B bfe81f4d33fc4035d9819ea3d71ac06622bf537b62bce54c2d2edecf4d44553ad9cf13285c67fd06298a3bfe82fb4e45bddc4cd171a8fed5bd271c62d21248f3 SHA512 3dcbd870dffd32ef820c32d1e0ddbb95416337dd01f838dee0ff6f24e0ba6e14ee2e1f295e4947e0b7c5966f5a1f99ef4db16e80acc749c294b96bdb5d7d8b7d
+EBUILD trilinos-12.18.1.ebuild 6445 BLAKE2B 0e8efec55654b6f10ef389df708c6f3ce1f9d80be8f8d5a45a442520a656d59859a1ce7f796650445deaa8b16e5077ff4f2333401eb0a336ef3e5f50779036ad SHA512 639cf20e9bd4353c63a3c61e831ee6a24471c61cfccc4a9821f759b2fd652a63a9de7ac5c798aca5e65bbd856193659e105e1dc457f9f1ec0fa634e71935c515
 MISC metadata.xml 2778 BLAKE2B 45cb2a647a1730c9b6b21271364b5f4acaf145f6ae33db356d0b9be7584705c29a645d3f96abfe0a9b87540ae55ab586ec202191776f4472b66291c274b9f24b SHA512 c58e98197353efe1c6fef038dd53d4a938e85aa66fc53f00cab0133d8ee89c629eead55c270c88583778b193f0a85b498c7235fc3f1e8f45a1abfff2d5f0cbec
diff --git a/sci-libs/trilinos/trilinos-12.18.1.ebuild b/sci-libs/trilinos/trilinos-12.18.1.ebuild
index 605b4f2f2d09..d526edf1054c 100644
--- a/sci-libs/trilinos/trilinos-12.18.1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.18.1.ebuild
@@ -96,6 +96,7 @@ src_configure() {
 		-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
 		-DTrilinos_ENABLE_ALL_PACKAGES=ON
 		-DTrilinos_ENABLE_PyTrilinos=OFF
+		-DTrilinos_ENABLE_SEACAS=OFF
 		-DTrilinos_ENABLE_SEACASChaco=OFF
 		-DTrilinos_ENABLE_SEACASExodiff="$(usex netcdf)"
 		-DTrilinos_ENABLE_SEACASExodus="$(usex netcdf)"
@@ -195,6 +196,8 @@ src_install() {
 
 	# Clean up the mess:
 	mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
+	mv "${ED}/usr/$(get_libdir)"/trilinos/cmake/* "${ED}/usr/$(get_libdir)"/cmake || die "mv failed"
+	rmdir "${ED}/usr/$(get_libdir)/trilinos/cmake" || die "rmdir failed"
 	if [ -f "${ED}"/lib/exodus.py ]; then
 		mv "${ED}"/lib/exodus.py "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
 	fi
diff --git a/sci-libs/volk/Manifest b/sci-libs/volk/Manifest
new file mode 100644
index 000000000000..b5de6e0c6ccf
--- /dev/null
+++ b/sci-libs/volk/Manifest
@@ -0,0 +1,3 @@
+DIST volk-2.3.0.tar.gz 344763 BLAKE2B 0f0e0cb7e6cd28086802c1618685ec30dedf5cdf67bef7ed09f3a7482f84d6e7972f4b22c096676bdef34c66c60d936ca8ab300cd4da07f6714cface1c2846ed SHA512 9e3b405b7be46b4f5ff61a4d42fa9013fc55169bc18c9cf9253e446fe23fd12dc0356adb9aa176e33dfa4cc478e4b9226bee906a2d89ef83bac3b28f52816382
+EBUILD volk-2.3.0-r1.ebuild 1111 BLAKE2B 6dd21f37fc91d0824c5edc15f1c53e7c702d46139e7e5afe4b339cdd1823f8392b1dc0c5770e4f8d079a2b0a3e52679c5eca4a63d896051d55851d8f12967edb SHA512 d834630ae84b856e8496a804a815d261b4ce46bd65f12e7994504c40a16a58308bb9a2d31795ec1fd15b846fa30a78705273589867e64b26aa8d78d2edd03b56
+MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/sci-libs/volk/metadata.xml b/sci-libs/volk/metadata.xml
new file mode 100644
index 000000000000..2b9b4266ca5b
--- /dev/null
+++ b/sci-libs/volk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sci-libs/volk/volk-2.3.0-r1.ebuild b/sci-libs/volk/volk-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..31451c46050e
--- /dev/null
+++ b/sci-libs/volk/volk-2.3.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+#https://github.com/gnuradio/volk/issues/383
+CMAKE_BUILD_TYPE="Release"
+inherit cmake python-single-r1
+
+DESCRIPTION="vector optimized library of kernels"
+HOMEPAGE="http://libvolk.org"
+SRC_URI="https://github.com/gnuradio/volk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="orc"
+
+RDEPEND="!<net-wireless/gnuradio-3.8
+	dev-libs/boost:=
+	orc? ( dev-lang/orc )"
+DEPEND="${RDEPEND}
+	$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]')"
+
+RESTRICT="test"
+
+src_prepare() {
+	#https://github.com/gnuradio/volk/issues/382
+	#Waiting for confirmation from upstream to push this fix
+	#sed -i '/_mm256_zeroupper();/d' kernels/volk/volk_32f_x2_dot_prod_32f.h || die
+	mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_ORC=$(usex orc)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 8eb4ecabb24c..2b4272749df1 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -9,7 +9,7 @@ EBUILD votca-tools-1.4.1.ebuild 1211 BLAKE2B d49fc0a98bfaf61cee9b1c38f058687591b
 EBUILD votca-tools-1.4.ebuild 1182 BLAKE2B 2077617efbf04198cf2a0f53bbf07f87897a8420ec6ad9e1774c821e7e3789421a253b79e9f09e85abfdf1523ebba02400233199cee5d7966a03b97db4477155 SHA512 48eb152df0bc0ad1481179977c0a8b6947180d9978961024a57674414326eb370182c02f5fda3a902a03a14fe3f0e60f666787eb16729412426ee83f1a074613
 EBUILD votca-tools-1.5.1.ebuild 1124 BLAKE2B d8bbb47af7f2b160f83719246b8c1c1e435970790aa1ec3922085959354347c61a845013a32da9edcbcad19c66e7dd25fd0fa8c2b908f795827c324452413183 SHA512 9219e23530a0f55cc4159f250e251c49ce61a8514b05d0d4eca7f224b340e0bcc313e82b57fb647141f683607be545044495da2eea956ea197cae029f52a5662
 EBUILD votca-tools-1.5.ebuild 1122 BLAKE2B e6ca1c6354b17eae1f1574de117b2fe421965e05376ac2d13cff50814e5b2987fbac645be133037cf31b08513e09f96fba94cb02a82bab06c60a667b9147d75c SHA512 2482328a8306a0126c7ab17250be2ab91e823a1ae248e3d4bf15b27bf1f313b3277a132ba4e52362c92f1d4096a00f7b5e657afaa6de464866b551c5976c4be5
-EBUILD votca-tools-1.6.ebuild 821 BLAKE2B 8ba8afa6b5b386d501b2025443d9a237d6949fc8762fed0572ecd61850b57960cf498120bb3e653bb746e53f17b4216bb6372d415e30bd0634f47e5f567f1ec1 SHA512 d67a3a3021a7d9acf8c485c0cafa5c04d1165905ccc3c84d74586ead84dcfe922000fb5666ac15372b3d0529cb9bf94026233b8f821a189099339be7b4a8e8b7
+EBUILD votca-tools-1.6.ebuild 824 BLAKE2B 12abb2c899f4f473ddc42d30f1f43618f759373a5530228c7b08deb512b3bd273ba9d0d5611c0de34de9ddcd96784b8339b1c46dc7ad00179e6983fb3bd11e2e SHA512 c463a1b68e8e5a44f1d3688059a4291cdedc54de7883233ff828ac61b177fad92ebafc21c2d4d022488174a2512b41465cc1e2f4369df2297bc20d47aca381dc
 EBUILD votca-tools-1.6_rc1.ebuild 854 BLAKE2B ee6c6234021d9a903a611fe75c64c612ea8c3c35c048c0663dfbff91d289410966d9aef8ca2533895b33d734d7333e7bb3dba9ae88db3b387dbee199bef2c2e5 SHA512 137867d077e0c84d49a76553f00e2182350643822c6961103aba45810b236e2333f3a9092b5572cb1588d658e0c1111aa2ffdc83e6b679d84af2d7c885fbb0da
 EBUILD votca-tools-9999.ebuild 817 BLAKE2B 07c6d4667bf74c45a962fea7ad7af4d3e40910d7fb4c38713e30193c9d58d2553c693b28db361f7c0b7d16df2d05636fedc648a18934b77bd6f7faeefebb6b5c SHA512 4be6e932cb3a573465c907956d79f6f85c3f2d38bd867ce8488afdafdc4e005c3d953f5e8cfdc4a422ff16e39a8d844ed5e84e53e1155a800ab3844ffbd8a32c
 MISC metadata.xml 455 BLAKE2B 8f698a0352731cfaa42f58ad669e7a509fbc95082c9accedef69d91628528e29b55a03256f035446f1d1da9a8ac569f17136a2e05e87bb4300cbd4f4af9639ea SHA512 db6cffcdbb0d1b791e8d96338ea9226161d14130d4e6760fdc3997751fbae20e2452529a6403c5ddd0b0a30274f51465fea7edae60fc9655291bd0497f316c8d
diff --git a/sci-libs/votca-tools/votca-tools-1.6.ebuild b/sci-libs/votca-tools/votca-tools-1.6.ebuild
index c6ae6196c3d7..3370b1dc94bd 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.ebuild
@@ -9,12 +9,12 @@ inherit cmake-utils eutils multilib
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-macos"
+	KEYWORDS="amd64 x86 ~amd64-linux ~x86-macos"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Votca tools library"
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 2c74bdd2e521..2d3e28d3f680 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,12 +1,11 @@
 AUX vtk-8.1.0-openmpi-4-compatibility.patch 473 BLAKE2B 2f4994b5c745746b0c1391666d155e8ff79f6c57969177862e3f64956cc370b2b12a0ba223bd344734a7700c5eb728ccaf1ac7188d0fd049815b7b22c7648203 SHA512 6a2e25263070747657aa319d80b333375b2c10bbbd58fc98a1ab6cdb563e996afe9af8d4ae28d4aab24a437508993cfa3cacfc9284562d7af8a9e29fded73837
-DIST VTK-8.1.0.tar.gz 33482506 BLAKE2B 82aecb497847254595f20294120ae793432348fc3fd881924b52c004335d9bae3d052f168bbe291b307af67845a80e740d8996d36991c38fbec7213438e2395d SHA512 3d5efd1a18939e21045278a387817421a98919cbaaa6ed65167c16999e1bb882b849b698d201a294da9920dbc96d1fbc987013462b1c7cbb12920bfff9b6f2a3
+AUX vtk-8.2.0-fno-common.patch 1694 BLAKE2B 7fe15b8ea0fc358360e06be2fcc6634005cbb294fdcfea87028ef67fd018085c33448a70babd0e3e6997767b801e69853381c7bd02926d9657ea3233a8bcd065 SHA512 fbccb357649cf0dc7c5a5123db05b87e26c6095c89005adcb9e799cc68531fac87f4f588d12f0ee2728517a60436192011a04885e06ef4975fc8b81ba54ba1ea
+AUX vtk-8.2.0-gcc-10.patch 739 BLAKE2B 8b9ae179c5af17f5d0173674ffd616f5473bcc0830487343150b778cf143d762fc77c7212ee4e7f8f725878e85a7c1ccaa320393164212b276703e0b86e61e7f SHA512 7a2a8ea7ac3f6d3a5fd7d6553764eb5396ee4d89cc259bbf772493953125982b4cc8a43dc7b7a5e5c1ab6783eba6dd0d6edc791465985fd1f4b1ac9eb99062eb
+AUX vtk-8.2.0-py38.patch 8467 BLAKE2B ea624989f3f0a4900fa692fc271d47d1d10cc047043e464f8b6ae9ea6713a63c4f0ec75c84a70d7fc2523b29b1c24ada4b77e90e9016690868c62217dbe69a8b SHA512 9922b24551c4716bdd95d398b2ea9d48f5c098350821a16767128a97180e4e1575414755545dd71e40dec88b0a7a61fc63ba2e598bedfc07620b15b0efd02cf4
+AUX vtk-8.2.0-qt-5.15.patch 1153 BLAKE2B 2e0d041d15f547845c07d46da4f641df7a57c0df8d5f9d5290c44a91d403b58f4627ae713169696383afa1d9edd85c59606782b169238d08a5df0b7e28ac79b7 SHA512 d1460117738b33074fbd92ffc54a838452c5b2cdd668767295dced7a39c845cb58664f0ea91726015facf4e3b752a53f2a32e52c85dc187a815c95e0935d0f03
 DIST VTK-8.2.0.tar.gz 35511819 BLAKE2B 908ed9377d75da6d0bd84de0078ba90a1e9396fcc906ca2981102e2c79d9d3ba4b1297f98682cd2802c7c04f9dbec32ee70740e645c44180befd765f7cda34a6 SHA512 521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286
-DIST VTKData-8.1.0.tar.gz 282986441 BLAKE2B 885f35c5386cc5db8db905a868a3ad79c246f1b0e41a3e5b81312b1f3de90483a1e34886d4764c60fe8006acaace2405b25acf047ec0e25a957f7a2d563d3380 SHA512 0a63f87896320aa38970932bf47c9e3f65a8bdd5413e51f95c53e321348b5b4e1eca2405d755eabb785c03939e1936245cc9f1b0f7ad0988c41362ac6f1e3047
 DIST VTKData-8.2.0.tar.gz 304287875 BLAKE2B 0292d84be40e11203326dcb1bf45f4a6ad2a785968130d4868a230f1cfbdcb600d0c03d4dae3519e2737dc7a964f29c51500c91b3da4291069608dd80a2bce45 SHA512 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b
-DIST VTKLargeData-8.1.0.tar.gz 166992034 BLAKE2B ac98861ccac2aacfab7547a4b56de5c9e611b8655f077bb85e6ab850fb0cfd79f4722a0486f73eafcde2cd77d6be305201857f3e729b1f60f710c45bcf0bb63f SHA512 9dfd64b5125205ba7d8cba5665da40874d0a9781f3bd2595058d939207d96980c9a68009ce9ed1476931e1b929199c4888ccf6d590f23d2412873ca6907abc31
 DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d26599b48208b4104f41eaa90f99483689cd928cb00e3a7def396d65db2f03c9294d132854a27af74f66eb118c8319c4ce SHA512 8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588
-DIST vtkDocHtml-8.1.0.tar.gz 132655967 BLAKE2B a27d9631fa9fe42e9b8076aa3b33e03b3835db0f348ed60cfdc866ffe7accd9c5d99b6525523113a4d628253e28d6d9121e78942d89b6ee281d5e7ecee7c289e SHA512 c49338ad2c121ab16098195e5a1f2c9539137a85ae5edaa64d4a887ece0c64efb8840162942f47b70ab2d82d341bba2e706a6ff007fe6bdfbce12ad92bca883c
 DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317
-EBUILD vtk-8.1.0-r7.ebuild 9242 BLAKE2B e7ba2acec19ff4808cf1bebd137c387769165ba9c1870caa5279fdb272da440fb38e8c0c27fb1ee760b92cc366b7e06db065eace71fb9089ef2eca95be12d8c5 SHA512 570281a2090406371f92d5f4d7b11c5649cbf0e7c1778b7b2a961a974a4d8e52463a2019505f751f5d33b2c908767ce62286f56deb6735907518a215f01d3467
-EBUILD vtk-8.2.0.ebuild 9034 BLAKE2B 7a2ddffb44db83c1a88c664f4a42a24d2647943fea5df02f209e248ea9ffdb7a2b4735d1eb9ae21da4c88545dd92698ef5f84a4cf922d2a6120f43789ed7d09e SHA512 6bfc12c34a26aec09347ec5ebd122b5011e4660df2874a5f952aa382c9f1acb21ba1e9b37b49c35e0701596dc947ff87ea2fb08ff831a3e0e9cf81b742179a94
+EBUILD vtk-8.2.0.ebuild 9331 BLAKE2B 05cbcf1bf05e64e529efcabd092d9a4ef8e9b50e1b734eda3b03eff3f63973a51ecafb2d500271dba7b96669782f255b73d4f2ff2f20db5a584ba9b37391a102 SHA512 aa613e41002ec63bb311cbdf1be2313f78ff748599035802862fdec5960211e406ae3b4dac6dbc6eff3eeaefa563965f09cb87b1cc192d815fe713b40f6e6a0e
 MISC metadata.xml 988 BLAKE2B 2533eda3936361d835dba2e30f1b1a19484facc289603d82b6c2012ee242e7778b1080d7136584c08113d7a82e0742d7bb2373984667301a4c7d52b4dbd8b087 SHA512 f4e29e15a05cfb49b24f4a8e24a6e43ac72ac0fa21ed640a70e5017263f23e21e514dedc489d963acd803407df8ee2bd2d6006c83eece795f91b4809d2ec2ff4
diff --git a/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch b/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch
new file mode 100644
index 000000000000..d7268ef7566b
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-fno-common.patch
@@ -0,0 +1,40 @@
+From a9079bdccbb2165583d6773a5ed848427e2a38a8 Mon Sep 17 00:00:00 2001
+From: Seacas Upstream <kwrobot@kitware.com>
+Date: Tue, 28 Jan 2020 09:13:38 -0500
+Subject: [PATCH] exodusII 2020-01-28 (d97eb08d)
+
+Code extracted from:
+
+    https://gitlab.kitware.com/third-party/seacas.git
+
+at commit d97eb08d79e87c82facfae39bc75deb60c0a2d83 (for/vtk-20200128-7.24f-v2019-12-18).
+---
+ ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c | 2 +-
+ ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c b/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c
+index 8d5d6734f0..ef439618da 100644
+--- a/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c
++++ b/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c
+@@ -216,5 +216,5 @@ int ex_create_par_int(const char *path, int cmode, int *comp_ws, int *io_ws, MPI
+  * Prevent warning in some versions of ranlib(1) because the object
+  * file has no symbols.
+  */
+-const char exodus_unused_symbol_dummy_1;
++const char exodus_unused_symbol_dummy_ex_create_par;
+ #endif
+diff --git a/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c b/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c
+index b2faa22c29..9df4818767 100644
+--- a/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c
++++ b/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c
+@@ -459,5 +459,5 @@ int ex_open_par_int(const char *path, int mode, int *comp_ws, int *io_ws, float
+  * Prevent warning in some versions of ranlib(1) because the object
+  * file has no symbols.
+  */
+-const char exodus_unused_symbol_dummy_1;
++const char exodus_unused_symbol_dummy_ex_open_par;
+ #endif
+-- 
+2.26.2
+
diff --git a/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch b/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch
new file mode 100644
index 000000000000..a903b0375304
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch
@@ -0,0 +1,16 @@
+--- a/CMake/VTKGenerateExportHeader.cmake  2020-05-24 14:33:12.154603698 -0600
++++ b/CMake/VTKGenerateExportHeader.cmake  2020-05-24 14:33:34.864603776 -0600
+@@ -174,8 +174,12 @@
+     execute_process(COMMAND ${CMAKE_C_COMPILER} --version
+       OUTPUT_VARIABLE _gcc_version_info
+       ERROR_VARIABLE _gcc_version_info)
+-    string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
++    string(REGEX MATCH "[1-9][0-9]\\.[0-9]\\.[0-9]*"
+       _gcc_version "${_gcc_version_info}")
++    if(NOT _gcc_version)
++      string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
++        _gcc_version "${_gcc_version_info}")
++    endif()
+     # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
+     # patch level, handle this here:
+     if(NOT _gcc_version)
\ No newline at end of file
diff --git a/sci-libs/vtk/files/vtk-8.2.0-py38.patch b/sci-libs/vtk/files/vtk-8.2.0-py38.patch
new file mode 100644
index 000000000000..c4c235dafd3f
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-py38.patch
@@ -0,0 +1,175 @@
+From 257b9d7b18d5f3db3fe099dc18f230e23f7dfbab Mon Sep 17 00:00:00 2001
+From: David Gobbi <david.gobbi@gmail.com>
+Date: Tue, 20 Aug 2019 17:02:24 -0600
+Subject: [PATCH] Compatibility for Python 3.8
+
+The PyTypeObject struct was modified in Python 3.8, this change is
+required to avoid compile errors.
+---
+ .../PythonInterpreter/vtkPythonStdStreamCaptureHelper.h   | 6 ++++++
+ Wrapping/PythonCore/PyVTKMethodDescriptor.cxx             | 2 +-
+ Wrapping/PythonCore/PyVTKNamespace.cxx                    | 2 +-
+ Wrapping/PythonCore/PyVTKReference.cxx                    | 8 ++++----
+ Wrapping/PythonCore/PyVTKTemplate.cxx                     | 2 +-
+ Wrapping/PythonCore/vtkPythonCompatibility.h              | 8 +++++++-
+ Wrapping/Tools/vtkWrapPythonClass.c                       | 2 +-
+ Wrapping/Tools/vtkWrapPythonEnum.c                        | 2 +-
+ Wrapping/Tools/vtkWrapPythonType.c                        | 2 +-
+ 9 files changed, 23 insertions(+), 11 deletions(-)
+
+diff --git a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
+index b1c12c83de..14ccfbe928 100644
+--- a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
++++ b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
+@@ -140,6 +140,12 @@ static PyTypeObject vtkPythonStdStreamCaptureHelperType = {
+ #if PY_VERSION_HEX >= 0x03040000
+   0, // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++  0, // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++  0, // tp_print
++#endif
++#endif
+ };
+ 
+ static PyObject* vtkWrite(PyObject* self, PyObject* args)
+diff --git a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
+index 2b0d443537..3840038498 100644
+--- a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
++++ b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
+@@ -186,7 +186,7 @@ PyTypeObject PyVTKMethodDescriptor_Type = {
+   sizeof(PyMethodDescrObject),           // tp_basicsize
+   0,                                     // tp_itemsize
+   PyVTKMethodDescriptor_Delete,          // tp_dealloc
+-  nullptr,                               // tp_print
++  0,                                     // tp_vectorcall_offset
+   nullptr,                               // tp_getattr
+   nullptr,                               // tp_setattr
+   nullptr,                               // tp_compare
+diff --git a/Wrapping/PythonCore/PyVTKNamespace.cxx b/Wrapping/PythonCore/PyVTKNamespace.cxx
+index 71ee2a3516..5cf5bfbe6b 100644
+--- a/Wrapping/PythonCore/PyVTKNamespace.cxx
++++ b/Wrapping/PythonCore/PyVTKNamespace.cxx
+@@ -49,7 +49,7 @@ PyTypeObject PyVTKNamespace_Type = {
+   0,                                     // tp_basicsize
+   0,                                     // tp_itemsize
+   PyVTKNamespace_Delete,                 // tp_dealloc
+-  nullptr,                               // tp_print
++  0,                                     // tp_vectorcall_offset
+   nullptr,                               // tp_getattr
+   nullptr,                               // tp_setattr
+   nullptr,                               // tp_compare
+diff --git a/Wrapping/PythonCore/PyVTKReference.cxx b/Wrapping/PythonCore/PyVTKReference.cxx
+index 943ac71080..b7104091c0 100644
+--- a/Wrapping/PythonCore/PyVTKReference.cxx
++++ b/Wrapping/PythonCore/PyVTKReference.cxx
+@@ -1010,7 +1010,7 @@ PyTypeObject PyVTKReference_Type = {
+   sizeof(PyVTKReference),                // tp_basicsize
+   0,                                     // tp_itemsize
+   PyVTKReference_Delete,                 // tp_dealloc
+-  nullptr,                               // tp_print
++  0,                                     // tp_vectorcall_offset
+   nullptr,                               // tp_getattr
+   nullptr,                               // tp_setattr
+   nullptr,                               // tp_compare
+@@ -1067,7 +1067,7 @@ PyTypeObject PyVTKNumberReference_Type = {
+   sizeof(PyVTKReference),                // tp_basicsize
+   0,                                     // tp_itemsize
+   PyVTKReference_Delete,                 // tp_dealloc
+-  nullptr,                               // tp_print
++  0,                                     // tp_vectorcall_offset
+   nullptr,                               // tp_getattr
+   nullptr,                               // tp_setattr
+   nullptr,                               // tp_compare
+@@ -1124,7 +1124,7 @@ PyTypeObject PyVTKStringReference_Type = {
+   sizeof(PyVTKReference),                // tp_basicsize
+   0,                                     // tp_itemsize
+   PyVTKReference_Delete,                 // tp_dealloc
+-  nullptr,                               // tp_print
++  0,                                     // tp_vectorcall_offset
+   nullptr,                               // tp_getattr
+   nullptr,                               // tp_setattr
+   nullptr,                               // tp_compare
+@@ -1181,7 +1181,7 @@ PyTypeObject PyVTKTupleReference_Type = {
+   sizeof(PyVTKReference),                // tp_basicsize
+   0,                                     // tp_itemsize
+   PyVTKReference_Delete,                 // tp_dealloc
+-  nullptr,                               // tp_print
++  0,                                     // tp_vectorcall_offset
+   nullptr,                               // tp_getattr
+   nullptr,                               // tp_setattr
+   nullptr,                               // tp_compare
+diff --git a/Wrapping/PythonCore/PyVTKTemplate.cxx b/Wrapping/PythonCore/PyVTKTemplate.cxx
+index be200985b3..340fe7953b 100644
+--- a/Wrapping/PythonCore/PyVTKTemplate.cxx
++++ b/Wrapping/PythonCore/PyVTKTemplate.cxx
+@@ -268,7 +268,7 @@ PyTypeObject PyVTKTemplate_Type = {
+   0,                                     // tp_basicsize
+   0,                                     // tp_itemsize
+   nullptr,                               // tp_dealloc
+-  nullptr,                               // tp_print
++  0,                                     // tp_vectorcall_offset
+   nullptr,                               // tp_getattr
+   nullptr,                               // tp_setattr
+   nullptr,                               // tp_compare
+diff --git a/Wrapping/PythonCore/vtkPythonCompatibility.h b/Wrapping/PythonCore/vtkPythonCompatibility.h
+index 4a767844a6..be208faeef 100644
+--- a/Wrapping/PythonCore/vtkPythonCompatibility.h
++++ b/Wrapping/PythonCore/vtkPythonCompatibility.h
+@@ -64,7 +64,13 @@
+ #endif
+ 
+ // PyTypeObject compatibility
+-#if PY_VERSION_HEX >= 0x03040000
++#if PY_VERSION_HEX >= 0x03090000
++#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
++  0, 0, 0, 0,
++#elif PY_VERSION_HEX >= 0x03080000
++#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
++  0, 0, 0, 0, 0,
++#elif PY_VERSION_HEX >= 0x03040000
+ #define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
+   0, 0, 0,
+ #else
+diff --git a/Wrapping/Tools/vtkWrapPythonClass.c b/Wrapping/Tools/vtkWrapPythonClass.c
+index b1e45f8e80..4d558ea081 100644
+--- a/Wrapping/Tools/vtkWrapPythonClass.c
++++ b/Wrapping/Tools/vtkWrapPythonClass.c
+@@ -521,7 +521,7 @@ void vtkWrapPython_GenerateObjectType(
+     "  sizeof(PyVTKObject), // tp_basicsize\n"
+     "  0, // tp_itemsize\n"
+     "  PyVTKObject_Delete, // tp_dealloc\n"
+-    "  nullptr, // tp_print\n"
++    "  0, // tp_vectorcall_offset\n"
+     "  nullptr, // tp_getattr\n"
+     "  nullptr, // tp_setattr\n"
+     "  nullptr, // tp_compare\n"
+diff --git a/Wrapping/Tools/vtkWrapPythonEnum.c b/Wrapping/Tools/vtkWrapPythonEnum.c
+index b933702242..1249362854 100644
+--- a/Wrapping/Tools/vtkWrapPythonEnum.c
++++ b/Wrapping/Tools/vtkWrapPythonEnum.c
+@@ -145,7 +145,7 @@ void vtkWrapPython_GenerateEnumType(
+     "  sizeof(PyIntObject), // tp_basicsize\n"
+     "  0, // tp_itemsize\n"
+     "  nullptr, // tp_dealloc\n"
+-    "  nullptr, // tp_print\n"
++    "  0, // tp_vectorcall_offset\n"
+     "  nullptr, // tp_getattr\n"
+     "  nullptr, // tp_setattr\n"
+     "  nullptr, // tp_compare\n"
+diff --git a/Wrapping/Tools/vtkWrapPythonType.c b/Wrapping/Tools/vtkWrapPythonType.c
+index 744cb1b9d3..0a1375e541 100644
+--- a/Wrapping/Tools/vtkWrapPythonType.c
++++ b/Wrapping/Tools/vtkWrapPythonType.c
+@@ -709,7 +709,7 @@ void vtkWrapPython_GenerateSpecialType(
+     "  sizeof(PyVTKSpecialObject), // tp_basicsize\n"
+     "  0, // tp_itemsize\n"
+     "  Py%s_Delete, // tp_dealloc\n"
+-    "  nullptr, // tp_print\n"
++    "  0, // tp_vectorcall_offset\n"
+     "  nullptr, // tp_getattr\n"
+     "  nullptr, // tp_setattr\n"
+     "  nullptr, // tp_compare\n"
+-- 
+2.21.0
diff --git a/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch b/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch
new file mode 100644
index 000000000000..d5a02ca75929
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch
@@ -0,0 +1,37 @@
+From 797f28697d5ba50c1fa2bc5596af626a3c277826 Mon Sep 17 00:00:00 2001
+From: "Andrew J. P. Maclean" <andrew.amaclean@gmail.com>
+Date: Wed, 27 May 2020 15:27:15 +1000
+Subject: [PATCH] Qt 5.15 needs the include file QPainterPath
+
+---
+ Rendering/Qt/vtkQtLabelRenderStrategy.cxx | 1 +
+ Rendering/Qt/vtkQtStringToImage.cxx       | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/Rendering/Qt/vtkQtLabelRenderStrategy.cxx b/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
+index afda585cca..eca65c64cd 100644
+--- a/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
++++ b/Rendering/Qt/vtkQtLabelRenderStrategy.cxx
+@@ -41,6 +41,7 @@
+ #include <QImage>
+ #include <QMap>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPair>
+ #include <QPixmap>
+ #include <QTextDocument>
+diff --git a/Rendering/Qt/vtkQtStringToImage.cxx b/Rendering/Qt/vtkQtStringToImage.cxx
+index 659c71570e..fbb9b78f05 100644
+--- a/Rendering/Qt/vtkQtStringToImage.cxx
++++ b/Rendering/Qt/vtkQtStringToImage.cxx
+@@ -30,6 +30,7 @@
+ #include <QFontMetrics>
+ #include <QImage>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPixmap>
+ #include <QString>
+ #include <QTextDocument>
+-- 
+2.26.2
+
diff --git a/sci-libs/vtk/vtk-8.1.0-r7.ebuild b/sci-libs/vtk/vtk-8.1.0-r7.ebuild
deleted file mode 100644
index dc399b3e2c54..000000000000
--- a/sci-libs/vtk/vtk-8.1.0-r7.ebuild
+++ /dev/null
@@ -1,340 +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} )
-WEBAPP_OPTIONAL=yes
-WEBAPP_MANUAL_SLOT=yes
-
-inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils versionator toolchain-funcs cmake-utils virtualx webapp
-
-# Short package version
-SPV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="https://www.vtk.org/"
-SRC_URI="
-	https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
-	doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz )
-	examples? (
-		https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
-		https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
-	)"
-
-LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="
-	all-modules aqua boost doc examples imaging ffmpeg gdal java json mpi
-	odbc offscreen postgres python qt5 rendering tbb theora tk tcl
-	video_cards_nvidia views web R +X xdmf2"
-
-REQUIRED_USE="
-	all-modules? ( python xdmf2 boost )
-	java? ( qt5 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tcl? ( rendering )
-	examples? ( python )
-	tk? ( tcl )
-	web? ( python )
-	^^ ( X aqua offscreen )"
-
-RDEPEND="
-	app-arch/lz4
-	dev-libs/expat
-	dev-libs/jsoncpp:=
-	dev-libs/libxml2:2
-	>=media-libs/freetype-2.5.4
-	>=media-libs/libharu-2.3.0-r2
-	media-libs/libpng:0=
-	media-libs/libtheora
-	media-libs/mesa
-	media-libs/tiff:0
-	sci-libs/exodusii
-	sci-libs/hdf5:=
-	sci-libs/netcdf:0=
-	sci-libs/netcdf-cxx:3
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	boost? ( dev-libs/boost:=[mpi?] )
-	examples? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)
-	ffmpeg? ( media-video/ffmpeg )
-	gdal? ( sci-libs/gdal )
-	java? ( >=virtual/jdk-1.7:* )
-	odbc? ( dev-db/unixODBC )
-	offscreen? ( media-libs/mesa[osmesa] )
-	postgres? ( dev-db/postgresql:= )
-	R? ( dev-lang/R )
-	tbb? ( dev-cpp/tbb )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	web? (
-		${WEBAPP_DEPEND}
-		$(python_gen_cond_dep '
-			dev-python/autobahn[${PYTHON_MULTI_USEDEP}]
-			dev-python/constantly[${PYTHON_MULTI_USEDEP}]
-			dev-python/hyperlink[${PYTHON_MULTI_USEDEP}]
-			dev-python/incremental[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			dev-python/twisted[${PYTHON_MULTI_USEDEP}]
-			dev-python/txaio[${PYTHON_MULTI_USEDEP}]
-			dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	xdmf2? ( sci-libs/xdmf2 )
-	$(python_gen_cond_dep "
-		mpi? (
-			virtual/mpi[cxx,romio]
-			python? ( dev-python/mpi4py[\${PYTHON_MULTI_USEDEP}] )
-		)
-		python? (
-			${PYTHON_DEPS}
-			dev-python/sip[\${PYTHON_MULTI_USEDEP}]
-		)
-		qt5? (
-			dev-qt/designer:5
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtopengl:5
-			dev-qt/qtsql:5
-			dev-qt/qtx11extras:5
-			python? ( dev-python/PyQt5[\${PYTHON_MULTI_USEDEP}] )
-		)
-	")"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/VTK-${PV}
-
-PATCHES=(
-	"${FILESDIR}"/vtk-8.1.0-openmpi-4-compatibility.patch
-)
-
-RESTRICT="test"
-
-pkg_setup() {
-	use java && java-pkg-opt-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	use web && webapp_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	local x
-	# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
-	for x in constantly expat freetype hdf5 hyperlink incremental jpeg jsoncpp libharu libxml2 lz4 netcdf oggtheora png tiff Twisted txaio zlib ZopeInterface; do
-		ebegin "Dropping bundled ${x}"
-		rm -r ThirdParty/${x}/vtk${x} || die
-		eend $?
-	done
-	rm -r \
-		ThirdParty/AutobahnPython/vtkAutobahn \
-		|| die
-
-	if use doc; then
-		einfo "Removing .md5 files from documents."
-		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
-		sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
-			-i Utilities/Doxygen/CMakeLists.txt || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# general configuration
-	local mycmakeargs=(
-		-Wno-dev
-		-DVTK_DIR="${S}"
-		-DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
-		-DVTK_INSTALL_PACKAGE_DIR="$(get_libdir)/cmake/${PN}-${SPV}"
-		-DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data"
-		-DVTK_CUSTOM_LIBRARY_SUFFIX=""
-		-DBUILD_SHARED_LIBS=ON
-		-DVTK_USE_SYSTEM_AUTOBAHN=ON
-		-DVTK_USE_SYSTEM_EXPAT=ON
-		-DVTK_USE_SYSTEM_FREETYPE=ON
-		-DVTK_USE_SYSTEM_FreeType=ON
-		# Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible)
-		-DVTK_USE_SYSTEM_GL2PS=OFF
-		-DVTK_USE_SYSTEM_HDF5=ON
-		-DVTK_USE_SYSTEM_JPEG=ON
-		-DVTK_USE_SYSTEM_LIBPROJ4=OFF
-		-DVTK_USE_SYSTEM_LIBXML2=ON
-		-DVTK_USE_SYSTEM_LibXml2=ON
-		-DVTK_USE_SYSTEM_NETCDF=ON
-		-DVTK_USE_SYSTEM_OGGTHEORA=ON
-		-DVTK_USE_SYSTEM_PNG=ON
-		-DVTK_USE_SYSTEM_TIFF=ON
-		-DVTK_USE_SYSTEM_TWISTED=ON
-		-DVTK_USE_SYSTEM_XDMF2=OFF
-		-DVTK_USE_SYSTEM_XDMF3=OFF
-		-DVTK_USE_SYSTEM_ZLIB=ON
-		-DVTK_USE_SYSTEM_ZOPE=ON
-		-DVTK_USE_SYSTEM_LIBRARIES=ON
-		# Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake)
-		-DVTK_USE_SYSTEM_DIY2=OFF
-		-DVTK_USE_GL2PS=ON
-		-DVTK_USE_LARGE_DATA=ON
-		-DVTK_USE_PARALLEL=ON
-		-DVTK_EXTRA_COMPILER_WARNINGS=ON
-		-DVTK_Group_StandAlone=ON
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=off
-		-DVTK_BUILD_ALL_MODULES=$(usex all-modules)
-		-DUSE_DOCUMENTATION_HTML_HELP=$(usex doc)
-		-DVTK_Group_Imaging=$(usex imaging)
-		-DVTK_Group_MPI=$(usex mpi)
-		-DVTK_Group_Rendering=$(usex rendering)
-		-DVTK_Group_Tk=$(usex tk)
-		-DVTK_Group_Views=$(usex views)
-		-DVTK_Group_Web=$(usex web)
-		-DVTK_WWW_DIR="${ED}/${MY_HTDOCSDIR}"
-		-DVTK_WRAP_JAVA=$(usex java)
-		-DVTK_WRAP_PYTHON=$(usex python)
-		-DVTK_WRAP_PYTHON_SIP=$(usex python)
-		-DVTK_WRAP_TCL=$(usex tcl)
-		-DVTK_USE_BOOST=$(usex boost)
-		-DUSE_VTK_USE_BOOST=$(usex boost)
-		-DModule_vtkInfovisBoost=$(usex boost)
-		-DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost)
-		-DVTK_USE_ODBC=$(usex odbc)
-		-DModule_vtkIOODBC=$(usex odbc)
-		-DVTK_USE_OFFSCREEN=$(usex offscreen)
-		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
-		-DVTK_USE_OGGTHEORA_ENCODER=$(usex theora)
-		-DVTK_USE_NVCONTROL=$(usex video_cards_nvidia)
-		-DModule_vtkFiltersStatisticsGnuR=$(usex R)
-		-DVTK_USE_X=$(usex X)
-	# IO
-		-DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg)
-		-DModule_vtkIOGDAL=$(usex gdal)
-		-DModule_vtkIOGeoJSON=$(usex json)
-		-DModule_vtkIOXdmf2=$(usex xdmf2)
-		-DBUILD_TESTING=$(usex examples)
-	# Apple stuff, does it really work?
-		-DVTK_USE_COCOA=$(usex aqua)
-	)
-
-	if use java; then
-		local javacargs=$(java-pkg_javac-args)
-		mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} )
-	fi
-
-	if use tbb; then
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" )
-	else
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" )
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)"
-			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DPYTHON_LIBRARY="$(python_get_library_path)"
-			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
-			-DSIP_INCLUDE_DIR="$(python_get_includedir)"
-			-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
-			-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX} --root=${D}"
-			-DVTK_USE_SYSTEM_SIX=ON
-		)
-	fi
-
-	if use qt5; then
-		mycmakeargs+=(
-			-DVTK_USE_QVTK=ON
-			-DVTK_USE_QVTK_OPENGL=ON
-			-DVTK_USE_QVTK_QTOPENGL=ON
-			-DQT_WRAP_CPP=ON
-			-DQT_WRAP_UI=ON
-			-DVTK_INSTALL_QT_DIR="$(basename $(qt5_get_libdir))/qt5/plugins/designer"
-			-DDESIRED_QT_VERSION=5
-			-DVTK_QT_VERSION=5
-			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
-			-DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
-			-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5"
-			-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
-			-DVTK_Group_Qt:BOOL=ON
-			-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
-		)
-	fi
-
-	if use R; then
-		mycmakeargs+=(
-			-DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
-			-DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
-		)
-	fi
-
-	append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
-
-	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
-
-	if use mpi; then
-		export CC=mpicc
-		export CXX=mpicxx
-		export FC=mpif90
-		export F90=mpif90
-		export F77=mpif77
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use web && webapp_src_preinst
-
-	cmake-utils_src_install
-
-	use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar
-
-	# Stop web page images from being compressed
-	use doc && docompress -x /usr/share/doc/${PF}/doxygen
-
-	if use tcl; then
-		# install Tcl docs
-		docinto vtk_tcl
-		dodoc Wrapping/Tcl/README
-		docinto .
-	fi
-
-	# install examples
-	if use examples; then
-		einfo "Installing examples"
-		mv -v {E,e}xamples || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# environment
-	cat >> "${T}"/40${PN} <<- EOF || die
-		VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
-		VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
-		VTKHOME=${EPREFIX}/usr
-		EOF
-	doenvd "${T}"/40${PN}
-
-	use web && webapp_src_install
-}
-
-# webapp.eclass exports these but we want it optional #534036
-pkg_postinst() {
-	use web && webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	use web && webapp_pkg_prerm
-}
diff --git a/sci-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild
index ee000cf9d837..ea05c1e55496 100644
--- a/sci-libs/vtk/vtk-8.2.0.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0.ebuild
@@ -3,14 +3,13 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 WEBAPP_OPTIONAL=yes
 WEBAPP_MANUAL_SLOT=yes
 
-inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils toolchain-funcs cmake-utils virtualx webapp
-
 # Short package version
 SPV="$(ver_cut 1-2)"
+inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils toolchain-funcs cmake virtualx webapp
 
 DESCRIPTION="The Visualization Toolkit"
 HOMEPAGE="https://www.vtk.org/"
@@ -23,12 +22,11 @@ SRC_URI="
 	)"
 
 LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
-IUSE="
-	all-modules aqua boost doc examples imaging ffmpeg gdal java json mpi
-	odbc offscreen postgres python qt5 rendering tbb theora tk tcl
-	video_cards_nvidia views web R +X xdmf2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi
+	odbc offscreen postgres python qt5 R rendering tbb tcl theora tk
+	video_cards_nvidia views web +X xdmf2"
 
 REQUIRED_USE="
 	all-modules? ( python xdmf2 boost )
@@ -42,10 +40,15 @@ REQUIRED_USE="
 
 RDEPEND="
 	app-arch/lz4
+	dev-cpp/eigen
+	dev-db/sqlite
+	dev-libs/double-conversion:0=
 	dev-libs/expat
 	dev-libs/jsoncpp:=
 	dev-libs/libxml2:2
+	dev-libs/pugixml
 	>=media-libs/freetype-2.5.4
+	media-libs/glew:0=
 	>=media-libs/libharu-2.3.0-r2
 	media-libs/libpng:0=
 	media-libs/libtheora
@@ -69,9 +72,32 @@ RDEPEND="
 	ffmpeg? ( media-video/ffmpeg )
 	gdal? ( sci-libs/gdal )
 	java? ( >=virtual/jdk-1.7:* )
+	mpi? (
+		virtual/mpi[cxx,romio]
+		$(python_gen_cond_dep '
+			python? ( dev-python/mpi4py[${PYTHON_MULTI_USEDEP}] )
+		')
+	)
 	odbc? ( dev-db/unixODBC )
 	offscreen? ( media-libs/mesa[osmesa] )
 	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/sip[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/designer:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtsql:5
+		dev-qt/qtx11extras:5
+		$(python_gen_cond_dep '
+			python? ( dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] )
+		')
+	)
 	R? ( dev-lang/R )
 	tbb? ( dev-cpp/tbb )
 	tcl? ( dev-lang/tcl:0= )
@@ -91,32 +117,18 @@ RDEPEND="
 		')
 	)
 	xdmf2? ( sci-libs/xdmf2 )
-	$(python_gen_cond_dep "
-		mpi? (
-			virtual/mpi[cxx,romio]
-			python? ( dev-python/mpi4py[\${PYTHON_MULTI_USEDEP}] )
-		)
-		python? (
-			${PYTHON_DEPS}
-			dev-python/sip[\${PYTHON_MULTI_USEDEP}]
-		)
-		qt5? (
-			dev-qt/designer:5
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtopengl:5
-			dev-qt/qtsql:5
-			dev-qt/qtx11extras:5
-			python? ( dev-python/PyQt5[\${PYTHON_MULTI_USEDEP}] )
-		)
-	")"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 S="${WORKDIR}"/VTK-${PV}
 
 PATCHES=(
-	"${FILESDIR}"/vtk-8.1.0-openmpi-4-compatibility.patch
+	"${FILESDIR}"/${PN}-8.1.0-openmpi-4-compatibility.patch
+	"${FILESDIR}"/${P}-qt-5.15.patch # bug 726960
+	"${FILESDIR}"/${P}-gcc-10.patch # bug 723374
+	"${FILESDIR}"/${P}-fno-common.patch # bug 721048
+	"${FILESDIR}"/${P}-py38.patch
 )
 
 RESTRICT="test"
@@ -128,7 +140,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
+	cmake_src_prepare
 
 	local x
 	# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
@@ -144,8 +156,6 @@ src_prepare() {
 		sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
 			-i Utilities/Doxygen/CMakeLists.txt || die
 	fi
-
-	cmake-utils_src_prepare
 }
 
 src_configure() {
@@ -287,13 +297,13 @@ src_configure() {
 		export F77=mpif77
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
 	use web && webapp_src_preinst
 
-	cmake-utils_src_install
+	cmake_src_install
 
 	use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar
 
diff --git a/sci-libs/xdmf2/Manifest b/sci-libs/xdmf2/Manifest
index 92d4d90814a2..99e68f6c0eb4 100644
--- a/sci-libs/xdmf2/Manifest
+++ b/sci-libs/xdmf2/Manifest
@@ -2,5 +2,5 @@ AUX xdmf2-1.0_p141226-cannot-find-hdf5-bug-591302.patch 1675 BLAKE2B f1a2674d987
 AUX xdmf2-1.0_p141226-cmake-3.12.patch 422 BLAKE2B 904de870ce6e7cb9aaa4454dbecd47447048eee08e7826869e09e7f294570e0dd235f011ccc775a1c4369bb4e6e890d8279c2102ce1c85f8488815c185be891e SHA512 e9fbf5caeffcccd12d9112cc4afc2485cea89105743d69483c08e931e84cb5d48facf67017b49c20a9c0f3087dbac974fa6eb2b0b76714ad207c1bbb20fd9518
 AUX xdmf2-1.0_p141226-module.patch 452 BLAKE2B 1611edbdf962ba25b72dab702044b7c7299abe5d92757c333827f08eb643fd17661739a4c0f7c0e759c516d9eeba794733145bdb03ef6779d1a9ef6e315fc5db SHA512 9a9e05001f1d8ea8250a7bb9231a43e8cceeface61fb125330b6255a1ba452650a80cb6592a69fdecc04212752c0d1fa195151b13c88262c40a36ca566a33dcd
 DIST xdmf2-1.0_p141226.tar.xz 267096 BLAKE2B 230ed73cc0521f04ff519c0050559ccf3837b915a196336de4b439cf05cae02220270a81290a6aac70e04095695b853e7de35613fba39cef6a90e93e6c99a3f9 SHA512 031b947ccd942c39cb40504e939f03bc9e3190ae1a7baf8325809decf70a040e860b43d5bc9debfcf2f3838f5f0d7a9c77c92561c89fc0d632306e140b136db9
-EBUILD xdmf2-1.0_p141226-r3.ebuild 1826 BLAKE2B 163017498172125a0c3705e7c72fe0d711cd5208444e8871623bc0a7ec854ae1cb787def9fedbb18d18bae31b9a0fe7fdafde58176e12f5e9b76aaca35e52c67 SHA512 460bb0336178754a71daaa80df233e4502980af316e6a28440e29cd886d83cc2e2fa0f1f4f6d4f3270b8612b6fdc63cd70e4accc0daecf2097b118e4558637c7
+EBUILD xdmf2-1.0_p141226-r4.ebuild 1152 BLAKE2B 7243e0c54008dfe0a141a4f97fe9d2ef0975e81696176220a4cbfed9783f021dd15a7d4f7f442f253ad361b38dfd7b1e4ba92c6abe07e09afd800f3bed1433f0 SHA512 28f7106ede60193dc0d8d9272e37b1ec13e7682f874521cbc69cfec66a92ce3fcfaa615db414419a4d91ee727e4dc31d7b4e276dc181d05323280620503b71e2
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild b/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild
deleted file mode 100644
index fe0d3fcb2bc5..000000000000
--- a/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils flag-o-matic python-single-r1
-
-DESCRIPTION="eXtensible Data Model and Format"
-HOMEPAGE="http://xdmf.org/index.php/Main_Page"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="VTK"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="doc python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/boost:=
-	sci-libs/hdf5:=
-	dev-libs/libxml2:2
-	python? ( ${PYTHON_DEPS} )
-	"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	python? ( dev-lang/swig:0 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-module.patch
-	"${FILESDIR}"/${P}-cannot-find-hdf5-bug-591302.patch
-	"${FILESDIR}"/${P}-cmake-3.12.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup && python_export
-}
-
-src_prepare() {
-	if use python; then
-		local _site=$(python_get_sitedir)
-		sed \
-			-e "/DESTINATION/s:python:${_site##${EPREFIX}/usr/$(get_libdir)/}:g" \
-			-i CMakeLists.txt || die
-	fi
-
-	sed \
-		-e "/DESTINATION/s:lib:$(get_libdir):g" \
-		-e "/INSTALL/s:lib:$(get_libdir):g" \
-		-i CMakeLists.txt core/CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# bug 619604
-	append-cxxflags -std=c++14
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=1
-		-DXDMF_BUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_TESTING=$(usex test)
-		-DXDMF_WRAP_PYTHON=$(usex python)
-#		-DXDMF_WRAP_JAVA=$(usex java)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dosym XdmfConfig.cmake /usr/share/cmake/Modules/${PN}Config.cmake
-
-	# need to byte-compile 'XdmfCore.py' and 'Xdmf.py'
-	# as the CMake build system does not compile them itself
-	use python && python_optimize "${D%/}$(python_get_sitedir)"
-}
diff --git a/sci-libs/xdmf2/xdmf2-1.0_p141226-r4.ebuild b/sci-libs/xdmf2/xdmf2-1.0_p141226-r4.ebuild
new file mode 100644
index 000000000000..e196d6f8dd2b
--- /dev/null
+++ b/sci-libs/xdmf2/xdmf2-1.0_p141226-r4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="eXtensible Data Model and Format"
+HOMEPAGE="http://xdmf.org/index.php/Main_Page"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+LICENSE="VTK"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/libxml2:2
+	sci-libs/hdf5:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-module.patch
+	"${FILESDIR}"/${P}-cannot-find-hdf5-bug-591302.patch
+	"${FILESDIR}"/${P}-cmake-3.12.patch
+)
+
+src_prepare() {
+	sed \
+		-e "/DESTINATION/s:lib:$(get_libdir):g" \
+		-e "/INSTALL/s:lib:$(get_libdir):g" \
+		-i CMakeLists.txt core/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=1
+		-DXDMF_BUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_TESTING=$(usex test)
+		-DXDMF_WRAP_PYTHON=OFF
+		-DXDMF_WRAP_JAVA=OFF
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dosym XdmfConfig.cmake /usr/share/cmake/Modules/${PN}Config.cmake
+}