gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sci-libs
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
187 files changed, 3263 insertions, 890 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 74a66b7aa2c7..fe78b3cf8cd0 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/adolc/Manifest b/sci-libs/adolc/Manifest
index 719d5868c8dc..2e29e087fbac 100644
--- a/sci-libs/adolc/Manifest
+++ b/sci-libs/adolc/Manifest
@@ -4,7 +4,9 @@ AUX adolc-2.5.0-pkgconfig-no-ldflags.patch 364 BLAKE2B a35ab92ca491110c390a4d0f9
 AUX adolc-2.6.2-dash.patch 4516 BLAKE2B 8db052472bd3051ed0b8b1a180aac4098862695cefeed0f0f94600d447b2ef5b888ba072613ea101ac1435569eb9d5bcba1aa64b23a0bc7cf01a4ef20d3f760b SHA512 9b904d8c0ab3c286af27b293b5ffe516b9c1da53169702f94a9213496b6626e1a587e8ab8d9d25b983872c1a97620a8d5386d9053ba1a4c973ef5e145f655bc5
 DIST ADOL-C-2.4.1.tgz 2210414 BLAKE2B f9b1fd7f0e619d811b29e077e436697dc8b5a388568d73b2db602e57f97cbb690a5b47a55c722ae45cc28698dd19949eddb9d02e11c87383191e217f012519bb SHA512 5e5135ca587d159510bf77338fdff3d324f4d32c4ec6f8cf64ddc92253b427b8ee26a30bc1d83fe18121bbfdc7454c3536f58849c0c335e1b240e39d46acdccc
 DIST ADOL-C-2.6.3.tgz 2416928 BLAKE2B 74e575a1a919bc2787be0c29deaac4b503c077cb06efdba3f2382f21abf1ed53e8cb5f41729dc39f9188e44460fa137a09cffdb296b5f92131153795f36fa83a SHA512 e3c44b1f8ab5211a8a3c3163124e35b6d1e9551672ab4944d983dd3117f609d512c1b08c61e535dc4d50089295ee565bec07aaca67aa88b57b17bc3906573262
+DIST adolc-2.7.2.tar.gz 2447479 BLAKE2B 0f871ce1dcb50bb14684e45e265cf45807f514dd3ca0dbaaedede2c7117d34cc5a34b0096a34c8ec37023e50aec7fd4be6561819d6297771e7f7fcaa7ba0e507 SHA512 b896650077367fd7388a6c5a40e5d8bb3f19af9e3bc5b067fd1d9a769809b77ccdfb5ef11ef481ab791c0f040401aaed0053cba55d4c2a3383c0d056122280f6
 EBUILD adolc-2.4.1.ebuild 863 BLAKE2B e3455061dfd93d3fd14ae07051da5e3a99576d8e20d7ec5f28aad0daae9f0ef37dc0f4ba2565cf4edb96ffb7d07ad6055f06335302a787bd7e88e8c84fdebea1 SHA512 c409dd49db0d5c1043a50aae33d6dfd07e24c1f62f18abd4906ea7468944ec46f89d1e80be97af6c166b0cf1d00a2a38383555e7d1e76e062a136b32ab98006d
 EBUILD adolc-2.6.3-r1.ebuild 1215 BLAKE2B 3ae1cf484b9f241225703e0da2202ff1e95e8cc850cd3bfd7278bc73e568cd65d39ad48a77a311cac7c21e06af7508305702dde33aa9bc10d516e2b5af4de2ba SHA512 b84eef882252394bbb6253b707e45bb8779dbe3066b6b2d64db032d0be06d9866ba63554ff78f620887b83b91d101c722e2268d21e7222e7e61e5dc486410c63
-EBUILD adolc-9999.ebuild 1353 BLAKE2B 58aae0d1c849e069fbc1f947101069d67c4aeb05e38af535d5c2e98f092ab277c545f0305355bfdfa8e0af3208525e4413ceefc61e27fd7a124a0781513ac6aa SHA512 df03d1c9d7385df40bd9972625b2ba2e5af4c995cda8abfc406d2c12769b3d6412c79d69e826a495cb5b5a9361dc6da1ea0c59e2f135c6019e3f9262f13c243b
+EBUILD adolc-2.7.2.ebuild 1366 BLAKE2B 9d56381152f11b278f5bcbb150aab07d5cb1b8539223da53a6ff3526d813b0d7a1b0726cc78aa2f74f2df44c784ac8a801339f9b4c8b9e3e68353456da691b19 SHA512 e5098c625210d6fe7aadde93a92c79e1c9c2748ea97303c9d3acb176ce67be8d6f9ef1976821320bdea070ea43f00e24571ef13d1aa3bee4cbd694133a8bbde4
+EBUILD adolc-9999.ebuild 1366 BLAKE2B 9d56381152f11b278f5bcbb150aab07d5cb1b8539223da53a6ff3526d813b0d7a1b0726cc78aa2f74f2df44c784ac8a801339f9b4c8b9e3e68353456da691b19 SHA512 e5098c625210d6fe7aadde93a92c79e1c9c2748ea97303c9d3acb176ce67be8d6f9ef1976821320bdea070ea43f00e24571ef13d1aa3bee4cbd694133a8bbde4
 MISC metadata.xml 736 BLAKE2B ddc9935966f95c209568fca01f222894812328b0411a75ee3ff369220860c274d52280c39f916dfdf9fd30ee3a67134a1bdab19feba1bf35b0e2695fa4577a97 SHA512 00cb5d1b587dc4220507a52f2e979fbbeed9035e59e1de26781e33b16d6a16474ad4aeae45ea7a1b8de9193fbe0671ffdd19a07431c33e22ff5586c7216b0522
diff --git a/sci-libs/adolc/adolc-2.7.2.ebuild b/sci-libs/adolc/adolc-2.7.2.ebuild
new file mode 100644
index 000000000000..dc6d88c74f35
--- /dev/null
+++ b/sci-libs/adolc/adolc-2.7.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs eutils
+
+DESCRIPTION="Automatic differentiation system for C/C++"
+HOMEPAGE="https://projects.coin-or.org/ADOL-C/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/coin-or/ADOL-C"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/coin-or/ADOL-C/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/ADOL-C-releases-${PV}"
+fi
+
+LICENSE="|| ( EPL-1.0 GPL-2 )"
+SLOT="0/2"
+IUSE="+boost mpi sparse static-libs"
+
+RDEPEND="
+	boost? ( dev-libs/boost:0= )
+	mpi? ( sys-cluster/ampi:0= )
+	sparse? ( sci-libs/colpack:0= )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.0-no-colpack.patch
+	"${FILESDIR}"/${PN}-2.5.0-pkgconfig-no-ldflags.patch
+	"${FILESDIR}"/${PN}-2.6.2-dash.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-advanced-branching \
+		--enable-atrig-erf \
+		$(use_enable mpi ampi) \
+		$(use_enable sparse) \
+		$(use_enable static-libs static) \
+		$(use_with boost) \
+		$(use_with sparse colpack "${EPREFIX}"/usr)
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	default
+	use static-libs || find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/adolc/adolc-9999.ebuild b/sci-libs/adolc/adolc-9999.ebuild
index bae60dcf2ee8..dc6d88c74f35 100644
--- a/sci-libs/adolc/adolc-9999.ebuild
+++ b/sci-libs/adolc/adolc-9999.ebuild
@@ -1,24 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools toolchain-funcs eutils git-r3 ltprune
-
-MYPN=ADOL-C
+inherit autotools toolchain-funcs eutils
 
 DESCRIPTION="Automatic differentiation system for C/C++"
 HOMEPAGE="https://projects.coin-or.org/ADOL-C/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/adol-c/adol-c.git"
+	EGIT_REPO_URI="https://github.com/coin-or/ADOL-C"
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
+	SRC_URI="https://github.com/coin-or/ADOL-C/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MYPN}-${PV}"
+	S="${WORKDIR}/ADOL-C-releases-${PV}"
 fi
 
 LICENSE="|| ( EPL-1.0 GPL-2 )"
@@ -59,5 +57,5 @@ src_test() {
 
 src_install() {
 	default
-	use static-libs || prune_libtool_files --all
+	use static-libs || find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
index c85d451b2781..4aacbf0e4876 100644
--- a/sci-libs/amd/Manifest
+++ b/sci-libs/amd/Manifest
@@ -1,3 +1,5 @@
 DIST amd-2.3.1.tar.bz2 339970 BLAKE2B b84b7b690deb6a1fcfdbbec403a3e5267cd4e1cf851312a56bbd48ac92a732f789365e2191f6b74f49173bc6c008ebd5f6b528a99a9abdc6a2777f3a6a7305b8 SHA512 19b8c010e0f7a5a96e60fe52904b2b548fb89dfaf9d6f99184df955a732ec3edef04acff01a82a909e030c3bf78c9eccfe0c329731edb29f4b936507e39d885e
-EBUILD amd-2.3.1.ebuild 738 BLAKE2B 1c578b5cb410ec31da08de7ea5f8ccf1362a7f5388e06ba44aa0d36809c77e0c73ab38adf15246357fe9577224ef3c0461051c1bc9be734676b620b8ab80e655 SHA512 ec4a5c1a56c783b931f7a3ff8e177e5c372bf8c6b04421833981bfbc4414f130c348c2860d4042d1455c686be105122864e29b1a31dd12bd2f819f3e060ff0a3
+DIST amd-2.4.6.tar.bz2 343925 BLAKE2B 296579d888b61e84ec798206fbb6f89fd923f0d762e84e7a1e2e2a5fb502f4822f89a2a4b631dc42fa829e845bf3980886185650e8de28774400e0c351805061 SHA512 6960a557e6c2f82ca2e68e48ddcb502e1527235a3ca34df2f5f7f63f0f12afacedb15fefe4a39768fe7a2c70308793544b5b24b6f2be2c6b934b0c0e0e796d57
+EBUILD amd-2.3.1.ebuild 739 BLAKE2B f92ddd0fc74c0e1940975e1536f3a56364125a40f0ded5660c9c9dafa04235628b6e10c0aacb03abbc6faad134a2e91b88990475f9222ff9bc6fa1361ca224a7 SHA512 96e2ffe647415968e1824faab20011008db57a3d810d562dd1e45107881512dbe14cf106ea05022f8e22b0a6ca12c5bff0e5c461efaa338b09dca2e2d30534da
+EBUILD amd-2.4.6.ebuild 722 BLAKE2B 30b3940156a86ae07f36dcbdbfb5d547a079afd4e85939b1f51599cb4fadff074d2a99f93a908f9e42caad25b2f0976006e6ab007106fb3aaade3699740d2c2e SHA512 c6968c4152243dc5032247dfb07d54dc2357c2bbe2bb47fa9a8a82825f303fca18ed31de90ed6ac5d0f26361a1ec01cd026ad35ccee94b11367f691c693e87cf
 MISC metadata.xml 492 BLAKE2B ac6367af33dd797e703e3370d6369db5286b11f862b5387258e9edd860554049c7d9e2bf2186c86e24a7fc29c3f1122f330c0a3cf0420f13085757cff0a388b3 SHA512 1c53658e87337e1e43149c363c901dabfdde52b647891d8026a7ce9ddcd5e36b0121948d169d446e5a78d05c26301bd4f8c7c06665506ebc0999c259b709a6b6
diff --git a/sci-libs/amd/amd-2.3.1.ebuild b/sci-libs/amd/amd-2.3.1.ebuild
index 7a8b40f973e1..a0bb445c716c 100644
--- a/sci-libs/amd/amd-2.3.1.ebuild
+++ b/sci-libs/amd/amd-2.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc fortran static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/amd/amd-2.4.6.ebuild b/sci-libs/amd/amd-2.4.6.ebuild
new file mode 100644
index 000000000000..14e702a4e129
--- /dev/null
+++ b/sci-libs/amd/amd-2.4.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fortran-2
+
+DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
+HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="doc fortran static-libs"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( virtual/latex-base )"
+DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
+REPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		$(use_enable fortran) \
+		$(use_with doc) \
+		$(use_enable static-libs static)
+}
diff --git a/sci-libs/arpack/Manifest b/sci-libs/arpack/Manifest
index 1d0d2d582de4..7eea9e4c3d23 100644
--- a/sci-libs/arpack/Manifest
+++ b/sci-libs/arpack/Manifest
@@ -5,6 +5,6 @@ DIST tutorial.ps.gz 105599 BLAKE2B 99570e6a0cc1c020b9c271e8ce1cc224f69ff5333cc81
 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 1353 BLAKE2B 1c1e065c0aa0b64d65cb3892324ae3ab4736c01e9c27a9a5962a2a9eb418f8df25723a7f9c0ba9aa337b63aa93c30a749c1f613feca748c830cc777d3d605b72 SHA512 41622bfb79ab0e186916788a3573e039d1b01c44594b9b85ee1335e7d65f7451b00a4eb17b6e26a9f7fb865f6eb7a4be42f4c9dd31aeb3c05dbce92786892fb2
+EBUILD arpack-3.5.0.ebuild 1360 BLAKE2B f27b73327d50e85de51733c5b1ff4348c39a805fbd22112d57fab68ebe62e46655610f59d4b82df67da7e37bf4a10fb497b59a50de4f4df64d1cb9bb01a4a17c SHA512 4e858b3a711180820c423a57bf977c90947b162f458ed74cc85904d844d6efb0422af3a9c3e8aec03cd3d2c708bff1f99ec74d71a47ca77dd0f21085382b380b
 EBUILD arpack-9999.ebuild 1310 BLAKE2B d1153a2ab23165a18266ea7c7dcbb78a55a816645dbb0f37c0a9ed065fce28cd49af53b50a7b6314d79bcffb1e3c9aa4e942752dd2fc4cdcc3ac883671ee1bfc SHA512 83fff44b0d876d88b5836d4c3a1bbbaf05834e31a8914e57e130ea574c14bfd094d3dd64502924bb50c802a008d1d42f97b9634d8ed5211f9e8ee27b265bb98e
 MISC metadata.xml 974 BLAKE2B c9121a0b23acddc3268d4bdbf4537104217a00d09263d29b6cc6f832c87f9a9775f6fab567976078dc1dfa54f2bac627d792b1819a9ea698f3a1534bc52c39da SHA512 c3e094cab53fb61c9acf3eff6ca0c0fc53a71ec135315ba833fbfe6a5ae9481f2b4de5270ccd19ec84cf85dfb18df179e1e234d268eef1af98be218575dcd4bf
diff --git a/sci-libs/arpack/arpack-3.5.0.ebuild b/sci-libs/arpack/arpack-3.5.0.ebuild
index 5bf1ad557e6f..91539e12556e 100644
--- a/sci-libs/arpack/arpack-3.5.0.ebuild
+++ b/sci-libs/arpack/arpack-3.5.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
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples mpi"
 
 RDEPEND="
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index 144d25e33004..d1449e8aff1c 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -3,7 +3,10 @@ AUX avogadrolibs-1.91.0_pre20180406-bundled-genxrdpattern.patch 1644 BLAKE2B 3b2
 AUX avogadrolibs-1.91.0_pre20180406-unbundle-jsoncpp.patch 5377 BLAKE2B 5de00cdcd90d7642ddb82aa8ae0e6685ad17c2a6332a4ef9ba28be66f48a6eabf51d557173a6129b588b9eafb394db74d332fc178b2a323d29777e88e37174a7 SHA512 b4445aa7377370fd1336b7fdf0aa3dfa93b6d538efa70ca383cdcf85d9f54e64a6bd0c2af5e0f5c80ed731d4babd4c2a1f7a4e909fb5cf2a30bf72224737870a
 AUX avogadrolibs-1.91.0_pre20180406-underlinking.patch 549 BLAKE2B e773e8994677a4cc0880013455efbe153ecdf92061599b787e3486638a6a2a0b5ebe731387a6f79357ff8f049c74b2a5efdeec0ed886b89e02f5160268dda4a2 SHA512 05d7ef99d1d5d395962def8896fb0c61ae437aeb0199ea8ce26a6076abba0559973aff5a4a4620f5c7dbe6413c80237490ad6b80f8a7503a8b2d3ae92f81fbf4
 AUX avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch 3887 BLAKE2B 3803af011ecd8df2cc8cc969623d37237ed398cfd82baaf06d6d59da7dfdda3c8a042ffe2b5e15e9571cb3d74ae0eba4e3d80c9cbd9a6fd53a0035340257a382 SHA512 d49da2a4f215a74f1267de1fe74a19e1f2c4fdd61d583a05c04ca3d8309fd0ed431ac10164a0130fa5a1a2c85f23b5de5445a75dbe0e0e83d7060521454507b1
+AUX avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch 695 BLAKE2B 40feb1bfe132fe5ddbef435b4d611a55650c0348c943f0796a87fc0761c99c4aebcbc54fb4d29e545c66384ad7352067f3ff5549e9e26bdd2cfe602974f56425 SHA512 7e5198bb3b6c7e83372bd6b54d3f50347ff8519fd24adcb0c59fdc50593be1c08cc2b1d7d12dc530de10c80bfaacad17679a6b1b90ded82947fe94d6dfa51f56
 DIST avogadrolibs-1.91.0_pre20180415.tar.gz 2541101 BLAKE2B 526d2135af123d31220c8dd87351a35464e3dfd6b8d411d6dc9a6b3e74693090adfa3b61198a6a296eac99e6bbd67623f7aeda6a1752a09e3e3bcaa3df4d5008 SHA512 1cc646368f70523fcf20c6cf598025234162e0c81da64a3b5375c1691a6743f2aceb1f13230937bf9da045e725a23c1c89c8121e07b31ef9e2c7987b1feafccc
+DIST avogadrolibs-1.93.0.tar.gz 2735862 BLAKE2B b5d696f23aeeab27358ee390a30b2cf146e7119185a0d2e8d71b34d2744e534cd8b50b36d12928b5aa723118db470272b6428514593d64770d172c4bde730cf6 SHA512 1af220e5614cbd96656679c2879cb7f7c46acd135b4e6f2e5f8d0ba98601ce004e78f019a0a71c643f005451309bd194eb73eb9f66707685e5855b47e95f7eae
 DIST linux64-genXrdPattern 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
 EBUILD avogadrolibs-1.91.0_pre20180415.ebuild 2223 BLAKE2B 6a9201d8b944a49fca4a0ef06f227e3d941539666d14a60a12cd72531ff46b1a5845a1543c44a8117b843174a2dacb4b3605e7a5afd4fc893b404bcb9b72304e SHA512 cad3ea94243eccc4f734368a5a8ebdfef1ec7ece172ab6b97e2470b3bc4b5e05c7da2b5ca8c898d4f05ebf5a8531aca6dfbcceea39987dbe5754617bbbe0293e
+EBUILD avogadrolibs-1.93.0.ebuild 2319 BLAKE2B 949191323ba13df889944a1908bbf23417e8770139d8fb060395bc809ce0e0de1bf1ac3927c88a6449979801ba3ca92107d6a15e409a2a703efbe9b59262e19b SHA512 be5e96632b2a43aeb2b33e45ba2048cf982bfb9b2759a9e0d3c755108d05afc53f2f3073e21fdc5f1960f6ac8ee67c70c0154f1a068f6f0c7fd0c4fad03f9289
 MISC metadata.xml 670 BLAKE2B 39737e6ffacaf9284506e41dfa1154f233a6bf37dd514c0eafe6bdf7bd7129a43d81cf4c3e510759b7888277bb403ad933e21abf0ba4dbedd43fda2aa2b55edd SHA512 781b3e67a291253d83d6c2e11124b07dbae652267de2702a1a2b10680f7db19cf35bda8964b320658d849091bd9ead07eeb5fc682a8817101dd1e7a1e9e20757
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
new file mode 100644
index 000000000000..a1cbede0ed28
--- /dev/null
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
+HOMEPAGE="https://www.openchemistry.org/ https://github.com/OpenChemistry/avogadrolibs"
+SRC_URI="
+	https://github.com/OpenChemistry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	vtk? ( https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern )
+"
+
+SLOT="0"
+LICENSE="BSD GPL-2+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+# static-plugins needs to be enabled until upstream fixes
+# https://github.com/OpenChemistry/avogadrolibs/issues/436
+#IUSE="archive doc hdf5 qt5 static-plugins test vtk"
+IUSE="archive doc hdf5 qt5 test vtk"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="vtk? ( qt5 )"
+
+# TODO: Not yet packaged:
+# sci-libs/libmsym (https://github.com/mcodev31/libmsym)
+# sci-libs/spglib (https://atztogo.github.io/spglib/)
+RDEPEND="
+	dev-libs/jsoncpp:=
+	>=sci-chemistry/molequeue-0.7
+	sci-libs/spglib
+	archive? ( app-arch/libarchive )
+	hdf5? ( sci-libs/hdf5:= )
+	qt5? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		media-libs/glew:0=
+		virtual/opengl
+	)
+	vtk? ( sci-libs/vtk[qt5,views] )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
+	qt5? ( dev-qt/linguist-tools:5 )
+	test? ( dev-cpp/gtest )"
+
+PATCHES=(
+	# https://github.com/OpenChemistry/avogadrolibs/issues/449
+	"${FILESDIR}"/${PN}-1.93.0-fix_AvogadroLibsConfig.patch
+)
+
+src_unpack() {
+	default
+	if use vtk; then
+		cp "${DISTDIR}"/linux64-genXrdPattern "${WORKDIR}/genXrdPattern" || die
+	fi
+}
+
+src_configure() {
+	# -DBUILD_STATIC_PLUGINS=$(usex static-plugins)
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DUSE_PROTOCALL=OFF
+		-DBUILD_GPL_PLUGINS=ON
+		-DUSE_MOLEQUEUE=ON
+		-DUSE_MMTF=OFF
+		-DUSE_LIBMSYM=OFF
+		-DUSE_SPGLIB=OFF
+		-DUSE_PYTHON=OFF
+		-DUSE_LIBARCHIVE=$(usex archive)
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DUSE_HDF5=$(usex hdf5)
+		-DENABLE_TRANSLATIONS=$(usex qt5)
+		-DUSE_OPENGL=$(usex qt5)
+		-DUSE_QT=$(usex qt5)
+		-DBUILD_STATIC_PLUGINS=ON
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_VTK=$(usex vtk)
+	)
+	use vtk && mycmakeargs+=(
+		-DBUNDLED_GENXRDPATTERN="${WORKDIR}/genXrdPattern"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch
new file mode 100644
index 000000000000..5eb316af9414
--- /dev/null
+++ b/sci-libs/avogadrolibs/files/avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch
@@ -0,0 +1,11 @@
+--- a/cmake/AvogadroLibsConfig.cmake.orig.in	2016-12-01 22:17:48.000000000 +0100
++++ b/cmake/AvogadroLibsConfig.cmake.in	2017-03-11 20:39:36.462581381 +0100
+@@ -10,7 +10,7 @@
+ 
+ set(AvogadroLibs_INSTALL_PREFIX  "@CMAKE_INSTALL_PREFIX@")
+ set(AvogadroLibs_INCLUDE_DIRS    "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_INCLUDE_DIR@")
+-set(AvogadroLibs_LIBRARY_DIR     "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@@LIB_SUFFIX@")
++set(AvogadroLibs_LIBRARY_DIR     "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@")
+ set(AvogadroLibs_RUNTIME_DIR     "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_RUNTIME_DIR@")
+ set(AvogadroLibs_CMAKE_DIR       "${AvogadroLibs_LIBRARY_DIR}/cmake/avogadrolibs")
+ 
diff --git a/sci-libs/blas-reference/Manifest b/sci-libs/blas-reference/Manifest
index 24db31aca8e4..960d59563b9a 100644
--- a/sci-libs/blas-reference/Manifest
+++ b/sci-libs/blas-reference/Manifest
@@ -7,7 +7,7 @@ AUX lapack-reference-3.7.0-fix-build-system.patch 1598 BLAKE2B 9128036fc47dae239
 DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01f5ab237dc0d941792ceb54dbd2f8dc22d56286f5dab3499289ed94e67521ea951a98973c9640abc294ad6c SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8
 DIST lapack-3.7.0.tgz 7359812 BLAKE2B 20aa42e22d8c920d1360afe41ceec7b36f6cd5fbe43ca9d7848ef7cc45a64a0314cb1321941c1a7c03654f41e28ec805445882ded0ca0ea07674e70b66cba6b5 SHA512 e4f4c7d0ba8a096eeb813160c6dbcdd535647df6b2ad5beac9181908158956b31d1a9554ec9b9836fd44fe7404c1f377b297cbb20d744f20d70e357fd246c91b
 DIST lapack-lite-3.1.1.tgz 5332509 BLAKE2B 5a8ea98e9956f2bc1fc8dbb1ede18178d43d1f418e324f2798daf2197a2f7f7a1841ea0a0d68f1affa3c9c0a37b024f82222bd2fd6072ca827c70c9c441191c7 SHA512 492b932ef313339ce6b4e63ac8f778489e6870b0eb85f7b086f3c844e75f98e7f85382c7556dfa368ab8320b6f02d1df8ccfcb40b5c0b7c2d74518b7c309e75c
-EBUILD blas-reference-20070226-r4.ebuild 1941 BLAKE2B 9313c3b9c7207b23769779bbaf4e82bd3f2f89ec2c04b97753dd27b266a1f2c80c2e79e7d0bdd0192fe8757cc65f63d73e9ac6a0a9ff21721437fe9717908a1f SHA512 212bd53367da67b62ff9ed6723559711a2e11364ebc8f726bba314c3df1eb5c45ee44b902f347e958e99a230b3b9392c7280716fc4e5844ca1c664a2916be30f
+EBUILD blas-reference-20070226-r4.ebuild 1942 BLAKE2B 246d27c0bd496c35df3ec6f89f11526f4a8f218fcc775d849cf6e83ad63f2e8e072fa795cd8d90df16b307364b4cd3ddde9b09462af5821c47a942aa2787c686 SHA512 4f43ec9aa40e8d73886d9b77d529958b524cfcdb6d0f44ce084d91ee351cf1ed75a14a7d6e6119277a2566d1bd6627b201127a1bd7abd9a0796e65c7ecab7c86
 EBUILD blas-reference-20151113-r1.ebuild 2443 BLAKE2B ebf191ba5e0f495e61c38b65c49a86e4658011c199d3f042835b87f1e503ccfc73cc128539a95c7482bfaa7d664bd97ced90a3f1a357e0c31f49dbbae424cfd5 SHA512 91aca3db676aafb985e6ce3591a16363a2ded2f5758d2af56cf1c01d432fa3aad347e74b962b52c4ae993528e3837ca3fffb840852a78fb9da43b465e537f67a
 EBUILD blas-reference-20161223.ebuild 2679 BLAKE2B 8cce508ef59b33e6ff6ac50ee14ce0ca5252dbc61820da38349eab2cf3819d658ed89f9f22a284ec77bb2c831707af2a00323ea3f4933b2f0e0450ff9ec8c517 SHA512 dd96d61e86fcea2d01e76ce902ebb45b2e6dc30ea9a737fbdf5b28486c951944b1728f7c135a893fca6645efceb9d2b1633025e261875ea55bb6b1ae8682b241
 MISC metadata.xml 801 BLAKE2B 68ea5978073c01c861253ffd064179a25dc63771c9cabc0b3de200e5333c93a5d55caf8cde1234b643007b690b2a96fa207314117f790b367bd089c997722676 SHA512 78ca8d7459ba5bc81f5f821d9020023d01610d1fd55157bf566890a5c80ff8f83ca1139304319ee41b04f04b559c9e377037c04a1fbdd8dfde3e62f7ca6ff9fe
diff --git a/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild b/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
index b9c622a49106..bd98acc71819 100644
--- a/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
+++ b/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.netlib.org/lapack/${LAPACKPN}-${LAPACKPV}.tgz"
 
 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 DEPEND="app-eselect/eselect-blas"
diff --git a/sci-libs/brial/Manifest b/sci-libs/brial/Manifest
new file mode 100644
index 000000000000..31a2bfb2bbe3
--- /dev/null
+++ b/sci-libs/brial/Manifest
@@ -0,0 +1,3 @@
+DIST brial-1.2.8.tar.bz2 1228732 BLAKE2B f9bdfc9416381f3436c555861806a7ea4680e706729b6de9c2b06ea2908090b87b745fe5ce2d94ba9d5832a78067e4848f8ef113b7d8dc22557b6d95b7dad707 SHA512 a94acba140d976dd070b5214c537fb3dba89fc2309addc566b8f0a031328f2d4c2bb3c38c2cb5565c7ff2ca0c5f7f56ca120899d15c768887d3b61a18b3e05be
+EBUILD brial-1.2.8.ebuild 981 BLAKE2B 1afbbc177eac3082e2ed4ffaeb56e62d53067897e26be76f381be19384528cee71f8183ff0d50a146cc3f65d8f7b3b0c54cb99ddcec9c8bcc446fea5ece4fb34 SHA512 71614bcf0bf367288ae14e91b84a6ab4c9dc203ea208f837139590c84ace60e0e74928f16d83a4fa73206d28ba23ff7d1e2dd8d4ff0e8d691882b828831c4f9d
+MISC metadata.xml 1046 BLAKE2B 34c6f471ca6fbc4538cf3a2dc71bd19d4201656f326166b2589be3126f73f5ff34d190c2ff42154a067457a9da6f05067e782c9dc340357895ca016be6983183 SHA512 550a191f11f7812c363d419e8bed69fdd70e69b3a94e6fba838be9bc04050977edaab34ab0c0ef9c589e6478cdf2d40ba631983f6a2f411e51b9f3964bb48db5
diff --git a/sci-libs/brial/brial-1.2.8.ebuild b/sci-libs/brial/brial-1.2.8.ebuild
new file mode 100644
index 000000000000..8949ea5ef31b
--- /dev/null
+++ b/sci-libs/brial/brial-1.2.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A C++ library for polynomials over boolean rings"
+HOMEPAGE="https://github.com/BRiAl/BRiAl"
+SRC_URI="https://github.com/BRiAl/BRiAl/releases/download/${PV}/${P}.tar.bz2"
+
+# The top-level license is GPL2, but cudd/LICENSE is BSD.
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="png static-libs"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="dev-libs/boost
+	sci-libs/m4ri[png=]"
+RDEPEND="${DEPEND}"
+
+pkg_setup(){
+	tc-export PKG_CONFIG
+}
+
+src_configure(){
+	# with-boost-libdir added to deal with some rather quirky setups
+	# see https://github.com/cschwan/sage-on-gentoo/issues/551
+	econf \
+		--with-boost="${EPREFIX}"/usr \
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable static-libs static)
+}
+
+src_install(){
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/brial/metadata.xml b/sci-libs/brial/metadata.xml
new file mode 100644
index 000000000000..7bb93bb41ee3
--- /dev/null
+++ b/sci-libs/brial/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+  <!--
+      mjo: François maintained this package in the sage-on-gentoo overlay
+      long before I moved it into ::gentoo. You don't need an ACK from me
+      to merge his changes.
+  -->
+  <maintainer type="person">
+    <email>frp.bissey@gmail.com</email>
+    <name>François Bissey</name>
+  </maintainer>
+    <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+
+  <longdescription lang="en">
+    BRiAl is a C++ library (the successor to PolyBoRi) that provides
+    high-level data types for Boolean polynomials and monomials,
+    exponent vectors, as well as for the underlying polynomial rings
+    and subsets of the powerset of the Boolean variables.
+  </longdescription>
+
+  <upstream>
+    <remote-id type="github">BRiAl/BRiAl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/btf/Manifest b/sci-libs/btf/Manifest
index a48f96475c5e..a65f45059888 100644
--- a/sci-libs/btf/Manifest
+++ b/sci-libs/btf/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..085477593c5c
--- /dev/null
+++ b/sci-libs/btf/btf-1.2.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Algorithm for matrix permutation into block triangular form"
+HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+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"
+IUSE="static-libs"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="sci-libs/suitesparseconfig"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest
index 7b271627816d..eddb12f9c0f1 100644
--- a/sci-libs/camd/Manifest
+++ b/sci-libs/camd/Manifest
@@ -1,3 +1,5 @@
 DIST camd-2.3.1.tar.bz2 319766 BLAKE2B f812b457ede3b86fd7fd99f8cc2ea8f19a917c96cf33ca65c6bb2d0f7ebdb37b08af5cd8ad260bf4a636f2d884527c928c026edab23fffacafdd87ef2ce416e8 SHA512 13c5d687b9314f43a6c7237c7541e0c21cc544ffe52f8a984f64c5177a9f1f6b5ab07e9190388587f273424db8e6076ef050f836dbc9f33ca44e94d0034c8070
+DIST camd-2.4.6.tar.bz2 317071 BLAKE2B 8f982050a20f00c9443063a0473caa4aa27efe005fe07b503cb68b29499152561fc9d30d00783607b1e8fb8af88707eabfe22d192b80e375b8a6d04d7a9a26d7 SHA512 c4020ed3e063d04f5d7d1a301719b1a5b5b912d505858f046654c9d283c41ff01d55f668fb7f7179a6ac636f5a5b80f71cac5eb5b1e5cae0ede97d946d62a1d0
 EBUILD camd-2.3.1.ebuild 700 BLAKE2B 8426dc0e2c549807b159e0822b7574a9a12ae9ff5a52a1ce45985a6c3446b25ec45011404f1e02262b2c54f1d0c117e8002b8bdd24c44bfebb7403d00cd026da SHA512 eecedd765217b255f7301302ffc6115f0925f76244b433d3765a5feca8f1f5e96af80adc9d6f1f25fd7d2a8f6d254d6e8db301fe6c3ddedeed99a1713018510c
+EBUILD camd-2.4.6.ebuild 671 BLAKE2B 8c8e1b9f31bc1f853da950dce52aa53d6c41418d8bf0e9a71542452e9e70d1700f95cb2e405d4302b765cb0a917f87b907ad809f990926ea1abc8e289a41981e SHA512 d892372d172d61ca64391ac620ab885edbb78ea961b31d5c13a1762e87bc4dc5573f30f9fc3dd3e0bb5a85b9593e5edd1fe74d3b7974aade7d7f62b83e107fcf
 MISC metadata.xml 494 BLAKE2B 456f4ab539ab7303849cfabfda3e07987874a833e5691d6c3336ebb8a86cc6d5cc5fe8c20b65d8e5fdd8da1c947b9e7ff8eedfd2cc17da6040ff5d109b1b110d SHA512 6402783aec0922669bbf45477074644a9b10f44b0b06bf86ad9b4ecbab124076ee7f19c2c68c6eb3bf21a1569a3410f1ed0ac12f653dd5808559da133613d09f
diff --git a/sci-libs/camd/camd-2.4.6.ebuild b/sci-libs/camd/camd-2.4.6.ebuild
new file mode 100644
index 000000000000..3bdd531cc108
--- /dev/null
+++ b/sci-libs/camd/camd-2.4.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
+HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="doc static-libs"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( virtual/latex-base )"
+DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		$(use_with doc) \
+		$(use_enable static-libs static)
+}
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 3d7ffd132bd4..9060984e7a0c 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,7 +1,7 @@
 AUX cantera_2.4.0_env.patch 3559 BLAKE2B 07af1b751b653b1c92288286b9c82ef230ea0df7d9ea4036d23ac24338a221cc45c8e74f137fcf741bb9bb7148e7f3339f54234e9a92ac939956ba7c0ca8e157 SHA512 f2574c3de42d1666a2b64914c66d97045a2a3598f63678b3b60a701d111d7bfc9bd71031dd665a64e6791c9f311fb9514b1a0462a5713763a1b5f87fcd72e528
 AUX cantera_2.4.0_env_python_install.patch 1001 BLAKE2B bfe6e69332117526d8a7c330ae9610e26e72a9e250ce04beda564149fbd21f3262f36982971e5ec0c552e09f12804172b7f978ab03bfb98c0dbe92cd8c7d9401 SHA512 410a81b4ec69eb6eb2a60d55d142b266b836da5a7d4e4ae2fd8844fb87eff0f3544f6e370fc354d334c6cd5a61f8364842c8a9b3bd0dc2290f58ee7392a170f4
-AUX cantera_2.4.0_sundials4.patch 7498 BLAKE2B 8a3fa5ff6a07987bf4d35f0c6362e91414be513a79150526773f8a141271ffe772efbbb7765fc888043ccc2326e89f51a14f2eaf40765c1d05d5987abf5942fe SHA512 0ec9d7f0a0818262ebf2d694800fd6f5a438ef9a501c122ffebe703271cbfd50cc8db20fa28f9674e5740f768df9f3e5fec010c46703c01e4bfff7aea0a4c948
+AUX cantera_2.4.0_sundials4.patch 7504 BLAKE2B 55bfc58edaed97459a40a1adafcba545bc6513219e9ce1bbf4a529007c6c629ad295b4f85b9cac44da9a9399c721ca19547fa75948c0d0d518fc149862eb9b14 SHA512 4ddf7122df491f53bf67f299d8134b072751dc6f56ab0e4d7cfed733f35ad4b1fb7f005584b06f44d68dc2f29abc299bfb6a65b6b0b3daa828fc80fa52fac964
 DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9
 EBUILD cantera-2.4.0-r1.ebuild 2929 BLAKE2B 57eb719f155c1c58024283cea0fd7a667888ce1749be056a644e80f466ac7ed66c854277ae67681a19f6d374ede9a3fb4394f80f4d5802bab77bc28e41807223 SHA512 f1d88be5b54a480735ae55da4a05267c3890abaa80776124234bb5dcb8dd539e6df9d3cf8dd29a1577f9008cc57581e0f6a575b14d1c432599e72f93cbd6967b
-EBUILD cantera-2.4.0-r3.ebuild 3028 BLAKE2B b0dc19d0a64b9a0edb6252c4d636cbe887ebed47ac584b2d9ca03d77b716c2abc5ef43b287f4f260f472a5d6fe3fe593c4f1fe5f4992e0150975aa1a6cde6c39 SHA512 d0d34ffdba44455932fd89e2ba45f06c6f9bd4ecf4b490bb81ca7ed2c1ba726392b4d89c44181bbafccd949da514156cdb57b07d285b9a1e4ab945ffe0e5e959
+EBUILD cantera-2.4.0-r4.ebuild 3028 BLAKE2B cacb43b61a63aba2ae8a55393ff8f0ea93c0bbea9266f182d3ac270e822b09a16865da60076e6ea059bc1c684c9a13e7291f3aed037ca2fa79c48d0844fd5051 SHA512 c3f361945f1d4756f8251fc3122a4b8ba36e5f5723c4d71742f8d089a41614669ecaf5462a8e2d5945b09611eda3a98f4d91736ca253202c44d1a6fd6cb22705
 MISC metadata.xml 794 BLAKE2B 4a92fb553aad7d87d4b7a8d77974dbd67d593b4010783f96324979d9c01067bccc60d2faedf604bd8d44a8ac4316356879301899af8bc08d0fcd548df6d3762d SHA512 a9e6f4e161519d0b3618fe8da7065195bc760ba889fa4356358d4047ea1970eb5fd78bdc5fbeb7c660f1bee48a68ab20ced636514e6f12848e88f6f4dabc9705
diff --git a/sci-libs/cantera/cantera-2.4.0-r3.ebuild b/sci-libs/cantera/cantera-2.4.0-r4.ebuild
index 29345e36058c..d3f8fb2e514b 100644
--- a/sci-libs/cantera/cantera-2.4.0-r3.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r4.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
 		')
 	)
-	<sci-libs/sundials-5.1.0:0=
+	<sci-libs/sundials-5.2.0:0=
 "
 
 DEPEND="
diff --git a/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch b/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch
index 0345a98e2527..8c44228019b8 100644
--- a/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch
+++ b/sci-libs/cantera/files/cantera_2.4.0_sundials4.patch
@@ -47,7 +47,7 @@ diff -Nur old/SConstruct new/SConstruct
      # Ignore the minor version, e.g. 2.4.x -> 2.4
      env['sundials_version'] = '.'.join(sundials_version.split('.')[:2])
 -    if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1','3.2'):
-+    if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1','3.2','4.0','4.1','5.0'):
++    if env['sundials_version'] not in ('2.4','2.5','2.6','2.7','3.0','3.1','3.2','4.0','4.1','5.0','5.1'):
          print("""ERROR: Sundials version %r is not supported.""" % env['sundials_version'])
          sys.exit(1)
      print("""INFO: Using system installation of Sundials version %s.""" % sundials_version)
diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
new file mode 100644
index 000000000000..f2633613ce59
--- /dev/null
+++ b/sci-libs/cartopy/Manifest
@@ -0,0 +1,3 @@
+DIST cartopy-0.18.0_beta1.tar.gz 14215372 BLAKE2B 5bb1e98f18fdf57c0459202bfe77d4e4a476a3008e2f21a77cf643711cc3c438626915c31ee48886e980466f952985503987e3ed571295e2beb6c12754b382c4 SHA512 95d3bd87e57bea89eb2c25d6a709285ba59fb0f994abc3b37faf29b272b73647d0bc8979a25b1480f48bb55c957f4183ac3c3ad49b830ce686e931227c797abe
+EBUILD cartopy-0.18.0_beta1.ebuild 1662 BLAKE2B 89c8c5c01c35b087b53f482bcdba0486b41d5de7d3a0a1abec623c287ca65b92d53c33a1766c532b1be34071c4bb38940cbcf2e80509fafbb2b01c5fc10e5ea7 SHA512 30e66e5d966dec99a83603f2447d3c9db054e45a54e55427df29f81b9348ff6772e9bd351f7f0a070b69c5d6b09c0eef0d1ec4109ecea23e9354e526f04f466a
+MISC metadata.xml 602 BLAKE2B 92e179b5503c84c6e567e7adb48917ca6140a7c04a0f5613b5aa3a9c19623d61abed95c325b41ca0d5a99b046c2891511796de49c3117c4ce9c969069bb2c5f0 SHA512 8677cb5685dee0b5868c1b14ffc13ac93e3b26ab741ceb684c7c48caf02f159a7a6613402e0396b9b0bc256c39b6446cbb7779521324447d96ed524fb8ca664d
diff --git a/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild b/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild
new file mode 100644
index 000000000000..01048dc6aca8
--- /dev/null
+++ b/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit distutils-r1 virtualx
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Python package for geospatial data processing and analysis"
+HOMEPAGE="https://scitools.org.uk/cartopy"
+SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/pyshp[${PYTHON_USEDEP}]
+	sci-libs/Shapely[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	sci-libs/gdal[python,${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	sci-libs/geos
+	sci-libs/proj
+"
+
+distutils_enable_tests pytest
+
+DEPEND+="test? (
+		dev-python/filelock[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	# drop test file requiring network access, which got not covered by markers
+	rm "${S}"/lib/cartopy/tests/mpl/test_crs.py || die
+	# prepare matplotlib backend for test suite
+	export MPLCONFIGDIR="${T}"
+	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cd "${BUILD_DIR}"
+	# drop all tests needing network access
+	virtx pytest -vv -m "not network and not natural_earth" || die "test failed"
+}
diff --git a/sci-libs/cartopy/metadata.xml b/sci-libs/cartopy/metadata.xml
new file mode 100644
index 000000000000..5bffb9050151
--- /dev/null
+++ b/sci-libs/cartopy/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tomjbe@gentoo.org</email>
+		<name>Thomas Beierlein</name>
+	</maintainer>
+	<longdescription>
+		Cartopy is a Python package designed for geospatial data processing
+		in order to produce maps and other geospatial data analyses.
+		Key features of cartopy are its object oriented projection definitions, 
+		and its ability to transform points, lines, vectors, polygons and i
+		images between those projections.
+	</longdescription>
+</pkgmetadata>
diff --git a/sci-libs/ccolamd/Manifest b/sci-libs/ccolamd/Manifest
index 85101a10bb6d..e6eda8c4fca6 100644
--- a/sci-libs/ccolamd/Manifest
+++ b/sci-libs/ccolamd/Manifest
@@ -1,3 +1,5 @@
 DIST ccolamd-2.8.0.tar.bz2 309907 BLAKE2B 1229d0802a53613d2a320906889dc5ae928bc0b21003d0340f7c5f153a8a7fab8302981c1c2421f64ca5c9f5a1e9460ad5d136a6c1efbc401666f82d7aab1901 SHA512 6a515a8250ed98d52aa932a6f93170174ff32f76c1ecedcedeb1540a471416d0cd40b5613a839b96fbc79c66b3cb5106c6a340a33fafdd695c83b7d949756e77
+DIST ccolamd-2.9.6.tar.bz2 305744 BLAKE2B 0d741ead328a1e888715672ddb617cc96a559f46f2379e1d7792b70868dd290de19b3047e3ed4dd2711084c9afc523d18ecb375aa4ee8a4a12950cee08f238b8 SHA512 cf6f210d26ddb1be454cac377a773b73b75261a74e1e3985565f57f45659b1c11b747829c5bbe99c4bc3e8b364d7b2b3c109e00f6d7e8e41afd713312ebf103c
 EBUILD ccolamd-2.8.0.ebuild 576 BLAKE2B e594eab1a608c513c2cf32270f4e4011520562610a3064460dfd771b09266ceaa15c95bb727eeef5a9e12577c74c5a2f900a4a92e2cab000f84f6b6a1c79ac23 SHA512 3f0e57a9837be8c4e44e3a07ed507a176a9672e3eca944b14573ad0cd9698b55cb05ba7e2ebdc981f6a9fdf5c5fa93ef667b0de12a743323bbc590d958ff95ed
+EBUILD ccolamd-2.9.6.ebuild 607 BLAKE2B 2d561523a9ed079156c16a5575df88f80bee8e852305774aa0c4a61efa4adfea9754038d2710cee88a2edaddd49a0c636a9af6ab37cfab0b8a4315276d0eb857 SHA512 fd888fe42d7a601117089697c8767f0e30a2e43e4867a76bf71422e60484e03f7faff5b4929abd0f1e3b98a8464a3257aeb3c1c6a0321eb4eed7579fbe9c2165
 MISC metadata.xml 470 BLAKE2B b20ae7c51907e135898a4ca6eee1454c1760d8f6c061d6d8c9bdf6082773e003326c65ba4489831139bc9af96f2321a09b22fbe106aa87b8f6dbb4781163edb9 SHA512 99c2d290fea618dfd8997209d8e6db971a2ab74d1be5fb270f2177c9843b0f324710491977c7cf2427806295d05e341ece4399afd8a0d43bca8b42b0fdea7beb
diff --git a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
new file mode 100644
index 000000000000..cbeecdadbaf3
--- /dev/null
+++ b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Constrained Column approximate minimum degree ordering algorithm"
+HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+SRC_URI="http://202.36.178.9/sage//${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="static-libs"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="sci-libs/suitesparseconfig"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
diff --git a/sci-libs/cddlib/Manifest b/sci-libs/cddlib/Manifest
index 3cd07726d48f..c117673df379 100644
--- a/sci-libs/cddlib/Manifest
+++ b/sci-libs/cddlib/Manifest
@@ -7,5 +7,5 @@ DIST cddlib-094g.tar.gz 1383388 BLAKE2B c26f201f0369a931d672b192d6fab775210d2758
 DIST cddlib-094h.tar.gz 1678116 BLAKE2B 619e26745c04338d97fb4ce2997c23a16017ed19e14dda24c9ef90b84253d5540361b4ccd68eafb65b6380cff95b58e9ec2bf587643e71084cd47ed87bdffbc9 SHA512 22160c88832b78dd568b58c1e097e4c6006f82580f1114a3ef03fc10bde98132337d5b555306b58b65aac6fea1534d9e09725907808c969de16c2dfc75f80204
 EBUILD cddlib-094g.ebuild 1014 BLAKE2B e53740d143751c2a96efa2613e5d1df912805b44cb690f576c5bf036fcece1f708a92fbbc9cf5f20c05e66dce158b2e2a88fd65e4f33534fe25c15d156727c8f SHA512 f59749d1d10d844dfd97eafbbb1a752424f26af88652ff52d6f8a1fac2f1849051184a68c03f6bc82f548d0b550f12623c9ecce6c1e0aea2b1a9683779e57ef9
 EBUILD cddlib-094h.ebuild 1138 BLAKE2B 32ac8a7b2bca079879d021dfc9537f3a54fa912543a42479e1c951b45c84ce79e643c3369eaab07bb5bdcf430b90d6beb9cc62352e4275af4aac8cd207273c58 SHA512 c2e6fc69ceb8b0866f5713d906b7f9d97907ae7e5dc363d903f8b2dc7507156b8869f74bc0b60270ae80a34e6be109bc2796e8adf1caa608baf5f4e113a9e91a
-EBUILD cddlib-094j.ebuild 1399 BLAKE2B a226e70edb7db2206c6f81dc56da1ba066300167f5d08f75c99907a1930b13c2eba9bfe0d56d97bcf8a5113a9b342f64a5bf798908ccc3787eb60b727d2edd37 SHA512 1a976453e9e94dbfe84860b39c242e3e5c09b343a1cd6d0db2f91be1e1bed7fb07e12eb86e5fd690eb588462d96003a45c2ae5b14a31ef951930689530207189
+EBUILD cddlib-094j.ebuild 1397 BLAKE2B 7ee4d9bccb7761758c4ea58aa236e1c74fe8ff2a72a76c10cd2738e0f7cc831bb1bee5b3ff543085343dba1b4deaa00254f55473c0a0367a5858c1efc100e9dd SHA512 2b2b5b386dfdd1e26204f5c5cf78963cc51bcad91d394df9e6c95db815dd975761d485de720e0f4bd11c00abf89cd07173032d8204378c8dc23137ed715605db
 MISC metadata.xml 1817 BLAKE2B 3a75a0a27708d31cf58ec067ad25ffce663b3d52f90dd2437ce529bb4babf49a6e0461eee6841ef836f37caa2f7e4f62a762ea61094213fe10f9cd1e16951d99 SHA512 a50ed995ba248cf59ae3b2c2d5a8f91df9b08bd03cb48a14de0eabc79b44091d425b41d980952ac3eea6182e12ca235985f347bb67ac109993a47a545d1c4289
diff --git a/sci-libs/cddlib/cddlib-094j.ebuild b/sci-libs/cddlib/cddlib-094j.ebuild
index 73468ab72e6d..dfcea92f0e38 100644
--- a/sci-libs/cddlib/cddlib-094j.ebuild
+++ b/sci-libs/cddlib/cddlib-094j.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${MY_P}.tar.g
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs tools"
 
 DEPEND="dev-libs/gmp:0"
diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 022df791ecac..0e9e8120302d 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,5 +1,5 @@
-DIST ceres-solver-1.11.0.tar.gz 3944965 BLAKE2B cafae018abde9b8085f7e8841a6a720ef52cd40178a43c3050b6b20465bc9675cc326a6bc405572a235758c5f2f99e936375f711bf5c4b121acfe0c0641713c6 SHA512 4941538e6ec31e2ee56a24446748dc5d6dd02ba9c151e4320a2db943fd1a377455b0ee23d56780e1f05322b30e25057145c540fde901d7fd2244ec630a73527c
 DIST ceres-solver-1.12.0.tar.gz 5008861 BLAKE2B 52b3954dde96386bd031543ab9d7370368f58f76f1dec9d24ef10803da787cc96f40a1c775626fde832b70ebd94cf4274c70a8fb4bd7e1bcf040e119cbec09f8 SHA512 485eece0471cf05d31b5dd7e133e23115a334a4ed557a3c1bd0b715a063f840738af8f507e935522a0dae90ce6851984c0002a25e9b445b90889792f68a05571
-EBUILD ceres-solver-1.11.0.ebuild 2412 BLAKE2B f4aec1265ab4534a65b768e4b4da9546e8ef4fb68b918488e57ab494c3f0b30d179dba1dc68d9c45630396a66ef535f8936b31c68962530360337f2c1c48b469 SHA512 a15c6ef0f7d97ef7515180b085979efb7c55327038cf380101bc7e856cf660c2f60d3d869470bd63f38fe82b6a719857828da60ddacf06b18b6eedb9482cb1ec
-EBUILD ceres-solver-1.12.0.ebuild 2418 BLAKE2B 08e50a9f5a09647f01ad930fb70e32773dc7a5c12b4e7bd8c53f3f6f18011500a0ddbccf3e0f3aedaf823bd49f7042c201cdb2ce5d0346d66127296223d6372d SHA512 c2b4b9f8d4753fc7dcf46044e7ca4a285f0a8e27cc2b6737229884b8ff8715530eca5c6a5dfb28e396235083bd2e66c01c738899fc0755fef64d54a3f2f0bb24
+DIST ceres-solver-1.14.0.tar.gz 5450130 BLAKE2B cfcfe07cecb267528081dfc6deb5283bc5a04b79d4595e45365960895b84a6dca2a3024b046868f06709fc81e8514730cbc409ab01cb0cbee488b5bad5b9f7cc SHA512 a2af9918d2730709361ec971431a2b22e6ca3ca440081be87fa52729ec43702020b021837bfe5a42a58db1ab89ea6aada11f2d1888da66bef614ec1f27ab30c6
+EBUILD ceres-solver-1.12.0.ebuild 2400 BLAKE2B 40d628872950995e250c6ad5ddac436e2c9b8fc9e4ad25c93d66851930370dabdcfad93ad1ca70c0b37a201ded641b2e547bb95b14a11418f910403c6c2d502e SHA512 e84db68bd83234e6ee272a07bb40a4a41ae225b61aaa7ecc42dd4b8a6996f0d72cf2805a3c69bd45db271f5b9974e2aa36eb52bf51070c93b0b753839f728b42
+EBUILD ceres-solver-1.14.0.ebuild 2323 BLAKE2B 1379ac818581c2b62926381bfec1c8b13cd838ae43c65fd77cd1495b1650d32cf9d132cfc8695329e711a2bf1863cb330c76a3727ff527b9115c5ed7a321c440 SHA512 80ed6b5071c06d10c0ccd68bf1fa5a4a79ef21e1a31c1e9263cca52d33c4bb8c2e23b66d09f47e32cecb314bb179eca51a9d49c233ea88a37c846ad91bb351c5
 MISC metadata.xml 1525 BLAKE2B 46de33a7fa6513877e2427442e918d8e39871a6b6b8a15a18d14dcedd55c42bfb1bdeab7e1cc57c0ac03ba06d5c3628dd666b6f0787eac5c9dc75785e2a9e471 SHA512 4c95aef23ce327f9cd11b53638e1b6485eb789cd296ad8a571278b65c9001465f56c97b97db6e2c4a4ed76336f0e33684958adef593d74193cb73930e7ea5ad2
diff --git a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
index 8bef6c01db95..05747c215b05 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
@@ -21,15 +21,15 @@ REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack
 
 RDEPEND="
 	dev-cpp/glog[gflags?,${MULTILIB_USEDEP}]
-	cxsparse? ( sci-libs/cxsparse:0= )
+	cxsparse? ( sci-libs/cxsparse )
 	lapack? ( virtual/lapack )
 	sparse? (
-		sci-libs/amd:0=
-		sci-libs/camd:0=
-		sci-libs/ccolamd:0=
-		sci-libs/cholmod:0=[metis]
-		sci-libs/colamd:0=
-		sci-libs/spqr:0=
+		sci-libs/amd
+		sci-libs/camd
+		sci-libs/ccolamd
+		sci-libs/cholmod[metis(+)]
+		sci-libs/colamd
+		sci-libs/spqr
 	)"
 
 DEPEND="${RDEPEND}
@@ -90,7 +90,7 @@ src_install() {
 	dodoc README.md VERSION
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}
+		docinto /usr/share/doc/${PF}
 		docompress -x /usr/share/doc/${PF}/examples
 		doins -r examples data
 	fi
diff --git a/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
index d8f758d4dd37..d40b75690c4b 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.14.0.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=( python2_7 )
-
-inherit cmake-multilib eutils python-any-r1 toolchain-funcs
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-any-r1 toolchain-funcs
 
 DESCRIPTION="Nonlinear least-squares minimizer"
 HOMEPAGE="http://ceres-solver.org/"
@@ -14,29 +14,36 @@ SRC_URI="http://ceres-solver.org/${P}.tar.gz"
 LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxsparse c++11 doc examples gflags lapack openmp +schur sparse test"
-RESTRICT="!test? ( test )"
+IUSE="cxsparse doc examples gflags lapack openmp +schur sparse test"
 
 REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )"
 
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	>=dev-cpp/eigen-3.3.4:3
+	doc? (
+		dev-python/sphinx
+		dev-python/sphinx_rtd_theme
+	)
+	lapack? ( virtual/pkgconfig )
+"
 RDEPEND="
 	dev-cpp/glog[gflags?,${MULTILIB_USEDEP}]
-	cxsparse? ( sci-libs/cxsparse:0= )
+	cxsparse? ( sci-libs/cxsparse )
 	lapack? ( virtual/lapack )
 	sparse? (
-		sci-libs/amd:0=
-		sci-libs/camd:0=
-		sci-libs/ccolamd:0=
-		sci-libs/cholmod:0=
-		sci-libs/colamd:0=
-		sci-libs/spqr:0=
-	)"
-
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	doc? ( dev-python/sphinx dev-python/sphinx_rtd_theme )
-	lapack? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
+		sci-libs/amd
+		sci-libs/camd
+		sci-libs/ccolamd
+		sci-libs/cholmod[metis(+)]
+		sci-libs/colamd
+		sci-libs/spqr
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md VERSION )
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
@@ -52,6 +59,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	cmake_src_prepare
+
 	# search paths work for prefix
 	sed -e "s:/usr:${EPREFIX}/usr:g" \
 		-i cmake/*.cmake || die
@@ -59,27 +68,24 @@ src_prepare() {
 	# remove Werror
 	sed -e 's/-Werror=(all|extra)//g' \
 		-i CMakeLists.txt || die
-
-	# respect gentoo doc install directory
-	sed -e "s:share/doc/ceres:share/doc/${PF}:" \
-		-i docs/source/CMakeLists.txt || die
-	cmake-utils_src_prepare
 }
 
 src_configure() {
 	# CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF CXX11=OFF
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_BENCHMARKS=OFF
 		-DBUILD_EXAMPLES=OFF
-		-DENABLE_TESTING="$(usex test)"
-		-DCXX11="$(usex c++11)"
-		-DBUILD_DOCUMENTATION="$(usex doc)"
-		-DGFLAGS="$(usex gflags)"
-		-DLAPACK="$(usex lapack)"
-		-DOPENMP="$(usex openmp)"
-		-DSCHUR_SPECIALIZATIONS="$(usex schur)"
-		-DCXSPARSE="$(usex cxsparse)"
-		-DSUITESPARSE="$(usex sparse)"
+		-DBUILD_TESTING=$(usex test)
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DGFLAGS=$(usex gflags)
+		-DLAPACK=$(usex lapack)
+		-DOPENMP=$(usex openmp)
+		-DSCHUR_SPECIALIZATIONS=$(usex schur)
+		-DCXSPARSE=$(usex cxsparse)
+		-DSUITESPARSE=$(usex sparse)
+	)
+	use doc && mycmakeargs+=(
+		-DCERES_DOCS_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
 	)
 	use sparse || use cxsparse || mycmakeargs+=( -DEIGENSPARSE=ON )
 	cmake-multilib_src_configure
@@ -87,11 +93,9 @@ src_configure() {
 
 src_install() {
 	cmake-multilib_src_install
-	dodoc README.md VERSION
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}
 		docompress -x /usr/share/doc/${PF}/examples
-		doins -r examples data
+		dodoc -r examples data
 	fi
 }
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index 9500fd0c9755..749f122d39ca 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -1,4 +1,6 @@
 AUX cholmod-1.7.4-parmetis32.patch 702 BLAKE2B 241d68fa25ac2ab3f9a425702559736fb15657eda82c5ba0a413174c146c09e0be167746f866a64189d027892d180445adcf92f55fc913c9bff0085f87051c94 SHA512 a1694a7f42f10c7619e23817e93f76df35bc208200918b74a6dd68bb4662d57ce2f3665be424ad4b5c8a4ea9c3957676c48716aa0e47d9fb19337dc43e759ecc
 DIST cholmod-2.1.2.tar.bz2 656458 BLAKE2B 83a574ad7d3755428d8d732f3f60b07908b8315d73d5a3d3aaf9aac50b54590c532389dd90efc569e67639993095706eb546e72313b735e35af34a1fea398be2 SHA512 7aca97de4c60ff2d7a76a776be4c2d61243a159a51b9e147fa2480f2aaf61a5d966eb0f1cb57c0145510437f6c478fa30384b741709d0a02432b74ada3e78089
+DIST cholmod-3.0.13.tar.bz2 696002 BLAKE2B 40a065fe1a3585897b3ca554a25fa80ffc68ac70798f2f803e34a231ec4f532d113a3d00ab7ab61f5eb02503a84e1459cdb7e96cb0b0d1dc6975ed3d533104fe SHA512 c6c80d099386bac27e385a1b8ee8941cd2fb4f2dcfcf302b4b17d6477ac9ee17ad8030aae9191f92576dfaeb521e2c98ec24e867281c2405e42f95580e14f0ab
 EBUILD cholmod-2.1.2.ebuild 1758 BLAKE2B c9c74a50027e6a07ae755ecbcfbd16b60bfdaf5597dbbe91363b8119fa5689ad8f07afb8f5fcfbce3839f8e793fed7968bd58d6aa2117a1661f64fd88f95386b SHA512 f655e8b83a6886e9596a1acc2f54d1c25dc15983a3e272f159bcd72c1e362035253f0389588c5a3b377617fed982495ace46659002cd49415405cf9a2107fe32
-MISC metadata.xml 603 BLAKE2B ce6355915a22fd4bb81f619a1b946f83b971b43caf86929441452938c1bee5971c5f95d0349d13d740efcf51883015334db167d2fab49c8954ac6af1d5ca3348 SHA512 da9db58edeab0b40813e47567cbaa4e54ae8aa9f4cdc89cd87f1e35bb65991c305bc955e6aba744d322c6375de0e8ba1253415814175cf1f4bc2a01de2e11d22
+EBUILD cholmod-3.0.13.ebuild 1598 BLAKE2B 14b5373a37540b745ae0d425f56b6b0732e907da4c220d40d06f1ab8ca035aa3579999274d44d9876c1dd7c9db70cd099b9565b969b371f8eaae3870f5d1e27c SHA512 c80c18f5fb27da4d556e55f855423f80405663dc26e091fb6eeb6398b0e3fae0365fa8dabb38c3f95ed89df4e345f5317f90feb9c6235807a87e282c4209cd94
+MISC metadata.xml 1064 BLAKE2B b0e3376f34f051bd7cec27db2bda432e0b7bc7a941807061e93fc0ea51fdde5ebc3d2a3ca400c0d05efaa39b16bd86051dbd3e86a629c3e3b7b3dd3fe15e99da SHA512 fc1765b400dd7463fc707e50c45e1b82152de54cbf0fcc20d4c42ed71172fd7fc0f2e649642e9074f09c6af544bb4c3e9ffed16fdd971612a66de58c9f4d7308
diff --git a/sci-libs/cholmod/cholmod-3.0.13.ebuild b/sci-libs/cholmod/cholmod-3.0.13.ebuild
new file mode 100644
index 000000000000..7e2b678d25bd
--- /dev/null
+++ b/sci-libs/cholmod/cholmod-3.0.13.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Sparse Cholesky factorization and update/downdate library"
+HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="cuda doc +lapack +matrixops +modify +partition static-libs"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( virtual/latex-base )"
+DEPEND="
+	>=sci-libs/amd-2.4
+	>=sci-libs/colamd-2.9
+	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
+	lapack? ( virtual/lapack )
+	partition? (
+		>=sci-libs/camd-2.4
+		>=sci-libs/ccolamd-2.9
+		|| ( >=sci-libs/metis-5.1.0 sci-libs/parmetis ) )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local lapack_libs=no
+	local blas_libs=no
+	if use lapack; then
+		blas_libs=$($(tc-getPKG_CONFIG) --libs blas)
+		lapack_libs=$($(tc-getPKG_CONFIG) --libs lapack)
+	fi
+
+	local cudaconfargs=( $(use_with cuda) )
+	if use cuda ; then
+		cudaconfargs+=(
+			--with-cublas-libs="-L${EPREFIX}/opt/cuda/$(get_libdir) -lcublas"
+			--with-cublas-cflags="-I${EPREFIX}/opt/cuda/include"
+		)
+	fi
+
+	econf \
+		--with-blas="${blas_libs}" \
+		--with-lapack="${lapack_libs}" \
+		$(use_with doc) \
+		$(use_enable static-libs static) \
+		$(use_with modify) \
+		$(use_with matrixops) \
+		$(use_with partition) \
+		$(use_with partition camd) \
+		$(use_with lapack supernodal) \
+		"${cudaconfargs[@]}"
+}
diff --git a/sci-libs/cholmod/metadata.xml b/sci-libs/cholmod/metadata.xml
index 79ccb35047bf..401422f1a9d6 100644
--- a/sci-libs/cholmod/metadata.xml
+++ b/sci-libs/cholmod/metadata.xml
@@ -11,6 +11,20 @@
 </longdescription>
   <use>
     <flag name="cuda">Use nvidia cuda toolkit for speeding up computations</flag>
-    <flag name="metis">Enable the Partition module to cholmod using <pkg>sci-libs/metis</pkg></flag>
+    <flag name="matrixops">
+      Support basic sparse and dense matrix operations (add, multiply,
+      scale, et cetera)
+    </flag>
+    <flag name="metis">
+      Enable the Partition module to cholmod using <pkg>sci-libs/metis</pkg>
+    </flag>
+    <flag name="modify">
+      Enable Cholesky-modification routines like update, downdate,
+      row-add, and row-delete
+    </flag>
+    <flag name="partition">
+      Enable graph partitioning and graph-partition-based orderings
+      through <pkg>sci-libs/metis</pkg> or <pkg>sci-libs/parmetis</pkg>
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/sci-libs/cln/Manifest b/sci-libs/cln/Manifest
index 2e3a2d5cdf27..dd547827116c 100644
--- a/sci-libs/cln/Manifest
+++ b/sci-libs/cln/Manifest
@@ -2,7 +2,7 @@ AUX cln-1.3.2-arm.patch 340 BLAKE2B e66f245944e4a21f87c64d6c79f8b11fd55d8733fbc3
 DIST cln-1.3.3.tar.bz2 1300229 BLAKE2B ca7985771d300b2bf0a1e5d6acda90de2596e0a8910c293500c8c218578814a82867ac24b641d3e3a36897a1a0ebf09a136ba6d64c7a1ed61133aa0b89ecacea SHA512 ee829cd03a2d36215a4d4e76cc0aa6c5abe6ff967ed366d752da1dc0c47dbec56e0521e92fb35574c038305fb767991c5c7fd12ad03583080da3f923fbfecdaf
 DIST cln-1.3.4.tar.bz2 1281348 BLAKE2B 7681ae5a421f2992e16b48541b46aceb988d697d95d2457fbe2f8c0f7e8ca95e6fbfb0fc309ea29a4669bc3d4fdf9c670fdf25b202019457ffba392f15bf2fa4 SHA512 2178a64b4388b3018c3847f6fb192ea51eb9c8618302986d7706accef17184e3333ddeca218d726f93f3b985598952ad58d705c9081201985611e383f788a631
 DIST cln-1.3.6.tar.bz2 1330815 BLAKE2B 89ddd0079ac746b262dac01ae0fc1ceb250956c530883d93430e62866e09fdd964c4f96edb21260f9aa40f739450996e1bf21503a30cc02fffaba08a1bd45264 SHA512 a32a1449c5f0edac1444e58f500ef1a72ffab8dad65125082eff0995cc9855b45f38b89c7f754e3d4487756a8cd3f7db1e534865b8d0384fd28246f444ed7d14
-EBUILD cln-1.3.3.ebuild 1314 BLAKE2B 6b5522ab92421c91ff012c7d29f18b433219fccb7c4bfac51acd2f2b56b0ca20c9f109e8094e27f342dc3455937140560953f7bd68210b7797b38711e79f8ca9 SHA512 df213df46bfcf3246786d418e6d6a455e3b2ba0502805d85ef87f69ff7986c0ae79897e7176096dd89c84e5c67dcd55a72af24ceff65e3ad73c0112cc93b756c
-EBUILD cln-1.3.4.ebuild 1297 BLAKE2B e2fdea35ef130611b969d0e1d514b229d84b18d9a89767a2ae52ab4691d16f4d0b0326eaa0e6d88e638c4f63277aa94b0363a3b61d543f501a7cb4866bf52864 SHA512 58072da7fd4925c69ae14fd66b35baedcca20667a663c4a64960a54c67f114b854fa8111827e916126784962a01e5653971050f5fa9ecb38db9025949234adcb
+EBUILD cln-1.3.3.ebuild 1315 BLAKE2B 6df09568b8af0481148ec0c7a3d948780130a99602dcf243dbc9031462572cbf6338b45c0ed2080b4c97418471d748ed85be17de528800ef363caaa7f9f3b605 SHA512 c43939707b5c7401f45fe53a07bfd4c90bbac65cecc95b70cd13dbb4ca8d80c0f330a8605753ce51853205c08fad98c9aa59275710c673aca0f31d6949177453
+EBUILD cln-1.3.4.ebuild 1298 BLAKE2B f3600f208eaff7cee7acfe0d990372188d2fe7c47bce1abcd6220dfb5606093492b7d697fc8b8e71cd19f4777e6d03a7d29b47d0992fe6812676646b4135d970 SHA512 914d452df7ce8ae95d8be1ba3c33aff59197bebc0020c3e9bfbc916013d93de3688030c5e268799e57c6d8f4f37b13b47ab831134ce92a2ca2df08e82026e04f
 EBUILD cln-1.3.6.ebuild 1146 BLAKE2B 262832d69f9a3918415e074da23197775617023bb146e3f64b5da54fa6e09d35b45b6089d8e0cf4057797c5633f4730fd4ee8d2ba0bc0b3f0b8543be41cd0c20 SHA512 b29b9bb985070367c53bf3eb7a3b965e130a61a64e3fe9d09aa2777116775e00c86060ab7eb457bee26eb000606a352d4bdfa58efe77c5dbb02f215e5fc27b97
 MISC metadata.xml 702 BLAKE2B 597b40fd2f7f11ef4e6ec7d0c523d2eeedb9a2cf6d2a663616dc45e891368136b38cb7760c588a7fee0880d6bcab6acace1771ad4d108ea6d52eff0abbb7e08f SHA512 4b6ddc8f558bc777963dcf271584ba59ba3d8cc3c2c95260a5680eab2a436dca894a2318f5bacdd9c9da68e6c22323d4ef2829b9bb1de0db2467f20ac204d95b
diff --git a/sci-libs/cln/cln-1.3.3.ebuild b/sci-libs/cln/cln-1.3.3.ebuild
index 74c377448c28..8b641d2d4f4d 100644
--- a/sci-libs/cln/cln-1.3.3.ebuild
+++ b/sci-libs/cln/cln-1.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs"
 
 RDEPEND="dev-libs/gmp:0="
diff --git a/sci-libs/cln/cln-1.3.4.ebuild b/sci-libs/cln/cln-1.3.4.ebuild
index 9ce183c5b1fa..e8173925c67e 100644
--- a/sci-libs/cln/cln-1.3.4.ebuild
+++ b/sci-libs/cln/cln-1.3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ginac.de/CLN/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs"
 
 RDEPEND="dev-libs/gmp:0="
diff --git a/sci-libs/colamd/Manifest b/sci-libs/colamd/Manifest
index 7000bbb860a8..6e79db23f770 100644
--- a/sci-libs/colamd/Manifest
+++ b/sci-libs/colamd/Manifest
@@ -1,3 +1,5 @@
 DIST colamd-2.8.0.tar.bz2 304819 BLAKE2B a2c4b67ad8d20b0cb136f579a367bf53b0e692596550b9e22908628f4d0bce00e2ddeb9aa0dfe6d1f204e79332be99c97366df2ba555ab881d4ba01c42a721e6 SHA512 36b2e50e01ad44f04f084ebcdcfb7d9d1d1712c6f53c8bce9f46ce39edc418aa64b8e67489fb06cb95d86658fd9f9bad89217a5f9f4777181f0f0e9b58c04aee
-EBUILD colamd-2.8.0.ebuild 563 BLAKE2B ddcacd6e329009727bda80fed68f0d2f24c498d084fbc05eb64b7af462e7934e1c24ba980d0698bb1cac4c058ded0d58687eddf11f8e92ad744cd95a218bbaa4 SHA512 7a8906fead1a74cddc63ef948ee9e6b475ef61b823aac64778a84a13367fa761c759b4f1897a86f61a2e915c15f61e3e05a79b9f2cb9c13ed9a15d422cc3f4c6
+DIST colamd-2.9.6.tar.bz2 298903 BLAKE2B e1e3cfa0153e21b742854d28fb6d3ede287c2ec22cfef4268a8aba8bb239be527433907f6984dad976341cf6e1ca9cb39f5c97029ad9bed032a874add9aa0e02 SHA512 f302d18f9ba004c9d1b0e1ada76e70f20fa1d11896815e5300983513b7ed4a7b969adef33adb1a57d67ce856a5ded410874c23d9bba42b6bf1a6a790430f5137
+EBUILD colamd-2.8.0.ebuild 564 BLAKE2B feabb3e0326d7b12d7f174b0d806515fbb155dec9f442d3a483082d7bec35ab346910d80ce7665058e7d9dd0b0f21b88a2432f6ee250745ef3afc9a05841fdbb SHA512 e8b758cb658eabb035aabc1054e2366438b63b404771e6079f00fd0b9d526a40b0cda6c9ad15c77e20243548f794e1dd755939a18e7688a588a7ec4fb930b6c0
+EBUILD colamd-2.9.6.ebuild 602 BLAKE2B 8ef7fb3dd4c273534a175910968ab9950390f1e0cd934870f2ff5b5876e1070876a1eeca31487ce25905a9966452b16a08e193b10634a5a2a0b8d358267968ea SHA512 cdd8fa45437ebed66deea0553d0acacede97d238adcebbb87e5c28bd00e3a4cf57a8a790c072aa7e9dfa6265779077be049655baa621a6331cf87966c6c74844
 MISC metadata.xml 827 BLAKE2B d1b92027b2b820c67cb091e71c22c5ebcfe8e560968b8cf76f5cb61b6c26a71b66f4801343a531fbc8941b5b678bff44e2ab3aa6bec49db9b0264ea2273ac816 SHA512 367258fb10bcde8e5136c541ef1e134c4e882b296c45300c8d70945222c0730572b1dc116b80057c3a9d6a64c175fb86915847522000740d9a39e6fcd8eb5004
diff --git a/sci-libs/colamd/colamd-2.8.0.ebuild b/sci-libs/colamd/colamd-2.8.0.ebuild
index 92c845793eec..6bcd65775912 100644
--- a/sci-libs/colamd/colamd-2.8.0.ebuild
+++ b/sci-libs/colamd/colamd-2.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/colamd/colamd-2.9.6.ebuild b/sci-libs/colamd/colamd-2.9.6.ebuild
new file mode 100644
index 000000000000..2ddcb5d9db54
--- /dev/null
+++ b/sci-libs/colamd/colamd-2.9.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Column approximate minimum degree ordering algorithm"
+HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="static-libs"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest
index ca8994c03d27..0fb37542e657 100644
--- a/sci-libs/cxsparse/Manifest
+++ b/sci-libs/cxsparse/Manifest
@@ -1,3 +1,6 @@
+AUX cxsparse-3.2.0-header.patch 531 BLAKE2B 7b8738c26a48aa01541db4978cc195f093da3e5d81536ff5819334ac847cd5d5a0e7ea5d2b1891183015ff449d98ba96ad360c4097369a70adab72a5419c471f SHA512 2340a350af044bcded3a592fde76ee885c02a3047772a02d91bfa0b43e7b6a04d7102893ba8d3e2394435fa6194d767812a3896359581c4d789890d2d35a78e0
 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
 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
new file mode 100644
index 000000000000..5c8ca14041e8
--- /dev/null
+++ b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Extended sparse matrix package"
+HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+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"
+IUSE="static-libs"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND=">=sci-libs/suitesparseconfig-5.4.0[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-3.2.0-header.patch" )
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/cxsparse/files/cxsparse-3.2.0-header.patch b/sci-libs/cxsparse/files/cxsparse-3.2.0-header.patch
new file mode 100644
index 000000000000..0eaaeda69fd6
--- /dev/null
+++ b/sci-libs/cxsparse/files/cxsparse-3.2.0-header.patch
@@ -0,0 +1,17 @@
+diff --git a/CXSparse/Include/cs.h b/CXSparse/Include/cs.h
+index a47ee115..dbdf3017 100644
+--- a/Include/cs.h
++++ b/Include/cs.h
+@@ -43,9 +43,9 @@ extern "C" {
+ #endif
+ 
+ #define CS_VER 3                    /* CXSparse Version */
+-#define CS_SUBVER 1
+-#define CS_SUBSUB 9
+-#define CS_DATE "May 4, 2016"       /* CXSparse release date */
++#define CS_SUBVER 2
++#define CS_SUBSUB 0
++#define CS_DATE "Sept 12, 2017"       /* CSparse release date */
+ #define CS_COPYRIGHT "Copyright (c) Timothy A. Davis, 2006-2016"
+ #define CXSPARSE
+ 
diff --git a/sci-libs/djbfft/Manifest b/sci-libs/djbfft/Manifest
index 8ce8afb5f7a3..87386f8381ed 100644
--- a/sci-libs/djbfft/Manifest
+++ b/sci-libs/djbfft/Manifest
@@ -2,5 +2,5 @@ AUX djbfft-0.76-gcc3.patch 1176 BLAKE2B a5a3301b5aefad844fc08fb8172b6b9be1f538f3
 AUX djbfft-0.76-headers.patch 995 BLAKE2B 8611ff8c7ca92d82e349476346d05fbe797e28395b01a659a48714febd3895c7301ed78b2b1c0a162b2ef15deec6d70a23581df89a543c32c88e138903ac87a7 SHA512 651ef26ef1ae00a5e10b512cef6cd741e77035dbdc792fdc7d215026ff4c3304ac0f1fd4c0e58debeb1bca2620a1002c67c1115b3590cf8f5b2453eb7a370684
 AUX djbfft-0.76-shared.patch 3722 BLAKE2B 4b0367156c0904dad032ea218679355ab4b2d6fd7bbf2a6a8cb17778e959c40db689e9c7fe36e90d344cf9d49d53d70a7cdb481b5d409ec208d46ede6c51f7e1 SHA512 58bc4d65553a6642a1b9a25a5b57974325f201dcec5758c7bf4c86da6b0a9fa018f1099af98234e7fbcbe29b398ac22d40c25069b9b987b41f547630f2799c1a
 DIST djbfft-0.76.tar.gz 80092 BLAKE2B de87fe1e2b0af64fa631b9b72e418bdd464f30b5680bc903a241d0525a48180f55d1cbc99e54dd81d3133a0f6dbba99cf55771304b4b1b62d8388aa15fa9c7e2 SHA512 f23e5f80d2737476feea4ed65d7d022c4ca74748a2ff7b3b9338fdea4f72b4009d1c5909325382647feab837bec078231eddc3fc3bd0b5ae3346690e5edef530
-EBUILD djbfft-0.76-r2.ebuild 1793 BLAKE2B f229279d50dae9947058136794096315e7f88435e5737139bcd8936dfab7590068c727c9b460510ec8b0ebb40f193ae333ebaca26be7f4a955a89632dcdd2817 SHA512 7b575dc1b1e070999cfe2b177d033afbbf5eedf52bdafda17dd8df38f048ff50c9a70e51b80c8ccf181abb80400ef97a714f5026e974466a94bed1017b7d6365
+EBUILD djbfft-0.76-r2.ebuild 1789 BLAKE2B 3c5f9dde143fe2d959c6543a1e0f38969f84945f035bf180b6f851e5613b391bbb96f76edef4edbe9403b27e5581e1522739737e76fa2c5563a633c7a4b83972 SHA512 b995a793cfb292fc15b941377917cc2f1f8c8a042014854e68cec91afef200fbd217d4b958f1a07896bccf67796ca6c74d0e98687efe6e02a8e4abb515eed1f1
 MISC metadata.xml 840 BLAKE2B 134f5c3b883159a7ff105730fff872b30cdc091c29ea434d1f1a672b0e65c3410ac596060bc5e98a5be3d5fd41b753867e3e35e8159315390a38045aa7ee479c SHA512 988a23596f952d9f9b874cfa7582fafda0ab2df81a03498c068665b968cf49d3fa7eb7977a09a5e2410c0432bc0addc2cf3a97f4089a6b43a7a16a67d2552d6a
diff --git a/sci-libs/djbfft/djbfft-0.76-r2.ebuild b/sci-libs/djbfft/djbfft-0.76-r2.ebuild
index 1c50b6525792..4bf66301628c 100644
--- a/sci-libs/djbfft/djbfft-0.76-r2.ebuild
+++ b/sci-libs/djbfft/djbfft-0.76-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://cr.yp.to/djbfft/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 DOCS=( CHANGES README TODO VERSION )
 
diff --git a/sci-libs/eccodes/Manifest b/sci-libs/eccodes/Manifest
new file mode 100644
index 000000000000..3a031ed8d2f4
--- /dev/null
+++ b/sci-libs/eccodes/Manifest
@@ -0,0 +1,4 @@
+DIST eccodes-2.16.0-Source.tar.gz 11258869 BLAKE2B 4a1b3e953fc041beed47046c6ea4f74bb18230019b71c884f1dc5a102a7bae2b9083f51b74fc4078c493d188433f08db833a571e7deadd93b6c137f975f03006 SHA512 6e8768824152d8782c1457cfe79daed32114d1b4694d2843bd02a8aa63c42ccc435b53f7db6942239b3e56999fbaaba4ecef345d39fc5c5f7a5d20ceecf4422a
+DIST eccodes_test_data.tar.gz 139711871 BLAKE2B f2e89207835c78fa198f0a2fba8ac2cd4ab263c9160e02005a3ca851bc71586010e7f4742cbb9240463abb9421db83b7dadc83fe798f37321a553ca9856f68d7 SHA512 24c24ec9e01d230cf542abe5c131f05b8e627dd9d170c666628bb5fd8f7b1a6aa11a35456b8d742c59f54c6aabac78658efd68b0c50779d466aba3d35b4a0231
+EBUILD eccodes-2.16.0.ebuild 2111 BLAKE2B ac0d1afcd864f10154de036a7c1721fb3910a100b845dfe9597f5dcc302a4b00af304bcf0d21d76c64bac9e1d0a24ed2eaeab12d585ce3b04fc14709631f0add SHA512 412532263440995c65681b6e9a00f3db14227ae197900c194393c8b6c8e798f7ba1d44a1135627a57e5e5e929bc50406fd9a831c18ef400393ea3a1d6f1e3848
+MISC metadata.xml 662 BLAKE2B bc436a549b8fdcc428e9a77978b4acd557739e065768aecb084c9ac12aa5ac7d181d0a2b2268e9056beee4ceed358145b8d43f62cede5c994b9a17f8151c8ee2 SHA512 50900717dac24e76414607b55f7965fd9944668bfcb33035f66a68a3802c894b0783befff2008858e006138f1eabca1ee8e6d71691f5e202856e494afb77080c
diff --git a/sci-libs/eccodes/eccodes-2.16.0.ebuild b/sci-libs/eccodes/eccodes-2.16.0.ebuild
new file mode 100644
index 000000000000..5f49a25c6be6
--- /dev/null
+++ b/sci-libs/eccodes/eccodes-2.16.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils fortran-2 python-any-r1
+
+MY_P="${P}-Source"
+
+DESCRIPTION="A set of encoding/decoding APIs and tools for WMO GRIB, BUFR, and GTS messages"
+HOMEPAGE="https://confluence.ecmwf.int/display/ECC"
+SRC_URI="https://confluence.ecmwf.int/download/attachments/45757960/${MY_P}.tar.gz
+	extra-test? ( http://download.ecmwf.org/test-data/eccodes/${PN}_test_data.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="defs examples extra-test -fortran memfs netcdf jpeg2k png python szip test threads"
+
+REQUIRED_USE="threads? ( !fortran ) test? ( defs !memfs ) extra-test? ( test ) !test? ( memfs? ( python ) )"
+
+RDEPEND="
+	sys-libs/zlib
+	szip? ( sci-libs/szip )
+	netcdf? ( >=sci-libs/netcdf-4.2[hdf5] )
+	jpeg2k? ( >=media-libs/openjpeg-2:2 )
+	png? ( media-libs/libpng )"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+	use python && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_ECCODES_THREADS=$(usex threads TRUE FALSE)
+		-DENABLE_EXAMPLES=OFF  # no need to build examples
+		-DENABLE_INSTALL_ECCODES_DEFINITIONS=$(usex defs TRUE FALSE)
+		-DENABLE_FORTRAN=$(usex fortran TRUE FALSE)
+		-DENABLE_PYTHON=OFF  # py2 support is deprecated
+		-DENABLE_NETCDF=$(usex netcdf TRUE FALSE)
+		-DENABLE_JPG=$(usex jpeg2k TRUE FALSE)
+		-DENABLE_PNG=$(usex png TRUE FALSE)
+		-DENABLE_MEMFS=$(usex memfs TRUE FALSE)
+		-DENABLE_EXTRA_TESTS=$(usex extra-test TRUE FALSE)
+		-DBUILD_SHARED_LIBS=ON
+		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples; then
+		insinto "/usr/share/${PN}/examples"
+		doins -r examples/C
+		use fortran && doins -r examples/F90
+		use python && doins -r examples/python
+	fi
+}
+
+src_test() {
+	use extra-test && cp -r "${WORKDIR}"/data/* "${BUILD_DIR}"/data/
+
+	cmake-utils_src_test
+}
diff --git a/sci-libs/eccodes/metadata.xml b/sci-libs/eccodes/metadata.xml
new file mode 100644
index 000000000000..a59cfc2a5284
--- /dev/null
+++ b/sci-libs/eccodes/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>nerdboy@gentoo.org</email>
+	<name>Steve Arnold</name>
+</maintainer>
+<longdescription lang="en">
+	This is the new open source BUFR/GRIB library (from ECMWF)
+	supporting C, F90, and Python interfaces.
+</longdescription>
+<use>
+	<flag name="defs">
+		Install full set of definition files.
+	</flag>
+	<flag name="extra-test">
+		Install full set of test data (large).
+	</flag>
+	<flag name="memfs">
+		Enable memory based access to definition/sample files
+		(conflicts with tests).
+	</flag>
+</use>
+</pkgmetadata>
diff --git a/sci-libs/fflas-ffpack/Manifest b/sci-libs/fflas-ffpack/Manifest
new file mode 100644
index 000000000000..f909bc05e636
--- /dev/null
+++ b/sci-libs/fflas-ffpack/Manifest
@@ -0,0 +1,4 @@
+AUX fflas-ffpack-2.3.2-blaslapack.patch 1981 BLAKE2B 9813b99bb5c616608500189e2f54392b5240cfa75bb0ebb946ec74ed8491a8c51e205aa22a34b2fde961b3a817f06124dc6fd6d2737c2e557203b323e371bdfb SHA512 7c8d7380f1d6ee8cce18ef3cdb792066d246263922cccbee739b68e1c2e2e117d4a70108cf29ac0f29ebb286eaafc86215661395eb5016f95f8852917c9831ec
+DIST fflas-ffpack-2.4.3.tar.gz 1059033 BLAKE2B e416429bb426a81cf9c25d54c83380ff9a9d658c711da06e6359d968843d4d9d26cf8389379f9ad4a5cbcee93e0afc9fe0497bb7a8f190e0c72c0b1f7b67de18 SHA512 c7620ba5a92e4114a581a6bea32267f9d5a9f0eb7e23fc0a7a97ce4b8124bb7b29f89ff2ad6ad270d97c76489625b57a354e581905b74ee57b35f4ca3e196a44
+EBUILD fflas-ffpack-2.4.3.ebuild 1819 BLAKE2B c19cc8094ed7be6ce175d54981fb8fc6a095e0a8011c5695a4386e964db8bb89d5e3ea9fe7f6c98bfc6d7f6fdf45f2148dfbce7d82b095a3f136cbeb8ecc36bb SHA512 dc29cdec219415e969068f685e606cdecac755297965bb3a5ead74d387916d81be30f1ccb3f36b279d99928e34b4cc384e8d58ac338867427c696cecd466ebab
+MISC metadata.xml 1461 BLAKE2B 0b4c7c31a7a82eeb2eaa33027ff25877a6f5be4155b0be0018b34ea848b270ceb8393ab9fb4c3a053abc870885da52e5f48589593f4ee8d37762443dbc51bb07 SHA512 f350c0d55e9de16789244d03371d7331e6f41d5c726b6964e3ad4d09d9b74ec83dac56adc5c645f8e90705f833faf31b301d8c39f74bfc976b1883775bd84379
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild
new file mode 100644
index 000000000000..4115dc61acec
--- /dev/null
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Library for dense linear algebra over word-size finite fields"
+HOMEPAGE="https://linbox-team.github.io/fflas-ffpack/"
+SRC_URI="https://github.com/linbox-team/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="static-libs openmp cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_avx512dq cpu_flags_x86_avx512vl"
+
+# Our autotools patch hacks in PKG_CHECK_MODULES calls.
+BDEPEND="virtual/pkgconfig"
+DEPEND="virtual/cblas
+	virtual/blas
+	virtual/lapack
+	dev-libs/gmp[cxx]
+	=sci-libs/givaro-4.1*"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.3.2-blaslapack.patch" )
+
+pkg_pretend() {
+	[[ "${MERGE_TYPE}" != "binary" ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup(){
+	tc-export PKG_CONFIG
+}
+
+src_prepare(){
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-precompilation \
+		$(use_enable openmp) \
+		$(use_enable cpu_flags_x86_fma3 fma) \
+		$(use_enable cpu_flags_x86_fma4 fma4) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
+		$(use_enable cpu_flags_x86_ssse3 ssse3) \
+		$(use_enable cpu_flags_x86_sse4_1 sse41) \
+		$(use_enable cpu_flags_x86_sse4_2 sse42) \
+		$(use_enable cpu_flags_x86_avx avx) \
+		$(use_enable cpu_flags_x86_avx2 avx2) \
+		$(use_enable cpu_flags_x86_avx512f avx512f) \
+		$(use_enable cpu_flags_x86_avx512dq avx512dq) \
+		$(use_enable cpu_flags_x86_avx512vl avx512vl) \
+		$(use_enable static-libs static)
+}
+
+src_install(){
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.3.2-blaslapack.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.3.2-blaslapack.patch
new file mode 100644
index 000000000000..3154a2618196
--- /dev/null
+++ b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.3.2-blaslapack.patch
@@ -0,0 +1,90 @@
+diff --git a/configure.ac b/configure.ac
+index 5b46b18..5e0264a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -248,49 +248,24 @@ dnl echo '**********************************************************************
+ dnl exit 1
+ dnl ])
+ 
+-BLAS_FOUND=false
+-
+-FF_CHECK_BLAS_CFLAGS
+-FF_CHECK_BLAS_LIBS
+-FF_CHECK_MKL
+-FF_CHECK_USER_BLAS
+-FF_CHECK_USER_LAPACK
+-
+-FF_OPENBLAS_NUM_THREADS
+-
+-# FF_CHECK_BLAS
+-
+-# FF_CHECK_GOTOBLAS
+-
+-# FF_CHECK_GSL
+-
+-# if test "$BLAS_FOUND" = "false" ; then
+-	# FF_CHECK_CBLAS
+-# fi
+-
+-# if test "$BLAS_FOUND" = "false" ; then
+-	# FF_CHECK_OTHERBLAS
+-# fi
+-
+-# FF_CHECK_LAPACK
+-
+-# if test "$BLAS_FOUND" = "false" ; then
+-	# FF_CHECK_BLAS2
+-# fi
+-
+-
+-
+-# BLAS_LIBS="${BLAS_LIBS}"
+-# BLAS_LIBS="-L/${BLAS_PATH} ${LAPACK_LIBS} ${BLAS_LIBS}"
+-# AC_SUBST(BLAS_LIBS)
+-
+-# FF_CHECK_CUDA
+-
+-# AM_CONDITIONAL(FFLASFFPACK_HAVE_BLAS,  test "x$BLAS_FOUND" != "xfalse")
+-
+-
+-# FF_BENCH
+-
++PKG_PROG_PKG_CONFIG
++
++PKG_CHECK_MODULES([BLAS], [cblas blas],[
++    AC_DEFINE(HAVE_BLAS,1,[Define if BLAS is installed])
++    AC_DEFINE(HAVE_CBLAS,1,[Define if C interface to BLAS is installed])
++    HAVE_BLAS=yes
++    BLAS_PATH=""
++    CBLAS_LIBS="${BLAS_LIBS}"
++    AC_SUBST(BLAS_LIBS)
++    AC_SUBST(CBLAS_LIBS)
++    AC_SUBST(BLAS_CFLAGS)
++    AC_SUBST(BLAS_PATH)])
++
++PKG_CHECK_MODULES([LAPACK], [lapack],[
++    AC_DEFINE(HAVE_LAPACK,1,[Define if LAPACK is installed])
++    AC_SUBST(LAPACK_LIBS)])
++
++AM_CONDITIONAL(FFLASFFPACK_HAVE_LAPACK,  test "x$HAVE_LAPACK" == "x1")
+ 
+ FF_DOC
+ 
+diff --git a/fflas-ffpack-config.in b/fflas-ffpack-config.in
+index f1dac22..17633a0 100644
+--- a/fflas-ffpack-config.in
++++ b/fflas-ffpack-config.in
+@@ -107,11 +107,11 @@ while test $# -gt 0; do
+ 			;;
+ 
+ 		--libs)
+-			echo @PARLIBS@ @PRECOMPILE_LIBS@ @BLAS_LIBS@ @GIVARO_LIBS@ # @CUDA_LIBS@
++			echo @PARLIBS@ @PRECOMPILE_LIBS@ @LAPACK_LIBS@ @BLAS_LIBS@ @GIVARO_LIBS@ # @CUDA_LIBS@
+ 			;;
+ 
+ 		--blas-libs)
+-			echo  @BLAS_LIBS@
++			echo  @LAPACK_LIBS@ @BLAS_LIBS@
+ 			;;
+ 
+ 		--blas-home)
diff --git a/sci-libs/fflas-ffpack/metadata.xml b/sci-libs/fflas-ffpack/metadata.xml
new file mode 100644
index 000000000000..9de9afc41f19
--- /dev/null
+++ b/sci-libs/fflas-ffpack/metadata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+  <!--
+      mjo: François maintained this package in the sage-on-gentoo overlay
+      long before I moved it into ::gentoo. You don't need an ACK from me
+      to merge his changes.
+  -->
+  <maintainer type="person">
+    <email>frp.bissey@gmail.com</email>
+    <name>François Bissey</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+
+  <longdescription lang="en">
+    FFLAS-FFPACK is a library for basic linear algebra operations over
+    a finite field. It is inspired by the BLAS interface (Basic Linear
+    Algebra Subprograms) and the LAPACK library for numerical linear
+    algebra, and shares part of their design. Yet it differs in many
+    aspects due to the specifics of computing over a finite field: it
+    is generic with respect to the finite field, so as to accommodate
+    a large variety of field sizes and implementations; consequently,
+    all routines use C++ template generics and the library is
+    primarily meant to be used as a source code library, to be
+    included and compiled in the user's software.
+  </longdescription>
+
+  <upstream>
+    <remote-id type="github">linbox-team/fflas-ffpack</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index c1e828e8edbc..7029fb0c0e35 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -7,8 +7,9 @@ AUX fftw-2.1.5-texinfo5.1.patch 596 BLAKE2B f45dcfef53cfb374c2022e88632934b48f2a
 DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0466fa0a59fccfa2cec930e8870a5febfccfacfe44e876e40534c34e05dc62b8e7bf188b43fe3a65c6a7bdba SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15
 DIST fftw-3.3.6-pl2.tar.gz 4185261 BLAKE2B e2f877c13ab441ddf1ae731cf3ebdc5d1565f8216f497694ea1fccc43b6a53fc02d39e17f97c56d15d03410b2005e6c693cb4b639399aac0f6ebdc63fed32d2e SHA512 e130309856752a1555b6d151c4d0ce9eb4b2c208fff7e3e89282ca8ef6104718f865cbb5e9c4af4367b3615b69b0d50fd001a26d74fd5324ff2faabe14fe3472
 DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73695742459079ebf050dfa4c371484ea65324fd4b7d374f70d88a5942ff8abaad167b0d44d485bf1dc9e208c SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
-EBUILD fftw-2.1.5-r9.ebuild 3145 BLAKE2B f3417fd6b0da75f7607f8d7d113e484172c850004051169e21384f1f9c56db7b5f6192984c3a9515a417a800e9ee06c1cbc6f7209fa7405453ef67cadbcccab0 SHA512 26353418e75eb94b48628d10f77dfd08aa6308d496db78be946b9e653aeaf4b63f8ef564742bd6006c45c137c88e34b036eb0865ee1ee02d5a6468acf3f33e44
-EBUILD fftw-3.3.6_p2.ebuild 4458 BLAKE2B 7c87ea915fa6d243342d58af329955e0f92991b979b047814fed958f4e9e1ecf67304c4557d91531077b30edac6949f3aa2d6ae925b17abab97b306652efe382 SHA512 026d8c998fd1be57bd23796b56b1b567abe5a27eb2f5e673f167b30a8fc7c86bafd00e446ea488557139c4f57f3e934c185eda3d14cafea332611ee525b3cbbe
+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 4482 BLAKE2B 3d15c541c7ebd4da4d8c5db3d138ed34ac762fd69bc5deeeeab6be45b979568152558b42c67ede7ea61ff6166bc1e52b2e47374d9b845f931e29a4ca3d9bf4e7 SHA512 1121948acc7270f310aba04212848b2f4ae918a96c137cdaa7117296566272b67e90bf439e17cbaa1b3f25e2604be8fcb5c7f035ea3162c640847f3e0eba999a
 EBUILD fftw-3.3.8.ebuild 4487 BLAKE2B 3f88b09f0973e09ebd253128086307354e03d091cc8095dbcd2672582dec2fdeca3965324a1ce6860aba9500397a2a1ce494547793073557981238b41b7f501a SHA512 4998722cd488e98041d4a8ec4bf3a0888358c5558a44da0e1dbd9be9b1e42d7ce0ebb9c18179d48b324b3ffaaea2473b350b407d5f7af3ad44515176dfd72d30
-EBUILD fftw-9999.ebuild 4678 BLAKE2B 360cf9fa16bcbb3492929e3a6465a3b3898c55c2e20e3b6c26694f8d7e9f9d3254c08c7d9565f9ab41314a7a51328443dec05d61ba0ac86da5e9724feb30b52a SHA512 66d7f5c3f94060b8ec0932eca34c5b858182a658e0a2cc67e003492180ff76a40d417b496ae31d25e47b5f399f7dc2f9efd304270e5bc208763bdad7adfa577f
+EBUILD fftw-9999.ebuild 4482 BLAKE2B 3d15c541c7ebd4da4d8c5db3d138ed34ac762fd69bc5deeeeab6be45b979568152558b42c67ede7ea61ff6166bc1e52b2e47374d9b845f931e29a4ca3d9bf4e7 SHA512 1121948acc7270f310aba04212848b2f4ae918a96c137cdaa7117296566272b67e90bf439e17cbaa1b3f25e2604be8fcb5c7f035ea3162c640847f3e0eba999a
 MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98
diff --git a/sci-libs/fftw/fftw-2.1.5-r9.ebuild b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
index 3f78d748134b..d4bb1d4b0677 100644
--- a/sci-libs/fftw/fftw-2.1.5-r9.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org"
 SRC_URI="http://www.fftw.org/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 LICENSE="GPL-2+"
 SLOT="2.1"
diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
index 174a9d770a8d..3d8aa2902359 100644
--- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild
+++ b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
new file mode 100644
index 000000000000..9266b28d174d
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
+
+DESCRIPTION="Fast C library for the Discrete Fourier Transform"
+HOMEPAGE="http://www.fftw.org/"
+
+MY_P=${PN}-${PV/_p/-pl}
+
+if [[ ${PV} = *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
+else
+	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	quad? ( sys-devel/gcc[fortran] )
+	test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+HTML_DOCS=( doc/html/. )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-check-openmp
+		FORTRAN_NEED_OPENMP=1
+	fi
+
+	fortran-2_pkg_setup
+
+	MULTIBUILD_VARIANTS=( single double longdouble )
+	if use quad; then
+		if ! tc-is-gcc; then
+			ewarn "quad precision only available for gcc >= 4.6"
+			die "need quad precision capable gcc"
+		fi
+		MULTIBUILD_VARIANTS+=( quad )
+	fi
+}
+
+src_prepare() {
+	default
+
+	# fix info file for category directory
+	if [[ ${PV} = *9999 ]]; then
+		sed -i -e
+			's/Texinfo documentation system/Libraries/' \
+			doc/fftw3."info" || die "failed to fix info file"
+
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	# jlec reported USE=quad on abi_x86_32 has too few registers
+	# stub Makefiles
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
+		mkdir -p "${BUILD_DIR}/tests" || die
+		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
+		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
+		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
+		return 0
+	fi
+
+	local myconf=(
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
+		$(use_enable fortran)
+		$(use_enable zbus mips-zbus-timer)
+		$(use_enable threads)
+		$(use_enable openmp)
+	)
+	case "${MULTIBUILD_ID}" in
+		single-*)
+			# altivec, sse, single-paired only work for single
+			myconf+=(
+				--enable-single
+				$(use_enable altivec)
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse sse)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable neon)
+				$(use_enable mpi)
+			)
+			;;
+
+		double-*)
+			myconf+=(
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable mpi)
+			)
+			;;
+
+		longdouble-*)
+			myconf+=(
+				--enable-long-double
+				$(use_enable mpi)
+			)
+			;;
+
+		quad-*)
+			# quad does not support mpi
+			myconf+=(
+				--enable-quad-precision
+			)
+			;;
+
+		*)
+			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
+			;;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC)"
+}
+
+src_configure() {
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake -C tests smallcheck
+}
+
+src_test() {
+	# We want this to be a reasonably quick test, but that is still hard...
+	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
+	# Do not increase the number of threads, it will not help your performance
+	# local testbase="perl check.pl --nthreads=1 --estimate"
+	#     ${testbase} -${p}d || die "Failure: $n"
+
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant multilib-minimal_src_install
+	dodoc CONVENTIONS
+
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto faq
+		dodoc -r doc/FAQ/fftw-faq.html/.
+	else
+		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
+	fi
+
+	local x
+	for x in "${ED%/}"/usr/lib*/pkgconfig/*.pc; do
+		local u
+		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
+		done
+	done
+
+	# fftw uses pkg-config to record its private dependencies
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index 3e2234048b53..9266b28d174d 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.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=6
 
 FORTRAN_NEEDED=fortran
 
-inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal
+inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
 
 DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org/"
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"
@@ -28,14 +28,11 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
+	quad? ( sys-devel/gcc[fortran] )
 	test? ( dev-lang/perl )"
-if [[ ${PV} = *9999 ]]; then
-	DEPEND="${DEPEND}
-		dev-ml/ocamlbuild
-		doc? ( media-gfx/transfig )"
-fi
 
 S=${WORKDIR}/${MY_P}
+HTML_DOCS=( doc/html/. )
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -64,6 +61,10 @@ src_prepare() {
 
 	# fix info file for category directory
 	if [[ ${PV} = *9999 ]]; then
+		sed -i -e
+			's/Texinfo documentation system/Libraries/' \
+			doc/fftw3."info" || die "failed to fix info file"
+
 		eautoreconf
 	fi
 }
@@ -81,7 +82,6 @@ multilib_src_configure() {
 
 	local myconf=(
 		--enable-shared
-		$([[ ${PV} = *9999 ]] && echo "--enable-maintainer-mode")
 		$(use_enable static-libs static)
 		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
 		$(use_enable fortran)
@@ -132,14 +132,7 @@ multilib_src_configure() {
 			;;
 	esac
 
-	local MY_S="${S}"
-	#out-of-source build is broken for 9999 due to maintainer mode
-	if [[ ${PV} = *9999 ]]; then
-		cp -al "${S}"/* "${BUILD_DIR}"/
-		MY_S="${BUILD_DIR}"
-	fi
-
-	ECONF_SOURCE="${MY_S}" econf "${myconf[@]}" MPICC="$(tc-getCC) -lmpi"
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC)"
 }
 
 src_configure() {
@@ -147,7 +140,7 @@ src_configure() {
 }
 
 src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile all $([[ ${PV} = *9999 ]] && usev doc)
+	multibuild_foreach_variant multilib-minimal_src_compile
 }
 
 multilib_src_test() {
@@ -165,7 +158,6 @@ src_test() {
 }
 
 src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
 	multibuild_foreach_variant multilib-minimal_src_install
 	dodoc CONVENTIONS
 
@@ -173,6 +165,8 @@ src_install() {
 		dodoc doc/*.pdf
 		docinto faq
 		dodoc -r doc/FAQ/fftw-faq.html/.
+	else
+		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
 	fi
 
 	local x
diff --git a/sci-libs/fplll/Manifest b/sci-libs/fplll/Manifest
index f4e9b970d5ab..454b69c178cd 100644
--- a/sci-libs/fplll/Manifest
+++ b/sci-libs/fplll/Manifest
@@ -1,5 +1,5 @@
 DIST fplll-5.3.2.tar.gz 1284989 BLAKE2B 66d022c1a6acb3f029c871bebf4925ec5f9447af71829c6d52f2065155bf75f075965a41918722d095546ca18e8e87a85f181a76f5e42abd20c8de8165210bab SHA512 eacd990c468b1d919e1d6cc04f99656d982d5a3807970e0a1dd910a2703eb5b8eff913bc5c0e45790a547bb7aa71189fb9022024186bb84ee04d8602c9980ac2
 DIST libfplll-4.0.4.tar.gz 413519 BLAKE2B afeea5a813d3d5b1b7fe3e81d5a8e9bce66ee4f8a3d265dacaa0ba7ff2f632f0f533182027322e2fd17645f5bc5816b266b167da0e36a00a38f73e794e22a522 SHA512 81cf61118f0dadca8fd82cc58df2fb5f0dc3ddd15a9b5de95a7777e0ece77d8f6a6d50d14ba7fdd6be6697cf375fac2e60792c94cc65f5a181c427dea84d552d
 EBUILD fplll-4.0.4.ebuild 704 BLAKE2B e658442fb5582e62ebd499cf7b3dddd13e5b25ae4c60b161c82661a5d5a3eda79507aaee612e4dc47d571ed839be9e50a3882f3347b350e1b39d91db603839ca SHA512 7d384773c284569c2d5a6fc4a1cc5f163ec3471f09db7949d941518a08247f2539f853c9d1ecac410523ac167e25dc554c9f0770939aa45300e75e65561d3d3b
-EBUILD fplll-5.3.2.ebuild 686 BLAKE2B 0d64f9ea109773b2a30183b36782c5a1de018fdf951991f57efe5af75d55db14a071746f9dda3d2bcf1a57cd0b7a575ed31458579b3e0e857c943dc2a031dc66 SHA512 b38e8689fbf82b9d75648ab3e3448848b448d35be34e4284e38705d69e0ea28bc43367e278281b30aeeb339f7408f3d83e6790eff7adbc53e0bebd70cab2080a
+EBUILD fplll-5.3.2.ebuild 684 BLAKE2B dbb2bf6a338bd9b4f357aafab6737001155249d0a28fc398f37c696f4e3a1a2497b221a5426c7f252a36b9f57c26e0bab65ca134fa405407f6697aa8f17949a1 SHA512 ebd3087376ccd1be88f351be6edb6e0eaa3beeefc3a4774208133173c67ae58490c967fbe5e19349026135a1292b4711a193cec70b5ecace1f1470010d72ae87
 MISC metadata.xml 731 BLAKE2B 64e80fd07c1887f4478cbd116254222a26b79a90037007fe4c99e3bef59036168de165468d3c4c39c2e4c7dae5392aa51de6d4b3cf97d76c7c6687d7cfb0685c SHA512 0ff3088ed94924291b47ffbe624f54b493755f941ab59fe23f67eae01d8e79ac4c8699ce23db4ffd8bc9012290da379b19dd4a0772a9e0e2c6312387a93e01b7
diff --git a/sci-libs/fplll/fplll-5.3.2.ebuild b/sci-libs/fplll/fplll-5.3.2.ebuild
index 2757d1e1f4a1..f204635f77ef 100644
--- a/sci-libs/fplll/fplll-5.3.2.ebuild
+++ b/sci-libs/fplll/fplll-5.3.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
 BDEPEND=""
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 993ddfd1ac36..4d1f21927951 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -13,6 +13,6 @@ DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 92404336339c6f46877f3e6599af6fc67a537148
 DIST gdal-2.4.3.tar.gz 14726748 BLAKE2B 104c29912a96b03d0913be40f91a844b2f04f1e972b1ae8764bd277e7d51960b45d4a67a8f9240130de7ce8752f69f4172ca9a54bb11e70635aa55b6c6924cb5 SHA512 e532ce86c92724300ab443c42dd8cec0e74e41411a54d30222f98faa10623b31e616eda44da8f406ed01f3fc3c72c76e8ceb80c1dff733f8efcaa2e2e18132f6
 DIST gdal-3.0.4.tar.gz 14379480 BLAKE2B 1ced7f791608be2ea1aede8705826135a015a3bf376af087b10e0b17a6884c141df4b24654eeac136afd959c1360ce0cf1f1312438093ca305fa38a242d7e364 SHA512 bc5032a123a2cc90145fef8b467a4c9b78ddf7b4d850ceaae8350aacc3f6f23e13dd52219844a2b930b59d000854d3f2cce117643d62ead176b71939f4760ce9
 EBUILD gdal-2.4.1-r1.ebuild 8176 BLAKE2B 0ccaedec2cdd24e0b572483595445ade24d1dada60540137840d4e6947d238ff675dff191aaa6dbb569736721d71f297cb2c7cfcec709a872194f07313dfedd8 SHA512 f8642e106d247e8e5ba7b8d89fbad81cb767655fd6ebcb1ae6f0cabb8b75de83d48108c37d9805cc040861288cb696843dc0e609eff1cea7c0c55f3f769f1b19
-EBUILD gdal-2.4.3.ebuild 8090 BLAKE2B 67afb5d2471e6c10ac1e76d3dfd352f27e58f232531272b5f8ee3008b6191d7e4b3b1930bf6b0e0c676a96ed60c942b91ece9f7f9c738c378e98f5b7c85f8d3c SHA512 2786af2efab67820db7ebadc6bbccff701a278efd351277831e85a36359f154862f8237bfd27990ee2eb3dd274903c7218d56f98d582b569e881fc40b48b0fc9
-EBUILD gdal-3.0.4-r1.ebuild 7308 BLAKE2B fbfaf6ecbe7f267048421ce2e19fc947761a807da3245a5362cc2bab1ab972f4f310a853d610a335b0a94693728f65b4f689f89d2110cb27b7ad45a32896b407 SHA512 96f19c51995c8eeb0dcc65e2e75b33658b653176bbd779ff76d8249380c7df36527e3f6af7cc1bbc78707e4c7884ca50b3f5c6459c3f80869d1f0c43868c94c5
+EBUILD gdal-2.4.3.ebuild 8098 BLAKE2B 6af448cbf507f843f9732149e6b94caeadd3114df9d03082d3ff345f0182be58b9521c2b5f337dbd97e6dbaf0b12723c038ea8ae283cfbb5b7d17b0d81e8794f SHA512 21587d67b306a5adfb357f9299bb8fc537d5c3a5bf1c2c903a7f041f6d1b6602a88e5ecfd3446080f274b94b2e00a31bb422bb3df4dae322f11b0c06230d2f48
+EBUILD gdal-3.0.4-r1.ebuild 7305 BLAKE2B 91aeba00048f346e542a228020fa6bc8c6f4e6f55c3b2b581a175669889b415f66c6120166dfadde0a0b230bb02fe813f0b6fef1affb334c89cdfc49ca95b5ea SHA512 a98c91005dc6714352a2ca5f18f8487aca49ab3240abde0f30035b6ec48408f7e3d4a1d714b0d414060c23c3c366834e577546f2944154b275045e4c58772d48
 MISC metadata.xml 1420 BLAKE2B 1887e48a94b0d8596913fda0e102c0e23768e1fe9df32f8f0387c5966d9e9b1e0bdd6d06f6d281660494c871d887ed20d4254f1aaa9b23cda9830f7a4810ef00 SHA512 be3a0fdc46e1b022fce052908ce7f43399f1be9d4f4b1cf23e3cca8e43d6280d1f8f820fe1d0ac1d65d2dacde1ddc859c1ce3b8d067e0f6114ab3900abc419eb
diff --git a/sci-libs/gdal/gdal-2.4.3.ebuild b/sci-libs/gdal/gdal-2.4.3.ebuild
index b1cd05478bd4..77fa8dd5ff87 100644
--- a/sci-libs/gdal/gdal-2.4.3.ebuild
+++ b/sci-libs/gdal/gdal-2.4.3.ebuild
@@ -60,7 +60,7 @@ DEPEND="
 	ogdi? ( sci-libs/ogdi )
 	opencl? ( virtual/opencl )
 	oracle? ( dev-db/oracle-instantclient:= )
-	pdf? ( app-text/poppler:= )
+	pdf? ( <app-text/poppler-0.85.0:= )
 	perl? ( dev-lang/perl:= )
 	png? ( media-libs/libpng:0= )
 	postgres? ( >=dev-db/postgresql-8.4:= )
diff --git a/sci-libs/gdal/gdal-3.0.4-r1.ebuild b/sci-libs/gdal/gdal-3.0.4-r1.ebuild
index 5bb8ddce5ea9..b8e390e8e00a 100644
--- a/sci-libs/gdal/gdal-3.0.4-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.0.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/3.0"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="armadillo +aux-xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 REQUIRED_USE="
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index c420e452802d..df94026cb65a 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,6 +1,5 @@
-AUX 3.4.2-solaris-isnan.patch 575 BLAKE2B 34e2fddd46e4e503630d0c44c03ee72ceb8bb19af31075ae209d0198b5db0839a633cbb7c855035bf8964d860174c56288579a4bd50e322d728ea4704d312108 SHA512 efa2730f178814e8d98318347e7a8313327679a5c861ef2a844ce821c5854f4dd56e0cc2c52fa5866fb4214b0d9aa8614b1f1ebaa62f0427e69221a93106aa45
-DIST geos-3.7.2.tar.bz2 2071465 BLAKE2B ba968488aa5d845e582d3771d8d2b1f67b0f301e73fad5834a0805a912c8f3b1200bba93d8758f43539ce269758de348d999db3db9738e7abf5c1a443f388d8c SHA512 ff0fde2e21ed9d2770c139aa50c6efd22d9cff3c6bfd8f1ef86b064efd1ad318b08dec66e34661bc1c7a341b0837978853494f27d63988be865a8ee4f7611d38
 DIST geos-3.8.0.tar.bz2 2399403 BLAKE2B 0f9b6d7f9a4052b9b84e77d534be6e2909e5dc4995287f34e3b7e7c1537c9a73088d4a49f96f43034723eb37c88674aae469e26d7db3eb40efbcdf5551553a1a SHA512 c89b25b42092152ef261090f25ff64b229f30f67d42fdf44c2871e78b66bb2c42e23b9ae21f9aea0e48823bdb0267d609ab2ee77d310abcb76fa672c6614d8f1
-EBUILD geos-3.7.2.ebuild 1338 BLAKE2B 7ebfca396ca09ebe266c59c901ad7f931076a5bef9b7574167d35b0123297205504cdfe7b11ad3a44729483ab57a14bfce6a17f66c9a4391c06b8fcf4c1071d4 SHA512 fe01f7c023c67401396ba760266b62ebba2388e42a7aae08a188fb7ec4726d9c6390f8768511fbd28ad6374a8f47a5de55a530c025d01e43a43082f7ea3a0021
-EBUILD geos-3.8.0-r1.ebuild 1051 BLAKE2B d3f968edbe2ca5b45d4a7de7dec864c03aef47573b08b271aa1cf4a3e21548bcdb6a50dae532c98a47a40af20a91edde1f18f2f83050cfc786ffefba0dcdd06b SHA512 70cf5c442d28fd8f61d35119c4a6607bdb7d2f646c424ea647841aa215a3c0fe2e19fb8683af8bc4661c92863c2cf8b4ea9063235b810ae2129097c4d1a25931
+DIST geos-3.8.1.tar.bz2 2505407 BLAKE2B 43053ea9e29d190f41c37d5d382b689ef477e0256cfd5705f4f2f316cac21a1674660bcf0900c51db72909c41d46be7a41d297958de48e108ae6d6bd1ca9d247 SHA512 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056
+EBUILD geos-3.8.0-r1.ebuild 1148 BLAKE2B 8fb0f023e255cb3cd5c90dc9f26f6ed1589c8d73c5cfb73cb7aa579fac03d7bac0951565ac13764ced5bc3e915af341007e44b56ee5f3689640058c616ac05b4 SHA512 ebbc36bb4a71b7612534ac6d6fa557d6fc413c50ac243deaf02f328f859bafafec50ae475388eabc10bc49ab1ea22e6300f826296f83234b1b47382ec1543bfa
+EBUILD geos-3.8.1.ebuild 1118 BLAKE2B 49c05deb35d5b4d56132375bc673e24937f3e596f052b3e6018a09df8311673f33a622df02907d0732e3de6d53b5f0b810a4c79214307bb3428c922b47feb47c SHA512 01f5f170b96f0ebd506bbac22edb64ab1f3b3c88bddc65a03a0634e88ff8d12a6f02a5d7f5c2619968beba26049a09729e642f7d1a391ba559eda90333af26cd
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/files/3.4.2-solaris-isnan.patch b/sci-libs/geos/files/3.4.2-solaris-isnan.patch
deleted file mode 100644
index a66d36f6587d..000000000000
--- a/sci-libs/geos/files/3.4.2-solaris-isnan.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naruw geos-3.4.2.orig/include/geos/platform.h.in geos-3.4.2/include/geos/platform.h.in
---- geos-3.4.2.orig/include/geos/platform.h.in	2013-08-25 15:10:32.000000000 +0000
-+++ geos-3.4.2/include/geos/platform.h.in	2013-10-20 23:45:29.891690795 +0000
-@@ -98,8 +98,9 @@
-    // It does leave a version in std.
- #  define ISNAN(x) (std::isnan(x))
- # elif (defined(__sun) || defined(__sun__)) && defined(__SUNPRO_CC)
-+#  define _XOPEN_SOURCE 600 //force iso/math_c99
- #  include <math.h>
--#  define ISNAN(x) (::isnan(x))
-+#  define ISNAN(x) (std::isnan(x))
- # endif
- #endif
- 
diff --git a/sci-libs/geos/geos-3.7.2.ebuild b/sci-libs/geos/geos-3.7.2.ebuild
deleted file mode 100644
index 4c8405e7855f..000000000000
--- a/sci-libs/geos/geos-3.7.2.ebuild
+++ /dev/null
@@ -1,61 +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 python-single-r1
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="http://trac.osgeo.org/geos/"
-SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc python ruby static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby:* )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	python? ( dev-lang/swig:0 )
-	ruby? ( dev-lang/swig:0 )
-"
-
-PATCHES=( "${FILESDIR}"/3.4.2-solaris-isnan.patch )
-
-RESTRICT="test"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	echo "#!${EPREFIX}/bin/bash" > py-compile
-}
-
-src_configure() {
-	econf \
-		$(use_enable python) \
-		$(use_enable ruby) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	use doc && emake -C "${S}/doc" doxygen-html
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/doxygen_docs/html/. )
-	default
-	use python && python_optimize "${D}$(python_get_sitedir)"/geos/
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/geos/geos-3.8.0-r1.ebuild b/sci-libs/geos/geos-3.8.0-r1.ebuild
index 3992d7a58cfd..53a956cfd2d4 100644
--- a/sci-libs/geos/geos-3.8.0-r1.ebuild
+++ b/sci-libs/geos/geos-3.8.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.osgeo.org/geos/${PN}-${MY_PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc ruby static-libs"
 
 BDEPEND="
@@ -33,10 +33,14 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--disable-python \
-		$(use_enable ruby) \
+	local myeconfargs=(
+		--disable-python
+		$(use_enable ruby)
 		$(use_enable static-libs static)
+	)
+	use arm && myeconfargs+=( --disable-inline ) # bug 709368
+
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
diff --git a/sci-libs/geos/geos-3.8.1.ebuild b/sci-libs/geos/geos-3.8.1.ebuild
new file mode 100644
index 000000000000..f19227d4b289
--- /dev/null
+++ b/sci-libs/geos/geos-3.8.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Geometry engine library for Geographic Information Systems"
+HOMEPAGE="http://trac.osgeo.org/geos/"
+SRC_URI="http://download.osgeo.org/geos/${PN}-${PV}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="doc ruby static-libs"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	ruby? ( dev-lang/swig:0 )
+"
+RDEPEND="
+	ruby? ( dev-lang/ruby:* )
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	echo "#!${EPREFIX}/bin/bash" > py-compile
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-python
+		$(use_enable ruby)
+		$(use_enable static-libs static)
+	)
+	use arm && myeconfargs+=( --disable-inline ) # bug 709368
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use doc && emake -C doc doxygen-html
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/doxygen_docs/html/. )
+	default
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/givaro/Manifest b/sci-libs/givaro/Manifest
index 5423171a9afe..bb2e5f41b025 100644
--- a/sci-libs/givaro/Manifest
+++ b/sci-libs/givaro/Manifest
@@ -1,3 +1,3 @@
 DIST givaro-4.1.1.tar.gz 1008358 BLAKE2B 246fd1a263174f58d96dd66fa79e6113368b6c318c33d68858a339bd9cb778dfda84636c683ee9d02f2ac72ccff8ac22d395b92741448a8ed2ce08c041ac8ba9 SHA512 7ad15ac24f55ad65c9c5d0d48ff4388d0494e75dc7b66d1e139195cd086ff2371259bdb5df940fead1db2fd378bb76289f2327a8d6f41575d99d424a74cf644c
-EBUILD givaro-4.1.1.ebuild 1645 BLAKE2B f9b80dfc3bbb977c42a93be86d4bbde8006c6eb67627544843716263b8906257b527c10a81f3f0392e659ee74073075e87bac6c903bec5c19a15034149a0f6b7 SHA512 cbc26638b87fb6c7ce67b84e4e3422a4e952ef82c04a4796c34105af9e3086aa4c938fff5a20bfe68a72623be0cd2299fec0a4476e2c9015a3100507ee5ff758
+EBUILD givaro-4.1.1.ebuild 1805 BLAKE2B 98ee01af532811a591ac3428de6572054227f00b3ed26396fe41e7564038ac57d8d46b451c3cececf14a984d992b3f89a25fb38c5c48b02837ccbb9026c70484 SHA512 ddc57d485b7847b284307843e8632a02666f5b2940ec46705784a93136d3b5cca81a9feaa8eed0858ac02909dd310302b3421d2cbcfb3332a7f7bbf1e1408598
 MISC metadata.xml 738 BLAKE2B 89916089365fd82a21b273b91b832888d542ec4c0d7533d725f2be0bf9c9310758f3d4ccd5e8c1d6abf8cb63f92e62c048be22f99a88f05eb6db5cd6bc5a8c17 SHA512 768957687398de4ece1f9d04f6f4c7836b0230d166553b5b2998d61875d78810c1470061eeaac5d39b4ee81f839cb4eddc4ba2316a7024374f8a8864a275af4f
diff --git a/sci-libs/givaro/givaro-4.1.1.ebuild b/sci-libs/givaro/givaro-4.1.1.ebuild
index dbf9f8850194..935649abda69 100644
--- a/sci-libs/givaro/givaro-4.1.1.ebuild
+++ b/sci-libs/givaro/givaro-4.1.1.ebuild
@@ -13,7 +13,16 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 doc static-libs test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="doc? ( app-doc/doxygen[dot,latex] )"
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
 DEPEND="dev-libs/gmp:0[cxx]"
 RDEPEND="${DEPEND}"
 
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 97f1193372ef..ec81a9c46ba5 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -5,8 +5,8 @@ DIST gsl-1.16.tar.gz 3534080 BLAKE2B 1c55a41e5ed57b57f671074240d23416aa8f23e3cc2
 DIST gsl-2.3-cblas.patch.bz2 12036 BLAKE2B ddad801cc42f925581e2e4995292f3eab0d2faf70c43c3b205fcf521b98e426df1d0824ed7d98b2c4cc89bbc4068fd45f2595dc02d23bded5c702b5a01bbfdb2 SHA512 37b867a21e60cd96c453ae24139bcf16c00c85bb6d5a3dcece81185fd9af5870c5167d2fa3c74cffce55bfb84f72be34d28ea94e0889904f8dda8687f66b4d23
 DIST gsl-2.4.tar.gz 5916715 BLAKE2B f22c07b2d5759a383e05b8bfdba70071672cc27f12ff2a8c755451fe7e10c8e2d80e3fcc601508c5e9942e4cfd05e51c43ba96666326b760e4390eb0c2552886 SHA512 12442b023dd959e8b22a9c486646b5cedec7fdba0daf2604cda365cf96d10d99aefdec2b42e59c536cc071da1525373454e5ed6f4b15293b305ca9b1dc6db130
 DIST gsl-2.5.tar.gz 7303881 BLAKE2B 7c6d10c21071a1af1f03123f83244476d2e90fcd27d05a115b03a74fe631eb7d8081f5260e534ae58ab0997c1111f980a5e4cb50d110ca626fe810c44be70180 SHA512 5b4c5c023f9029ce220f4e09aa4d0234fed94d42ac224d58fda095fe0532d54237a7c33278f8b5d0ba051f6004486edb38d0adb4fcb49337a8c1d8a18cf4a24a
-EBUILD gsl-1.16.ebuild 3080 BLAKE2B 3a660a26d3c28fe313fd3f36f20b342818e9dcde2a7fa38d44d6c8cb92b09eb7f8d97c56db09671fd0ffbdfd73136b1fa399c511227179423f45b388a51b4e72 SHA512 0dc0310648dc49e917b96f75728068e80ea752e0d099e6b016fcd64b39c3b431108e09805ec2a0cbf3ff028e50969e1481b6181e5aed1ad94a650d0625cd154f
-EBUILD gsl-2.4.ebuild 3191 BLAKE2B 230228573c7479f4964da270a8ea2f4fb886a0969e28e914e880cd56dd46ceb6bcc173fa0a0634582bf59eb8007184dd1d91d1c46548ff1eebb2c35aa50ec76b SHA512 91f25c90a99f4a91912e713854cc8f47eecbd64f12534be6609eef156832cec17d4490866b2c1e1aeb6fffd3414e79be538a34f81a463e48c80040ae888e4544
-EBUILD gsl-2.5-r1.ebuild 1416 BLAKE2B a4c27e39c41c61fb5f2c4b0b16185f6494b6860105bc62a35c95ff84e2c592ed038aacfe90095db969204f7c26f9394bbe677ab0db97c1c9f113f90d13c620f8 SHA512 c1f4dacf446865724c9dc52d0c38f89eb5a5d42f74ebbd226097048a49c90949447c24a2d17facd5206a5ed455726ab67cbbc0b92b656528187ecc8acf0e90f4
-EBUILD gsl-2.5.ebuild 3179 BLAKE2B d6970d769f496680f9238fcb27338722c7e82d5bf8946d4663ce33d1f3373091422480ddd906b074c680824da1fec33023d470b4d3b092b8ad40a84071cbf9e0 SHA512 d71979695720a713553aa52cf53b7d35bf78471479f654b8420f9acb864bb383b0f1e5ce74bd89581ad832d533c612e6dce3af985cf4e5856b46a4c590ecddf0
+EBUILD gsl-1.16.ebuild 3077 BLAKE2B fcf2bd17298b05ad90cb0b3ead571f21ecee7a3566392f0f5456292a246f3ff25fdf097d126cac313c7d74233ff97ca1b1fd6b6bd21273d46009b14f45dd9a10 SHA512 835dbad1e6c39ab301f574c00c5ec588a9328962ffd4b1c731b89f3c950a19fc0d120ab166506750d06d58376845615e1eca67ead9efcc04a31aaa20cbc12d6a
+EBUILD gsl-2.4.ebuild 3184 BLAKE2B 40bbf1271590764573038be47e18cff594ea73f196247bcac3767fa5ae41e7e3e21982e321ad4bcb9b44bcf1f9c5102a5be7f44248d4639c9e5b32a6d465652e SHA512 6636cb654983c9c0826853f9fde3709633a2d0f693d0b1993f3d9de5b13dce71c18107a404ead7a14df4d70ec418a4974266022166f2964f104dedc6b76d4700
+EBUILD gsl-2.5-r1.ebuild 1411 BLAKE2B 28050f0766d37c2766913781dfdad1580fbcff98715d16d752147e2ad267a5f587397bdc9d3fff856567ac4e3f46bac72c5ae77fb930fddfd0a2be703472937f SHA512 e907625ad002f384d28007b6d9b2d32b85ac7863036ec4e265ba2b071a2e69e4836c684a4bd2bc202c17f166659e324071b1becd3fb01a8623c49fbe891940d1
+EBUILD gsl-2.5.ebuild 3175 BLAKE2B a265f3662a02ceb32aa3bf9084ecb98d00807c6c60cae20ecf1d695c06d0055f9bd0bb30188e54a9077639ec9c791a7d4fe03da26c0d48e24669a54bbf673bdc SHA512 ca02461335b8c204b0e08e19d2cc8bcb554ccdee56a350d8ae86be892c7c647c3c5ec2164e586eb6f7ca62bda51f1b67238ee78e6a4ac9e174ec7053141e25db
 MISC metadata.xml 1190 BLAKE2B b9015dc09464b327144a546a0e9dae6e1c5eaf3ce118a24b7ad1853f09af1952284f754aada2436d7e1a1df82638720492445d8f015ccb1cec05c78dd718fc26 SHA512 f56ec87aeb8f257480a631748db79c78193797e1ecd586dbbd78f31a01fbbd3341fa67ffd3244e5dba352478ee552184d6a1d9b5ef5d54d67b038215090eca00
diff --git a/sci-libs/gsl/gsl-1.16.ebuild b/sci-libs/gsl/gsl-1.16.ebuild
index 2a36189f93e8..079f9e21ec17 100644
--- a/sci-libs/gsl/gsl-1.16.ebuild
+++ b/sci-libs/gsl/gsl-1.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas )"
diff --git a/sci-libs/gsl/gsl-2.4.ebuild b/sci-libs/gsl/gsl-2.4.ebuild
index 0a8ef9c699ae..717234335f10 100644
--- a/sci-libs/gsl/gsl-2.4.ebuild
+++ b/sci-libs/gsl/gsl-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external +deprecated static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/gsl/gsl-2.5-r1.ebuild b/sci-libs/gsl/gsl-2.5-r1.ebuild
index a5a55b8ab15c..f1d81874a93a 100644
--- a/sci-libs/gsl/gsl-2.5-r1.ebuild
+++ b/sci-libs/gsl/gsl-2.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external +deprecated static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/gsl/gsl-2.5.ebuild b/sci-libs/gsl/gsl-2.5.ebuild
index 86760d3ddcc6..491d3cbe7610 100644
--- a/sci-libs/gsl/gsl-2.5.ebuild
+++ b/sci-libs/gsl/gsl-2.5.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external +deprecated static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index 6abe6a5eb217..1b0e2829e143 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -6,6 +6,6 @@ AUX hdf-4.2.13-linux-tirpc.patch 972 BLAKE2B a95350ef2364e3ff08aa79d12e458853beb
 DIST hdf-4.2.11.tar.bz2 3173535 BLAKE2B a35a366858cc67d6ef68959cf407c21a929d5dca82834937b648eded506c7c3f75dd67be763f0d1fc24b7be92849b53d688abb25611cbc9b918340dbb23a83e1 SHA512 b3be9a91c62fa258c8aa6f97d1ccbd8301225e43938b525a826c639fd8b30b7dd566f58f4d54e365606d861ad01660887163e5ca6521293791080e5ed41ef781
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
 EBUILD hdf-4.2.11.ebuild 1637 BLAKE2B 1182b6cc0c1b9a4a21d11a3e232c6b7bc1b357617473493056b51252961c26e1c6747bf4893658222373b4ac695523a0486ed02ad1f0e6fa0ed1e5943f118bec SHA512 dea95330be6dba8c69180aa1c34f5068e1f2565d09893e4b02d1697c6d2d2dd8ec4ab0c4ce7a61765da65e282d19997bc3c90bbaa62e9a29b123e35f4fb2db2e
-EBUILD hdf-4.2.13-r1.ebuild 1822 BLAKE2B ee51dbc40d343ab4024e1904a4dfb29140707ea841b12c318a9f37bda91eec0ecaeabfb5b610c755b04b436b7cf4eeeb35190e4472c8854ac416e52cb1498907 SHA512 1405e4e0696764695129130e10c05d8356012b098722e3613bceea2ef65aa874c5d4b0a6e216592751ab36f98672ca09ef3397285870677ab847d7d2fc2d2919
+EBUILD hdf-4.2.13-r1.ebuild 1823 BLAKE2B 4a5d632b3ad107129734c37ec0ba289f5b8c9ecfa593d2aaab3af124bc3d60492146153fa616d9995b0d78e146daa7afb7fb9cb383ec296269306b171329fb8d SHA512 1322ac7ba685da4f9ce71811cb1f046ecbfb25817d3ad3044433da337e81decff6c943eb30b47faeffaa248bf13d8cb33f3a7291de24913c1426f5403bf6a432
 EBUILD hdf-4.2.13.ebuild 1709 BLAKE2B c19ddf38cbbf55b529a5860755d7fd87dd98061e42bf0b5b11e089c204e5b24b73311bc773eb3d7ecec230bc336f8aabe93d33a669c6ab8dcc0f5ab5a076bca3 SHA512 74df72ce4b4467038ccfd45103b845f72f746e2826a51fc7f7504ac4e0e9ae07485f5a8d0d580130a7e784152735ef10f95c2facbeb6e42b34694e8ba295bc24
 MISC metadata.xml 859 BLAKE2B c5c33f1a444d0af6287dac495443be05de5a2b8d9c55d4bf9aeb80ebc28f1391612510771848277fa1467097ab480b9b1dc306af587d2621e4a1d16c6bdc91a5 SHA512 2a38d2fbd5672f4465cba6da9f74c6ef95068be26514acc3d2949049f8461265e2ce7c6751d1853218ac4a4b62746e355faa9f2e0d7d8d6dc2faf17d8e40fceb
diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index 284afd710fce..d50d336f6fcf 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="amd64 ia64 ppc -sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ia64 ppc -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( szip )"
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index b90c616a1e9d..21a614534847 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -2,5 +2,6 @@ AUX hdf5-1.8.13-no-messing-ldpath.patch 1141 BLAKE2B d7d186e4c00acb9fd3d44beb1d8
 AUX hdf5-1.8.9-mpicxx.patch 494 BLAKE2B 148d87af064e2ba28c918c8db39ece0782a179803e4c38c5cd5eaba81a673bb8aa3699a48e80a7ae2d4579ac0261cc21d5509e46661ada9a69f444a58eb45ecd SHA512 8b4c39e40591860652547ea8ff205230da7d67488233e911cbcb3416eab561f2529c65bc5e7c9c812bf4298812346f47f9209e5f69f7e8f66ad587306a5b477b
 AUX hdf5-1.8.9-static_libgfortran.patch 429 BLAKE2B 9e1c544a453c09b3498a7d9d3e8090c928571776934c4dd6b426cbdb2783ed8f47185d6ee0c73ede6b4f14e27459ef5e1412112e9d897daa2dc57f1ad5fb0b24 SHA512 af97c54469a90bf3b0e8ec1218d4ca95822ac0cbc7120114979fc467fe3114743c74f4d4e16f0c10b1cd82d40880ef482f6fd34e1effc7c621b981ad466204f9
 DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4
-EBUILD hdf5-1.10.5.ebuild 2709 BLAKE2B b3974b7cfd328cc64d98e74e12eddc18e13808638f0c3603cd67143f358b7b1bffd5d3650364b1d625540f6aa5ca7e4d07f9b4772850e68f887a684521dae497 SHA512 9cb39c28298661733a37691c06c9cb6f5e1712bdabeb97b7f68aadf23aee3b338c54960b49ddfef966ff2d077c06596d73184f909ccbb0b99be230497ef1c2e5
-MISC metadata.xml 670 BLAKE2B 6ec39c2c545ea8130677894921b6914d4503199a40f5498b81f1520312a451585276a2192ecb388323574bf0a17acfe798d090bf499f8ef2b6bb7ff831c662ba SHA512 2cbdee7294537d76bee9c72c77c36d0d2aab176dd4588a7b99d16bc3a421b52770bf6d93943c13fb32674f5deb7bbebb94b9e18875b3e473395a9176277fd56a
+EBUILD hdf5-1.10.5-r1.ebuild 2811 BLAKE2B 1b8e555034e149f38a15046bdf4e4dbf8a5ce50093852db1dc0fe5fab512b301b887c3c1eccef1043f221f7589eec2b99cfff15ea4114822c671e8cff9a81ab5 SHA512 16468635badb6f81b09215e38739975fa2e99a89f63a7e39bc616228a0d92a5828b957187aa97da99781f67d98db646d964a72e521bf184b25d852fcc567a62c
+EBUILD hdf5-1.10.5.ebuild 2710 BLAKE2B 44d9392549ae2f6ac7e8c39fd42c8b7706c9fc626de94f79b695c9f04fa097330176253f2d7a0695daedd8bdd7c86ee6cbcfa3223490307139f86ed0e19aacb6 SHA512 40b10877a1ace67993de99e0748a5af315f8e0bda6bc539108cbef8a6ecdf4b01306f5d3b0150b6b4773be7bf8b0d82758d612cd3c8637d62c7c81f284f47db1
+MISC metadata.xml 763 BLAKE2B df2fb5f7f3aaa55b77b51d1e874cc4e58dc81d4c9fcc713f01bcd5d197b33d3ea0e300849432255d068b585b129dd0bc75310ea6ebe6d987688a2c621fd8fa75 SHA512 303724cfdf46efa4864e58bb645398472e801d1a22b083947e52aecbf28c7e5c0e16d5752d12927f02874d24270ea64220c42ec75d04d15c014f396523c2b19d
diff --git a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
new file mode 100644
index 000000000000..ef906aa6eefc
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FORTRAN_NEEDED="fortran"
+
+inherit autotools eutils fortran-2 flag-o-matic toolchain-funcs multilib prefix
+
+MY_P="${PN}-${PV/_p/-patch}"
+MAJOR_P="${PN}-$(ver_cut 1-2)"
+
+DESCRIPTION="General purpose library and file format for storing scientific data"
+HOMEPAGE="http://www.hdfgroup.org/HDF5/"
+SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
+
+LICENSE="NCSA-HDF"
+SLOT="0/${PV%%_p*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx debug examples fortran +hl mpi szip threads unsupported zlib"
+
+REQUIRED_USE="
+	!unsupported? (
+			?? ( cxx mpi )
+			threads? ( !cxx !mpi !fortran !hl )
+	)"
+RDEPEND="
+	mpi? ( virtual/mpi[romio] )
+	szip? ( virtual/szip )
+	zlib? ( sys-libs/zlib:0= )
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool:2
+	>=sys-devel/autoconf-2.69
+"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.9-static_libgfortran.patch"
+	"${FILESDIR}/${PN}-1.8.9-mpicxx.patch"
+	"${FILESDIR}/${PN}-1.8.13-no-messing-ldpath.patch"
+)
+
+pkg_setup() {
+	tc-export CXX CC AR # workaround for bug 285148
+	use fortran && fortran-2_pkg_setup
+
+	if use mpi; then
+		if has_version 'sci-libs/hdf5[-mpi]'; then
+			ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail."
+			ewarn "Try to uninstall the current hdf5 prior to enabling mpi support."
+		fi
+		export CC="mpicc"
+		use fortran && export FC="mpif90"
+		append-ldflags -lmpi
+	elif has_version 'sci-libs/hdf5[mpi]'; then
+		ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail."
+		ewarn "Try to uninstall the current hdf5 prior to disabling mpi support."
+	fi
+}
+
+src_prepare() {
+	# respect gentoo examples directory
+	sed \
+		-e "s:hdf5_examples:doc/${PF}/examples:g" \
+		-i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die
+	sed \
+		-e '/docdir/d' \
+		-i config/commence.am || die
+	if ! use examples; then
+		sed -e '/^install:/ s/install-examples//' \
+			-i Makefile.am || die #409091
+	fi
+	# enable shared libs by default for h5cc config utility
+	sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/src/misc/h5cc.in || die
+	hprefixify m4/libtool.m4
+
+	default
+	eautomake
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--enable-deprecated-symbols
+		--enable-build-mode=$(usex debug debug production)
+		$(use_enable cxx)
+		$(use_enable debug codestack)
+		$(use_enable fortran)
+		$(use_enable hl)
+		$(use_enable mpi parallel)
+		$(use_enable threads threadsafe)
+		$(use_enable unsupported)
+		$(use_with szip szlib)
+		$(use_with threads pthread)
+		$(use_with zlib)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/hdf5/hdf5-1.10.5.ebuild b/sci-libs/hdf5/hdf5-1.10.5.ebuild
index f755fd989570..d812cce90d46 100644
--- a/sci-libs/hdf5/hdf5-1.10.5.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cxx debug examples fortran +hl mpi szip threads zlib"
 
 REQUIRED_USE="
diff --git a/sci-libs/hdf5/metadata.xml b/sci-libs/hdf5/metadata.xml
index 040542a30ae7..2fa4f45de1bb 100644
--- a/sci-libs/hdf5/metadata.xml
+++ b/sci-libs/hdf5/metadata.xml
@@ -13,5 +13,6 @@
 </longdescription>
   <use>
     <flag name="hl">Enable high level API (https://support.hdfgroup.org/HDF5/doc/HL/index.html)</flag>
+    <flag name="unsupported">Enable unsupported combinations of configuration options</flag>
   </use>
 </pkgmetadata>
diff --git a/sci-libs/htslib/Manifest b/sci-libs/htslib/Manifest
index 7616be52568a..367d9aa3cd48 100644
--- a/sci-libs/htslib/Manifest
+++ b/sci-libs/htslib/Manifest
@@ -1,5 +1,5 @@
 DIST htslib-1.5.tar.bz2 1051132 BLAKE2B 90c6aeeaa2a2692228aa1f530d775a6e81f9275d321e8b2d6005b86b9a25e5967acca19dd898311a5bc4f3c17d4e8ea36d18da4602e18fadee47666350122077 SHA512 fd58552ddbd178f9797123fdaf47914ccd0e2aefd055fc6557ac8f479c600775616107cfa871c3acd93079f45974a19f443941a79f2acfd2a8c2983ef35b8917
 DIST htslib-1.9.tar.bz2 1178859 BLAKE2B a0229313d3572717101f4f23d39fa124f3bb38d8b2e65055f4f801dbb5f1549df95115e8beadd8fa024171b3ff8a874d20087bf71819c36700666f168dbe41ab SHA512 ddb0e2d970e4c2c27e203b064898f95cb7c187cd497c02fc7b4312dcea25669d0b6063d537687521e7a065f6daefa1ae897add2df4981037a187b499d08fdef7
 EBUILD htslib-1.5.ebuild 769 BLAKE2B 0a40bc1059beabd9671df35ea8febf7b5a11c8b46aa0f66891879962698789b36326fd91423200312497b2f9691766c1dc8aae5dceab5626a7e8de119881793a SHA512 e5df03c2dfa5088743674af125f7464a6e2add8d9c092060d7ddfc914cac4cff16d65eabb35ca3c199290461b92f7424a4347fded4f76dce763801b2b70f91c2
-EBUILD htslib-1.9.ebuild 945 BLAKE2B c198b14431fb321dd125fc344bdccd328b5d1943f08e5d691ad4343fba78637424f12a75498099ccf99aa46df479499ec528f2de737a7d9af668030593c6e860 SHA512 8d7d48327fea34bcb022b4b9ca28eb90fc019c50a4095ae7fbf4ea4ee5fdf1ae0f1f85996d250fd0f26862f1e18d5ea0377f02cdbb9906fa4d2f623d3f8ef36b
+EBUILD htslib-1.9.ebuild 943 BLAKE2B 7aafc2a82f264c4bffc1fc527f41ee336bba5b92b02c0a7e5dd3ed752b24fe3f398a375b159a1f6d9630af05b73815cb7bf748a6637cceac13cc13006daaceec SHA512 f865568b71ccda72f1c40622dc51f5e7bba5c9f958d1c7f5637373241655c9d013d2e454f39ca4a803f1ed6d6303b4b6f33df388046b400a1a656d50d8fa9ced
 MISC metadata.xml 349 BLAKE2B 0a67c5034cea0b990b01f90cf319622a73d2c8c23b89d207f013f1ac27fbfd2f267f4d0a8d331b9ab9de792cea9914671cfb2568a56fc09aeec890f69934e943 SHA512 9108691a0c4c68ececa5e93d1719b4a6fc42c423c0b7dca3c037007873a40c86a44610c54139c6868391bb903d509b0202a87640d7114815d07ef62e478ffce7
diff --git a/sci-libs/htslib/htslib-1.9.ebuild b/sci-libs/htslib/htslib-1.9.ebuild
index 69df48a332f2..ea70899c061c 100644
--- a/sci-libs/htslib/htslib-1.9.ebuild
+++ b/sci-libs/htslib/htslib-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/samtools/${PV}/${P}.tar.bz2"
 
 SLOT="0/2"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="+bzip2 curl +lzma static-libs"
 
 RDEPEND="
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index afcbed394744..cc642b6718a9 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,7 +1,7 @@
 DIST indilib-1.7.5.tar.xz 1380436 BLAKE2B 092f4100894218bf749ee0d7c910c4ee20026cf471f4f65686b67dd37a924b448b6de3733e70d7047dca6a77fd8ae26b9a568f8249336be78d052984838a2ccf SHA512 57205ed9ea9d8e8215886b17d9f0307755bca571d599967dc607320fad5ec62096f31526280f3b184ffeb0434d9adb71e65a7d6f89d29edaa643d729765f47a8
-DIST indilib-1.8.2.tar.gz 2049051 BLAKE2B 66f85d84bf4e1eae003cb13d8b400055590763d807e880f2375f33064bbeebdd7a47a3c6f1f8dc154e7d82d3424b71883b9ffe2d7853a2feb9b498107387f6ae SHA512 066a7a7b7ffba33fba1435e6a9bd7be5e26f07023438b7c196a6fd865e6d3efe76ec32329962c16fc52e42ecc96dd9e7b9feb77858139faa1d7c32716f4a1a23
 DIST indilib-1.8.3.tar.gz 2062250 BLAKE2B f46b557dfbbe16070605ad638111505577b801ac6abc2cf42df3a322eaec35a25e6f8efe3ea740b5758b3aeadd656efb4b98e284d531621ab34ca00f28e39a2e SHA512 09c23299659efea795ec430566a5b51181878c382c72f1e530ef3abe3b996b670506f6f5f1bca4eb88fbdc756854c3a36d8bd646a2cf13e397e09ace1f1af044
+DIST indilib-1.8.4.tar.gz 2097437 BLAKE2B d5c6d14032c073c24bc4357dad5bb88fe08b76554878cabc5afaae41ff58165e7f2b57cf972207b47b2003e53eafb73f15925548912e72f590c0647b4a960a9a SHA512 32b5b21e3a5e797fd203abccaca4ca259fb74dcc6b7695e67c55b1d614b562aa2ec735afeb9bfb0e159099def6fb8160023e0dbef45fa61a1a04bab86c99998d
 EBUILD indilib-1.7.5.ebuild 1120 BLAKE2B 70e19ee186e7b74d01430d4fafd2fb15d3850666b519051fa2ab97612fd01180b39e5c37d697d8d2508166ad769b41422f9d4e7e7f0789c1059641d5ee77e40d SHA512 f33e4268c4837c2df6b64bb79abd11479001e9fd9abde0c5357751a014522b37d48878a8f72628e56915487c72b7805ab7c5dd01f61a21c47407a4cda8a00a27
-EBUILD indilib-1.8.2-r2.ebuild 1181 BLAKE2B 2e7b4692d38f7f2877974f54a90ee15cb878b2974c1347de461aab088ad284e57c59b862ea5a0db8d324e812b3d2a1c76ce9bcc625e72b3a6de3c11fe34d7c72 SHA512 35da3dc46e0ed2ef842b167e842801cc1437b1f9f752f22f3ad312366f06a42c271b32358443940290de963978c3f87a2cb81f9fdf5bd9d2528a6bef55a7a31f
 EBUILD indilib-1.8.3.ebuild 1180 BLAKE2B 57212e677b51f57427debdaa8b1e0eea4f6fb26fba8368b7e2f1e5f4c8d2165406f5a11c17970bd6706782684da9456a4dfb9edf1fec4c8bcf6fbc48cc010a56 SHA512 0ea6c402a6ff57a589f4f3309746de7e1b69c3180d3a12265ffc20ff361f53638eedb0caedee8cec7b3fabc0aeaa573c2998444bb696eb8bc08862e91768cf3c
+EBUILD indilib-1.8.4.ebuild 1182 BLAKE2B 72992e4b51b92d044bb0d95ee05d5e9ee23c8cd5bc375df999b5166e5a6241150545cd6ed1de5281833a6218ed3ece509d9e907b1d439016d4d15f4d68578643 SHA512 a5a3f070a4cb27c38108b7adb2a58652d470e0d1880fd4a4381eca74ea0e4d08f8917604748cc5c7de37fd551a18f7bfec2904b58c6132c90b883678b6090a8d
 MISC metadata.xml 460 BLAKE2B b6ebdd49fefcbbb015e5856f0ad42682b5eda153b38b3d64f949d2c41274df269f292f25d5eb3be37a7acb039bab2d3d3b7744cfe7959472fe03425b53bd4282 SHA512 ff04501f56765165645695dda25db6bff677a6f676d3fa1d005ec0bc6fae7413e0fdd87d800b321fdd7a98f1d0cc829daa5a3d4d3bff849b6e164a5768c79c84
diff --git a/sci-libs/indilib/indilib-1.8.2-r2.ebuild b/sci-libs/indilib/indilib-1.8.4.ebuild
index 1efeceadfe82..c0ffca05006a 100644
--- a/sci-libs/indilib/indilib-1.8.2-r2.ebuild
+++ b/sci-libs/indilib/indilib-1.8.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="ogg test websocket"
 
 RDEPEND="
diff --git a/sci-libs/klu/Manifest b/sci-libs/klu/Manifest
index 94744add955f..3bcd5e563100 100644
--- a/sci-libs/klu/Manifest
+++ b/sci-libs/klu/Manifest
@@ -1,3 +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 620 BLAKE2B dc9d846658e801f3f74603292b837147af7b33e0f5c5816cb7cbb1366c10671e5ed7f1b4d4e6a80b8e1040340af3fc150e5f58ccbd5ef34609d6d4deaa545dcf SHA512 046556302481485fdf48e8a44395ee4963d21c00318f5bf136f238db76a401f8ffc2f6e35b97e2f86d23f4ad3ae69c81939056e7a97d2d3e83b7f7c17fe7077f
 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
new file mode 100644
index 000000000000..14645153cd81
--- /dev/null
+++ b/sci-libs/klu/klu-1.3.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Sparse LU factorization for circuit simulation"
+HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc static-libs"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( virtual/latex-base )"
+DEPEND="
+	>=sci-libs/amd-2.4
+	>=sci-libs/btf-1.2
+	>=sci-libs/colamd-2.9"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with doc)
+}
diff --git a/sci-libs/lapack-reference/Manifest b/sci-libs/lapack-reference/Manifest
index 97a04ce0a5eb..a44996bf100f 100644
--- a/sci-libs/lapack-reference/Manifest
+++ b/sci-libs/lapack-reference/Manifest
@@ -7,7 +7,7 @@ DIST lapack-3.2.1.tgz 4792502 BLAKE2B e9d39c958406db05383ebda7e781ae6c2d0b1f3896
 DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01f5ab237dc0d941792ceb54dbd2f8dc22d56286f5dab3499289ed94e67521ea951a98973c9640abc294ad6c SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8
 DIST lapack-3.7.0.tgz 7359812 BLAKE2B 20aa42e22d8c920d1360afe41ceec7b36f6cd5fbe43ca9d7848ef7cc45a64a0314cb1321941c1a7c03654f41e28ec805445882ded0ca0ea07674e70b66cba6b5 SHA512 e4f4c7d0ba8a096eeb813160c6dbcdd535647df6b2ad5beac9181908158956b31d1a9554ec9b9836fd44fe7404c1f377b297cbb20d744f20d70e357fd246c91b
 DIST lapack-reference-3.2.1-autotools.patch.bz2 13338 BLAKE2B 1be1d2c273b92a106a9c914f17e0350b44fc42b3837ee48b040d7a61802bf5036c30e8800ec613ccf12a082a7801cad6878b6ddcbd4db32e27a06b7462f8ecd2 SHA512 957e8c7646a0d6ade9c0dfdaf2aa665a01f932dfda376ba1db164106fb174793e6504cdbed7daf158f23bb69502937963cb2e2d45ac720980d3832f6fc0fedbd
-EBUILD lapack-reference-3.2.1-r4.ebuild 2822 BLAKE2B 85de6bf04f0f55e231895e5e9237d7f1f6d4e936ceebaa8b267a0fa088dd097f7a8b62a261f0387d0728e5315237c3f5b0db2acd186324ea4171e1ed54d62638 SHA512 d0bb06623d231e10e36429e6323739796e30e8c40e708584427c7c8ace02f3d3c41b0394129f8caa1be8a139f2d7e6425db5f8c2f7c14305ac811658ace7f19a
+EBUILD lapack-reference-3.2.1-r4.ebuild 2823 BLAKE2B a086405347206ed704889e793c05fe99488ee0dbefba609ea8a05913473e4c3b8aedafdeddd30261a33a9c98a140c508e3b06b675a80409fe3bf60a660dd174c SHA512 b6d3e0edf17e95b686201c278f0b1ef5bb4e55e1d42edc99edc462e0693c3fac2601e0705b8a2801d1b2267a283a67aa7abbc4867857b917cc338715885cb909
 EBUILD lapack-reference-3.6.0.ebuild 2622 BLAKE2B 1059d64fba18d9c91da283fd82b42baeefd6223bf18f04b3e7b38762b709b9335367a2af13ef1a3bd45cc228fc80b7ed2ccf12b67ee0b1513b92f12ebc14b2c1 SHA512 bdc1587e0e3d035bf5959e564ee3247531f286908dde35f8691c58c538d163895fdd40a9bf0a402aad1c370e5859b7c09c8ad44fc0934b5464a5082f463d0c79
 EBUILD lapack-reference-3.7.0.ebuild 2860 BLAKE2B a2c723501a2468be083de147ab99b7aff66ac02f4cdd72129dbf83df2881f64def8ae58cc5946478ddfde0cbb4a89f668d85301bb7c92c3686c08caabe205738 SHA512 c84d6f6650298f1d3b41cfa689c0b41ebdabecf7e9dddaa67b9069280c92fa0f73f1e115829a095e87ee3785f93fae4b5cf1c277c1251a8ca90ebdfc4496ff76
 MISC metadata.xml 779 BLAKE2B 64433bf79744cecd4ce505c3643ff73d3355620749b344ab27324c80ecb7b3ad9dd02a05dbbf1bd3e8174cac947c236d80f51377c259a1ff3aaa17b9908a8a0e SHA512 a72591749a3ea6ac49ce3a20d6934042c54e0b1639d00d585bdcc88cd9425d31135d8acc4ee33856f3933cc2518e5c7354d6debc20bbcc7b701cd6978f474e6f
diff --git a/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild b/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
index 9c83d4847260..b9ee0e8c6fee 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index d9dd41871e15..fdb64f5cd4ea 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,3 +1,4 @@
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
-EBUILD lapack-3.8.0.ebuild 2960 BLAKE2B 15840b6e805fd1fcd78efb9ca8e80439e02e72e2730a3b36af10725642edecfbdc764850bdd46e00981d0c930ede0362b6b5608b2233dfdd843d34c6735ed393 SHA512 293ea329ee66748b4eb2182eedc4d1ec3149645cf4170e6ca010e2782ea16e9638709f60d39130b9c8a2996bb459f40a62bfeefd19df89dbcf95031e38dd34d1
-MISC metadata.xml 1423 BLAKE2B 2ec6d7c07c4827cca666cddb7e7b2e47238ff3fd40fd5e15463196812a7a82e0b85e5d36ae2a2c3315c3b4e0b5f3d4a79a953cb1703836b20dc14862956bcf29 SHA512 39a5e8738999caaf00b4f7fcdb3afdd1405a7c817920b9247a76dbc64e06f8c2011763031a058673ac8a411cad2219cbd7c8664d379535e2afea72d2bd578fbe
+EBUILD lapack-3.8.0-r1.ebuild 3018 BLAKE2B 6db2da7db3213d7899b2becf2eebf348443d0730b5e3277545380aafdbc93bab9b75d5fa398e1daa7a4b4ed9740bb93138d3206c37ea6df89bc11b1e5d610cc4 SHA512 4e7762e8298aa856aeadb5496d578efcdef2b2ee3163b8ac8ad5423746a8a878475aa9629912bb2ddf00ebb81be68f4a0f2a67a098a052420dd1824a3d19fe6f
+EBUILD lapack-3.8.0.ebuild 2961 BLAKE2B 3dc6ec8426220f56b7d3df421bbfb9bb667121a8972b3b54ca6c299d45a78becd893d3d5567b09fc10f1846fce4842799624237c7194711c648c6d900afd49c5 SHA512 704b45f86f862c69ab68a6b6ec7f1ff610a64a662f6939dc18bbbb441b4b51e928a67a7b985bf835193e3add85f9d9a408ab86fdb47a4e3730be95156c02c77b
+MISC metadata.xml 1490 BLAKE2B bcb933b7cc3c3ae6f33e7c8ae9ef12475477ecd3351901cfba5dc955430def35df18e5ab41624cb99f2c1551fc38153138195e4e95ab40d3cf92e5685ce68fc5 SHA512 a99af3086d63488e7a2b8cda2f3727ce31eb0e62dd75a9cf64e44a203068866a06c7d6e119665e663c49a1afccb7a70982fd831735d958b73b6dcdf52c8ef5b1
diff --git a/sci-libs/lapack/lapack-3.8.0-r1.ebuild b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
new file mode 100644
index 000000000000..bf8ffd460297
--- /dev/null
+++ b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake-utils
+
+DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
+HOMEPAGE="http://www.netlib.org/lapack/"
+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"
+IUSE="lapacke deprecated doc eselect-ldso"
+# TODO: static-libs 64bit-index
+
+RDEPEND="
+	eselect-ldso? ( >=app-eselect/eselect-blas-0.2
+	>=app-eselect/eselect-lapack-0.2 )
+	!app-eselect/eselect-cblas
+	!sci-libs/blas-reference
+	!sci-libs/cblas-reference
+	!sci-libs/lapack-reference
+	!sci-libs/lapacke-reference
+	virtual/fortran
+	doc? ( app-doc/blas-docs )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCBLAS=ON
+		-DLAPACKE=$(usex lapacke)
+		-DBUILD_DEPRECATED=$(usex deprecated)
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use eselect-ldso || return
+	# Create private lib directory for eselect::blas (ld.so.conf)
+	dodir /usr/$(get_libdir)/blas/reference
+	dosym ../../libblas.so usr/$(get_libdir)/blas/reference/libblas.so
+	dosym ../../libblas.so.3 usr/$(get_libdir)/blas/reference/libblas.so.3
+	dosym ../../libcblas.so usr/$(get_libdir)/blas/reference/libcblas.so
+	dosym ../../libcblas.so.3 usr/$(get_libdir)/blas/reference/libcblas.so.3
+
+	# Create private lib directory for eselect::lapack (ld.so.conf)
+	dodir /usr/$(get_libdir)/lapack/reference
+	dosym ../../liblapack.so usr/$(get_libdir)/lapack/reference/liblapack.so
+	dosym ../../liblapack.so.3 usr/$(get_libdir)/lapack/reference/liblapack.so.3
+}
+
+pkg_postinst() {
+	use eselect-ldso || return
+
+	local me=reference libdir=$(get_libdir)
+	# check eselect-blas
+	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
+	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_blas} == ${me} || -z ${current_blas} ]]; then
+		eselect blas set ${libdir} ${me}
+		elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
+	else
+		elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
+		elog "To use blas [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect blas set ${libdir} ${me}"
+	fi
+
+	# check eselect-lapack
+	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
+	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_lapack} == ${me} || -z ${current_lapack} ]]; then
+		eselect lapack set ${libdir} ${me}
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+	else
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+		elog "To use lapack [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect lapack set ${libdir} ${me}"
+	fi
+}
+
+pkg_postrm() {
+	use eselect-ldso || return
+
+	eselect blas validate
+	eselect lapack validate
+}
diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild
index 7aee557bc78a..00c22e49a877 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/lapack/metadata.xml b/sci-libs/lapack/metadata.xml
index adc276993c4f..e4cd26e0166e 100644
--- a/sci-libs/lapack/metadata.xml
+++ b/sci-libs/lapack/metadata.xml
@@ -23,6 +23,7 @@ that has found extensive use in the scientific community.
 This package installs the reference FORTRAN 77 implementation from Netlib.
   </longdescription>
   <use>
+    <flag name="deprecated">Also build deprecated functions</flag>
     <flag name="lapacke">Build LAPACKE</flag>
     <flag name="eselect-ldso">Enable runtime library switching by
     eselect and ld.so.</flag>
diff --git a/sci-libs/ldl/Manifest b/sci-libs/ldl/Manifest
index 088917075b4e..33ba31a112a5 100644
--- a/sci-libs/ldl/Manifest
+++ b/sci-libs/ldl/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..6a1f2acf3873
--- /dev/null
+++ b/sci-libs/ldl/ldl-2.2.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Simple but educational LDL^T matrix factorization algorithm"
+HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+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"
+IUSE="doc static-libs"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( virtual/latex-base )"
+DEPEND="sci-libs/suitesparseconfig"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		$(use_with doc) \
+		$(use_enable static-libs static)
+}
diff --git a/sci-libs/libbraiding/Manifest b/sci-libs/libbraiding/Manifest
index 030ae07ca91f..b41a185a1ed9 100644
--- a/sci-libs/libbraiding/Manifest
+++ b/sci-libs/libbraiding/Manifest
@@ -1,3 +1,3 @@
 DIST libbraiding-1.0.tar.gz 377140 BLAKE2B 93520ca1af05dfe77028d3a8d94e94fb4b387662c0f71048db5aa8b1dcc4115996be2ac95108c01a574095cdaba97db1997a65e98a64f87230dda4ae1b6bd8cb SHA512 0fb389d4483b665165bf9ef8dc770b51884eb4ab576c4ca06944080d87ddae806bcf4ebee1fd586f97de171d2ec79c89aeef86ffdeac10eed49ffd0541989ee6
-EBUILD libbraiding-1.0.ebuild 788 BLAKE2B b3b3f125ac036094282c9ff3e8872e0fe1f031d4a9ef6a2b85178c169f0344b5924ab4813126cae5e8439e944e4680fe228c4f19928f8826094ebf775d3979f6 SHA512 c335145461408ee545d5dbcf4d9e8cfde2661f93640ac98340f924a56cc5857d29204c82bea18570104b6b4e03a9032bd776e4ab542c9c384cdae1c2d0db77af
+EBUILD libbraiding-1.0.ebuild 787 BLAKE2B 70a7d79780f451145b298c1a2955cef6e7c6a105241c5833284cf4e65933b0dbf9e057c7af8b6cb677403ca5303ed2a261abc8347bdbc84732c16a86e4fad24b SHA512 07133513b88cd231bc8ae369b9b7d2913bc0837b73a5ff0793c04e6f5792296f0d0edf7a1329af95a36c96071997871b58b11109177a9e4821fb32fc17e4d6b2
 MISC metadata.xml 1009 BLAKE2B 8dff16992db4a93811825eba4e52e60025c0981e8f1faf2077ae78800d730777e73239146e3356ab4cbc39c94c117715a2ebaccdf1e1a23e3a864bcc06b50a8b SHA512 f6fd4fbe425042627258bf02be878c40834858521daa8feba891ce04990910ba256dec5e550c69cf0791564c8eeef1219f6d0ffabc2dbcc879ee8a44c25a324d
diff --git a/sci-libs/libbraiding/libbraiding-1.0.ebuild b/sci-libs/libbraiding/libbraiding-1.0.ebuild
index 6f1b1b81a9af..c2f848f1a9bf 100644
--- a/sci-libs/libbraiding/libbraiding-1.0.ebuild
+++ b/sci-libs/libbraiding/libbraiding-1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://files.sagemath.org/spkg/upstream/${PN}/${P}.tar.gz"
 # oversight: https://github.com/jeanluct/cbraid/issues/4
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/sci-libs/libcerf/Manifest b/sci-libs/libcerf/Manifest
index c9c4dc8af3c0..2a9207d81fa1 100644
--- a/sci-libs/libcerf/Manifest
+++ b/sci-libs/libcerf/Manifest
@@ -1,3 +1,3 @@
 DIST libcerf-1.5.tgz 413926 BLAKE2B 1208c77658625d00d37f95f5dda9e07f99c91dc6b6fede4b8f936637dddd7450fa42c0ed3c8ff4c72bca0abe0195d6ebb58fdaa8c1bd535d8a488344fcccafad SHA512 bb97a1142d26dd2507a3fabc543accd5416f5ef3565bad6ea68ca8a62e13cb480b6e05bd8fe2215ed0133f43d4107fdc72efaedfcff7ffc0314492e97a92a8a3
-EBUILD libcerf-1.5.ebuild 808 BLAKE2B 8c9c73bc1ac1344ddb57540edce1d0b03701b4dc029d0fd87950fa00ca7c28ad51a26c157c7cfebb525cdbb4828b39a8b2a466bda4e2fd7da90a07e96547bdbf SHA512 5aa914f36e857c60177b6475cecc390b101542ba96adae66cf90f79ab71c4f82f3874ea47588fff41cb03959ae62f2cfe6dccdc5c63c8c9452880e6aefa3f6d3
+EBUILD libcerf-1.5.ebuild 809 BLAKE2B 3d81a43562d215ed052c370d0b381baee17a6d4fe4e0240d0972e284a4936a2817a7b5a1d08bdfbf6d2cd5d59cb874f54c07843e5d4091d4dd06e0672d5b6b29 SHA512 f1275560a5c7c861c7f3106b7af9b5df0c3c4d21b358576f109661213b5a1481bdf88351022103e7ff61b8d1365c4b7b1c92f1f9fc75bb34e39b575689927aa7
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/libcerf/libcerf-1.5.ebuild b/sci-libs/libcerf/libcerf-1.5.ebuild
index 3696b58fa32c..e254c3c379e4 100644
--- a/sci-libs/libcerf/libcerf-1.5.ebuild
+++ b/sci-libs/libcerf/libcerf-1.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index 47c1a81656b2..b13b3f8edbe9 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -1,6 +1,7 @@
-AUX libgeodecomp-0.4.0-lfa.patch 1548 BLAKE2B f5cce98b02e24bcf34ab803ea323351fe56fb382d388b20072b2a3dea5437392601efd39d6a388630f22b8533fb1b5071ed4438a41d1035e58ec9277ffcb542d SHA512 84761ef464e2b69d34718f148571a60edb4d9cb15d920b637b529850a922b284bec0375806e2f021544ccac5ad8645aeee0ee12299866c7179437057cceabdd6
-AUX libgeodecomp-0.4.0-libdir.patch 694 BLAKE2B 87b08665e9f1d236183f7bfaaf34ef5a9839e28f7a94a6b870fe99d19603b11f152227137202be5669c9f9cd2ba65b3f559eba9ca2460676f19c22e0911ab36e SHA512 fa8e0e08b45d9250d6f32e1a8ade6ff8bdb8acb7951115916cee7b6df600800f8aa64cfb92e13bb5b108af98e8ac2b1f127f34b415648ebe556a589bb11af68d
-AUX libgeodecomp-0.4.0-scotch.patch 7962 BLAKE2B e47365810132838ba0afc63dead520a17d866c0c6b5c2c2bf8f7299d688bcf10ef34ff19d1b29a29d3388101f082080b5943b037fdc9aedf937b392ffb46a68a SHA512 78d805aedb820b457ae01e5f35c530edf7de014cc60c640314cefb1cdfa88f54a6128fb56a81e974fed9d0620e56c31a8f97922d78e88d729bbf3c29c71f7f5d
-DIST libgeodecomp-0.4.0.tar.bz2 766090 BLAKE2B 2abc5d10371fbad92f957118cabd656f0b4938d5e102da6446851bd979debddaf5eba8a6321dffd32356a40ca12659d9a7a691929e71989e48a71e5177fedc51 SHA512 3ff1a45844e5879662012cb4bae5d577f30ee71094ed4063b535b0ac3da900f34a1bc25be524c006ff91e0edd665e46cbb6cfc0db7966eebfea30f9fee6eeddb
-EBUILD libgeodecomp-0.4.0-r1.ebuild 1434 BLAKE2B ee8d11d32eafe469a1d0ccf59203b8ff155d81909685d3b9abbde22f300d5ebd99960415fbe77a3bc3631299d4c426948ec8ed4522e22e35670e043080390ca4 SHA512 9c63b5d6d1a0b02482beab0c7db730f11bb8d067b0bc18057b75519152a5aebd5c328ec81271daf2878c16be090282289a445127f6c834ee68c5c3e5f4ee77fb
+AUX libgeodecomp-0.5.0_pre20200314-hpx.patch 9844 BLAKE2B 4f2fb08bdac5396bcc0fa6af26db15ee819bdeb541eb639d5de88158b57ac2acbba2bf021ce569bbfd60e42da481095cb9826912da67f53d01250f4d05f32395 SHA512 66fc7262a4f6a4cb84d5488bcf50e67fe0f62b4a24301bd7b4143b949f22ca1d5cd5dfb93be0e27221c2201d268eafda5099765ca812413b314d88b2b7c64fa6
+AUX libgeodecomp-0.5.0_pre20200314-libdir.patch 1070 BLAKE2B 6cd368ad278e879a07ea655207ef19010dbceadeccb3434689c98054a9157893c916e76ca4a16a2f7b343a395b2ecc05754e0bdf114b37f61eb598cf84d34cb4 SHA512 db9cd6a601771727ba66b629f6b15f03bfe8440e91df307f8c44e3706e6b07273b8cbbd88696c5f14261993a2e9a6c12d9931ef7293e68e7961ca0bc774afe48
+AUX libgeodecomp-0.5.0_pre20200314-mpi.patch 13752 BLAKE2B ed5e2cafc0c8777e30ecf7e3b896aab1226b110c948e984dabf15d0bb85fa931f6991e1c108e55bab4016131c6f142d589500004e4ac76cb840c41eb975f41ea SHA512 b33ddbe1e0293e14b9f6b2a982cf8717d5c6dbceb34c476a5896c2eb3776ecbac9e219f11b9aea6a10a108b1fae3a2b373976e7636ff80b0f381b6bd4e1b0722
+AUX libgeodecomp-0.5.0_pre20200314-warnings.patch 1111 BLAKE2B 2a06ca14fa8d12b1c1d6f56bedb5937c8e7aed00fa6c5f7bed42978c94164f17c00a1b71542b12348013c0ae9d30545c9ccebeac81e42af3c7ae9b583554bd21 SHA512 6c152fb43ae26f69dc0963f51a99e41d39ed2056cd88fd6771e516b64cdd77ae918d9726c9a1be72154c8a434b266bdba749c54cc13dfb768a8b9044c18ddc75
+DIST libgeodecomp-0.5.0_pre20200314.tar.gz 1506929 BLAKE2B 078a0d3384963b0d3b5e5885d794b4feb6493ab3c4d4df068c300769f6bd8ee1d695accec0f4a702b218d725cc68889450d7d4fbddd495387e75a6804bbd8de9 SHA512 5bc23ce68d91d3cb8ec753a09efc4d7c46aab3c307c529f2f2e09593d14bcb027532aeea32ba99ce524cc6dfb248e983a040f482a47784f5da6fb07aac06a859
+EBUILD libgeodecomp-0.5.0_pre20200314.ebuild 1767 BLAKE2B fafc8b73b2efe3269df78d720a5a5be895081859f768b609c0b683f4f62c1434eb1cc4e72c1060a6da6f2edeb8b4a1591461789152f44a851cba6f8244dcbb5f SHA512 bf7c98a48962e5e30d3713d850b0631133c4ab31110fb5f7d8f0fc4861838c4fe042c1993624a3863fbfb12dfab927178e29de1906bc9e0fa5284efc2635c844
 MISC metadata.xml 1345 BLAKE2B d6cb11021ade1a8c9007bf7a57c1e9355e19331498b66f746405bbd52dd5562656e827ab1db290190c37b283f579512609cf730d0ea27f6c31629d7e1fc38266 SHA512 f377ab4249dc9bb3dc2518e7d86ad6c2b44cd1249474480a5a71aa5b944c220ddc1608a8171d1abeaffa3d4628f4f327956cfb412ac14336f75705b7d8fe0fd9
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-lfa.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-lfa.patch
deleted file mode 100644
index 463d416b3bf6..000000000000
--- a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-lfa.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 673017f0..28704461 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -528,18 +528,20 @@ foreach(dir ${LIBDIRS})
- endforeach(dir)
- 
- # install libflatarray, too
--file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/*.hpp")
--foreach(i ${HEADERS})
--  install(FILES ${i} DESTINATION include/libflatarray)
--endforeach()
--file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/detail/*.hpp")
--foreach(i ${HEADERS})
--  install(FILES ${i} DESTINATION include/libflatarray/detail)
--endforeach()
--file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/testbed/*.hpp")
--foreach(i ${HEADERS})
--  install(FILES ${i} DESTINATION include/libflatarray/testbed)
--endforeach()
-+if(NOT libflatarray_FOUND)
-+  file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/*.hpp")
-+  foreach(i ${HEADERS})
-+    install(FILES ${i} DESTINATION include/libflatarray)
-+  endforeach()
-+  file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/detail/*.hpp")
-+  foreach(i ${HEADERS})
-+    install(FILES ${i} DESTINATION include/libflatarray/detail)
-+  endforeach()
-+  file(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../lib/libflatarray/src/testbed/*.hpp")
-+  foreach(i ${HEADERS})
-+    install(FILES ${i} DESTINATION include/libflatarray/testbed)
-+  endforeach()
-+endif()
- 
- # link against the libs we need
- set(INSTALLER_LINK_FLAGS "-L${CMAKE_INSTALL_PREFIX}/${LIB_DIR} -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/${LIB_DIR} -lgeodecomp ")
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-hpx.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-hpx.patch
new file mode 100644
index 000000000000..9f71ea087c69
--- /dev/null
+++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-hpx.patch
@@ -0,0 +1,246 @@
+From fe581cc24805288c6c1a9b26a4b72748906f16c8 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Thu, 26 Mar 2020 15:58:46 +0100
+Subject: [PATCH] hpx: Remove use of deprecated header
+
+The current hpx version is v1.4. Remove the usage of deprecated hpx headers and
+make it compile again.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ src/libgeodecomp/communication/hpxreceiver.h             | 5 ++---
+ src/libgeodecomp/communication/hpxserializationwrapper.h | 8 ++++----
+ .../communication/test/parallel_hpx_4/hpxreceivertest.h  | 5 ++---
+ src/libgeodecomp/geometry/coord.h                        | 4 ++--
+ src/libgeodecomp/io/mocksteerer.h                        | 5 +++++
+ src/libgeodecomp/io/mockwriter.h                         | 5 +++++
+ src/libgeodecomp/misc/clonable.h                         | 2 +-
+ src/libgeodecomp/misc/nonpodtestcell.h                   | 2 +-
+ src/libgeodecomp/parallelization/hpxsimulator.cpp        | 2 +-
+ src/libgeodecomp/parallelization/hpxsimulator.h          | 9 ++++-----
+ src/libgeodecomp/storage/displacedgrid.h                 | 4 ++--
+ src/libgeodecomp/storage/grid.h                          | 4 ++--
+ src/libgeodecomp/storage/patchprovider.h                 | 3 ++-
+ .../storage/test/unit/reorderingunstructuredgridtest.h   | 4 ++--
+ 14 files changed, 35 insertions(+), 27 deletions(-)
+
+diff --git a/src/libgeodecomp/communication/hpxreceiver.h b/src/libgeodecomp/communication/hpxreceiver.h
+index 1a0baf9bbdee..beb657b88bbc 100644
+--- a/src/libgeodecomp/communication/hpxreceiver.h
++++ b/src/libgeodecomp/communication/hpxreceiver.h
+@@ -10,10 +10,9 @@
+ 
+ #include <hpx/include/components.hpp>
+ #include <hpx/include/lcos.hpp>
+-#include <hpx/lcos/broadcast.hpp>
+-#include <hpx/lcos/local/receive_buffer.hpp>
++#include <hpx/collectives/broadcast.hpp>
++#include <hpx/local_lcos/receive_buffer.hpp>
+ #include <hpx/runtime/get_ptr.hpp>
+-#include <hpx/util/unwrapped.hpp>
+ #include <libgeodecomp/communication/hpxserializationwrapper.h>
+ #include <libgeodecomp/misc/stringops.h>
+ 
+diff --git a/src/libgeodecomp/communication/hpxserializationwrapper.h b/src/libgeodecomp/communication/hpxserializationwrapper.h
+index 5ebf06c4cf7c..0afb145840a6 100644
+--- a/src/libgeodecomp/communication/hpxserializationwrapper.h
++++ b/src/libgeodecomp/communication/hpxserializationwrapper.h
+@@ -10,10 +10,10 @@
+  * just pull in this header.
+  */
+ #include <libgeodecomp/communication/hpxserialization.h>
+-#include <hpx/runtime/serialization/map.hpp>
+-#include <hpx/runtime/serialization/serialize.hpp>
+-#include <hpx/runtime/serialization/shared_ptr.hpp>
+-#include <hpx/runtime/serialization/vector.hpp>
++#include <hpx/serialization/map.hpp>
++#include <hpx/serialization/serialize.hpp>
++#include <hpx/serialization/shared_ptr.hpp>
++#include <hpx/serialization/vector.hpp>
+ 
+ #endif
+ 
+diff --git a/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h b/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h
+index ab16a0947546..b2f9c6d47559 100644
+--- a/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h
++++ b/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h
+@@ -1,9 +1,8 @@
+ #include <cxxtest/TestSuite.h>
+ #include <hpx/hpx.hpp>
+-#include <hpx/lcos/broadcast.hpp>
++#include <hpx/collectives/broadcast.hpp>
+ #include <hpx/runtime/components/component_factory.hpp>
+-#include <hpx/runtime/serialization/serialize_buffer.hpp>
+-#include <hpx/util/unwrapped.hpp>
++#include <hpx/serialization/serialize_buffer.hpp>
+ #include <libgeodecomp/communication/hpxreceiver.h>
+ #include <libgeodecomp/misc/stringops.h>
+ 
+diff --git a/src/libgeodecomp/geometry/coord.h b/src/libgeodecomp/geometry/coord.h
+index 5df21310d3ee..8772980c52df 100644
+--- a/src/libgeodecomp/geometry/coord.h
++++ b/src/libgeodecomp/geometry/coord.h
+@@ -10,8 +10,8 @@
+ #ifdef LIBGEODECOMP_WITH_HPX
+ #include <libgeodecomp/misc/cudaboostworkaround.h>
+ #include <hpx/config.hpp>
+-#include <hpx/runtime/serialization/array.hpp>
+-#include <hpx/runtime/serialization/serialize.hpp>
++#include <hpx/serialization/array.hpp>
++#include <hpx/serialization/serialize.hpp>
+ #endif
+ 
+ // For Intel MPI we need to source mpi.h before stdio.h:
+diff --git a/src/libgeodecomp/io/mocksteerer.h b/src/libgeodecomp/io/mocksteerer.h
+index 4ab2d28c5097..e20d0d5bb6bf 100644
+--- a/src/libgeodecomp/io/mocksteerer.h
++++ b/src/libgeodecomp/io/mocksteerer.h
+@@ -4,6 +4,11 @@
+ #include <sstream>
+ #include <libgeodecomp/io/steerer.h>
+ 
++#ifdef LIBGEODECOMP_WITH_HPX
++#include <hpx/include/threads.hpp>
++#include <hpx/concurrency/spinlock.hpp>
++#endif
++
+ namespace LibGeoDecomp {
+ 
+ namespace MockSteererHelpers {
+diff --git a/src/libgeodecomp/io/mockwriter.h b/src/libgeodecomp/io/mockwriter.h
+index 4d6d13c93acb..36cb7e1e1ae6 100644
+--- a/src/libgeodecomp/io/mockwriter.h
++++ b/src/libgeodecomp/io/mockwriter.h
+@@ -8,6 +8,11 @@
+ #include <libgeodecomp/misc/clonable.h>
+ #include <libgeodecomp/misc/testcell.h>
+ 
++#ifdef LIBGEODECOMP_WITH_HPX
++#include <hpx/include/threads.hpp>
++#include <hpx/concurrency/spinlock.hpp>
++#endif
++
+ #include <sstream>
+ 
+ namespace LibGeoDecomp {
+diff --git a/src/libgeodecomp/misc/clonable.h b/src/libgeodecomp/misc/clonable.h
+index 8162513826b8..a1dccbf94bd3 100644
+--- a/src/libgeodecomp/misc/clonable.h
++++ b/src/libgeodecomp/misc/clonable.h
+@@ -5,7 +5,7 @@
+ 
+ #ifdef LIBGEODECOMP_WITH_HPX
+ #include <libgeodecomp/misc/cudaboostworkaround.h>
+-#include <hpx/runtime/serialization/base_object.hpp>
++#include <hpx/serialization/base_object.hpp>
+ #endif
+ 
+ namespace LibGeoDecomp {
+diff --git a/src/libgeodecomp/misc/nonpodtestcell.h b/src/libgeodecomp/misc/nonpodtestcell.h
+index 66453ce80ba7..1618c8359b90 100644
+--- a/src/libgeodecomp/misc/nonpodtestcell.h
++++ b/src/libgeodecomp/misc/nonpodtestcell.h
+@@ -11,7 +11,7 @@
+ #endif
+ 
+ #ifdef LIBGEODECOMP_WITH_HPX
+-#include <hpx/runtime/serialization/set.hpp>
++#include <hpx/serialization/set.hpp>
+ #endif
+ 
+ namespace LibGeoDecomp {
+diff --git a/src/libgeodecomp/parallelization/hpxsimulator.cpp b/src/libgeodecomp/parallelization/hpxsimulator.cpp
+index 6e2fb6c78519..0329d6815913 100644
+--- a/src/libgeodecomp/parallelization/hpxsimulator.cpp
++++ b/src/libgeodecomp/parallelization/hpxsimulator.cpp
+@@ -3,7 +3,7 @@
+ 
+ #include <libgeodecomp/parallelization/hpxsimulator.h>
+ #include <hpx/include/lcos.hpp>
+-#include <hpx/lcos/broadcast.hpp>
++#include <hpx/collectives/broadcast.hpp>
+ 
+ namespace LibGeoDecomp {
+ namespace HpxSimulatorHelpers {
+diff --git a/src/libgeodecomp/parallelization/hpxsimulator.h b/src/libgeodecomp/parallelization/hpxsimulator.h
+index 1ccdf883e915..15b5a3628f9d 100644
+--- a/src/libgeodecomp/parallelization/hpxsimulator.h
++++ b/src/libgeodecomp/parallelization/hpxsimulator.h
+@@ -6,11 +6,10 @@
+ 
+ #include <libgeodecomp/misc/cudaboostworkaround.h>
+ #include <hpx/config.hpp>
+-#include <hpx/runtime/serialization/set.hpp>
+-#include <hpx/runtime/serialization/string.hpp>
+-#include <hpx/runtime/serialization/vector.hpp>
+-#include <hpx/include/lcos.hpp>
+-#include <hpx/lcos/broadcast.hpp>
++#include <hpx/serialization/set.hpp>
++#include <hpx/serialization/string.hpp>
++#include <hpx/serialization/vector.hpp>
++#include <hpx/collectives/broadcast.hpp>
+ 
+ #include <libgeodecomp/communication/hpxserializationwrapper.h>
+ #include <libgeodecomp/geometry/partitions/stripingpartition.h>
+diff --git a/src/libgeodecomp/storage/displacedgrid.h b/src/libgeodecomp/storage/displacedgrid.h
+index 5c72e520ce48..a8831053fedc 100644
+--- a/src/libgeodecomp/storage/displacedgrid.h
++++ b/src/libgeodecomp/storage/displacedgrid.h
+@@ -19,8 +19,8 @@
+ #ifdef LIBGEODECOMP_WITH_HPX
+ #include <libgeodecomp/misc/cudaboostworkaround.h>
+ #include <libgeodecomp/communication/hpxserializationwrapper.h>
+-#include <hpx/runtime/serialization/input_archive.hpp>
+-#include <hpx/runtime/serialization/output_archive.hpp>
++#include <hpx/serialization/input_archive.hpp>
++#include <hpx/serialization/output_archive.hpp>
+ #endif
+ 
+ namespace LibGeoDecomp {
+diff --git a/src/libgeodecomp/storage/grid.h b/src/libgeodecomp/storage/grid.h
+index 6e218696f625..821b02002c87 100644
+--- a/src/libgeodecomp/storage/grid.h
++++ b/src/libgeodecomp/storage/grid.h
+@@ -26,8 +26,8 @@
+ #ifdef LIBGEODECOMP_WITH_HPX
+ #include <libgeodecomp/misc/cudaboostworkaround.h>
+ #include <libgeodecomp/communication/hpxserializationwrapper.h>
+-#include <hpx/runtime/serialization/input_archive.hpp>
+-#include <hpx/runtime/serialization/output_archive.hpp>
++#include <hpx/serialization/input_archive.hpp>
++#include <hpx/serialization/output_archive.hpp>
+ #endif
+ 
+ namespace LibGeoDecomp {
+diff --git a/src/libgeodecomp/storage/patchprovider.h b/src/libgeodecomp/storage/patchprovider.h
+index 71fda8091e95..66aa67f214fa 100644
+--- a/src/libgeodecomp/storage/patchprovider.h
++++ b/src/libgeodecomp/storage/patchprovider.h
+@@ -2,7 +2,8 @@
+ #define LIBGEODECOMP_STORAGE_PATCHPROVIDER_H
+ 
+ #ifdef LIBGEODECOMP_WITH_HPX
+-#include <hpx/lcos/local/spinlock.hpp>
++#include <hpx/include/threads.hpp>
++#include <hpx/synchronization/spinlock.hpp>
+ #include <mutex>
+ #endif
+ 
+diff --git a/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h b/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h
+index d89146a4bf69..7cb5203dae44 100644
+--- a/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h
++++ b/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h
+@@ -19,8 +19,8 @@
+ #ifdef LIBGEODECOMP_WITH_HPX
+ #include <libgeodecomp/misc/cudaboostworkaround.h>
+ #include <libgeodecomp/communication/hpxserializationwrapper.h>
+-#include <hpx/runtime/serialization/input_archive.hpp>
+-#include <hpx/runtime/serialization/output_archive.hpp>
++#include <hpx/serialization/input_archive.hpp>
++#include <hpx/serialization/output_archive.hpp>
+ #endif
+ 
+ using namespace LibGeoDecomp;
+-- 
+2.24.1
+
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-libdir.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-libdir.patch
index 39da128feff8..d76930d83ca1 100644
--- a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-libdir.patch
+++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-libdir.patch
@@ -1,11 +1,21 @@
+From b03cef449361bef6d65f40382227714e0e0980c3 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Fri, 21 Feb 2020 19:47:51 +0100
+Subject: [PATCH] cmake: Fix library installation directory
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ src/CMakeLists.txt | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0666f1d..673017f 100644
+index b82d667087ba..f4ea6b379ec7 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -509,11 +509,12 @@ endif()
+@@ -335,11 +335,12 @@ endif()
  target_link_libraries(geodecomp ${LIBGEODECOMP_LINK_LIBRARIES})
  
- #============= 10. INSTALLER CONFIG ==================================
+ #============= 6. INSTALLER CONFIG ===================================
 +include(GNUInstallDirs)
  install(
    TARGETS geodecomp
@@ -17,3 +27,6 @@ index 0666f1d..673017f 100644
  
  install(FILES "${CMAKE_BINARY_DIR}/${PACKAGE_NAME}/config.h" DESTINATION include/${PACKAGE_NAME})
  install(FILES libgeodecomp.h DESTINATION include)
+-- 
+2.24.1
+
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-mpi.patch
index 774293f34c4a..1a1164e342be 100644
--- a/sci-libs/libgeodecomp/files/libgeodecomp-0.4.0-scotch.patch
+++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-mpi.patch
@@ -1,8 +1,48 @@
+From 55356ab9c03cd25efeb5176761f2f5b3744b4371 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Fri, 24 Jan 2020 17:59:48 +0100
+Subject: [PATCH] cmake: Disable mpiruns
+
+The mpiruns will violate the sandboxing. Therefore, disable them including
+scotch.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ CMakeLists.txt                |  14 +-
+ CMakeModules/FindSCOTCH.cmake | 238 +++++++++++++++++-----------------
+ 2 files changed, 121 insertions(+), 131 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ed5cc607c3ed..fec488002958 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -238,19 +238,9 @@ if (MACHINE_ARCH MATCHES "x86_64")
+   set(AMD64_LINUX true)
+ endif()
+ 
+-# test if mpirun/mpiexec supports the  --oversubscribe flag:
++# use the --oversubscribe flag:
+ if(MPI_FOUND)
+-  execute_process(
+-    COMMAND ${MPIEXEC} --oversubscribe ${MPIEXEC_NUMPROC_FLAG} 4 echo ok
+-    RESULT_VARIABLE MPIEXEC_OVERSUBSCRIBE_RETURN_CODE
+-    OUTPUT_QUIET
+-    ERROR_QUIET)
+-
+-  if (MPIEXEC_OVERSUBSCRIBE_RETURN_CODE EQUAL 0)
+-    set(MPIEXEC_OVERSUBSCRIBE_FLAG "--oversubscribe")
+-  else()
+-    set(MPIEXEC_OVERSUBSCRIBE_FLAG "")
+-  endif()
++  set(MPIEXEC_OVERSUBSCRIBE_FLAG "--oversubscribe")
+ endif()
+ 
+ #============= 3. CONFIGURABLE BUILD OPTIONS =========================
 diff --git a/CMakeModules/FindSCOTCH.cmake b/CMakeModules/FindSCOTCH.cmake
-index 9f22b8d..0755470 100644
+index 5c717977dbba..146c2bf8bb60 100644
 --- a/CMakeModules/FindSCOTCH.cmake
 +++ b/CMakeModules/FindSCOTCH.cmake
-@@ -232,81 +232,83 @@ int main() {
+@@ -233,125 +233,125 @@ int main() {
  ")
  
      message(STATUS "Performing test SCOTCH_TEST_RUNS")
@@ -81,8 +121,50 @@ index 9f22b8d..0755470 100644
 -
 -      endif()
 -    endif()
-+    set(SCOTCH_TEST_RUNS FALSE)
-+    message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed")
+-
+-    if(NOT SCOTCH_TEST_RUNS)
+-      if (NOT BZIP2_FOUND)
+-        find_package(BZip2)
+-      endif()
+-
+-      if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
+-        set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${BZIP2_INCLUDE_DIR})
+-        set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${BZIP2_LIBRARIES})
+-
+-        message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS")
+-        try_run(
+-          SCOTCH_BZIP2_TEST_LIB_EXITCODE
+-          SCOTCH_BZIP2_TEST_LIB_COMPILED
+-          ${CMAKE_CURRENT_BINARY_DIR}
+-          ${SCOTCH_TEST_LIB_CPP}
+-          CMAKE_FLAGS
+-                  "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
+-                  "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
+-          COMPILE_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT
+-          RUN_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_OUTPUT
+-          )
+-
+-        # Add zlib flags if required and set test run to 'true'
+-        if (SCOTCH_BZIP2_TEST_LIB_COMPILED AND SCOTCH_BZIP2_TEST_LIB_EXITCODE EQUAL 0)
+-          message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Success")
+-          set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR})
+-          set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${BZIP2_LIBRARIES})
+-          set(SCOTCH_TEST_RUNS TRUE)
+-        else()
+-          message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Failed")
+-          if (SCOTCH_DEBUG)
+-            message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+-                           "SCOTCH_BZIP2_TEST_LIB_COMPILED = ${SCOTCH_BZIP2_TEST_LIB_COMPILED}")
+-            message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+-                           "SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT}")
+-            message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+-                           "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
+-            message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
+-                           "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
+-          endif()
+-        endif()
+-      endif()
+-    endif()
 +    # try_run(
 +    #   SCOTCH_TEST_LIB_EXITCODE
 +    #   SCOTCH_TEST_LIB_COMPILED
@@ -158,6 +240,53 @@ index 9f22b8d..0755470 100644
 +
 +    #   endif()
 +    # endif()
++
++    # if(NOT SCOTCH_TEST_RUNS)
++    #   if (NOT BZIP2_FOUND)
++    #     find_package(BZip2)
++    #   endif()
++
++    #   if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
++    #     set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${BZIP2_INCLUDE_DIR})
++    #     set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${BZIP2_LIBRARIES})
++
++    #     message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS")
++    #     try_run(
++    #       SCOTCH_BZIP2_TEST_LIB_EXITCODE
++    #       SCOTCH_BZIP2_TEST_LIB_COMPILED
++    #       ${CMAKE_CURRENT_BINARY_DIR}
++    #       ${SCOTCH_TEST_LIB_CPP}
++    #       CMAKE_FLAGS
++    #               "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
++    #               "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
++    #       COMPILE_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT
++    #       RUN_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_OUTPUT
++    #       )
++
++    #     # Add zlib flags if required and set test run to 'true'
++    #     if (SCOTCH_BZIP2_TEST_LIB_COMPILED AND SCOTCH_BZIP2_TEST_LIB_EXITCODE EQUAL 0)
++    #       message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Success")
++    #       set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR})
++    #       set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${BZIP2_LIBRARIES})
++    #       set(SCOTCH_TEST_RUNS TRUE)
++    #     else()
++    #       message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Failed")
++    #       if (SCOTCH_DEBUG)
++    #         message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++    #                        "SCOTCH_BZIP2_TEST_LIB_COMPILED = ${SCOTCH_BZIP2_TEST_LIB_COMPILED}")
++    #         message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++    #                        "SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT}")
++    #         message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++    #                        "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
++    #         message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
++    #                        "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
++    #       endif()
++    #     endif()
++    #   endif()
++    # endif()
+ 
    endif()
  endif()
- 
+-- 
+2.24.1
+
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-warnings.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-warnings.patch
new file mode 100644
index 000000000000..2a7acd0c655b
--- /dev/null
+++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200314-warnings.patch
@@ -0,0 +1,33 @@
+From 87e1918e13fa3f3124e945a0ea12cfb339ddf303 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Thu, 26 Mar 2020 16:05:02 +0100
+Subject: [PATCH] hpx: receiver: Remove std::move() call
+
+This fixes the following warning:
+
+|/home/kurt/git/libgeodecomp/src/libgeodecomp/communication/hpxreceiver.h:138:29: warning: moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
+|  138 |         return std::move(vec);
+
+The compiler should be smart enough to optimize the correct way :).
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ src/libgeodecomp/communication/hpxreceiver.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libgeodecomp/communication/hpxreceiver.h b/src/libgeodecomp/communication/hpxreceiver.h
+index beb657b88bbc..28de314d5ef5 100644
+--- a/src/libgeodecomp/communication/hpxreceiver.h
++++ b/src/libgeodecomp/communication/hpxreceiver.h
+@@ -135,7 +135,7 @@ public:
+             vec << receiver->get(i).get();
+         }
+ 
+-        return std::move(vec);
++        return vec;
+     }
+ 
+ private:
+-- 
+2.24.1
+
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200314.ebuild
index 098ddbd3a50d..90abc7144a36 100644
--- a/sci-libs/libgeodecomp/libgeodecomp-0.4.0-r1.ebuild
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200314.ebuild
@@ -3,16 +3,20 @@
 
 EAPI=7
 
-inherit cmake cuda
+inherit cmake cuda virtualx
+
+MY_COMMIT="09529db4b3f458f93a0240be578d1da6f1c2dc21"
 
 DESCRIPTION="An auto-parallelizing library to speed up computer simulations"
-HOMEPAGE="http://www.libgeodecomp.org"
-SRC_URI="http://www.libgeodecomp.org/archive/${P}.tar.bz2"
+HOMEPAGE="
+	http://www.libgeodecomp.org
+	https://github.com/STEllAR-GROUP/libgeodecomp"
+SRC_URI="https://github.com/STEllAR-GROUP/libgeodecomp/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Boost-1.0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="cuda doc hpx mpi opencl opencv silo"
+IUSE="cuda doc hpx mpi opencl opencv qt5 silo"
 
 BDEPEND="
 	doc? (
@@ -20,21 +24,29 @@ BDEPEND="
 		app-text/texlive
 		media-gfx/graphviz
 		)"
-RDEPEND=">=dev-libs/boost-1.48"
+RDEPEND="dev-libs/boost"
 DEPEND="${RDEPEND}
+	~dev-libs/libflatarray-0.4.0_pre20200314
+	cuda? ( dev-util/nvidia-cuda-toolkit )
 	hpx? ( sys-cluster/hpx )
-	<dev-libs/libflatarray-0.3.0
 	mpi? ( virtual/mpi )
-	cuda? ( dev-util/nvidia-cuda-toolkit )
 	opencl? ( virtual/opencl )
 	opencv? ( media-libs/opencv )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
 	silo? ( sci-libs/silo )"
 
-S="${WORKDIR}/${P}"
+S="${WORKDIR}/libgeodecomp-${MY_COMMIT}"
+
 PATCHES=(
-	"${FILESDIR}/${P}-scotch.patch"
+	"${FILESDIR}/${P}-hpx.patch"
 	"${FILESDIR}/${P}-libdir.patch"
-	"${FILESDIR}/${P}-lfa.patch"
+	"${FILESDIR}/${P}-mpi.patch"
+	"${FILESDIR}/${P}-warnings.patch"
 )
 
 src_prepare() {
@@ -44,15 +56,16 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_MPI=$(usex mpi)
 		-DWITH_CUDA=$(usex cuda)
+		-DWITH_HPX=$(usex hpx)
+		-DWITH_MPI=$(usex mpi)
 		-DWITH_OPENCL=$(usex opencl)
 		-DWITH_OPENCV=$(usex opencv)
-		-DWITH_SILO=$(usex silo)
+		-DWITH_QT5=$(usex qt5)
 		-DWITH_SCOTCH=false
-		-DWITH_HPX=$(usex hpx)
-		-DWITH_VISIT=false
+		-DWITH_SILO=$(usex silo)
 		-DWITH_TYPEMAPS=false
+		-DWITH_VISIT=false
 	)
 	cmake_src_configure
 }
@@ -69,5 +82,5 @@ src_install() {
 }
 
 src_test() {
-	cmake_build check
+	virtx cmake_build check
 }
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index 5dec6b95bece..110c8c1b0b09 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1,6 +1,5 @@
 AUX Doxyfile 9282 BLAKE2B 0dcda644c528df5bd495db1785ce0f3213f0ce0c3551205e9c043a52151b59e82704545d55521f1983ca2b77a93c20dc0e9ddcc6b446a6485e942f301e19e165 SHA512 cc0324c682d5f45f516f0a71311a9b6527c5c4cd6c1a4113503ad9023b72c64ef9c257008cda95d565723183f932f61f79aab73e123e7b7ecf8b7fdb30457fee
-DIST libgeotiff-1.4.1.tar.gz 1674928 BLAKE2B 6c83ca77728c40995bf262d165c8566573c995f0d0116a3756f688b5686ff6529295d3340afdd771268c80050fb81b10953f7ae7339c46ed23d44dbd73cf302d SHA512 4a68bd7b9adf7453fdcb8f98cdeb79289b5f21315d1ef91d54fcc01724c8d687d243826c05a5523bb08c930296335959d2290916d46b6d802e63ac9be727c628
+AUX libgeotiff-1.5.1-proj-6.2-tests.patch 2102 BLAKE2B 643afa6f1a39a1990307c50415ded096ce08cf0cb88f70206c3e471cbdd2d619d61e3bd08aecfcb8a2fbf7deafdd773768e9cfb80ffcde0aaa05d4a96e3cacaf SHA512 f4c8fadce30f3ade704cc38b1646beefbc3676e9f68e06067e89617fe584b3f2a2b13615e5e8949c6a1ec4d88fcf4937922d8d47f498f1feefddb096b17df51b
 DIST libgeotiff-1.5.1.tar.gz 528083 BLAKE2B 24dd812c4b12a942b21640c031fd890bb2151f6dfedfd98d0b54cf41d6341ee4d352edd427d350f36542169f822a360f8d0c9f3bb13019a422db77f43e7bd893 SHA512 6599ec89dd39d975ba389584778dd084ded628d3304b302e3af25bb7d156cf583c56b52f1c89c253b041df43f99d6893190ee1556398dab1ba044f12ef8b8dc1
-EBUILD libgeotiff-1.4.1-r1.ebuild 1282 BLAKE2B 878dfb3f73781cd4d799900bcb556bd0c3080e1b7c57854a09f058614162bd0fcf84070ff277b9184e7d670b272190199a6f7a8597e369c819ab24fb64a6d051 SHA512 f1faee1223815f7ade357a1f2d3d32a8da3b7b491da69548dc2183948fdf334234b0542cced920bc5a8cc231a790881ae22a3e078bf31be06d0981b2badcb30a
-EBUILD libgeotiff-1.5.1-r1.ebuild 1285 BLAKE2B 20670f3f191b57c775ac89de77d7c10018f5af38017addf1e5191c25ebf57b7340d1b50e6ac64d0683ace80c43198b42a9d7ea2b1ca174b8f2e7d0c3d015b9a1 SHA512 958b9790b8a23417d80fca53af5f772fc3f754f5052256ed24c759f198424bd1454c2b2b89b2cf2422ef3d106a076a27fcabc87124a627cf89c7c0423cff9904
+EBUILD libgeotiff-1.5.1-r1.ebuild 1337 BLAKE2B 42db8b2918566dfb5ac357f4f52c37cce9bea0b0db94c8a5debec154f5bec3bc429be55c11ca932f09acb4cf10acde6efffa62ae43e600068ac613b22bf509ef SHA512 017990200b71efda4294f80791e340f4bfe6dd2296e20b79c980b783242c5035f716ef9d166bb6e7f97d3f2c242c2d67559f9c7f9bff0db428f5e7c2326adfbc
 MISC metadata.xml 275 BLAKE2B 054c49c4cc7e0607212f55ec7e66b38585457f74ce21e0483503814df58d31dee0b784e9b0bd9cdf0c8fca04e7454bd1b515085e5aac2c0d7fd2700df08c9b26 SHA512 5877508750864819a1d129ac2406c0d11721cd0e4e64d55c9bd6a44649991fda435e7752e841cca94b348f74078226f12e90dcdd323915bce3d601e65865c225
diff --git a/sci-libs/libgeotiff/files/libgeotiff-1.5.1-proj-6.2-tests.patch b/sci-libs/libgeotiff/files/libgeotiff-1.5.1-proj-6.2-tests.patch
new file mode 100644
index 000000000000..5004aadb9817
--- /dev/null
+++ b/sci-libs/libgeotiff/files/libgeotiff-1.5.1-proj-6.2-tests.patch
@@ -0,0 +1,57 @@
+From 678ffd97db2d63cf6856428bea65a93e069f812f Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Wed, 4 Sep 2019 16:11:37 +0200
+Subject: [PATCH] Adapt test script for PROJ 6.2 EPSG database (fixes #22)
+
+---
+ libgeotiff/test/testlistgeo          | 8 +++++++-
+ libgeotiff/test/testlistgeo_out.dist | 4 ++--
+ 3 files changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/test/testlistgeo b/test/testlistgeo
+index 7fb4a2f..571f5d0 100755
+--- a/test/testlistgeo
++++ b/test/testlistgeo
+@@ -210,10 +210,15 @@ echo "Testing listgeo equidistant_cylindrical.tif" >> ${OUT}
+ $EXE ${DATA_DIR}/equidistant_cylindrical.tif >>${OUT}
+ echo "" >>${OUT}
+ 
++# Normalize for results depending on the exact version of PROJ / EPSG database
++sed "s/ETRS89-extended/ETRS89/g" < ${OUT} > ${OUT}.tmp
++mv ${OUT}.tmp ${OUT}
++
++sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > testlistgeo_out.dist.tmp
+ 
+ # do 'diff' with distribution results
+ echo "diff ${OUT} with testlistgeo_out.dist"
+-diff -u ${OUT} ${TEST_CLI_DIR}/testlistgeo_out.dist
++diff -u ${OUT} testlistgeo_out.dist.tmp
+ if [ $? -ne 0 ] ; then
+     echo  ""
+     echo "PROBLEMS HAVE OCCURRED"
+@@ -224,6 +229,7 @@ else
+     echo "TEST OK"
+     echo "test file ${OUT} removed"
+     echo
++    rm testlistgeo_out.dist.tmp
+     /bin/rm -f ${OUT}
+     exit 0
+ fi
+diff --git a/test/testlistgeo_out.dist b/test/testlistgeo_out.dist
+index 68a948c..c157f00 100644
+--- a/test/testlistgeo_out.dist
++++ b/test/testlistgeo_out.dist
+@@ -1738,11 +1738,11 @@ Geotiff_Information:
+    Keyed_Information:
+       GTModelTypeGeoKey (Short,1): ModelTypeProjected
+       GTRasterTypeGeoKey (Short,1): RasterPixelIsArea
+-      ProjectedCSTypeGeoKey (Short,1): Code-3035 (ETRS89 / LAEA Europe)
++      ProjectedCSTypeGeoKey (Short,1): Code-3035 (ETRS89-extended / LAEA Europe)
+       End_Of_Keys.
+    End_Of_Geotiff.
+ 
+-PCS = 3035 (ETRS89 / LAEA Europe)
++PCS = 3035 (ETRS89-extended / LAEA Europe)
+ Projection = 19986 (Europe Equal Area 2001)
+ Projection Method: CT_LambertAzimEqualArea
+    ProjCenterLatGeoKey: 52.000000 ( 52d 0' 0.00"N)
diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild
deleted file mode 100644
index fe26ae0b2647..000000000000
--- a/sci-libs/libgeotiff/libgeotiff-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P=${P/_rc/RC}
-
-DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information"
-HOMEPAGE="http://geotiff.osgeo.org/"
-SRC_URI="http://download.osgeo.org/geotiff/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc static-libs"
-
-RDEPEND="
-	virtual/jpeg:=
-	>=media-libs/tiff-3.9.1:0
-	sci-libs/proj:=
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_P/RC*/}
-
-DOCS=( README ChangeLog )
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:-O3::g" \
-		configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--enable-debug=$(usex debug) \
-		--with-jpeg="${EPREFIX}"/usr/ \
-		--with-zip="${EPREFIX}"/usr/
-
-}
-src_compile() {
-	default
-
-	if use doc; then
-		mkdir -p docs/api || die
-		cp "${FILESDIR}"/Doxyfile Doxyfile || die
-		doxygen -u Doxyfile || die "updating doxygen config failed"
-		doxygen Doxyfile || die "docs generation failed"
-	fi
-}
-
-src_install() {
-	default
-
-	use doc && dohtml docs/api/*
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
index 7806a36e7258..58b7bdac277c 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/5"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs"
 
 BDEPEND="
@@ -25,6 +25,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-proj-6.2-tests.patch" )
+
 src_prepare() {
 	default
 	sed -e "s:-O3::g" -i configure.ac || die
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 0c753661aa35..75d915cf77fe 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -3,7 +3,7 @@ DIST libqalculate-0.9.9.tar.gz 1509180 BLAKE2B 3f309add80ddb6b21730eab25d37c2d8f
 DIST libqalculate-2.2.0.tar.gz 1717207 BLAKE2B 020ca544683ff140ab5f8256a5a955c895a6ea09a581e9e75ab6c0a0657886c352a1ec2d34400057fe80004481d3198998613113ca40fb4feebfca010445dced SHA512 e6f3693e4dba2beffca300b673657b90037a6b7acc5bbd4e659863f4f5aec148d6d385fc3c666b16b2be713d0a8ad1b4d7fda557cef0e2be340ca2435f62aae7
 DIST libqalculate-2.8.1.tar.gz 1961535 BLAKE2B 074d83a44cbc6cb5d8afe5121e4c34cec46f2f6fecf046f6b4e67c6ebc612030ccbd0f42c303cc675267374502ecb3e831c9bbfca0f13d339e31fb8933a99b7a SHA512 a258bf4f67db70263626ac77822afc75fd7a9e5af2feb1930314daff219865b28c43e82fef6ceae4f3f23957447d6eaebdc709e606d28457bca0f47eefb9274a
 DIST libqalculate-3.2.0.tar.gz 2035352 BLAKE2B 4ad9f1acaaa34693e3167514d16193b06af5a2d441946e636439cd9374c0061e0f20e72126a2cb020fed2e7c82e7144636a7eb545196bd6879af5a09320c3245 SHA512 6d0e1bbc1c9e4436208cd0ea855cc1d90b8a6d0525cd25bc9414db6e610e1e48aa84a9b552248926bd3c6f91db4997afb60658a5579502bac7194178e36fb857
-EBUILD libqalculate-0.9.9.ebuild 1440 BLAKE2B abc537650ccd40360434acb8d7e233c49796416d878ea7d2bbafd79bf11f16f2a77e0bb2e501259215deb4bf62891333a6f0aa6e503f5ef908b8229acca2343a SHA512 93c286c17cdf7dcbb5803871032ecc2def6ea4ba890f50f9e357c18363206873c63cb10eb77dde7a2eaf565b0f8e5af0054f951a51ccd37b483ac2b1949f031f
+EBUILD libqalculate-0.9.9.ebuild 1441 BLAKE2B 6e05f435d1d5d5a4c635a7ce59d88104f8af68714a9620c2f273451cb00d280edd578429943d0e9271d89286d56176216b360ebdcde1ac039795cd44ca1b2330 SHA512 0e976d34bdcb93d81ce132e8ada4e28d461d238b130ea1f357b6ed73947113a1b5f62e85a78cd01e7eefae232c42dde532b953f5077995a8bb65076146edfe47
 EBUILD libqalculate-2.2.0.ebuild 1349 BLAKE2B ea1df54be1d8970a19f229dcc268627ec760e586c3c9c5e9526c747d15d95b91cf3bb0fb90e56fda9191191a22ebd23728bb8921a6b608eae8fa5e7b149785ee SHA512 739d3946688533002637177352784a9884a08931ed9d70ec3012e76b3bfdb7d7831d54fc401e3e74ff4f73b1a015fc18c8cbbf8ee27913d5149c44094cdc16f8
 EBUILD libqalculate-2.8.1.ebuild 1438 BLAKE2B 0550f2dc76b323b0f6d6a20fbef66a7d65011ffb4747c0e1dd812a752d75fe2cdf57ad37ad8080a3d9336a12918ba0937a3be39899461e32b40933855410e8c8 SHA512 990790716b50742317fbd56ed110b69d1573fb89d1fdf3f735087c7364f576c6af4fd882c67c2d4d69e867555656976e2a5ba7607a4a483136d4200a616800c4
 EBUILD libqalculate-3.2.0-r1.ebuild 1441 BLAKE2B 2bbeab865e61e3bf0a14e94dbeaff047ff1cd21337e82d0b201fc3a79aae2a98fc6f09ab95596d1058b13739d831da19fa4ca94b8aae9a38cd60f885efdd90b7 SHA512 dfb669c337ecf1c80f831b1fc7c63df442c3a2c3c8fa729967adf921000fbd8f42414bf5a04fb049df87ed3824df23f9c52d15c8ac6d82b7cc4ff33056c725a7
diff --git a/sci-libs/libqalculate/libqalculate-0.9.9.ebuild b/sci-libs/libqalculate/libqalculate-0.9.9.ebuild
index adf535d9bf8a..19d324e74252 100644
--- a/sci-libs/libqalculate/libqalculate-0.9.9.ebuild
+++ b/sci-libs/libqalculate/libqalculate-0.9.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gnuplot readline static-libs"
 
 COMMON_DEPEND="
diff --git a/sci-libs/m4ri/Manifest b/sci-libs/m4ri/Manifest
index f40be85b044c..e8a7aadfd155 100644
--- a/sci-libs/m4ri/Manifest
+++ b/sci-libs/m4ri/Manifest
@@ -2,6 +2,8 @@ AUX m4ri-20200115-libm_underlinking.patch 2352 BLAKE2B 1c391a5d359585e8d6ffb6fa3
 AUX m4ri-20200115-memory_violation.patch 2905 BLAKE2B 08cdf9f22307f8477dd6dc5980d496cc56f4a7d625d83db77f1928417a1ba388c6a84c4866276bdad7ec4742b4dc102262e6f90c89a24423494e9877064f39d6 SHA512 70a32c5ec8e4c936b530e85d48d93e6f5d49122df658528c0fd74b3d812d25eef4d9826de3d01127bb717ecbdc20be23079d5805e3d767d225cd1cf24c321fde
 DIST m4ri-20140914.tar.gz 457978 BLAKE2B eadba6d1a751cb49cef25cc7726d87aa5746b23ad0a3b9bd274735a71da43ec4751fb655f91f3748f082369875508db365595f8443d77ae9645b3e4199d4f204 SHA512 efdd4ffa194d2d2b64a23a833420926613e74072ce62b2b06d768d157e134a615d88b93ed08d9f51f0fd14d686fd068523d1dc2c7cd9fb87108c96a4a11f4643
 DIST m4ri-20200115.tar.gz 510562 BLAKE2B 4522793ab61dd97dae5c8d82a4457364f437040c9c45c355007a3150bfebb5264e336b19a7416f62b5ef937480f15079d9c0e9711dd26a6f7c6f5ce66d699296 SHA512 4791576878097077bcda768c03a43ec9a5b05c29adaa9c5f1e737e798b3fc7d027f830183d57db7b8b6b75b25e01fb522eb8b2e5359efcb05054fc341cbb403c
+DIST m4ri-20200125.tar.gz 511132 BLAKE2B 637dbf7f17b84dc5fc91c9d8f501fa223cfacd687cb953ce3b9c4716e9a6d39318ef168c2ec8a4b5eeb469a4b46abbcd8802aaf694991d82deb20c832843c3ab SHA512 212ea58a93b792c1901f62411b06cd1a2ee60b3506c987e45ded73c146f2fa6baf5461b1dcabf31a5771ab5a44eab050d64714f7a5fca3df2d141d0d80c6c51a
 EBUILD m4ri-20140914.ebuild 1480 BLAKE2B f9e7fbf9bce01522e8f4030f4f9150b0549da6e294f97feb7ffa55511040c73ceab0011568637c1acf6f1e4b9a80a03b49b6d31e81b65fc6930e6903de6e47ba SHA512 4a4dad70150f202b5e746730453643952416fbe18d52b519087875b7af2eea17855ddaad18c5bc857d86160d78d2238fae0dbba97a40a13bb6cdfbff859c96ff
-EBUILD m4ri-20200115.ebuild 1342 BLAKE2B 09d39507657d42a784455b3373719e66811ec766b816eb33fe36c1a0e38fee915b8c8e40f677f4b731fbdaf3b4ad7a5913d0799392b481420bcdf95bb6071395 SHA512 7c07439ba65740d4b0517d7f79b3583b3087ae83c940603cdb6c94a82d860e980fb46a5127c75533b29203913bc6f384b7710bb6ba08f6bb7b6354e44b0772fc
+EBUILD m4ri-20200115.ebuild 1339 BLAKE2B 0bb3afb8b5596445b3d4835ed247116805f7e2e70b14af9d481d90ddd3c0f0089cf5e7cef311f454e2389141d66729a7c352c3b0b29f38b6851dc474d71a500a SHA512 9129b34ebed40010465129235e33843c14596f99dbd183401c9d7ba4ce60550506703028168447174ba37313d0ad4ab6abc3f1084b95df1a06e8bfd13defccbb
+EBUILD m4ri-20200125.ebuild 1170 BLAKE2B 20962682e9164b8da028392dc1f014939cbb44bdc051abfb5ec560d1a673dcfcbc7b767bd9f9f3753b2282f02d8ca4ecbf162f6969767ed88fc34a531a2197f3 SHA512 88c0c6931f03dc57d97879705d792ef8e504eb536af6a8c66c04207b33c0b1ceb318bd889d7a22ab2ada4b72325a436f3dd4e4f441bcef7d12216723abdf052d
 MISC metadata.xml 1159 BLAKE2B 4a51b94a6a8d48e39412d90a249ef2038bcaac90653cbc187226842f33f5a8c75704b2671dc5fc63650cf4a57f77d7724409eca8d5822c7689eda3e5386902da SHA512 40d6e3dce814e11ced9da6874af71022dad66ff1b0511024a9033706f1b43ce741f418086d9beb276e09578db2acc1708758f71cdb168384d59f85627505e643
diff --git a/sci-libs/m4ri/m4ri-20200115.ebuild b/sci-libs/m4ri/m4ri-20200115.ebuild
index 58fff80b3df9..8521f51be38f 100644
--- a/sci-libs/m4ri/m4ri-20200115.ebuild
+++ b/sci-libs/m4ri/m4ri-20200115.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug openmp cpu_flags_x86_sse2 png static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/m4ri/m4ri-20200125.ebuild b/sci-libs/m4ri/m4ri-20200125.ebuild
new file mode 100644
index 000000000000..09158e5ef290
--- /dev/null
+++ b/sci-libs/m4ri/m4ri-20200125.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Method of four russian for inversion (M4RI)"
+HOMEPAGE="https://bitbucket.org/malb/m4ri"
+SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug openmp cpu_flags_x86_sse2 png static-libs"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="png? ( media-libs/libpng:= )"
+RDEPEND="${DEPEND}"
+
+# NEWS and ChangeLog are empty as of 2020-01-01, and README.md
+# didn't make it into the release tarball.
+DOCS=( AUTHORS )
+
+pkg_pretend() {
+	use openmp && tc-check-openmp
+}
+
+src_configure() {
+	# when using openmp and -O0 the testsuite fails
+	# https://github.com/cschwan/sage-on-gentoo/issues/475
+	# Still current as of 20200115
+	use openmp && replace-flags -O0 -O1
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable openmp) \
+		$(use_enable png) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/m4rie/Manifest b/sci-libs/m4rie/Manifest
new file mode 100644
index 000000000000..9a8da50fceb4
--- /dev/null
+++ b/sci-libs/m4rie/Manifest
@@ -0,0 +1,3 @@
+DIST m4rie-20200115.tar.gz 500702 BLAKE2B d8b1506ef9902def6577851a97dd6f7da986dce39b3250f9f9b66f9caf8f811568b7975165fb75b6b8ab3c9faf65d890f7c2254725224266f1250a0bcf18a464 SHA512 22c990cf06de9ac790f82f48e498b2bfc87fdf6834257f4e4a4c44e2446b4226438d21692d654008b58df36d8da746bba04dcf1a3d50e34ccf8c678efd5b642b
+EBUILD m4rie-20200115.ebuild 822 BLAKE2B ec28709f5abc0b9fb70ee38eb83ccbacaf7ff102864aa4eac456ebc6bb39ef67aab73870e5e9ae521e8c0ce8b7c3a8b4075bda88608e38f673e9382b8deac226 SHA512 f818df456e021de0d3d6f88ff2da7b514661edf1a695c9e80d023aafc30542f83b1d2bb68f393170ad07e1e42c636aa47c01ec2250268370d608ac0a108fdd62
+MISC metadata.xml 957 BLAKE2B 4f5e134533fe60df5f32154614dbd0ca69fbf2fdace991689c6a65ae03804593d4f45cdecdc12f73f366c765f314302fbcbeaf0de12f2fb7cdc7a3a26120dfbc SHA512 640ec04b19e1c3194d9abd0abb15cbba3294784bcde56d5bf6b0d661f551ab0d9f7f0b932ccec872cb74bc7536d027d27b5e95ca33f6220d0b8c74d5039f5c7c
diff --git a/sci-libs/m4rie/m4rie-20200115.ebuild b/sci-libs/m4rie/m4rie-20200115.ebuild
new file mode 100644
index 000000000000..676a82f2a93a
--- /dev/null
+++ b/sci-libs/m4rie/m4rie-20200115.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Fast dense matrix arithmetic over GF(2^e) for 2 <= e <= 16"
+HOMEPAGE="https://bitbucket.org/malb/m4rie/"
+SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug static-libs"
+
+DEPEND=">=sci-libs/m4ri-20140914"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# m4rie doesn't actually have any openmp code. The configure flag
+	# stems from a mistaken belief that it needs to be there to use the
+	# openmp code in m4ri.
+	econf \
+		--disable-openmp \
+		$(use_enable debug) \
+		$(use_enable static-libs static)
+}
+
+src_install(){
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/m4rie/metadata.xml b/sci-libs/m4rie/metadata.xml
new file mode 100644
index 000000000000..33cb9a18e32a
--- /dev/null
+++ b/sci-libs/m4rie/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+  <!--
+      mjo: François maintained this package in the sage-on-gentoo overlay
+      long before I moved it into ::gentoo. You don't need an ACK from me
+      to merge his changes.
+  -->
+  <maintainer type="person">
+    <email>frp.bissey@gmail.com</email>
+    <name>François Bissey</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+
+  <longdescription>
+    M4RIE is a library for fast arithmetic with dense matrices over
+    GF(2^e) for "e" between 2 and 16, inclusive. The name stems from
+    the fact that it relies heavily on M4RI.
+  </longdescription>
+
+  <upstream>
+    <remote-id type="bitbucket">malb/m4rie</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/matio/Manifest b/sci-libs/matio/Manifest
index 17af2720f434..2d018a108fbb 100644
--- a/sci-libs/matio/Manifest
+++ b/sci-libs/matio/Manifest
@@ -1,5 +1,7 @@
 DIST matio-1.5.13.tar.gz 10037903 BLAKE2B 8817fa3a1c050a84951c706922b32c5ed082ec057a35cb7fa20cc4d977316208a61604fcb6c0e09c96f592294a65d57a8a95844d15821987bdd337564345e778 SHA512 2db430dd47b8ceed850aaadf36c0fd3b405ba32db3eb2d5be320d007754983e2538ab99338d3ae8d69e8a531818c3bde0807c1f4a505eff7dd25d4a77934b737
 DIST matio-1.5.16.tar.gz 10050153 BLAKE2B de643c11371a931853c2d60347431a1fc3c46f80d5e3083376e634999ea9d10bb1f5f547ed9844654dcb8ff6ff9492d037b26f693cbced04228a6c5d603c0a86 SHA512 38039ddc897b9e44677af08d996dde960355b6d8c5598000fbb23dda5501361d1c2a9e82f0f3e6c1309f0784943976259e5d39d1030f00db323e1756e5bd144a
+DIST matio-1.5.17.tar.gz 10066268 BLAKE2B 0852d1861bb4c43acd8a34d7114d29b7e15aa00e6f995d8516d22ff9420268cf7de7b82e08ee33978891bdfd02fcf3f8441aa1466e66e112a21f01abd6f3f0e0 SHA512 af8ff11c7c44fea9ea6886e381f49ef9186946f3def98ad9695f2d5d1df045c35e8f4ceac12a44be397f7bbd708b4803762b5ce54c45b60a9f446d551c04f5d2
 EBUILD matio-1.5.13.ebuild 976 BLAKE2B 3ad88b53997bc9c025f37f2173258064263867f27f24f41fb6037ef6971647285083096a77fc32bb6fa4ee99f1708e5d0ea814208e7fea62690331a3fbecf995 SHA512 bb866a2f22dc160bbecae2d9a2168275203dd5c5abe5eaafef27c5f28ecdce11a30ecc3fb562160b43946e1ee1f5390e74c835a7bb7c2c08cb8a1fe76d40c314
 EBUILD matio-1.5.16.ebuild 976 BLAKE2B 3ad88b53997bc9c025f37f2173258064263867f27f24f41fb6037ef6971647285083096a77fc32bb6fa4ee99f1708e5d0ea814208e7fea62690331a3fbecf995 SHA512 bb866a2f22dc160bbecae2d9a2168275203dd5c5abe5eaafef27c5f28ecdce11a30ecc3fb562160b43946e1ee1f5390e74c835a7bb7c2c08cb8a1fe76d40c314
+EBUILD matio-1.5.17.ebuild 964 BLAKE2B 75bcdba772c7aa2c951f942f31c7bc7dc89ffc25fe516d5dc5af505e0b8f5e4a4be001bd82081a476c88f7db174c1c9fa75de6bab19fc7e4e3f823cad7f28db1 SHA512 698c744736765b074707d6db5dbe1a60eee70f11e518c0afea55e97baf0bb624067300daea45d982cc331baa108fdd7a923b30097e80963d687815ae1d3a863e
 MISC metadata.xml 591 BLAKE2B f3e23baf2a3e7bd304987be8296034faf78988c95b4d9fbb9eedc7e8cc6efa0c1479a4ed48ecc10d9b0aee6c92603f4436e8d6b34811b227e86a5f822f47adf3 SHA512 d6f20bbc3bff29f3d163909acb1aa6f3cc6557c5717c3ee9771ef17fbd14fe17836f26c2b2dc4defb4223cdeb5b978ef13c4d4a294a1ac11f0559e2518d58009
diff --git a/sci-libs/matio/matio-1.5.17.ebuild b/sci-libs/matio/matio-1.5.17.ebuild
new file mode 100644
index 000000000000..da6218a96d9f
--- /dev/null
+++ b/sci-libs/matio/matio-1.5.17.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library for reading and writing matlab files"
+HOMEPAGE="https://sourceforge.net/projects/matio/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/9" # subslot = soname version
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples hdf5 sparse"
+
+RDEPEND="
+	sys-libs/zlib
+	hdf5? ( sci-libs/hdf5:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( virtual/latex-base )"
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable hdf5 mat73) \
+		$(use_enable sparse extended-sparse)
+}
+
+src_compile() {
+	default
+	use doc && emake -C documentation pdf
+}
+
+src_install() {
+	default
+	use doc && dodoc documentation/matio_user_guide.pdf
+
+	if use examples; then
+		docinto examples
+		dodoc test/test*.c
+		insinto /usr/share/${PN}
+		doins share/test*
+	fi
+
+	# no static archives
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index fa3555a7cc9c..daf8aa793b31 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -7,7 +7,7 @@ AUX mpir-2.7.2-sed-backport.patch 704 BLAKE2B a4e2083008ddb0acb2cd81886e53fc1e9e
 DIST mpir-2.6.0.tar.lzma 2472231 BLAKE2B ec768fb78317220d677fac24609fdc4db1315e3c5594d7e098a0f502c38eb8dcf69bac5317c3b7afd629c089504856bb686aa4de65ad54b4f728325e100db44f SHA512 e2608beeb72651c9b2e47f8fb2bcf672f8c74e2cd622e17cd19b12100b66e929ee31d102d2901816379b23aee1a3ea3a854e3e10ebffe2a6e4772748858f911d
 DIST mpir-2.7.2.tar.bz2 3771429 BLAKE2B c3431bcb84207fdb1bc0242fe56b7c2d45643e8c21c4b215162f824bed3a395972f734907f966bc14c58a28d30bb35f441b16b2762a9c8ef9c02d164f804bc82 SHA512 8436a0123201f9e30130ea340331c5a6445dddb58ce1f6c6a3a8303c310ac5b3c279c83b5c520a757cba82c2b14e92da44583e0eec287090cf69cbb29d516a9c
 DIST mpir-3.0.0.tar.bz2 2572041 BLAKE2B f564944dd76586ca6e50c39f1199468b905a3db7bbb8b2ee6cf3dcdfb00757d7eefc57e010d5cfc3d6db7ba2676e36f7980365e85c87827b4901ec4e80349915 SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e
-EBUILD mpir-2.6.0-r2.ebuild 1721 BLAKE2B e4364eed1f742c576ec5e2c3be3a7116ddbaeb74df6cb7d6cce072878cad946ac9dfdd8e32395e6ad1f245d0cc9abdfa004f2af7dcc9525a068dbf58f7aedecb SHA512 9877aca2a319548d735e7591942cf891c8c68914b66de9b83250d63ee38017a0939d1853344af7bc90875b2415c276cde6779d013801043753aa8c4f18fc7a26
+EBUILD mpir-2.6.0-r2.ebuild 1722 BLAKE2B 0d356fc5762aa25d8dff40d72ad031201d6a1c01fd10107f815ae2cb4f6abbb5b2806b9097f87f916ea892f246d0ccf9e0f00cfc88b65f7b1d8ab4eab775e0ad SHA512 43d1bc825f15e4386a163860ff62917ccdffc7cc3d1ed4cc767e101ca78f86a6212fa618b92439d7f308108c4e71bb55d2a2cb7738d8b275b6714e6ac3e21b6c
 EBUILD mpir-2.7.2.ebuild 1719 BLAKE2B e4c9c8a697fb658a76eecdc651c119729a9ec8ecf30d54f054e8f5c61e7a873824e3f566cc5afa2509b96c33eadebbd79bc94aa074e144b562d2fe61c841d6cb SHA512 0cabe5c4e5c1df7b8ecd54b4ba87caff0b934d1805fcbb32b68ba393ba5684fac4314ed277e39286697295f94e79900fc809586b96131d0d03c264873dfd0c07
-EBUILD mpir-3.0.0.ebuild 1844 BLAKE2B ebe1b4565c52d276b5f1ed0a557e47ddcd1b940d1b23cbbacc070959fabad9a234aac37e3d034dbd2220c8113ff3c59a2c92e76c4c89c7eac8f3dcc50066141f SHA512 55220384bcaad613cb99859af8424e7afb150c3b7a7b054e31e0013148c41b3c74b0543f20f5cd1aeeb9a424b1b5f87a2ff0dec95ae52c54d1570318d6093d8c
+EBUILD mpir-3.0.0.ebuild 1840 BLAKE2B ae3684cc09c4853685bc97626fda129d4e3c23bec817e35b3edb18651907fd48f1e40ad52bb97121280130662c3da9ebf5d77157b3960626aa799a8b32cafd70 SHA512 43262a8e864aa234a7a05c537611b9464fa0ea934e4e2841af4c7d2b3c25b7d12457309cb0979e7debc97527c7f8b793482c11f9b9e6e20d4bc6a4a3693dadf7
 MISC metadata.xml 792 BLAKE2B 9c0bea642d53a6afb0abeecefcc940c012b5cecf8c6e98fdf69eb718f63ea8e7c7f913fa1cd8360240b5f355e3742a5ccae00166690cf8a83226ad636342d279 SHA512 811f781a961982955ba036f719ec5cce3def93190fb786ef3c3a60f1b54f9b7638d8083cf0f273174002da7d358d25e8764de591d7b587b41198c48c52908fcc
diff --git a/sci-libs/mpir/mpir-2.6.0-r2.ebuild b/sci-libs/mpir/mpir-2.6.0-r2.ebuild
index 8dc689e347d1..d661f2833091 100644
--- a/sci-libs/mpir/mpir-2.6.0-r2.ebuild
+++ b/sci-libs/mpir/mpir-2.6.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.mpir.org/${P}.tar.lzma"
 
 LICENSE="LGPL-3"
 SLOT="0/11"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+cxx cpudetection static-libs"
 
 DEPEND="x86? ( dev-lang/yasm )
diff --git a/sci-libs/mpir/mpir-3.0.0.ebuild b/sci-libs/mpir/mpir-3.0.0.ebuild
index 6efc062bb0ad..dd1e6cc41e80 100644
--- a/sci-libs/mpir/mpir-3.0.0.ebuild
+++ b/sci-libs/mpir/mpir-3.0.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=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.mpir.org/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="+cxx cpudetection static-libs"
 
 DEPEND="
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index b5354505e841..e906966ab14c 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,7 +1,7 @@
 AUX netcdf-4.3.2-HDF5-1.8.13+-compat.patch 5258 BLAKE2B ef4afcaf5f9139c6db2898e8e6339e77de8534218c7e00a6b16ff68bdaeb470a96b06493637a6b7734bc00a4813f21a4fd179bc12d1cf156a04ee651380bfc5e SHA512 aa54ec936aff884b105217a8c87f5d7722b8b76a4bdd8b8804366c6509abba9962fdcdbfda2361662fec3732be1a1c2b7a2ae8abea1862d2ad7fd3b0f3828f59
 DIST netcdf-4.3.2.tar.gz 5013938 BLAKE2B 7acef16284bf8586750bdeb03da3e2e2a1c543b80423269eb2542d179e1b52dd51e30584a13f604e75c295ae9ff993c814183fbb5a78ad1141c62f8dbdda6525 SHA512 9cb9c761bf1e17a37601c37000fdc0bb654afcf111e5ac2fb7dcf037c6aa827e66beb29d5c661edc50ea3f84849f3dee387aab9e85ef81a9b6ca3f36e45debdd
 DIST netcdf-4.6.1.tar.gz 18201700 BLAKE2B 2dab9add736d0db3ad91fb1ccda63c200fe5a2c6e56e2dd5b76375f6535807c6f462623d1709235f03e0940b66a8c2d1c3fd896b042b8b0004c87f038852befb SHA512 e290b10e763f9f6ef56b5224f834834853de7c21347ef6a078a2e7d819757fc8069814431784d0a0387ba2ce1f01776556e3051f9465829da0ffd3849571cd61
-EBUILD netcdf-4.3.2-r1.ebuild 1498 BLAKE2B 7a2dd203d94f38819bea1690c570578da3049eaaa7029ad8efc8ce32569fc06cc37c910888e9fbe7f2340c61c7f860cf4385f4b319e6da3b1a375fc71ed0298e SHA512 1bbf0f408fc29bdcf86447e0d9bba325b1238733bb2770d274587fa1f4907e6d2198e077c4f1cf0067bcd6352d680ff6f6fa752467b6fb9e921c4d903f88b6b6
-EBUILD netcdf-4.6.1-r1.ebuild 1338 BLAKE2B f4aaca3ba39dd9c330eb71ccb735a37d15e622f04fb9aaa429d593fb808c47dde765ee3170aa379c04bcd12480c4fbc532712fe006dd22d9b0d747ddf80fa4a5 SHA512 cda897e7bcb2ab2c27b39339a36dfc39e4cb3a604d8cb4579fbae88ee353f1920667de87966c6eacec14fca8253b16d55254fc1b483ffc6871f8aadb968593b8
+EBUILD netcdf-4.3.2-r1.ebuild 1499 BLAKE2B 7bfd5e8ac228a24e707089b4c0c7853051804b368c588080a1abf6080c2e81470a18814b4a999660e2e4af229b5ab68fe6d2d8f08e4f3a4bbc7a85446003d82d SHA512 63d12e90ba69030eda48a8d2c905f6cd2337b9cf9d1aa96856c4e45227f65bcb113a3aba0d0d1f7a5781a23fdbcdf0aa34c9322a4feb2b5533e591c85ca234de
+EBUILD netcdf-4.6.1-r1.ebuild 1339 BLAKE2B 93c0f23f0abfa4d52bd4de02f67a7521400ad82c91ade18d6c09e18fe8fb9b4e053ee7864fa0e21b472df0d813680d74c91589c9049da100191646fea03553ba SHA512 6d3b500df1de3f15a694b8162d1bc52cd4d91428a57946db1f9fa1a81adb911feb9710cf57b96693388994ad301d5600c08eb00cfcfd4aa9979815078302bc55
 EBUILD netcdf-4.6.1.ebuild 1341 BLAKE2B bc9e4f661439c5bad7436f5bfb6f0b9aed1bb1192365c519fd66b97997e8f06199a916c53c46ec48b088c41eea94d833c2f345a3525dc76f04eb06c0ba1118e9 SHA512 8db8eb13f11d42ffeb244a330a80abc0d9909364c3697f9b92f6db1665a3dca6372cdcfbfabca2023443147fc0ccc2738affee1a41a5961e25d00fa10f0c6c5e
 MISC metadata.xml 1064 BLAKE2B 7980e918eb2d2f438aeb5deb4a678c2e324606b40e8d04e592df7d24492bdfbc548082f6fa372c168b09597c3511df15a046cd8f6d746db3d9aeae31cf3604ac SHA512 2aaa7a6c4659ff3daf81bdb63541ce08359f43bb7007f38dea333d0a05fc920e6780b79a9b0f79fec59d4e05a005efd3642acaedcd3223a21d5aa919110545dd
diff --git a/sci-libs/netcdf/netcdf-4.3.2-r1.ebuild b/sci-libs/netcdf/netcdf-4.3.2-r1.ebuild
index 4f7a0aedfc29..e880b9a4ebf8 100644
--- a/sci-libs/netcdf/netcdf-4.3.2-r1.ebuild
+++ b/sci-libs/netcdf/netcdf-4.3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.unidata.ucar.edu/pub/netcdf/${P}.tar.gz"
 
 LICENSE="UCAR-Unidata"
 SLOT="0/7"
-KEYWORDS="amd64 ~arm ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+dap examples hdf +hdf5 mpi static-libs szip test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild b/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild
index e8e0b787d64b..d7770061f7a7 100644
--- a/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild
+++ b/sci-libs/netcdf/netcdf-4.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="UCAR-Unidata"
 SLOT="0/13"
-KEYWORDS="amd64 ~arm ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+dap examples hdf +hdf5 mpi static-libs szip test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index a0edb68e45bc..fc1a00bafd29 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -7,6 +7,9 @@ AUX ogdi-3.2.0-optimisation.patch 247 BLAKE2B 097d0e9615352512f5322b7e11826fe435
 AUX ogdi-3.2.0-rpc.patch 11640 BLAKE2B 86809477603e9842e9c80e59b83769ef7a67e05aa5fd8db5795639aa0387a3f7324405bf4ea532a522154f88a4fd29469b7bdbef3285771b4c54c625c33f32a0 SHA512 b16647603aec1a2bc5fdcdf17234d78c62d882777187ba4896d7ea7ef96025c663f585866fa70e432700faa1963c2d2643f6b83791a90f4c38fc1e426b84889a
 AUX ogdi-3.2.0-tcl.patch 320 BLAKE2B 4cf742b86210f4b78f9cfd304e6ed928fdeb26aebc541d3de3017939b75f08ec47676e5c91466a9ec667830b7cebacd334878cb30ba4d0937ab9f5408bb1333f SHA512 19f08d16caab2cc456b608f89f100830de6c2b7d13336240a9738c5435fe6065a946c4929dab386889363d392dd701dc5be5c1a1d6b589c31721caa5fddf97b8
 AUX ogdi-3.2.0_beta2-subdirs.patch 905 BLAKE2B 69db0794449ca68b61ba8723585a2d055836f2bfd031023073b515a326ca04215833c9ab1ef1d73f1bd5392a56d2479ba71d9a24fea42f5a41f239a3ec6c55db SHA512 b6e6f50dafdb6aea991b8ece37953a9910b3fa790dcb68108ba7316c81de3cffae1413afb9d9126457550fa46bded8a7613c8be27fcd9956c8c17b5b64065732
+AUX ogdi-4.1.0-subdirs.patch 600 BLAKE2B b42bfc9fbd88e729a604d53d72464af1e91c47f765c29ea18001118b63b14ac35e2e2ad4afef5da8e03a97f5703aaec4c435451b5012c6a16d8e1db48aeab572 SHA512 b3557d0b2e1b55231988401474d0242296c66199731998487301e39849410a4c55f4c50de8ee70c2a44619198d9049a23207c2046989a210915c742172897b87
 DIST ogdi-3.2.0.tar.gz 976004 BLAKE2B 535f05b3145c49ce72adcd86cd9ded1c8d8d12e051feb4e1898d8ddabbff1cf27f609326ccdb3a1cbff523b277f99e9d8c3678d2ed565dd81e6c5d956ed2dcca SHA512 b29d52b733c15927d2c93df10632d9bf6288614b944c02a5e1a67f3f971263bcb07460b301fb5db389ed15fc5f38a1f3c0263c4b1441f2ea4809bb61b3e67ef0
+DIST ogdi-4.1.0.tar.gz 848818 BLAKE2B d037d7a1b97e0db4b714e94a46c04e7126b5ab520e9cf54ffaba5f3e8ffa694690f4863ce257a4f56a3a596ae3ce430eb8f656f700a9287455b9f540299c6b1a SHA512 abfc409bfa5ea2f81a90c16361fe6cdc2b2ee39775c22ceb74b13b171aa04d6d6eaffe398cae0ef91dcde8509e5cc25100eedeffdad358e090b78e118d386859
 EBUILD ogdi-3.2.0-r1.ebuild 1730 BLAKE2B 0414eebbe445021de0a41e17ae77f5b954d025c90c3f4e74708e941793d3bd5cb171a329897b06b0652fa01dc4e036cadb4199ee56a7b6503a8ca38cd74d1b74 SHA512 8602a2c3ed67233f23006739206a471e72fed4a8d370150bbaa7d3f7e9f3a0567eca246d7ec47db96767237538a42962cfc3dbee12ba9cd317d4479590931a93
+EBUILD ogdi-4.1.0.ebuild 1294 BLAKE2B c93e6386c764d4b884e78538cdecd14d1dcf95835db25eefca763a23f103c3b6131c8ac8587c3da015d471f7f8b5b39d28900afee227b63ac6226e7fcb88f79f SHA512 54f53ef1b5c73f1b4908257e1554f04c6ec4cead60c7c5ecca092bf34d153682f9f1556b59931ed2d6dfd0487e7b43b969bb18f1cbef1f5a5791aad32431ddfe
 MISC metadata.xml 337 BLAKE2B 01ea83d967f6073198b6a96775ed63b603dcd4736a3a3faa8d8e5e891d2b4fb25ef436425fe51be91d4d81702f392c7f28274738b7d672a82d681159e28b87dd SHA512 958474862734f915497c1e574254cd2152009f436b59dd57be9bcd5ad0ae2949dba1f6275ad3a68b3a6d60863093df2bf2bcfffdea51b591e9c1864231899221
diff --git a/sci-libs/ogdi/files/ogdi-4.1.0-subdirs.patch b/sci-libs/ogdi/files/ogdi-4.1.0-subdirs.patch
new file mode 100644
index 000000000000..208bfb2bb023
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-4.1.0-subdirs.patch
@@ -0,0 +1,24 @@
+diff -urN a/makefile b/makefile
+--- a/makefile
++++ b/makefile
+@@ -17,7 +17,7 @@
+ #
+ # Sub-directories that need to be built
+ #
+-subdirs	= external vpflib ogdi contrib
++subdirs	= vpflib ogdi contrib
+ 
+ #
+ # Default target to build everything in all sub-directories
+diff -urN a/ogdi/makefile b/ogdi/makefile
+--- a/ogdi/makefile
++++ b/ogdi/makefile
+@@ -15,7 +15,7 @@
+ #
+ # Sub-directories that need to be built
+ #
+-subdirs	= include c-api glutil attr_driver driver gltpd examples
++subdirs	= include c-api glutil attr_driver driver gltpd
+ 
+ #
+ # Default target to build everything in all sub-directories
diff --git a/sci-libs/ogdi/ogdi-4.1.0.ebuild b/sci-libs/ogdi/ogdi-4.1.0.ebuild
new file mode 100644
index 000000000000..a355b84b1d17
--- /dev/null
+++ b/sci-libs/ogdi/ogdi-4.1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Open Geographical Datastore Interface, a GIS support library"
+HOMEPAGE="http://ogdi.sourceforge.net/ https://github.com/libogdi/ogdi"
+SRC_URI="https://github.com/libogdi/ogdi/releases/download/${PN}_${PV//./_}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+	dev-libs/expat
+	net-libs/libtirpc:=
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog NEWS README )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-subdirs.patch
+	"${FILESDIR}"/${PN}-3.2.0-endianess.patch
+	"${FILESDIR}"/${PN}-3.2.0-optimisation.patch
+	"${FILESDIR}"/${PN}-3.2.0-tcl.patch
+)
+
+src_prepare() {
+	default
+	rm -r external || die
+	sed 's:O2:O9:g' -i configure || die
+}
+
+src_configure() {
+	export TOPDIR="${S}"
+	export TARGET=$(uname)
+	export CFG="release"
+	export LD_LIBRARY_PATH=$TOPDIR/bin/${TARGET}
+
+	econf \
+		--with-expat \
+		--with-zlib
+}
+
+src_compile() {
+	# bug #299239
+	emake -j1
+}
+
+src_install() {
+	mv "${S}"/bin/${TARGET}/*.so* "${S}"/lib/Linux/. || die "lib move failed"
+	dobin "${S}"/bin/${TARGET}/*
+	insinto /usr/include
+	doins ogdi/include/ecs.h ogdi/include/ecs_util.h
+	dolib.so lib/${TARGET}/lib*
+	einstalldocs
+}
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 2da3e06292c3..2c21b42dd6be 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,6 +1,8 @@
 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
diff --git a/sci-libs/openblas/openblas-0.3.9.ebuild b/sci-libs/openblas/openblas-0.3.9.ebuild
new file mode 100644
index 000000000000..9aa17003313d
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.3.9.ebuild
@@ -0,0 +1,127 @@
+# 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/opencascade/Manifest b/sci-libs/opencascade/Manifest
index cfeb4e1b3238..dbf704875294 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -1,11 +1,6 @@
-AUX opencascade-7.3.0-ffmpeg4.patch 1392 BLAKE2B ce5f6c82b34ca00c758411102d15b12bc410f98156b6281a2c50609eee05e1655e93cbd918c509b2daa6e018fb7cd107a6a8a539f9d9f19438d3cf5a7e20e3cd SHA512 447ff4039ed6ad0f01d62a4d129ff0eed77427fff11dc6303decb5e15b41dd1be305a909838c296a926ddaa8c93211995f188f95c4a70a9f9ce896e7d286929f
-AUX opencascade-7.3.0-fixed-DESTDIR.patch 2272 BLAKE2B 30b0e045d872673ff65f00b471d9b7e5239f451329d8a0d3f0f367c811a387ef76c368eeddc3fe8d6684d7012190ae09aac66f2f91fdec7b2b4f4134b3a1463a SHA512 57e5195516d8f282c0ecd5de88e7e29f00a3748ae9ac82c74eca3b4f577dd4f4e6286e1deda424590a8c8b30cb1cd326d5c4f1634d0f7dba5bcb6ce88758a9f5
-AUX opencascade-7.3.0-vtk-compat.patch 431 BLAKE2B 468a804ed906555637110b0d7cb7a4ef994fae9130e7317e525d21598cc19b67e8c7bfaaaffea82ee8fb94a20c14b42e6ec02e2541ddfc54fc288c8d0f68fc7c SHA512 026ed3451c1c36e1f187be390773329ad011c9ebdb766b730ee04f9f9a844a307c4fefc6669c81187fd34d8264bea233680c7ee43afb566e695c3d64c37438a4
 AUX opencascade-7.4.0-find-qt.patch 3349 BLAKE2B 6520b3242927c86c4958f81f8a94e8976fb2cd262318ee7fd7e1362bb95d0d665bbf909108a0526e4d251af045f734a58ee6cfae631b14b139e1a70f7666beb3 SHA512 8d7a758f749794430267e473b6048386bb3b9e4274091f5a5662bfcbaf2c76cdf0c3c2fac4d6e8f03ea300bfe3d0258cb23b8f184de62f153d12a41746f02e75
 AUX opencascade-7.4.0-fix-install.patch 7870 BLAKE2B 4842ad5123a06a53b81ca80e4152434ee6d78a9eb5436a7a9f899651fcdb45a6f403f31bd6e4225611c1085fb91eb7a5640e5bb3fd49b71295ad0868b8e018dd SHA512 5315e82bd03a8782df8c72bbfb334d9cf739dd53f3aa22649f087c1b8b7fa5f88f7a80850c1f2e0c9dffd80a77dd99fd36e9674463535cbf48b896596c24f38e
 AUX opencascade-7.4.0.env.in 4611 BLAKE2B 3593cd4e05d33e466a975cf4641c56cd8e686310a148cc684591d3e08f8c4efd86e4df13500f11845e425b056b9c2c42f0f27a2a4d8cea524dc8fbb1c7dad703 SHA512 25f65e2b1e91fa78313334dab7d19b115bb7ff97ccefe7d18c45ab1817e12e10fdbe36babcb22e2a0d52bf7a0fbbdd2937523b773ddbb37635c1dd0d14de6253
-DIST opencascade-7.3.0.tar.gz 48576720 BLAKE2B bf63ba77aabc8a8c92d694f78f24bab71c07e68e7ba4b8d5d90966733dbd9c0c83a76e35f059e798d4a60640d663330cd13a828b19ec02a5372053ab39a74aa6 SHA512 17eb1810b43a8b001867563f97801ceb38a7878fa53d9b39b46a5cf3dd676310fa80e83e90668a99ec6aff9d4f09733fb6c7be83c1e3ab4eaa9fda55888050da
 DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
-EBUILD opencascade-7.3.0.ebuild 4410 BLAKE2B ccb199b9cde98a579d3be135c657755506f2f4950317521bc70260666f191e9176124fb98b7ae232121222da4db93db2a300eaf88e42b14bfd330d0d8ac4f3c2 SHA512 0ca80511c240296b5f5d93c1e0132eb369778205f192f8f322cacfdede1808c5700ee96ebc10afad01b2786e18f5ae64e179fd54ddb632e1cede07a20aa2da91
-EBUILD opencascade-7.4.0.ebuild 3733 BLAKE2B 9bfa3ca240c9c1eb3e047c4603f86d5228b81e3d15171f5cc7b36c1a0b392435205b14d6f4bd53f600c79e296961fe77c0b61000338210b2b0da4fd431bfb8a6 SHA512 9f224495b6583cb22f16e81aeebc7b492867be72308d65beab1f02cc1c562010e04b1550a7661ea3fbf3027d6137b835d05813fffea0e755ef3d2d53701e86dc
-MISC metadata.xml 957 BLAKE2B 609b823e60c216481f0628bf396a81b827dea3d3d7a8e96203d9243e46c110784e4dc55032773ccd808cfa10f18342b30852ad982983e86ab41a399cfc99692d SHA512 80246f152111d9bb48df691198b478f5181c51a94286e28dc0f3a037e025b403559ad2c1aebf7660693d6a6a333e058de4bc711317c45ba9491e98529bd2d5ba
+EBUILD opencascade-7.4.0.ebuild 3775 BLAKE2B f0a7df2574a439e4f948a11f883afcbc1314c482e1fa77f9344f41d7a0e2d5379fdcd9069c91f933cd07432ffc1bd5258c34a629d8611f245efc6c46367ee5f5 SHA512 68a3ef0d24c497c9184da1fec1206715212d9448994d0b904e42b174e0e177348af312d42b4e91faca5995e45508edd5cfa97ecdcb5605e5cb612a69037c7ff3
+MISC metadata.xml 887 BLAKE2B 1b9179667b3bb44f0b2c761f8dfed80f804c7313900087a2e61ce7a43ad140b7cb5a15ac0428d3ca0a7ba1087ac0f9014f0fa12d591a34b44a14edb90bfa57f5 SHA512 0d13482fbba741097d384878c333fbf4ed68bafbf4901dd296d1381953eee14112e03ec4bdeb817bdbba9ec5b0b2356d9eccc65cdebba4a47832446c263988f9
diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch b/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch
deleted file mode 100644
index fc572a4f5bca..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.3.0-ffmpeg4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Author: jbeich
-Date: Wed May  2 13:25:55 UTC 2018
-New revision: 468831
-
-src/Image/Image_VideoRecorder.cxx:279:25: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER'
-    aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-                        ^
-src/Image/Image_VideoRecorder.cxx:452:38: error: use of undeclared identifier 'AVFMT_RAWPICTURE'
-  if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0
-                                     ^
-
---- a/src/Image/Image_VideoRecorder.cxx	2017-08-30 13:28:21 UTC
-+++ b/src/Image/Image_VideoRecorder.cxx
-@@ -276,7 +276,7 @@ Standard_Boolean Image_VideoRecorder::addVideoStream (
-   // some formats want stream headers to be separate
-   if (myAVContext->oformat->flags & AVFMT_GLOBALHEADER)
-   {
--    aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+    aCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-   }
-   return Standard_True;
- #else
-@@ -449,6 +449,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame 
-   AVPacket aPacket;
-   memset (&aPacket, 0, sizeof(aPacket));
-   av_init_packet (&aPacket);
-+#ifdef AVFMT_RAWPICTURE
-   if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0
-    && !theToFlush)
-   {
-@@ -461,6 +462,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame 
-     aResAv = av_interleaved_write_frame (myAVContext, &aPacket);
-   }
-   else
-+#endif
-   {
-     // encode the image
-     myFrame->pts = myFrameCount;
diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch
deleted file mode 100644
index c0a6363e19fd..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.3.0-fixed-DESTDIR.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/CMakeLists.txt	2016-11-25 11:50:18.000000000 +0100
-+++ b/CMakeLists.txt	2017-03-18 08:44:10.406668714 +0100
-@@ -885,7 +885,7 @@ if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
- 
-   set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
- 
--  file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
-+  file (WRITE \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}\" "${CUSTOM_CONTENT}")
- else()
-   OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
- endif()
-@@ -906,7 +906,7 @@
- endforeach()
- # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
- install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
--install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
-+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
- 
- foreach (OCCT_MODULE ${OCCT_MODULES})
-   if (BUILD_MODULE_${OCCT_MODULE})
---- a/adm/cmake/occt_macros.cmake	2016-11-25 11:50:18.000000000 +0100
-+++ b/adm/cmake/occt_macros.cmake	2017-03-18 08:44:10.406668714 +0100
-@@ -558,7 +558,7 @@
-   "cmake_policy(PUSH)
-   cmake_policy(SET CMP0007 NEW)
-   string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
--  file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
-+  file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
-   foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
-     file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
-     file (REMOVE \"\${TARGET_FILENAME}\")
diff --git a/sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch b/sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch
deleted file mode 100644
index 71700a57f1dc..000000000000
--- a/sci-libs/opencascade/files/opencascade-7.3.0-vtk-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/IVtkVTK/IVtkVTK_ShapeData.cxx   2018-09-15 01:57:25.086783255 +0300
-+++ b/src/IVtkVTK/IVtkVTK_ShapeData.cxx   2018-09-15 01:58:20.877779839 +0300
-@@ -29,6 +29,10 @@
- #pragma warning(pop)
- #endif
- 
-+#ifdef vtkGenericDataArray_h
-+#define InsertNextTupleValue InsertNextTypedTuple
-+#endif
-+
- IMPLEMENT_STANDARD_RTTIEXT(IVtkVTK_ShapeData,IVtk_IShapeData)
- 
- //================================================================
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index c601fab04b30..471a91a9796b 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -13,9 +13,6 @@
 	<flag name="freeimage">
 		Enable support for image i/o via media-libs/freeimage
 	</flag>
-	<flag name="gl2ps">
-		Use gl2ps PostScript printing library
-	</flag>
 	<flag name="gles2">
 		Use OpenGL ES 2.0
 	</flag>
diff --git a/sci-libs/opencascade/opencascade-7.3.0.ebuild b/sci-libs/opencascade/opencascade-7.3.0.ebuild
deleted file mode 100644
index 15dce82b6a9d..000000000000
--- a/sci-libs/opencascade/opencascade-7.3.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs cmake-utils eapi7-ver java-pkg-opt-2
-
-MY_PV="$(ver_rs 1- '_')"
-
-DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
-HOMEPAGE="https://www.opencascade.com/"
-SRC_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${MY_PV};sf=tgz -> ${P}.tar.gz"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug doc examples ffmpeg freeimage gl2ps gles2 java +tbb +vtk"
-
-RDEPEND="app-eselect/eselect-opencascade
-	dev-lang/tcl:0=
-	dev-lang/tk:0=
-	dev-tcltk/itcl
-	dev-tcltk/itk
-	dev-tcltk/tix
-	media-libs/freetype:2
-	media-libs/ftgl
-	virtual/glu
-	virtual/opengl
-	x11-libs/libXmu
-	ffmpeg? ( virtual/ffmpeg )
-	freeimage? ( media-libs/freeimage )
-	gl2ps? ( x11-libs/gl2ps )
-	java? ( >=virtual/jdk-0:= )
-	tbb? ( dev-cpp/tbb )
-	vtk? ( sci-libs/vtk[rendering] )
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-
-CHECKREQS_MEMORY="256M"
-CHECKREQS_DISK_BUILD="3584M"
-
-CMAKE_BUILD_TYPE=Release
-
-S="${WORKDIR}/occt-V${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-vtk-compat.patch"
-	"${FILESDIR}/${P}-fixed-DESTDIR.patch"
-	"${FILESDIR}/${P}-ffmpeg4.patch" # bug 672248
-)
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	use java && java-pkg-opt-2_src_prepare
-
-	# Do not pre-strip files
-	sed -i 's/_FLAGS_RELEASE} -s/_FLAGS_RELEASE}/g' adm/cmake/occt_defs_flags.cmake || die
-
-	# Prepare environment variables used by Opencascade
-	echo "CASROOT=${EROOT}usr/$(get_libdir)/${P}
-PATH=${EROOT}usr/$(get_libdir)/${P}/bin
-LDPATH=${EROOT}usr/$(get_libdir)/${P}/lib
-
-CSF_EXCEPTION_PROMPT=1
-CSF_GraphicShr=${EROOT}usr/$(get_libdir)/${P}/lib/libTKOpenGl.so
-CSF_IGESDefaults=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/XSTEPResource
-CSF_LANGUAGE=us
-CSF_MDTVTexturesDirectory=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/Textures
-CSF_MIGRATION_TYPES=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/StdResource/MigrationSheet.txt
-CSF_PluginDefaults=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/StdResource
-CSF_ShadersDirectory=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/Shaders
-CSF_SHMessage=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/SHMessage
-CSF_StandardDefaults=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/StdResource
-CSF_StandardLiteDefaults=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/StdResource
-CSF_STEPDefaults=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/XSTEPResource
-CSF_UnitsDefinition=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/UnitsAPI/Units.dat
-CSF_XCAFDefaults=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/StdResource
-CSF_XmlOcafResource=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/XmlOcafResource
-CSF_XSMessage=${EROOT}usr/$(get_libdir)/${P}/share/opencascade/resources/XSMessage
-
-MMGT_CLEAR=1
-# use TBB for memory allocation optimizations
-MMGT_OPT=2
-# The next MMGT_* variables are at their default values.
-# They are here for documentation, so you can change them if needed
-#MMGT_MMAP=1
-#MMGT_CELLSIZE=200
-#MMGT_NBPAGES=10000
-#MMGT_THRESHOLD=40000
-" > "${S}/${PV}"
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOC_Overview=$(usex doc)
-		-DBUILD_WITH_DEBUG=$(usex debug)
-		-DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${P}"
-		-DINSTALL_DIR_CMAKE="/usr/$(get_libdir)/cmake"
-		-DINSTALL_DIR_DOC="/usr/share/doc/${P}"
-		-DINSTALL_SAMPLES=$(usex examples)
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FREEIMAGE=$(usex freeimage)
-		-DUSE_GL2PS=$(usex gl2ps)
-		-DUSE_GLES2=$(usex gles2)
-		-DUSE_TBB=$(usex tbb)
-		-DUSE_VTK=$(usex vtk)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	fperms go-w "/usr/$(get_libdir)/${P}/bin/draw.sh"
-
-	if ! use examples; then
-		rm -rf "${ED%/}/usr/$(get_libdir)/${P}/share/${PN}/samples" || die
-	fi
-
-	insinto "/etc/env.d/${PN}"
-	doins "${S}/${PV}"
-}
-
-pkg_postinst() {
-	eselect ${PN} set ${PV}
-	elog "You can switch between available ${PN} implementations using eselect ${PN}."
-	elog "After upgrading OpenCASCADE you may have to rebuild packages depending on it."
-	elog "You get a list by running \"equery depends sci-libs/opencascade\""
-	elog "revdep-rebuild does NOT suffice."
-}
diff --git a/sci-libs/opencascade/opencascade-7.4.0.ebuild b/sci-libs/opencascade/opencascade-7.4.0.ebuild
index 372cacad7c81..871c8a8e49c2 100644
--- a/sci-libs/opencascade/opencascade-7.4.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0.ebuild
@@ -53,7 +53,12 @@ RDEPEND="
 	vtk? ( >=sci-libs/vtk-8.1.0[rendering] )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		qt5? ( dev-qt/linguist-tools:5 )
+	)
+"
 
 # There's no easy way to test. Testing needs a rather big environment
 # properly set up.
@@ -90,7 +95,7 @@ src_configure() {
 		-DCMAKE_INSTALL_PREFIX="/usr/$(get_libdir)/${PF}/ros"
 		-DINSTALL_DIR_DOC="/usr/share/doc/${PF}"
 		-DINSTALL_DIR_CMAKE="/usr/$(get_libdir)/cmake"
-		-DINSTALL_DOC_Overview=$(usex doc)
+#		-DINSTALL_DOC_Overview=$(usex doc)
 		-DINSTALL_SAMPLES=$(usex examples)
 		-DINSTALL_TEST_CASES=NO
 		-DUSE_D3D=no
diff --git a/sci-libs/openlibm/Manifest b/sci-libs/openlibm/Manifest
index e83b50784832..04ddb614ac99 100644
--- a/sci-libs/openlibm/Manifest
+++ b/sci-libs/openlibm/Manifest
@@ -1,3 +1,5 @@
 DIST openlibm-0.5.4.tar.gz 353072 BLAKE2B 2427d207f3b45a5b2a80c3405a6a749c8d62409eea0adb31f26eda6a5dc370f242f5874a6783ada79972ac22183bb55448de683290f4c052967e2e598367f011 SHA512 ca74936b9eb7a52566cc509ffb98dd9e1672cd4029ba0193162505e53fe671b8903c37ef4036c15d0872ca246079a792d1630f3a93024010ff0c232f78295192
+DIST openlibm-0.7.0.tar.gz 366359 BLAKE2B 9dc545e3effedaadefda31ae75759ac8e5afb74250e8a7d9016b1406c235a298a375641207d3561365d750ec442e5ecdbfb1ce8b179a17bdaa48a5e2d5e5af25 SHA512 e52245ea93513fb1d9eade348f7c4ad4f1b500944024f7d52d71d43af908059e581ea77df6fc879414ff17c860263debec3aaf6ac86eea03ee1fe23d180487ed
 EBUILD openlibm-0.5.4.ebuild 710 BLAKE2B f4d3155d69697bd7303cb4d92e455590c767fdc91f7e6b848dd8e5f7e62215b9acc1196c585524317a7aa51f37fca26c775c5ef6849db62c8308905c06b5e17d SHA512 b3a4226d579f610bfb28ad9c46d5fcd11870afdca0e1d6133f7e891530615b3dd974bd8cd9452e98cf6d9847c106b53e2b629a3c682ef318431cf4d046a25458
+EBUILD openlibm-0.7.0.ebuild 711 BLAKE2B ea950f0d7ac74e99dd4decf0b7b27b2ad1e67fe31c7e159b8226a6eedd3821655aad2db71e0695ce4bccb2e0b3c4f033590f9a94d9606c3ab3497e4e2bfc8f1a SHA512 092836047064e721859e8a8197bfa8fea07533f11b9ac1429bb15c0ccb6832bb1341f547d7b04f3dec10de70dcbf0d42ad95f29f927b38900001483ab7bbf223
 MISC metadata.xml 770 BLAKE2B a75ed3c2d1a22ecb086b22d9ffad8c6d4ab002b7bb63acc60867a88a3126ad3feb1b1ea75ded8e798cd59d128236ab776a53131c6428aa422e1ffa31ee66e5d7 SHA512 c95d57f8ffc872aa8e0b4433d7b51bdb2c06f57c7ba00a66f7ecce06310db0343ff91081249154e2c1e32c9a90ed510704603c337530c1ee1acf36ce808b7b70
diff --git a/sci-libs/openlibm/openlibm-0.7.0.ebuild b/sci-libs/openlibm/openlibm-0.7.0.ebuild
new file mode 100644
index 000000000000..aae8815fd2f8
--- /dev/null
+++ b/sci-libs/openlibm/openlibm-0.7.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils toolchain-funcs fortran-2
+
+DESCRIPTION="High quality system independent, open source libm"
+HOMEPAGE="https://github.com/JuliaLang/openlibm"
+SRC_URI="https://codeload.github.com/JuliaMath/openlibm/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+"
+SLOT="0/${PV}.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="static-libs"
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+		libdir="${EPREFIX}/usr/$(get_libdir)" install
+	use static-libs || rm "${D}/${EPREFIX}/usr/$(get_libdir)/libopenlibm.a" || die "rm failed"
+	dodoc README.md
+}
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index ebe56b648eef..cc3cf5bab54e 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -9,6 +9,6 @@ DIST proj-datumgrid-europe-1.4.tar.gz 26115747 BLAKE2B 3dfb5c19362f9d9cdfc4ee546
 DIST proj-datumgrid-europe-1.5.tar.gz 187195036 BLAKE2B 0f88922435793930e21ace8488e0d1cd6a6325880f90d61a91d1592e51191514db7fc93e08c4a6c51699e3eb43762786d11eea425c181a8d3f73ec5ad7848092 SHA512 456a8c27dad7ef8fc1790ef822e7e8dcbc69b79e0a28df8c6b58d24b0ef4a3221cebd8e911a0d84b7f00694247b0fb8f4361a38d7369f921da000c838812f389
 EBUILD proj-4.9.2.ebuild 1284 BLAKE2B 59769bb31fdea258a0149af00ba5e73f599705d51b32d1584368388bfd68ad4fe5af297a25bcb544fe0b9fca6a413a3fbf3cc939d46de756cfaa76ff65e98fce SHA512 5bda300c624a6f79cb7c5a8274f3f1be0b4f7ca9e0351c409f86154ffa975109f5147737b8ec1cb0581d52d2c297d5e1581ae4d7cfbe670d9bc2e85fe81ea16c
 EBUILD proj-5.2.0.ebuild 912 BLAKE2B 17615cadc426d50a728b460b8b24c82536049dda4cec04500e0e066043f339eff685b52669e58dc6475f77a1c7fb8d8d39fb233af941f800fb6e85472c4ab1ee SHA512 753932af1fd02f1ba414d712a54ac6bc5ea9e86f9585cb5c899b48b6791389624bd746cd9fdef09e298e745627aea696a8bada0a7d23b17c4e0596640f89ce19
-EBUILD proj-6.2.1.ebuild 1119 BLAKE2B f679702c3a4b6385c5e94a68ec49dfefdb3c56ad1e446d6db414eb932b368dc70540d2d14832f7e976461a2c24139d21bbdf7ec5431447c9caab8dd254e69619 SHA512 315d419f8ff31666f9f717b15aa8d7bdb4ed69f88f2137554c9afef7d154ea2ba0a6771d1b38d9b49c3afc08f66aae66ec729f43863c19649d164df0b3f97a1a
+EBUILD proj-6.2.1.ebuild 1118 BLAKE2B efc31b3a18898c9fbf064d556a51b660bfabb2db0d08352d01367a2f1c88376d993dfeeee67556d5d65b57e22997e150a9ab80b90d497bf7d2a65487ea8b1108 SHA512 88101056c9660c8c088fc05592fbcb7c258c837aaad55971f4d7939c1ae79b51bb5069b963b8c6cfbedbfb4a54a0b9ce7324c6b056a8f4883e01e273b5bddde4
 EBUILD proj-6.3.0.ebuild 1123 BLAKE2B 27a3e1372aa2c62063b16caf2d9479d8d67092f9a6e3a0f7a1a3f7f2b52bb08694a358567d36fb96c8c4a5e1fca3ef24f8eded6834f3a0f9c787bb8ba3d204f1 SHA512 7f4a6c73f17a96e95848a81be7c3821deae554719db75ae02649b2430bb5b3e73b1c27e80cf66841820c59de825a9caed11d39c707c29d988641554db7787872
 MISC metadata.xml 513 BLAKE2B 4068b4ddcb4e95578df8da19650ab86b4dbfdba294a3d03f10ada37a578a2113b0d71720545c269b1c097d3a37dbc66ee0cdfe61889466171c109413088707fd SHA512 e841ea4fb30d3632fecca7d584121fce35dff2b23ad8a1feeb98a47f0a3b1d78f57a05b0d303aeff47f981f5b7feb831deb14644ab6615644c0a8593a6e321b3
diff --git a/sci-libs/proj/proj-6.2.1.ebuild b/sci-libs/proj/proj-6.2.1.ebuild
index 30bf178877a3..a249436269b5 100644
--- a/sci-libs/proj/proj-6.2.1.ebuild
+++ b/sci-libs/proj/proj-6.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0/15"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="europe static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( !europe )"
diff --git a/sci-libs/scikits/Manifest b/sci-libs/scikits/Manifest
index 6187b4f5bb39..2e0abfd81f1f 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 280dbd2574b0dbae516d82308b41f7459fd128a18ef418f9660834eb57944a3dee0b0a5e1b6b6f102416cee27d025c01b7f5e5488c5b174b312b6d728f346224 SHA512 b56aacc22c4d5056f8ce7614b335d619f4f2f272e0e34bdddec1b94e899eb07f501102f655258a14b37edbe32ca27653b7e6f1ddaeffb9d9956be871fef82264
+EBUILD scikits-0.1-r2.ebuild 744 BLAKE2B 8ac4c054c91c535cd0dd12bcc5463e9e709d8d7b32ed3ed8788c68b048ced9db8dd66a62b44f822eb5ba4b07c2ac15baf1aa5b8a49c8d1a7314928fa8425b0cc SHA512 464ec5457894c5676b1982d6a6b400f336b76ac914fc1d9b92f4485068143dd0aef78c419e708c703b761d46bca9422921cc1fb06cc413cf1c361fefc9a29ab7
 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 b427f6adf14e..40d020bef608 100644
--- a/sci-libs/scikits/scikits-0.1-r2.ebuild
+++ b/sci-libs/scikits/scikits-0.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit python-r1
 
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
index f2d601d48fa2..e6a480273e7c 100644
--- a/sci-libs/scikits_learn/Manifest
+++ b/sci-libs/scikits_learn/Manifest
@@ -3,7 +3,9 @@ AUX scikits_learn-0.20.2-fix-cdfast.patch 3401 BLAKE2B cb75c941c2d7a81cde7fe07dc
 DIST scikit-learn-0.19.0.tar.gz 9341628 BLAKE2B c9e0c12558e81efb6f5cfddead028980b0019d2f6d0fdce5662c9138ec3a5b2a3d30b022a5713578bc7effd09894006e8f7f60a3e038ca66297502d9d4212686 SHA512 1b88bc043b08de9b5bb1f3814b8101c73ced010cf94bd725fb69e1ef95b4a9597a34de4a19f84fbbf63e54d47e95b3ff498d611234fcdfcaa5e4e3cf696289d2
 DIST scikit-learn-0.20.2.tar.gz 10275187 BLAKE2B 6865fd101f99930e014f4a2a89616e1ee917df27a5a1b0a931d47503d7df509fe6490799e876a5d68b1cb76a35c6f85e4acbb31a28adfc528720fe9a69e108a7 SHA512 5e0bdea3c40e38880683c6a49cdf2f4c0d40c1f5436c1d8209d613440d5d9d13b9a608e73943a890ef3effaddd930b5c171c45d29700afb8629285ba4aad414f
 DIST scikit-learn-0.20.4.tar.gz 11684276 BLAKE2B 791fd5c7e3ebfdb9bf01524be46b19341b5750fdc5352de9e50cc395a34cf91551825352f18f235b658b55b38829981884fca9f0535a1c505adeb18ac5d87ceb SHA512 a94c254440641a987df1eaec63302639b8e6f56705ec426c350070658141dd574b502eb1e4b94ae9c766c1becfd911f08bb97d5c87d39b0546d8444ed281b06a
+DIST scikits_learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e666fbb51e33954fdf700292650204fd9d1ab4fc4d1695890d02a24ad68f4dcc2d3cde8f0827eca70c6fb9a6f0e5c0d9c04fd5 SHA512 20bcda5c65f76bce9b71c5b5fb1b499f7f3a7a3f6fa5fade80a38dc658cb434e16e9d5a4906a9657157a5cc90a6d51080575d6e510207baa9f8b06c4fa761d5b
 EBUILD scikits_learn-0.19.0-r1.ebuild 2836 BLAKE2B 06bc03dbe61c8afbf4c83f006d23bd4255979fa7a1091aceb9a78b051dee64f721215122196e66dc93b4a47fdac0337e2a75544693104825ea38879837fbbb30 SHA512 3c87b6a8cc2fd1af8614b809f5ff533d2db2f1d1240162a697aaa392b9143d6ac1e5680d423c104fd71051c70bc3fd4caa874b80a4c866341a6bd70bad575454
 EBUILD scikits_learn-0.20.2.ebuild 2888 BLAKE2B 91ecea16f8ca17dcd04519b510c61deb9e78d14362ea3e4f4902bce7a7189577ccb96dc92b530b547389a7c65b957ffa705ca25b680c777453fa1c29c876eefd SHA512 3deb10f3314abb6e82a4e118362724147f09b2104db90cdb7bfe98d804828136a590f0aec53ec873a3c8d718009ff946c660e9efd750d3d550be91c0847e03fc
 EBUILD scikits_learn-0.20.4.ebuild 2888 BLAKE2B 91ecea16f8ca17dcd04519b510c61deb9e78d14362ea3e4f4902bce7a7189577ccb96dc92b530b547389a7c65b957ffa705ca25b680c777453fa1c29c876eefd SHA512 3deb10f3314abb6e82a4e118362724147f09b2104db90cdb7bfe98d804828136a590f0aec53ec873a3c8d718009ff946c660e9efd750d3d550be91c0847e03fc
+EBUILD scikits_learn-0.22.2_p1.ebuild 1759 BLAKE2B 083162faf241e37c8ed611b9192fd6cd1fbb0112d56d315d2045c6b466e9d0bf7621577b4ff65ac37f9eee46f433b06891a8ad9961e1cc4cf017a0a76cab6025 SHA512 1ff3d30f691597e2bf262c8a3d4e792ee06319792f99fdd757114a020b024f1f1b537fb88bbbc90c1253a28414f856c28e2440fea021877a4ec17ac0bd4fb270
 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
new file mode 100644
index 000000000000..804ed2914a01
--- /dev/null
+++ b/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+MY_PV="${PV//_p/.post}"
+MY_PN="${PN//s_/-}"
+
+DESCRIPTION="Machine learning library for Python"
+HOMEPAGE="https://scikit-learn.org/stable/
+	https://github.com/scikit-learn/scikit-learn"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+#ffhttps://github.com/scikit-learn/scikit-learn/archive/0.22.2.post1.tar.gz
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/wheel[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	sci-libs/scikits[${PYTHON_USEDEP}]
+	virtual/blas:=
+	virtual/cblas:=
+"
+DEPEND="
+	virtual/blas:=
+	virtual/cblas:=
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/joblib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# scikits-learn now uses the horrible numpy.distutils automagic
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+
+	# remove bundled cblas
+	rm -rf sklearn/src || die "failed to remove bundled cblas"
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile ${SCIPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	pushd "${TEST_DIR}/lib" >/dev/null || die
+	pytest -vv || die "testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+}
+
+python_install_all() {
+	find "${S}" -name \*LICENSE.txt -delete
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+}
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 0b287d8f6cdf..6f32ffa5c330 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -5,6 +5,6 @@ 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 4065 BLAKE2B 094ef61648731f225c5b27695d527ede440ee6d7fa43b939811c27bbae6ea7aabc65e7bcb5c0d0fdcc169b59e131bc83ffa3704d913870048dcb6ba263ba7fe9 SHA512 b6f67054ff0669ac4a7863e00d2a0357e34aae29a0ae9b31c8d5c7502458ba69769cc6a7a3f43a67f743d8e0e891caf4fe453f829f0aabee523432257129f2f7
+EBUILD scipy-1.4.1.ebuild 4072 BLAKE2B 21c75bfbd592110e76d9c113c9fa898df20f4116634da28bf300d062a69c5874777b3cfe4cd8a114da387a2709966ff6707067e378eddd353c2f1f797f3429db SHA512 e59b75e3f56f487ab81a33432ee0a0f1c6657e363928cc4ad37fee9c4506946147205cd0b5280a3a1709015fd435a0121704a98ceff26db30950c6b124371844
 EBUILD scipy-9999.ebuild 3601 BLAKE2B 3a86b12c2989b9e64ff97119fbb6cea242179287362010f7d3e82ad0298c207a6318217f81626d18549252383a04cc107861b0283420eae2c1ce990fb7252f18 SHA512 3128f47231149e78818440f2ade24d4ca5c51f8e4a89c93e3e4da2fb2303e60a50f2f65b3c5bc32b42ebd0bd25c77cbb7017f2750367eaf7a21ffd3adcef947a
 MISC metadata.xml 931 BLAKE2B 3e358fcc4354b870a4794f13ed6c840f2c55ffdf4d6306977e6db3606b73e7df9b682a18973f0aa2a1d0d9eabb2d7d40c6aa5c6026813385361700bdc227afd8 SHA512 ae95726c4c661a2e5708a98b347f8ea25708574bbaf8ec86f315069551d6a0d68a43279b214be8b54cd20e5aacea1a9abd40a2de43d51f292a830cab0955d625
diff --git a/sci-libs/scipy/scipy-1.4.1.ebuild b/sci-libs/scipy/scipy-1.4.1.ebuild
index b176683c8870..d00d7da75c79 100644
--- a/sci-libs/scipy/scipy-1.4.1.ebuild
+++ b/sci-libs/scipy/scipy-1.4.1.ebuild
@@ -23,7 +23,7 @@ LICENSE="BSD LGPL-2"
 SLOT="0"
 IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 CDEPEND="
 	>=dev-python/numpy-1.10[lapack,${PYTHON_USEDEP}]
diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest
index 6983fc2162c0..787e286ded17 100644
--- a/sci-libs/shapelib/Manifest
+++ b/sci-libs/shapelib/Manifest
@@ -1,7 +1,3 @@
-DIST shapelib-1.4.0.tar.gz 548990 BLAKE2B 0e75481d35f8dc5687eee23696d46a780d4b185a81ca1246e5c19f01e58f4a55dc7b69347c9effa01ac1786c5271dfe3907798cc81fe9314979c502bcb9d982d SHA512 206b81fe859a837e821e449ab1b2dbd5a3aa7abd1871da4aec69e130b6fad6300697429884ce359c90e4b76bca90e2108f32b9fdbd3b92013fa5a39f3bedeeb1
-DIST shapelib-1.4.1.tar.gz 549831 BLAKE2B e579704bd71c2525133f87628261e78f39e8063cd7e8a57997e90a8ca4a6ebb5de3a4d1ab8da5d00afe1363d9eb22e8c7a9a66ac109c300b72b6d26bd87b61fd SHA512 791c1a0d6c5ff09341176f68349ebd760ae91e8749a9f844299d7ac38a42c4f1131e63479c384a8a8b05a89e90d02e9fd92c526cab417eb80b171d639b4a4422
 DIST shapelib-1.5.0.tar.gz 547686 BLAKE2B 3f962ee701d8cfb86a56aa1c0b2156bc2288a2bc908bb1a8303e491812845241f5281b0b8650befcc53e9dfc408b652a56f5e2fdc5ac7c2ff6eb99170696e437 SHA512 6dbd5fc7929ca403e65017ef58211f351608d9ad08221bf68bde047ceecfd27013ce731f9ae4edcfd040bc3db7fe9054b5d96e46128d2968788bef19532b1721
-EBUILD shapelib-1.4.0-r1.ebuild 734 BLAKE2B 01ef8f8b68ef976f4dc0fe32e948af09cb2c0fe8696566aaf21707d13f2ed1d9a726c67f124b8efb6ead679737c7a5e5d08fa06a1765ab15269bf4e9416cd700 SHA512 9855cd8eae880e70691c10cf7fc253dae7720118930a3ff3a8884e6f89ce55a35ac58b023de0883d321cd130f392d11359e5f82beb680c497e83bc239777d2b3
-EBUILD shapelib-1.4.1.ebuild 739 BLAKE2B 54d057ca4143ffa67a6911a9ff755b9cb716b6e01ad93f34e04500da4f7d314f2c96f2f0a457248d3f38c5bdb668511c0c2511156f4275bde13ca0a3da7a3bf4 SHA512 b7692107c187098ec350e8591aa744681819dd603145f491ce3a11d1060a792d23a72e05f69a4d5b040c06514a8354d158137e18c95bd0e56d7cc89dfc92ef86
-EBUILD shapelib-1.5.0.ebuild 731 BLAKE2B 11eddcc77943b51e50691d4a11f62131cf6bed0907c83a09ff4268d51b2bba4f0ebbbf481511c24ed32d543370cb516b96b756023aca9500f947514276b23324 SHA512 d44767c4ab7c745d4cce9e4f5a48518d412ed422e57c28d2efe82a4c79131059af5f6c44bb47516c6f6590771b457d0ca92d16527b72a4080f13a5b090640048
+EBUILD shapelib-1.5.0.ebuild 730 BLAKE2B 93cc8317306991cd5306eedb1e297f76982bf9c37e32a7513a4d9b03ada9249edf3d8730b1ec7e6525cc6121317baa9f1ea02f0c080391234e8e358d4dc5b7e2 SHA512 f986dcef8a808a318e20258a10ff55fb0fe5cce8dcb5d5162796bfb89570b9b294770a27d45a1e76abcb3bce5163264947b986c0f1760488c140a1b4ae3f8cdc
 MISC metadata.xml 405 BLAKE2B ed97fadfd57934dab768c271f100531eb2f5c9e98564b54d73c2396d0959c62b39ee7ce5ad96495f1133cf8c3de8ad2ffcb0d13353c1a32c9be92ad81bd80995 SHA512 9581a1f8123cdcc6b68de0fdc03dfa866c64668222f1d90b55160cdaf8d36e1441f0530fced6b149681fef88321bf33879996199685eb6e26cefae975b704adb
diff --git a/sci-libs/shapelib/shapelib-1.4.0-r1.ebuild b/sci-libs/shapelib/shapelib-1.4.0-r1.ebuild
deleted file mode 100644
index becf6ab986ba..000000000000
--- a/sci-libs/shapelib/shapelib-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Library for manipulating ESRI Shapefiles"
-HOMEPAGE="http://shapelib.maptools.org/"
-SRC_URI="http://download.osgeo.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/2"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-RDEPEND="sci-libs/proj:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	rm -r m4/* || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--includedir=/usr/include/libshp
-}
-
-src_install() {
-	use doc && HTML_DOCS=( web/. )
-	default
-
-	if ! use static-libs; then
-		find "${D}" \( -name '*.la' -o -name '*.a' \) -delete || die
-	fi
-}
diff --git a/sci-libs/shapelib/shapelib-1.4.1.ebuild b/sci-libs/shapelib/shapelib-1.4.1.ebuild
deleted file mode 100644
index 2cdd74bbd191..000000000000
--- a/sci-libs/shapelib/shapelib-1.4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Library for manipulating ESRI Shapefiles"
-HOMEPAGE="http://shapelib.maptools.org/"
-SRC_URI="http://download.osgeo.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-RDEPEND="sci-libs/proj:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	rm -r m4/* || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--includedir=/usr/include/libshp
-}
-
-src_install() {
-	use doc && HTML_DOCS=( web/. )
-	default
-
-	if ! use static-libs; then
-		find "${D}" \( -name '*.la' -o -name '*.a' \) -delete || die
-	fi
-}
diff --git a/sci-libs/shapelib/shapelib-1.5.0.ebuild b/sci-libs/shapelib/shapelib-1.5.0.ebuild
index 1d5eefa7869f..bb0e872ae7d7 100644
--- a/sci-libs/shapelib/shapelib-1.5.0.ebuild
+++ b/sci-libs/shapelib/shapelib-1.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.osgeo.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 src_prepare() {
diff --git a/sci-libs/spglib/Manifest b/sci-libs/spglib/Manifest
new file mode 100644
index 000000000000..c875597d60cb
--- /dev/null
+++ b/sci-libs/spglib/Manifest
@@ -0,0 +1,3 @@
+DIST spglib-1.14.1.tar.gz 1994323 BLAKE2B 69c16d4b1b7f23b652247df01f88d88917083bf4394e4a5e2e6636b49950ae3e06e395d117ba92ed4fc7c4295f61bab53cda25c2b7b3b7073bc888719ac2dee1 SHA512 77f65af957b1cc956bbd7ab555b5d62297b13228187c54cc4f6e48efba84b0fd60e57f79a4cf22a160a550ca0a19c5d71de0219fccd0b370d2ce413d41a5cfb0
+EBUILD spglib-1.14.1.ebuild 592 BLAKE2B 16533821ff23f6a96435da7a3bc6a55aa52392aa660f153859da34913b013f1675d52e37cd2a5407e8c74c1ab4791329d374aecd585639a06b4ad7d0cba32e2e SHA512 5e72af6ad26709197d41f6ddfd9f9b552169b8d6858f8930277250c34d2ff161c184b9a3611069dff91bcc4e3557fbfa88f12a6acb9003350d4044065fd73608
+MISC metadata.xml 265 BLAKE2B 74e5ec829fb82a7e0aadf704a58a8a241797e8ab9e403dff4d83f2eed30d05e3639a70e6c9ac402fd4fd1e91e69cd70cf493ba86b20a1e4673b1376115bf0a25 SHA512 fe668e47689c3e00051c472da520f1bf241f9382ab1a1bdbca4aaf03b8d8a1c8b49b5994e1bccc94d087b8551d2a321a3077c2fb069a1b83c0490f0eb126add6
diff --git a/sci-libs/spglib/metadata.xml b/sci-libs/spglib/metadata.xml
new file mode 100644
index 000000000000..d0522ae93c48
--- /dev/null
+++ b/sci-libs/spglib/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="project">
+		<email>sci-chemistry@gentoo.org</email>
+		<name>Gentoo Chemistry Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sci-libs/spglib/spglib-1.14.1.ebuild b/sci-libs/spglib/spglib-1.14.1.ebuild
new file mode 100644
index 000000000000..3471996ebea3
--- /dev/null
+++ b/sci-libs/spglib/spglib-1.14.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Spglib is a C library for finding and handling crystal symmetries"
+HOMEPAGE="https://atztogo.github.io/spglib/"
+SRC_URI="https://github.com/atztogo/spglib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/spqr/Manifest b/sci-libs/spqr/Manifest
index 71e17011d901..8eb22f1d8f16 100644
--- a/sci-libs/spqr/Manifest
+++ b/sci-libs/spqr/Manifest
@@ -1,6 +1,8 @@
 AUX spqr-1.2.3-autotools.patch 7204 BLAKE2B 52d4a84bddc1fa24f4d783f72ce20a3f058d179f917b4fb5c3be590067ad93b9090679273dd9b34505587794470f7283d858effd9ce8c8d5b165be6bb7f01379 SHA512 23b07ce5bbc993dbb8c7811f04d0c8997c4293ad2ffb6fee07b4fc23d5306499bfe5a84683add88a8d7050cf0ae5ed5e9d5a3d03064ef8a049918b5f2a2d1250
 DIST SPQR-1.2.3.tar.gz 1090017 BLAKE2B 7ecd180f2147229bea7d9230c5f645c1d835e7260d58930ab8021c7d90b3b7992d708af942beaa728bce86e83e008db9ecb7d69cb7a3b1245bab1c9c9bf7c4c6 SHA512 1abcde88e157bc99445e3589cacd6aba875429f1cdef87e36e1d6943c1474a2f8df9a65eff99e92d72e346c02f11194b6ec6829c158f42f689f95845c9b11599
 DIST spqr-1.3.1.tar.bz2 1115795 BLAKE2B 027509745cd336d3ccff27a4f36e51493fb9008fabb84448ba559b561269861be97d86ec841674c2bc944eb86623675b223947fcccf0716052a899ce17850d32 SHA512 1c7644da2bb7a14b9bc26066b84355626ce5d7c396afe5ce496ae72a5ef54431dc817178bfe7dd69ddf586b661c44066ee0850c91dba846a32787d52607749bf
+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 761 BLAKE2B e874a05510fc3861c6a81325d30719cf97b5993bfa94b9570da483c3e7b05282fa83e1c2481103f815c3aab873ec36de269aaa4d52071322974621f3f0a93f3f SHA512 8807c16ef052643a607115e0fd612d65c2e97621fcd0ed4b200e4befae529051d70dd22e6f4d92b65fd32299d00ad001f05326139a64fc19c2b5fabd968e54b4
-MISC metadata.xml 845 BLAKE2B 3bd0f2ca3c7eb01f5de8b5271ea922e550d5fef3f6bc00f9ef7e17cd3cd57a6421f85a16f3343217d140fb447939705538888a1249fe7412bcc28a235b226048 SHA512 73bccff4ac4f1ccc72d4c5e511b4c98bdb6346ca05bf09f6b92585c51a054f27b2571bd3dccc99d6cc928b343beaf4ffb68fa44db8ecb214cd90f2dd5c78f9ef
+EBUILD spqr-2.0.9.ebuild 1009 BLAKE2B 5ed65ca626a6d99698c233a4c6b51f407b3633cb0767f26ceeda068544e634fbdac2724af53f6f7fc91bc383d7db7c5fc9aa425b3e4fe88676ccb66c66af03bb SHA512 9d56736bfa422cf6e4b580ea03e34441ad5e8ffc42a26416990e851f3759f1b101942e5badf5eb2154e2915c67fc8f08e9d373c7422b94dd3ecc868ab8ce0650
+MISC metadata.xml 962 BLAKE2B b7d87c2d66c17b1d3071b8b0a17e39fe77897a9af7e79caf784cd1c370c70467010718ad3ef60314dc6f0db5703b4a0035294fac5fc2552e9bb595132b7991ed SHA512 a8cbc5b0168b847b814c54b874d159fcfd349780d9b64907ffdb1d572babbee8b64f422328fa583ba9f7e0a60846249385acbccf5db2944f7c05bcd33f4ce757
diff --git a/sci-libs/spqr/metadata.xml b/sci-libs/spqr/metadata.xml
index c7ab54f2c476..0d8618db4112 100644
--- a/sci-libs/spqr/metadata.xml
+++ b/sci-libs/spqr/metadata.xml
@@ -14,6 +14,10 @@
 </longdescription>
 <use>
   <flag name="metis">Use <pkg>sci-libs/metis</pkg> or <pkg>sci-libs/parmetis</pkg> for partitioning</flag>
+  <flag name="partition">
+    Use the partition module of <pkg>sci-libs/cholmod</pkg> for
+    partitioning
+  </flag>
   <flag name="tbb">Enable multithreading with the Intel Threads
   Building Block <pkg>dev-cpp/tbb</pkg></flag>
 </use>
diff --git a/sci-libs/spqr/spqr-2.0.9.ebuild b/sci-libs/spqr/spqr-2.0.9.ebuild
new file mode 100644
index 000000000000..16aea9c33e72
--- /dev/null
+++ b/sci-libs/spqr/spqr-2.0.9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Multithreaded multifrontal sparse QR factorization library"
+HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc partition static-libs tbb"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( virtual/latex-base )"
+# We require the cholmod supernodal module that is enabled with
+# USE=lapack, and cholmod has to have partition support if spqr is going
+# to have it (the ./configure script for spqr checks this). Note that
+# spqr links to metis directly, too.
+DEPEND="virtual/lapack
+	>=sci-libs/cholmod-2[lapack,partition?]
+	partition? ( >=sci-libs/metis-5.1.0 )
+	tbb? ( dev-cpp/tbb )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		$(use_with doc) \
+		$(use_enable static-libs static) \
+		$(use_with partition) \
+		$(use_with tbb)
+}
diff --git a/sci-libs/suitesparse/Manifest b/sci-libs/suitesparse/Manifest
index b3fee50ed1f5..2d28517af5e9 100644
--- a/sci-libs/suitesparse/Manifest
+++ b/sci-libs/suitesparse/Manifest
@@ -1,3 +1,4 @@
 EBUILD suitesparse-4.0.2.ebuild 762 BLAKE2B b2eb7df499c9ac1f8e27f0bf90fa8178303090ea3819fc3945603b94d3c3a4259823f7f46f2d824d9d69ec6d457cd1c03a9781e98e4b04706147fd0adc6e2083 SHA512 57ac75b2b86bd6f5476144db5561c0d3197ecdfedccdd7673952c928f6d0c85858c348d8e2821384e802a107870157a0fd7aade95ca7d30aea374642af7af3a2
 EBUILD suitesparse-4.2.1.ebuild 762 BLAKE2B 598b35b6165b24cc5e34f9df5ab3f695d79cee04f693c55d0d302ca5d7e2d52f193ba99fc459af97cfd2fd9badc293e6d814b578b17277a35255a0a16e94fb78 SHA512 7232069fb3d9f5ebc31424d1c88a930b27756a4a111993c8c607b7c5e1df59e089e5c5f578e331f77837c910ad81718166d7c922fe95a571722885c6ff1cc951
-MISC metadata.xml 1796 BLAKE2B d08361dcba469f44488448b20523593502049d5ec571874cdcce310801e1dca66695eb363e6eaba9031d7e0896c0e8f71f98d39f438cc7b40d046577a907491d SHA512 43f5cb3b418015616d24602efadd65cac6f1ea68a552c636d6cb032d00ab6d01c64371477c02d0cbc17dba81edace0148abe7b8babe9f56581abac5e13d4e17a
+EBUILD suitesparse-5.4.0.ebuild 754 BLAKE2B 0ecc95375e4a6bbc5a4d5732802eddb292fe6e5e261da842a18578a4d6d7016ce3c9164a3ef7ce8c15d176980027af6423b2e14c981e308f1f0ee7ddd2827a32 SHA512 469d1d6f80d27382eb9c44bbe98873859ce0556b729a462a0e9abd2403066d3d9199cc84dd7f63211f1bdf102a3034cb60a737890cfe1ceb3f43b0a7ebea036c
+MISC metadata.xml 1995 BLAKE2B 34721d419d77f93f3dac7d99cde6d41f8ea9ed7bdb87a8b88b02da1a151b9dce4b415da56176ba07ef83f55692b9520aea2dd2eaa0b90f5e6847585908e8c4be SHA512 855650d41560fa1a9ad9dd6d7136328f744eb07ea086a275485edb147da394787a92c56890bd8a8613ef2dbf94a32d9c94698c54916461150c5013504817aa03
diff --git a/sci-libs/suitesparse/metadata.xml b/sci-libs/suitesparse/metadata.xml
index a30fdd382ec1..d8c0d9a2971e 100644
--- a/sci-libs/suitesparse/metadata.xml
+++ b/sci-libs/suitesparse/metadata.xml
@@ -26,11 +26,22 @@
     * RBio: MATLAB toolbox for reading/writing sparse matrices
     * LINFACTOR: solve Ax=b using LU or CHOL
     * MESHND: 2D and 3D mesh generation and nested dissection
-    * SSMULT: sparse matrix times sparse matrix 
+    * SSMULT: sparse matrix times sparse matrix
 </longdescription>
 <use>
-  <flag name="cuda">Enable nvidia cuda toolkit for speeding up computations</flag>
-  <flag name="metis">Enable the Partition module to cholmod using <pkg>sci-libs/metis</pkg></flag>
-  <flag name="tbb">Enable multithreading with the Intel Threads Building Block <pkg>dev-cpp/tbb</pkg></flag>
+  <flag name="cuda">
+    Enable nvidia cuda toolkit for speeding up computations
+  </flag>
+  <flag name="metis">
+    Enable the Partition module to cholmod using <pkg>sci-libs/metis</pkg>
+  </flag>
+  <flag name="partition">
+    Enable graph partitioning and graph-partition-based orderings
+    through <pkg>sci-libs/metis</pkg> or <pkg>sci-libs/parmetis</pkg>
+  </flag>
+  <flag name="tbb">
+    Enable multithreading with the Intel Threads Building Block
+    <pkg>dev-cpp/tbb</pkg>
+  </flag>
 </use>
 </pkgmetadata>
diff --git a/sci-libs/suitesparse/suitesparse-5.4.0.ebuild b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
new file mode 100644
index 000000000000..2098b0804964
--- /dev/null
+++ b/sci-libs/suitesparse/suitesparse-5.4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Metapackage for a suite of sparse matrix tools"
+HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+
+LICENSE="metapackage"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cuda doc lapack partition tbb"
+DEPEND=""
+RDEPEND="
+	~sci-libs/suitesparseconfig-${PV}
+	~sci-libs/amd-2.4.6[doc?]
+	~sci-libs/btf-1.2.6
+	~sci-libs/camd-2.4.6[doc?]
+	~sci-libs/ccolamd-2.9.6
+	~sci-libs/cholmod-3.0.13[cuda?,doc?,partition?,lapack?]
+	~sci-libs/colamd-2.9.6
+	~sci-libs/cxsparse-3.2.0
+	~sci-libs/klu-1.3.9[doc?]
+	~sci-libs/ldl-2.2.6[doc?]
+	~sci-libs/spqr-2.0.9[doc?,partition?,tbb?]
+	~sci-libs/umfpack-5.7.9[doc?,cholmod]"
diff --git a/sci-libs/suitesparseconfig/Manifest b/sci-libs/suitesparseconfig/Manifest
index 1cb79e644be2..1b33b7638e13 100644
--- a/sci-libs/suitesparseconfig/Manifest
+++ b/sci-libs/suitesparseconfig/Manifest
@@ -1,3 +1,5 @@
 DIST suitesparseconfig-4.2.1.tar.bz2 256308 BLAKE2B 74993d9a43117e9b71e21856c7b27d4aa6627c64a4235d7d37efa282a0a8e54fa8c6d6aea1cd447902ab8b18bfff1aa1e0d67a6b86d86c2feaf6a9f716ac2f0f SHA512 2363f8adb962d1f932b4390ac54e7203b5eec6005f9275dc155a4b178fd5259ddd42dc34c663a4c82546452c0f1e05619522567a69be1a58efc5d032b6d7a61d
-EBUILD suitesparseconfig-4.2.1-r1.ebuild 702 BLAKE2B fbbe88b875f6bc280dd9ecd0a931adb8c6c13c4331b438f6ea638670691c30d352ee2d09979d9228ab1609b08bcf7147da8f81e6adc3b064c3ae6c9f9d350b92 SHA512 de5fd78b65cc670f422043e15bac5c86eca07f51ecf2ecb68a869353aa448e677a23ecade3f7dff1061fcf0c30a43eb9aaa1ba6b9e6fa11d8225fd64bf3e922b
+DIST suitesparseconfig-5.4.0.tar.bz2 257352 BLAKE2B 3832e34281c742a7d704dde866c53c742420486d782075e047b605fb2062d77353cda8670138c4bef62c73d16e123a8a74f65272a01766f124c1e53f9ba32e9d SHA512 e91f60f426b73add473c6341e30512b8fbe65b7850cd83f3852e78f1e74ce067b7ae1577ccc795698e680a841a9d32c2ca073651a4fe95f0b723578721aec874
+EBUILD suitesparseconfig-4.2.1-r1.ebuild 703 BLAKE2B c24f133a3a9b6b89521f8874c7259f54b3ce69f49e003fbd607d8340f9eb0f0b01b0b39fa0b1ae611f4ea22a75bf3762798ea19e743f399ed00a0a5fb398beb6 SHA512 36174e7f3e8024980d71e971c6b329f9cfe9d67f8b88f720a323d04f36d57e303510a4646d5e696122c6b31ac9c56d393209b143d4ffa6ad3949f9e702bd2118
+EBUILD suitesparseconfig-5.4.0.ebuild 795 BLAKE2B c633ecb9aca6782abde5b57179c2074202ec69d126941f3f4d49cf4a6ff247e5cef5a47121910dfdfbab11736bc4ace7f4717ab5dbf44543c7bb6b6f37bd75e3 SHA512 8f93a7db06f437af31c4f4db0f2166a86c5fe915e0f196cc4952b25720e9c33f1f5a8bb72b8c9d0c921a4150b9af8d7c3557138f9f740c16b3a645cb28f69a51
 MISC metadata.xml 476 BLAKE2B f583e4dc6801797ee1572a38f1e4aaaac0811a709ce56a28d8e1f4f13f60f62a702b034809edc488d0b91920f8c5d40d48226213837d92a3e496cf65a6061c04 SHA512 fbbcd2de1d7b23e4eb45d8102fe76aa4251b83ce2b1fd7ef9cb599c7716ff662b8182060ce7b350ed3541b39483cf72c7c9ac810db1fe739f82406606412acb8
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild
index 658d975d6541..4c9ba78b501a 100644
--- a/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild
+++ b/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 multilib_src_configure() {
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
new file mode 100644
index 000000000000..6e48d59fa270
--- /dev/null
+++ b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Common configurations for all packages in suitesparse"
+HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
+
+# Upstream says, "no licensing restrictions apply to this file or to the
+# SuiteSparse_config directory".
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="static-libs"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+		econf \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	if ! use static-libs; then
+		find "${ED}" -name "*.la" -delete || die
+	fi
+}
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index d200297435bf..1029d5599ae8 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -2,12 +2,15 @@ AUX sundials-3.2.1-fix-license-install-path.patch 335 BLAKE2B ac9a2c33fabf13cb55
 AUX sundials-4.0.2-fix-license-install-path.patch 479 BLAKE2B d77b43b2d30978dce198f51917286b208cc1baccb4230a2eaf9f1e656a23e1b1980bf7c86a4a4bd16a5210b16083aec4e05b316af5a42f6a64631a843d79f7f9 SHA512 99baa802dd367159a82c57997421aad938b52babf3c2444957f46fe9affcd57e9524a6ef0fecdf3ef973e95a032f3dec37487794e397e45db515db01af2893dd
 AUX sundials-4.1.0-fix-license-install-path.patch 479 BLAKE2B c87cf483663f970aba2352e6831fcce7ead9ec7ce3c9a8e451e47481b0c663d698df98ffc62bbc9b6e6117188fcf1272a491b9df1a77d4acadf0625dbcdf2d26 SHA512 a8fa64f8d16e09b86b08910b395f17f2bfdcd82667b789a85bef87591ecdb9b0f01630f9dd65e7892f36261d3ef42ce12c95e980be29669dd74cc6469bd4ea87
 AUX sundials-5.0.0-fix-license-install-path.patch 434 BLAKE2B 29fbdab95a77d983eb95753202ef39f1bbeb0ff25fe6c7ddfef8fae340e8ea958bdc45ee4230f0e42218884bb8f04f9167d94d04ba8e14c77824242a4026332d SHA512 dba0893329c769eb90e03e9c6c2aa84ecd8554640979b0145cc75ba8facea1bba1d645a7876ff1975170df507653d501099a831688f0c8b7422ab69fd29eafc2
+AUX sundials-5.1.0-fix-license-install-path.patch 434 BLAKE2B d553fb3cb0c2653e161c27eac29bc3f15b261fe58c5f6f7cd4647ba7c319022b0377f621eca2a12d51078bfc375a12cb3dedb5ff23f0530686ea95cecd7fb6fb SHA512 41e09d72faa2e1f963f34b0919e72f64eaf55a5357e5b2111e0f020f8331297fffbe8053a0b0be745bbf9ccca1cfb46f6ca8bfbd2c2a2f502551b37957b874fb
 DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad6281f8d29580d9558ad3146dbbaab52794013e9cb56ad83f7309dbd3084a1ccaf6972c6b1468cefcc86bf30d3a460c SHA512 1f3e4b12f368e4f50c38b970c012f1702e339319ee0a858661bdf83e5739bb5b8a36f98b82e2ef76d1ce8a473123046347ee1b44f3cb685509823864f0af1384
 DIST sundials-4.0.2.tar.gz 17183377 BLAKE2B e322a978186f41d84a936faa55962ef6794bf99d6c6a108bfa2bd5615f27f32f7ab6ca4989802fa052d3132b53dca3069b7e4ec9941f95efb92de7bf0792dd88 SHA512 6d0a6fc49c695e70593da71892f0906585dee9c94899bb6b8c9a56c85f345809565166a62544647fdac411d22e37276b9b1bb78ba9be46eaeb28dcd3f6162ef5
 DIST sundials-4.1.0.tar.gz 17221960 BLAKE2B 598c7adc9e37fcfb1f44a3235f58af489ad907d053cb67ee0d3b076076621958374eb847e48318ddf7ced85a7601c5330ac640c7abe8723aaee7d650e3298b8d SHA512 1922dca3f0b8869098670aede802e48abec39607c96304e4efd9b03d195b16920175846fce10641aeebc48c216bda73c8691139dce57ffa7731a6bc8194b81b0
 DIST sundials-5.0.0.tar.gz 18820465 BLAKE2B 77bc7bd489b52ff316f3e889aad4ec27830c42650591270443d45a0aa958d06663e93931a8933ca2d228619263219be4d7441cb473eaaedeab958ae47418a44e SHA512 4962adabcde19207b5044d1e63758d58b5d3cfeefcd0eae65ddfe5499931bf19fa98bafbd4742045cc255f6b4a45653f41df7a7739f86d6eb47c79c9312b4471
+DIST sundials-5.1.0.tar.gz 18496945 BLAKE2B bfe2c88bd1a43c6e0b50e30a4498d23da9e495b4a27e67ff309a032f892cfd8ce54010f567f26b1ecd40a2e21e9364f0b75d0b5dde2771c9e35ad4912e7abf64 SHA512 ad2fef1197fe5680651b63a1da8fab0087416c943f9142e6d0ac8388113fb7e33a7297847f550585d7e8fed1d33111ab85235b3a2f94ac81004f5f3eb584c021
 EBUILD sundials-3.2.1.ebuild 2053 BLAKE2B 5bb930c92705f0b30ef23379da27379c16e19d6ff58239d6da988cdd1463b64757313c6bb2f569229ffd98d979a863c8257e71dcd3696c108bb4e3dd992a4c12 SHA512 fd8f7a523d855d38d132b054d4b6fb6addb7e5f8266bf0eaf932a91cff1200ff4c665a3dafb5ea73d05989eef376b29f145c385cef426ac8e4c847231ce3e668
 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
+EBUILD sundials-5.1.0.ebuild 2067 BLAKE2B 9f3324ddf9158af16d2489ac656a660859f80470077afaa59f0758b2f1c936110701d29bf24c482261055fc43c7b8b3e9bf7497137bacc2b3d487d87034418ca SHA512 2c1d0f672ca0c2a3b5da077557665b9f481cc9a3c8b5bc5f96e59c8cfcd05d5f9956afd2f367ffc141467961642b39d8443ffbe166850280fb12a8a0d05a0e41
 MISC metadata.xml 1059 BLAKE2B 48ccadfac9b7ea4203334ffdadaa76ab3164273835c727e76085db3a5afc179404eb21c74aad77ceb368397377afb0efa27d798c849eab2ffc35153cd4fe7588 SHA512 47da8b9edc993c480a045642ad2746ff6180e54e1ad368823fd81b0d217e72c31394d7575cb4c2d5e5cfea065dffb01751bc8b1088f0f1a6feaaea15c2c7fb8f
diff --git a/sci-libs/sundials/files/sundials-5.1.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.1.0-fix-license-install-path.patch
new file mode 100644
index 000000000000..48b019611cb2
--- /dev/null
+++ b/sci-libs/sundials/files/sundials-5.1.0-fix-license-install-path.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d5436bf..76b27c5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1146,9 +1146,9 @@ endif()
+ # install license and notice files
+ install(
+   FILES ${PROJECT_SOURCE_DIR}/LICENSE
+-  DESTINATION include/sundials
++  DESTINATION share/doc/sundials-5.1.0
+   )
+ install(
+   FILES ${PROJECT_SOURCE_DIR}/NOTICE
+-  DESTINATION include/sundials
++  DESTINATION share/doc/sundials-5.1.0
+   )
diff --git a/sci-libs/sundials/sundials-5.1.0.ebuild b/sci-libs/sundials/sundials-5.1.0.ebuild
new file mode 100644
index 000000000000..c6bc6848c819
--- /dev/null
+++ b/sci-libs/sundials/sundials-5.1.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90"
+# if FFLAGS and FCFLAGS are set then should be equal
+
+inherit cmake fortran-2 toolchain-funcs
+
+DESCRIPTION="Suite of nonlinear solvers"
+HOMEPAGE="https://computation.llnl.gov/projects/sundials"
+SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
+REQUIRED_USE="hypre? ( mpi )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	lapack? ( virtual/lapack )
+	mpi? ( virtual/mpi sci-libs/hypre:= )
+	sparse? ( sci-libs/klu )
+	superlumt? ( sci-libs/superlu_mt:= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+		ewarn "OpenMP is not available in your current selected gcc"
+		die "need openmp capable gcc"
+	fi
+}
+
+src_configure() {
+	mycmakeargs+=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STATIC_LIBS="$(usex static-libs)"
+		-DCXX_ENABLE="$(usex cxx)"
+		-DFCMIX_ENABLE="$(usex fortran)"
+		-DF90_ENABLE="$(usex fortran)"
+		-DHYPRE_ENABLE="$(usex hypre)"
+		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
+		-DKLU_ENABLE="$(usex sparse)"
+		-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="-lsuperlu_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" )
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc doc/*/*.pdf
+}
diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest
index 8200a6c10c93..e31c7bf3d3d6 100644
--- a/sci-libs/symengine/Manifest
+++ b/sci-libs/symengine/Manifest
@@ -1,7 +1,3 @@
-DIST symengine-0.3.0.tar.gz 629813 BLAKE2B 8d611703604f10d1ed8837708fa2125c0e84d12a8513d34e5d4bd44ae55395bcaa8fda92754b538ba1ecfdcacff83d079094dda9dfca6fdcdc4cccb0702cf484 SHA512 e4a906bb1cc5159003969871711f40b3c6bfb9e38ac25258dc5797933d55374a2f201c8a89e9af48821b24cc54408d4feb70f6de421e0a9fbf766d2b35846b83
-DIST symengine-0.4.0.tar.gz 753664 BLAKE2B c6296ceef20cfbb16803adc3c623429cf417c639d45d8cad742c3f7cf9d8171f22fb72e168cd07a6a705726a09133866fa497e2092ec4885ae4462d55adc416e SHA512 162c4bb4c67e2f21a0a113726d7b0ad00cc3e80db0534e95109a41894dcd05ca03a3be39d1a56a336b4bb7926dadad72fbe6705c71df3448db99fde20139ad11
 DIST symengine-0.5.0.tar.gz 761321 BLAKE2B ddff0e756188f375e966b92e6e7796936b8b6fe1a884c036066dc09d46183f157761c9813fe27366e625b7cc070381332964a12f14617be66b0f38f536c0518d SHA512 0b94b531f71adf9129440e0664a5b5ce23453de6c8d22ed385958b38cda9bc2b356a0182a80076f47b217e9f6b5a57f059b040fddf7d69694d5bd5857b0a046b
-EBUILD symengine-0.3.0-r1.ebuild 2114 BLAKE2B 5b12dc098d75469e3cf4dd78d10e3e4b19baa62ff77aef07028bbad902783c005bdb75bba1d31ec539733b67fd4be09df9305b5c03e02181417cc6d70a43cbda SHA512 6db741c9d998210c2f2a78611554d95c4d86be3ea22ce9bc28add645ce1cc0faf1b353f73b88e0394129d0861ec0bd4517146ad509c8af7f52a1e7b23c463e9c
-EBUILD symengine-0.4.0.ebuild 2114 BLAKE2B 0f35f1f7fdf1143fc4ed33fb344e56f25bc3325e18fc3725753497433a6bda7e2092de8092e8b28e7a17d0dee9f51785af6f7019e027550a6d1e1ae17a8ad9b9 SHA512 c2fee700ff34c69a474957b63f193042d1273c35fcb5007f4c19e12e66ef9a9601ac4f09e2206adbfdc57b887496351974741c36496c9e00c9aba5485e7234dd
-EBUILD symengine-0.5.0.ebuild 2131 BLAKE2B 5d8a6d399b944ceb628a8503d67818bebd882aff04d0a92498a0bb714f3018c464f077030ef063cbbc239802d9014facd593b3569e074df17c9e3a8fbc9f7d43 SHA512 402f7cbf2a3158eded9e5264929c89d3aa0cfc3e061dc793982a37e6b9672788b80a630f0136b3bd40018ebcbf3cc0d57c13dfd716f3ef9f7677678df27b3e1f
+EBUILD symengine-0.5.0-r1.ebuild 2193 BLAKE2B 775daf836fc5fc1a0860645201ca905184383f5409e95c482b702cdc4891658f2fcd70e99ef8c5667d536598f5025616398405f0670ec69ddaf42549bef7c00d SHA512 b966d73b297cea26f9b7f1d85014f8753ec009a268844e777a8f453934e13c352803bca48d855933450529c64471da1f09b6fba1d828928187ceed2a71171b92
 MISC metadata.xml 1265 BLAKE2B f91a4783ae464dee61dbca5f532bb73a217600b49633f0c80ee46f7650f27f2e37e32cd4f5e14e171e6a47eb4c612d686f883034378afb73520ed0c22862d564 SHA512 f2a634346a9f703565959b48d7648df6abb088a479819aa3f9818ae941df168dbfa3cb1867f48673fce9f24dc890d05134689d93edb0d6761f2a54f4c802037e
diff --git a/sci-libs/symengine/symengine-0.3.0-r1.ebuild b/sci-libs/symengine/symengine-0.3.0-r1.ebuild
deleted file mode 100644
index bb4276b5f7e6..000000000000
--- a/sci-libs/symengine/symengine-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Fast symbolic manipulation library, written in C++"
-HOMEPAGE="https://github.com/sympy/symengine"
-SRC_URI="https://github.com/sympy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/0.3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arb benchmarks boost debug doc flint llvm mpc mpfr openmp test tcmalloc threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/gmp:=
-	sys-libs/binutils-libs:=
-	arb? ( sci-mathematics/arb:= )
-	boost? ( dev-libs/boost:= )
-	mpc? ( dev-libs/mpc:= )
-	tcmalloc? ( dev-util/google-perftools )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-"
-
-pkg_pretend() {
-	use openmp && [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed -e "s|DESTINATION doc| DESTINATION share/doc/${PF}/html|" \
-		-e "s|/lib|/$(get_libdir)|g" \
-		-e "s|lib/|$(get_libdir)/|g" \
-		-e "/DESTINATION/s|lib|$(get_libdir)|g" \
-		-i CMakeLists.txt symengine/CMakeLists.txt \
-		symengine/utilities/teuchos/CMakeLists.txt || die
-}
-
-src_configure() {
-	# not in portage yet: piranha, ecm
-	local int_class
-	if use arb || use flint; then
-		int_class=flint
-	elif use mpfr; then
-		int_class=gmpxx
-	elif use boost; then
-		int_class=boostmp
-	else
-		int_class=gmp
-	fi
-	local mycmakeargs=(
-		-DARB_INCLUDE_DIR="${EPREFIX}/usr/include"
-		-DINTEGER_CLASS="${int_class}"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_BENCHMARKS="$(usex benchmarks)"
-		-DBUILD_DOXYGEN="$(usex doc)"
-		-DBUILD_TESTS="$(usex test)"
-		-DWITH_ARB="$(usex arb)"
-		-DWITH_BFD="$(usex debug)"
-		-DWITH_SYMENGINE_ASSERT="$(usex debug)"
-		-DWITH_SYMENGINE_THREAD_SAFE="$(usex threads)"
-		-DWITH_FLINT="$(usex flint)"
-		-DWITH_OPENMP="$(usex openmp)"
-		-DWITH_MPFR="$(usex mpfr)"
-		-DWITH_MPC="$(usex mpc)"
-		-DWITH_LLVM="$(usex llvm)"
-		-DWITH_PTHREAD="$(usex threads)"
-		-DWITH_TCMALLOC="$(usex tcmalloc)"
-	)
-	test-flag-CXX -std=c++11 && append-cxxflags -std=c++11
-	CMAKE_BUILD_TYPE=Release cmake-utils_src_configure
-}
diff --git a/sci-libs/symengine/symengine-0.4.0.ebuild b/sci-libs/symengine/symengine-0.4.0.ebuild
deleted file mode 100644
index fcecc23453ea..000000000000
--- a/sci-libs/symengine/symengine-0.4.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Fast symbolic manipulation library, written in C++"
-HOMEPAGE="https://github.com/sympy/symengine"
-SRC_URI="https://github.com/sympy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/0.4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arb benchmarks boost debug doc flint llvm mpc mpfr openmp test tcmalloc threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/gmp:=
-	sys-libs/binutils-libs:=
-	arb? ( sci-mathematics/arb:= )
-	boost? ( dev-libs/boost:= )
-	mpc? ( dev-libs/mpc:= )
-	tcmalloc? ( dev-util/google-perftools )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-"
-
-pkg_pretend() {
-	use openmp && [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed -e "s|DESTINATION doc| DESTINATION share/doc/${PF}/html|" \
-		-e "s|/lib|/$(get_libdir)|g" \
-		-e "s|lib/|$(get_libdir)/|g" \
-		-e "/DESTINATION/s|lib|$(get_libdir)|g" \
-		-i CMakeLists.txt symengine/CMakeLists.txt \
-		symengine/utilities/teuchos/CMakeLists.txt || die
-}
-
-src_configure() {
-	# not in portage yet: piranha, ecm
-	local int_class
-	if use arb || use flint; then
-		int_class=flint
-	elif use mpfr; then
-		int_class=gmpxx
-	elif use boost; then
-		int_class=boostmp
-	else
-		int_class=gmp
-	fi
-	local mycmakeargs=(
-		-DARB_INCLUDE_DIR="${EPREFIX}/usr/include"
-		-DINTEGER_CLASS="${int_class}"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_BENCHMARKS="$(usex benchmarks)"
-		-DBUILD_DOXYGEN="$(usex doc)"
-		-DBUILD_TESTS="$(usex test)"
-		-DWITH_ARB="$(usex arb)"
-		-DWITH_BFD="$(usex debug)"
-		-DWITH_SYMENGINE_ASSERT="$(usex debug)"
-		-DWITH_SYMENGINE_THREAD_SAFE="$(usex threads)"
-		-DWITH_FLINT="$(usex flint)"
-		-DWITH_OPENMP="$(usex openmp)"
-		-DWITH_MPFR="$(usex mpfr)"
-		-DWITH_MPC="$(usex mpc)"
-		-DWITH_LLVM="$(usex llvm)"
-		-DWITH_PTHREAD="$(usex threads)"
-		-DWITH_TCMALLOC="$(usex tcmalloc)"
-	)
-	test-flag-CXX -std=c++11 && append-cxxflags -std=c++11
-	CMAKE_BUILD_TYPE=Release cmake-utils_src_configure
-}
diff --git a/sci-libs/symengine/symengine-0.5.0.ebuild b/sci-libs/symengine/symengine-0.5.0-r1.ebuild
index 5949ae7acbbe..2c9b5a766fd4 100644
--- a/sci-libs/symengine/symengine-0.5.0.ebuild
+++ b/sci-libs/symengine/symengine-0.5.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sympy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/0.4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="arb benchmarks boost debug doc ecm flint llvm mpc mpfr openmp test tcmalloc threads"
 RESTRICT="!test? ( test )"
 
@@ -22,6 +22,7 @@ RDEPEND="
 	arb? ( sci-mathematics/arb:= )
 	boost? ( dev-libs/boost:= )
 	ecm? ( sci-mathematics/gmp-ecm )
+	flint? ( sci-mathematics/flint:= )
 	mpc? ( dev-libs/mpc:= )
 	tcmalloc? ( dev-util/google-perftools )
 "
@@ -56,7 +57,6 @@ src_configure() {
 		int_class=gmp
 	fi
 	local mycmakeargs=(
-		-DARB_INCLUDE_DIR="${EPREFIX}/usr/include"
 		-DINTEGER_CLASS="${int_class}"
 		-DBUILD_BENCHMARKS="$(usex benchmarks)"
 		-DBUILD_DOXYGEN="$(usex doc)"
@@ -74,6 +74,8 @@ src_configure() {
 		-DWITH_TCMALLOC="$(usex tcmalloc)"
 		-DWITH_ECM="$(usex ecm)"
 	)
+	use arb && mycmakeargs+=( -DARB_INCLUDE_DIR="${EPREFIX}/usr/include" )
+
 	test-flag-CXX -std=c++11 && append-cxxflags -std=c++11
 	cmake_src_configure
 }
diff --git a/sci-libs/szip/Manifest b/sci-libs/szip/Manifest
index 2d2c1c7a7e8d..9f5e447101bd 100644
--- a/sci-libs/szip/Manifest
+++ b/sci-libs/szip/Manifest
@@ -1,3 +1,3 @@
 DIST szip-2.1.tar.gz 383219 BLAKE2B 84e10763bcec885a423d64c2c3cff0632d7a6a39c8cd177cf607f549cb4cd02a4ca03362464c2c4ec4539c80149493329427f529f5d6daea4a35b91af6fa1538 SHA512 bb7e0af6dfaaaaa85013ef52e6901d5b7b6159795338d285c2e843bd2879230a6397fb072662fdfeda5690981db4e9af94782c057bf993f92516d92a8934cb75
-EBUILD szip-2.1-r2.ebuild 712 BLAKE2B c0cb7d1522d2eba2985f50973746cb22aed2da3e336e488bc55e6b03792ef69962e9c836e33b223d341db10cf10c781f029f0a213949f9fe4f62f309f549cf45 SHA512 26cc6f8c06585ca0f36c3051bf12be5ddf43eebd9e0523f6df71935996cc2cd90e6a0ac42a0ae6b6303db8369ad50d31aaca5b205d46da4d66d1310d96678ebb
+EBUILD szip-2.1-r2.ebuild 713 BLAKE2B eee29f5269f96977d39f756124b32249a5dc0be413fb25bb536fab05b254350564a7d4299985f12fcfc203031866aa1ff1a24311cab5b79522ecdc3846da3661 SHA512 6319b14942b31fa7ec8be0aa95d87d9eaa008a67a6c8d3b6cf7b4ccc42c86de975d42957c4cc7ae35c54972435fc99eb73f019e2a5ff51ac886ab683d982985a
 MISC metadata.xml 765 BLAKE2B a720dfb9f71c9f9adc5e539b2a791b8edcd2fce2b1540b17066c09e1d3895d40e147ddd2ef86499c6a9db3c2c68c3bb9aae3357f13d86370d7fba8069f968368 SHA512 c56edc42adeff2e523e9a312b0393f45647b2a902334221d2b9842afa1ecd885a17f108041cad69a0797bdc1eb58c75672226a0c3a2f4c8f561ab8a70eb28b27
diff --git a/sci-libs/szip/szip-2.1-r2.ebuild b/sci-libs/szip/szip-2.1-r2.ebuild
index 6301242771b5..7e5ab7936ab2 100644
--- a/sci-libs/szip/szip-2.1-r2.ebuild
+++ b/sci-libs/szip/szip-2.1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/src/${P}.tar.gz"
 
 LICENSE="szip"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="!sci-libs/libaec[szip]"
diff --git a/sci-libs/tensorflow-estimator/Manifest b/sci-libs/tensorflow-estimator/Manifest
index d0ce74e5b07e..12f7aa198000 100644
--- a/sci-libs/tensorflow-estimator/Manifest
+++ b/sci-libs/tensorflow-estimator/Manifest
@@ -1,8 +1,10 @@
 DIST bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip 72534 BLAKE2B 0bbcc2b3fefb8df84d9f72b13da59c377fcd657ead378f85f80a587f8750302236212ae5c58819933015e62425126bead0733d2924a567fb9c5cb14fb75271a8 SHA512 1818c555504ba89afff88d75fe8b4e1386b3665a3ad477c26b4e9504c8f52f398b6aaedbad41a4ab8b8d9b3f86e0992e7c83a6da70241685d7b79ba177af1035
+DIST bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip 159656 BLAKE2B c2ebed5165907e5452db2e8797253ce17fb39a00d3ca3aab11dec475399821dd529629d710af6f9892b74d0654293bd7989fa2be24caf5836490e8df566c7c18 SHA512 deecf484f5e888db345a57c3b557d6548e4e71fd4c62ea10b4dc9c47be9d303df55c03bb446158675b131064c4eccb401bf217e131e78d629c8fc1836600cb51
+DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c
 DIST tensorflow-estimator-1.15.1.tar.gz 696316 BLAKE2B 7797ae13fa5f56920df912f7d0eaef214a381acb25632dc2d21c6bbf5744bcc36b32f21e30b18be16d37f7a1deb30b2139d58c2c0f97a1de7a5f767a8a5462d8 SHA512 ae42057870cfb0e19d45ee59bd99c110ecfb3ae43cd5a5536711c7d2528b429c433b0f594e462eae9c40b34dd7813f3b14b1282cbf2edc725e13c45e93da818d
 DIST tensorflow-estimator-2.0.1.tar.gz 618583 BLAKE2B d4ae6225cb8a56febc9ffa64d5f811fc41db462534361a183095f724ce6deb17fa22edbd13bacd2d556adcc023dff1daeb7bf7338360b3cb49b19dc3bc3e97d0 SHA512 d7aa35784aa2726c49039be50b73cc957e7f883414bb43101527918bacfa55632df89e6f54cfc58a096512fc49a6ea7524aea87af0579c2a52db2ca7f5ee4bc2
 DIST tensorflow-estimator-2.1.tar.gz 622792 BLAKE2B d1c8abb22d90c789ebfadaf78ca932f87428274afe6e1ac20670bf6d2b4c1c6ea8f367b1eb7ee64ff9f6e9b8ecdc2f64113924e7e2286e3f4e3d2c36cb101794 SHA512 4aaa21969299b02443e9396c238ef4c03af3bde1d0142a81c04d9706f18b02bfd125f3aaf8ffb47e0a3ffad949c3d3bca3909375f12a1c1e4c55ca1cc7930d51
 EBUILD tensorflow-estimator-1.15.1.ebuild 1328 BLAKE2B b629259c42c606f8620f3efb2b56c253dca488c59c5c4df52a241c1e279856484e8fc289cc011044fff2ad4d80138234a20782d9a396ce84716f453530cacdbe SHA512 722e5579e71df900c0702980197e1eb532ace50817769363b42d9ba413037c339eeae61e625b6fdf53efbd95d821fc83ea7ed12a62e77a1bcc945abcc8916148
-EBUILD tensorflow-estimator-2.0.1.ebuild 1527 BLAKE2B 846fb24d0b0cc085c02a43254b5f8bb2c2c160198315f3188d8c57689b1a378361be3f7f93036a78a17ed34d9552613d09e8d2cff81fbb834b3160f40ed66554 SHA512 eceb919ccd58559c84a301409b82bbad4eda4ed92a6adf6f20f2e4507e6e97c530393a6179efb12a869d5e7ae4c92ffbc0ce63f943359fd5e1546d8a02a78e98
-EBUILD tensorflow-estimator-2.1.ebuild 1527 BLAKE2B 846fb24d0b0cc085c02a43254b5f8bb2c2c160198315f3188d8c57689b1a378361be3f7f93036a78a17ed34d9552613d09e8d2cff81fbb834b3160f40ed66554 SHA512 eceb919ccd58559c84a301409b82bbad4eda4ed92a6adf6f20f2e4507e6e97c530393a6179efb12a869d5e7ae4c92ffbc0ce63f943359fd5e1546d8a02a78e98
+EBUILD tensorflow-estimator-2.0.1.ebuild 1853 BLAKE2B 13a0aa24ad860e69af5c8e180d939bd074c909bfcef47d5e9d16074cf010927f51bb64e6a48a7db00a5a817db70f4aa7071a32e89439b6864cc406a3cc13c59e SHA512 295825f9278094596f880fe69898791b00b68f71b4e7b6fd2efdb7357d2090ace62eb0d45b7b649f222544c789d8375bba73776a5428b587ba01367024af6615
+EBUILD tensorflow-estimator-2.1.ebuild 1853 BLAKE2B 13a0aa24ad860e69af5c8e180d939bd074c909bfcef47d5e9d16074cf010927f51bb64e6a48a7db00a5a817db70f4aa7071a32e89439b6864cc406a3cc13c59e SHA512 295825f9278094596f880fe69898791b00b68f71b4e7b6fd2efdb7357d2090ace62eb0d45b7b649f222544c789d8375bba73776a5428b587ba01367024af6615
 MISC metadata.xml 580 BLAKE2B fb81098968d0fdf34a3f28dabee76df16be5393cb9ea79ee4fa670af985ef3f70bb83f14be84a0cc0e564e6626007c2977851f8299460b483f88325be155f4cc SHA512 6aef6523502a3bcf0b2ca59cf7480b92032b53020cccfa715203e5a48c960ecc92c94fa75f98a234da2d51662d43e0c1a85a1537f3ab67287cdb8183476a0efa
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.0.1.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.0.1.ebuild
index 937c3b58dbb4..32a54df07f94 100644
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.0.1.ebuild
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.0.1.ebuild
@@ -19,7 +19,9 @@ KEYWORDS="~amd64"
 IUSE=""
 
 bazel_external_uris="
-	https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip"
+	https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip
+	https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip
+	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
 
 SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 	${bazel_external_uris}"
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.1.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.1.ebuild
index 937c3b58dbb4..32a54df07f94 100644
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.1.ebuild
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.1.ebuild
@@ -19,7 +19,9 @@ KEYWORDS="~amd64"
 IUSE=""
 
 bazel_external_uris="
-	https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip"
+	https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip
+	https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip
+	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
 
 SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 	${bazel_external_uris}"
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index aef53232a9d4..692d27492db3 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -8,32 +8,45 @@ DIST bazel-skylib.0.8.0.tar.gz 72941 BLAKE2B 1928989d3e5dc338fee974c5592a524adb4
 DIST bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz 660374 BLAKE2B 549292aa3ad8a6e01c29391a123f3cbc84d1f714ff9c68bfc6c8df07fa0ba3b19c22e61627f227a8a484f6d7d6c59935fd7560c447559ff5e774ddf1437eefe1 SHA512 83531a2646a9f63557eff6fefaf551ee7e9f0ccdb31374d7a17c35b9f9d844b9b405597972fcd31b2b68e9da312511bbfd9c8fbb75222f5924e1d2500cd1c2a6
 DIST bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz 505681 BLAKE2B f16225eb11859f487335bddca115c9c2a05731f4bfe4240609a47e17b706d9a25b6b363b61404b4d5df0471e4dd9b4b9befbf78dbcb1c7c11e3f590039ff92b2 SHA512 7723baf2c710adb063375a33fd64e3941fae7e98c824764c266d5554cc0b0cbb1c91a5c2a9058bb4c8766ec404ca556199ce22965a6de4baee09cb740b7671c9
 DIST bazel_skylib-0.9.0.tar.gz 84644 BLAKE2B 40b69a524e632ea00d34b9cf805b882ac4c549dd465ef37f28e54729ff1b614a7610a4895cede4e0c938edba5b19f781f3c0bfdb62bde628ee0af21d6b679546 SHA512 af4bcb641fed05d15f2d0ffe0e3abdfe9c7a5deb9c53064992d6605d224ded1648b1bdfa293e161028913f9f2c178c68cc38bc16028892ca5b0f52b4e645209d
+DIST bazelbuild-apple_support.0.7.1.tar.gz 20070 BLAKE2B e72098fc5017e3371b6af0f33f392a42da18376052f30db5dd602c5ccc0176c1ac8002cca3f598845c5cb33406b4fd8d30c5ea47c69add6c530b75dc6566a4b0 SHA512 bbab25c229404123d7d424fa261480cf887c749ae729cc1a00bd6c2554d4b4b3fa81e0eaa670542b3a5d3301f3bd5dcd7727d011ba854f13dbbf4f65895e4b08
+DIST bazelbuild-rules_apple.0.18.0.tar.gz 1333446 BLAKE2B c7667e05c236f4de44573707c795d31c980242a2ea6eb69261403e7b1b7cc852d899c9b76cba347df1b1006542f9d532d78586a3bf5f831d37f8f0c0cd79a8eb SHA512 209b21856642b03dc7d54c0c82826224167df7da4c6dda3d29490e0661cdfe35ad9abe763288e0ff80af4d681a361efb22e0ca45ead6fb96fd38f211bcb4435d
+DIST bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip 171775 BLAKE2B ec0ece4555d779bc8380937baac517a8adf3b0176c4bfb1324943a91366ad9688f528a4bd69e4587bcc4ad427c71a53016a3e2d32a050d9d4ec99caac4967a8e SHA512 5c5e82f276c1c962fbd9c7ddf21df9aa4291f3285f3fa07cd2c2790475ccba670b0627fc3d6faedd1508eca4d80bdae64a31383f001f04f3031112be81c3e697
 DIST bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip 72534 BLAKE2B 0bbcc2b3fefb8df84d9f72b13da59c377fcd657ead378f85f80a587f8750302236212ae5c58819933015e62425126bead0733d2924a567fb9c5cb14fb75271a8 SHA512 1818c555504ba89afff88d75fe8b4e1386b3665a3ad477c26b4e9504c8f52f398b6aaedbad41a4ab8b8d9b3f86e0992e7c83a6da70241685d7b79ba177af1035
 DIST bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz 464906 BLAKE2B 033d76b8081f4f987e64875ad5c8e7b8f894ec6be58c52ee02c4d31d4480fee02f3f432ea9c4630ad3f5d1163f820aff37f6493da797ec51b148b361ab3c8b25 SHA512 2cd841f4530503ed31fa6425cb749ef29f8a1071b5d55594644303233e58455783cb02402bc23d7104ef036745733087d43075a1fcdab2ac96cd1a9872a6ea4a
 DIST bazelbuild-rules_docker-v0.10.0.tar.gz 549649 BLAKE2B e7a537b21138a5c5d9ce360e46238f57c917d2dbf5dd17887607402227cbe7c5d68aead9db0ecdb74c09eed9dac26eb86e004a9020c251152d15beb48be0e0d7 SHA512 7802107f8520c88646728800637cce54dbcefc54aa4361288a5b46e403e41998bc23e16fbe94f23a2ca52e5c33fc255af65846963c2fd0139ca1195435ce1b03
+DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c
+DIST bazelbuild-rules_python-0.0.1.tar.gz 2302092 BLAKE2B 1db52eebf2461d779f764f2afdd070d1d0dd65eb2b83ccd98c2831da1784614ca281b114064729a9f257c64eceb62975aac8362d231c84f32abdf19aee7a1852 SHA512 40fa069a4482e2f83e29dc8e109652d14d187b2ec8efdcd36e98d117de93d66a938ed74999b42a2293fcb6eccc0a111cbbcf65c5c155579214bb1b96644280a5
 DIST bazelbuild-rules_swift.0.11.1.tar.gz 107453 BLAKE2B 8cd686b945b5c9de9c8bfcaca38cd7c513bb8b55b4584bc569463997e7c5abcac3be4a5a31ccf95a494d17f3078ec9b1052497dba228fa3159a0c0be2a83eb88 SHA512 3479d6d8ce9111a39b9ef2e014399abc904e432841570dd0380104d80e4d3a74b6ff5cc6d2b250bcd15b152efa29d08f9ed092f70fd8bafa6deaa6f847d7f626
 DIST bazelbuild-rules_swift.0.12.1.tar.gz 111674 BLAKE2B 7c116d6098aa0725034dce4c83628c31c85c36a6331b44636deb2efe0f689a5baee8081b33d65e3727a83bca865bcabedd6f8fa1fdb60e901a9b60840c52c018 SHA512 6136feb3dc0074f82500000cf5335f046f21ea3a1edcb4dcb22228c82b56ed6a334e4b03e4e26a4d25549581abcf7df22b60a2bccf823a51bf270051fe18d489
 DIST cub-1.8.0.zip 602396 BLAKE2B a5e302a52e04f85ae8e1836c59e799532a8b961a8d10c08fe1241c9045f88e31f1ebda6d26124b85c6df40968e1c7b3985a39961bf7614535aafcab2da1a576a SHA512 6167c5be94989f88e05a07508cf69cf2c6b22a5ac733804043daa46bd86a44a15a758b1ffb811bab28b82039d027516ed85b3d9f7677a740a7e00ec9c2f81aed
+DIST dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz 39637 BLAKE2B 532a3ce3d0e354a73c19433f0210a64ecbf00d9134d06a0ee7462baaff3f2b981524aa630cf250595671d6673105724482c7d69e803179aac247f2020c883bd0 SHA512 3728db5213e887fd946f64ba5dc0c336be9a72a0966ee83f146148749ffc93ddb342e0735df6117d7943874c18f87de5791a28e4a57ea420bb8a4e2a5b7338bc
 DIST eigen-049af2f56331.tar.gz 2485848 BLAKE2B 9d8a91782c9d40b7a6df101d2f43df25b5a3622bc02a7b9576929afb1f2f3d7c8b80671d24f1e31670883003b60c4cc0f3c9dadff0430d2ee047eb5122805edd SHA512 ab37106e9dfebbb42d7919c16b301887607080345b7ed63c8e3b8568489cfdc2c3ca0117a77905162cb3ba8324753040c841d2c96521fa4b9486f0778f1962df
 DIST eigen-49177915a14a.tar.gz 2496808 BLAKE2B 4e89b72a2ca121e9d1951a7179434c9eb70104ad45e63ae9811e10e28e32d51386acd2fe6938970404dcada8a377d1b3c07a68a98a68a036a6e85b2cf9ff4b48 SHA512 eb036225b41ffd8cc61ef99d2d22030c0d1e0f87eefcea4dd2b1fdb16a5316e0f4f17527983a00a8a684067654bf1f87c82cfaed5764829778660485ebbfa4b5
 DIST eigen-4e696901f873a2347f76d931cf2f701e31e15d05.tar.gz 2580537 BLAKE2B 927897c80f3529da40a76ddde26113403926d730fa4539aa9e4121406e8d3852abcfdbc55d178723300e9daa26176f6170db06bb49a59cb190e8c7e6dfdea4dd SHA512 d5461e615044aa94b6ac9ab2815536f4bdf2b9ccfeb578cc7bc62554ba928b4192450f72f1350f3231ed44d2bb90e95218de9a5d0bcee9ec02867499a6dc5db0
+DIST eigen-52a2fbbb008a47c5e3fb8ac1c65c2feecb0c511c.tar.gz 2585583 BLAKE2B a2ce9da5f962f891cba748f46ce43667ae2b7fef54d4cc83411eafbc24b331e586c44fb135a2c3597c77fe62b0c8ff1172ae5ce6876f00ddd6f6ef2eca802d9c SHA512 65a73d26474547db83b9b40a133dd2a021e0f5a459104f63124461b4aac28bf3579dc81475441b3576901f28f704d6d4624939b22ecfbfbec896148c4c38da7c
 DIST farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz 467122 BLAKE2B 8b9dd426f4b9f732df6c8c09d868d1b1cc006c395b1525c46ea91c75318b723358c8e64bb0d86a73aace2032eded93f0d80cc7c2c77fddd6a39e3402ab4f2cb7 SHA512 7f5110514a8cdc7ce48d33fd94ad67d96a24e42e11b203e4d0986f4190545f051b2a63f8e09f2ac38c3aa4a5c62d9a0e02cd8ce02045037381fb62a99f0dcd00
 DIST gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip 935628 BLAKE2B 09bd1dd1e367b1e5c4fe9a9525449c09460f19168bc03c57ad563aa27ec74a18f08b620a3dab6da4fa1a1448cdc7ce8bc8a089becc033b53fff4cc07593315ce SHA512 bd42a364f718f3b077cd9c840d626bfc1fd92ace98ce43329d8fa54700c9d28cb47568b6567e9b081b340af7be621c44be1ce06d4b8dccc4fb5d82c35b12f951
 DIST highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz 138574 BLAKE2B cecd95039fc31545ced38a1949e7cb31d6f34deef7c8923b573aa7a632576d0a9b60fd24fbc8a40b8a840a7d2442ea28382fe842178a77467772ed4ba8a2cfb6 SHA512 d25162ed266a8c9c00e6978fcf642cf924f03c0d196f971d0d6f6a3454ca7dfc82f758eabd038ac08e0a5dacc51eccb9b674f588f64692f37cb7a17150aefe4f
 DIST kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz 44744 BLAKE2B aeea5d23c122417ddb70a44354890242c4fb61c456fba9af79054293a1355939af51a681760ac27be55423f888649fd2826e634422c7e9cb3749a9d7f50ef990 SHA512 30f4fcd351bbcb950a27e2a77ca100ccdfd37deb17a05e7e31c3e8f1c56d7c626ab81bbd7497484e6b512e41f7b1bed714722a194b2218c669b297911101df7b
+DIST llvm-387c3f74fd8efdc0be464b0e1a8033cc1eeb739c.tar.gz 115936989 BLAKE2B 624b4a898321e62002cbf3955f844755b3ba6b1c8acf9a310ddac19cf21f9627902eb0b3684e42bac1fe835be972322a5cc667f78a6e2b0e699f956e0cab81e8 SHA512 09ec39ec7a25703bbb47befb406be3de6d15232c971fa186e33dff80192876a827e35523a9782365e26a90abd42b32b9a2ee1443af71cc23cd825b3ff05df629
 DIST llvm-7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz 50144723 BLAKE2B b744756c9782e5506fd6628531409e305bd9ce9a79f1776c4fe674cec5b01a86ab1793dc602f704d295587c3d769d622402a4fe07c0d66269c7f610178693bce SHA512 43f185c8dd38ae7cb048bb9c98fb94e1f43ce66764b43a7141a06a1a0b011389fa139f34b7eaee72c39b8f44aeeff3e7a2189c11d10f8f8a93e9792a1acf2b5f
 DIST llvm-b7d166cebcf619a3691eed3f994384aab3d80fa6.tar.gz 49997477 BLAKE2B 66cbd71a4ad65768fb39fd622efd54a7821b83eb105871e82e0b99074960cb4ebd8197ef984b0be29d5178a7ce3c0d4839d2d611c96fe1507227f7f28fd7e156 SHA512 79c6d4986cedfc132f085d2794f295fdbefa772cb53d3870963d4851ea15ce8e2863aa50c903930abaff53d818ad97acfe8acd1c923ccbe26e3a99ac2397ae9f
 DIST llvm-ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz 115788302 BLAKE2B ea18d6cb3cc8311a78e543996d88831e1ecf1dec58b7c890a80cd8fce86e1c52244b9cfc0d7ce0867480465c2d914555c16cf003bfdcf90056d63e8f4e0ea0c0 SHA512 5422762ffe1022ad4588bcf2bdce1a041c37b5edffed70fcefdd911b2dbf8b52cba9ec57670d48d7b69be6b71e354d333d6eaa5ac5260df56ed8ab18fd98fe88
 DIST nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz 107044 BLAKE2B fd018b1d40977add357e98382f41e3fa6456bdc9a181e2d6cc7a3bc7fb98d242b3216b5ed0c40323bbcc006ab5221b49819ebc1dccd0c8dd700d9504f085eed1 SHA512 e66f323abb68feeec41927cc23e3a85d82fd1b7105a6232626edba95acb9eb22b3fb8b28d1a7adb536c47c936f68271fe5d8f66d3059e3128608ad826dd7622e
+DIST nvidia-nccl-3701130b3c1bcdb01c14b3cb70fe52498c1e82b7.tar.gz 123898 BLAKE2B 9a268e089877fde9ac900b43bbf829f7dedfa701b017568647e3564670d5457dc18c96846a2cc8674b243c0c7d97d322e7466167c322588af3ad4f2d189b175b SHA512 9b090a963213eb088edf247e72b51a6cc79669f507831b88205c75a006a43f3d2257c4e75a34c33987c7d95c421e2273642db4c716b02907e8de1b1ef5d080f0
 DIST oourafft2d-20061228.tgz 54434 BLAKE2B 382dd5787155b877a2ad1d624596afb5dbbe146a7aedf044d7f016949deedac871a512a030b5e6ac9ea5310e216788ffb99af1dd9d2a0de3f1ad72d9e5e7a3db SHA512 af993f68e8e1eb3cb927a51e86da8f74cfafc912a7cd055515e50fe543dd19ab5a6f7b1c2be4a55d6f4a0e5d766ead34c3be4c5705be6353f78cb2a55bd5cf16
 DIST pybind11-v2.3.0.tar.gz 564520 BLAKE2B a7c1485aa8f63a00eccd3103cf9f531a080b049be02e6182b30503ae6dd6c55fc517684ed9d92aaec244efd5f77336c68d1ea546833f7f0ae2fd7b090c19a02d SHA512 04542fe9dca2ffdb86c15698a4bbc041446a9f11970092e89a482ae0ff64c932f62fff8f437b98bdaa006c1fccabddd79f0c7e376f27daed2150b1d2f988e8aa
 DIST re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz 316237 BLAKE2B 8a975bc3e78b690f70944651c7022c6d946f40b2eb5fe01b2e203141f94b890cf1ad5c72af8e7c6ff3c5242d42af5a8657ed69e3c74d9ac081beb15de6334c0c SHA512 e3e00e92700d08bc55ba0e96148ddf1e00de2d329c1fdac08691ff15976937829f66dbc84af886a4b749ad66ba4ab208d66811e97e33bb9c2d7359735406c450
+DIST sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz 2569603 BLAKE2B cd66dc8a0b4ad3ea586a79ef588c8d68e4f05b6ea89e6d8119b5ee338b9046c11a747ca57c2f80a3c90fab119c05e85f5965571c9e522ccb8a312b95804d1a36 SHA512 b819d050bb38246b503f1eb3d6e7d878d0f166f3602ae3c327749b1f6ddc2b1d6ac7f768b1f1d055b98b7b98812e4643a75bcebc9728c7f615d67ca739761b3e
 DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856
 DIST tensorflow-1.15.0.tar.gz 46183168 BLAKE2B 5ccd87d5b53d6c543728e9c7ef96f12149bd8729620838b07a28f752fd5c57ef88350c2b62e8c44ec3561469eda38d8a64cbfca5e1ac7850674e1dd2c4d605d6 SHA512 f8683a950be6a3fa234d42e0f46bd9e049280e0c1d203c5c00ad44cf4728d894f2c301939d6d71203f815130a1ead53127adcc7565009589ff5aafc878b4dba7
 DIST tensorflow-2.0.0.tar.gz 46176997 BLAKE2B 761e91a774f61b50459240a83fe52f723a76c2cc3eaf7c371684849cb7365b94fb3743ab8de9adffe64bef0f70da2bb0b7e6426a3f402e436eff841d3edefe8d SHA512 c3a2cb9673d2ade8e83961f7d944165123d0e4d94e6ca4d8fdee4f02f536893b879bbbf78d3ad5e557467b58f97f7194f2d9cfc64d7d05540969be732070eecc
 DIST tensorflow-2.1.0.tar.gz 41637803 BLAKE2B 63aac95cdb71097d2e7a257a691a2b51703fb22d2535395494adebfae0d3f97f8dd9e0deaadf1c2f3d3d26138066a7c6fb9b9728b5b0ac3d54360d7b5e4bebff SHA512 6d09ba3c097e4b3d712e7164d649841572c418d56c207eea6d31e3b1851b84ce57e82801d9887d84cfd8fcf990a3ea4c4b4b05265f8d625509986412c230c3c6
+DIST tensorflow-2.2.0_rc2.tar.gz 42090496 BLAKE2B 016a6dac71d59a4964a78daf0297cc037f104ddc5ace22a093780cb04312660861b50877bd996a92308d3bacb23bf8a25a0606954cd0b8a30943367bda8df4df SHA512 505f03a2e9c57638aaecbcc83fa5b292a038eab9c4777cb75a4ee2c9926cdc3ade565326abd0eb7bf1717972f4a2a20941227afe29b79f0519fd724fbc15d959
 DIST tensorflow-patches-2.1.0.tar.bz2 5737 BLAKE2B 67f5004312389ed19e810aad9f2d5d4839d806b5a7422963520e0dff06b91346683647db757ac463af13ca70861a7ed9c94be242910abacc6be350e162947225 SHA512 a20bfb619d59e0d2741a27ce36e3d38dbb7a5a706d6bc56f8aa94b5b72288139ad301fc06390b128ef1c3a88b758d09d0224351590dedcda9c5309cc55af6fed
-EBUILD tensorflow-1.15.0.ebuild 11924 BLAKE2B 676bdcd9ea4adff9bf622bf1cf9bedfbd2eeea297db3e608e030fdbc1607feafeb865c3eb526f127998c4ed7149e0efebc267daf794d7b6cffb13fc49d5700f1 SHA512 e08207530f1e11b6987c14c589e4ffb0bc959a0ccb5d4a45ba7bddc12b07b4cdf59ebae8705ece969abe3292ec5c3838e36035bc255b906fce31e8cf6cbdad24
-EBUILD tensorflow-2.0.0.ebuild 11980 BLAKE2B 4a9a6b3e619ac91d2612f604451d2067b613a7872272708bbbb0a2484fc639bef8da6d0a1858713a2c9a8912453a03c03e6d8ec645392350ac1db8a62a0bd32a SHA512 47bedd5e042cb703f7383fd9d573e19f1100e3491e49ed1aeda8136cdbd732606efb72fa42a75f3c81be64cffbb411dcc40c4b65f4066f80be4f20c2af3a1b2b
-EBUILD tensorflow-2.1.0.ebuild 12433 BLAKE2B 801dedbd741e000e0dc6b563c3425e332fcf1fbb6a6401488cd9803a40c842e75ded9c61d583b13d4c8640749963a8c1e69a70fd81182235e0cd326f27ec453c SHA512 d7497b905513c6f74cec2a49a29e17a4adba637f8e1c3d63410c76721007d0f34938cbbba92dc7dce88ceb37a981a804354a6384d5ab7b199d6a532bf791d127
+DIST tensorflow-patches-2.2.0_rc2.tar.bz2 8173 BLAKE2B 266eca0eea68e7ac643ae3f2df31fabf327dc84acca14965334875d0ec2eaca64c8b61e52386da6f7240fc58f910fff16eed4b7995f6b028fbef46890f9d8a63 SHA512 a989c7c3ee088c0dc0e6e98aff3e73da90b09dac2a518ec536d77e4e72e7c145a1c7af92ae08ef284251e985324e7b824db52ba1ddb4639cca4c21233f33582f
+EBUILD tensorflow-1.15.0.ebuild 11856 BLAKE2B cfebe23380544388cca0d97bc9b8999deb335a936d8dc5fae86c303bcc1a62fadc024d43e5d60ea931d4cc54130806797252e40269521e7854e027c8c74a2bb2 SHA512 86a012782ea9cbb1af070d4e33497570e557e91c4693956a58e32808e384c5018f5580e45327abba16a5daa485193453cbd08b6c0608a0e0f0299875936470fe
+EBUILD tensorflow-2.0.0.ebuild 11912 BLAKE2B 513fb292684c12279384d6642dbde445d9bf01d5ff3086d9251b425a4b0bcd70cf7e80e5c37720528c212158bab1e5f3eb0b822b5a3d2fe8e2a555ff86ee1072 SHA512 dac4c3536e0fbb076395759d3f212fd235915949b5fe5274cfab3ec2597aa6781d279d321617845d697b97ffea64a32e118e4a10e97c97f1e0855166a7ffb20e
+EBUILD tensorflow-2.1.0.ebuild 12365 BLAKE2B d895256b37ee79be36d83745545e6515366b64121c0bd5ec79544827a4492a327ca26593d06ec0b42745ef9bfa213a251eef2bd7c9093d8b461b744035d18cf7 SHA512 d710ea279a2e0b73749a0b4a947a98753e11a6ac14799b9d5e45e3e63afd776aa8047d44d66b831d49df686fea65f0663133f8639080f722fbbd6254d6025b46
+EBUILD tensorflow-2.2.0_rc2.ebuild 12927 BLAKE2B 56d51c0bd3989ebd7483f686c0ec087d82edadb3a77c4db03b436866d3dafacad9b6004dd6c545d18b2dbbfbdcdb1b82bc87b9fe7992fa76d24621f4d64881e2 SHA512 783aaabdae37f5507a8bc412b1877e576c1eab560414f5e975b32db7e8b37b76f86e11f84f22ceb17e4ba18d4eb16b93992634a3e09d1023eaae67c35cf70bbd
 MISC metadata.xml 606 BLAKE2B 910509df7310f05e34bbdd7223a9ad64e4f67c67174d3868629d594022aeab23fb9631fb17782b5787e7880cb2990ffed7d14c030ab86a25c23c8118330bc690 SHA512 ffc3f68be38618f77b7d31406292e3a4ead2819d19aa7c8b1eb779e03027b9220cc248645cad44e31a6f0c113f4aeeed2a45060617b1bb03695bd2c684262b30
diff --git a/sci-libs/tensorflow/tensorflow-1.15.0.ebuild b/sci-libs/tensorflow/tensorflow-1.15.0.ebuild
index 7844e3a1a28b..8190ff5d464a 100644
--- a/sci-libs/tensorflow/tensorflow-1.15.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.15.0.ebuild
@@ -189,9 +189,8 @@ src_configure() {
 		export TF_SET_ANDROID_WORKSPACE=0
 
 		if use python; then
-			python_export PYTHON_SITEDIR
 			export PYTHON_BIN_PATH="${PYTHON}"
-			export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
+			export PYTHON_LIB_PATH="$(python_get_sitedir)"
 		else
 			export PYTHON_BIN_PATH="$(which python)"
 			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
@@ -320,9 +319,8 @@ src_install() {
 		esetup.py install
 
 		# libtensorflow_framework.so is in /usr/lib already
-		python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR
-		rm -f "${D}/${PYTHON_SITEDIR}"/${PN}/lib${PN}_framework.so* || die
-		rm -f "${D}/${PYTHON_SITEDIR}"/${PN}_core/lib${PN}_framework.so* || die
+		rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die
+		rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die
 		python_optimize
 	}
 
diff --git a/sci-libs/tensorflow/tensorflow-2.0.0.ebuild b/sci-libs/tensorflow/tensorflow-2.0.0.ebuild
index 902eac64ba84..4e04d4e51c6d 100644
--- a/sci-libs/tensorflow/tensorflow-2.0.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.0.0.ebuild
@@ -188,9 +188,8 @@ src_configure() {
 		export TF_SET_ANDROID_WORKSPACE=0
 
 		if use python; then
-			python_export PYTHON_SITEDIR
 			export PYTHON_BIN_PATH="${PYTHON}"
-			export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
+			export PYTHON_LIB_PATH="$(python_get_sitedir)"
 		else
 			export PYTHON_BIN_PATH="$(which python)"
 			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
@@ -319,9 +318,8 @@ src_install() {
 		esetup.py install
 
 		# libtensorflow_framework.so is in /usr/lib already
-		python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR
-		rm -f "${D}/${PYTHON_SITEDIR}"/${PN}/lib${PN}_framework.so* || die
-		rm -f "${D}/${PYTHON_SITEDIR}"/${PN}_core/lib${PN}_framework.so* || die
+		rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die
+		rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die
 		python_optimize
 	}
 
diff --git a/sci-libs/tensorflow/tensorflow-2.1.0.ebuild b/sci-libs/tensorflow/tensorflow-2.1.0.ebuild
index ff79ebeaaeb4..4f7b9c8ecf7d 100644
--- a/sci-libs/tensorflow/tensorflow-2.1.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.1.0.ebuild
@@ -194,9 +194,8 @@ src_configure() {
 		export TF_SET_ANDROID_WORKSPACE=0
 
 		if use python; then
-			python_export PYTHON_SITEDIR
 			export PYTHON_BIN_PATH="${PYTHON}"
-			export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
+			export PYTHON_LIB_PATH="$(python_get_sitedir)"
 		else
 			export PYTHON_BIN_PATH="$(which python)"
 			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
@@ -326,9 +325,8 @@ src_install() {
 		esetup.py install
 
 		# libtensorflow_framework.so is in /usr/lib already
-		python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR
-		rm -f "${D}/${PYTHON_SITEDIR}"/${PN}/lib${PN}_framework.so* || die
-		rm -f "${D}/${PYTHON_SITEDIR}"/${PN}_core/lib${PN}_framework.so* || die
+		rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die
+		rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die
 		python_optimize
 	}
 
diff --git a/sci-libs/tensorflow/tensorflow-2.2.0_rc2.ebuild b/sci-libs/tensorflow/tensorflow-2.2.0_rc2.ebuild
new file mode 100644
index 000000000000..c0ab709f7b9d
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-2.2.0_rc2.ebuild
@@ -0,0 +1,367 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{3_6,3_7} )
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+inherit bazel check-reqs cuda distutils-r1 flag-o-matic toolchain-funcs
+
+DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda mpi +python xla"
+CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
+for i in $CPU_USE_FLAGS_X86; do
+	IUSE+=" cpu_flags_x86_$i"
+done
+
+# distfiles that bazel uses for the workspace, will be copied to basel-distdir
+bazel_external_uris="
+	https://storage.googleapis.com/mirror.tensorflow.org/www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz
+	https://gitlab.com/libeigen/eigen/-/archive/52a2fbbb008a47c5e3fb8ac1c65c2feecb0c511c/eigen-52a2fbbb008a47c5e3fb8ac1c65c2feecb0c511c.tar.gz
+	https://github.com/abseil/abseil-cpp/archive/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz -> abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz
+	https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz
+	https://github.com/bazelbuild/rules_apple/releases/download/0.18.0/rules_apple.0.18.0.tar.gz -> bazelbuild-rules_apple.0.18.0.tar.gz
+	https://github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz -> bazelbuild-apple_support.0.7.1.tar.gz
+	https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz
+	https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip
+	https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz
+	https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz
+	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
+	https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz
+	https://github.com/bazelbuild/rules_swift/releases/download/0.12.1/rules_swift.0.12.1.tar.gz -> bazelbuild-rules_swift.0.12.1.tar.gz
+	https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz
+	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
+	https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip
+	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
+	https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz
+	https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz
+	https://github.com/llvm/llvm-project/archive/387c3f74fd8efdc0be464b0e1a8033cc1eeb739c.tar.gz -> llvm-387c3f74fd8efdc0be464b0e1a8033cc1eeb739c.tar.gz
+	https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
+	cuda? (
+		https://github.com/nvidia/nccl/archive/3701130b3c1bcdb01c14b3cb70fe52498c1e82b7.tar.gz -> nvidia-nccl-3701130b3c1bcdb01c14b3cb70fe52498c1e82b7.tar.gz
+		https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
+	)
+	python? (
+		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz
+		https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt
+		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
+	)"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
+		${bazel_external_uris}"
+
+RDEPEND="
+	app-arch/snappy
+	dev-db/lmdb
+	dev-db/sqlite
+	dev-libs/double-conversion
+	dev-libs/icu
+	>=dev-libs/jsoncpp-1.9.2
+	dev-libs/libpcre
+	dev-libs/nsync
+	dev-libs/openssl:0=
+	>=dev-libs/protobuf-3.8.0:=
+	>=dev-libs/re2-0.2019.06.01
+	media-libs/giflib
+	media-libs/libjpeg-turbo
+	media-libs/libpng:0
+	>=net-libs/grpc-1.22.0
+	net-misc/curl
+	sys-libs/zlib
+	>=sys-apps/hwloc-2
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-9.1[profiler]
+		dev-libs/cudnn
+	)
+	mpi? ( virtual/mpi )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/flatbuffers-1.8.0
+		dev-python/absl-py[${PYTHON_USEDEP}]
+		>=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
+		dev-python/astunparse[${PYTHON_USEDEP}]
+		>=dev-python/gast-0.3.3[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
+		dev-python/google-pasta[${PYTHON_USEDEP}]
+		dev-python/opt-einsum[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.8.0[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+		>=dev-python/grpcio-1.22.0[${PYTHON_USEDEP}]
+		>=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}]
+		>=net-libs/google-cloud-cpp-0.10.0
+		>=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}]
+		>=sci-libs/keras-preprocessing-1.1.0[${PYTHON_USEDEP}]
+		>=sci-visualization/tensorboard-2.0.0[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	python? (
+		dev-python/mock
+		dev-python/setuptools
+	)"
+PDEPEND="python? (
+		>=sci-libs/tensorflow-estimator-2.0.0[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.8.0
+	dev-java/java-config
+	dev-lang/swig
+	=dev-util/bazel-2.0*
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-9.1[profiler]
+	)
+	!python? ( dev-lang/python )
+	python? (
+		dev-python/cython
+		dev-python/mock
+		>=dev-python/grpcio-tools-1.22.0
+	)"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
+CHECKREQS_MEMORY="5G"
+CHECKREQS_DISK_BUILD="10G"
+
+get-cpu-flags() {
+	local i f=()
+	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
+	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
+		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
+	done
+	use cpu_flags_x86_fma3 && f+=( -mfma )
+	echo "${f[*]}"
+}
+
+pkg_setup() {
+	ewarn "TensorFlow 2.0 is a major release that contains some incompatibilities"
+	ewarn "with TensorFlow 1.x. For more information about migrating to TF2.0 see:"
+	ewarn "https://www.tensorflow.org/guide/migrate"
+
+	local num_pythons_enabled
+	num_pythons_enabled=0
+	count_impls(){
+		num_pythons_enabled=$((${num_pythons_enabled} + 1))
+	}
+	use python && python_foreach_impl count_impls
+
+	# 10G to build C/C++ libs, 5G per python impl
+	CHECKREQS_DISK_BUILD="$((10 + 6 * ${num_pythons_enabled}))G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack "${P}.tar.gz"
+	unpack tensorflow-patches-${PVR}.tar.bz2
+	bazel_load_distfiles "${bazel_external_uris}"
+}
+
+src_prepare() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	append-flags $(get-cpu-flags)
+	bazel_setup_bazelrc
+
+	eapply "${WORKDIR}"/patches/*.patch
+
+	default
+	use python && python_copy_sources
+
+	use cuda && cuda_add_sandbox
+}
+
+src_configure() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	do_configure() {
+		export CC_OPT_FLAGS=" "
+		export TF_ENABLE_XLA=$(usex xla 1 0)
+		export TF_NEED_OPENCL_SYCL=0
+		export TF_NEED_OPENCL=0
+		export TF_NEED_COMPUTECPP=0
+		export TF_NEED_ROCM=0
+		export TF_NEED_MPI=$(usex mpi 1 0)
+		export TF_SET_ANDROID_WORKSPACE=0
+
+		if use python; then
+			export PYTHON_BIN_PATH="${PYTHON}"
+			export PYTHON_LIB_PATH="$(python_get_sitedir)"
+		else
+			export PYTHON_BIN_PATH="$(which python)"
+			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
+		fi
+
+		export TF_NEED_CUDA=$(usex cuda 1 0)
+		export TF_DOWNLOAD_CLANG=0
+		export TF_CUDA_CLANG=0
+		export TF_NEED_TENSORRT=0
+		if use cuda; then
+			export TF_CUDA_PATHS="${EPREFIX}/opt/cuda"
+			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
+			export TF_CUDA_VERSION="$(cuda_toolkit_version)"
+			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
+			einfo "Setting CUDA version: $TF_CUDA_VERSION"
+			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+
+			if [[ -z "$TF_CUDA_COMPUTE_CAPABILITIES" ]]; then
+				ewarn "WARNING: Tensorflow is being built with its default CUDA compute capabilities: 3.5 and 7.0."
+				ewarn "These may not be optimal for your GPU."
+				ewarn ""
+				ewarn "To configure Tensorflow with the CUDA compute capability that is optimal for your GPU,"
+				ewarn "set TF_CUDA_COMPUTE_CAPABILITIES in your make.conf, and re-emerge tensorflow."
+				ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TF_CUDA_COMPUTE_CAPABILITIES=7.5,3.5"
+				ewarn ""
+				ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus"
+				ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'"
+			fi
+		fi
+
+		# com_googlesource_code_re2 weird branch using absl, doesnt work with released re2
+		local SYSLIBS=(
+			absl_py
+			astor_archive
+			astunparse_archive
+			boringssl
+			com_github_googleapis_googleapis
+			com_github_googlecloudplatform_google_cloud_cpp
+			com_github_grpc_grpc
+			com_google_protobuf
+			curl
+			cython
+			double_conversion
+			enum34_archive
+			flatbuffers
+			functools32_archive
+			gast_archive
+			gif
+			hwloc
+			icu
+			jsoncpp_git
+			libjpeg_turbo
+			lmdb
+			nasm
+			nsync
+			opt_einsum_archive
+			org_sqlite
+			pasta
+			pcre
+			png
+			pybind11
+			six_archive
+			snappy
+			swig
+			termcolor_archive
+			wrapt
+			zlib
+		)
+
+		export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
+		export TF_IGNORE_MAX_BAZEL_VERSION=1
+
+		# This is not autoconf
+		./configure || die
+
+		echo 'build --config=noaws --config=nohdfs' >> .bazelrc || die
+		echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_configure
+	else
+		do_configure
+	fi
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	if use python; then
+		python_setup
+		BUILD_DIR="${S}-${EPYTHON/./_}"
+		cd "${BUILD_DIR}"
+	fi
+
+	# fail early if any deps are missing
+	ebazel build -k --nobuild \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so \
+		//tensorflow:libtensorflow_cc.so \
+		$(usex python '//tensorflow/tools/pip_package:build_pip_package' '')
+
+	ebazel build \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so
+	ebazel build //tensorflow:libtensorflow_cc.so
+
+	do_compile() {
+		ebazel build //tensorflow/tools/pip_package:build_pip_package
+	}
+	BUILD_DIR="${S}"
+	cd "${BUILD_DIR}"
+	use python && python_foreach_impl run_in_build_dir do_compile
+	ebazel shutdown
+}
+
+src_install() {
+	local i j
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	do_install() {
+		einfo "Installing ${EPYTHON} files"
+		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
+		mkdir -p "${srcdir}" || die
+		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
+		cd "${srcdir}" || die
+		esetup.py install
+
+		# libtensorflow_framework.so is in /usr/lib already
+		rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die
+		rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die
+		python_optimize
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir do_install
+
+		# Symlink to python-exec scripts
+		for i in "${ED}"/usr/lib/python-exec/*/*; do
+			n="${i##*/}"
+			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
+		done
+
+		python_setup
+		local BUILD_DIR="${S}-${EPYTHON/./_}"
+		cd "${BUILD_DIR}" || die
+	fi
+
+	einfo "Installing headers"
+	ebazel build //tensorflow:install_headers
+	ebazel shutdown
+	insinto /usr/include/${PN}/
+	doins -r bazel-bin/tensorflow/include/*
+
+	einfo "Installing libs"
+	# Generate pkg-config file
+	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc ${PN}_cc.pc
+
+	for l in libtensorflow{,_framework,_cc}.so; do
+		dolib.so bazel-bin/tensorflow/${l}
+		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1)
+		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3)
+	done
+
+	einstalldocs
+}
diff --git a/sci-libs/umfpack/Manifest b/sci-libs/umfpack/Manifest
index bb2aa13baca3..4c9aecea6939 100644
--- a/sci-libs/umfpack/Manifest
+++ b/sci-libs/umfpack/Manifest
@@ -1,3 +1,5 @@
 DIST umfpack-5.6.2.tar.bz2 780204 BLAKE2B 9e0f4abe92139e3cd6604be63d7fea0ffe50e0669081cafe07eef5d16a4c99493ace16a36a13470d617944cef2c505a3feadb5324e0add4a7f7fe6cbaa732fd3 SHA512 7b206235e837e84885c871322c1f0d4378a048008d9c110bd96204e9bc1bd9c72c6909da513fd78b6225fddc7b91e1ceebf1a5147e99943b3f0fff48682403dc
+DIST umfpack-5.7.9.tar.bz2 772026 BLAKE2B 6d6dc1ba47b8f473884c1cb17d3eaa363d88281512e33586a0af0c2bcb7a523272bef4d8da0a29e2a5a84c8f0cd0ee6830ec10247971db63b4c319e6fa9a3c42 SHA512 5ad57467b5b7e4579f3cc9e2e7c92a0262ac2ef991a606d079b749b66e10da60aceaa4b0e741c116f8866da23c0f7c06368fe2b08d66d51383683f0dcbeddba3
 EBUILD umfpack-5.6.2.ebuild 869 BLAKE2B d838942a6fd5ff1af5d10bd2015b3931f8f2e56009e4f5cd7d89ee38dd4fbb5fa5806c01ce597882310f7d5315d3c5386970661939bd31bbb9b4437ee833cf6f SHA512 4d94dbe622115b30d2bc3d9bf5ed7fbd65cae24361311b7fb52814c357dea1d6e7f3d66ae776ed937eed6cf4a813333bde0a6edc1acaa6603bde2c1331e96ca3
+EBUILD umfpack-5.7.9.ebuild 901 BLAKE2B 26be1959f341ac9e72af4c5c02cd8a78958afb08baef2f5cd9a441ff2c9415e0857623fa8af10375d588a363b2969a12185dceba21b8b8a472eecc0ce4c95ad1 SHA512 ca812bb607681debab766f35e6d48cbe476092a672a01b3e6815738ea3e4f136d694e256a543e049f031cd63c2832d739e35e8876df26af3acd9dc327a528298
 MISC metadata.xml 667 BLAKE2B 1e0018ea7f7433ce19bfc6e364a30731e5e02f657502f721513da4191752b97c7a3d8352707e1036f0e5fe81ffb81ed3862cc2b213ca89e80067a06a82e5b078 SHA512 c204d7f86f2338f9571a46773c251dab31caa3d5bfbe4ae87326466026616d80737435d8cdbf0ae8cb5e109d8b52a5b6ccba09f8b52f38dfe9058049ef541007
diff --git a/sci-libs/umfpack/umfpack-5.7.9.ebuild b/sci-libs/umfpack/umfpack-5.7.9.ebuild
new file mode 100644
index 000000000000..3c62f3d82bb4
--- /dev/null
+++ b/sci-libs/umfpack/umfpack-5.7.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Unsymmetric multifrontal sparse LU factorization library"
+HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="doc +cholmod static-libs"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( virtual/latex-base )"
+DEPEND="sci-libs/amd
+	>=sci-libs/suitesparseconfig-5.4.0
+	virtual/blas
+	cholmod? ( sci-libs/cholmod )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		$(use_with doc) \
+		$(use_enable static-libs static) \
+		$(use_with cholmod)
+}
+
+src_compile() {
+	use doc && export VARTEXFONTS="${T}/fonts"
+	default
+}
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 1888c5f8f98a..09b7430a60a7 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -2,5 +2,5 @@ DIST VTK-8.1.0.tar.gz 33482506 BLAKE2B 82aecb497847254595f20294120ae793432348fc3
 DIST VTKData-8.1.0.tar.gz 282986441 BLAKE2B 885f35c5386cc5db8db905a868a3ad79c246f1b0e41a3e5b81312b1f3de90483a1e34886d4764c60fe8006acaace2405b25acf047ec0e25a957f7a2d563d3380 SHA512 0a63f87896320aa38970932bf47c9e3f65a8bdd5413e51f95c53e321348b5b4e1eca2405d755eabb785c03939e1936245cc9f1b0f7ad0988c41362ac6f1e3047
 DIST VTKLargeData-8.1.0.tar.gz 166992034 BLAKE2B ac98861ccac2aacfab7547a4b56de5c9e611b8655f077bb85e6ab850fb0cfd79f4722a0486f73eafcde2cd77d6be305201857f3e729b1f60f710c45bcf0bb63f SHA512 9dfd64b5125205ba7d8cba5665da40874d0a9781f3bd2595058d939207d96980c9a68009ce9ed1476931e1b929199c4888ccf6d590f23d2412873ca6907abc31
 DIST vtkDocHtml-8.1.0.tar.gz 132655967 BLAKE2B a27d9631fa9fe42e9b8076aa3b33e03b3835db0f348ed60cfdc866ffe7accd9c5d99b6525523113a4d628253e28d6d9121e78942d89b6ee281d5e7ecee7c289e SHA512 c49338ad2c121ab16098195e5a1f2c9539137a85ae5edaa64d4a887ece0c64efb8840162942f47b70ab2d82d341bba2e706a6ff007fe6bdfbce12ad92bca883c
-EBUILD vtk-8.1.0-r4.ebuild 9117 BLAKE2B bfd1a5b22f8c191bfb61f74f864d874d4627a5e43da8c79fd318b649b5605a4d68afc1e73028506e818c9dd0ef77f7e0e3d961f5fa51ea259bddb549dc3dc2c4 SHA512 54b9ad953693cfd6d94d20acd991fb8ce8bba247861e63a3fd48cc524bd0aeec6bc0c27ad99bcc78d77a220399bc2c5f289fee001c893c6b2072aaf677a16efc
+EBUILD vtk-8.1.0-r5.ebuild 9192 BLAKE2B 0a04a86a6eef79dc1f361c15bfff52fe5b75a8422fa2f98cc4b7d78db87f34a32ad62b6c6bc343be0e993420b5459c28cc7d685789a06bab38f42997cbd327fe SHA512 d6e076a008dd7a56c88bb697b3535b6dc21c6f96a0b961e6e74c106882ef6612ce9f7cece9f1088860d72dfe7a1dbcd3642778a00fccdf488a03a96483885569
 MISC metadata.xml 988 BLAKE2B 2533eda3936361d835dba2e30f1b1a19484facc289603d82b6c2012ee242e7778b1080d7136584c08113d7a82e0742d7bb2373984667301a4c7d52b4dbd8b087 SHA512 f4e29e15a05cfb49b24f4a8e24a6e43ac72ac0fa21ed640a70e5017263f23e21e514dedc489d963acd803407df8ee2bd2d6006c83eece795f91b4809d2ec2ff4
diff --git a/sci-libs/vtk/vtk-8.1.0-r4.ebuild b/sci-libs/vtk/vtk-8.1.0-r5.ebuild
index e0fa62ad1ca7..f1fe50fd32e1 100644
--- a/sci-libs/vtk/vtk-8.1.0-r4.ebuild
+++ b/sci-libs/vtk/vtk-8.1.0-r5.ebuild
@@ -152,6 +152,7 @@ src_configure() {
 		-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=""
@@ -254,7 +255,7 @@ src_configure() {
 			-DVTK_USE_QVTK_QTOPENGL=ON
 			-DQT_WRAP_CPP=ON
 			-DQT_WRAP_UI=ON
-			-DVTK_INSTALL_QT_DIR="$(qt5_get_libdir)/qt5/plugins/designer"
+			-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"
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sci-libs
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)