gentoo resync : 25.11.2020

212 files changed, 3778 insertions, 4690 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index d721f59f69f5..22f6ab52e4ac 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/Rtree/Manifest b/sci-libs/Rtree/Manifest
deleted file mode 100644
index ccdc0a2483b4..000000000000
--- a/sci-libs/Rtree/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST Rtree-0.8.3_p20180802.tar.gz 48893 BLAKE2B bd0745e8e5051a772c2d50fe35712dc661737f32f6af382579dbbffc7467c21ef73bbeb794489da9891e50497b6f8775b1a670185453d54881e6dc8496fef539 SHA512 10c35a1d00369b3a30c486830d7cecdae6bd9bbc2ab9ea7f398227bc46b116783b1486cc75759eb27d7b25439400cbc39b55e6f58c686caec45bbc8436c6067c
-DIST Rtree-0.9.4.tar.gz 62017 BLAKE2B 72a979a3b9b9e9e1d18ea8646bbf860413c18420ce40946108c4f2f0e59fcb5bb64971a57936a92714e02e13419f7dc594b2371e4b44a4fd6a3e3986c19f7d85 SHA512 59981ffefedac1162faaa86ea10d7d5503da46c7ae9588a57e1a49214043de5f41bd4836965651d4cd22e7959c37cc6d586d9912568a2aaf693a0afb7895b429
-EBUILD Rtree-0.8.3_p20180802.ebuild 677 BLAKE2B 63182b2364e40bfccfd82b80ed5e9f7d552e276d53d002023572d6791b2ceb6d84c50921c6ee1315b9c17d80e694c22c37f407edc4f44e8817f22e768329db72 SHA512 35f3477cb35cb9b37683d51d08d72336d3bd526600acdfd5e28dc07972468f638633c0880b6b9a43a3735087e1a4a806362c33802d9ebe20fdbfdd406d21c088
-EBUILD Rtree-0.9.4.ebuild 495 BLAKE2B b6e693428baa03a3e91ce43ccc413d04d5167fa1f7ba4418f6ddc3e1d24925d96494fb4d6b102af4af28f4a787ea62d4520f4b11d12cd9221c16a7a3a3bfb7bb SHA512 ce8c6940c6f81ef921f5d0e9a599ff24be6c5e65e500375169d5a50f73c21b4e7c3993ab804c11c53b77728b6f900ade6abeb1885870cce326fb63abba127304
-MISC metadata.xml 701 BLAKE2B 1f89c6481c0856f2bd0ca2431151ecef5c01b015c443efcfb837be7cbe84ac218b3811e3710e678650916094ab9c8e0d18b2bb0a8beea10a7b6c73e7df23d646 SHA512 c145907e76558f657c5ca11540fc83ed3fe42917b496c4885b9826fdeb6253594f8656f9e663bbb519b47f3590ef0068f28e75f2a14248f7cc9508d7f8d7db81
diff --git a/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild b/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild
deleted file mode 100644
index 0832cb96d361..000000000000
--- a/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-EGIT_COMMIT_HASH="c6437a8ae182cb58aef1d0a4465bfc0c6f75b273"
-
-DESCRIPTION="R-Tree spatial index for Python GIS"
-HOMEPAGE="https://github.com/Toblerity/rtree"
-SRC_URI="https://github.com/Toblerity/rtree/archive/${EGIT_COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sci-libs/libspatialindex"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/rtree-${EGIT_COMMIT_HASH}"
-
-python_test() {
-	pytest -vv || die
-}
diff --git a/sci-libs/Shapely/Manifest b/sci-libs/Shapely/Manifest
deleted file mode 100644
index db7e1a605569..000000000000
--- a/sci-libs/Shapely/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX Shapely-1.6.4_p2-test_operations.patch 722 BLAKE2B 661659bc1d2f8c8a5d6b77f0ca746024aa9724f2c25047d8203d591a4f793982d4cf9bebaa6abcaf48c0cf1b266ef941b986897d26bece39519f8fcaf5dcaf96 SHA512 c1e9eda0cf8dbfbcee2d6994f470559507c754fa2bf03973ac692ca6bd2fcf62ce05e15116515877e8900a89c55c6b2bf6e70b74e2cfced8d3852608901b34db
-DIST Shapely-1.6.4.post2.tar.gz 225745 BLAKE2B 96e995db6dd1464bac7c2562efdc7f298a5f23c388e44f334db685b1cfa1025ff403db870e11328977a267483726504e03b6d7c47fe4234a3a5966a13b2b7311 SHA512 027c816ef2104f654569ca658b52b87c60e5ba6a45927fcc51c23dd1922f3f9f7fdcea3601160b0a999e39611617142833ccac790777093be8b96a0d9083f78f
-DIST Shapely-1.7.0.tar.gz 281419 BLAKE2B 1a4e84104f21d2f5a5eb810883a89deb20fd47cf146efed884994786364b29bb5a194b063a50ae21842c07c335cbbee0c3d1a1e4ff4e43e0d083080fe33815ac SHA512 4d944fc6727e11d004ef7ba0325c159aa5ae03043f17b029ab0a399d6dcd361c4d299ad864a045a99b0229e333d5b42634bc6fd1ed94b914b7cf58fb886af2de
-EBUILD Shapely-1.6.4_p2-r1.ebuild 1237 BLAKE2B b51a668790e3cfeb75a7088bb25f57d8b4aa5a52e8d056d87693db69cacfa56c2f33c40509475f118bb77b9d583f62028b58a9dd9940417ba135739fbecd69bd SHA512 2695c1473dc5c02ba056f12dbb4c43d98209976411f69dd03c04550abc9d5dae00b703dcaa3238d08010cb7d9b90cec66bbe45f3a39aadf1f58e122a33a7b1bd
-EBUILD Shapely-1.7.0.ebuild 778 BLAKE2B d2b6e62575cbb785b4a6ec2201badb2910661bba281ed8dcb06052982788b096c9f7bc3e9baaa73d470d93de29729d890f6a363fb6b0cd1b34c822c05556e9f6 SHA512 c3c062ce96c00da0be73aa75b2458ec95fff4a20dc703b06c48b8fda7d248f553c027d2a405d83c6de5fa8a3f96280a4f2393c2da5858b75d7c215b71b7eea31
-MISC metadata.xml 774 BLAKE2B 418f9b236cefcea8bd6d1e4a7b7d85b2f0ff55060a6e4c75597d4db592a51e843264817643e8d0758bb82a35f1fc60bf99353561590233485122bb4869e584ce SHA512 7f580b0fbdb663892f4454815e29ceae0d31ce4d29659de7e4478f7ff86fc03625eaf65c643dbd24d4ffc30a7f0b6f535658b4d084dc25c3c47cbca92d7fc210
diff --git a/sci-libs/adolc/Manifest b/sci-libs/adolc/Manifest
index 2e29e087fbac..eb7cb16b829d 100644
--- a/sci-libs/adolc/Manifest
+++ b/sci-libs/adolc/Manifest
@@ -2,11 +2,12 @@ AUX adolc-2.4.0-no-colpack.patch 580 BLAKE2B 95247622f68b6e5c4f45eb6eef7cd99f759
 AUX adolc-2.5.0-no-colpack.patch 1424 BLAKE2B ea11eed8f816daaa9809b8f6a6f20e87a22acbf2d210f60000b93635f68d5f362530bac5a46c173ffbd33aec31769c6e5dadf9f638779bbdc0e17483b1a0f5c4 SHA512 826023e0066620a1885a462c31cb5be80d880f917df26c007564e327b8be8513621e56b601b6f9bfcec0fc617a15eea5016436aa08bebb0346254089a5d850ec
 AUX adolc-2.5.0-pkgconfig-no-ldflags.patch 364 BLAKE2B a35ab92ca491110c390a4d0f90c7cb12f417891762571ec91ce64fb81d84c4a7e3249971302e3801f721e7791725e37e3f4d241160ec80c5c633af096cad9107 SHA512 914bd01428fc07f50985afc076722778029835048883eade3730878c2d103cd29c288656d524ad3895416e94b50b5db2f53e35fdab0ed2a0f364669bf304af41
 AUX adolc-2.6.2-dash.patch 4516 BLAKE2B 8db052472bd3051ed0b8b1a180aac4098862695cefeed0f0f94600d447b2ef5b888ba072613ea101ac1435569eb9d5bcba1aa64b23a0bc7cf01a4ef20d3f760b SHA512 9b904d8c0ab3c286af27b293b5ffe516b9c1da53169702f94a9213496b6626e1a587e8ab8d9d25b983872c1a97620a8d5386d9053ba1a4c973ef5e145f655bc5
+AUX adolc-2.7.2-swig-python-configure.patch 15544 BLAKE2B 83a31d310e6ae4245085af960ef8440983defd75fa04fac63c24171640886c17a093f44a868c397db8f4189db61f523aa98b75bcab2238ab4931d6b94290f5c7 SHA512 661c4a939d58b7593dc4fbce5874c4e0e918ea54ca1163ae2984aeef528fe4a2c67128070d4f6fc3e33aab2d1e7b7d5e2ae244cea34111c69c72478e5949755f
 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-2.7.2.ebuild 1366 BLAKE2B 9d56381152f11b278f5bcbb150aab07d5cb1b8539223da53a6ff3526d813b0d7a1b0726cc78aa2f74f2df44c784ac8a801339f9b4c8b9e3e68353456da691b19 SHA512 e5098c625210d6fe7aadde93a92c79e1c9c2748ea97303c9d3acb176ce67be8d6f9ef1976821320bdea070ea43f00e24571ef13d1aa3bee4cbd694133a8bbde4
+EBUILD adolc-2.7.2.ebuild 1660 BLAKE2B 5187dffa6f999861d6c65ce07493b55a15338b606a522179ab4c4c36cfa51137c64e042210fe8aea3b674482e3b3c13860fa6155159cfb17cc4946f551f12749 SHA512 903bfe1a229fcd15cdd434fae1caf6ae9574536d18714f29db11d706f4fdf11be5fa3ab0c95f5095445b0150685a4fc31f5b3144dbd91f0425fd0c44676b91d5
 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
index dc6d88c74f35..52d83ebbf38a 100644
--- a/sci-libs/adolc/adolc-2.7.2.ebuild
+++ b/sci-libs/adolc/adolc-2.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools toolchain-funcs eutils
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Automatic differentiation system for C/C++"
 HOMEPAGE="https://projects.coin-or.org/ADOL-C/"
@@ -11,11 +11,9 @@ 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"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/ADOL-C-releases-${PV}"
 fi
 
@@ -33,6 +31,7 @@ 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
+	"${FILESDIR}"/${P}-swig-python-configure.patch
 )
 
 src_prepare() {
@@ -41,9 +40,14 @@ src_prepare() {
 }
 
 src_configure() {
+	# Disabling Python for now because swig build
+	# needs work. Revisit with >=2.7.3.
+	# https://bugs.gentoo.org/730750
+	# https://github.com/coin-or/ADOL-C/issues/20
 	econf \
 		--enable-advanced-branching \
 		--enable-atrig-erf \
+		--disable-python \
 		$(use_enable mpi ampi) \
 		$(use_enable sparse) \
 		$(use_enable static-libs static) \
@@ -52,6 +56,8 @@ src_configure() {
 }
 
 src_test() {
+	# 'check' target is unrelated to checking lib works
+	# ('check' is more like distcheck)
 	emake test
 }
 
diff --git a/sci-libs/adolc/files/adolc-2.7.2-swig-python-configure.patch b/sci-libs/adolc/files/adolc-2.7.2-swig-python-configure.patch
new file mode 100644
index 000000000000..c434f6556836
--- /dev/null
+++ b/sci-libs/adolc/files/adolc-2.7.2-swig-python-configure.patch
@@ -0,0 +1,391 @@
+https://bugs.gentoo.org/730750
+https://github.com/coin-or/ADOL-C/commit/8b53408d08f41ddaba2dea5655d332b13fc4c78b.patch
+https://github.com/coin-or/ADOL-C/commit/06b3b665fc0253ee17f0208bd06cdc130e103741.patch
+https://github.com/coin-or/ADOL-C/commit/25a69c486829ddaa19c115afc05cb7cf3b4e2410.patch
+https://github.com/coin-or/ADOL-C/commit/e41d32ba6dab09a3e58b22f1f042e49cd5ee917f.patch
+https://github.com/coin-or/ADOL-C/commit/0787a350cc181192cfd203b0f75941bcbd9c3e3a.patch
+https://github.com/coin-or/ADOL-C/commit/0b3dd1747f90f68b17dc5f1bd3a5d898e3bc77fb.patch
+----
+From e41d32ba6dab09a3e58b22f1f042e49cd5ee917f Mon Sep 17 00:00:00 2001
+From: Andrea Walther <walthand@math55020.mathematik.hu-berlin.de>
+Date: Tue, 22 Sep 2020 10:47:27 +0200
+Subject: [PATCH] fix prefix and provide --enable-python
+
+---
+ configure.ac | 19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6c2c88f9..b6aaeaa7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -71,6 +71,17 @@ if test x"${adolc_medipack_support}" = xyes ; then
+ AC_DEFINE(ADOLC_MEDIPACK_SUPPORT,1,[defined if MeDiPack support is to be compiled in])
+ fi
+ 
++
++AC_MSG_CHECKING(whether to build ADOL-C with python/swig support)
++AC_ARG_ENABLE(python,
++              [AS_HELP_STRING([--enable-python],[build ADOL-C with python/swig support [default=disabled]])],
++	      [adolc_python_support=$enableval],[adolc_python_support=no])
++AC_MSG_RESULT($adolc_python_support)
++AM_CONDITIONAL(BUILD_ADOLC_python_SUPPORT,[test x${adolc_python_support} = xyes])
++if test x"${adolc_python_support}" = xyes ; then
++AC_DEFINE(ADOLC_python_SUPPORT,1,[defined if python/swig support is to be compiled in])
++fi
++
+ LT_PREREQ([2.2.6])
+ # checks for programs
+ AC_PROG_CXX
+@@ -651,6 +662,10 @@ if test x$sparse = xyes && test x$have_colpack = xno; then
+   Only sparsity patterns can be computed\033@<:@0m"
+     warn=true
+ fi
++echo \
++"  Build with python:		      ${adolc_python_support}"
++
++if test x$adolc_python_support = xyes ; then
+ if test x$sparse = xyes && test x$python_found = xyes && test x$SWIG != xno; then
+    echo \
+ "  Build with python swig module:      yes"
+@@ -660,7 +675,7 @@ else
+    if test x$sparse = xno && test x$python_found = xyes && test x$SWIG != xno; then
+      echo \
+ "(due to sparse drivers disabled)"
+-  elif test x$sparse = xyes && ( $test x$python_found = xno || test x$SWIG = xno ); then
++  elif test x$sparse = xyes && ( test x$python_found = xno || test x$SWIG = xno ); then
+      echo \
+ "(due to python/swig missing)"
+   else
+@@ -668,6 +683,8 @@ else
+ "(due to sparse drivers disabled and python/swig missing)"
+   fi
+ fi
++fi
++
+ echo
+ 
+ echo \
+From 8b53408d08f41ddaba2dea5655d332b13fc4c78b Mon Sep 17 00:00:00 2001
+From: Kshitij Kulshreshtha <kkhere.geo@gmail.com>
+Date: Tue, 31 Mar 2020 22:42:23 +0200
+Subject: [PATCH] Fix out-of-tree build for swig
+
+---
+ ADOL-C/swig/Makefile.am    |  4 +--
+ ADOL-C/swig/setup.py       | 65 +++++++++++++++++++++++++++-----------
+ ADOL-C/swig/swigprocess.py | 34 +++++++++++---------
+ Makefile.am                |  3 +-
+ configure.ac               |  6 ++++
+ 5 files changed, 75 insertions(+), 37 deletions(-)
+
+diff --git a/ADOL-C/swig/Makefile.am b/ADOL-C/swig/Makefile.am
+index 04a52cd0..b1d5569b 100644
+--- a/ADOL-C/swig/Makefile.am
++++ b/ADOL-C/swig/Makefile.am
+@@ -12,7 +12,7 @@
+ 
+ ACLOCAL_AMFLAGS = -I autoconf
+ 
+-EXTRA_DIST = swigprocess.py adolc-r.i adolc-python.i adubswigfuncs.h adolc_all_in.hpp matrixmemory.hpp pyedfclasses.hpp
++EXTRA_DIST = swigprocess.py adolc-r.i adolc-python.i adubswigfuncs.hpp adolc_all_in.hpp matrixmemory.hpp pyedfclasses.hpp
+ 
+ clean-local:
+ 	-rm -rf python R *.cpp *.cxx *.o *.h include
+@@ -20,6 +20,6 @@ clean-local:
+ if PYTHONFOUND
+ if SPARSE
+ install:
+-	CXX=${CXX} ${PYTHON} setup.py install --prefix=${prefix} --only-swig
++	CXX=${CXX} ${PYTHON} ${srcdir}/setup.py build --only-swig --lib-prefix=${prefix} @python_srcbase@ install --prefix=${prefix}
+ endif
+ endif
+diff --git a/ADOL-C/swig/setup.py b/ADOL-C/swig/setup.py
+index 7a9a25c4..5bd98c3a 100644
+--- a/ADOL-C/swig/setup.py
++++ b/ADOL-C/swig/setup.py
+@@ -11,6 +11,10 @@
+ ##############################################################################
+ 
+ from __future__ import print_function
++import sys, os
++
++sys.path = [ os.path.dirname(os.path.abspath(__file__)) ] + sys.path
++
+ from swigprocess import prepare_flat_header
+ from numpy.distutils import misc_util as np_dist
+ from distutils.core import setup, Extension
+@@ -18,7 +22,6 @@
+ from distutils.command.build_ext import build_ext
+ from distutils.command.build import build
+ from distutils.command.install import install
+-import os
+ import subprocess
+ 
+ def compile_dynlib(prefix,colpackdir,boostdir):
+@@ -88,14 +91,34 @@ def finalize_options(self):
+         prefix = self.lib_prefix
+         print('prefix = ', prefix)
+         self.include_dirs.append(os.path.join(prefix,'include'))
+-        self.library_dirs.append(os.path.join(prefix,'lib64'))
+-        self.rpath.append(os.path.join(prefix,'lib64'))
+-        prepare_flat_header()
++        import ctypes as c
++        plen = c.sizeof(c.c_void_p(0))
++        if plen == 8:
++            self.library_dirs.append(os.path.join(prefix,'lib64'))
++            self.rpath.append(os.path.join(prefix,'lib64'))
++        else:
++            self.library_dirs.append(os.path.join(prefix,'lib'))
++            self.rpath.append(os.path.join(prefix,'lib'))
++        buildobj = self.get_finalized_command('build')
++        self.src = buildobj.src
++        prepare_flat_header(self.src)
++        self.swig_opts = ['-c++', '-I' + self.src]
++        self.finalized = 1
+ 
++    def build_extension(self, ext):
++        if self.src != '.':
++            import shutil
++            sources = ext.sources
++            newSrc = []
++            for s in iter(sources):
++                shutil.copy(self.src + '/' + s, '.')
++            ext.include_dirs.append(self.src)
++        super(build_swigadolc,self).build_extension(ext)
+ 
+ class buildthis(build,object):
+     command_name = 'build'
+     user_options = build.user_options + [
++        ('src=', None, 'path of the source directory of swig module'),
+         ('lib-prefix=', None, 'prefix to install adolc library'),
+         ('colpack-dir=', None, 'directory in which colpack is installed'),
+         ('boost-dir=', None, 'directory in which boost is installed'),
+@@ -111,11 +134,26 @@ def lib_doesnot_exist(self):
+ 
+     def initialize_options(self):
+         super(buildthis,self).initialize_options()
++        self.src = None
+         self.lib_prefix = None
+         self.colpack_dir = None
+         self.boost_dir = None
+         self.only_swig = None
+ 
++    def finalize_options(self):
++        super(buildthis,self).finalize_options()
++        if self.src is None:
++            self.src = '.'
++        if self.lib_prefix is None:
++            self.lib_prefix = os.path.join(os.environ['HOME'],'adolc_base')
++        if self.colpack_dir is None:
++            self.colpack_dir = os.path.join(os.environ['HOME'],'adolc_base')
++        if self.boost_dir is None:
++            self.boost_dir = '/usr'
++        if self.only_swig is None:
++            self.only_swig = False
++        self.finalized = 1
++
+     #sub_commands = [ ('build_lib', lib_doesnot_exist),
+     #                 ('build_ext', None) ]
+     sub_commands = [ ('build_lib', None),
+@@ -137,22 +175,13 @@ def initialize_options(self):
+         super(installthis,self).initialize_options()
+ 
+     def finalize_options(self):
++        self.set_undefined_options('build',
++                                   ('lib_prefix','lib_prefix'),
++                                   ('colpack_dir', 'colpack_dir'),
++                                   ('boost_dir', 'boost_dir'),
++                                   ('only_swig', 'only_swig'))
+         super(installthis,self).finalize_options()
+-        if self.lib_prefix is None:
+-            self.lib_prefix = os.path.join(os.environ['HOME'],'adolc_base')
+-        if self.colpack_dir is None:
+-            self.colpack_dir = os.path.join(os.environ['HOME'],'adolc_base')
+-        if self.boost_dir is None:
+-            self.boost_dir = '/usr'
+-        if self.only_swig is None:
+-            self.only_swig = False
+         self.finalized = 1
+-        buildobj = self.distribution.get_command_obj('build')
+-        buildobj.set_undefined_options('install',
+-                                       ('lib_prefix','lib_prefix'),
+-                                       ('colpack_dir', 'colpack_dir'),
+-                                       ('boost_dir', 'boost_dir'),
+-                                       ('only_swig', 'only_swig'))
+         
+ incdirs = np_dist.get_numpy_include_dirs()
+ #python_ldflags = subprocess.check_output(['python-config','--ldflags'],universal_newlines=True)
+diff --git a/ADOL-C/swig/swigprocess.py b/ADOL-C/swig/swigprocess.py
+index bd5fe03d..f9de5551 100644
+--- a/ADOL-C/swig/swigprocess.py
++++ b/ADOL-C/swig/swigprocess.py
+@@ -10,6 +10,7 @@
+ ## 
+ ##############################################################################
+ 
++from __future__ import print_function
+ import re
+ import os.path
+ import sys
+@@ -191,22 +192,25 @@ def finalClean(headfile,outfiles):
+     for f in glob.glob('*.o'):
+         os.remove(f)
+ 
+-def prepare_flat_header():
+-    sys.path = [ os.getcwd() ] + sys.path
+-    p = os.getcwd() + '/../include/adolc'
+-    for (dp, dn, fn) in os.walk(p):
+-        ndp = re.sub(r'\.\./',r'',dp)
+-        for f in iter(fn):
+-            lines = readFile(dp + "/" + f)
+-            lines = comment_all_includes(lines)
+-            lines = uncomment_local_includes(lines)
+-            try:
+-                os.makedirs(ndp)
+-            except:
+-                pass
+-            writeOutput(lines, ndp + "/" + f)
++def prepare_flat_header(src_base='.'):
++    pl = [ os.getcwd() + '/../include/adolc' ]
++    print('src_base = ', src_base)
++    if src_base != '.':
++        pl = [ src_base + '/../include/adolc' ] + pl
++    for p in iter(pl):
++        for (dp, dn, fn) in os.walk(p):
++            ndp = re.sub(r'^.*\.\./',r'',dp)
++            for f in iter(fn):
++                lines = readFile(dp + "/" + f)
++                lines = comment_all_includes(lines)
++                lines = uncomment_local_includes(lines)
++                try:
++                    os.makedirs(ndp)
++                except:
++                    pass
++                writeOutput(lines, ndp + "/" + f)
+     
+-    invoke_cpp('adolc_all_in.hpp', 'adolc_all_pre.hpp')
++    invoke_cpp(src_base + '/' + 'adolc_all_in.hpp', 'adolc_all_pre.hpp')
+     lines = readFile('adolc_all_pre.hpp')
+     lines = reinstate_nonlocal_include(lines)
+     writeOutput(lines,'adolc_all.hpp')
+diff --git a/Makefile.am b/Makefile.am
+index fb66e9f3..123ac905 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -24,13 +24,12 @@ EXTRA_DIST           = TODO BUGS LICENSE update_versions.sh \
+                        ADOL-C/doc/tapebasic.pdf ADOL-C/doc/tapebasic.eps \
+                        ADOL-C/doc/tap_point.pdf ADOL-C/doc/tap_point.eps \
+                        MSVisualStudio/v14/adolc.sln MSVisualStudio/v14/adolc.vcxproj \
+-                       MSVisualStudio/v14/ColPack_Readme_VC++.txt \
+                        MSVisualStudio/v14/ColPack.vcxproj \
+                        MSVisualStudio/v14/sparse/config.h.in MSVisualStudio/v14/nosparse/config.h.in \
+                        MSVisualStudio/v14/x64/sparse/config.h.in MSVisualStudio/v14/x64/nosparse/config.h.in \
+                        MSVisualStudio/v14/sparse/config.h MSVisualStudio/v14/nosparse/config.h \
+                        MSVisualStudio/v14/x64/sparse/config.h MSVisualStudio/v14/x64/nosparse/config.h \
+-                       MSVisualStudio/v14/Readme_VC++.txt \
++                       MSVisualStudio/v14/README_VC++.md \
+                        MSVisualStudio/v14/installer.sh \
+                        adolc.spec.in adolc.spec \
+                        update_versions.sh
+diff --git a/configure.ac b/configure.ac
+index ddb08de1..6c2c88f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -501,6 +501,12 @@ fi
+ AM_PATH_PYTHON([2.7],[python_found=yes],[python_found=no])
+ AC_PATH_PROG(SWIG, swig, [no])
+ AM_CONDITIONAL(PYTHONFOUND, [test x$python_found = xyes && test x$SWIG != xno])
++if test ${abs_top_srcdir} != ${abs_top_builddir} ; then
++   python_srcbase='--src=${abs_srcdir}'
++else
++   python_srcbase=''
++fi
++AC_SUBST(python_srcbase)
+ ###########################################################################
+ #                      COIN_PATCH_LIBTOOL_CYGWIN                          #
+ ###########################################################################
+
+From 25a69c486829ddaa19c115afc05cb7cf3b4e2410 Mon Sep 17 00:00:00 2001
+From: Kshitij Kulshreshtha <kkhere.geo@gmail.com>
+Date: Wed, 1 Apr 2020 02:36:12 +0200
+Subject: [PATCH] another small fix for swig, this time for in-tree check
+
+---
+ ADOL-C/swig/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ADOL-C/swig/setup.py b/ADOL-C/swig/setup.py
+index e6023679..4ec9a7cc 100644
+--- a/ADOL-C/swig/setup.py
++++ b/ADOL-C/swig/setup.py
+@@ -105,7 +105,7 @@ def finalize_options(self):
+         self.finalized = 1
+ 
+     def build_extension(self, ext):
+-        if self.src != '.':
++        if os.path.abspath(os.path.realpath(self.src)) != os.path.abspath('.'):
+             import shutil
+             sources = ext.sources
+             newSrc = []
+From 0787a350cc181192cfd203b0f75941bcbd9c3e3a Mon Sep 17 00:00:00 2001
+From: Andrea Walther <walthand@math55020.mathematik.hu-berlin.de>
+Date: Tue, 22 Sep 2020 11:58:09 +0200
+Subject: [PATCH] small change in configure.ac for swig module
+
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index b6aaeaa7..58380e55 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -509,6 +509,7 @@ if test x$tapedoc_values == xyes; then
+ AC_DEFINE(ADOLC_TAPE_DOC_VALUES,1,[ADOL-C tape_doc routine computes values])
+ fi
+ 
++if test x$adolc_python_support == xyes; then
+ AM_PATH_PYTHON([2.7],[python_found=yes],[python_found=no])
+ AC_PATH_PROG(SWIG, swig, [no])
+ AM_CONDITIONAL(PYTHONFOUND, [test x$python_found = xyes && test x$SWIG != xno])
+@@ -517,7 +518,12 @@ if test ${abs_top_srcdir} != ${abs_top_builddir} ; then
+ else
+    python_srcbase=''
+ fi
++else
++   AM_CONDITIONAL(PYTHONFOUND, [test x$adolc_python_support])
++   python_srcbase=''
++fi
+ AC_SUBST(python_srcbase)
++end
+ ###########################################################################
+ #                      COIN_PATCH_LIBTOOL_CYGWIN                          #
+ ###########################################################################
+From 0b3dd1747f90f68b17dc5f1bd3a5d898e3bc77fb Mon Sep 17 00:00:00 2001
+From: Andrea Walther <walthand@math55020.mathematik.hu-berlin.de>
+Date: Wed, 23 Sep 2020 08:54:54 +0200
+Subject: [PATCH] small fixes in configure.ac
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 58380e55..88671274 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -519,11 +519,11 @@ else
+    python_srcbase=''
+ fi
+ else
+-   AM_CONDITIONAL(PYTHONFOUND, [test x$adolc_python_support])
++   AM_CONDITIONAL(PYTHONFOUND, [test x$adolc_python_support = xyes])
+    python_srcbase=''
+ fi
+ AC_SUBST(python_srcbase)
+-end
++
+ ###########################################################################
+ #                      COIN_PATCH_LIBTOOL_CYGWIN                          #
+ ###########################################################################
diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
index f45d468b6609..32b4be8a8aaa 100644
--- a/sci-libs/amd/Manifest
+++ b/sci-libs/amd/Manifest
@@ -1,3 +1,3 @@
 DIST amd-2.4.6.tar.bz2 343925 BLAKE2B 296579d888b61e84ec798206fbb6f89fd923f0d762e84e7a1e2e2a5fb502f4822f89a2a4b631dc42fa829e845bf3980886185650e8de28774400e0c351805061 SHA512 6960a557e6c2f82ca2e68e48ddcb502e1527235a3ca34df2f5f7f63f0f12afacedb15fefe4a39768fe7a2c70308793544b5b24b6f2be2c6b934b0c0e0e796d57
-EBUILD amd-2.4.6.ebuild 782 BLAKE2B 132b5cf2afcb271fb78428144032ce990940d67034c458ba1ca03eaf11fb565f89dd4cb5b9b6c9ec73f08a6779052fd691d6f7c4b3627e9cdc6726b690d3f634 SHA512 41388ed82c77de69ce0dbc1926023b330c32ab45d2503ca6ace21aa2003d37950e77621173e24949af4e679854966d189215d6a729929c282db626b28585ef3a
+EBUILD amd-2.4.6.ebuild 781 BLAKE2B b07e0751789864426dc9de9fe7ea21f65f0227e9278ddde3a15755765fbd2b51fcddb3c885490999187529a567e4d8759685e7b46c94cc933ec67ddd1c7bdac5 SHA512 ae9059477e218c250782fe61a3347deac00c2757d31cca26d39560f8d336d3cf1df9a2607f7ebdda373b785bc686710b586fa657eaf255279c357acdc446adf0
 MISC metadata.xml 492 BLAKE2B ac6367af33dd797e703e3370d6369db5286b11f862b5387258e9edd860554049c7d9e2bf2186c86e24a7fc29c3f1122f330c0a3cf0420f13085757cff0a388b3 SHA512 1c53658e87337e1e43149c363c901dabfdde52b647891d8026a7ce9ddcd5e36b0121948d169d446e5a78d05c26301bd4f8c7c06665506ebc0999c259b709a6b6
diff --git a/sci-libs/amd/amd-2.4.6.ebuild b/sci-libs/amd/amd-2.4.6.ebuild
index 669231443d00..97354db25ab8 100644
--- a/sci-libs/amd/amd-2.4.6.ebuild
+++ b/sci-libs/amd/amd-2.4.6.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc fortran"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/arpack/Manifest b/sci-libs/arpack/Manifest
index adf657e11baf..08587ec525bd 100644
--- a/sci-libs/arpack/Manifest
+++ b/sci-libs/arpack/Manifest
@@ -1,10 +1,6 @@
-DIST arpack-3.5.0.tar.gz 949853 BLAKE2B fa28090cd745983ee362ab17e0d9f5ab503ec8403f37d38d1263d25ff7849dead7feb10667707aabb3db6d76d9d33397de13cd65fab18a45e7aadd544525cc76 SHA512 67181c783e61d5d2214ccbfa0de8efd55148537feca30376760f7009995694f68c9fc14991306fa19ad67598497510b6e0d42b68dc56dd581dc2a798e3a4b369
 DIST arpack-3.7.0.tar.gz 989570 BLAKE2B bdab72f080d223ebbe5a279102d54fc196aac3ad1b8360be0e3814cb5e14e8f26a1f37b4b27b66db4b88b0c651c039666aa94a98fcdb34977feea7fc7d10808c SHA512 cc07cdd1fba4881907b507ff6b6c9bce9e3dadd8ef744194f08ee718a6210c039ac0c51c12edd720503f8e59bcd11c178fc323e1a59696be8c3b8262cf47a452
-DIST arpack-ng_3.1.5.tar.gz 1516406 BLAKE2B 14dea27dbe7d17144871c62db58467642f4602ec479f63b1dcfe67e22b73b146691cb5bb01c90323507a65c499077d0fee3fec0a15c5d654ccca9d3f67975a06 SHA512 4876b0babb89bbcc39e92b63d4537b860e9cd0b8a188937d3ba815041b7261623cdac25c91c8bef20ebce4271f822307c492cf6c9f22ec3d740218405337a515
 DIST tutorial.ps.gz 105599 BLAKE2B 99570e6a0cc1c020b9c271e8ce1cc224f69ff5333cc818c10b063dc8ffbaf66a9f5c6ede99541b4212286d422146b1c4e332eba7e1635c99efa0e4c2620f0630 SHA512 a7b8fefd1a572ed477ae208d49094c1c65c9368990d12de9b3528e33fed546c947659f74e54a810d04154b4a1b0f9a94bcba4db0cf59d379e20786a261066aa4
 DIST ug.ps.gz 248543 BLAKE2B ac010aef470060636fa00360636ba093f0d24d219fa927c79fb1726b798160eda74fa8b4be6c7dff94f5759efcf30afa99ad310e7959115e028738beb8aa125d SHA512 3349117fb10b07207ffbab2ffa31b406d026855ea4c16e8649b14c7d70bc94e11b5730672e34acd654817799136d4bd76569ac50ec78d787df5582d18ed61328
-EBUILD arpack-3.1.5.ebuild 1550 BLAKE2B 0b18c51eff62ef6f0d25cd4692dfe0c6fe4b7148276427c69aa07eb487596ae624384140cb7d7cfe8939d8edd21ec4c361904220a309a5ca061e92e41faf0f35 SHA512 201b1020fda26b59b2b8c9b989500039a7d73718d4fd9531234f1a20e1972d33ba1ac827139ef0e453452cc6d358c7eabd568b2fab10ca2597d3bc2a473c292b
-EBUILD arpack-3.5.0.ebuild 1475 BLAKE2B 280c8b025a95d2f50ae9403c64c68681f40a65d55a25720c6fd5146be664b1b9b6dd46fc8089785e47d023f230a2a5ffe149c6e93e1367b2050bfad9d4d9112e SHA512 932ddcac59c36b5dbf86adc8fb79b73ab4ed7b4090efbd159db524af8e82c6b16c9afbe3d5306345d17a675951d79497f014619663ba40a55f01634e593e6c0f
-EBUILD arpack-3.7.0.ebuild 1504 BLAKE2B a9d73824f2ff6a395b933b748b4b4568aabd214e68a8c1a09af87d5f2c114e17be0024915f401ea738800714e20fd211ffd7402b58df0a677b9971a76bce667a SHA512 dff4e79e127fd60ac666a97477e6415b381738317534cd481f9a2676d0b2acdec485324fadb72d5e4bdcc0e7a22710cfec19ee0a0139b1fd996e565262179b7d
+EBUILD arpack-3.7.0.ebuild 1498 BLAKE2B d949ed75d793e6158ef2c75169a160c1cc6cf028c1b958341063453ef558d365c153f882ccec5275162403079592480052a3f7e3035573b54017a3a842b6c23e SHA512 345b83614edbaa0f8303da238faf05777c11c44829ff04bf501a8060e85e7dcd4a8f40f44f06bdc13ba414058cac448eb35afdc2cc38ec89649ac923176e6a62
 EBUILD arpack-9999.ebuild 1247 BLAKE2B bbbec3f3b0fce5ffc831382cd9257e7db4a2c118cc64ec7954d457dbab5943f546258a61a22f2d2bb3a6617df0b61e26869698c1aba2c0bbb1b871d85b78cedd SHA512 00dba333d657689664eff0120eeaef5f9753d9169ee644004aea7099279c1d443be9c170a9d2ef570d8d2f2be7b795914767547150d95ca1cec17f05eef51fe1
 MISC metadata.xml 974 BLAKE2B c9121a0b23acddc3268d4bdbf4537104217a00d09263d29b6cc6f832c87f9a9775f6fab567976078dc1dfa54f2bac627d792b1819a9ea698f3a1534bc52c39da SHA512 c3e094cab53fb61c9acf3eff6ca0c0fc53a71ec135315ba833fbfe6a5ae9481f2b4de5270ccd19ec84cf85dfb18df179e1e234d268eef1af98be218575dcd4bf
diff --git a/sci-libs/arpack/arpack-3.1.5.ebuild b/sci-libs/arpack/arpack-3.1.5.ebuild
deleted file mode 100644
index e59f0f251e17..000000000000
--- a/sci-libs/arpack/arpack-3.1.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils eutils flag-o-matic fortran-2 toolchain-funcs
-
-MY_P="${PN}-ng_${PV}"
-
-DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems"
-HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/ http://forge.scilab.org/index.php/p/arpack-ng/"
-SRC_URI="
-	http://forge.scilab.org/upload/arpack-ng/files/${MY_P}.tar.gz
-	doc? (
-		http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz
-		http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples mpi"
-
-RDEPEND="
-	virtual/blas
-	virtual/lapack
-	mpi? ( virtual/mpi[fortran] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P/_/-}"
-
-src_configure() {
-	tc-export PKG_CONFIG
-	local myeconfargs=(
-		--disable-static
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-		$(use_enable mpi)
-		)
-	autotools-utils_src_configure
-}
-
-src_test() {
-	cp "${S}"/TESTS/testA.mtx "${BUILD_DIR}"/TESTS || die
-	autotools-utils_src_test
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	dodoc DOCUMENTS/*.doc
-	newdoc DOCUMENTS/README README.doc
-	use doc && dodoc "${WORKDIR}"/*.ps
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r EXAMPLES
-		if use mpi; then
-			insinto /usr/share/doc/${PF}/EXAMPLES/PARPACK
-			doins -r PARPACK/EXAMPLES/MPI
-		fi
-	fi
-}
diff --git a/sci-libs/arpack/arpack-3.5.0.ebuild b/sci-libs/arpack/arpack-3.5.0.ebuild
deleted file mode 100644
index fe0ae23d0c28..000000000000
--- a/sci-libs/arpack/arpack-3.5.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic fortran-2 toolchain-funcs
-
-DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems"
-HOMEPAGE="http://www.caam.rice.edu/software/ARPACK/ https://github.com/opencollab/arpack-ng"
-SRC_URI="
-	https://github.com/opencollab/${PN}-ng/archive/${PV}.tar.gz -> ${P}.tar.gz
-	doc? (
-		http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz
-		http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples mpi"
-
-RDEPEND="
-	virtual/blas
-	virtual/lapack
-	mpi? ( virtual/mpi[fortran] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-ng-${PV}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	test-flag-FC -fallow-argument-mismatch &&
-		append-fflags -fallow-argument-mismatch
-
-	econf \
-		--disable-static \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
-		$(use_enable mpi)
-}
-
-src_install() {
-	default
-
-	dodoc DOCUMENTS/*.doc
-	newdoc DOCUMENTS/README README.doc
-	use doc && dodoc "${WORKDIR}"/*.ps
-	if use examples; then
-		dodoc -r EXAMPLES
-		if use mpi; then
-			docinto EXAMPLES/PARPACK
-			dodoc -r PARPACK/EXAMPLES/MPI
-		fi
-	fi
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/arpack/arpack-3.7.0.ebuild b/sci-libs/arpack/arpack-3.7.0.ebuild
index 3ab97b1fd718..20a36754ea12 100644
--- a/sci-libs/arpack/arpack-3.7.0.ebuild
+++ b/sci-libs/arpack/arpack-3.7.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~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/blas-reference/Manifest b/sci-libs/blas-reference/Manifest
deleted file mode 100644
index 960d59563b9a..000000000000
--- a/sci-libs/blas-reference/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-AUX blas-reference-20070226-autotool.patch 4245 BLAKE2B 44edea22832bdf0ee1437901b9271f24acdad7bd3f60d6e537ce63544a8f7e9bb62ab720647a1d6bebda66a92c9ad37df9376d0f7aea1e45393f76e45636b858 SHA512 01abdad5d93466bcfbc832548a57248050d0e362090ba33b497e3e4d5b39cb078cbec44f07f709a90e6e89b9e9eb49f040e9f6b600058044534d4473d2cc3830
-AUX blas-reference-20070226-pkg-config.patch 354 BLAKE2B 8ebda0caa0a3b9af63cb028b93f47285aa7556e24f17ebdb9bc1fddef77dec1f5830c9f16768601f989bc46c28e851a4052b444ffcb9b516e39b81b3718a3ab0 SHA512 0a77eca2435f7bf9c151578d2901ed2e43e150e8c098de99a1bc5829ea4133be57d9bd11b5d1a73beb9d77c36c0252e1ba5c0e8587d6db4f02d549263b4a32f1
-AUX eselect.blas.reference 213 BLAKE2B 885f9450bc688e51602e7e3b7267c0c77a1665b3957378ad2371cdf3faed74196c9351cea133c37026e421a1f6defa9cba0409dc23dd3558744eabca8bbd351e SHA512 c804f7a01aa627df593facb820910485352539bc02c343927870bfd39598cbf1c7ff3af823b66e2c4cf6b7102b90936e5cff35628e0660e8578fb412a1315420
-AUX eselect.blas.reference-r1 213 BLAKE2B 4feaf1275d517575c61bbe8dad52cb9c125ebab465865b6072c539fe98298c3da3393bc5dbf970560dbf96a58394a0d99fd978eb6188ec714fec9500b115d76c SHA512 b4d97d640f5aa34e20234591d8d2d1af488054fd36135df899f1f1345022367478a1013f4e39c8419b6d4ad63d63ac1c65e63c61d880f5322cae731c17fec068
-AUX lapack-reference-3.6.0-fix-build-system.patch 3061 BLAKE2B 22a7be4c561ffd3448810f6fd69ea4e9ae3499432a089ddfb5073038c7f42d2dc05ae15d55a53f341b9016ac77ca4ec8905aee9e8a734c207727fc6081812938 SHA512 db15b9ddde46cb41adf43f060ec46a5cd76a337bc9f3a33bf8ce66c65c7199ecff6e776b53b0ecca5057470a81e7cc470697907d6563462230ff23b1af913d73
-AUX lapack-reference-3.7.0-fix-build-system.patch 1598 BLAKE2B 9128036fc47dae239445162f98d2f7d1d86a5ad6d8c9517879cc4cb58a3d1f0f74b6a70704b2ae5089085cde4acb75bbf82d4aca218b7e7b05cf95f7061e1460 SHA512 3bcd21cc437fa62b1b74ec26908a882e69e413987a2d92832e5c62ed044230b1ac285401c6042c609b2a732320fd660979b812f9279f9eca7bb078ea3fce37b6
-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 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
deleted file mode 100644
index bd98acc71819..000000000000
--- a/sci-libs/blas-reference/blas-reference-20070226-r4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils fortran-2 autotools multilib flag-o-matic toolchain-funcs
-
-LAPACKPV="3.1.1"
-LAPACKPN="lapack-lite"
-
-DESCRIPTION="Basic Linear Algebra Subprograms F77 reference implementations"
-HOMEPAGE="http://www.netlib.org/blas/"
-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"
-IUSE="doc"
-
-DEPEND="app-eselect/eselect-blas"
-RDEPEND="${DEPEND}
-	doc? ( app-doc/blas-docs )"
-
-S="${WORKDIR}/${LAPACKPN}-${LAPACKPV}"
-
-src_prepare() {
-	ESELECT_PROF=reference
-	epatch \
-		"${FILESDIR}"/${P}-autotool.patch \
-		"${FILESDIR}"/${P}-pkg-config.patch
-	eautoreconf
-
-	cp "${FILESDIR}"/eselect.blas.reference "${T}"/eselect.blas.reference || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.blas.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.blas.reference || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/blas/reference
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	default
-	eselect blas add $(get_libdir) "${T}"/eselect.blas.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=blas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/blas-reference/blas-reference-20151113-r1.ebuild b/sci-libs/blas-reference/blas-reference-20151113-r1.ebuild
deleted file mode 100644
index d09263456c11..000000000000
--- a/sci-libs/blas-reference/blas-reference-20151113-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit eutils fortran-2 cmake-utils multilib flag-o-matic toolchain-funcs
-
-LPN=lapack
-LPV=3.6.0
-
-DESCRIPTION="Basic Linear Algebra Subprograms F77 reference implementations"
-HOMEPAGE="http://www.netlib.org/blas/"
-SRC_URI="http://www.netlib.org/${LPN}/${LPN}-${LPV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc"
-
-RDEPEND="
-	app-eselect/eselect-blas
-	doc? ( app-doc/blas-docs )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${LPN}-${LPV}"
-PATCHES=( "${FILESDIR}/lapack-reference-${LPV}-fix-build-system.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	ESELECT_PROF=reference
-
-	cp "${FILESDIR}"/eselect.blas.reference-r1 "${T}"/eselect.blas.reference || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.blas.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.blas.reference || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DUSE_OPTIMIZED_BLAS=OFF
-		-DCMAKE_Fortran_FLAGS="$(get_abi_CFLAGS) ${FCFLAGS}"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile -C BLAS
-}
-
-src_test() {
-	local BUILD_DIR="${WORKDIR}/${P}_build/BLAS"
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install -C BLAS
-
-	mkdir -p "${ED}/usr/$(get_libdir)/blas/reference" || die
-	mv "${ED}/usr/$(get_libdir)"/lib* "${ED}/usr/$(get_libdir)/pkgconfig"/* \
-		"${ED}/usr/$(get_libdir)/blas/reference" || die
-	rmdir "${ED}/usr/$(get_libdir)/pkgconfig" || die
-
-	eselect blas add $(get_libdir) "${T}"/eselect.blas.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=blas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/blas-reference/blas-reference-20161223.ebuild b/sci-libs/blas-reference/blas-reference-20161223.ebuild
deleted file mode 100644
index 8dda6cc4e151..000000000000
--- a/sci-libs/blas-reference/blas-reference-20161223.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit eutils fortran-2 cmake-utils multilib flag-o-matic toolchain-funcs
-
-LPN=lapack
-LPV=3.7.0
-
-DESCRIPTION="Basic Linear Algebra Subprograms F77 reference implementations"
-HOMEPAGE="http://www.netlib.org/blas/"
-SRC_URI="http://www.netlib.org/${LPN}/${LPN}-${LPV}.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"
-IUSE="doc"
-
-RDEPEND="
-	app-eselect/eselect-blas
-	doc? ( app-doc/blas-docs )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${LPN}-${LPV}"
-PATCHES=( "${FILESDIR}/lapack-reference-${LPV}-fix-build-system.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	ESELECT_PROF=reference
-
-	cp "${FILESDIR}"/eselect.blas.reference-r1 "${T}"/eselect.blas.reference || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.blas.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.blas.reference || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DUSE_OPTIMIZED_BLAS=OFF
-		-DCMAKE_Fortran_FLAGS="$(get_abi_CFLAGS) ${FCFLAGS}"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile -C BLAS
-}
-
-src_test() {
-	local BUILD_DIR="${WORKDIR}/${P}_build/BLAS"
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install -C BLAS
-
-	mkdir -p "${ED}/usr/$(get_libdir)/blas/reference" || die
-	mv "${ED}/usr/$(get_libdir)"/lib* "${ED}/usr/$(get_libdir)/pkgconfig"/* \
-		"${ED}/usr/$(get_libdir)/blas/reference" || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# modify install_names accordingly, bug #605214
-		local lib
-		for lib in "${ED}"/usr/$(get_libdir)/blas/reference/*.dylib ; do
-			install_name_tool -id "${lib#${D%/}}" "${lib}"
-		done
-	fi
-	rmdir "${ED}/usr/$(get_libdir)/pkgconfig" || die
-
-	eselect blas add $(get_libdir) "${T}"/eselect.blas.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=blas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/blas-reference/files/blas-reference-20070226-autotool.patch b/sci-libs/blas-reference/files/blas-reference-20070226-autotool.patch
deleted file mode 100644
index 8d8192fc0254..000000000000
--- a/sci-libs/blas-reference/files/blas-reference-20070226-autotool.patch
+++ /dev/null
@@ -1,243 +0,0 @@
---- configure.ac 	1970-01-01 01:00:00.000000000 +0100
-+++ configure.ac	2007-07-16 10:14:29.000000000 +0100
-@@ -0,0 +1,14 @@
-+AC_PREREQ(2.59)
-+AC_INIT(blas, 20070226, lapack@cs.utk.edu)
-+AM_INIT_AUTOMAKE([foreign])
-+
-+AC_LANG(Fortran 77)
-+AC_PROG_F77
-+AC_PROG_LIBTOOL
-+
-+AC_CONFIG_FILES([Makefile
-+		 BLAS/Makefile
-+		 BLAS/SRC/Makefile
-+		 BLAS/TESTING/Makefile
-+		 BLAS/blas.pc])
-+AC_OUTPUT
---- Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ Makefile.am	2007-07-16 01:51:11.000000000 +0100
-@@ -0,0 +1 @@
-+SUBDIRS = BLAS
---- BLAS/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ BLAS/Makefile.am	2007-08-14 11:38:42.000000000 +0100
-@@ -0,0 +1,7 @@
-+SUBDIRS = SRC TESTING
-+
-+pkgconfigdir = $(libdir)
-+pkgconfig_DATA = blas.pc
-+
-+EXTRA = blas.pc
-+
---- BLAS/blas.pc.in 	1970-01-01 01:00:00.000000000 +0100
-+++ BLAS/blas.pc.in	2007-08-17 11:38:23.000000000 +0100
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Description: Basic Linear Algebra Subprograms F77 reference implementations
-+Version: @PACKAGE_VERSION@
-+URL: http://www.netlib.org/blas
-+Libs: -lblas
-+Libs.private: -lm
---- BLAS/SRC/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ BLAS/SRC/Makefile.am	2007-07-16 01:50:12.000000000 +0100
-@@ -0,0 +1,153 @@
-+lib_LTLIBRARIES = libblas.la
-+
-+libblas_la_SOURCES = \
-+	caxpy.f \
-+	ccopy.f \
-+	cdotc.f \
-+	cdotu.f \
-+	cgbmv.f \
-+	cgemm.f \
-+	cgemv.f \
-+	cgerc.f \
-+	cgeru.f \
-+	chbmv.f \
-+	chemm.f \
-+	chemv.f \
-+	cher2.f \
-+	cher2k.f \
-+	cher.f \
-+	cherk.f \
-+	chpmv.f \
-+	chpr2.f \
-+	chpr.f \
-+	crotg.f \
-+	cscal.f \
-+	csrot.f \
-+	csscal.f \
-+	cswap.f \
-+	csymm.f \
-+	csyr2k.f \
-+	csyrk.f \
-+	ctbmv.f \
-+	ctbsv.f \
-+	ctpmv.f \
-+	ctpsv.f \
-+	ctrmm.f \
-+	ctrmv.f \
-+	ctrsm.f \
-+	ctrsv.f \
-+	dasum.f \
-+	daxpy.f \
-+	dcabs1.f \
-+	dcopy.f \
-+	ddot.f \
-+	dgbmv.f \
-+	dgemm.f \
-+	dgemv.f \
-+	dger.f \
-+	dnrm2.f \
-+	drot.f \
-+	drotg.f \
-+	drotm.f \
-+	drotmg.f \
-+	dsbmv.f \
-+	dscal.f \
-+	dsdot.f \
-+	dspmv.f \
-+	dspr2.f \
-+	dspr.f \
-+	dswap.f \
-+	dsymm.f \
-+	dsymv.f \
-+	dsyr2.f \
-+	dsyr2k.f \
-+	dsyr.f \
-+	dsyrk.f \
-+	dtbmv.f \
-+	dtbsv.f \
-+	dtpmv.f \
-+	dtpsv.f \
-+	dtrmm.f \
-+	dtrmv.f \
-+	dtrsm.f \
-+	dtrsv.f \
-+	dzasum.f \
-+	dznrm2.f \
-+	icamax.f \
-+	idamax.f \
-+	isamax.f \
-+	izamax.f \
-+	lsame.f \
-+	scabs1.f \
-+	sasum.f \
-+	saxpy.f \
-+	scasum.f \
-+	scnrm2.f \
-+	scopy.f \
-+	sdot.f \
-+	sdsdot.f \
-+	sgbmv.f \
-+	sgemm.f \
-+	sgemv.f \
-+	sger.f \
-+	snrm2.f \
-+	srot.f \
-+	srotg.f \
-+	srotm.f \
-+	srotmg.f \
-+	ssbmv.f \
-+	sscal.f \
-+	sspmv.f \
-+	sspr2.f \
-+	sspr.f \
-+	sswap.f \
-+	ssymm.f \
-+	ssymv.f \
-+	ssyr2.f \
-+	ssyr2k.f \
-+	ssyr.f \
-+	ssyrk.f \
-+	stbmv.f \
-+	stbsv.f \
-+	stpmv.f \
-+	stpsv.f \
-+	strmm.f \
-+	strmv.f \
-+	strsm.f \
-+	strsv.f \
-+	xerbla.f \
-+	zaxpy.f \
-+	zcopy.f \
-+	zdotc.f \
-+	zdotu.f \
-+	zdrot.f \
-+	zdscal.f \
-+	zgbmv.f \
-+	zgemm.f \
-+	zgemv.f \
-+	zgerc.f \
-+	zgeru.f \
-+	zhbmv.f \
-+	zhemm.f \
-+	zhemv.f \
-+	zher2.f \
-+	zher2k.f \
-+	zher.f \
-+	zherk.f \
-+	zhpmv.f \
-+	zhpr2.f \
-+	zhpr.f \
-+	zrotg.f \
-+	zscal.f \
-+	zswap.f \
-+	zsymm.f \
-+	zsyr2k.f \
-+	zsyrk.f \
-+	ztbmv.f \
-+	ztbsv.f \
-+	ztpmv.f \
-+	ztpsv.f \
-+	ztrmm.f \
-+	ztrmv.f \
-+	ztrsm.f \
-+	ztrsv.f
---- BLAS/TESTING/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ BLAS/TESTING/Makefile.am	2007-07-16 01:50:12.000000000 +0100
-@@ -0,0 +1,27 @@
-+TESTS = blas_tests
-+
-+blas_tests:
-+	@install -m0755 blas_tests.sh blas_tests
-+
-+check_PROGRAMS = \
-+	xsblat1 xdblat1 xcblat1 xzblat1 \
-+	xsblat2 xdblat2 xcblat2 xzblat2 \
-+	xsblat3 xdblat3 xcblat3 xzblat3
-+
-+LDADD = $(top_builddir)/BLAS/SRC/libblas.la
-+
-+xsblat1_SOURCES = sblat1.f
-+xdblat1_SOURCES = dblat1.f
-+xcblat1_SOURCES = cblat1.f
-+xzblat1_SOURCES = zblat1.f
-+
-+xsblat2_SOURCES = sblat2.f
-+xdblat2_SOURCES = dblat2.f
-+xcblat2_SOURCES = cblat2.f
-+xzblat2_SOURCES = zblat2.f
-+
-+xsblat3_SOURCES = sblat3.f
-+xdblat3_SOURCES = dblat3.f
-+xcblat3_SOURCES = cblat3.f
-+xzblat3_SOURCES = zblat3.f
-+
---- BLAS/TESTING/blas_tests.sh 	1970-01-01 01:00:00.000000000 +0100
-+++ BLAS/TESTING/blas_tests.sh	2007-07-16 01:50:12.000000000 +0100
-@@ -0,0 +1,9 @@
-+#!/bin/sh
-+
-+for t in cblat1 sblat1 dblat1 zblat1; do
-+    ./x${t}
-+done
-+
-+for t in cblat2 sblat2 dblat2 zblat2 cblat3 sblat3 dblat3 zblat3;  do
-+    ./x${t} < ../${t}.in
-+done
diff --git a/sci-libs/blas-reference/files/blas-reference-20070226-pkg-config.patch b/sci-libs/blas-reference/files/blas-reference-20070226-pkg-config.patch
deleted file mode 100644
index 14190f41e7d5..000000000000
--- a/sci-libs/blas-reference/files/blas-reference-20070226-pkg-config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
-index 367c87b..44b86db 100644
---- a/BLAS/blas.pc.in
-+++ b/BLAS/blas.pc.in
-@@ -7,5 +7,5 @@ Name: @PACKAGE_NAME@
- Description: Basic Linear Algebra Subprograms F77 reference implementations
- Version: @PACKAGE_VERSION@
- URL: http://www.netlib.org/blas
--Libs: -lblas
-+Libs: -L@libdir@ -lblas
- Libs.private: -lm
diff --git a/sci-libs/blas-reference/files/eselect.blas.reference b/sci-libs/blas-reference/files/eselect.blas.reference
deleted file mode 100644
index edb10ddd10d9..000000000000
--- a/sci-libs/blas-reference/files/eselect.blas.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-blas/reference/libblas.so /usr/@LIBDIR@/libblas.so
-blas/reference/libblas.so.0 /usr/@LIBDIR@/libblas.so.0
-blas/reference/libblas.a /usr/@LIBDIR@/libblas.a
-../blas/reference/blas.pc /usr/@LIBDIR@/pkgconfig/blas.pc
diff --git a/sci-libs/blas-reference/files/eselect.blas.reference-r1 b/sci-libs/blas-reference/files/eselect.blas.reference-r1
deleted file mode 100644
index f032181beb67..000000000000
--- a/sci-libs/blas-reference/files/eselect.blas.reference-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-blas/reference/libblas.so /usr/@LIBDIR@/libblas.so
-blas/reference/libblas.so.3 /usr/@LIBDIR@/libblas.so.3
-blas/reference/libblas.a /usr/@LIBDIR@/libblas.a
-../blas/reference/blas.pc /usr/@LIBDIR@/pkgconfig/blas.pc
diff --git a/sci-libs/blas-reference/files/lapack-reference-3.6.0-fix-build-system.patch b/sci-libs/blas-reference/files/lapack-reference-3.6.0-fix-build-system.patch
deleted file mode 100644
index 8661709d369b..000000000000
--- a/sci-libs/blas-reference/files/lapack-reference-3.6.0-fix-build-system.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- lapack-3.6.0/BLAS/blas.pc.in
-+++ lapack-3.6.0/BLAS/blas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: blas
- Description: Basic Linear Algebra Subprograms F77 reference implementations
---- lapack-3.6.0/BLAS/CMakeLists.txt
-+++ lapack-3.6.0/BLAS/CMakeLists.txt
-@@ -2,7 +2,7 @@
- if(BUILD_TESTING)
- add_subdirectory(TESTING)
- endif(BUILD_TESTING)
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY)
- install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/blas.pc
-   DESTINATION ${PKG_CONFIG_DIR}
---- lapack-3.6.0/CBLAS/cblas.pc.in
-+++ lapack-3.6.0/CBLAS/cblas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: lapacke
- Description: C Standard Interface to BLAS Linear Algebra PACKage
---- lapack-3.6.0/CBLAS/CMakeLists.txt
-+++ lapack-3.6.0/CBLAS/CMakeLists.txt
-@@ -71,7 +71,7 @@
-   ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
- 
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
-   install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
-   DESTINATION ${PKG_CONFIG_DIR}
---- lapack-3.6.0/CMakeLists.txt
-+++ lapack-3.6.0/CMakeLists.txt
-@@ -333,7 +333,7 @@
-   ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
- 
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
-   install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
-   DESTINATION ${PKG_CONFIG_DIR}
---- lapack-3.6.0/LAPACKE/CMakeLists.txt
-+++ lapack-3.6.0/LAPACKE/CMakeLists.txt
-@@ -65,7 +65,7 @@
- endif(BUILD_TESTING)
- 
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
-  install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
-   DESTINATION ${PKG_CONFIG_DIR}
---- lapack-3.6.0/LAPACKE/lapacke.pc.in
-+++ lapack-3.6.0/LAPACKE/lapacke.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: lapacke
- Description: C Standard Interface to LAPACK Linear Algebra PACKage
---- lapack-3.6.0/lapack.pc.in
-+++ lapack-3.6.0/lapack.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: lapack
- Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
diff --git a/sci-libs/blas-reference/files/lapack-reference-3.7.0-fix-build-system.patch b/sci-libs/blas-reference/files/lapack-reference-3.7.0-fix-build-system.patch
deleted file mode 100644
index 70f7cb0ee926..000000000000
--- a/sci-libs/blas-reference/files/lapack-reference-3.7.0-fix-build-system.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
-index 7fd6f1e..e52f3ad 100644
---- a/BLAS/blas.pc.in
-+++ b/BLAS/blas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: BLAS
- Description: FORTRAN reference implementation of BLAS Basic Linear Algebra Subprograms
-diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
-index 4a938fe..311aed9 100644
---- a/CBLAS/cblas.pc.in
-+++ b/CBLAS/cblas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: CBLAS
- Description: C Standard Interface to BLAS Basic Linear Algebra Subprograms
-diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
-index 028f8da..dc092b1 100644
---- a/LAPACKE/lapacke.pc.in
-+++ b/LAPACKE/lapacke.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: LAPACKE
- Description: C Standard Interface to LAPACK Linear Algebra PACKage
-diff --git a/lapack.pc.in b/lapack.pc.in
-index 878efc2..2cca4c2 100644
---- a/lapack.pc.in
-+++ b/lapack.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: LAPACK
- Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
diff --git a/sci-libs/blas-reference/metadata.xml b/sci-libs/blas-reference/metadata.xml
deleted file mode 100644
index 1bde80743687..000000000000
--- a/sci-libs/blas-reference/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-The BLAS (Basic Linear Algebra Subprograms) are high quality "building
-block" routines for performing basic vector and matrix operations. Level 1
-BLAS do vector-vector operations, Level 2 BLAS do matrix-vector operations,
-and Level 3 BLAS do matrix-matrix operations. Because the BLAS are
-efficient, portable, and widely available, they're commonly used in the
-development of high quality linear algebra software, LAPACK for
-example. This packages implements the reference FORTRAN 77 library.
-</longdescription>
-</pkgmetadata>
diff --git a/sci-libs/brial/Manifest b/sci-libs/brial/Manifest
index 4478580092f8..3ae2506db329 100644
--- a/sci-libs/brial/Manifest
+++ b/sci-libs/brial/Manifest
@@ -1,5 +1,5 @@
+DIST brial-1.2.10.tar.bz2 1229830 BLAKE2B a1cfe4fcd19824d04388bbab1130a9d07e5920fb05ea1686424f1e0193c6f5d29300bba66bdf7ac59665cbceed3f6ff84fbb5a95311858196a0fbdecda5a2cc7 SHA512 163d9f3703271f412d20ec165d713280d9b46c50b66eed0b15385c6d94569e0ea5d7e84c3b6715d51197e97be4062325551402c844f70235a4aa1cebc5e9d3a1
 DIST brial-1.2.8.tar.bz2 1228732 BLAKE2B f9bdfc9416381f3436c555861806a7ea4680e706729b6de9c2b06ea2908090b87b745fe5ce2d94ba9d5832a78067e4848f8ef113b7d8dc22557b6d95b7dad707 SHA512 a94acba140d976dd070b5214c537fb3dba89fc2309addc566b8f0a031328f2d4c2bb3c38c2cb5565c7ff2ca0c5f7f56ca120899d15c768887d3b61a18b3e05be
-DIST brial-1.2.9.tar.bz2 1230234 BLAKE2B c083931793976deee592e91efcc8ae2fa501c5a2b5cb04fd8449e225c84d5bbe9255480641694e8aac4f299c6ab1800bf21713278d0f8def4a1f335643751cdd SHA512 f5dfcab6b324d1151e06ce3af0f085ebf692d26cd4b38203c835a35a6f0f25d09f6c4a6ebf44b12c3a9c9125dddb2e94a43f1d04b59d07995392b50ada54d410
+EBUILD brial-1.2.10.ebuild 983 BLAKE2B 64e08bbdb530f70243a503e5e243e859c74d6c53961a964a9af3089c2922110653db946a2e512ac37fd5dbfec5107e753c52568d8f70fb98ae1ee6d5168462c6 SHA512 953d52de88b03cacd45dcfe7a77b2a94bc8fdc80f5c81bc212f03b9270f6b006daf63ecc1fffcb0cdd8aeee5f7f4f424d6c27ca30b89eaa57a5dc5f2a777a337
 EBUILD brial-1.2.8.ebuild 979 BLAKE2B 1c72e16b99e8f3512b3b16bb4c30525c09772e7702029f43a3b1ad10b7e1d218cf72af004003b867eb486b0731d924ddd1de5edc66eb5f1b28e3f1da924ea596 SHA512 65aa634cb876a4ac84fc04ac33c66157d8c8dd727b88a2018c935be54adebfa4fa9d77ff352933e6731e30c1352b62ff1b68d5b436a823fe9d2e8b0c58983c40
-EBUILD brial-1.2.9.ebuild 983 BLAKE2B 64e08bbdb530f70243a503e5e243e859c74d6c53961a964a9af3089c2922110653db946a2e512ac37fd5dbfec5107e753c52568d8f70fb98ae1ee6d5168462c6 SHA512 953d52de88b03cacd45dcfe7a77b2a94bc8fdc80f5c81bc212f03b9270f6b006daf63ecc1fffcb0cdd8aeee5f7f4f424d6c27ca30b89eaa57a5dc5f2a777a337
 MISC metadata.xml 1046 BLAKE2B 34c6f471ca6fbc4538cf3a2dc71bd19d4201656f326166b2589be3126f73f5ff34d190c2ff42154a067457a9da6f05067e782c9dc340357895ca016be6983183 SHA512 550a191f11f7812c363d419e8bed69fdd70e69b3a94e6fba838be9bc04050977edaab34ab0c0ef9c589e6478cdf2d40ba631983f6a2f411e51b9f3964bb48db5
diff --git a/sci-libs/brial/brial-1.2.9.ebuild b/sci-libs/brial/brial-1.2.10.ebuild
index e1831c017fc6..e1831c017fc6 100644
--- a/sci-libs/brial/brial-1.2.9.ebuild
+++ b/sci-libs/brial/brial-1.2.10.ebuild
diff --git a/sci-libs/buddy/Manifest b/sci-libs/buddy/Manifest
index 499f881e2421..f714e67b22d5 100644
--- a/sci-libs/buddy/Manifest
+++ b/sci-libs/buddy/Manifest
@@ -1,5 +1,5 @@
 AUX buddy-2.4-gcc43.patch 807 BLAKE2B 80434e41ccea232e9833462eac5dfaf028cec7e22e879ca1729c7cfff9a5c83868d898828c3b3d8cdbff584d48e501f4545cb80305c40076d6b2541703b15a03 SHA512 da8069bb467ad1a159036a6d39c8ab5ad75ecf1d69b00b2db8b2de5f279a8cf807fc0f93ae9e0b0b9512d4b33c0889318463e1f34ec10f34415be76ebb1c9a20
 AUX buddy-2.4-gold.patch 596 BLAKE2B 255f7b559418d7846dc7f81711d78e7764686a1972477c1579be5c4f0ded5142e7320986b9cfa3399e30c1ac2637c5c0478711df2867791b9dadd83970d941ca SHA512 46f8077fc2c10479b083d3b9cda2905baa8c06739e3de47ebf1535b77229a21811f47f33d5de1431ea634e97baa9950496ab46bc69974830f1f13a1c2e2444ee
 DIST buddy-2.4.tar.gz 766523 BLAKE2B ab640fe6ccde38b8c5b9b6e344a94c605f6c3f12992e13350bbf547367cb074ec07b76b3d2b9d9d4d87f3604b24fe8b4961a8634f51f6c25bb004118188ece3f SHA512 43984969359ac363141ee8a67538ceeae1412efa172432a8355f6ce68ab5ffab12470ad7a2e0d7a6a557b8bf55e98b2f2dc5cc6710466403d45fab2195ba2e23
-EBUILD buddy-2.4-r1.ebuild 707 BLAKE2B 3223a7c2f4f71626ac12af5c8fe6cfa5403082e577470f029e4417fd625d2c3663a1a65f2fdecfbb286695d38dacb25a320a89e82f8935d24a650e731122c7bc SHA512 3b1f8f9db8f7946de4b518c7dc62abe0b111cdafca153ac7426ac6dfb5c1f856357bcaf6d7d962d6160960373ab27fd27ceb30a6fa7f131de97d5f8e6590eee7
+EBUILD buddy-2.4-r1.ebuild 797 BLAKE2B d8f8b97269da5aad3f0cec9578e41eb85d68c85cfa9f8ee06012e9ee77ec7e14b93e48317af903fdc834ff3c5b54a3fc1ef09f98081eed5c9e5a7315f1935c3a SHA512 baea0c3806cdce6534ad49e2b878f1e082b4d1f3933249a9615f06584be9934907b5111c074f8498ce2ecc51a6a7fde0ecb218fa7cfef024752509d6fab526fc
 MISC metadata.xml 606 BLAKE2B f2921b1718f4c72d5f9f10c21fb2ff23485653629db025bd9eb97acc40b0aa2db3a82034c1577cd7244290d263fd5b9678dff3ae19241932653679bb34879cc0 SHA512 b89f749637d1b732bb8bb6ce33d8ca9445e388ee6bf0870e01781a3eec0a8a4bb3fe88c0ed618b0e3a4f2c793655fa3ba3184d84857754782b5c2a777f3f847a
diff --git a/sci-libs/buddy/buddy-2.4-r1.ebuild b/sci-libs/buddy/buddy-2.4-r1.ebuild
index c5dfddbbe1e1..004107ea6cf6 100644
--- a/sci-libs/buddy/buddy-2.4-r1.ebuild
+++ b/sci-libs/buddy/buddy-2.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit fortran-2
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="buddy"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples static-libs"
+IUSE="doc examples"
 
 DOCS=( doc/tech.txt )
 PATCHES=(
@@ -21,16 +21,21 @@ PATCHES=(
 )
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
 	default
-
-	use doc && docinto ps && dodoc doc/*.ps
+	find "${ED}" -name '*.la' -delete || die
 
 	if use examples; then
-		insinto /usr/share/${PN}/
-		doins -r examples
+		find examples/ -name 'Makefile*' -delete || die
+
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	if use doc; then
+		docinto ps
+		dodoc doc/*.ps
 	fi
 }
diff --git a/sci-libs/camd/Manifest b/sci-libs/camd/Manifest
index 70a6cdaaf4f2..2242bd9e8f1e 100644
--- a/sci-libs/camd/Manifest
+++ b/sci-libs/camd/Manifest
@@ -1,3 +1,3 @@
 DIST camd-2.4.6.tar.bz2 317071 BLAKE2B 8f982050a20f00c9443063a0473caa4aa27efe005fe07b503cb68b29499152561fc9d30d00783607b1e8fb8af88707eabfe22d192b80e375b8a6d04d7a9a26d7 SHA512 c4020ed3e063d04f5d7d1a301719b1a5b5b912d505858f046654c9d283c41ff01d55f668fb7f7179a6ac636f5a5b80f71cac5eb5b1e5cae0ede97d946d62a1d0
-EBUILD camd-2.4.6.ebuild 729 BLAKE2B bdc951c763877fe0dc0fa73d6ba0a1deaaa5379917ee0e385e0478a632e481e2263c8276eb3c559ac4196bde3a9275723249e54883d64e311cff697f0e5838ca SHA512 f74c783ec10f374ef67ad9c8e32112b60804a7bc7e179928bf960647001041c77588bb456a4ecb577a64713fa27d86059429b1e01174e89164b6a5c9667f46c2
+EBUILD camd-2.4.6.ebuild 728 BLAKE2B 1df7960dd020411c35ab57e1ce0500cd3ef887891ae7774e5a544e5af9bdfc46b02252b06cbc5ad8c6a4e943cbb3c9b9477630b52224e3d31d94a738198c22c1 SHA512 8b9cb89601700474ad4f8eb22ced91a270f62a7cb406430a38d115bb4b5fc160f4cd6f9ef7e6a2c65c86e5cee1922e325013b34acf90e70618a96e3b78231aa8
 MISC metadata.xml 494 BLAKE2B 456f4ab539ab7303849cfabfda3e07987874a833e5691d6c3336ebb8a86cc6d5cc5fe8c20b65d8e5fdd8da1c947b9e7ff8eedfd2cc17da6040ff5d109b1b110d SHA512 6402783aec0922669bbf45477074644a9b10f44b0b06bf86ad9b4ecbab124076ee7f19c2c68c6eb3bf21a1569a3410f1ed0ac12f653dd5808559da133613d09f
diff --git a/sci-libs/camd/camd-2.4.6.ebuild b/sci-libs/camd/camd-2.4.6.ebuild
index 4ac1627a0b35..b2702e44ebc6 100644
--- a/sci-libs/camd/camd-2.4.6.ebuild
+++ b/sci-libs/camd/camd-2.4.6.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 51c4f60a2de6..264a01cf4562 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -4,5 +4,5 @@ AUX cantera_2.4.0_env_python_install_prefix.patch 943 BLAKE2B 06bc4ac2cc4aaa2123
 AUX cantera_2.4.0_sundials4.patch 8410 BLAKE2B dbee09305610bb0d74c1569d694782194c0cb3daf06b581fa385021faed9d54d8f900747bdcac64b0322dcc82fee20bc330b71bee1aa90fe9df68efc335427b7 SHA512 ec4b80b761c3d18cc03bb87ec59b7c860b6818c3a5503f3f7c759f0bfde7cc6c5ded3c64294f9844e28a649754f4a1c158738bc5a7c923bd4808a78c6a59c91a
 DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9
 EBUILD cantera-2.4.0-r4.ebuild 3028 BLAKE2B cacb43b61a63aba2ae8a55393ff8f0ea93c0bbea9266f182d3ac270e822b09a16865da60076e6ea059bc1c684c9a13e7291f3aed037ca2fa79c48d0844fd5051 SHA512 c3f361945f1d4756f8251fc3122a4b8ba36e5f5723c4d71742f8d089a41614669ecaf5462a8e2d5945b09611eda3a98f4d91736ca253202c44d1a6fd6cb22705
-EBUILD cantera-2.4.0-r5.ebuild 3072 BLAKE2B 44b04260688a25de14ad1bd53bc5831f4f3354bc0b9cda0c857f86456b7d64e644284e7748ac0949cc5a5b50e3c297bedfdd6f162621eeb8c5d32f3570e318d7 SHA512 a4f702e5a7f4e8bf7c1147bd6a96d2bc51ef99a7c60691deb1f24fd07a78ca8cfb6427a0758912611793272c58a8bf87d66dcaa47b888dc0a3204729c0bb8ecf
+EBUILD cantera-2.4.0-r5.ebuild 3071 BLAKE2B e4a48b20a7446b1f521d2542c111f40603e708aef5940bee16447070cf00fd20e4f73778d054e33e68b92b0ae028dc8fbd89b0817367dcbeb96bc51305f13488 SHA512 0422fdea1f33a1e50aa6ec771234a87929c0827add0afc7cc2618db0cf275657b33d9f7aa95064eda4f2508d2cf7c5015c92d036058dda1838bd45d3b41cf68e
 MISC metadata.xml 794 BLAKE2B 4a92fb553aad7d87d4b7a8d77974dbd67d593b4010783f96324979d9c01067bccc60d2faedf604bd8d44a8ac4316356879301899af8bc08d0fcd548df6d3762d SHA512 a9e6f4e161519d0b3618fe8da7065195bc760ba889fa4356358d4047ea1970eb5fd78bdc5fbeb7c660f1bee48a68ab20ced636514e6f12848e88f6f4dabc9705
diff --git a/sci-libs/cantera/cantera-2.4.0-r5.ebuild b/sci-libs/cantera/cantera-2.4.0-r5.ebuild
index ac2a89b4ddd4..509fa30f426c 100644
--- a/sci-libs/cantera/cantera-2.4.0-r5.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+cti fortran pch +python test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 9848b2dc4d11..7b54d6051855 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,3 +1,3 @@
 DIST cartopy-0.18.0.tar.gz 14191937 BLAKE2B bb10791ef2534dad404cc492e378161a4a078813b09d6e2c16d0d465c7dcfbaa7f24d3818cfe0f1f46e7683bdf2e00440640534835ce064492d5321489e355bc SHA512 912d5ab57c96b9e6c51b3ad26f94d77e495eb9c3a8fb8a68bdd957c11b1bc8a3ddc97e76e0d8a5ec9afca9302b01fe5753f4208ec3829df8741ee0ebbaafe30f
-EBUILD cartopy-0.18.0.ebuild 1675 BLAKE2B 3159117c6844415b01d8943e51676cf010095de759391243176e3255ffd134c5b5f0d28921c513c3052a35096025ac0df25080d499519fc040d0a6e41ab05dbd SHA512 2dbc3396e318a336834dc8512747673463342b789f7f81a2fba45dfa31ec7332ae031d7f2d137d1687e22ad918029e47d3dca4db45273296191b9e3a7390540c
+EBUILD cartopy-0.18.0.ebuild 1675 BLAKE2B 24883ad6128afb55d51980fc7af6d2a7b2230928a6806da4c09079471ada2a0af9a5ad40bcee3864c390eafd752e1dc9766c2219dcb5b9d30fdaf0e4bf92baa8 SHA512 c7f2fb3a2307f59a8b0a0b257f0364a67319b2feb6b586c27467ec8d7457b0af842a1e10babd52e01d43fb52ba124f01b21d3af92829e15ca8f62f95789dd629
 MISC metadata.xml 602 BLAKE2B 92e179b5503c84c6e567e7adb48917ca6140a7c04a0f5613b5aa3a9c19623d61abed95c325b41ca0d5a99b046c2891511796de49c3117c4ce9c969069bb2c5f0 SHA512 8677cb5685dee0b5868c1b14ffc13ac93e3b26ab741ceb684c7c48caf02f159a7a6613402e0396b9b0bc256c39b6446cbb7779521324447d96ed524fb8ca664d
diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild b/sci-libs/cartopy/cartopy-0.18.0.ebuild
index bc9c5426b8f1..d4fd00b90fcd 100644
--- a/sci-libs/cartopy/cartopy-0.18.0.ebuild
+++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	${PYTHON_DEPS}
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/pyshp[${PYTHON_USEDEP}]
-	sci-libs/Shapely[${PYTHON_USEDEP}]
+	sci-libs/shapely[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
diff --git a/sci-libs/cblas-reference/Manifest b/sci-libs/cblas-reference/Manifest
deleted file mode 100644
index 1106f5b034e6..000000000000
--- a/sci-libs/cblas-reference/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX cblas-reference-20030223-autotool.patch 13378 BLAKE2B 6f66209755c9443b3732538af11848f5d1edbfdd0ad0464c1a2d11903adecf9ad4c28d7f7138ceda74d5a20e96b1c498d7351cc5e722f2f6fd822b13feac4235 SHA512 45d07414acd5251d162ccc2b3f8f126665e110348797f97df472ba38ecce46c3c91359d3f37a83f9763f756246e04b5756710ea0e2d2a74b4485968707262393
-AUX eselect.cblas.reference 256 BLAKE2B 086304a537ed2fe060c10c96cf5b799ea6954f5640ffe820a5ee8e740828a742544682d1d053c779f5ea9f02692c56a24546a8dfc57a857be46a1ae46e30a2ed SHA512 91728a7a56ef3f46c85a302e484f3173a63a58af003e64ec8ecfc2c77a75b8cedac4d6e9fba4ea6a6096bb71547ee8157c6059faa762fd90d4583a9025e569c0
-AUX eselect.cblas.reference-r2 481 BLAKE2B 4dc8b6c70ad60123dcfe66fd79f521720c9835a1880893efc2da98d2c7af12bb0e25ae3a25fd316e559a21e7848bed0a6af9749f3dc2c3f8aeb2043d8993d3cd SHA512 2aa8c08a8305ae7c9270325b8ed248045f937caeb081ae7ea59c6722f62bc8cbed9710084cd47fbb8ce96a1bc5b8876790e1bffdaed7e183033b4f2e2450efbd
-AUX lapack-reference-3.6.0-fix-build-system.patch 4215 BLAKE2B 4968da98f2e2885c9dda1165efea51fe71daf7985f96eb36adf945f7e8ee5f1b87c13e614ead4239deed2c098562587fd0a980883c5edd03def876d9978987c3 SHA512 5cd571de7f7f0af2e02643d4d47681a2acef3d1cd70d76ffe19c344c6c444d3d1902438a3c4462064cedea0386872c2f7c181b63dadcce952ec9b3bdc44dbb2a
-AUX lapack-reference-3.7.0-fix-build-system.patch 1598 BLAKE2B 9128036fc47dae239445162f98d2f7d1d86a5ad6d8c9517879cc4cb58a3d1f0f74b6a70704b2ae5089085cde4acb75bbf82d4aca218b7e7b05cf95f7061e1460 SHA512 3bcd21cc437fa62b1b74ec26908a882e69e413987a2d92832e5c62ed044230b1ac285401c6042c609b2a732320fd660979b812f9279f9eca7bb078ea3fce37b6
-DIST cblas.tgz 197694 BLAKE2B a9a6feff0198cc62b2a9fd75740e9cebbecd36adff7a1fb3ea57942846d428dcbdb9b266d4510b67bc077b13fe833c063e4784278755513c3abddc66884f5e36 SHA512 8edc4f939d36e6bb9bcbc4ffe414b6c991192ef2e76ec4eda16d3578591185d31e46be5e747d74c740411db6bd2c2d414a18f73193d4a288e8c7e4b83cb0895d
-DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01f5ab237dc0d941792ceb54dbd2f8dc22d56286f5dab3499289ed94e67521ea951a98973c9640abc294ad6c SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8
-DIST lapack-3.7.0.tgz 7359812 BLAKE2B 20aa42e22d8c920d1360afe41ceec7b36f6cd5fbe43ca9d7848ef7cc45a64a0314cb1321941c1a7c03654f41e28ec805445882ded0ca0ea07674e70b66cba6b5 SHA512 e4f4c7d0ba8a096eeb813160c6dbcdd535647df6b2ad5beac9181908158956b31d1a9554ec9b9836fd44fe7404c1f377b297cbb20d744f20d70e357fd246c91b
-EBUILD cblas-reference-20030223-r6.ebuild 1839 BLAKE2B 4c0d138ed5d2c1e46b2a350bf030f999fa99d05cd6584309947db85087cda505bb25a21a8f4fe3fbc24e17a96e8a013dc8952a7ae286b75ab9daef0d787aa8b1 SHA512 d8372f5d73f2166359596e8ca271aa4798bc12083e57c692e57fde951bfccc01d800b679f1a236ce5eb5960d453b59159773bada3dc63c78ee3dcecceafc6d08
-EBUILD cblas-reference-20151113-r2.ebuild 2634 BLAKE2B 40af8c3d632edae615a825040bbbd319f91ad186aca1916003dbfe88df29af20aaf4074ac83cb7e4556ac01b01c482f283063865b5afac2d7e02f4e35fb4e4b2 SHA512 d48b02af0a0db8ea90fb5fdcf00d4a7605162ef0f04e6ad70d042feb9fdb4816d41d2bcdff097fdd51df3145b38977cca4c6a9544fd4ec5cd7afeab702797d34
-EBUILD cblas-reference-20161223.ebuild 2641 BLAKE2B 3ac89dc9764fb98b8165832201c5d0643c2f807294eb4ab95b865557b06eee3885504885be9f3516b026677422345c4113c5ec3a80fb9e713a504094c4ac17fb SHA512 62247d478a4187d8b972471b5227e6e6e567feb74806bd271096f98a883a321e2471a53f4905a3206611b22117e6fd00004fd522fc8fc713cc9810b83a1e29fd
-MISC metadata.xml 836 BLAKE2B b355702b31b2de0e8c98cbd84338da58a19821c32b2e9cc039e0ea2f6a416be88ba4b4480b1f769c1311b1902092b8cfbe218ad67d48863932961a99b1ef15d2 SHA512 5e3394b15042b221806f47a96bc5b1bb09a004f9dc30639595c6a3264c7c92af3fec769b87a1702eba2f8a7c06580e7c62cbe22577ce93e35886c9db1aa309b3
diff --git a/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild b/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild
deleted file mode 100644
index 7b8572d844d3..000000000000
--- a/sci-libs/cblas-reference/cblas-reference-20030223-r6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils fortran-2 multilib toolchain-funcs
-
-MyPN="${PN/-reference/}"
-
-DESCRIPTION="C wrapper interface to the F77 reference BLAS implementation"
-HOMEPAGE="http://www.netlib.org/blas/"
-SRC_URI="http://www.netlib.org/blas/blast-forum/${MyPN}.tgz"
-
-SLOT="0"
-LICENSE="public-domain"
-IUSE=""
-KEYWORDS="~alpha amd64 hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	virtual/blas
-	app-eselect/eselect-cblas"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-ESELECT_PROF=reference
-S="${WORKDIR}/CBLAS"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-autotool.patch
-	eautoreconf
-
-	cp "${FILESDIR}"/eselect.cblas.reference "${T}"/ || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.cblas.reference || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/blas/reference \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-}
-
-src_install() {
-	default
-	dodoc cblas_example*c
-	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=cblas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild b/sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild
deleted file mode 100644
index f3dd39de4338..000000000000
--- a/sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit eutils fortran-2 cmake-utils multilib flag-o-matic toolchain-funcs
-
-LPN=lapack
-LPV=3.6.0
-
-DESCRIPTION="C wrapper interface to the F77 reference BLAS implementation"
-HOMEPAGE="http://www.netlib.org/cblas/"
-SRC_URI="http://www.netlib.org/${LPN}/${LPN}-${LPV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-DEPEND="app-eselect/eselect-cblas
-	>=virtual/blas-3.6
-	virtual/pkgconfig"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${LPN}-${LPV}"
-PATCHES=( "${FILESDIR}/lapack-reference-${LPV}-fix-build-system.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	ESELECT_PROF=reference
-
-	cp "${FILESDIR}"/eselect.cblas.reference-r2 "${T}"/eselect.cblas.reference || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.cblas.reference || die
-	fi
-
-	sed -i \
-		-e 's:/CMAKE/:/cmake/:g' \
-		CBLAS/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DCBLAS=ON
-		-DUSE_OPTIMIZED_BLAS=ON
-		-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		-DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) ${CFLAGS}"
-		-DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) $(get_abi_CFLAGS) ${FCFLAGS}"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile -C CBLAS
-}
-
-src_install() {
-	cmake-utils_src_install -C CBLAS
-
-	mkdir -p "${ED}/usr/$(get_libdir)/blas/reference" || die
-	mv "${ED}/usr/$(get_libdir)"/lib* "${ED}/usr/include"/cblas* \
-		"${ED}/usr/$(get_libdir)/pkgconfig"/* \
-		"${ED}/usr/$(get_libdir)/blas/reference" || die
-
-	rmdir "${ED}/usr/$(get_libdir)/pkgconfig" || die
-	rmdir "${ED}/usr/include" || die
-
-	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=cblas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/cblas-reference/cblas-reference-20161223.ebuild b/sci-libs/cblas-reference/cblas-reference-20161223.ebuild
deleted file mode 100644
index 839759b7cde4..000000000000
--- a/sci-libs/cblas-reference/cblas-reference-20161223.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit eutils fortran-2 cmake-utils multilib flag-o-matic toolchain-funcs
-
-LPN=lapack
-LPV=3.7.0
-
-DESCRIPTION="C wrapper interface to the F77 reference BLAS implementation"
-HOMEPAGE="http://www.netlib.org/cblas/"
-SRC_URI="http://www.netlib.org/${LPN}/${LPN}-${LPV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-DEPEND="app-eselect/eselect-cblas
-	>=virtual/blas-3.6
-	virtual/pkgconfig"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${LPN}-${LPV}"
-PATCHES=( "${FILESDIR}/lapack-reference-${LPV}-fix-build-system.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	ESELECT_PROF=reference
-
-	cp "${FILESDIR}"/eselect.cblas.reference-r2 "${T}"/eselect.cblas.reference || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.cblas.reference || die
-	fi
-
-	sed -i \
-		-e 's:/CMAKE/:/cmake/:g' \
-		CBLAS/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DCBLAS=ON
-		-DUSE_OPTIMIZED_BLAS=ON
-		-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		-DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) ${CFLAGS}"
-		-DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) $(get_abi_CFLAGS) ${FCFLAGS}"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile -C CBLAS
-}
-
-src_install() {
-	cmake-utils_src_install -C CBLAS
-
-	mkdir -p "${ED}/usr/$(get_libdir)/blas/reference" || die
-	mv "${ED}/usr/$(get_libdir)"/lib* "${ED}/usr/include"/cblas* \
-		"${ED}/usr/$(get_libdir)/pkgconfig"/* \
-		"${ED}/usr/$(get_libdir)/blas/reference" || die
-
-	rmdir "${ED}/usr/$(get_libdir)/pkgconfig" || die
-	rmdir "${ED}/usr/include" || die
-
-	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=cblas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/cblas-reference/files/cblas-reference-20030223-autotool.patch b/sci-libs/cblas-reference/files/cblas-reference-20030223-autotool.patch
deleted file mode 100644
index 0dd595bf4a21..000000000000
--- a/sci-libs/cblas-reference/files/cblas-reference-20030223-autotool.patch
+++ /dev/null
@@ -1,567 +0,0 @@
---- configure.ac 	1970-01-01 01:00:00.000000000 +0100
-+++ configure.ac	2007-11-09 17:59:16.000000000 +0000
-@@ -0,0 +1,24 @@
-+AC_PREREQ(2.59)
-+AC_INIT(cblas, 20030223, lapack@cs.utk.edu)
-+AC_CONFIG_SRCDIR([cblas_example2.c])
-+AC_CONFIG_HEADER([config.h])
-+AM_INIT_AUTOMAKE([foreign])
-+
-+AC_LANG(C)
-+AC_PROG_CC
-+AC_PROG_F77
-+AC_F77_LIBRARY_LDFLAGS
-+AC_PROG_LIBTOOL
-+
-+sinclude(acx_blas.m4)
-+ACX_BLAS
-+if test x"$BLAS_LIBS" = x; then
-+   AC_MSG_ERROR([Cannot find blas libraries])
-+fi
-+
-+
-+AC_CONFIG_FILES([Makefile
-+		 src/Makefile
-+		 testing/Makefile
-+		 cblas.pc])
-+AC_OUTPUT
---- Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ Makefile.am	2007-11-09 16:20:41.000000000 +0000
-@@ -0,0 +1,8 @@
-+SUBDIRS = src testing
-+
-+pkgconfigdir = $(libdir)
-+pkgconfig_DATA = cblas.pc
-+
-+EXTRA = cblas.pc
-+
-+
---- cblas.pc.in 	1970-01-01 01:00:00.000000000 +0100
-+++ cblas.pc.in	2007-11-09 16:20:41.000000000 +0000
-@@ -0,0 +1,13 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Description: Basic Linear Algebra Subprograms C reference wrapper
-+Version: @PACKAGE_VERSION@
-+Requires: blas
-+URL: http://www.netlib.org/blas/
-+Libs: -lcblas
-+Libs.private: @FLIBS@
-+Cflags: -I${includedir}
---- acx_blas.m4 	1970-01-01 01:00:00.000000000 +0100
-+++ acx_blas.m4	2007-08-04 22:50:48.000000000 +0100
-@@ -0,0 +1,191 @@
-+##### http://autoconf-archive.cryp.to/acx_blas.html
-+#
-+# SYNOPSIS
-+#
-+#   ACX_BLAS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-+#
-+# DESCRIPTION
-+#
-+#   This macro looks for a library that implements the BLAS
-+#   linear-algebra interface (see http://www.netlib.org/blas/). On
-+#   success, it sets the BLAS_LIBS output variable to hold the
-+#   requisite library linkages.
-+#
-+#   To link with BLAS, you should link with:
-+#
-+#   	$BLAS_LIBS $LIBS $FLIBS
-+#
-+#   in that order. FLIBS is the output variable of the
-+#   AC_F77_LIBRARY_LDFLAGS macro (called if necessary by ACX_BLAS), and
-+#   is sometimes necessary in order to link with F77 libraries. Users
-+#   will also need to use AC_F77_DUMMY_MAIN (see the autoconf manual),
-+#   for the same reason.
-+#
-+#   Many libraries are searched for, from ATLAS to CXML to ESSL. The
-+#   user may also use --with-blas=<lib> in order to use some specific
-+#   BLAS library <lib>. In order to link successfully, however, be
-+#   aware that you will probably need to use the same Fortran compiler
-+#   (which can be set via the F77 env. var.) as was used to compile the
-+#   BLAS library.
-+#
-+#   ACTION-IF-FOUND is a list of shell commands to run if a BLAS
-+#   library is found, and ACTION-IF-NOT-FOUND is a list of commands to
-+#   run it if it is not found. If ACTION-IF-FOUND is not specified, the
-+#   default action will define HAVE_BLAS.
-+#
-+#   This macro requires autoconf 2.50 or later.
-+#
-+# LAST MODIFICATION
-+#
-+#   2007-07-29
-+#
-+# COPYLEFT
-+#
-+#   Copyright (c) 2007 Steven G. Johnson <stevenj@alum.mit.edu>
-+#
-+#   This program is free software: you can redistribute it and/or
-+#   modify it under the terms of the GNU General Public License as
-+#   published by the Free Software Foundation, either version 3 of the
-+#   License, or (at your option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful, but
-+#   WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+#   General Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License
-+#   along with this program. If not, see
-+#   <http://www.gnu.org/licenses/>.
-+#
-+#   As a special exception, the respective Autoconf Macro's copyright
-+#   owner gives unlimited permission to copy, distribute and modify the
-+#   configure scripts that are the output of Autoconf when processing
-+#   the Macro. You need not follow the terms of the GNU General Public
-+#   License when using or distributing such scripts, even though
-+#   portions of the text of the Macro appear in them. The GNU General
-+#   Public License (GPL) does govern all other use of the material that
-+#   constitutes the Autoconf Macro.
-+#
-+#   This special exception to the GPL applies to versions of the
-+#   Autoconf Macro released by the Autoconf Macro Archive. When you
-+#   make and distribute a modified version of the Autoconf Macro, you
-+#   may extend this special exception to the GPL to apply to your
-+#   modified version as well.
-+
-+AC_DEFUN([ACX_BLAS], [
-+AC_PREREQ(2.50)
-+AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])
-+acx_blas_ok=no
-+
-+AC_ARG_WITH(blas,
-+	[AC_HELP_STRING([--with-blas=<lib>], [use BLAS library <lib>])])
-+case $with_blas in
-+	yes | "") ;;
-+	no) acx_blas_ok=disable ;;
-+	-* | */* | *.a | *.so | *.so.* | *.o) BLAS_LIBS="$with_blas" ;;
-+	*) BLAS_LIBS="-l$with_blas" ;;
-+esac
-+
-+# Get fortran linker names of BLAS functions to check for.
-+AC_F77_FUNC(sgemm)
-+AC_F77_FUNC(dgemm)
-+
-+acx_blas_save_LIBS="$LIBS"
-+LIBS="$LIBS $FLIBS"
-+
-+# First, check BLAS_LIBS environment variable
-+if test $acx_blas_ok = no; then
-+if test "x$BLAS_LIBS" != x; then
-+	save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS"
-+	AC_MSG_CHECKING([for $sgemm in $BLAS_LIBS])
-+	AC_TRY_LINK_FUNC($sgemm, [acx_blas_ok=yes], [BLAS_LIBS=""])
-+	AC_MSG_RESULT($acx_blas_ok)
-+	LIBS="$save_LIBS"
-+fi
-+fi
-+
-+# BLAS linked to by default?  (happens on some supercomputers)
-+if test $acx_blas_ok = no; then
-+	save_LIBS="$LIBS"; LIBS="$LIBS"
-+	AC_CHECK_FUNC($sgemm, [acx_blas_ok=yes])
-+	LIBS="$save_LIBS"
-+fi
-+
-+# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
-+if test $acx_blas_ok = no; then
-+	AC_CHECK_LIB(atlas, ATL_xerbla,
-+		[AC_CHECK_LIB(f77blas, $sgemm,
-+		[AC_CHECK_LIB(cblas, cblas_dgemm,
-+			[acx_blas_ok=yes
-+			 BLAS_LIBS="-lcblas -lf77blas -latlas"],
-+			[], [-lf77blas -latlas])],
-+			[], [-latlas])])
-+fi
-+
-+# BLAS in PhiPACK libraries? (requires generic BLAS lib, too)
-+if test $acx_blas_ok = no; then
-+	AC_CHECK_LIB(blas, $sgemm,
-+		[AC_CHECK_LIB(dgemm, $dgemm,
-+		[AC_CHECK_LIB(sgemm, $sgemm,
-+			[acx_blas_ok=yes; BLAS_LIBS="-lsgemm -ldgemm -lblas"],
-+			[], [-lblas])],
-+			[], [-lblas])])
-+fi
-+
-+# BLAS in Alpha CXML library?
-+if test $acx_blas_ok = no; then
-+	AC_CHECK_LIB(cxml, $sgemm, [acx_blas_ok=yes;BLAS_LIBS="-lcxml"])
-+fi
-+
-+# BLAS in Alpha DXML library? (now called CXML, see above)
-+if test $acx_blas_ok = no; then
-+	AC_CHECK_LIB(dxml, $sgemm, [acx_blas_ok=yes;BLAS_LIBS="-ldxml"])
-+fi
-+
-+# BLAS in Sun Performance library?
-+if test $acx_blas_ok = no; then
-+	if test "x$GCC" != xyes; then # only works with Sun CC
-+		AC_CHECK_LIB(sunmath, acosp,
-+			[AC_CHECK_LIB(sunperf, $sgemm,
-+        			[BLAS_LIBS="-xlic_lib=sunperf -lsunmath"
-+                                 acx_blas_ok=yes],[],[-lsunmath])])
-+	fi
-+fi
-+
-+# BLAS in SCSL library?  (SGI/Cray Scientific Library)
-+if test $acx_blas_ok = no; then
-+	AC_CHECK_LIB(scs, $sgemm, [acx_blas_ok=yes; BLAS_LIBS="-lscs"])
-+fi
-+
-+# BLAS in SGIMATH library?
-+if test $acx_blas_ok = no; then
-+	AC_CHECK_LIB(complib.sgimath, $sgemm,
-+		     [acx_blas_ok=yes; BLAS_LIBS="-lcomplib.sgimath"])
-+fi
-+
-+# BLAS in IBM ESSL library? (requires generic BLAS lib, too)
-+if test $acx_blas_ok = no; then
-+	AC_CHECK_LIB(blas, $sgemm,
-+		[AC_CHECK_LIB(essl, $sgemm,
-+			[acx_blas_ok=yes; BLAS_LIBS="-lessl -lblas"],
-+			[], [-lblas $FLIBS])])
-+fi
-+
-+# Generic BLAS library?
-+if test $acx_blas_ok = no; then
-+	AC_CHECK_LIB(blas, $sgemm, [acx_blas_ok=yes; BLAS_LIBS="-lblas"])
-+fi
-+
-+AC_SUBST(BLAS_LIBS)
-+
-+LIBS="$acx_blas_save_LIBS"
-+
-+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-+if test x"$acx_blas_ok" = xyes; then
-+        ifelse([$1],,AC_DEFINE(HAVE_BLAS,1,[Define if you have a BLAS library.]),[$1])
-+        :
-+else
-+        acx_blas_ok=no
-+        $2
-+fi
-+])dnl ACX_BLAS
---- src/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ src/Makefile.am	2007-11-09 16:20:41.000000000 +0000
-@@ -0,0 +1,232 @@
-+lib_LTLIBRARIES = libcblas.la
-+
-+pkgincludedir = $(includedir)/cblas
-+pkginclude_HEADERS = cblas.h
-+
-+AM_CPPFLAGS = -DADD_
-+
-+ERRHAND_SOURCES = \
-+	cblas_globals.c \
-+	cblas_xerbla.c \
-+	xerbla.c
-+
-+SINGLE_SOURCES = \
-+	cblas_scasum.c \
-+	cblas_scnrm2.c \
-+	scasumsub.f \
-+	scnrm2sub.f
-+
-+SLEV_SOURCES = \
-+	isamaxsub.f \
-+	sdotsub.f \
-+	sdsdotsub.f \
-+	snrm2sub.f \
-+	sasumsub.f
-+
-+SLEV1_SOURCES = \
-+	cblas_srotg.c \
-+	cblas_srotmg.c \
-+	cblas_srot.c \
-+	cblas_srotm.c \
-+	cblas_sswap.c \
-+	cblas_sscal.c \
-+	cblas_scopy.c \
-+	cblas_saxpy.c \
-+	cblas_sdot.c \
-+	cblas_sdsdot.c \
-+	cblas_snrm2.c \
-+	cblas_sasum.c \
-+	cblas_isamax.c
-+
-+SLEV2_SOURCES = \
-+	cblas_sgemv.c \
-+	cblas_sgbmv.c \
-+	cblas_sger.c \
-+	cblas_ssbmv.c \
-+	cblas_sspmv.c \
-+	cblas_sspr.c \
-+	cblas_sspr2.c \
-+	cblas_ssymv.c \
-+	cblas_ssyr.c \
-+	cblas_ssyr2.c \
-+	cblas_stbmv.c \
-+	cblas_stbsv.c \
-+	cblas_stpmv.c \
-+	cblas_stpsv.c \
-+	cblas_strmv.c \
-+	cblas_strsv.c
-+
-+SLEV3_SOURCES = \
-+	cblas_sgemm.c \
-+	cblas_ssymm.c \
-+	cblas_ssyrk.c \
-+	cblas_ssyr2k.c \
-+	cblas_strmm.c \
-+	cblas_strsm.c
-+
-+DLEV_SOURCES = \
-+	ddotsub.f \
-+	dsdotsub.f \
-+	dnrm2sub.f \
-+	dasumsub.f \
-+	idamaxsub.f
-+
-+DLEV1_SOURCES = \
-+	cblas_drotg.c \
-+	cblas_drotmg.c \
-+	cblas_drot.c \
-+	cblas_drotm.c \
-+	cblas_dswap.c \
-+	cblas_dscal.c \
-+	cblas_dcopy.c \
-+	cblas_daxpy.c \
-+	cblas_ddot.c \
-+	cblas_dsdot.c \
-+	cblas_dnrm2.c \
-+	cblas_dasum.c \
-+	cblas_idamax.c
-+
-+DLEV2_SOURCES = \
-+	cblas_dgemv.c \
-+	cblas_dgbmv.c \
-+	cblas_dger.c \
-+	cblas_dsbmv.c \
-+	cblas_dspmv.c \
-+	cblas_dspr.c \
-+	cblas_dspr2.c \
-+	cblas_dsymv.c \
-+	cblas_dsyr.c \
-+	cblas_dsyr2.c \
-+	cblas_dtbmv.c \
-+	cblas_dtbsv.c \
-+	cblas_dtpmv.c \
-+	cblas_dtpsv.c \
-+	cblas_dtrmv.c \
-+	cblas_dtrsv.c
-+
-+DLEV3_SOURCES = \
-+	cblas_dgemm.c \
-+	cblas_dsymm.c \
-+	cblas_dsyrk.c \
-+	cblas_dsyr2k.c \
-+	cblas_dtrmm.c \
-+	cblas_dtrsm.c
-+
-+CLEV_SOURCES = \
-+	cdotcsub.f \
-+	cdotusub.f \
-+	icamaxsub.f
-+
-+CLEV1_SOURCES = \
-+	cblas_cswap.c \
-+	cblas_cscal.c \
-+	cblas_csscal.c \
-+	cblas_ccopy.c \
-+	cblas_caxpy.c \
-+	cblas_cdotu_sub.c \
-+	cblas_cdotc_sub.c \
-+	cblas_icamax.c
-+
-+CLEV2_SOURCES = \
-+	cblas_cgemv.c \
-+	cblas_cgbmv.c \
-+	cblas_chemv.c \
-+	cblas_chbmv.c \
-+	cblas_chpmv.c \
-+	cblas_ctrmv.c \
-+	cblas_ctbmv.c \
-+	cblas_ctpmv.c \
-+	cblas_ctrsv.c \
-+	cblas_ctbsv.c \
-+	cblas_ctpsv.c \
-+	cblas_cgeru.c \
-+	cblas_cgerc.c \
-+	cblas_cher.c \
-+	cblas_cher2.c \
-+	cblas_chpr.c \
-+	cblas_chpr2.c
-+
-+CLEV3_SOURCES = \
-+	cblas_cgemm.c \
-+	cblas_csymm.c \
-+	cblas_chemm.c \
-+	cblas_cherk.c \
-+	cblas_cher2k.c \
-+	cblas_ctrmm.c \
-+	cblas_ctrsm.c \
-+	cblas_csyrk.c \
-+	cblas_csyr2k.c
-+
-+ZLEV_SOURCES = \
-+	zdotcsub.f \
-+	zdotusub.f \
-+	dzasumsub.f \
-+	dznrm2sub.f \
-+	izamaxsub.f
-+
-+ZLEV1_SOURCES = \
-+	cblas_zswap.c \
-+	cblas_zscal.c \
-+	cblas_zdscal.c \
-+	cblas_zcopy.c \
-+	cblas_zaxpy.c \
-+	cblas_zdotu_sub.c \
-+	cblas_zdotc_sub.c \
-+	cblas_dznrm2.c \
-+	cblas_dzasum.c \
-+	cblas_izamax.c
-+
-+ZLEV2_SOURCES = \
-+	cblas_zgemv.c \
-+	cblas_zgbmv.c \
-+	cblas_zhemv.c \
-+	cblas_zhbmv.c \
-+	cblas_zhpmv.c \
-+	cblas_ztrmv.c \
-+	cblas_ztbmv.c \
-+	cblas_ztpmv.c \
-+	cblas_ztrsv.c \
-+	cblas_ztbsv.c \
-+	cblas_ztpsv.c \
-+	cblas_zgeru.c \
-+	cblas_zgerc.c \
-+	cblas_zher.c \
-+	cblas_zher2.c \
-+	cblas_zhpr.c \
-+	cblas_zhpr2.c
-+
-+ZLEV3_SOURCES = \
-+	cblas_zgemm.c \
-+	cblas_zsymm.c \
-+	cblas_zhemm.c \
-+	cblas_zherk.c \
-+	cblas_zher2k.c \
-+	cblas_ztrmm.c \
-+	cblas_ztrsm.c \
-+	cblas_zsyrk.c \
-+	cblas_zsyr2k.c
-+
-+libcblas_la_SOURCES = \
-+	cblas_f77.h \
-+	cblas.h \
-+	$(ERRHAND_SOURCES) \
-+	$(SINGLE_SOURCES) \
-+	$(SLEV_SOURCES) \
-+	$(DLEV_SOURCES) \
-+	$(CLEV_SOURCES) \
-+	$(ZLEV_SOURCES) \
-+	$(SLEV1_SOURCES) \
-+	$(DLEV1_SOURCES) \
-+	$(CLEV1_SOURCES) \
-+	$(ZLEV1_SOURCES) \
-+	$(SLEV2_SOURCES) \
-+	$(DLEV2_SOURCES) \
-+	$(CLEV2_SOURCES) \
-+	$(ZLEV2_SOURCES) \
-+	$(SLEV3_SOURCES) \
-+	$(DLEV3_SOURCES) \
-+	$(CLEV3_SOURCES) \
-+	$(ZLEV3_SOURCES)
-+
-+libcblas_la_LIBADD = @BLAS_LIBS@
-+
---- testing/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ testing/Makefile.am	2007-11-09 17:20:37.000000000 +0000
-@@ -0,0 +1,70 @@
-+TESTS = cblas_tests
-+
-+cblas_tests:
-+	@install -m0755 cblas_tests.sh cblas_tests
-+
-+check_PROGRAMS = \
-+	xscblat1 xdcblat1 xccblat1 xzcblat1 \
-+	xscblat2 xdcblat2 xccblat2 xzcblat2 \
-+	xscblat3 xdcblat3 xccblat3 xzcblat3
-+
-+LDADD = $(top_builddir)/src/libcblas.la @BLAS_LIBS@
-+
-+AM_CPPFLAGS = -I$(top_srcdir)/src -DADD_
-+
-+AUX_SOURCES = \
-+	auxiliary.c \
-+	c_xerbla.c
-+
-+xscblat1_SOURCES = \
-+	c_sblas1.c \
-+	c_sblat1.f
-+xscblat2_SOURCES = \
-+	c_sblas2.c \
-+	c_s2chke.c \
-+	c_sblat2.f \
-+	$(AUX_SOURCES)
-+xscblat3_SOURCES = \
-+	c_sblas3.c \
-+	c_s3chke.c \
-+	c_sblat3.f \
-+	$(AUX_SOURCES)
-+xdcblat1_SOURCES = \
-+	c_dblas1.c \
-+	c_dblat1.f
-+xdcblat2_SOURCES = \
-+	c_dblas2.c \
-+	c_d2chke.c \
-+	c_dblat2.f \
-+	$(AUX_SOURCES)
-+xdcblat3_SOURCES = \
-+	c_dblas3.c \
-+	c_d3chke.c \
-+	c_dblat3.f \
-+	$(AUX_SOURCES)
-+xccblat1_SOURCES = \
-+	c_cblas1.c \
-+	c_cblat1.f
-+xccblat2_SOURCES = \
-+	c_cblas2.c \
-+	c_c2chke.c \
-+	c_cblat2.f \
-+	$(AUX_SOURCES)
-+xccblat3_SOURCES = \
-+	c_cblas3.c \
-+	c_c3chke.c \
-+	c_cblat3.f \
-+	$(AUX_SOURCES)
-+xzcblat1_SOURCES = \
-+	c_zblas1.c \
-+	c_zblat1.f
-+xzcblat2_SOURCES = \
-+	c_zblas2.c \
-+	c_z2chke.c \
-+	c_zblat2.f \
-+	$(AUX_SOURCES)
-+xzcblat3_SOURCES = \
-+	c_zblas3.c \
-+	c_z3chke.c \
-+	c_zblat3.f \
-+	$(AUX_SOURCES)
---- testing/cblas_tests.sh 	1970-01-01 01:00:00.000000000 +0100
-+++ testing/cblas_tests.sh	2007-11-09 16:20:41.000000000 +0000
-@@ -0,0 +1,8 @@
-+#!/bin/sh
-+
-+for t in x*blat1; do
-+    ./${t}
-+done
-+for t in x*blat{2,3}; do
-+    ./${t} < ${t:1:1}in${t:7:1}
-+done
diff --git a/sci-libs/cblas-reference/files/eselect.cblas.reference b/sci-libs/cblas-reference/files/eselect.cblas.reference
deleted file mode 100644
index 62b581860fc7..000000000000
--- a/sci-libs/cblas-reference/files/eselect.cblas.reference
+++ /dev/null
@@ -1,5 +0,0 @@
-blas/reference/libcblas.so /usr/@LIBDIR@/libcblas.so
-blas/reference/libcblas.so.0 /usr/@LIBDIR@/libcblas.so.0
-blas/reference/libcblas.a /usr/@LIBDIR@/libcblas.a
-../blas/reference/cblas.pc /usr/@LIBDIR@/pkgconfig/cblas.pc
-cblas/cblas.h /usr/include/cblas.h
diff --git a/sci-libs/cblas-reference/files/eselect.cblas.reference-r2 b/sci-libs/cblas-reference/files/eselect.cblas.reference-r2
deleted file mode 100644
index b02188c8a9da..000000000000
--- a/sci-libs/cblas-reference/files/eselect.cblas.reference-r2
+++ /dev/null
@@ -1,8 +0,0 @@
-blas/reference/libcblas.so /usr/@LIBDIR@/libcblas.so
-blas/reference/libcblas.so.3 /usr/@LIBDIR@/libcblas.so.3
-blas/reference/libcblas.a /usr/@LIBDIR@/libcblas.a
-../blas/reference/cblas.pc /usr/@LIBDIR@/pkgconfig/cblas.pc
-../@LIBDIR@/blas/reference/cblas_test.h /usr/include/cblas_test.h
-../@LIBDIR@/blas/reference/cblas_mangling.h /usr/include/cblas_mangling.h
-../@LIBDIR@/blas/reference/cblas_f77.h /usr/include/cblas_f77.h
-../@LIBDIR@/blas/reference/cblas.h /usr/include/cblas.h
diff --git a/sci-libs/cblas-reference/files/lapack-reference-3.6.0-fix-build-system.patch b/sci-libs/cblas-reference/files/lapack-reference-3.6.0-fix-build-system.patch
deleted file mode 100644
index a187dac21a12..000000000000
--- a/sci-libs/cblas-reference/files/lapack-reference-3.6.0-fix-build-system.patch
+++ /dev/null
@@ -1,124 +0,0 @@
- BLAS/CMakeLists.txt    | 2 +-
- BLAS/blas.pc.in        | 6 ++++--
- CBLAS/CMakeLists.txt   | 2 +-
- CBLAS/cblas.pc.in      | 9 ++++++---
- CMakeLists.txt         | 2 +-
- LAPACKE/CMakeLists.txt | 2 +-
- LAPACKE/lapacke.pc.in  | 6 ++++--
- lapack.pc.in           | 6 ++++--
- 8 files changed, 22 insertions(+), 13 deletions(-)
-
-diff --git a/BLAS/CMakeLists.txt b/BLAS/CMakeLists.txt
-index 45e68e9..56c8354 100644
---- a/BLAS/CMakeLists.txt
-+++ b/BLAS/CMakeLists.txt
-@@ -2,7 +2,7 @@ add_subdirectory(SRC)
- if(BUILD_TESTING)
- add_subdirectory(TESTING)
- endif(BUILD_TESTING)
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY)
- install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/blas.pc
-   DESTINATION ${PKG_CONFIG_DIR}
-diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
-index 845a25c..7a53ea5 100644
---- a/BLAS/blas.pc.in
-+++ b/BLAS/blas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: blas
- Description: Basic Linear Algebra Subprograms F77 reference implementations
-diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
-index 98b481f..8f98b04 100644
---- a/CBLAS/CMakeLists.txt
-+++ b/CBLAS/CMakeLists.txt
-@@ -71,7 +71,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/cblas-config-build.cmake.in
-   ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
- 
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
-   install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
-   DESTINATION ${PKG_CONFIG_DIR}
-diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
-index ee20206..14a141e 100644
---- a/CBLAS/cblas.pc.in
-+++ b/CBLAS/cblas.pc.in
-@@ -1,9 +1,12 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include/@PROFNAME@
- 
--Name: lapacke
-+Name: cblas-reference
- Description: C Standard Interface to BLAS Linear Algebra PACKage
- Version: @LAPACK_VERSION@
- URL: http://www.netlib.org/lapack/
- Libs: -L${libdir} -lcblas
-+Cflags: -I${includedir}
- Requires: blas
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ab29bd2..31b878a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -333,7 +333,7 @@ configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
-   ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
- 
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
-   install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
-   DESTINATION ${PKG_CONFIG_DIR}
-diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
-index 008f24c..d8c4cb0 100644
---- a/LAPACKE/CMakeLists.txt
-+++ b/LAPACKE/CMakeLists.txt
-@@ -65,7 +65,7 @@ if(BUILD_TESTING)
- endif(BUILD_TESTING)
- 
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
-  install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
-   DESTINATION ${PKG_CONFIG_DIR}
-diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
-index 75e6871..ce5201b 100644
---- a/LAPACKE/lapacke.pc.in
-+++ b/LAPACKE/lapacke.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: lapacke
- Description: C Standard Interface to LAPACK Linear Algebra PACKage
-diff --git a/lapack.pc.in b/lapack.pc.in
-index d34c870..0d0750f 100644
---- a/lapack.pc.in
-+++ b/lapack.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: lapack
- Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
diff --git a/sci-libs/cblas-reference/files/lapack-reference-3.7.0-fix-build-system.patch b/sci-libs/cblas-reference/files/lapack-reference-3.7.0-fix-build-system.patch
deleted file mode 100644
index 70f7cb0ee926..000000000000
--- a/sci-libs/cblas-reference/files/lapack-reference-3.7.0-fix-build-system.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
-index 7fd6f1e..e52f3ad 100644
---- a/BLAS/blas.pc.in
-+++ b/BLAS/blas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: BLAS
- Description: FORTRAN reference implementation of BLAS Basic Linear Algebra Subprograms
-diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
-index 4a938fe..311aed9 100644
---- a/CBLAS/cblas.pc.in
-+++ b/CBLAS/cblas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: CBLAS
- Description: C Standard Interface to BLAS Basic Linear Algebra Subprograms
-diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
-index 028f8da..dc092b1 100644
---- a/LAPACKE/lapacke.pc.in
-+++ b/LAPACKE/lapacke.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: LAPACKE
- Description: C Standard Interface to LAPACK Linear Algebra PACKage
-diff --git a/lapack.pc.in b/lapack.pc.in
-index 878efc2..2cca4c2 100644
---- a/lapack.pc.in
-+++ b/lapack.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: LAPACK
- Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
diff --git a/sci-libs/cblas-reference/metadata.xml b/sci-libs/cblas-reference/metadata.xml
deleted file mode 100644
index f77724cb6a54..000000000000
--- a/sci-libs/cblas-reference/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-The BLAS (Basic Linear Algebra Subprograms) are high quality "building
-block" routines for performing basic vector and matrix operations. Level 1
-BLAS do vector-vector operations, Level 2 BLAS do matrix-vector operations,
-and Level 3 BLAS do matrix-matrix operations. Because the BLAS are
-efficient, portable, and widely available, they're commonly used in the
-development of high quality linear algebra software, LAPACK for
-example. This packages implements the reference C library as a wrapper
-to the FORTRAN 77 BLAS library.
-</longdescription>
-</pkgmetadata>
diff --git a/sci-libs/ccolamd/Manifest b/sci-libs/ccolamd/Manifest
index 70b8ccca5d5c..4c6c329064a9 100644
--- a/sci-libs/ccolamd/Manifest
+++ b/sci-libs/ccolamd/Manifest
@@ -1,3 +1,3 @@
 DIST ccolamd-2.9.6.tar.bz2 305744 BLAKE2B 0d741ead328a1e888715672ddb617cc96a559f46f2379e1d7792b70868dd290de19b3047e3ed4dd2711084c9afc523d18ecb375aa4ee8a4a12950cee08f238b8 SHA512 cf6f210d26ddb1be454cac377a773b73b75261a74e1e3985565f57f45659b1c11b747829c5bbe99c4bc3e8b364d7b2b3c109e00f6d7e8e41afd713312ebf103c
-EBUILD ccolamd-2.9.6.ebuild 658 BLAKE2B a77a7f597a078d61762ce0294fd8d6f0d95662dfddefd09306bc5112e1f9fb6382a6da6bd72608f9a187949c2dcb81777d86baf6621a2ca1ccedbc9b155d3ae9 SHA512 0cad34fb75ad6c534c2fdc4f9aacb04d625e9448b8c77a4b7bc47befa5a144e1d510ea66d076024e75af128a4fef9d86d8c3ca43549201d8b3fee30a971f26e8
+EBUILD ccolamd-2.9.6.ebuild 657 BLAKE2B 30b23d3d98ce5908705e29aca518dde2a2ba0716362718412858b87e7be306104f44a0fb5a9eed006aac712be57c402533a73ec88cbc47416b6c7db92c2f7dd4 SHA512 7b2e76c60b8969e8421953d137b129fb90576226afbc0b858b3793412b7212f6523edeb95f069141d009c4e18ec412efd4621a2c8f2f2a94ce28a44cec07ac53
 MISC metadata.xml 470 BLAKE2B b20ae7c51907e135898a4ca6eee1454c1760d8f6c061d6d8c9bdf6082773e003326c65ba4489831139bc9af96f2321a09b22fbe106aa87b8f6dbb4781163edb9 SHA512 99c2d290fea618dfd8997209d8e6db971a2ab74d1be5fb270f2177c9843b0f324710491977c7cf2427806295d05e341ece4399afd8a0d43bca8b42b0fdea7beb
diff --git a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
index 592a43771f56..34fa1fbb8b4f 100644
--- a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
+++ b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index df4fb4d66876..c2153f563fb8 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -1,6 +1,8 @@
 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
+DIST cholmod-3.0.14.tar.bz2 696981 BLAKE2B 855927c18833235b3f0835bfba455d83957b9161c0ee885c2d31d126f0f473067f55bcf2cfa163c72efb5de573589ffa54b484a8cf89bc44c9dbf64d43fda5d9 SHA512 f8c12fc3c8787be38bca6c6f84a8279c1380fbe4fabbfba754235fdb042d7050bfb7b5a21ea87ef59dbd5184d28e8cb7667966c38f5dcad78fe8d47111896a3c
 EBUILD cholmod-2.1.2.ebuild 1760 BLAKE2B 4843142c993deb0246fe7aa3b333b0ff3f4c8c64f1b3582ba6c7df5fe287514ca124cc0939c60820c52476c6759440a1db812b677dd8cc9f23cfd93e4695099f SHA512 9884339cb38f0095eb9e087659b98cd6cd62425e11621cd40849a8b7e40965169f3b3be4fb2217f50b491327b83f7554ab5c8fbd55427a2ee1a293ad55b5428f
-EBUILD cholmod-3.0.13.ebuild 1672 BLAKE2B 09acac2ecf87fa376e53b52733e3b45f9a72884f318fa01a9bc516c9dc50d81416bc8ad004353a66ef4bf97db3ac2008dc758034a38a9aef36e543b89aecb233 SHA512 e87be48fd0ac76db3edbb812220ba6f8a2c88b52fd9091e6508d8cf584fc5cec0ab7e280ec2e0d4702fbebaaf0af197219c68f6966766c2ad8b3c7901cf8a417
+EBUILD cholmod-3.0.13.ebuild 1671 BLAKE2B ef23737bdc534124377cb44705fc0b5368ab3df316f48f1a76f3db14fd6a66a56536e8a051fb5f35e8caa444ed8277a43f2dac22f7cbd1f200be4af926771407 SHA512 a22969e486cafd4184fb8181132321d120455e62c6351b646d2177261039ac1d4c3520dd3b9353f266b1ec97198039d85b28c87e8915f724ca2cf25651ab6f9b
+EBUILD cholmod-3.0.14.ebuild 1653 BLAKE2B 417721714a260b7265470a26f7231972780e04785f34c7f6c855ee83c26b6c687e04f1b4e474ea4ffc5db47b941448c50c0c0e487d90e4334bd0dda6a4a48c3e SHA512 4f5fee2fe576c5f77dcf30c3512a5439fab0ba96d586a7e7b2dd12388b22be00dbab50127068064a757d02597737846f44e5f6da429489381b0de6083f5fd569
 MISC metadata.xml 920 BLAKE2B d78c2990bf35b95155adefe8a7b6d3213cd7187d031abbe91f1e12cb2ab438fce1ec34743a21a20b649255c691b87b6033f8bf8eec30b670456c105ad80f2c9a SHA512 64083142e54e0d9df8fb93c8a9ef810c4a6c85546ed8d96413acbadcbe3120d528e15895786e303094874448eeb4b411ce457147f452f781c6184aea985f5e9a
diff --git a/sci-libs/cholmod/cholmod-3.0.13.ebuild b/sci-libs/cholmod/cholmod-3.0.13.ebuild
index 4fdcecff8207..96d60a60ddcf 100644
--- a/sci-libs/cholmod/cholmod-3.0.13.ebuild
+++ b/sci-libs/cholmod/cholmod-3.0.13.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="cuda doc +lapack +matrixops +modify +partition"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/cholmod/cholmod-3.0.14.ebuild b/sci-libs/cholmod/cholmod-3.0.14.ebuild
new file mode 100644
index 000000000000..566f5c250c17
--- /dev/null
+++ b/sci-libs/cholmod/cholmod-3.0.14.ebuild
@@ -0,0 +1,71 @@
+# 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="https://people.engr.tamu.edu/davis/suitesparse.html"
+SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )"
+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"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( virtual/latex-base )"
+DEPEND="
+	sci-libs/amd
+	sci-libs/colamd
+	cuda? (
+		dev-util/nvidia-cuda-toolkit
+		x11-drivers/nvidia-drivers
+	)
+	lapack? ( virtual/lapack )
+	partition? (
+		sci-libs/camd
+		sci-libs/ccolamd
+		|| (
+			>=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 \
+		--disable-static \
+		--with-blas="${blas_libs}" \
+		--with-lapack="${lapack_libs}" \
+		$(use_with doc) \
+		$(use_with modify) \
+		$(use_with matrixops) \
+		$(use_with partition) \
+		$(use_with partition camd) \
+		$(use_with lapack supernodal) \
+		"${cudaconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/cln/Manifest b/sci-libs/cln/Manifest
index dd547827116c..11346f509892 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 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
+EBUILD cln-1.3.3.ebuild 1438 BLAKE2B 78b1e185c3219915710b03dc1af6f9fa70ac75e6a426d64e1a8a8ad6a5718b2680ebd379c476f9ee3a69901632fa47974ea227948c863131cb32e425098f0ef3 SHA512 fa45dcc25cc6a3027aef2ecf669ab815e2d148a1d29db9ac7164ac6f13cd9e1bac532d8e0c3c891b018b1198dcba0b3063c1777e985d07f847647c03563ec5dc
+EBUILD cln-1.3.4.ebuild 1421 BLAKE2B b2319cd4418956e87d72613c06ad85f9b3572d7f7bb86fc6bd75bf411274c6764c210eaff35d32ed2e5512b30e9c26f07750d3db25ded991c794fa4b72d325de SHA512 1a5658a9a716619b86b5ffe32dd063432e52cc5c5fae41fc7b550557ef3575f4c34aeef445c947f9b416f6013c36a00e598d58732a26ad6dec3a4599594f78d3
+EBUILD cln-1.3.6.ebuild 1214 BLAKE2B eace23afb8dd18ead939037030d2d12ffa0e1e59a2078809ff1dbb194df02985e862aeef6d9ed6feeda7b590e24e3db128ec597d701f08f6381051c41cd8b082 SHA512 9e881c24f33e8f6d72fdaf684e52eac54e5ce7083d8baba9082b598c3c0b1db543c52ca5b270e9efcdadd078df2965e8367567c45f500799cf30575235d5fa42
 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 8b641d2d4f4d..9687c7bb01a1 100644
--- a/sci-libs/cln/cln-1.3.3.ebuild
+++ b/sci-libs/cln/cln-1.3.3.ebuild
@@ -12,7 +12,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"
-IUSE="doc examples static-libs"
+IUSE="doc examples"
 
 RDEPEND="dev-libs/gmp:0="
 DEPEND="${RDEPEND}
@@ -35,6 +35,11 @@ src_prepare() {
 	autotools-utils_src_prepare
 }
 
+src_configure() {
+	local myeconfargs=( --disable-static )
+	autotools-utils_src_configure
+}
+
 src_compile() {
 	autotools-utils_src_compile
 	if use doc; then
@@ -53,4 +58,6 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins examples/*.cc
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/cln/cln-1.3.4.ebuild b/sci-libs/cln/cln-1.3.4.ebuild
index e8173925c67e..29ac33c74b05 100644
--- a/sci-libs/cln/cln-1.3.4.ebuild
+++ b/sci-libs/cln/cln-1.3.4.ebuild
@@ -12,7 +12,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"
-IUSE="doc examples static-libs"
+IUSE="doc examples"
 
 RDEPEND="dev-libs/gmp:0="
 DEPEND="${RDEPEND}
@@ -35,6 +35,11 @@ src_prepare() {
 	autotools-utils_src_prepare
 }
 
+src_configure() {
+	local myeconfargs=( --disable-static )
+	autotools-utils_src_configure
+}
+
 src_compile() {
 	autotools-utils_src_compile
 	if use doc; then
@@ -53,4 +58,6 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins examples/*.cc
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/cln/cln-1.3.6.ebuild b/sci-libs/cln/cln-1.3.6.ebuild
index 66502b2bb272..1fa4e64dd112 100644
--- a/sci-libs/cln/cln-1.3.6.ebuild
+++ b/sci-libs/cln/cln-1.3.6.ebuild
@@ -11,8 +11,8 @@ 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"
-IUSE="doc examples static-libs"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
 
 RDEPEND="dev-libs/gmp:0="
 DEPEND="${RDEPEND}
@@ -33,6 +33,10 @@ src_prepare() {
 		Makefile.in || die
 }
 
+src_configure() {
+	econf --disable-static
+}
+
 src_compile() {
 	default
 	if use doc; then
@@ -51,4 +55,6 @@ src_install() {
 		docinto examples
 		dodoc examples/*.cc
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/colamd/Manifest b/sci-libs/colamd/Manifest
index a6ff83ec3c9d..087ab7800a2b 100644
--- a/sci-libs/colamd/Manifest
+++ b/sci-libs/colamd/Manifest
@@ -1,3 +1,3 @@
 DIST colamd-2.9.6.tar.bz2 298903 BLAKE2B e1e3cfa0153e21b742854d28fb6d3ede287c2ec22cfef4268a8aba8bb239be527433907f6984dad976341cf6e1ca9cb39f5c97029ad9bed032a874add9aa0e02 SHA512 f302d18f9ba004c9d1b0e1ada76e70f20fa1d11896815e5300983513b7ed4a7b969adef33adb1a57d67ce856a5ded410874c23d9bba42b6bf1a6a790430f5137
-EBUILD colamd-2.9.6.ebuild 652 BLAKE2B 9f0379eed783a2c0187a67173af2d0767424a76fe09adc9942787b278fae68b2fdbeb6d8113b343ba60815e86226a51eb916f37136e2254ae48df016347f3091 SHA512 ec5836bcb1d59494f119e58b7a78e68ee23b6276fc6fdc52a2ab3a774ad8d6a426df2762912ef1e65975ac420d062e24b114a6332db21c9d41120c49a5023f88
+EBUILD colamd-2.9.6.ebuild 652 BLAKE2B bbd14c7d634d08e55533f830fc456b50c3cc4400f2c551312ff5258e074d244ae558e2b04a2df138e0e68346c65aee55b879c168d3adab2852bd12860c02c505 SHA512 25440b8a12ae5cd6187b2842b753337b11360b119ece67b7e3af7692d32f12be7e5cebc121eefb0474e3989a57ce401a0f56c239289fe606827c9e6d483d2043
 MISC metadata.xml 827 BLAKE2B d1b92027b2b820c67cb091e71c22c5ebcfe8e560968b8cf76f5cb61b6c26a71b66f4801343a531fbc8941b5b678bff44e2ab3aa6bec49db9b0264ea2273ac816 SHA512 367258fb10bcde8e5136c541ef1e134c4e882b296c45300c8d70945222c0730572b1dc116b80057c3a9d6a64c175fb86915847522000740d9a39e6fcd8eb5004
diff --git a/sci-libs/colamd/colamd-2.9.6.ebuild b/sci-libs/colamd/colamd-2.9.6.ebuild
index a656a74f5732..15cc9b507d95 100644
--- a/sci-libs/colamd/colamd-2.9.6.ebuild
+++ b/sci-libs/colamd/colamd-2.9.6.ebuild
@@ -4,12 +4,12 @@
 EAPI=7
 
 DESCRIPTION="Column approximate minimum degree ordering algorithm"
-HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
 SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 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"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
diff --git a/sci-libs/colpack/Manifest b/sci-libs/colpack/Manifest
index 3c9a9baf2b78..576565d81d2f 100644
--- a/sci-libs/colpack/Manifest
+++ b/sci-libs/colpack/Manifest
@@ -1,3 +1,3 @@
 DIST colpack-1.0.10.tar.gz 658087 BLAKE2B af6409969f0dfee465ad88515d0d4f82525047a8268ac9fd4b0784de1f4fd30ce7ba968502a5d92ad3a86f554fb8f1a786defb09396c8e678f62aeaa3cc25397 SHA512 566b7906c5d0dbcd6dcb9c359510ee8b13bf3249e56d8f88f7806493d1df14f54638a0558d601ab4dbc28f36093795eede57a059a7c4e66438b47bf5a0119808
-EBUILD colpack-1.0.10.ebuild 1104 BLAKE2B 3b428297f6a4dda375319a7633d1bcd20bc5b381f99e46ef415911b3ec2626f15ab1e6a5e6633d36409b39769363536fa9acb307e5bbf187d2fa4e724f3fb843 SHA512 c4fe5fc3863f384bead7e1b11f0fae0012520388e5891f5f8e9670eca21aea05dfb981750efbac2ba00a1fd1b694d87728159429aba577e377c3a4e28bf647dc
+EBUILD colpack-1.0.10.ebuild 1103 BLAKE2B ef32cbd7d52cfc688748f5d14a5a296a4e5766f6d585abb1a1970e6c76ab15bbcf2e9a30203604cf69a2045aab9e61d81eaf31a2785a4edd7f9797933f465c18 SHA512 c9c3da1c54e29a6c6b1d1953a2372ac5eeb4e2fb1129fc8ba0521178918abf468b3788dfad56529fe9afb5491f3bf9ae7aee98904e3a5f45bce51b75ee8ce1c6
 MISC metadata.xml 605 BLAKE2B c7dd1378bd62eeaf69648625deda27806662c0f2fa83112fcc757925412c3d1d2ce218d64be2ad98dc54088618ff874d6a4e7f266e5fc006e98e257d757f4190 SHA512 28e191bbb72a212832b13ad84064538a884835b1f3e4f8e50d4b247b17189a12fa1de32138a675ab1e9fed58b40101c50d2e4472c554cf25f6f919f24059c17b
diff --git a/sci-libs/colpack/colpack-1.0.10.ebuild b/sci-libs/colpack/colpack-1.0.10.ebuild
index f7a56facc524..9ba8c09a081b 100644
--- a/sci-libs/colpack/colpack-1.0.10.ebuild
+++ b/sci-libs/colpack/colpack-1.0.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/CSCsw/${MYPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 IUSE="openmp static-libs"
-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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest
index 681446030969..1c093b5785d5 100644
--- a/sci-libs/cxsparse/Manifest
+++ b/sci-libs/cxsparse/Manifest
@@ -1,4 +1,4 @@
 AUX cxsparse-3.2.0-header.patch 531 BLAKE2B 7b8738c26a48aa01541db4978cc195f093da3e5d81536ff5819334ac847cd5d5a0e7ea5d2b1891183015ff449d98ba96ad360c4097369a70adab72a5419c471f SHA512 2340a350af044bcded3a592fde76ee885c02a3047772a02d91bfa0b43e7b6a04d7102893ba8d3e2394435fa6194d767812a3896359581c4d789890d2d35a78e0
 DIST cxsparse-3.2.0.tar.bz2 2080196 BLAKE2B 9b89469c45e518077c4348ad3efd8d89d248e4c039057c0286ee44b493ab595075894d01530cbfbe845b91ef5e43cfbfdd102721cfeefe943a1cb4bc5f171843 SHA512 9931dac5b319b61a39ccb5f34309acb4240602b5f55d029c790ed0b7319a373cb925c4b83994526af4bc5b19b88c723f04581068d1fc80960a290c9d6d1e1aef
-EBUILD cxsparse-3.2.0.ebuild 805 BLAKE2B 0b737ac020c2d7ec730f9bf129c41857bd876537223526b961efba8da5433b26323f67d091ba725f9a8fd63aeb6a03e89f9bcab0aee9eabb9172bcab32f59f21 SHA512 101487e1540bb0f8bb5dd53a7b1a640145a382061ba7ff33288fb0bd69c78800ad9908ddfcc9c13c6a6dc342b80b4aaa6633897e6e90407a2618073269fa6199
+EBUILD cxsparse-3.2.0.ebuild 805 BLAKE2B 5652aca447544327aa3735b3ff0a2d0b4b43ac9d82e018b1572564894be753ed8c34b988d99307c549460483108f7bf8ecfc0f4eeff613064c17d8eadc74a51a SHA512 1d2fb294422317d79df278c058cb72875dbf25df80d5eebf8c1f8c0c5bcf9f67a9622b27b94aa18fecfddfe9dfad44d6ac7d0651aa8c320317fb1790d914648e
 MISC metadata.xml 449 BLAKE2B 18e0d692b302702a20ecfe5ae10b8d48de7582649feeda3fe9c0bbcbbf6e6876f620bd490dabf788276a378d60b3bd0c1ee19a6fa439f37dff9269e8fd74d12d SHA512 908237dbe24a16831fc04faaff76d06bc4f0ae8605a551a98763d72ecbd19dcdbf2c74f320ccaf296c69bcacb3cda51b600ca0a9a8b481858723c2dd34a3754c
diff --git a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
index 1f31b3ad40cf..1b981adafbed 100644
--- a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
+++ b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
@@ -6,12 +6,12 @@ EAPI=7
 inherit multilib-minimal
 
 DESCRIPTION="Extended sparse matrix package"
-HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
+HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
 SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
index dc2a85eea3d0..8614bef97096 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -6,5 +6,5 @@ DIST dcmtk-3.6.4.tar.gz 6402734 BLAKE2B 2d362789e7819089b7da46a9601fa5d53b8e8aab
 DIST dcmtk-3.6.5.tar.gz 6483626 BLAKE2B 6182ef207b42b16ee91e94397cc8a5b2d108435a30d4c86f0b7e39af91186604f16be07a75e176bf50575446abcab21b2f63158dc4e5f2cb6de3996a0881b295 SHA512 c0cf61b0095c5708709406bfef5e8bb82dd01dbf77df7f2af2118004920bda68218eb1e4174bf92941cdae0acdb275c886570dafd29476eee2eb815e9a82830a
 EBUILD dcmtk-3.6.3.ebuild 2039 BLAKE2B 655b3b3d424ebdba0d96f629b2308d1bd5650c03ebf48e575f05a8a9c3295928aff91cf34086b1a2f19a41907ff4811394f6c4622f3fd0ba3b2501dbe5a44d2c SHA512 7b92fda743f4ad39112f440b63db6549547a0e12510b9feb2c2a04cbea1a96db49d3c4ee04a8bf4e61bf500c0a94325332a997cc1f5f2434040b1b6a59b24211
 EBUILD dcmtk-3.6.4-r1.ebuild 1931 BLAKE2B 03b414dc9a763d562598760d9adae6f0ddea24431e13dbc517197ce84e4cf4261edd702b68398040674a7e11bc48b3b21b2564993d579902e40e914c75da1149 SHA512 6cb6d226886c6b7d29366986f6ce319d45f4f96d61b8c794cddcc1867bc8aa3518474c23b8c56e51e6d81bad03fbe309fa06364213a1327063aca852e76897c4
-EBUILD dcmtk-3.6.5.ebuild 1898 BLAKE2B 5f818d6d211393229a6bae8baec6cf79c7df232d01b020b00d7effc7988c4cfb77a4f9ebd79a4bd7523722f5929c6a7d759b6d535fdbbc3b5aed56c54c12e267 SHA512 52adf936393945f3e57cda5ada6386025d25e2167bfdd258d9411ee2b14200007bdcbd1d813d7ddd65484bfa758c92413dd0c594eba1ea25698d9663048cae62
+EBUILD dcmtk-3.6.5.ebuild 1903 BLAKE2B 73d5c5e620760899ed921f07eeee5ba9f29c05bff87251d0e1138bec0a147cfc3ee3762431917694d47618634ae282230c5696afbbfa6cc1debe06d7e77d00e0 SHA512 852555834f82ea2468f7433d8caec00df784e347d7d1251e6165bf760f05e59b56aa1aa4dcfdb1bb37e875c42da9522a2e4f01ebb162d72e23b680eb61eb816f
 MISC metadata.xml 227 BLAKE2B ed3fc2ad8c0bb2658fb120d3a54c69b5f03eb006f601b6aa8b45a48d73ab523ece0fa1efcee0ebd8fa6f134f77ff33f957dad0954d5c0fcef98e56179e24c041 SHA512 381afcd62a7b7d54c6108ee892d3609de2c183713947c7f04fad1e6c69a49866ee30265e313c72d446e4f8cab9296160f7f3d1797f9a37430fc8c4e02f50a166
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
index 240ca02f96fb..58d21bcacae1 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://dicom.offis.de/dcmtk.php.en"
 SRC_URI="https://dicom.offis.de/download/dcmtk/release/${P}.tar.gz"
 
 LICENSE="OFFIS"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 SLOT="0"
 IUSE="doc png ssl tcpd tiff +threads xml zlib"
 
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index fc4beaa82d46..0a0a69ed1800 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -5,11 +5,8 @@ AUX fftw-2.1.5-no-test.patch 1028 BLAKE2B 878780d275d1454edff28c6834c118981e8ecb
 AUX fftw-2.1.5-parallel-tests.patch 3720 BLAKE2B 6b18c68e121035c517cf8eae245d32a1b99f51fc01f3baa0b96351f0a0833714c89798fc06b231c3acda6131cb6e0fe9782a0d1c34c76eac04eee8d0b9144857 SHA512 2e02c69dcbae6c11b8bdf0edb1a49c9754c9a599438e1073eb2bcff04c52c38c1e76eb352f21957a0518d61ee2e32d302e5624e234d28344fc99036313394d3e
 AUX fftw-2.1.5-texinfo5.1.patch 596 BLAKE2B f45dcfef53cfb374c2022e88632934b48f2a19e5e75734a5c7d7901b8464403ceb675efcf6e43b00f10779776a8e9789956bb77e937b754c0a070e15821f4877 SHA512 71dd3c13784f9bd1b518827a6784e2619145377cbc88764c69830519096f61863140b90c8138d6a65e3994487cb12cd06baba826d48735c2cbddc1d2320a4214
 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 3146 BLAKE2B 8f899d8142cd8a90a887240756c501e2d736385d636734a9ddbcebb0b0d479e8006d5cbc75d20f41aa4deacfad469870ec5d387082da20f7a75333d667c190f1 SHA512 7648d4c60ad453a2b8be1a687918278941b54a99c06b59af5121dcdf259eb40f423969ab6d5b861668c4216fdfd9167043c72c51d3fbfb8e0da0cb50da6ce945
-EBUILD fftw-3.3.6_p2.ebuild 4459 BLAKE2B 0585c2fe679f1c849e60be3cf7ad87b5af8aac4d0e342fd064cd6d82c8c29f36fafc430222eb38de5f6bfaaa65547163d132635a818201b8f78d689aed33f957 SHA512 0f19ac77caf1a9e5e449b21498b582a7e6061ddc15754d4e626c89589477109cab56167aba8d9dd13c4729d390e713d5edf28095824a4a1b25520a6c8c1c37ab
 EBUILD fftw-3.3.8-r1.ebuild 4636 BLAKE2B 3e97d8a13f6fab8915a0afd265b58ab56f53f3489f42dd0385f7bd3ef049826131ec7e976398f621be5b73fb4536a3e0ebc480bbe5194fa9f65bb8c22f5d7078 SHA512 0a1ef1c403e30e45193908f09e7f03379b4ccbebbfa1f6cf0918a0b3e147c41461c3c0434f08b591542610b9aca9d9410a94d27c38a975d5bc4129f83a7f429d
-EBUILD fftw-3.3.8.ebuild 4523 BLAKE2B e449bb3e635e45930f18e36ca1cc2989b8d6f7bb6e53f6c937406a461e16badb64833e625327e1ef0c6a39ca8c9ba6360b2712a72e23de298bd774016e6c57ea SHA512 6ac197a894ceb0f29d4e3e22ac45cc48007d62230ee9448260c54a04d77595a7c702fd7884d7f9dd4a8b737adfe99534f268f004eae91de90dbe21e7daeec220
 EBUILD fftw-9999.ebuild 4518 BLAKE2B 41047e346e12e633d2faa45341cff1eb02959295f3000d0c5dc2b74ae366a72ef9c9b5724193c3c4b9ee2e7de4a2c76f2f19451156cae8d7ca6c201c9aab60dc SHA512 122471201bc246cc815abaf074a310ec9e91a9e3bbd9b58ceb3572114318e18f6e3def64d4e027d0022163565d35ba792daa1cc7e4b85150dd4cd7c62ec59422
 MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98
diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
deleted file mode 100644
index 3d8aa2902359..000000000000
--- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# 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
-
-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}
-	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) -lmpi"
-}
-
-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-3.3.8.ebuild b/sci-libs/fftw/fftw-3.3.8.ebuild
deleted file mode 100644
index e54af4af14bf..000000000000
--- a/sci-libs/fftw/fftw-3.3.8.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# 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="cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	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 cpu_flags_ppc_altivec altivec)
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_avx2 avx2)
-				$(use_enable cpu_flags_x86_sse sse)
-				$(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) -lmpi"
-}
-
-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/gerris/Manifest b/sci-libs/gerris/Manifest
index f4c1bdeb583f..dc3800c4595a 100644
--- a/sci-libs/gerris/Manifest
+++ b/sci-libs/gerris/Manifest
@@ -4,5 +4,5 @@ AUX gerris-20130531-use-blas-lapack-system.patch 1466 BLAKE2B a3c451570d97227008
 AUX gerris-20131206-DEFAULT_SOURCE-replacement.patch 728 BLAKE2B c2c6e05692d200d308dd7cd51896a06270b32e768b2e84b535858390972344998b1f64ff1c4a752211b97473064999b0737a9d4de03a1ba0ef5536af62ea511d SHA512 b1ca792b4b9ffe88964f58e12a3caff23ec3ba31f8f43136acf9adc106c57d10f75f32d2ec7a6769cdd130324e9de9a1621fc4c90be834eef330690f765159c7
 AUX gerris-20131206-lis-api-change.patch 526 BLAKE2B fedac0aa8cf763b37dd68c03f321e8ebe91caf944c51366ab3c8a1f0474eb140095af4207c208c8c9ed99bfb42a025e4437ad42da5e64cdf4986944910c3f1b6 SHA512 bba5cc317e66cbd48e80e2a1ce6cbd1f3688f77e3433c846294c56ba39591a840c2577eaffeed05553f651dc749ceaf751c2451624b71812ea2238014f456b25
 DIST gerris-snapshot-131206.tar.gz 2841686 BLAKE2B 63618b2166e632e447f7a47dd17f2bab1820234b9a651c4fcad57250b13bbfdf98645c9525d4cebcae6ab9ef81d111fadbff9800e3144d84bf59f2248e271585 SHA512 b3855d51eea04c496d2e5f662c148560d9ab8d5dfa97e4f7d1c22c70405b9b801b46f30aa0d159b1bd6a8182f171a1649b5f510f0e13feeb55f29cafe57b45dd
-EBUILD gerris-20131206-r1.ebuild 1557 BLAKE2B 0797d29c342267983c64f476e9a7572e9d847b1367d1f267511860d6d539ec237828f1a5b346af7242a1c1bbadca746ffb2dd986750c7dc25a26ec0a64926d89 SHA512 9a5a6d041fb41618c13d53fef7b8ad9af3c1753b52d6fd6e0466e9c20c1533dec2d9563d680966adfb01068c533cfebdf1fd18f3befe5361fd1280634b666e09
+EBUILD gerris-20131206-r1.ebuild 1558 BLAKE2B 6eb4b017e887b067f14396f250d14d564da9dd93d3164837f5d7899ebacdd5116c231d22680d9485e9b4b21de7ce42738b258410b5778229b987be70e0763669 SHA512 d05592d019f0cc00bcc7eafca126be972990fa48d33cf19e5becd61948604bbd1bd1fcf05c91ba32afaec59009660541f14485de75b367ca96c7f39b88c08e55
 MISC metadata.xml 510 BLAKE2B 24ec4c7f0735f04eb58a6382166c3552d329b7b51b1ac4b3ab4522603583c96197d4ddd5081b056b27c50cf13f5814a20cdb8f0716d7b8af8fb276f17d81916b SHA512 876a9ba57d32d3bcb0071d8644a6d050ef67df1a94b90064bd7f7e45ddf44c3efa220c1c9738279892f2c8327da26043c29f8478cfb5599e3e3eda43d99719e8
diff --git a/sci-libs/gerris/gerris-20131206-r1.ebuild b/sci-libs/gerris/gerris-20131206-r1.ebuild
index d17000bbe95f..4ddca5bec04a 100644
--- a/sci-libs/gerris/gerris-20131206-r1.ebuild
+++ b/sci-libs/gerris/gerris-20131206-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs xdg
 
 MY_P=${P/-20/-snapshot-}
 
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index b4e439e4685a..11eb3b918ea9 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -2,6 +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-r1.ebuild 2808 BLAKE2B 4419ea4fa305c0ea3d1793edc380b4e5912a25492eaab28901133a2e8e4be358d3e076fdbf3921fe490b55d32903f58f1fee2f3b088904947fd25cd9c648cf4f SHA512 04f37efdbbe8e91f5ad1713ce2c272ca910a19f64ae4e7ea762a3a3f0ba476c7966d66f3ad56e9b0b9981724f20b0f7c5ddf3a040c721ba307e78176f22359cd
+EBUILD hdf5-1.10.5-r1.ebuild 2807 BLAKE2B 23514104cb522f06a54ebb821895367a6514d47e18d42a8be1e633603da33aa795e5ec6c6a875cc4330ce228a47d28881e5aa077f78c66e0bb770fe844997be4 SHA512 dd59891edb4bab6ce5411a3070f7870fb87fe22f097aebd1fa08f749d36bf788d7b9cc57dec440adc67ad5ae046b891da3fe090efe64574c9bd60bba25b10bbe
 EBUILD hdf5-1.10.5.ebuild 2712 BLAKE2B ee136d4a3c9a7301d4887f5406b208bad88ea16e60bde7e2dd07f4d24d897afbe8575ebc76c96e054b7371a37d275da6f298620c181c13e53a33be0b59ccde9e SHA512 0183dc5aa3d1ac98dd04ddcf0391a97fa48e0647ed838167b54b807ee751f96a774d9c34fb5e6dd965075db8adcb63c852b786b87a017ce5057264a55fff0dc2
 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
index 47f24fba7d92..c3fa2f27d0ca 100644
--- a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_
 
 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 unsupported zlib"
 
 REQUIRED_USE="
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index baaedcde2f6d..61f5ec7306ab 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -2,6 +2,6 @@ DIST indilib-1.7.5.tar.xz 1380436 BLAKE2B 092f4100894218bf749ee0d7c910c4ee20026c
 DIST indilib-1.8.3.tar.gz 2062250 BLAKE2B f46b557dfbbe16070605ad638111505577b801ac6abc2cf42df3a322eaec35a25e6f8efe3ea740b5758b3aeadd656efb4b98e284d531621ab34ca00f28e39a2e SHA512 09c23299659efea795ec430566a5b51181878c382c72f1e530ef3abe3b996b670506f6f5f1bca4eb88fbdc756854c3a36d8bd646a2cf13e397e09ace1f1af044
 DIST indilib-1.8.6.tar.gz 2166393 BLAKE2B 65998b90a66938f0fa7cf702da83c86a0a5d22cde6ebca6ec2e7ab65fb310ef3f6aa0b8ae0ede48cbcd78788741433a43907ea9d020fcf3362d012a1464d1905 SHA512 c966b92cd9d66dcafd26b5ff7b062c22d035367111496c84777dfed5b22403631107f43dcdc535036198d2e108689aa99e003e9ad047a0af687ad247df155850
 EBUILD indilib-1.7.5.ebuild 1120 BLAKE2B 70e19ee186e7b74d01430d4fafd2fb15d3850666b519051fa2ab97612fd01180b39e5c37d697d8d2508166ad769b41422f9d4e7e7f0789c1059641d5ee77e40d SHA512 f33e4268c4837c2df6b64bb79abd11479001e9fd9abde0c5357751a014522b37d48878a8f72628e56915487c72b7805ab7c5dd01f61a21c47407a4cda8a00a27
-EBUILD indilib-1.8.3.ebuild 1180 BLAKE2B 57212e677b51f57427debdaa8b1e0eea4f6fb26fba8368b7e2f1e5f4c8d2165406f5a11c17970bd6706782684da9456a4dfb9edf1fec4c8bcf6fbc48cc010a56 SHA512 0ea6c402a6ff57a589f4f3309746de7e1b69c3180d3a12265ffc20ff361f53638eedb0caedee8cec7b3fabc0aeaa573c2998444bb696eb8bc08862e91768cf3c
-EBUILD indilib-1.8.6.ebuild 1182 BLAKE2B 72992e4b51b92d044bb0d95ee05d5e9ee23c8cd5bc375df999b5166e5a6241150545cd6ed1de5281833a6218ed3ece509d9e907b1d439016d4d15f4d68578643 SHA512 a5a3f070a4cb27c38108b7adb2a58652d470e0d1880fd4a4381eca74ea0e4d08f8917604748cc5c7de37fd551a18f7bfec2904b58c6132c90b883678b6090a8d
+EBUILD indilib-1.8.3.ebuild 1190 BLAKE2B e09d230117079e62df8baefe1933c8d70e76778a1cb34776b02c13a7635e9bec2819315aa7f22010515b5e787525fd30a8af7525369f4fa5563c251696f84639 SHA512 44395e193f3e918f45362995cae6dbc7ea24c0038a7bd4068b684d5684518be7ffbe7dd1d942b1162b4cd2ea87c6ef1754ba388381738eafb79ed00095e84f4e
+EBUILD indilib-1.8.6.ebuild 1192 BLAKE2B 0b7e584d556b356999fa46d863ff115638c7941c8cc6b756b10571070d0892f19937ad5b17d72312682d24f3260b227d781c6bdaa4094e89592fb3c14bc7977a SHA512 d28075334e1b6c1410413e1b191a0f8d0410daffe3f0fd823598280d8572013ecb6d3df5728be9ecaad05432a50ca1dc13a8734aa226a6a63e561b59df5f39be
 MISC metadata.xml 460 BLAKE2B b6ebdd49fefcbbb015e5856f0ad42682b5eda153b38b3d64f949d2c41274df269f292f25d5eb3be37a7acb039bab2d3d3b7744cfe7959472fe03425b53bd4282 SHA512 ff04501f56765165645695dda25db6bff677a6f676d3fa1d005ec0bc6fae7413e0fdd87d800b321fdd7a98f1d0cc829daa5a3d4d3bff849b6e164a5768c79c84
diff --git a/sci-libs/indilib/indilib-1.8.3.ebuild b/sci-libs/indilib/indilib-1.8.3.ebuild
index 883a84595b95..8111266706f8 100644
--- a/sci-libs/indilib/indilib-1.8.3.ebuild
+++ b/sci-libs/indilib/indilib-1.8.3.ebuild
@@ -43,7 +43,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DINDI_BUILD_QT5_CLIENT=OFF
 		-DINDI_BUILD_UNITTESTS=$(usex test)
-		-DUDEVRULES_INSTALL_DIR="$(get_udevdir)"/rules.d
+		-DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
 		$(cmake_use_find_package ogg OggTheora)
 		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
 	)
diff --git a/sci-libs/indilib/indilib-1.8.6.ebuild b/sci-libs/indilib/indilib-1.8.6.ebuild
index c0ffca05006a..dc1c02bc3d9b 100644
--- a/sci-libs/indilib/indilib-1.8.6.ebuild
+++ b/sci-libs/indilib/indilib-1.8.6.ebuild
@@ -43,7 +43,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DINDI_BUILD_QT5_CLIENT=OFF
 		-DINDI_BUILD_UNITTESTS=$(usex test)
-		-DUDEVRULES_INSTALL_DIR="$(get_udevdir)"/rules.d
+		-DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
 		$(cmake_use_find_package ogg OggTheora)
 		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
 	)
diff --git a/sci-libs/keras-preprocessing/Manifest b/sci-libs/keras-preprocessing/Manifest
index 17db55bfd7ad..e92a77d1e59e 100644
--- a/sci-libs/keras-preprocessing/Manifest
+++ b/sci-libs/keras-preprocessing/Manifest
@@ -1,6 +1,8 @@
+DIST Keras_Preprocessing-1.1.2.tar.gz 163598 BLAKE2B 94d0bac41ac140015a5d46453c99e1180c8c06d8fab4d6707890b1f24466d287f6da54d66b395e5e50c7aac67cc0abc8153fbfbeb4ffb0e79561bca528a6b81b SHA512 aae4d52accdfb9df260070336b1c5a628e57563978f7cb299aa67a6265f26eb44deb803cef795616a5e94cd8bcd2b9aa067570258fff96642b88cc0c701c3cec
 DIST keras-preprocessing-1.0.9.tar.gz 46476 BLAKE2B af80a6647bb56f8c4dba93120bc2b70db36d2c6a0e36c3be9a4843e5c36c9ffe50db1cd9396eecd47f6c0595c110825d70d2e6b28a29a0a199b5cfcc499e4440 SHA512 93ef9b294638bfeaea82170b323f08b261a2519f5ee8b9aac7d88e5b32c6486646d91075cea71bfbc27780c8af55125319873361f0431d48b451e574d1e7a400
 DIST keras-preprocessing-1.1.0.tar.gz 50631 BLAKE2B 235a1a7d296684e5405c6472026a53b1930923e74065529ba6921e91bf8849d35c02378f8eeabc4f532a4e25937e8fd8f712a59067c5b358afe10b88e1531fcb SHA512 68c71e82ea2139d3db4142c86a2c404e4d65a9a881f72b07b4ccf28733b93a9e4837f91534a20c3ca5128600d8b885cc8723181d96c9045d5280ad7f84091cbb
 EBUILD keras-preprocessing-1.0.9.ebuild 595 BLAKE2B bc5f3052d03249c8210460d2b15a3252b4f4818fe8924f885a0cdad36ee429fd22c2f5e31c93306e6014ef42bc8a0c18cc92c4aed579f0c2791570fef63a4765 SHA512 8cb56546d094f03c846d5cf32fb4c38266cc8029e6caca76005f07b3afc5f2a77a28aa571742f77fb640a06e14aa2909d9b319061484e76f08d9230d3552d821
 EBUILD keras-preprocessing-1.1.0-r1.ebuild 597 BLAKE2B 226f15626ef1ffdebcb5bba1235ea3bf514f42eaa0579acd44d98c4a9cb5ce6ed7e4e7adc6fe27ef9085053acfb274804640640bd960b20acd85db8b63aafefd SHA512 d0d663f7697d9a76d0c4ee8bd32736a21da91ed12c13f33719ead1d685f6ffced6bc9042a6ea075ffa47f72552bb475ff9d7652b48b446b9cdd43661a095b35f
 EBUILD keras-preprocessing-1.1.0.ebuild 595 BLAKE2B bc5f3052d03249c8210460d2b15a3252b4f4818fe8924f885a0cdad36ee429fd22c2f5e31c93306e6014ef42bc8a0c18cc92c4aed579f0c2791570fef63a4765 SHA512 8cb56546d094f03c846d5cf32fb4c38266cc8029e6caca76005f07b3afc5f2a77a28aa571742f77fb640a06e14aa2909d9b319061484e76f08d9230d3552d821
+EBUILD keras-preprocessing-1.1.2.ebuild 673 BLAKE2B 0d0247ab25cc2cbd606f9d2141980aca0d7e5580ac713762c3b6f029d2f3d6eb809c68bd254e869d4a44af30aafef071398e43bd231918149dcbed2abd755607 SHA512 4ddaea181fb81d51cb8e05d5d9b8d7254ebd6e3654161866ad72a16f815d8c8da72ed558ec7e75032f2997263cdf8579c3a2e9918adca71cd2b5e3b4287ea6a8
 MISC metadata.xml 585 BLAKE2B a2f92ac4e2b9af055313a13de9bcbaee7ab7ca2efa4790c82027aece4b629bfa7a73c5ed0286b0f24f1853330057527009afe6ab1722f19d9c504a9d0737e827 SHA512 371cc3f5897bd28c62642a8857a22e775e24aa917bc0e58bb4de4e0a2a6580174ba35cfda2e8dd83599e2180fdfb3f11a953e7076c6d87073e1465b145b115e9
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild
new file mode 100644
index 000000000000..f59272ef1161
--- /dev/null
+++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+MY_PN="Keras_Preprocessing"
+
+DESCRIPTION="Easy data preprocessing and data augmentation for deep learning models"
+HOMEPAGE="https://keras.io/"
+SRC_URI="https://files.pythonhosted.org/packages/source/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-libs/lapack-reference/Manifest b/sci-libs/lapack-reference/Manifest
deleted file mode 100644
index a44996bf100f..000000000000
--- a/sci-libs/lapack-reference/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-AUX eselect.lapack.reference 237 BLAKE2B 3b9fda5e3853ba553a56709c1827c17368b1dc6229c2ca97a35220c05bf428fd94b6e855a8d2dada43dcc153af59b1f7aa1f34923e42cc6b679c3e35993e033d SHA512 cd0b5c771e552d348ce87192583bed2dbf9f2c61cbaf512b006dd9da3b36d3f0c8ad24129e595f644fc0472f5e60e0c3c0964ec86f9ece1c0f00e942d2515936
-AUX eselect.lapack.reference-r1 237 BLAKE2B bb87359115ee06d0062ad1013571a8f4e0c19b87f58e5f830334316e3ef19878fad220f7cf3ba05826fa9d1183a74557ee7da33b0bcd873c1e9c9a8b113c6b52 SHA512 f33b5e14184017192a51e6cf9e6c41a55cf79e60f133e1ef552b80fd2c50ad33f8252d20e379e28b283eab3f33c755172e4244bfe7cfbc633db7f8dd8d5537c3
-AUX lapack-reference-3.2.1-parallel-make.patch 4904 BLAKE2B 5885a1cf316c24f5dccf907e8eb5b4d3d3e8c0322de86230686abbb8120e3b85ba2a2e627076d5daf74213f6868a83803bc2e9ef53fd16e8a0b2c8f910eb3bfb SHA512 2d42f14ddfd78f9f1566e3f31c03b74fe41f6b93a12156554b884b82496f6777781290167597ac220c3fff89edd055952a208c49835a69f745d728fcef605a78
-AUX lapack-reference-3.6.0-fix-build-system.patch 3061 BLAKE2B 22a7be4c561ffd3448810f6fd69ea4e9ae3499432a089ddfb5073038c7f42d2dc05ae15d55a53f341b9016ac77ca4ec8905aee9e8a734c207727fc6081812938 SHA512 db15b9ddde46cb41adf43f060ec46a5cd76a337bc9f3a33bf8ce66c65c7199ecff6e776b53b0ecca5057470a81e7cc470697907d6563462230ff23b1af913d73
-AUX lapack-reference-3.7.0-fix-build-system.patch 1598 BLAKE2B 9128036fc47dae239445162f98d2f7d1d86a5ad6d8c9517879cc4cb58a3d1f0f74b6a70704b2ae5089085cde4acb75bbf82d4aca218b7e7b05cf95f7061e1460 SHA512 3bcd21cc437fa62b1b74ec26908a882e69e413987a2d92832e5c62ed044230b1ac285401c6042c609b2a732320fd660979b812f9279f9eca7bb078ea3fce37b6
-DIST lapack-3.2.1.tgz 4792502 BLAKE2B e9d39c958406db05383ebda7e781ae6c2d0b1f3896d4071a33bec0c7038f9ffca3e254f8ef36aa27118c83a1e5df9110c57ce90ab897e0f8f0ca5750d20cba0e SHA512 a89b88540f8e5b05b7c58e8e301a5068729ceb35fcb2143edfff1644458ff1a375e5185492cf116b50409fe0c17b51c253a2987f4df83e9f9c3968a4b77e5d97
-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 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/files/eselect.lapack.reference b/sci-libs/lapack-reference/files/eselect.lapack.reference
deleted file mode 100644
index fe1a777b2dc2..000000000000
--- a/sci-libs/lapack-reference/files/eselect.lapack.reference
+++ /dev/null
@@ -1,4 +0,0 @@
-lapack/reference/liblapack.so /usr/@LIBDIR@/liblapack.so
-lapack/reference/liblapack.so.0 /usr/@LIBDIR@/liblapack.so.0
-lapack/reference/liblapack.a /usr/@LIBDIR@/liblapack.a
-../lapack/reference/lapack.pc /usr/@LIBDIR@/pkgconfig/lapack.pc
diff --git a/sci-libs/lapack-reference/files/eselect.lapack.reference-r1 b/sci-libs/lapack-reference/files/eselect.lapack.reference-r1
deleted file mode 100644
index b6c4db325593..000000000000
--- a/sci-libs/lapack-reference/files/eselect.lapack.reference-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-lapack/reference/liblapack.so /usr/@LIBDIR@/liblapack.so
-lapack/reference/liblapack.so.3 /usr/@LIBDIR@/liblapack.so.3
-lapack/reference/liblapack.a /usr/@LIBDIR@/liblapack.a
-../lapack/reference/lapack.pc /usr/@LIBDIR@/pkgconfig/lapack.pc
diff --git a/sci-libs/lapack-reference/files/lapack-reference-3.2.1-parallel-make.patch b/sci-libs/lapack-reference/files/lapack-reference-3.2.1-parallel-make.patch
deleted file mode 100644
index 72bc71ca2d95..000000000000
--- a/sci-libs/lapack-reference/files/lapack-reference-3.2.1-parallel-make.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -Nauru lapack-3.2.1.old/TESTING/EIG/Makefile lapack-3.2.1/TESTING/EIG/Makefile
---- lapack-3.2.1.old/TESTING/EIG/Makefile	2008-11-17 17:51:24.000000000 -0500
-+++ lapack-3.2.1/TESTING/EIG/Makefile	2009-12-12 11:23:22.000000000 -0500
-@@ -126,25 +126,25 @@
- double: ../xeigtstd
- complex16: ../xeigtstz
- 
--../xeigtsts: $(SEIGTST) $(SCIGTST) $(AEIGTST) ; \
--          $(LOADER) $(LOADOPTS) -o xeigtsts \
--          $(SEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
--	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtsts $@
--
--../xeigtstc: $(CEIGTST) $(SCIGTST) $(AEIGTST) ; \
--          $(LOADER) $(LOADOPTS) -o xeigtstc \
--          $(CEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
--	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtstc $@
--
--../xeigtstd: $(DEIGTST) $(DZIGTST) $(AEIGTST) ; \
--          $(LOADER) $(LOADOPTS) -o xeigtstd \
--          $(DEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
--	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtstd $@
--
--../xeigtstz: $(ZEIGTST) $(DZIGTST) $(AEIGTST) ; \
--          $(LOADER) $(LOADOPTS) -o xeigtstz \
--          $(ZEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
--	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtstz $@
-+../xeigtsts: $(SEIGTST) $(SCIGTST) $(AEIGTST)
-+	$(LOADER) $(LOADOPTS) \
-+	$(SEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
-+	../../$(LAPACKLIB) $(BLASLIB) -o ../xeigtsts 
-+
-+../xeigtstc: $(CEIGTST) $(SCIGTST) $(AEIGTST)
-+	$(LOADER) $(LOADOPTS) \
-+	$(CEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
-+	../../$(LAPACKLIB) $(BLASLIB) -o ../xeigtstc 
-+
-+../xeigtstd: $(DEIGTST) $(DZIGTST) $(AEIGTST)
-+	$(LOADER) $(LOADOPTS) \
-+	$(DEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
-+	../../$(LAPACKLIB) $(BLASLIB) -o ../xeigtstd
-+
-+../xeigtstz: $(ZEIGTST) $(DZIGTST) $(AEIGTST)
-+	$(LOADER) $(LOADOPTS) \
-+	$(ZEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
-+	../../$(LAPACKLIB) $(BLASLIB) -o ../xeigtstz
- 
- $(AEIGTST): $(FRC)
- $(SCIGTST): $(FRC)
-@@ -169,4 +169,5 @@
- zchkee.o: zchkee.f
- 	$(FORTRAN) $(DRVOPTS) -c $< -o $@
- 
--.f.o : ; $(FORTRAN) $(OPTS) -c $< -o $@
-+.f.o : 
-+	$(FORTRAN) $(OPTS) -c $< -o $@
-diff -Nauru lapack-3.2.1.old/TESTING/LIN/Makefile lapack-3.2.1/TESTING/LIN/Makefile
---- lapack-3.2.1.old/TESTING/LIN/Makefile	2009-02-10 12:23:05.000000000 -0500
-+++ lapack-3.2.1/TESTING/LIN/Makefile	2009-12-12 07:22:41.000000000 -0500
-@@ -238,43 +238,43 @@
- 
- ../xlintsts : $(ALINTST) $(SLINTST) $(SCLNTST)
- 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(SCLNTST) $(SLINTST) \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o xlintsts && mv xlintsts $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o ../xlintsts 
- 
- ../xlintstc : $(ALINTST) $(CLINTST) $(SCLNTST)
- 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(SCLNTST) $(CLINTST) \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o xlintstc && mv xlintstc $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o ../xlintstc 
-  
- ../xlintstd : $(ALINTST) $(DLINTST) $(DZLNTST)
- 	$(LOADER) $(LOADOPTS) $^ \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB) -o xlintstd && mv xlintstd $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB) -o ../xlintstd 
-  
- ../xlintstz : $(ALINTST) $(ZLINTST) $(DZLNTST)
- 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(DZLNTST) $(ZLINTST) \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o xlintstz && mv xlintstz $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o ../xlintstz 
-  
- ../xlintstds : $(DSLINTST)
- 	$(LOADER) $(LOADOPTS)  $(DSLINTST) \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o xlintstds && mv xlintstds $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o ../xlintstds 
-  
- ../xlintstzc : $(ZCLINTST)
- 	$(LOADER) $(LOADOPTS)  $(ZCLINTST) \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o xlintstzc && mv xlintstzc $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o ../xlintstzc 
-  
- ../xlintstrfs : $(SLINTSTRFP)
- 	$(LOADER) $(LOADOPTS)  $(SLINTSTRFP) \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o xlintstrfs && mv xlintstrfs $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o ../xlintstrfs 
-  
- ../xlintstrfd : $(DLINTSTRFP)
- 	$(LOADER) $(LOADOPTS)  $(DLINTSTRFP) \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o xlintstrfd && mv xlintstrfd $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o ../xlintstrfd
-  
- ../xlintstrfc : $(CLINTSTRFP)
- 	$(LOADER) $(LOADOPTS)  $(CLINTSTRFP) \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o xlintstrfc && mv xlintstrfc $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o ../xlintstrfc 
-  
- ../xlintstrfz : $(ZLINTSTRFP)
- 	$(LOADER) $(LOADOPTS)  $(ZLINTSTRFP) \
--        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o xlintstrfz && mv xlintstrfz $@
-+        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o ../xlintstrfz
-  
- $(ALINTST): $(FRC)
- $(SCLNTST): $(FRC)
diff --git a/sci-libs/lapack-reference/files/lapack-reference-3.6.0-fix-build-system.patch b/sci-libs/lapack-reference/files/lapack-reference-3.6.0-fix-build-system.patch
deleted file mode 100644
index 8661709d369b..000000000000
--- a/sci-libs/lapack-reference/files/lapack-reference-3.6.0-fix-build-system.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- lapack-3.6.0/BLAS/blas.pc.in
-+++ lapack-3.6.0/BLAS/blas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: blas
- Description: Basic Linear Algebra Subprograms F77 reference implementations
---- lapack-3.6.0/BLAS/CMakeLists.txt
-+++ lapack-3.6.0/BLAS/CMakeLists.txt
-@@ -2,7 +2,7 @@
- if(BUILD_TESTING)
- add_subdirectory(TESTING)
- endif(BUILD_TESTING)
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY)
- install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/blas.pc
-   DESTINATION ${PKG_CONFIG_DIR}
---- lapack-3.6.0/CBLAS/cblas.pc.in
-+++ lapack-3.6.0/CBLAS/cblas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: lapacke
- Description: C Standard Interface to BLAS Linear Algebra PACKage
---- lapack-3.6.0/CBLAS/CMakeLists.txt
-+++ lapack-3.6.0/CBLAS/CMakeLists.txt
-@@ -71,7 +71,7 @@
-   ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
- 
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
-   install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
-   DESTINATION ${PKG_CONFIG_DIR}
---- lapack-3.6.0/CMakeLists.txt
-+++ lapack-3.6.0/CMakeLists.txt
-@@ -333,7 +333,7 @@
-   ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
- 
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
-   install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
-   DESTINATION ${PKG_CONFIG_DIR}
---- lapack-3.6.0/LAPACKE/CMakeLists.txt
-+++ lapack-3.6.0/LAPACKE/CMakeLists.txt
-@@ -65,7 +65,7 @@
- endif(BUILD_TESTING)
- 
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
-  install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
-   DESTINATION ${PKG_CONFIG_DIR}
---- lapack-3.6.0/LAPACKE/lapacke.pc.in
-+++ lapack-3.6.0/LAPACKE/lapacke.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: lapacke
- Description: C Standard Interface to LAPACK Linear Algebra PACKage
---- lapack-3.6.0/lapack.pc.in
-+++ lapack-3.6.0/lapack.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: lapack
- Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
diff --git a/sci-libs/lapack-reference/files/lapack-reference-3.7.0-fix-build-system.patch b/sci-libs/lapack-reference/files/lapack-reference-3.7.0-fix-build-system.patch
deleted file mode 100644
index 70f7cb0ee926..000000000000
--- a/sci-libs/lapack-reference/files/lapack-reference-3.7.0-fix-build-system.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
-index 7fd6f1e..e52f3ad 100644
---- a/BLAS/blas.pc.in
-+++ b/BLAS/blas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: BLAS
- Description: FORTRAN reference implementation of BLAS Basic Linear Algebra Subprograms
-diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
-index 4a938fe..311aed9 100644
---- a/CBLAS/cblas.pc.in
-+++ b/CBLAS/cblas.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: CBLAS
- Description: C Standard Interface to BLAS Basic Linear Algebra Subprograms
-diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
-index 028f8da..dc092b1 100644
---- a/LAPACKE/lapacke.pc.in
-+++ b/LAPACKE/lapacke.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: LAPACKE
- Description: C Standard Interface to LAPACK Linear Algebra PACKage
-diff --git a/lapack.pc.in b/lapack.pc.in
-index 878efc2..2cca4c2 100644
---- a/lapack.pc.in
-+++ b/lapack.pc.in
-@@ -1,5 +1,7 @@
--prefix=@prefix@
--libdir=@libdir@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: LAPACK
- Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
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
deleted file mode 100644
index b9ee0e8c6fee..000000000000
--- a/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils fortran-2 flag-o-matic multilib toolchain-funcs
-
-MyPN="${PN/-reference/}"
-PATCH_V="3.2.1"
-
-DESCRIPTION="FORTRAN reference implementation of LAPACK Linear Algebra PACKage"
-HOMEPAGE="http://www.netlib.org/lapack/index.html"
-SRC_URI="
-	mirror://gentoo/${MyPN}-${PV}.tgz
-	mirror://gentoo/${PN}-${PATCH_V}-autotools.patch.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc"
-
-RDEPEND="
-	app-eselect/eselect-lapack
-	virtual/blas"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/lapack-docs )"
-
-S="${WORKDIR}/${MyPN}-${PV}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	if  [[ $(tc-getFC) =~ if ]]; then
-		ewarn "Using Intel Fortran at your own risk"
-		export LDFLAGS="$(raw-ldflags)"
-		export NOOPT_FFLAGS=-O
-	fi
-	ESELECT_PROF=reference
-}
-
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/${PN}-${PATCH_V}-autotools.patch \
-		"${FILESDIR}"/${P}-parallel-make.patch
-	eautoreconf
-
-	# set up the testing routines
-	sed \
-		-e "s:g77:$(tc-getFC):" \
-		-e "s:-funroll-all-loops -O3:${FFLAGS} $($(tc-getPKG_CONFIG) --cflags blas):" \
-		-e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $($(tc-getPKG_CONFIG) --cflags blas):" \
-		-e "s:../../blas\$(PLAT).a:$($(tc-getPKG_CONFIG) --libs blas):" \
-		-e "s:lapack\$(PLAT).a:SRC/.libs/liblapack.a:" \
-		make.inc.example > make.inc \
-		|| die "Failed to set up make.inc"
-
-	cp "${FILESDIR}"/eselect.lapack.reference "${T}"/eselect.lapack.reference || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.lapack.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.lapack.reference || die
-	fi
-	sed \
-		-e '/Libs:/s|: |: -L${libdir} |g' \
-		-i lapack.pc.in || die
-}
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}/usr/$(get_libdir)/lapack/reference" \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-}
-
-src_install() {
-	default
-	eselect lapack add $(get_libdir) "${T}"/eselect.lapack.reference ${ESELECT_PROF}
-}
-
-src_test() {
-	MAKEOPTS+=" -j1"
-	cd "${S}"/TESTING/MATGEN && emake
-	cd "${S}"/TESTING && emake
-}
-
-pkg_postinst() {
-	local p=lapack
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
deleted file mode 100644
index a3080330b1ff..000000000000
--- a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils fortran-2 cmake-utils multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="Reference implementation of LAPACK"
-HOMEPAGE="http://www.netlib.org/lapack/"
-SRC_URI="http://www.netlib.org/lapack/lapack-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="+deprecated"
-
-DEPEND="app-eselect/eselect-lapack
-	>=virtual/blas-3.6
-	virtual/pkgconfig"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/lapack-${PV}"
-PATCHES=( "${FILESDIR}/${P}-fix-build-system.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	ESELECT_PROF=reference
-
-	# some string does not get passed properly
-	sed -i \
-		-e '/lapack_testing.py/d' \
-		CTestCustom.cmake.in || die
-	# separate ebuild to tmglib
-	sed -i \
-		-e '/lapack_install_library(tmglib)/d' \
-		TESTING/MATGEN/CMakeLists.txt || die
-
-	cp "${FILESDIR}"/eselect.lapack.reference-r1 "${T}"/eselect.lapack.reference || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.lapack.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.lapack.reference || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DUSE_OPTIMIZED_BLAS=ON
-		-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		-DBUILD_DEPRECATED=$(usex deprecated)
-		-DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) $(get_abi_CFLAGS) ${FCFLAGS}"
-		-DBUILD_STATIC_LIBS=ON
-		-DBUILD_SHARED_LIBS=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	mkdir -p "${ED}/usr/$(get_libdir)/lapack/reference" || die
-	mv "${ED}/usr/$(get_libdir)"/lib* "${ED}/usr/$(get_libdir)/pkgconfig"/* \
-		"${ED}/usr/$(get_libdir)/lapack/reference" || die
-	rmdir "${ED}/usr/$(get_libdir)/pkgconfig" || die
-
-	eselect lapack add $(get_libdir) "${T}"/eselect.lapack.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=lapack
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/lapack-reference/lapack-reference-3.7.0.ebuild b/sci-libs/lapack-reference/lapack-reference-3.7.0.ebuild
deleted file mode 100644
index 32c1ba6cfd12..000000000000
--- a/sci-libs/lapack-reference/lapack-reference-3.7.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils fortran-2 cmake-utils multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="Reference implementation of LAPACK"
-HOMEPAGE="http://www.netlib.org/lapack/"
-SRC_URI="http://www.netlib.org/lapack/lapack-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="+deprecated"
-
-DEPEND="app-eselect/eselect-lapack
-	>=virtual/blas-3.6
-	virtual/pkgconfig"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/lapack-${PV}"
-PATCHES=( "${FILESDIR}/${P}-fix-build-system.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	ESELECT_PROF=reference
-
-	# some string does not get passed properly
-	sed -i \
-		-e '/lapack_testing.py/d' \
-		CTestCustom.cmake.in || die
-	# separate ebuild to tmglib
-	sed -i \
-		-e '/lapack_install_library(tmglib)/d' \
-		TESTING/MATGEN/CMakeLists.txt || die
-
-	cp "${FILESDIR}"/eselect.lapack.reference-r1 "${T}"/eselect.lapack.reference || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.lapack.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.lapack.reference || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DUSE_OPTIMIZED_BLAS=ON
-		-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		-DBUILD_DEPRECATED=$(usex deprecated)
-		-DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) $(get_abi_CFLAGS) ${FCFLAGS}"
-		-DBUILD_STATIC_LIBS=ON
-		-DBUILD_SHARED_LIBS=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	mkdir -p "${ED}/usr/$(get_libdir)/lapack/reference" || die
-	mv "${ED}/usr/$(get_libdir)"/lib* "${ED}/usr/$(get_libdir)/pkgconfig"/* \
-		"${ED}/usr/$(get_libdir)/lapack/reference" || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# modify install_names accordingly, bug #608266
-		local lib
-		for lib in "${ED}"/usr/$(get_libdir)/lapack/reference/*.dylib ; do
-			install_name_tool -id "${lib#${D%/}}" "${lib}"
-		done
-	fi
-	rmdir "${ED}/usr/$(get_libdir)/pkgconfig" || die
-
-	eselect lapack add $(get_libdir) "${T}"/eselect.lapack.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=lapack
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/lapack-reference/metadata.xml b/sci-libs/lapack-reference/metadata.xml
deleted file mode 100644
index 9bd49b11cd5c..000000000000
--- a/sci-libs/lapack-reference/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-LAPACK is a comprehensive library that does linear algebra
-operations including matrix inversions, least squared solutions to
-linear sets of equations, eigenvector analysis, singular value
-decomposition, etc. It is a very comprehensive and reputable package
-that has found extensive use in the scientific community.
-This package installs the reference FORTRAN 77 implementation from Netlib.
-  </longdescription>
-  <use>
-    <flag name="deprecated">Build deprecated routines</flag>
-  </use>
-</pkgmetadata>
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index bd36f953d608..1eac2c0fcc29 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,7 +1,7 @@
 AUX lapack-3.9.0-build-tests.patch 591 BLAKE2B 3db7dad6b798e5e9a4d050b05ef318aebd564d7fca3b3ac12c44f460eb6653693476f016c8a4d6369e4f4e4aa06aa7bf4a1cea38083758e8257f8cfd36c41d9f SHA512 642073d65ab1d5b7beb06e90cd4777ed89f4a76dcd5ec26025fa254ab243c8c09dcd4ca17b8d406e55cdbd302eab36f34a429dc3963a11827209246ebf2251cd
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
 DIST lapack-3.9.0.tar.gz 7534567 BLAKE2B 408013a11a72e0262d144adfdf6db28a6efa3bb5446f9ff959bb88fe10459dfa621149ed0144630a55e73e3b5be3c704269a716eb195f6db7b39d345b4db8270 SHA512 424956ad941a60a4b71e0d451ad48db12a692f8a71a90f3ca7f71d6ecc1922f392746ea84df1c47a46577ed2db32e9e47ec44ad248207c5ac7da179becb712ef
-EBUILD lapack-3.8.0-r1.ebuild 3011 BLAKE2B a8efb95f7d55e08b16cd1e784fdf25b57f45ce1182fd5b461384bef75ae3abc5efc49066ab9f1e015c2861f0ff1fb5039db079bb48bb18899ce521a6f07798d2 SHA512 d46ec6260889139d1b721a88de7e2b428742238fde74555dc933d02820835fe804394f401ebf6d605b08016da803ac33f726545fea2f567ece89c99d0113cb2e
-EBUILD lapack-3.8.0.ebuild 2959 BLAKE2B 415318e59b79d7bca4a4faefcc7f6b080287589eab098cbd32d72d77ad31b28ba9d6536527308340feeb6141cb8439bed73d18fd7f3b4b403cbcb5e3661765f1 SHA512 aed62d7a3b58f0bb4e658ddae720ce3b872aa5416b9aa54b30cca1beb2c4350a8ce0899ba7de1cf7e4782e459baf56b8ba4ac2306b8f9e6fb0ab412d2da88ffb
-EBUILD lapack-3.9.0.ebuild 3105 BLAKE2B cf20345444e6a2a9ed6fe8ef7310d4d8903dc288e64e55b9a2e63dcaf3e5af04c2841de5b8245c117f498f64add85ac95c378d12a9e1bc20f234d85bc4b6f809 SHA512 7b8b2f77ef85cf31827e6a4609cc7d091ed998e7b0d3427c7ec380651cf87d4d2241227d15ad46a27e95826defc56bd31616fbd1340891b5029bc79e597a71e4
+EBUILD lapack-3.8.0-r1.ebuild 2901 BLAKE2B d5f74beb2ce42286073f0814de763d0a2766d6164cc79a1e462e0023c43df99187159c9326d0ceda48bb0c2d7f5982acb7d53851d0343d65b787517bb7114e5a SHA512 5f80710f037904ecaa7c8c252f0f0ab71e2a33fad7f70f1a9c86aebf67ab869e229590afac775753d159516f953b6b60228f3262f5e63e7441d727e975b44237
+EBUILD lapack-3.8.0.ebuild 2849 BLAKE2B cf64c5d2a2c49b23821c8f66751fd14886444ba89d6f77b26be33eab76991ed587a1eecdb4d2422c35b184e716af888490ca400a404c50f3de0118e9afa5dd30 SHA512 9dd9b8ed862a6d3961766fc8e550d04991b69d3d4ef1c9d3b5eb1e5df893eb6fd90b29d10cf9078a172cb0210a4f25c179ebf1a11fc470ec9964481dfa8b74bf
+EBUILD lapack-3.9.0.ebuild 2988 BLAKE2B 0c9c7694ea6adfe6d4d05a207f82d9da54ad7ee8b05c230589f834117c3995e90a046085d69ef4112518dd21df6506f55c939240d00c2cfeaba5f85899d05155 SHA512 f7447bd24d4526a9dfe1d04ecd58a16a7624d714cd876b9d765186e2e3ffc665ba3d0fc369c55a1cc50c5e4403d4b6964784b6929e3450c4f11f21019cf2666c
 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
index fe759a13f358..47bcb4605cab 100644
--- a/sci-libs/lapack/lapack-3.8.0-r1.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
@@ -19,10 +19,6 @@ 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}
diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild
index 7b7241aeb315..d661b9b9be54 100644
--- a/sci-libs/lapack/lapack-3.8.0.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0.ebuild
@@ -19,10 +19,6 @@ 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}
diff --git a/sci-libs/lapack/lapack-3.9.0.ebuild b/sci-libs/lapack/lapack-3.9.0.ebuild
index 87c344ba13b5..311a994271d3 100644
--- a/sci-libs/lapack/lapack-3.9.0.ebuild
+++ b/sci-libs/lapack/lapack-3.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P
 
 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 test"
 # TODO: static-libs 64bit-index
 RESTRICT="!test? ( test )"
@@ -21,10 +21,6 @@ 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}
diff --git a/sci-libs/libaec/Manifest b/sci-libs/libaec/Manifest
index 816054bbb24e..5294cf0587f0 100644
--- a/sci-libs/libaec/Manifest
+++ b/sci-libs/libaec/Manifest
@@ -1,9 +1,5 @@
-DIST libaec-0.3.2.tar.gz 353185 BLAKE2B 7578b35f25ecf8e3e5172f1f0fcbb84a0354cf5a1cb3bfb8588d63ee6872ea8ad7e220b53ea4989dfc1741417f5f10023e91d3a3db7d2ed9e7bc1f6a4eae3509 SHA512 c3935f7d3e2e289e66f24d5af8f8fe21aab1044adbe883708ed64eb194bf93511fe2a9dd2b1658571ebbcc502123b3a5e6dfaa1bc4a1b85eaeaedc8b43d8085e
-DIST libaec-1.0.0.tar.gz 3118578 BLAKE2B f3b8ef52e636cd3a04710f75de6fac6d4ab97bbb9422a7753ec5acf98a9cfedf8dacfd13a610f6a5445312448e3490d43182753c8f82995b112de1ad3dd0f45a SHA512 112ded6151e46a90adfe230d8298452b2e42105e0e9d40ce10ac49f1e0160a13fa7ddec22e22346f0d5defc397bbba7c12f9d58b08e024da19991108e6e8d8ba
-DIST libaec-1.0.1.tar.gz 769507 BLAKE2B 7a5f0e3c016f6562a94013a072e33638ba6e4b4af1a607befd508e442dae750d59435b96628bc59e4b86694d5745c302a615fa00603221d642700b86519c4428 SHA512 e3e38298d8d1fdf86332612c4dd62cafb8fa59ec8de00ed96aabee5bfbb46fd2396fcc0ad7fa2e4f89f9a22de538e58be5017d214b42176c0450dcc7c35bfedb
 DIST libaec-1.0.2.tar.gz 767910 BLAKE2B 4d843839b21d93a7ae0f90627217978d1d7262dff35962bb7fe7a9f62f57b5042c36278ff61ad7d7aa3ad1a7cdd1ceb75a59dcc1ab9b3d1c899c506ffe5819d3 SHA512 28a8839089e4b643b259cb8679b96e602a35098d1129baae6b3923767060e5deabfa33256d628a8bcbf205368cda5f2e6701078de0caccf44e0597d932a67ba2
-EBUILD libaec-0.3.2.ebuild 866 BLAKE2B c76546c4c162be29bc2073d22b0d191a3b64fe2354fc24425e293f2da91652a5e4dba8ab7ea2d6c95884054de4a5f6da018cc442cdd320190b8309caa60f0995 SHA512 c1cbba499700a549b299ee9cba35d3e8e2014ddf1c943eb3f7a6954ecfb0ead97b730796c31590aa27793bfa1e78679fde81d9fd5411a4771eeb84de072f86f3
-EBUILD libaec-1.0.0.ebuild 898 BLAKE2B 947c0edd44b0b1bf17307db40e507b4133a1fb2e837541f28aec7af6cf482ab76d43b12cc8ce215ee983028e1f9a5bd1c7dff24e975ceb21bcf6d63a4e7291dc SHA512 4c5d847fc9c9c22c7b19a65175b878030ca8c0916caebc8223330cb712709df7bdadce824bfda6f44cac6d5b89b50c107da948089a1055519a3572cde4cb30e5
-EBUILD libaec-1.0.1.ebuild 750 BLAKE2B 94023b81dfa7ebe237dfc857b71b835540ad8a6209ab36808db00cb917a8736ca4abd8170eba20517a2f5e9cdd225b8dcb397e043f5d831ec16c445c8915aa48 SHA512 7e506fb0f84d3e18c86cf0bbe1bf657911393c18316398c6bb9fd2787de0ac0142e421241b503148f739944e406eb3a049af3622b993f0d662a0816bcdb5dcf7
+DIST libaec-1.0.4.tar.gz 2775768 BLAKE2B e083c5e268296227b5193c2192f7c52d47f8cef08823de013453ffd2c5f8c115921a79c60286e7582cbfcbb914c5e8ad4c2493e4ec89395df3be2206bc893591 SHA512 74d01208ad3a426d68895dbfa8a830c96618a219f27745ecfd94b248462748e772c266e7fb0d4e4f4c75f8953a97f835fb2ece67317cf9e9a7495360362d22eb
 EBUILD libaec-1.0.2.ebuild 739 BLAKE2B 57c3fb5b3d94e17960c94ce135226386b16d5fbb481fcafe730e8b8ac836d8f8e9efe1de535dbdfaec57fe8fe8b0748d4a3604b626c4d319ebc4a23ac0c172f4 SHA512 eef3ad4f0b72a5fb168b5cd887dcf27cefa93f46e818ab3efc7198187948baec4f10fcbb61f5c49def4d6d15b816486bb022cca54a5401dcc706faf348088f7b
+EBUILD libaec-1.0.4.ebuild 746 BLAKE2B 560dbff99896a9c23906eeb2c8b6cd7ad52ae182d99dd1c92194501c29ea1e62287fdbc78e5ee3aeaa46e10eebb0f272f61b3cfc087129faeb1d2afc16a0bd44 SHA512 046695832d8ce2400d6bbc13648061783182a8e0f88b7f6cd22f7df1210cfb835ceb135384ec8ac771a8cba02ae9dc075ad217a9b6c4e5084bae4be32ef92afc
 MISC metadata.xml 719 BLAKE2B d8294233ada6c2318c05d70c6062e7b7db0b0bab38410e9bd0c7d6f9834d1515cb138095d555f27f36c829fbbf7c83c141c1ce74213fba849da8704adf63889d SHA512 f0197c0cf374cb0771e4b2e3bfcc80f639d3e660943df1cab79eec68b515a605855f792b0b1627d24409cfb6cc2890ca7e96f4aace01639106ee50e14574ccf6
diff --git a/sci-libs/libaec/libaec-0.3.2.ebuild b/sci-libs/libaec/libaec-0.3.2.ebuild
deleted file mode 100644
index a242649f4d19..000000000000
--- a/sci-libs/libaec/libaec-0.3.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune
-# number that might change every version
-PID=453
-
-DESCRIPTION="Adaptive Entropy Coding library"
-HOMEPAGE="https://www.dkrz.de/redmine/projects/aec"
-SRC_URI="https://www.dkrz.de/redmine/attachments/download/${PID}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs +szip"
-
-DEPEND=""
-RDEPEND="szip? ( !sci-libs/szip )"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	# avoid conflict with szip (easier than to patch autotools)
-	if ! use szip; then
-		rm "${ED}"/usr/include/szlib.h || die
-		rm "${ED}"/usr/$(get_libdir)/libsz* || die
-		rm "${ED}"/usr/share/doc/${PF}/README.SZIP || die
-	fi
-	use static-libs || prune_libtool_files --all
-}
diff --git a/sci-libs/libaec/libaec-1.0.0.ebuild b/sci-libs/libaec/libaec-1.0.0.ebuild
deleted file mode 100644
index 12418e922659..000000000000
--- a/sci-libs/libaec/libaec-1.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune
-# number that might change every version
-PID="631e85bcf877c2dcaca9b2e6d6526339"
-
-DESCRIPTION="Adaptive Entropy Coding library"
-HOMEPAGE="https://gitlab.dkrz.de/k202009/libaec"
-SRC_URI="https://gitlab.dkrz.de/k202009/libaec/uploads/${PID}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/2"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs +szip"
-
-DEPEND=""
-RDEPEND="szip? ( !sci-libs/szip )"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	# avoid conflict with szip (easier than to patch autotools)
-	if ! use szip; then
-		rm "${ED}"/usr/include/szlib.h || die
-		rm "${ED}"/usr/$(get_libdir)/libsz* || die
-		rm "${ED}"/usr/share/doc/${PF}/README.SZIP || die
-	fi
-	use static-libs || prune_libtool_files --all
-}
diff --git a/sci-libs/libaec/libaec-1.0.1.ebuild b/sci-libs/libaec/libaec-1.0.4.ebuild
index 09a38b3d5844..c88b8785e98c 100644
--- a/sci-libs/libaec/libaec-1.0.1.ebuild
+++ b/sci-libs/libaec/libaec-1.0.4.ebuild
@@ -1,25 +1,27 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils vcs-snapshot
+inherit cmake
 
+MY_P="${PN}-v${PV}"
 DESCRIPTION="Adaptive Entropy Coding library"
 HOMEPAGE="https://gitlab.dkrz.de/k202009/libaec"
-SRC_URI="https://gitlab.dkrz.de/k202009/libaec/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
+SRC_URI="https://gitlab.dkrz.de/k202009/libaec/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="+szip"
 
-DEPEND=""
 RDEPEND="szip? ( !sci-libs/szip )"
 
 src_install() {
-	cmake-utils_src_install
-	# avoid conflict with szip (easier than to patch autotools)
+	cmake_src_install
+
+	# avoid conflict with szip (easier than to patch)
 	if ! use szip; then
 		rm "${ED}"/usr/include/szlib.h || die
 		rm "${ED}"/usr/$(get_libdir)/libsz* || die
diff --git a/sci-libs/libecpint/Manifest b/sci-libs/libecpint/Manifest
new file mode 100644
index 000000000000..289b2fc57399
--- /dev/null
+++ b/sci-libs/libecpint/Manifest
@@ -0,0 +1,3 @@
+DIST libecpint-1.0.2.tar.gz 1161801 BLAKE2B 98b9264055bc9dab86ad54921f65380bca6cf96a2e6000bc061998367b3eeaffe122fa03ed83c75deb568ee7cce49ff85b97909bd57ae057a189025421dee82e SHA512 adf9394628a39d1e07e4f02bf4fad1c3d19cbfd9a9aa123d6151dddb78c7ef2c2cab07bc7060dba1d5114756c03964c2bd237c82203a1efb38b9facaaa24c74a
+EBUILD libecpint-1.0.2.ebuild 614 BLAKE2B cfa9e63c58e931e386cd1fa89252621ae2056ec93a10e8b1dd0ca3c87c14a0973c69707844f26710cf90b5561b858d9ee87abbeb0c6cceee780ec787cb004978 SHA512 aef1b9a6f9ed45d329af61014925b8fc17336bdb12a66b283100856eab619cf4005a2b0974f021452c1f1c59c484d2076439138c1865a1a535f027ed3276b16d
+MISC metadata.xml 636 BLAKE2B 4ef2fae4bda3d954677ec576703eb777c947212819c38ef1181c50f4bd7e128c342547d4c35e61ecac57852f21108265410034e2a71f546b8101a587e9428840 SHA512 c74b750861f6bd26d0f6aef880d055cc418216e4e8a17b45bfe51caee453ff0214fe7557b59b38f71dfcf13063ebf0c93ed4c29efdbeb5528172abf087d7e60c
diff --git a/sci-libs/libecpint/libecpint-1.0.2.ebuild b/sci-libs/libecpint/libecpint-1.0.2.ebuild
new file mode 100644
index 000000000000..40c0946f2990
--- /dev/null
+++ b/sci-libs/libecpint/libecpint-1.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Efficient evaluation of integrals over ab initio effective core potentials"
+HOMEPAGE="https://github.com/robashaw/libecpint"
+SRC_URI="https://github.com/robashaw/libecpint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/pugixml
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	mycmakeargs=(
+		-DLIBECPINT_BUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/libecpint/metadata.xml b/sci-libs/libecpint/metadata.xml
new file mode 100644
index 000000000000..0802ee79be89
--- /dev/null
+++ b/sci-libs/libecpint/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  Libecpint is a C++ library for the efficient evaluation of integrals over ab
+  initio effective core potentials, using a mixture of generated, recursive
+  code and Gauss-Chebyshev quadrature. It is designed to be standalone and
+  generic.
+</longdescription>
+  <upstream>
+    <remote-id type="github">robashaw/libecpint</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index 7e3f04987287..9098e3462e23 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -1,4 +1,4 @@
-AUX libgeodecomp-0.5.0_pre20200420-mpi.patch 13752 BLAKE2B ed5e2cafc0c8777e30ecf7e3b896aab1226b110c948e984dabf15d0bb85fa931f6991e1c108e55bab4016131c6f142d589500004e4ac76cb840c41eb975f41ea SHA512 b33ddbe1e0293e14b9f6b2a982cf8717d5c6dbceb34c476a5896c2eb3776ecbac9e219f11b9aea6a10a108b1fae3a2b373976e7636ff80b0f381b6bd4e1b0722
-DIST libgeodecomp-0.5.0_pre20200420.tar.gz 1507078 BLAKE2B 64d5c9a138c54175ce049a1a02def90553bca617b22c9ac5fa93cd66aebfd7892f5a458f2d3eb3dd987d3c897cbb338b64cb64af7447f6ae74b41d02a762888e SHA512 0e1caa011641fba5af3c32f165fc95ced578ebeb45cb7ef56f1ede416f2e6aef532569a85339e48b43b0050bbfb60ffa1760604577c07137590445a87e691c70
-EBUILD libgeodecomp-0.5.0_pre20200420.ebuild 1673 BLAKE2B c83553fc11313cad76f3b726cbdfc0326a5c545665d448553302b8309a228ad483c0a924d84322fff514f27e0097e3df3e9ca4f56ba7a371487d647b5bbf6099 SHA512 9046846474befbd1aaa2d8351295d222fed3e1901912e9b683c0236a38f2fcb894b35154d1dec86499b3083baa2d04351261cde288eafe55ed0ca4eb3d51adb7
+AUX libgeodecomp-0.5.0_pre20201009-mpi.patch 13752 BLAKE2B ed5e2cafc0c8777e30ecf7e3b896aab1226b110c948e984dabf15d0bb85fa931f6991e1c108e55bab4016131c6f142d589500004e4ac76cb840c41eb975f41ea SHA512 b33ddbe1e0293e14b9f6b2a982cf8717d5c6dbceb34c476a5896c2eb3776ecbac9e219f11b9aea6a10a108b1fae3a2b373976e7636ff80b0f381b6bd4e1b0722
+DIST libgeodecomp-0.5.0_pre20201009.tar.gz 1510212 BLAKE2B fdddf8ef8dd93d0a4860dbde27d1e59bda039b27ff7526a1ddfb6cfe8103f54edd2a847dad2ffa1cdc0c4454b2d48e0df7e5f941ad2a9df9c848868817413b03 SHA512 42a28fcce6408c610265f8cde9c9d46e83519a8ec4a3e6b1f0e6637597b4b9a702c43655f9c1cf5a159012533f2c2e937de21bda2aed54cdd6acd19ec5b4030a
+EBUILD libgeodecomp-0.5.0_pre20201009.ebuild 1673 BLAKE2B b00edfd28376b55f0c5772d6bff2994ea151bd2e29822594059678e262b324925fdd14e4f4e5fa415ed26e08267ef1ac926e942c0dedeab20e142527fdedc178 SHA512 6c9b30a02ad8cf246b0c5fb26c113671875426213320f6f80b33b92a99ad0a8ae7e7930c436fdf4e1af8de9cb0d0787bc9f2b1ee290400862a6a2fab8a76e315
 MISC metadata.xml 1345 BLAKE2B d6cb11021ade1a8c9007bf7a57c1e9355e19331498b66f746405bbd52dd5562656e827ab1db290190c37b283f579512609cf730d0ea27f6c31629d7e1fc38266 SHA512 f377ab4249dc9bb3dc2518e7d86ad6c2b44cd1249474480a5a71aa5b944c220ddc1608a8171d1abeaffa3d4628f4f327956cfb412ac14336f75705b7d8fe0fd9
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200420-mpi.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20201009-mpi.patch
index 1a1164e342be..1a1164e342be 100644
--- a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20200420-mpi.patch
+++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20201009-mpi.patch
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200420.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20201009.ebuild
index d269428d5cd1..70aa22852709 100644
--- a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20200420.ebuild
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20201009.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake cuda virtualx
 
-MY_COMMIT="69c5573ac7b2b654d649e8902fad73b05bf33644"
+MY_COMMIT="6848b3a17b359e03585e56dd1f37dc7c71136114"
 
 DESCRIPTION="An auto-parallelizing library to speed up computer simulations"
 HOMEPAGE="
@@ -26,7 +26,7 @@ BDEPEND="
 	)"
 RDEPEND="dev-libs/boost"
 DEPEND="${RDEPEND}
-	~dev-libs/libflatarray-0.4.0_pre20200314
+	~dev-libs/libflatarray-0.4.0_pre20201009
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	hpx? ( sys-cluster/hpx )
 	mpi? ( virtual/mpi )
diff --git a/sci-libs/libint/Manifest b/sci-libs/libint/Manifest
index d70bf14f8006..9d0c99be91f0 100644
--- a/sci-libs/libint/Manifest
+++ b/sci-libs/libint/Manifest
@@ -2,5 +2,6 @@ AUX libint-1.1.6-as-needed.patch 2733 BLAKE2B 9ffec6e80030c1226387f51fb3e0409d22
 DIST libint-1.1.6.tar.gz 256404 BLAKE2B c754e25f0c3bc6c52eb434beafd2cb794a2e715003ee9409d76e8ae06e0ce19a42a9331ad4db9be2745d6820e7248210d10b4c004146e99192fd16fd2c31966d SHA512 cb39d73e89431c324e32d4a71593fe913c7ae2132677d4600e63ce1ed99e8e431758f0aa3d130991da841e98a1064fa931eb0e82dbe80af4c0ece10ee3a4f2d7
 DIST libint-2.6.0.tar.gz 24743255 BLAKE2B 3ab7baba012828485c6c8425bce100e1ab50d2a3c8443ea2ef5cf173d58d8aa211a07e837b10a7f89d7e57f2e15b9384060bbf7b9885f32e9426525e65e15960 SHA512 56343c64b0dfb829702f4bb2fe14a04ad063acd7cb8b5a21cd1a45a830944c1ee98c888c9a28d6746b1bc17459aefcfb0aafe6ef310bfe554056212ad19e43ef
 EBUILD libint-1.1.6.ebuild 955 BLAKE2B 3b9e1a5074e9d8ff91ad97b7682a0cd658abe256c331c9b270056148aba64fd0e0eb9a0f93388b25d880c9ef017408e768888fe5463900e8264f85e0c843645a SHA512 53f1b0ffc316cb021f05ca6432c24ea8c316bcb87f02149a7a0f8b6401c845d13a5f20b4fa954eee0c25c32b5325bc1f01de8ac183492c9b6f36994c7fddc491
-EBUILD libint-2.6.0.ebuild 1142 BLAKE2B dbcf21cb24b82b024aaf58ccdfc50db19fb942b72cdfca95be9feba3b549ba84749cc6d948afbb0687335c710c4cc0ca275fb65ed0e30d7bdc028cc6e8c18883 SHA512 f48c2a64fcf9bdda80d98d71c750df875ff0b9c031c7407e39985c83b06a151d184d5ce5831786e3b403ece06e2abb206b507f3b506e685cadf50e543c95928c
+EBUILD libint-2.6.0-r2.ebuild 1410 BLAKE2B c7711ab08a0479791d75e93906b328d469fcaedbc34f53a9fa6e92f4bfaf0cef9dc84c5f61407ac73ace663cf1d586da8380be268ff3632421f9154d9096b7ed SHA512 d65fc01982c69a7a291f1481e3c2e2aedda5f0401a54949748011288acac9478d68a48027714390072ba34fdc22eb741df69addf3c52431db45f2576ee93c94d
+EBUILD libint-2.6.0.ebuild 1141 BLAKE2B a2c257f44c010d68f80b14e32b7f260d0019daa9b30f0bdffd691e51875dcf74b076d8f9d5700aa666588944b210429b9e3598f3494a3b33f23dda30e65279a4 SHA512 96e8d062ac2237fc357a6d93161ac364491c0be9a91da5ca11ef66f65492667658cef1c82d98185b4d93554e91bf11d3c51fbf18be5cf04e4ed2847a0f071b08
 MISC metadata.xml 612 BLAKE2B bc2b11edd30d0db99860d1d005c56c428c75be96224fa3285fd3cde6f35af0f142b445254214af00308a29ee8965505a8dfe14ffb2e80b57ca42ef20c91bf100 SHA512 db9172c0e887d45f42914159eae83c0f11b40fbafac31395c782ff959cdccad8a62a8d468cec66d6e362cd8ea09aa3b05057d19fff8a1f94b9bd472be97d04b0
diff --git a/sci-libs/libint/libint-2.6.0-r2.ebuild b/sci-libs/libint/libint-2.6.0-r2.ebuild
new file mode 100644
index 000000000000..0297d5bfea81
--- /dev/null
+++ b/sci-libs/libint/libint-2.6.0-r2.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 eutils fortran-2 toolchain-funcs
+
+DESCRIPTION="Matrix elements (integrals) evaluation over Cartesian Gaussian functions"
+HOMEPAGE="https://github.com/evaleev/libint"
+SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="2"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs doc"
+
+DEPEND="
+	dev-libs/boost
+	dev-libs/gmp[cxx]
+	doc? (
+		dev-texlive/texlive-latex
+		dev-tex/latex2html
+	)"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-cxx=$(tc-getCXX) \
+		--with-cxx-optflags="${CXXFLAGS}" \
+		--with-cxxgen-optflags="${CXXFLAGS}" \
+		--with-cxxdepend=$(tc-getCXX) \
+		--with-ranlib=$(tc-getRANLIB) \
+		--with-ar=$(tc-getAR) \
+		--with-ld=$(tc-getLD) \
+		--enable-eri=2 --enable-eri3=2 --enable-eri2=2 \
+		--with-eri-max-am=7,5,4 --with-eri-opt-am=3 \
+		--with-eri3-max-am=7 --with-eri2-max-am=7 \
+		--with-g12-max-am=5 --with-g12-opt-am=3 \
+		--with-g12dkh-max-am=5 --with-g12dkh-opt-am=3 \
+		--enable-contracted-ints \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}"
+
+	use doc && emake html pdf
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		DOCS=( doc/progman/progman.pdf )
+		HTML_DOCS=( doc/progman/progman/*.{html,png,css} )
+		einstalldocs
+	fi
+}
diff --git a/sci-libs/libint/libint-2.6.0.ebuild b/sci-libs/libint/libint-2.6.0.ebuild
index a81caff037d7..774bdc758b4a 100644
--- a/sci-libs/libint/libint-2.6.0.ebuild
+++ b/sci-libs/libint/libint-2.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs doc"
 
 DEPEND="
diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index 4b7fe34341e4..9bda25565b22 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -1,6 +1,8 @@
+AUX libsigrok-0.5.2-check-0.15.patch 917 BLAKE2B 39d042e99dc5a71fa79def033f7a30621967294ed8198b00ca9e7a21caf7ee77f07e3f6d1e27c3a4d2629539835ec1b4e7bc3fdfe2ce1e98d7e97b4a897131ce SHA512 1729653f153ebdec08c0b987a0cf15a50ed6ce8948805b2a9ddf122ba591426e830329bfb47527ef253c19f9b8e98693ab0258e9ac19906473d3605d61c8983d
 AUX libsigrok-0.5.2-ruby-swig-docs.patch 3085 BLAKE2B 865f38a8230762f58620c06b91dda8bfda405057c6733ef8dc27dbc7094817709ce03a3db1904e4c4ce3ecbdc82da6d16c5719a3f93410a84f07cd4c4018a9ea SHA512 aa3fd492f736c0fe7af1c2ba4e41307731589cef78c480426113dcbae8abbf0ecc07bdc5e1b251103d5aa813f120c5ff7f76dd6d5e577ca8f2b9f29eac008025
 AUX libsigrok-0.5.2-swig-4.patch 1484 BLAKE2B 94c9bbde14f3175252677dedd50a7f3ff17bcc734382d93fbe3c65c71989dc72d0568535343bcb7764053075a2bac9c9f2d4e480d582a5371ac0d4a12bcab4a2 SHA512 34e568351624aeada4c3894be8a60cc0111be7c20ebe8e5395a1f81b2fc453a6a8228f575b95faad5140162a9d4fc5fc570546f42673f7275cb3910c73ffc8de
 DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092
-EBUILD libsigrok-0.5.2.ebuild 3878 BLAKE2B 469ae6df2e16a1d6d26f65631f8ed4c4587533c72f0b9f4c4846f04ecb7c094680aeb62e3ef4412f5dbb34d6d4ccc81e53deb0a21bd1765a9359918e79115dca SHA512 bd48c7fb6f8e6b49e86886153add093039adc1c939ee0dd0666973b0c2caa8417c2a775b88946b3e7915faf1df0f22c9e2ba878c90a2ff687eef7782f815f333
-EBUILD libsigrok-9999.ebuild 3679 BLAKE2B 7c80f57e327ebac43dbda70a5f07147d49db55bc6640f7f22a82709bc0527cc76a8744ca314b79952ee6fc291462b988668d6ca7ad297246932a4f92c720c0dd SHA512 0182a0ba019d158e2c1c66889e8d97c0857f946357fa2704946b024bece3e43d4410b8d147cbd71c82506264f7b3d38f98a165558e3a515522724f1575ff41fb
+EBUILD libsigrok-0.5.2-r1.ebuild 3912 BLAKE2B 5cdb953cf07fdad970a080610e0670cf056c1507916a9e9c9e19b880c5d12c4ef495330d43f0024e89388e3580a1373149a5a26a01ca465c9e641ef8b45ec0a1 SHA512 84ff50dd1ba7db844f2472ebd1230fc210f34f9446cabeb10d56267e8f018a3bae0b56870a0789c4017ebceb61577240e8d1ae009cf9fb47d6064a532a178ac1
+EBUILD libsigrok-0.5.2.ebuild 3908 BLAKE2B 568c46ba1494ff09b3fc463b71903b89dd6a90e8369eec74ae552d525c0ac4d12e405b9fbc795babf85f81cc798cae937c4ebea0221d89162801992da3563561 SHA512 e9bfc5c369c5600edaa3ca3f7e769bb1a12f00c0228c551dc91fb7c051193b5c9f419d57d4f3de01c9f77c2d5ba76c48155ab997071b90f42d8f3b7269b32b00
+EBUILD libsigrok-9999.ebuild 3674 BLAKE2B 80c07d9da658ca2ae9237230c20bebd8b1bac782fca990cfa4f530a04b4e9bffeeace9bc202bbfa2ea99c73d15da965101f4481fbd47f26ac09abc1ed99d6664 SHA512 00b450ee4a3090c93cab7799e4e269e62d8da66af57794ca9624536740fc0286c950935bb18954015f645e8b87d6de8842d54e517d3172760544a2a4c12a6582
 MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b
diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-check-0.15.patch b/sci-libs/libsigrok/files/libsigrok-0.5.2-check-0.15.patch
new file mode 100644
index 000000000000..8099dcc6c49d
--- /dev/null
+++ b/sci-libs/libsigrok/files/libsigrok-0.5.2-check-0.15.patch
@@ -0,0 +1,26 @@
+From 505a55f7899ee2eb41418e753a1290252202ecd3 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Tue, 15 Sep 2020 08:50:48 +0200
+Subject: [PATCH] tests: strutil, use ck_assert
+
+We pass no message, so use ck_assert instead of ck_assert_msg. This
+results in an error with check 0.15:
+tests/strutil.c:157:2: error: too few arguments to function '_ck_assert_failed'
+  157 |  ck_assert_msg(saved_locale != NULL);
+---
+ tests/strutil.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/strutil.c b/tests/strutil.c
+index fca70eaae..ec2233329 100644
+--- a/tests/strutil.c
++++ b/tests/strutil.c
+@@ -154,7 +154,7 @@ START_TEST(test_locale)
+ 	fprintf(stderr, "Old locale = %s\n", old_locale);
+ 	/* Copy the name so it won’t be clobbered by setlocale. */
+ 	saved_locale = g_strdup(old_locale);
+-	ck_assert_msg(saved_locale != NULL);
++	ck_assert(saved_locale != NULL);
+ 
+ #ifdef _WIN32
+ 	/*
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..9387c14e6ca7
--- /dev/null
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+USE_RUBY="ruby26 ruby25"
+RUBY_OPTIONAL="yes"
+
+inherit python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support"
+HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
+
+LICENSE="GPL-3"
+SLOT="0/4"
+IUSE="+cxx ftdi java parport python ruby serial static-libs test +udev usb"
+REQUIRED_USE="java? ( cxx )
+	python? ( cxx ${PYTHON_REQUIRED_USE} )
+	ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
+
+RESTRICT="!test? ( test )"
+
+# We also support librevisa, but that isn't in the tree ...
+LIB_DEPEND="
+	>=dev-libs/glib-2.32.0[static-libs(+)]
+	>=dev-libs/libzip-0.8:=[static-libs(+)]
+	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
+	ftdi? ( dev-embedded/libftdi:1[static-libs(+)] )
+	parport? ( sys-libs/libieee1284[static-libs(+)] )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
+	)
+	ruby? ( $(ruby_implementations_depend) )
+	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
+	usb? ( virtual/libusb:1[static-libs(+)] )
+"
+RDEPEND="
+	java? ( >=virtual/jre-1.4 )
+	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	static-libs? ( ${LIB_DEPEND} )
+"
+DEPEND="${LIB_DEPEND//\[static-libs(+)]}
+	cxx? ( app-doc/doxygen )
+	java? (
+		>=dev-lang/swig-3.0.6
+		>=virtual/jdk-1.4
+	)
+	python? (
+		>=dev-lang/swig-3.0.6
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	ruby? ( >=dev-lang/swig-3.0.8 )
+	test? ( >=dev-libs/check-0.9.4 )
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}"/${P}
+
+PATCHES=(
+	# https://sigrok.org/bugzilla/show_bug.cgi?id=1527
+	"${FILESDIR}/${P}-swig-4.patch"
+	# https://sigrok.org/bugzilla/show_bug.cgi?id=1526
+	"${FILESDIR}/${P}-ruby-swig-docs.patch" # bug 705074
+	"${FILESDIR}/${P}-check-0.15.patch"
+)
+
+pkg_setup() {
+	use python && python_setup
+	use ruby && ruby-ng_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	[[ ${PV} == *9999* ]] && git-r3_src_unpack || default
+}
+
+sigrok_src_prepare() {
+	[[ ${PV} == *9999* ]] && eautoreconf
+}
+
+each_ruby_prepare() {
+	sigrok_src_prepare
+}
+
+src_prepare() {
+	if use ruby; then
+		cp -rl "${S}" "${WORKDIR}"/all || die
+		ruby-ng_src_prepare
+	fi
+	default
+	sigrok_src_prepare
+	use python && python_copy_sources
+}
+
+sigrok_src_configure() {
+	econf \
+		$(use_with ftdi libftdi) \
+		$(use_with parport libieee1284) \
+		$(use_with serial libserialport) \
+		$(use_with usb libusb) \
+		$(use_enable cxx) \
+		$(use_enable java) \
+		$(use_enable static-libs static) \
+		"${@}"
+}
+
+each_ruby_configure() {
+	RUBY="${RUBY}" sigrok_src_configure --enable-ruby --disable-python
+}
+
+each_python_configure() {
+	cd "${BUILD_DIR}"
+	sigrok_src_configure --disable-ruby --enable-python
+}
+
+src_configure() {
+	sigrok_src_configure --disable-ruby --disable-python
+	use ruby && ruby-ng_src_configure
+	use python && python_foreach_impl each_python_configure
+}
+
+each_ruby_compile() {
+	emake ruby-build
+}
+
+each_python_compile() {
+	cd "${BUILD_DIR}"
+	emake python-build
+}
+
+src_compile() {
+	default
+	use ruby && ruby-ng_src_compile
+	use python && python_foreach_impl each_python_compile
+}
+
+src_test() {
+	emake check
+}
+
+each_ruby_install() {
+	emake ruby-install DESTDIR="${D}"
+}
+
+each_python_install() {
+	cd "${BUILD_DIR}"
+	emake python-install DESTDIR="${D}"
+	python_optimize
+}
+
+src_install() {
+	default
+	use python && python_foreach_impl each_python_install
+	use ruby && ruby-ng_src_install
+	use udev && udev_dorules contrib/*.rules
+	find "${D}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
index 6f9692c6488b..17fe88bad8fc 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
@@ -34,7 +34,7 @@ LIB_DEPEND="
 	>=dev-libs/glib-2.32.0[static-libs(+)]
 	>=dev-libs/libzip-0.8:=[static-libs(+)]
 	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-	ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
+	ftdi? ( dev-embedded/libftdi:1[static-libs(+)] )
 	parport? ( sys-libs/libieee1284[static-libs(+)] )
 	python? (
 		${PYTHON_DEPS}
@@ -72,6 +72,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-swig-4.patch"
 	# https://sigrok.org/bugzilla/show_bug.cgi?id=1526
 	"${FILESDIR}/${P}-ruby-swig-docs.patch" # bug 705074
+	"${FILESDIR}/${P}-check-0.15.patch"
 )
 
 pkg_setup() {
diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild
index 1449357471e6..7cbb58b0daf2 100644
--- a/sci-libs/libsigrok/libsigrok-9999.ebuild
+++ b/sci-libs/libsigrok/libsigrok-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 USE_RUBY="ruby26 ruby25"
 RUBY_OPTIONAL="yes"
 
@@ -34,7 +34,7 @@ LIB_DEPEND="
 	>=dev-libs/glib-2.32.0[static-libs(+)]
 	>=dev-libs/libzip-0.8:=[static-libs(+)]
 	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-	ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
+	ftdi? ( dev-embedded/libftdi:1[static-libs(+)] )
 	parport? ( sys-libs/libieee1284[static-libs(+)] )
 	python? (
 		${PYTHON_DEPS}
diff --git a/sci-libs/magma/Manifest b/sci-libs/magma/Manifest
deleted file mode 100644
index aca2161aee6a..000000000000
--- a/sci-libs/magma/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST magma-1.4.0.tar.gz 3557459 BLAKE2B 610658835e09772f8a54cd851ca23f0123c45133faf7f7db0a9e62c690a0908f6769b7bf16ba955599503416d7ff1b979c7c9b7fa09b57f693a4da709bb483c6 SHA512 9857ac544cc1657ab7d2f6e8c9700facb7fa38278dbfbfeecc3656434de4bd5b96c268f1a98c9ffa823775aa64c315bd63e577b4d475e104311e09d3e5c3ca15
-DIST magma-1.4.1.tar.gz 3765589 BLAKE2B 9f382942e36492efb7a64d62bd62f704e54589aafcdc6d99d33cac1e49612014a139e01766539948f005d86b611c1bb772421635ccd66dd678549a662a410efa SHA512 d283b59b75ca35c8206c07eff97caf28f07ab598955c84a90d795d46905d879d0f1d7e6a2cb080dad74710255b28999e5ce9708e4f0f53a4adba50724fc5ef71
-EBUILD magma-1.4.0.ebuild 3185 BLAKE2B f06d5f99a094a5148d0ded4690b70e94a4970b0e9ba87bbf4c4a9e21ff0b50a8bbc4e49a45c57ec2a793992f0d392aa6146ec3af0b635c2c549312ee9d5a2541 SHA512 4c0124e7e899d3951a0d33cc586830dcd3e5a6a4682e52d5bdaeb096e92c3efc4299e3645b883724e3590f6733861150bfcaa6357651735fa1c725005b71d52f
-EBUILD magma-1.4.1.ebuild 3185 BLAKE2B f06d5f99a094a5148d0ded4690b70e94a4970b0e9ba87bbf4c4a9e21ff0b50a8bbc4e49a45c57ec2a793992f0d392aa6146ec3af0b635c2c549312ee9d5a2541 SHA512 4c0124e7e899d3951a0d33cc586830dcd3e5a6a4682e52d5bdaeb096e92c3efc4299e3645b883724e3590f6733861150bfcaa6357651735fa1c725005b71d52f
-MISC metadata.xml 712 BLAKE2B 0766b74c5103797646ab6b05d13e03e0ed807c110a3cced8ae099d87bb3c58c161db732cd564e83238f20d0302d86c727b4860818a40f578658997d1ad03c258 SHA512 27a54732753e5a772d40323c4571cbe43b3a9aec5243063e2e37fc9939a0fcf4810e8f91364145ab8982a385bbcdebcb468abbab917a074416fd8818943b5ec0
diff --git a/sci-libs/magma/magma-1.4.0.ebuild b/sci-libs/magma/magma-1.4.0.ebuild
deleted file mode 100644
index c50eea5b55ac..000000000000
--- a/sci-libs/magma/magma-1.4.0.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-FORTRAN_STANDARD="77 90"
-
-inherit cuda eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator python-any-r1
-
-DESCRIPTION="Matrix Algebra on GPU and Multicore Architectures"
-HOMEPAGE="http://icl.cs.utk.edu/magma/"
-SRC_URI="http://icl.cs.utk.edu/projectsfiles/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="fermi kepler static-libs test"
-
-REQUIRED_USE="?? ( fermi kepler )"
-
-RDEPEND="
-	dev-util/nvidia-cuda-toolkit
-	virtual/cblas
-	virtual/lapack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )"
-
-# We have to have write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
-# user is (usually) not in the video group
-RESTRICT="userpriv !test? ( test )"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# distributed pc file not so useful so replace it
-	cat <<-EOF > ${PN}.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include/${PN}
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lmagma
-		Libs.private: -lm -lpthread -ldl -lcublas -lcudart
-		Cflags: -I\${includedir}
-		Requires: cblas lapack
-	EOF
-
-	if [[ $(tc-getCC) =~ gcc ]]; then
-		local eopenmp=-fopenmp
-	elif [[ $(tc-getCC) =~ icc ]]; then
-		local eopenmp=-openmp
-	else
-		elog "Cannot detect compiler type so not setting openmp support"
-	fi
-	append-flags -fPIC ${eopenmp}
-	append-ldflags -Wl,-soname,lib${PN}.so.1.4 ${eopenmp}
-
-	cuda_src_prepare
-}
-
-src_configure() {
-	cat <<-EOF > make.inc
-		ARCH = $(tc-getAR)
-		ARCHFLAGS = cr
-		RANLIB = $(tc-getRANLIB)
-		NVCC = nvcc
-		CC = $(tc-getCXX)
-		FORT = $(tc-getFC)
-		INC = -I"${EPREFIX}/opt/cuda/include" -DADD_ -DCUBLAS_GFORTRAN
-		OPTS = ${CFLAGS} -fPIC
-		FOPTS = ${FFLAGS} -fPIC -x f95-cpp-input
-		F77OPTS = ${FFLAGS} -fPIC
-		NVOPTS = -DADD_ -DUNIX ${NVCCFLAGS}
-		LDOPTS = ${LDFLAGS}
-		LOADER = $(tc-getFC)
-		LIBBLAS = $($(tc-getPKG_CONFIG) --libs cblas)
-		LIBLAPACK = $($(tc-getPKG_CONFIG) --libs lapack)
-		CUDADIR = ${EPREFIX}/opt/cuda
-		LIBCUDA = -L\$(CUDADIR)/$(get_libdir) -lcublas -lcudart
-		LIB = -pthread -lm -ldl \$(LIBCUDA) \$(LIBBLAS) \$(LIBLAPACK) -lstdc++
-	EOF
-	if use kepler; then
-		echo >> make.inc "GPU_TARGET = Kepler"
-	elif use fermi; then
-		echo >> make.inc "GPU_TARGET = Fermi"
-	else # See http://icl.cs.utk.edu/magma/forum/viewtopic.php?f=2&t=227
-		echo >> make.inc "GPU_TARGET = Tesla"
-	fi
-}
-
-src_compile() {
-	emake lib
-	emake shared
-	mv lib/lib${PN}.so{,.1.4} || die
-	ln -sf lib${PN}.so.1.4 lib/lib${PN}.so.1 || die
-	ln -sf lib${PN}.so.1.4 lib/lib${PN}.so || die
-}
-
-src_test() {
-	emake test lapacktest
-	cd testing/lin || die
-	# we need to access this while running the tests
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-	LD_LIBRARY_PATH="${S}"/lib ${EPYTHON} lapack_testing.py || die
-}
-
-src_install() {
-	dolib.so lib/lib*$(get_libname)*
-	use static-libs && dolib.a lib/lib*.a
-	insinto /usr/include/${PN}
-	doins include/*.h
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-	dodoc README ReleaseNotes
-}
diff --git a/sci-libs/magma/magma-1.4.1.ebuild b/sci-libs/magma/magma-1.4.1.ebuild
deleted file mode 100644
index c50eea5b55ac..000000000000
--- a/sci-libs/magma/magma-1.4.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-FORTRAN_STANDARD="77 90"
-
-inherit cuda eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator python-any-r1
-
-DESCRIPTION="Matrix Algebra on GPU and Multicore Architectures"
-HOMEPAGE="http://icl.cs.utk.edu/magma/"
-SRC_URI="http://icl.cs.utk.edu/projectsfiles/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="fermi kepler static-libs test"
-
-REQUIRED_USE="?? ( fermi kepler )"
-
-RDEPEND="
-	dev-util/nvidia-cuda-toolkit
-	virtual/cblas
-	virtual/lapack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )"
-
-# We have to have write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
-# user is (usually) not in the video group
-RESTRICT="userpriv !test? ( test )"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# distributed pc file not so useful so replace it
-	cat <<-EOF > ${PN}.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include/${PN}
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lmagma
-		Libs.private: -lm -lpthread -ldl -lcublas -lcudart
-		Cflags: -I\${includedir}
-		Requires: cblas lapack
-	EOF
-
-	if [[ $(tc-getCC) =~ gcc ]]; then
-		local eopenmp=-fopenmp
-	elif [[ $(tc-getCC) =~ icc ]]; then
-		local eopenmp=-openmp
-	else
-		elog "Cannot detect compiler type so not setting openmp support"
-	fi
-	append-flags -fPIC ${eopenmp}
-	append-ldflags -Wl,-soname,lib${PN}.so.1.4 ${eopenmp}
-
-	cuda_src_prepare
-}
-
-src_configure() {
-	cat <<-EOF > make.inc
-		ARCH = $(tc-getAR)
-		ARCHFLAGS = cr
-		RANLIB = $(tc-getRANLIB)
-		NVCC = nvcc
-		CC = $(tc-getCXX)
-		FORT = $(tc-getFC)
-		INC = -I"${EPREFIX}/opt/cuda/include" -DADD_ -DCUBLAS_GFORTRAN
-		OPTS = ${CFLAGS} -fPIC
-		FOPTS = ${FFLAGS} -fPIC -x f95-cpp-input
-		F77OPTS = ${FFLAGS} -fPIC
-		NVOPTS = -DADD_ -DUNIX ${NVCCFLAGS}
-		LDOPTS = ${LDFLAGS}
-		LOADER = $(tc-getFC)
-		LIBBLAS = $($(tc-getPKG_CONFIG) --libs cblas)
-		LIBLAPACK = $($(tc-getPKG_CONFIG) --libs lapack)
-		CUDADIR = ${EPREFIX}/opt/cuda
-		LIBCUDA = -L\$(CUDADIR)/$(get_libdir) -lcublas -lcudart
-		LIB = -pthread -lm -ldl \$(LIBCUDA) \$(LIBBLAS) \$(LIBLAPACK) -lstdc++
-	EOF
-	if use kepler; then
-		echo >> make.inc "GPU_TARGET = Kepler"
-	elif use fermi; then
-		echo >> make.inc "GPU_TARGET = Fermi"
-	else # See http://icl.cs.utk.edu/magma/forum/viewtopic.php?f=2&t=227
-		echo >> make.inc "GPU_TARGET = Tesla"
-	fi
-}
-
-src_compile() {
-	emake lib
-	emake shared
-	mv lib/lib${PN}.so{,.1.4} || die
-	ln -sf lib${PN}.so.1.4 lib/lib${PN}.so.1 || die
-	ln -sf lib${PN}.so.1.4 lib/lib${PN}.so || die
-}
-
-src_test() {
-	emake test lapacktest
-	cd testing/lin || die
-	# we need to access this while running the tests
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia0
-	LD_LIBRARY_PATH="${S}"/lib ${EPYTHON} lapack_testing.py || die
-}
-
-src_install() {
-	dolib.so lib/lib*$(get_libname)*
-	use static-libs && dolib.a lib/lib*.a
-	insinto /usr/include/${PN}
-	doins include/*.h
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-	dodoc README ReleaseNotes
-}
diff --git a/sci-libs/magma/metadata.xml b/sci-libs/magma/metadata.xml
deleted file mode 100644
index 63989ce9caba..000000000000
--- a/sci-libs/magma/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  The Matrix Algebra on GPU and Multicore Architectures
-  project aims to develop a dense linear algebra library
-  similar to LAPACK but for heterogeneous/hybrid architectures, starting
-  with current "Multicore+GPU" systems.
-</longdescription>
-  <use>
-    <flag name="fermi">Compile for GPU NVIDIA Fermi family (2.x cards)</flag>
-    <flag name="kepler">Compile for GPU NVIDIA Kepler family (GF 6xx cards)</flag>
-  </use>
-</pkgmetadata>
diff --git a/sci-libs/metis/Manifest b/sci-libs/metis/Manifest
index 442ebc5ed2ad..b5b7cb018d1e 100644
--- a/sci-libs/metis/Manifest
+++ b/sci-libs/metis/Manifest
@@ -7,5 +7,5 @@ DIST metis-4.0.3.tar.gz 522624 BLAKE2B a09d15de35deb0a41bc7f54254effc68d977349e0
 DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
 EBUILD metis-4.0.3-r1.ebuild 843 BLAKE2B d20fe57aeaecc542db25429495efff913b9c33719d08626686bdaddeac1e54d84cd0cabe2ebb2837b283a823bd54e7f0c513e7863a208199afdd918723db422a SHA512 b61f5b756ac0c31e509c825cb52464ea43e71764cb4431c36aed09a180ee36523c5b00e78cedd532459231674d7456947999f97f0d7433cf01bb61ba4c959dc0
 EBUILD metis-4.0.3-r2.ebuild 868 BLAKE2B 6120a07d9c342b296c2e6e6c7df8862982ff732afd6dd96cee3b190b80f18c4077507e1059ff1be3f573cd1b7469aaa2fdc822f2c3fbf2b035796860b463c2af SHA512 987f89de9887e7a5e0aeb29de9f2fcd9d057785becf7e9f7ed31a238ba39aff3f6db6b6699c0428d9d88361c4b4e2655e39e850dd8dd402057873813ec16784c
-EBUILD metis-5.1.0-r4.ebuild 1479 BLAKE2B 40880ea6432947d892720bb1b31f29d38d59d8a41a420f4b443299e663fac7e6ef9658673267008d872bc37d503b5e6782eb4907a173ebb0c2b3afb84b7bae5f SHA512 6df2841404d1d80901319ce9d932b4b44f118ff05bd63cd4759e85f315d959b0182ed58fc4657a2a2d9dbe20bdec8fb33c1bdcdf4816e7d94dd7009f5dcbd636
+EBUILD metis-5.1.0-r4.ebuild 1478 BLAKE2B de2c08a22218ddaca73624764bf9ee1d13598588ecf27e46a59afce16df57b5f5a1836e98d820702c6dc24412ce459dcda8cc65ae72ac73e12176ea988f9d204 SHA512 bd41163f6c7d425125d3a2901eab1a3425d0f476d0268d03d91098d949533a865dbb11729ddb722e47b638ff92416d0cd7bc71219dd44e5804f93660aef08e9a
 MISC metadata.xml 618 BLAKE2B 862f647c5562ab3d781bd3cb6a4ec1470cd45941043bbf1b9d09d41c5ad528546e338663400d322d8b1cb6b57e33910a9520b818a81c376451af0da6c037aa34 SHA512 7f46d28a97805eddd9d547ba66263cd395be46b495f4a9651312cfb421714b614d2c7415142c929c99386d32799fe78ea10110471b702487be4072b981ca17ee
diff --git a/sci-libs/metis/metis-5.1.0-r4.ebuild b/sci-libs/metis/metis-5.1.0-r4.ebuild
index 73cb6ab6964c..1e704d508cc9 100644
--- a/sci-libs/metis/metis-5.1.0-r4.ebuild
+++ b/sci-libs/metis/metis-5.1.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc openmp"
 
 RDEPEND="!sci-libs/parmetis"
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 96cd5d09d210..b9b1f335034a 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -1,4 +1,13 @@
-AUX mkl-10.0.2.018-openmpi.patch 331 BLAKE2B 2472d459c1e3e90f6efaa1bf0941a02f2c71b24712be71fbc6be23dd53743468b8af88df49e49510344aff7b7f334940bfd5574f146eb5c82dc79a2bb0920f34 SHA512 b097815a369e8d743e77fd45ff52ad1cbe5f6d608e4bbe43d9c2cb54301c0d76960b7ce314bdbd5cd06c51e32332c9275360fe811b93df712710e359a4afab60
-DIST l_mkl_p_10.0.5.025.tgz 230389719 BLAKE2B 622dd0076c8e6d747f170685b6a378db95aa2453d15a53c93ef863729bb8dc76409d7bf72f8bab8ef9a07d8efe1e448cb9e7fc8e6f0c0b2cbbf0a0f6944e2a86 SHA512 621c3bfdecb57313e375424e391c0630a29efd70196e3e4bfc5b4ddd03aa45fda4761523652d875f2e60d466a0010c06659306b11f20966fba4943c308fa6f84
-EBUILD mkl-10.0.5.025-r1.ebuild 9829 BLAKE2B ac549f14e7c68b899a05369cc1c52670de2fabe5c07cb9def15f040e57b16eb1471a738c6db1d4133b06b38e59826bd62b494c289afda17e19cb79c923a7486d SHA512 2e09cf66221de13e9331ec0935944a878cb4de36fa36c580abd883ee7aff0d194b705935bb6e1e86b8e9d6ba3f86590e6048bbd1b0127a624e63fca1f944668b
-MISC metadata.xml 882 BLAKE2B 420f779849ebf2b4191156df6328233e0d474fe7ed1ced6505cfa3136b780a4029eb7f7df52a357287376252704d7215c98f2562689061e4fe5d1b420f2fcb22 SHA512 9909f91bb7389c3bcecc25935f7d7fc03c4b91c26990a188e3597be0818d94aec644f7cc9786cf673321c1136738e4738ae775019ab423019450e49725788be8
+AUX mkl-dynamic-ilp64-iomp.pc 306 BLAKE2B 0ea0134934cde3aef3689e4fb4749b3f1c6f90276bd9f64b784af1674b57eb6c3d00fd80b0733e1864e09c89bea6c7bf175d124ba1cb224c22d64ddc4c3457e4 SHA512 26d85c37d9900d3dc594302cdcf3ff13e49654843fac4febcddf0706f3b8bc87d259c1e88fe014ff157de168313cb32d868819ae994cb10e7bb37df0095ea83c
+AUX mkl-dynamic-ilp64-seq.pc 295 BLAKE2B 5b11259d812803cd2f122e4cf5557afbccaedc31cd0d1c88bf51bab540ab6b34ac393bce8308a8c2284a7e94d12ae361c47ce0164a971fda62ba14cda17e386a SHA512 86fa0bbee7aea9505fa549240de434ecb1c8749108eb442514a91c6b2f95eeaf1e1e0aa86ae4f5f97c6bfac5e436abfde2f30e79bbe1346e916d431b85948248
+AUX mkl-dynamic-lp64-iomp.pc 304 BLAKE2B cf0035147e728be3ce478526e3ff90b020835f7fe9be9119f4692500663c789884c191516737b076abd54e964fbe60860f82a5cde9ce883aa41078de64605e31 SHA512 2b372856f4139e36dad46f1c5763adb1a3513782ed90d555e702eb67335f666e1e13505c769a84af07f3ee37c0d0d9d3dbace666ce0a0afa2b05675ab45fe2ae
+AUX mkl-dynamic-lp64-seq.pc 289 BLAKE2B 2e368aa56b94fa54605012bbc2c8f037c9a531f8cc93ed6e74785dddf7ef6cbc9c5399fe6b7fec97d090e16cd516b4db671a93ed65280c5b27cd484533c13628 SHA512 a7da30424e7f41fb885590fe28b94e86ca7ee03287d434f581b08a0b9123a8102d4ecf7f2c2e0b5c9f06fb9b9887d36a6f948495c12f1c88d4d6bc4489c8e398
+AUX mkl-sdl-ilp64.pc 225 BLAKE2B 662a2bef1ac2eef99708c4b8e39800197e3265b376550d3b40aaa15fc2370bdd0bf01eb53a908fb3a506376206164b0058aef4c3e6e4a5f6e4f1c00b1f7f4423 SHA512 cb615257fb7a15e7c0050f28e67a9e586e077ac2e96cf28a68c25ffeb24796ef9f9b3a4693f1ef0d1d10c82a4a863243929d38050022613609fd9a6b62d7fd54
+AUX mkl-sdl-lp64.pc 213 BLAKE2B 266a7a9e0d063520731b2b496ba9a4a31f01c9a806d40b1635248f75a1b1d8a9677ea3170a025b8f17a55521cd64d072ce219865d0a6bf2bfd83b5fc341240a0 SHA512 08cf34eaf1c755b6a390142346025f077d2b9f90996bdf52ce9bab6a712e1c249e2be923dfbf966b34fff71b34333b0cc147ea420d9cdc0138370e7b4c747222
+AUX mkl-static-ilp64-iomp.pc 344 BLAKE2B dea2d1e1aa563367edb1a811d2ea109db3c1b07d4c1ee09e082e3eabd072303cd51d86dbe4bd2912f02e864f04fd0fe721fe60aa0954fe015f70b488c692451f SHA512 27b177e6f49b69bcc044a805d091d66ce50be1e6bdf26953f846f67984242e48ab018343cc8099d593892847de89c61d14cb90341da02565dea38e1ae60fc20f
+AUX mkl-static-ilp64-seq.pc 333 BLAKE2B 4c21e956ae5d6ffd8b6e701458a37a74c74a04fcf4e8742e37468703345d41cf43f85122d40eb8265a693bb816899a725b025334ea124f3f39c960aa9507f57b SHA512 ff795ec9ac7ab5ab12fe0aaf1e84fe35d71b7010523c6a85aea734ff0b3ffb896293aa7f4a994bceaad119043b20b9903d5a0dd45840c2417a11fa63d7f347f3
+AUX mkl-static-lp64-iomp.pc 342 BLAKE2B eddd6bba13426762a47a306469613e2010f5882b5db312f757e94a3f468e95ea7099219cbe78e14d9ddf66b21ff5cb07074ed32f19b21ccd1e78a1f3dbf94ed6 SHA512 2f9550b64adae53a68baa9a6c1faaebb24a2e17cf74f6c50a8c5f149d5da759bf6607261d14e94ac46d8aad2bf32487e41e94f1a5bdda18eefde2c5f23a58294
+AUX mkl-static-lp64-seq.pc 331 BLAKE2B 5c234425fff2462f668fc8dd681a9c3d6d1c4e39f73ec4e5cb984eeeede1f84907ffcba3066b81912b7e8712d2dc154af5703d19d085b0f5a5fa3ab0290f2457 SHA512 b828a7513a491e852c65922159333418be026497d4b0b8b456607463af8b0d71da910e0eb4cd915f5a7eb1d0ff959c87bfc443df352f1f84ce9006530dd0af7f
+DIST mkl-2020.4.304.tar.gz 549319314 BLAKE2B 9ffdb0dc87c9fba1f003961f09cabef7376bd3d10e98085900c863383f0eb1e026f0f804390b2edf4e29d5b0b685af7b74092a7cb5cc871ca656462cec9487e4 SHA512 9c4ff7710484a1c0dd3e6ba7401eb6cb599f771651006b6a570c45b9abf1f43e8e400940d859a656c6892aa81e634c4d74eefe88e8287fdbb19a513f332326b7
+EBUILD mkl-2020.4.304.ebuild 6617 BLAKE2B 29b75f9f3ac32363d1cfe349028e12633f9bb3fdc1d20f13a0269c2dadc0e672349cf9eac99d2980af8e4407b2b254d12d92a18d24c8540b12e7bf0cfd86fc46 SHA512 626cabd6a497e7b53d8f118b1bec44236d5887a6e8a759cd36bfd0b0967fc18249d4a65d95aabfb52b802c73837ac491c9a536b7bb4d474e9b4d754df43f326d
+MISC metadata.xml 716 BLAKE2B 2f80a154c168cfde53f9da85cbde7ae08b991a19958ae1f103c482379a579ccea7d2b1472c3ac8007532d3feddb7d1be1c52378d367b199877492eff66fbd660 SHA512 303b063b9bad6ff610fee4913115828d13cb7ab3f645eabaca9d349310d9a2830fafb99e9cac22f3640f38c85649870d2b6b6b2c793a101352d01f37ae334be3
diff --git a/sci-libs/mkl/files/mkl-10.0.2.018-openmpi.patch b/sci-libs/mkl/files/mkl-10.0.2.018-openmpi.patch
deleted file mode 100644
index 0519b5fdebdb..000000000000
--- a/sci-libs/mkl/files/mkl-10.0.2.018-openmpi.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/interfaces/fftw2x_cdft/makefile	2008-03-11 23:26:26.287984332 +0000
-+++ b/interfaces/fftw2x_cdft/makefile	2008-03-13 10:56:44.755095617 +0000
-@@ -172,6 +172,15 @@
- endif
- 
- 
-+ifeq ($(mpi),openmpi)
-+CS = mpicc
-+ifdef mpidir
-+_CS = $(mpidir)/bin/$(CS)
-+else
-+_CS = $(CS)
-+endif
-+endif
-+
- vpath %.c wrappers
- 
- $(WRP): %.o: %.c
diff --git a/sci-libs/mkl/files/mkl-dynamic-ilp64-iomp.pc b/sci-libs/mkl/files/mkl-dynamic-ilp64-iomp.pc
new file mode 100644
index 000000000000..c68c025daa23
--- /dev/null
+++ b/sci-libs/mkl/files/mkl-dynamic-ilp64-iomp.pc
@@ -0,0 +1,10 @@
+prefix=@PREFIX@
+exec_prefix=${prefix}
+includedir=${prefix}/include/mkl
+
+Name: mkl-dynamic-ilp64-iomp
+Description: Intel(R) Math Kernel Library
+Version: Gentoo
+URL: https://software.intel.com/en-us/mkl
+Libs: -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread -lm -ldl
+Cflags: -I${includedir}
diff --git a/sci-libs/mkl/files/mkl-dynamic-ilp64-seq.pc b/sci-libs/mkl/files/mkl-dynamic-ilp64-seq.pc
new file mode 100644
index 000000000000..0494c50f9da3
--- /dev/null
+++ b/sci-libs/mkl/files/mkl-dynamic-ilp64-seq.pc
@@ -0,0 +1,10 @@
+prefix=@PREFIX@
+exec_prefix=${prefix}
+includedir=${prefix}/include/mkl
+
+Name: mkl-dynamic-ilp64-seq
+Description: Intel(R) Math Kernel Library
+Version: Gentoo
+URL: https://software.intel.com/en-us/mkl
+Libs: -lmkl_intel_ilp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl
+Cflags: -I${includedir}
diff --git a/sci-libs/mkl/files/mkl-dynamic-lp64-iomp.pc b/sci-libs/mkl/files/mkl-dynamic-lp64-iomp.pc
new file mode 100644
index 000000000000..4e8bb50bb9ca
--- /dev/null
+++ b/sci-libs/mkl/files/mkl-dynamic-lp64-iomp.pc
@@ -0,0 +1,10 @@
+prefix=@PREFIX@
+exec_prefix=${prefix}
+includedir=${prefix}/include/mkl
+
+Name: mkl-dynamic-lp64-iomp
+Description: Intel(R) Math Kernel Library
+Version: Gentoo
+URL: https://software.intel.com/en-us/mkl
+Libs: -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread -lm -ldl
+Cflags: -I${includedir}
diff --git a/sci-libs/mkl/files/mkl-dynamic-lp64-seq.pc b/sci-libs/mkl/files/mkl-dynamic-lp64-seq.pc
new file mode 100644
index 000000000000..e0386e29fa33
--- /dev/null
+++ b/sci-libs/mkl/files/mkl-dynamic-lp64-seq.pc
@@ -0,0 +1,10 @@
+prefix=@PREFIX@
+exec_prefix=${prefix}
+includedir=${prefix}/include
+
+Name: mkl-dynamic-lp64-seq
+Description: Intel(R) Math Kernel Library
+Version: Gentoo
+URL: https://software.intel.com/en-us/mkl
+Libs: -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl
+Cflags: -I${includedir}
diff --git a/sci-libs/mkl/files/mkl-sdl-ilp64.pc b/sci-libs/mkl/files/mkl-sdl-ilp64.pc
new file mode 100644
index 000000000000..e1648f7f934a
--- /dev/null
+++ b/sci-libs/mkl/files/mkl-sdl-ilp64.pc
@@ -0,0 +1,9 @@
+prefix=@PREFIX@
+exec_prefix=${prefix}
+includedir=${prefix}/include/mkl
+
+Name: mkl-sdl-ilp64
+Version: Gentoo
+Description: Intel(R) Math Kernel Library
+Libs: -lmkl_rt -lpthread -lm -ldl
+Cflags: -I${includedir} -DMKL_ILP64 -m64
diff --git a/sci-libs/mkl/files/mkl-sdl-lp64.pc b/sci-libs/mkl/files/mkl-sdl-lp64.pc
new file mode 100644
index 000000000000..506851e43fed
--- /dev/null
+++ b/sci-libs/mkl/files/mkl-sdl-lp64.pc
@@ -0,0 +1,9 @@
+prefix=@PREFIX@
+exec_prefix=${prefix}
+includedir=${prefix}/include/mkl
+
+Name: mkl-sdl-ilp64
+Version: Gentoo
+Description: Intel(R) Math Kernel Library
+Libs: -lmkl_rt -lpthread -lm -ldl
+Cflags: -I${includedir} -m64
diff --git a/sci-libs/mkl/files/mkl-static-ilp64-iomp.pc b/sci-libs/mkl/files/mkl-static-ilp64-iomp.pc
new file mode 100644
index 000000000000..911c9d498938
--- /dev/null
+++ b/sci-libs/mkl/files/mkl-static-ilp64-iomp.pc
@@ -0,0 +1,10 @@
+prefix=@PREFIX@
+exec_prefix=${prefix}
+includedir=${prefix}/include
+
+Name: mkl-static-ilp64-iomp
+Description: Intel(R) Math Kernel Library
+Version: Gentoo
+URL: https://software.intel.com/en-us/mkl
+Libs: -Wl,--start-group libmkl_intel_ilp64.a libmkl_intel_thread.a libmkl_core.a -Wl,--end-group -liomp5 -lpthread -lm -ldl
+Cflags: -I${includedir}
diff --git a/sci-libs/mkl/files/mkl-static-ilp64-seq.pc b/sci-libs/mkl/files/mkl-static-ilp64-seq.pc
new file mode 100644
index 000000000000..aff2ff30ff8c
--- /dev/null
+++ b/sci-libs/mkl/files/mkl-static-ilp64-seq.pc
@@ -0,0 +1,10 @@
+prefix=@PREFIX@
+exec_prefix=${prefix}
+includedir=${prefix}/include
+
+Name: mkl-static-ilp64-seq
+Description: Intel(R) Math Kernel Library
+Version: Gentoo
+URL: https://software.intel.com/en-us/mkl
+Libs: -Wl,--start-group libmkl_intel_ilp64.a libmkl_sequential.a libmkl_core.a -Wl,--end-group -lpthread -lm -ldl
+Cflags: -I${includedir}
diff --git a/sci-libs/mkl/files/mkl-static-lp64-iomp.pc b/sci-libs/mkl/files/mkl-static-lp64-iomp.pc
new file mode 100644
index 000000000000..ba799d399f9d
--- /dev/null
+++ b/sci-libs/mkl/files/mkl-static-lp64-iomp.pc
@@ -0,0 +1,10 @@
+prefix=@PREFIX@
+exec_prefix=${prefix}
+includedir=${prefix}/include
+
+Name: mkl-static-lp64-iomp
+Description: Intel(R) Math Kernel Library
+Version: Gentoo
+URL: https://software.intel.com/en-us/mkl
+Libs: -Wl,--start-group libmkl_intel_lp64.a libmkl_intel_thread.a libmkl_core.a -Wl,--end-group -liomp5 -lpthread -lm -ldl
+Cflags: -I${includedir}
diff --git a/sci-libs/mkl/files/mkl-static-lp64-seq.pc b/sci-libs/mkl/files/mkl-static-lp64-seq.pc
new file mode 100644
index 000000000000..1c96e5483d5f
--- /dev/null
+++ b/sci-libs/mkl/files/mkl-static-lp64-seq.pc
@@ -0,0 +1,10 @@
+prefix=@PREFIX@
+exec_prefix=${prefix}
+includedir=${prefix}/include
+
+Name: mkl-static-lp64-seq
+Description: Intel(R) Math Kernel Library
+Version: Gentoo
+URL: https://software.intel.com/en-us/mkl
+Libs: -Wl,--start-group libmkl_intel_lp64.a libmkl_sequential.a libmkl_core.a -Wl,--end-group -lpthread -lm -ldl
+Cflags: -I${includedir}
diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml
index 446435794d0d..59fd7e51f0f7 100644
--- a/sci-libs/mkl/metadata.xml
+++ b/sci-libs/mkl/metadata.xml
@@ -13,8 +13,4 @@
 		capacities. The package is installed as binary and has a restrictive
 		license. Please see license terms and home page for proper use.
 	</longdescription>
-	<use>
-		<flag name="fortran95">Installs the BLAS/LAPACK FORTRAN95 static libraries</flag>
-		<flag name="int64">Installs the 64 bits integer libraries</flag>
-	</use>
 </pkgmetadata>
diff --git a/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild b/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild
deleted file mode 100644
index bd88e59f5c51..000000000000
--- a/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs fortran-2 toolchain-funcs
-
-PID=1232
-PB=${PN}
-P_ARCHIVE=l_${PN}_p_${PV}
-
-DESCRIPTION="Intel(R) Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="https://software.intel.com/en-us/mkl"
-SRC_URI="http://registrationcenter-download.intel.com/irc_nas/${PID}/${P_ARCHIVE}.tgz"
-
-SLOT="0"
-LICENSE="Intel-SDP"
-KEYWORDS="-* ~amd64 ~ia64 ~x86"
-IUSE="doc fftw fortran95 int64 mpi"
-
-RESTRICT="bindist strip mirror"
-
-DEPEND="
-	app-eselect/eselect-blas
-	app-eselect/eselect-cblas
-	app-eselect/eselect-lapack"
-RDEPEND="${DEPEND}
-	doc? ( app-doc/blas-docs app-doc/lapack-docs )
-	mpi? ( virtual/mpi )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.0.2.018-openmpi.patch # allow openmpi to work
-)
-
-MKL_DIR=/opt/intel/${PN}/${PV}
-INTEL_LIC_DIR=/opt/intel/licenses
-
-CHECKREQS_DISK_BUILD=3500M
-
-QA_PREBUILT="opt/intel/${PN}/${PV}/*"
-
-get_fcomp() {
-	case $(tc-getFC) in
-		*gfortran* )
-			FCOMP="gfortran" ;;
-		ifort )
-			FCOMP="ifc" ;;
-		* )
-			FCOMP=$(tc-getFC) ;;
-	esac
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-	fortran-2_pkg_setup
-	# Check the license
-	if [[ -z ${MKL_LICENSE} ]]; then
-		MKL_LICENSE="$(grep -ls MKern ${ROOT}${INTEL_LIC_DIR}/* | tail -n 1)"
-		MKL_LICENSE=${MKL_LICENSE/${ROOT}/}
-	fi
-	if  [[ -z ${MKL_LICENSE} ]]; then
-		eerror "Did not find any valid mkl license."
-		eerror "Register at ${HOMEPAGE} to receive a license"
-		eerror "and place it in ${INTEL_LIC_DIR} or run:"
-		eerror "export MKL_LICENSE=/my/license/file emerge mkl"
-		die "license setup failed"
-	fi
-
-	# Check if we have enough free diskspace to install
-	CHECKREQS_DISK_BUILD="1100M"
-	check-reqs_pkg_setup
-
-	# Check and setup fortran
-	if use fortran95; then
-		# blas95 and lapack95 don't compile with gfortran < 4.2
-		[[ $(tc-getFC) =~ (gfortran|g77) ]] && [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] &&
-		die "blas95 and lapack95 don't compile with gfortran < 4.2"
-	fi
-	MKL_FC="gnu"
-	[[ $(tc-getFC) =~ if ]] && MKL_FC="intel"
-
-	# build profiles according to what compiler is installed
-	MKL_CC="gnu"
-	[[ $(tc-getCC) == icc ]] && MKL_CC="intel"
-
-	if has_version sys-cluster/mpich; then
-		MKL_MPI=mpich
-	elif has_version sys-cluster/mpich2; then
-		MKL_MPI=mpich2
-	elif has_version sys-cluster/openmpi; then
-		MKL_MPI=openmpi
-	else
-		MKL_MPI=intelmpi
-	fi
-	get_fcomp
-}
-
-src_unpack() {
-	default
-	cd "${WORKDIR}/${P_ARCHIVE}"/install || die
-
-	cp ${MKL_LICENSE} "${WORKDIR}"/ || die
-	MKL_LIC="$(basename ${MKL_LICENSE})"
-
-	# binary blob extractor installs rpm leftovers in /opt/intel
-	addwrite /opt/intel
-	# undocumented features: INSTALLMODE_mkl=NONRPM
-
-	# We need to install mkl non-interactively.
-	# If things change between versions, first do it interactively:
-	# tar xf l_*; ./install.sh --duplicate mkl.ini;
-	# The file will be instman/mkl.ini
-	# Then check it and modify the ebuild-created one below
-	# --norpm is required to be able to install 10.x
-	cat > mkl.ini <<-EOF || die
-		[MKL]
-		EULA_ACCEPT_REJECT=ACCEPT
-		FLEXLM_LICENSE_LOCATION=${WORKDIR}/${MKL_LIC}
-		INSTALLMODE_mkl=NONRPM
-		INSTALL_DESTINATION=${S}
-	EOF
-	einfo "Extracting ..."
-	./install \
-		--silent ./mkl.ini \
-		--installpath "${S}" \
-		--log log.txt &> /dev/null \
-		|| die
-
-	if [[ -z $(find "${S}" -name libmkl.so) ]]; then
-		eerror "Could not find extracted files"
-		eerror "See ${PWD}/log.txt to see why"
-		die "extracting failed"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# remove left over
-	rm -f /opt/intel/.*mkl*.log /opt/intel/intel_sdp_products.db || die
-
-	# remove unused stuff and set up intel names
-	rm -rf "${WORKDIR}"/l_* || die
-
-	case ${ARCH} in
-		x86)	MKL_ARCH=32
-				MKL_KERN=ia32
-				rm -rf lib*/{em64t,64} || die
-				;;
-
-		amd64)	MKL_ARCH=em64t
-				MKL_KERN=em64t
-				rm -rf lib*/{32,64} || die
-				;;
-
-		ia64)	MKL_ARCH=64
-				MKL_KERN=ipf
-				rm -rf lib*/{32,em64t} || die
-				;;
-	esac
-	MKL_LIBDIR=${MKL_DIR}/lib/${MKL_ARCH}
-	# fix env scripts
-	sed -i \
-		-e "s:${S}:${MKL_DIR}:g" \
-		tools/environment/*sh || die "sed support file failed"
-}
-
-src_compile() {
-	cd "${S}"/interfaces || die
-	if use fortran95; then
-		einfo "Compiling fortan95 static lib wrappers"
-		local myconf="lib${MKL_ARCH}"
-		[[ $(tc-getFC) =~ gfortran ]] && \
-			myconf="${myconf} FC=gfortran"
-		if use int64; then
-			myconf="${myconf} interface=ilp64"
-			[[ $(tc-getFC) =~ gfortran ]] && \
-				myconf="${myconf} FOPTS=-fdefault-integer-8"
-		fi
-		local x
-		for x in blas95 lapack95; do
-			emake -C ${x} ${myconf}
-		done
-	fi
-
-	if use fftw; then
-		local fftwdirs="fftw2xc fftw2xf fftw3xc fftw3xf"
-		local myconf="lib${MKL_ARCH} compiler=${MKL_CC}"
-		if use mpi; then
-			fftwdirs="${fftwdirs} fftw2x_cdft"
-			myconf="${myconf} mpi=${MKL_MPI}"
-		fi
-		einfo "Compiling fftw static lib wrappers"
-		local x
-		for x in ${fftwdirs}; do
-			emake -C ${x} ${myconf}
-		done
-	fi
-}
-
-src_test() {
-	cd "${S}"/tests
-	local myconf
-	local testdirs="blas cblas"
-	local x
-	use int64 && myconf="${myconf} interface=ilp64"
-	# buggy with g77 and gfortran
-	#if use mpi; then
-	#	testdirs="${testdirs} scalapack"
-	#	myconf="${myconf} mpi=${MKL_MPI}"
-	#fi
-	for x in ${testdirs}; do
-		einfo "Testing ${x}"
-		emake -C ${x} \
-			compiler=${MKL_FC} \
-			${myconf} \
-			so${MKL_ARCH}
-	done
-}
-
-mkl_make_generic_profile() {
-	cd "${S}" || die
-	# produce eselect files
-	# don't make them in FILESDIR, it changes every major version
-	cat  > eselect.blas <<-EOF || die
-		${MKL_LIBDIR}/libmkl_${MKL_KERN}.a /usr/@LIBDIR@/libblas.a
-		${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libblas.so
-		${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libblas.so.0
-	EOF
-	cat  > eselect.cblas <<-EOF || die
-		${MKL_LIBDIR}/libmkl_${MKL_KERN}.a /usr/@LIBDIR@/libcblas.a
-		${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libcblas.so
-		${MKL_LIBDIR}/libmkl.so /usr/@LIBDIR@/libcblas.so.0
-		${MKL_DIR}/include/mkl_cblas.h /usr/include/cblas.h
-	EOF
-	cat > eselect.lapack <<-EOF || die
-		${MKL_LIBDIR}/libmkl_lapack.a /usr/@LIBDIR@/liblapack.a
-		${MKL_LIBDIR}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so
-		${MKL_LIBDIR}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so.0
-	EOF
-}
-
-# usage: mkl_add_profile <profile> <interface_lib> <thread_lib> <rtl_lib>
-mkl_add_profile() {
-	cd "${S}" || die
-	local prof=${1}
-	local x
-	for x in blas cblas lapack; do
-		cat > ${x}-${prof}.pc <<-EOF || die
-			prefix=${MKL_DIR}
-			libdir=${MKL_LIBDIR}
-			includedir=\${prefix}/include
-			Name: ${x}
-			Description: Intel(R) Math Kernel Library implementation of ${x}
-			Version: ${PV}
-			URL: ${HOMEPAGE}
-		EOF
-	done
-	cat >> blas-${prof}.pc <<-EOF || die
-		Libs: -Wl,--no-as-needed -L\${libdir} ${2} ${3} -lmkl_core ${4} -lpthread
-	EOF
-	cat >> cblas-${prof}.pc <<-EOF || die
-		Requires: blas
-		Libs: -Wl,--no-as-needed -L\${libdir} ${2} ${3} -lmkl_core ${4} -lpthread
-		Cflags: -I\${includedir}
-	EOF
-	cat >> lapack-${prof}.pc <<-EOF || die
-		Requires: blas
-		Libs: -Wl,--no-as-needed -L\${libdir} ${2} ${3} -lmkl_core -lmkl_lapack ${4} -lpthread
-	EOF
-	insinto ${MKL_LIBDIR}
-	for x in blas cblas lapack; do
-		doins ${x}-${prof}.pc
-		cp eselect.${x} eselect.${x}.${prof} || die
-		echo "${MKL_LIBDIR}/${x}-${prof}.pc /usr/@LIBDIR@/pkgconfig/${x}.pc" \
-			>> eselect.${x}.${prof} || die
-		eselect ${x} add $(get_libdir) eselect.${x}.${prof} ${prof}
-	done
-}
-
-mkl_make_profiles() {
-	local clib="gf"
-	has_version 'dev-lang/ifc' && clib+=" intel"
-	local slib="-lmkl_sequential"
-	local rlib="-liomp5"
-	local pbase=${PN}
-	local c
-	for c in ${clib}; do
-		local ilib="-lmkl_${c}_lp64"
-		use x86 && ilib="-lmkl_${c}"
-		local tlib="-lmkl_${c/gf/gnu}_thread"
-		local comp="${c/gf/gfortran}"
-		comp="${comp/intel/ifort}"
-		mkl_add_profile ${pbase}-${comp} ${ilib} ${slib}
-		mkl_add_profile ${pbase}-${comp}-threads ${ilib} ${tlib} ${rlib}
-		if use int64; then
-			ilib="-lmkl_${c}_ilp64"
-			mkl_add_profile ${pbase}-${comp}-int64 ${ilib} ${slib}
-			mkl_add_profile ${pbase}-${comp}-threads-int64 ${ilib} ${tlib} ${rlib}
-		fi
-	done
-}
-
-src_install() {
-	dodir ${MKL_DIR}
-
-	# install license
-	if  [[ ! -f ${INTEL_LIC_DIR}/${MKL_LIC} ]]; then
-		insinto ${INTEL_LIC_DIR}
-		doins "${WORKDIR}"/${MKL_LIC}
-	fi
-
-	# install main stuff: cp faster than doins
-	einfo "Installing files..."
-	local cpdirs="benchmarks doc examples include interfaces lib man tests"
-	local doinsdirs="tools"
-	cp -pPR ${cpdirs} "${D}"${MKL_DIR} \
-		|| die "installing mkl failed"
-	insinto ${MKL_DIR}
-	doins -r ${doinsdirs}
-	dosym mkl_cblas.h ${MKL_DIR}/include/cblas.h
-
-	# install blas/lapack profiles
-	mkl_make_generic_profile
-	mkl_make_profiles
-
-	# install env variables
-	cat > 35mkl <<-EOF || die
-		MKLROOT=${MKL_DIR}
-		LDPATH=${MKL_LIBDIR}
-		MANPATH=${MKL_DIR}/man
-	EOF
-	doenvd 35mkl
-}
-
-pkg_postinst() {
-	# if blas profile is mkl, set lapack and cblas profiles as mkl
-	local blas_prof=$(eselect blas show | cut -d' ' -f2)
-	local def_prof="mkl-gfortran-threads"
-	local x
-	has_version 'dev-lang/ifc' && def_prof="mkl-ifort-threads"
-	use int64 && def_prof="${def_prof}-int64"
-	for x in blas cblas lapack; do
-		local cur_prof=$(eselect ${x} show | cut -d' ' -f2)
-		if [[ -z ${cur_prof} ||	${cur_prof} == ${def_prof} ]]; then
-			# work around eselect bug #189942
-			local configfile="${ROOT}"/etc/env.d/${x}/$(get_libdir)/config
-			rm -f ${configfile} || die
-			eselect ${x} set ${def_prof}
-			elog "${x} has been eselected to ${def_prof}"
-		else
-			elog "Current eselected ${x} is ${current_lib}"
-			elog "To use one of mkl profiles, issue (as root):"
-			elog "\t eselect ${x} set <profile>"
-		fi
-		if [[ ${blas_prof} == mkl* && ${cur_prof} != ${blas_prof} ]]; then
-			eselect blas set ${def_prof}
-			elog "${x} is now set to ${def_prof} for consistency"
-		fi
-	done
-	if [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]]; then
-		elog "Multi-threading OpenMP for GNU compilers only available"
-		elog "with gcc >= 4.2. Make sure you have a compatible version"
-		elog "and select it with gcc-config before selecting gnu profiles"
-	fi
-}
diff --git a/sci-libs/mkl/mkl-2020.4.304.ebuild b/sci-libs/mkl/mkl-2020.4.304.ebuild
new file mode 100644
index 000000000000..e90f9cb25172
--- /dev/null
+++ b/sci-libs/mkl/mkl-2020.4.304.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit multilib-build rpm
+
+MAGIC=16917            # from registration center
+MY_P=${P/-/_}          # mkl_2020.4.304
+MY_PV=$(ver_rs 2 '-')  # 2020.4-304
+
+DESCRIPTION="Intel Math Kernel Library"
+HOMEPAGE="https://software.intel.com/en-us/intel-mkl"
+SRC_URI="http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/${MAGIC}/l_${MY_P}.tgz -> ${P}.tar.gz"
+S="${WORKDIR}"/l_${MY_P}
+
+LICENSE="ISSL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+RESTRICT="strip"
+
+# MKL uses Intel/LLVM OpenMP by default.
+# One can change the threadding layer to "gnu" or "tbb"
+# through the MKL_THREADING_LAYER env var.
+RDEPEND="
+	app-eselect/eselect-blas
+	app-eselect/eselect-lapack
+	sys-libs/libomp[${MULTILIB_USEDEP}]
+"
+
+QA_PREBUILT="*"
+QA_TEXTRELS="*"
+QA_SONAME="*"
+QA_MULTILIB_PATHS="/usr/lib.*/libmkl_tbb_thread.so"
+
+# first unpack all rpms
+# find folders containing header like, static and dynamic lib files
+# these are the only folders we care about
+# find "${S}"/rpm -type f \( -name "*.a" -o -name "*.so" -o -wholename "*mkl/include*" \) \
+#	| tr '/' ' ' | awk '{ print $2 }' | sort | uniq
+
+# ignore all conda-* rpms
+# ignore all empty rpms
+# information about rest:
+#
+# mkl-core-ps-32bit-2020.3-279-2020.3-279.x86_64.rpm | some prebuilt benchmark executables
+# psxe-common-2020.3-111-2020.3-111.noarch.rpm
+# comp-l-all-vars-19.1.2-279-19.1.2-279.noarch.rpm
+# comp-nomcu-vars-19.1.2-279-19.1.2-279.noarch.rpm
+# mkl-cluster-c-2020.3-279-2020.3-279.noarch.rpm
+# mkl-cluster-f-2020.3-279-2020.3-279.noarch.rpm
+# mkl-doc-2020-2020.3-279.noarch.rpm
+# mkl-common-ps-2020.3-279-2020.3-279.noarch.rpm | only contains benchmarks
+# compxe-pset-2020.3-111-2020.3-111.noarch.rpm | only contains benchmarks
+# mkl-doc-ps-2020-2020.3-279.noarch.rpm
+# mkl-common-2020.3-279-2020.3-279.noarch.rpm | setting up environment vars (might be needed for parallel studio)
+# mkl-installer-license-2020.3-279-2020.3-279.noarch.rpm | already have license
+# mkl-psxe-2020.3-111-2020.3-111.noarch.rpm | useless files
+# mkl-common-c-ps-2020.3-279-2020.3-279.noarch.rpm | contained in common-c
+
+INTEL_DIST_X86_RPMS=(
+	mkl-core-32bit
+	mkl-core-rt-32bit
+	mkl-f95-32bit
+	mkl-gnu-32bit
+	mkl-gnu-f-32bit
+	mkl-gnu-f-rt-32bit
+	mkl-gnu-rt-32bit
+	mkl-tbb-32bit
+	mkl-tbb-rt
+	intel-openmp-32bit-19.1.3-304-19.1.3-304.x86_64.rpm
+)
+INTEL_DIST_AMD64_RPMS=(
+	mkl-cluster
+	mkl-cluster-rt
+	mkl-core
+	mkl-core-ps
+	mkl-core-rt
+	mkl-f95
+	mkl-gnu
+	mkl-gnu-f
+	mkl-gnu-rt
+	mkl-gnu-f-rt
+	mkl-pgi
+	mkl-pgi-rt
+	mkl-tbb
+	mkl-tbb-rt
+	intel-openmp-19.1.3-304-19.1.3-304.x86_64.rpm
+)
+INTEL_DIST_DAT_RPMS=(
+	mkl-common-c
+	mkl-common-f
+	mkl-f95-common
+)
+
+rpm_dirname() {
+	local rpm="${1}" suffix="x86_64"
+	if [[ $# -eq 2 ]]; then
+		suffix="$2"
+	fi
+	if [[ ! ${rpm} =~ "rpm" ]] ; then
+		rpm="intel-${rpm}-${MY_PV}-${MY_PV}.${suffix}"
+	fi
+	printf '%s\n' "${rpm%%.rpm}"
+}
+
+rpm_unpack() {
+	local rpm="$1" suffix="x86_64"
+	if [[ $# -eq 2 ]]; then
+		suffix="$2"
+	fi
+	rpm="$(rpm_dirname $rpm $suffix)"
+	elog "Unpacking - ${rpm}.rpm"
+	rpmunpack "${rpm}.rpm" || die
+}
+
+src_unpack() {
+	default
+	cd "${S}"/rpm
+	local rpm
+	for rpm in ${INTEL_DIST_DAT_RPMS[@]}; do
+		rpm_unpack ${rpm} noarch
+	done
+	if use abi_x86_64 ; then
+		for rpm in ${INTEL_DIST_AMD64_RPMS[@]}; do
+			rpm_unpack ${rpm}
+		done
+	fi
+	if use abi_x86_32 ; then
+		for rpm in ${INTEL_DIST_X86_RPMS[@]}; do
+			rpm_unpack ${rpm}
+		done
+	fi
+}
+
+multilib_src_install() {
+	cd "${S}"/rpm
+	elog "current variant - ${MULTIBUILD_VARIANT}"
+	local rpm rpm_list libdir=$(get_libdir)
+	if [[ ${MULTIBUILD_VARIANT} =~ 'amd64' ]] ; then
+		rpm_list="${INTEL_DIST_AMD64_RPMS[@]}"
+	else
+		rpm_list="${INTEL_DIST_X86_RPMS[@]}"
+	fi
+	for rpm in ${rpm_list} ; do
+		rpm=$(rpm_dirname ${rpm})
+		elog "installing libs from - ${rpm}"
+		local libso liba
+		for libso in $(find "${S}"/rpm/${rpm} -name "*.so") ; do
+			dolib.so "${libso}"
+		done
+		use static-libs && \
+		for liba in $(find "${S}"/rpm/${rpm} -name "*.a") ; do
+			dolib.a "${liba}"
+		done
+	done
+
+	dodir /usr/$(get_libdir)/blas/mkl
+	dosym ../../libmkl_rt.so usr/$(get_libdir)/blas/mkl/libblas.so
+	dosym ../../libmkl_rt.so usr/$(get_libdir)/blas/mkl/libblas.so.3
+	dosym ../../libmkl_rt.so usr/$(get_libdir)/blas/mkl/libcblas.so
+	dosym ../../libmkl_rt.so usr/$(get_libdir)/blas/mkl/libcblas.so.3
+	dodir /usr/$(get_libdir)/lapack/mkl
+	dosym ../../libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapack.so
+	dosym ../../libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapack.so.3
+	dosym ../../libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapacke.so
+	dosym ../../libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapacke.so.3
+
+	# for some reason pkgconfig files are only for amd64
+	[[ ${MULTIBUILD_VARIANT} =~ 'amd64' ]] || return
+	local pc_files=( "${FILESDIR}"/*.pc )
+	insinto /usr/$(get_libdir)/pkgconfig
+	for pc in "${pc_files[@]}" ; do
+		doins "${pc}"
+		sed -e "s:@PREFIX@:${EPREFIX}/usr:" \
+		    -i "${ED}"/usr/$(get_libdir)/pkgconfig/${pc##*/} || die
+	done
+}
+
+src_install() {
+	# install bunch of header like files
+	dodir /usr/include/mkl
+	for idir in $(find "${S}"/rpm -type d -wholename "*mkl/include"); do
+		cp -a "${idir}"/. "${ED}"/usr/include/mkl || die
+	done
+
+	multilib_foreach_abi multilib_src_install
+}
+
+library-provider_pkg_postinst() {
+	local libdir=$(get_libdir) me="mkl"
+
+	# 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_blas}]."
+	else
+		elog "Current eselect: LAPACK ($libdir) -> [${current_blas}]."
+		elog "To use lapack [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect lapack set ${libdir} ${me}"
+	fi
+}
+
+pkg_postinst() {
+	multilib_foreach_abi library-provider_pkg_postinst
+}
+
+library-provider_pkg_postrm() {
+	eselect blas validate
+	eselect lapack validate
+}
+
+pkg_postrm() {
+	multilib_foreach_abi library-provider_pkg_postrm
+}
diff --git a/sci-libs/mpfi/Manifest b/sci-libs/mpfi/Manifest
index 7e83527dfe12..e4127d198a5f 100644
--- a/sci-libs/mpfi/Manifest
+++ b/sci-libs/mpfi/Manifest
@@ -1,3 +1,5 @@
 DIST mpfi-1.5.3.tar.bz2 447256 BLAKE2B 67bb9af362ec96c015571cbdaba09befc2241e0113b6177dd76eec97b619bbf9c924ba4d16583df664cafdb1a78c8700712e30633e91e5ae6f1d5e084c3ede5c SHA512 9c3cdf665fccff8b383c96827f4acb7aa62efdf7854cff271455273f00f8e7ecf84fbe191b02e5f51fe067aaae564fd2a0add062070ff5c1f542d61a021f967d
+DIST mpfi-1.5.4.tgz 261696 BLAKE2B 264453870fbf18afc0876eef72a3fc9690e9eee1da5179831a24409159abe75b88dc373e2d20b8171c846e870ded876715b2c9034ab4f0d0f0ff10e34abd099d SHA512 72ba7d8c950f4d4e2c7a3da8570cdcec08f75b73580cdf64c4cc3b24f8add23c46ccf78a6de2158e81bd77e6efabceebbae418988d536e7484356b8102e10ce1
 EBUILD mpfi-1.5.3.ebuild 647 BLAKE2B 9788b4f8d72e957544908117e0e8409530dd6c772ba4e8c1b730afe165e2cd88c945c3c709368372c4f7046d188c6419e0a360a437de9512bfea5d0be04012d2 SHA512 4e4a192a512b263522eca48b5fab60414bc5bfa6286c29d62cbe64f21560e57c7ba8aebec3d0686fe32e38e27c9bf0cb2485a878475daf2df2ccecffd5052efe
+EBUILD mpfi-1.5.4.ebuild 645 BLAKE2B e7873908407165f12cdfac8108e4282d2f638a6b18df72c09e893fe947aa44153faae4d21f277990f56e52fab0f6a00656316d0948fa72240a87c23e6b2577e9 SHA512 6cc97b8965d2f8d4dd2f71e9c5553f11331491d89c51a0cec661d74ec25c488fb28e5c004fce30a5f819b43a1fe7f7dc20b4507d945cf8cc0d6783763f7b38d3
 MISC metadata.xml 1029 BLAKE2B 51b40066219be20a21939a82e93c095573e3cadaf288430db3c0a46c83a6045dccb3b940505b6ee189d426a0e1e57b9135df202a6185848546a9f5a1e8316d7b SHA512 870810149f2a547a0db4df6c7997fadfeaee91d0a8a1d456fafba76c7c48e0e59e8a0415a10b46b89bf4930e1880b94d3b6d3f28443dda2bb7ea45a62fa3c8b4
diff --git a/sci-libs/mpfi/mpfi-1.5.4.ebuild b/sci-libs/mpfi/mpfi-1.5.4.ebuild
new file mode 100644
index 000000000000..7c513767c675
--- /dev/null
+++ b/sci-libs/mpfi/mpfi-1.5.4.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="Multiple precision interval arithmetic library based on MPFR"
+HOMEPAGE="http://perso.ens-lyon.fr/nathalie.revol/software.html"
+SRC_URI="https://gforge.inria.fr/frs/download.php/file/38111/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/mpfr:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 69a615fb3c80..fa959779eeae 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,8 +1,11 @@
 AUX dont-clobber-fflags.patch 1251 BLAKE2B 7451d67e8676be33c2070b9eea767d24d961eff708eec3f6544b68228963166138f844f51dde8d48f723412ce0fcb6d0da427d298c652156da56d34073a1c82c SHA512 d06cd469749c88c69e2bdab01b5c0c67105a756a6d4c3704842335261ad57f6e898ceb73943487396178ae99ccf2ee3e551ae5881996af54e36fb951c6be43dc
 AUX openblas-0.3.10-dont-clobber-fflags.patch 1209 BLAKE2B 8759226f8a2b9371a89434f14e5db6e10b079dec5b260b438811f476ceeded67bcf2a596c7f4892ec2b3388a3437c9cd276592bb01ebb84af69977002e0bbe88 SHA512 6b239e750a6c5baf6dfca58dc8036a1de34efd917839558d2b2ff1d6fab00067dfe953bfb0837d8f19e1f52cf5ab7f92f9e3f65f3963fd3ae9052c0a00d6065d
+AUX openblas-0.3.12-shared-blas-lapack.patch 2008 BLAKE2B 2d3a4a90d8144cbf149b7711b67364176a94287f26448930b5a4fd29fe761fb250e9007c580fb1ffa8148c477e2f4057f9cd8d7aa07efeb85caa842802d358fd SHA512 3f0d4b480549565c838eba6371e0990c162f56a226f9d26e1639e012ae3f39809f8c6badcf8fdfbb1258f45367dbaff9c4c611b8b44bac27d341aea954f0133e
 AUX shared-blas-lapack.patch 5557 BLAKE2B 1e41b18e5a9c12eec9283c835e9b09e4ca89c6512f47a2f158f29c8a8a822d0365ad350177e379bec13f7c7574d8debd55a2f612027ff661c67ac7b226bb2370 SHA512 baa23f0c2bc8b7bc3384d7b8fa20eb5e095f20e1d8859badb55e680ccd435a851da6099b20aa203e46d62096ac93663ea130bea04dabf19432522e53139d393b
 DIST openblas-0.3.10.tar.gz 12246979 BLAKE2B 507aa3f058b841f477720cff98480afda5c3e236b688fb1a12ff45ce20c42c6e84c786d62a5db7e6de6d133d40286e58777fcb51d6542b7030629d55ba12086f SHA512 64a5f983b2f6e02cdb6e0f14433498cc5daa1ccfb49246f7a2dcd38f9982fa608f2abea069fe0e35012af8c1441c43d1f6418eaccd40795f5002fed1c36ce05d
+DIST openblas-0.3.12.tar.gz 12325103 BLAKE2B 3d6706e59e83f87dd58b287753bf697de99e83c8a4484453f120d8f8c9c69ea5b481a143db04342a1dcb1779ce548a49618cf4941d08d636e12ed481305e8fb5 SHA512 1ff5a065c41f7e460857f8428fc77900b189f051fa8129eea9ae93237f234d387cc1c6e627c2c95636164f512d4d721d4229729f04a04e8d5f655abbf5463d98
 DIST openblas-0.3.9.tar.gz 12189745 BLAKE2B 3cc4c6a403d6a52845cf4ff8cef254f57587e17e3d09bfb6ed7c02ad06a6002e50b340177c73a944c2a621c12b7f494c516025751c194d019662c0b4db17f4dc SHA512 c6b8ee465f1cf53b37f21ec3ff9a28d5cafe20fec59d8c1bff5923a9e1989dfa5ae8c032a5d43988fe7722ed08c64c7957a3d30e6ae917e2e7aa2977a91e67a3
-EBUILD openblas-0.3.10.ebuild 4100 BLAKE2B 4c5ea233e1d6efa39f0095aa346ca4ca4fcfd7456a862bf299ad2e161e3e5a5946ba20e5495168e9452cea26031418ea78b17bf82a09cad6b7aedda775fe4722 SHA512 d6a6096a691890f9e96c53d6dc41bbca5d4e33ff4fb988cb8dfb2b2fa18bdee38f2b4d777ca9c745ff99fc81660536df0b334eae667ac9fd92fda4c1ac47ec08
+EBUILD openblas-0.3.10.ebuild 4111 BLAKE2B 872a4bcffb2d76a03189131b7e742ba7d72f1b9d93d19ca9e00c0f688568c2e7a3ab00b598f3d3066b85d161a44cdc83562710200d61dc2b5ce5c095b3462fa8 SHA512 958088ad8866d3218b4d6be4820a1b6bcc512b6960abc21a654bc78b561b65e235a66281a1867d8ec217a4b96cfd178c894b0ef263a9f317241949368d4526f1
+EBUILD openblas-0.3.12-r1.ebuild 5746 BLAKE2B d68962c2c993f87836564febcc37311b93f4c17e49e9b9050923e9170f984d7cb8b74616f9bf1f5bd0e7fab3a06e6b053c9ac2f7c8988095715f9216437e845c SHA512 608cd1c978f76285de494bec53eea2647f0e7910a5fa7e70a59687cf27985da49b2548adfff51fd9a8323ee243a1f768acf4c38cee6fdcdd56b892951619785d
 EBUILD openblas-0.3.9-r1.ebuild 4075 BLAKE2B fe030c9249e08b2695cdacc10042ba128a184e2f21193d21a602bff4ec6d307fadae33937b721cb7aec7151e31e4427df95e08f639698492cd4154a43e04261d SHA512 dd96938cb36e36989e600955d4171241f66d2eb8725ba3e193cc08c7222fc6f0fea977358679eb6890d8dac6699aff1a601160ef425defd991c86381b35efd2c
-MISC metadata.xml 1460 BLAKE2B 22d1770bd4a58a0be80b7b1b04a7a6909d6bc7ff166a242c46294a1d39f5adf928c9e6f00835b79ef1c2df1747efa3b04d9b380a964581eeb963ea17e453ec9b SHA512 da3e981cab096d3bc18077ac210ccb1b91350418969549467c22f286196b18fb080eeb8a6183247b47de65cbd0a7fb67a16f2e46911aac6c5e9e9f01c193764f
+MISC metadata.xml 1546 BLAKE2B 3e6379f0e8624978c09272d6440f8234379ebc886e1f72d05f89ffd9914da46cd66d94f5d408f11bb585ac28bde6d222b89e2b9608de550d94fdcbae25e2d910 SHA512 a4680cd8f28c4028acfb9621281ee0a08916f62c99cec883e953390ac9d55d47fa3c667c4fabb54121f7010f67d1e180c1c1faa5eceffe6a89d379ef4419cca7
diff --git a/sci-libs/openblas/files/openblas-0.3.12-shared-blas-lapack.patch b/sci-libs/openblas/files/openblas-0.3.12-shared-blas-lapack.patch
new file mode 100644
index 000000000000..55fb7d7c66ca
--- /dev/null
+++ b/sci-libs/openblas/files/openblas-0.3.12-shared-blas-lapack.patch
@@ -0,0 +1,36 @@
+diff --git a/interface/Makefile b/interface/Makefile
+index 6b247b4..1297c73 100644
+--- a/interface/Makefile
++++ b/interface/Makefile
+@@ -330,7 +330,7 @@ CCBLAS3OBJS   = \
+ 	cblas_chemm.$(SUFFIX) cblas_cherk.$(SUFFIX) cblas_cher2k.$(SUFFIX) \
+ 	cblas_comatcopy.$(SUFFIX) cblas_cimatcopy.$(SUFFIX)\
+ 	cblas_cgeadd.$(SUFFIX)
+-	
++
+ CXERBLAOBJ = \
+ 	cblas_xerbla.$(SUFFIX)
+ 
+@@ -2310,3 +2310,22 @@ cblas_zgeadd.$(SUFFIX) cblas_zgeadd.$(PSUFFIX) : zgeadd.c
+ cblas_xerbla.$(SUFFIX) cblas_xerbla.$(PSUFFIX) : xerbla.c
+ 	$(CC) -c $(CFLAGS) -DCBLAS $< -o $(@F)
+ 
++#####
++shared-blas-lapack: libblas.so.3 libcblas.so.3 liblapack.so.3 liblapacke.so.3
++
++# The list of prerequisite is created by comparing with NETLIB BLAS public API.
++libblas.so.3: $(SBLAS1OBJS) $(SBLAS2OBJS) $(SBLAS3OBJS) $(DBLAS1OBJS) $(DBLAS2OBJS) $(DBLAS3OBJS) $(CBLAS1OBJS) $(CBLAS2OBJS) $(CBLAS3OBJS) $(ZBLAS1OBJS) $(ZBLAS2OBJS) $(ZBLAS3OBJS) ../kernel/lsame.o ../kernel/scabs1.o ../kernel/dcabs1.o ../driver/others/xerbla.o
++	$(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,libblas.so.3 -L.. -lopenblas $(EXTRALIB)
++
++libcblas.so.3: $(CSBLAS1OBJS) $(CSBLAS2OBJS) $(CSBLAS3OBJS) $(CDBLAS1OBJS) $(CDBLAS2OBJS) $(CDBLAS3OBJS) $(CCBLAS1OBJS) $(CCBLAS2OBJS) $(CCBLAS3OBJS) $(CZBLAS1OBJS) $(CZBLAS2OBJS) $(CZBLAS3OBJS) ../kernel/lsame.o ../kernel/scabs1.o ../kernel/dcabs1.o ../driver/others/xerbla.o
++	$(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,libcblas.so.3 -L.. -lopenblas $(EXTRALIB)
++
++# The prerequisites must match the symbols deleted in target delete-duplicate-lapack-objects
++liblapack.so.3: $(SLAPACKOBJS) $(DLAPACKOBJS) $(CLAPACKOBJS) $(ZLAPACKOBJS) ../kernel/lsame.o ../driver/others/xerbla.o
++	$(CC) $(LDFLAGS) -shared -o $@ $^ ../lapack-netlib/SRC/*.o -Wl,-soname,liblapack.so.3 -L.. -lopenblas $(EXTRALIB)
++
++liblapacke.so.3: liblapack.so.3
++	$(CC) $(LDFLAGS) -shared -o $@ `find ../lapack-netlib/LAPACKE -name "*.o"` -Wl,-soname,liblapacke.so.3 -L.. -lopenblas $(EXTRALIB)
++
++clean::
++	rm -f libblas.so.3 libcblas.so.3 liblapack.so.3
diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 0661dad2eee9..0f6a98c1f26e 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -33,6 +33,9 @@
     <flag name="pthread">
       Build with pthread threading model
     </flag>
+    <flag name="relapack">
+      Build the ReLAPACK extension to OpenBLAS
+    </flag>
   </use>
   <upstream>
     <remote-id type="github">xianyi/OpenBLAS</remote-id>
diff --git a/sci-libs/openblas/openblas-0.3.10.ebuild b/sci-libs/openblas/openblas-0.3.10.ebuild
index 9d96c6fa9fd0..fad54321378c 100644
--- a/sci-libs/openblas/openblas-0.3.10.ebuild
+++ b/sci-libs/openblas/openblas-0.3.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="dynamic eselect-ldso index-64bit openmp pthread test"
 REQUIRED_USE="?? ( openmp pthread )"
 RESTRICT="!test? ( test )"
@@ -84,7 +84,7 @@ src_test() {
 }
 
 src_install() {
-	emake install DESTDIR="${ED}" OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
+	emake install DESTDIR="${D}" OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
 		OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir)
 	dodoc GotoBLAS_*.txt *.md Changelog.txt
 
diff --git a/sci-libs/openblas/openblas-0.3.12-r1.ebuild b/sci-libs/openblas/openblas-0.3.12-r1.ebuild
new file mode 100644
index 000000000000..ef165228c141
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.3.12-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic fortran-2 toolchain-funcs
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/OpenBLAS-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="dynamic eselect-ldso index-64bit openmp pthread +relapack test"
+REQUIRED_USE="?? ( openmp pthread )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	eselect-ldso? (
+		>=app-eselect/eselect-blas-0.2
+		>=app-eselect/eselect-lapack-0.2
+	)
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.12-shared-blas-lapack.patch"
+	"${FILESDIR}/${PN}-0.3.10-dont-clobber-fflags.patch"
+)
+
+pkg_pretend() {
+	elog "This software has a massive number of options that"
+	elog "are configurable and it is *impossible* for all of"
+	elog "those to fit inside any manageable ebuild."
+	elog "The Gentoo provided package has enough to build"
+	elog "a fully optimized library for your targeted CPU."
+	elog "You can set the CPU target using the environment"
+	elog "variable - OPENBLAS_TARGET or it will be detected"
+	elog "automatically from the target toolchain (supports"
+	elog "cross compilation toolchains)."
+	elog "You can control the maximum number of threads"
+	elog "using OPENBLAS_NTHREAD, default=64 and number of "
+	elog "parallel calls to allow before further calls wait"
+	elog "using OPENBLAS_NPARALLEL, default=8."
+}
+
+pkg_setup() {
+	fortran-2_pkg_setup
+
+	# List of most configurable options - Makefile.rule
+
+	# https://github.com/xianyi/OpenBLAS/pull/2663
+	tc-export CC FC LD AR AS RANLIB
+
+	# HOSTCC is used for scripting
+	export HOSTCC=$(tc-getBUILD_CC)
+
+	# threading options
+	use openmp && tc-check-openmp
+	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
+
+	# We need to filter these while building the library, and not just
+	# while building the test suite. Will hopefully get fixed upstream:
+	# https://github.com/xianyi/OpenBLAS/issues/2657
+	use test && filter-flags "-fbounds-check" "-fcheck=bounds" "-fcheck=all"
+
+	# disable submake with -j and default optimization flags
+	# in Makefile.system
+	# Makefile.rule says to not modify COMMON_OPT/FCOMMON_OPT...
+	export MAKE_NB_JOBS=-1 \
+	       COMMON_OPT=" " \
+	       FCOMMON_OPT=" "
+
+	# Target CPU ARCH options
+	# generally detected automatically from cross toolchain
+	use dynamic && \
+		export DYNAMIC_ARCH=1 \
+		       NO_AFFINITY=1 \
+		       TARGET=GENERIC
+
+	export NUM_PARALLEL=${OPENBLAS_NPARALLEL:-8} \
+	       NUM_THREADS=${OPENBLAS_NTHREAD:-64}
+
+	# setting OPENBLAS_TARGET to override auto detection
+	# in case the toolchain is not enough to detect
+	# https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt
+	if ! use dynamic && [[ ! -z "${OPENBLAS_TARGET}" ]] ; then
+		export TARGET="${OPENBLAS_TARGET}"
+	fi
+
+	export NO_STATIC=1
+
+	BUILD_RELAPACK=1
+	if ! use relapack; then
+		BUILD_RELAPACK=0
+	fi
+
+	export PREFIX="${EPREFIX}/usr" BUILD_RELAPACK
+}
+
+src_prepare() {
+	default
+
+	# Disable tests by default
+	sed -e "/^all ::/s/tests //" -i Makefile || die
+
+	# if 64bit-index is needed, create second library
+	# with LIBPREFIX=libopenblas64
+	if use index-64bit; then
+		cp -aL "${S}" "${S}-index-64bit" || die
+	fi
+}
+
+src_compile() {
+	default
+	cd interface || die
+	emake 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 index-64bit; then
+		dolib.so "${S}-index-64bit"/libopenblas64*.so*
+	fi
+
+	if use eselect-ldso; then
+		insinto /usr/$(get_libdir)/blas/openblas/
+		doins interface/libblas.so.3
+		dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so
+		doins interface/libcblas.so.3
+		dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so
+
+		insinto /usr/$(get_libdir)/lapack/openblas/
+		doins interface/liblapack.so.3
+		dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
+		doins interface/liblapacke.so.3
+		dosym liblapacke.so.3 usr/$(get_libdir)/lapack/openblas/liblapacke.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 55f332f70562..ce51f04edf85 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -2,5 +2,5 @@ AUX opencascade-7.4.0-find-qt.patch 3349 BLAKE2B 6520b3242927c86c4958f81f8a94e89
 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.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b556a726f0534131706b3a11cb0986ba32818e162df3982283f6815eb9d67d7e91f909485d78f2b8d638da1934ffbc2f7f SHA512 eb0d47848d48f42a159ae5d7a4144483ba1f59f634844bd2053e48e04af30a30ba7056112cd38a1730d193a8d736b898f9608dd574cbe6829dbe7257a002772a
-EBUILD opencascade-7.4.0-r2.ebuild 3778 BLAKE2B a672398e2cfcfdf64d597d0ff8f6c5cc737cf92baa49dc2d8bfe91f69291244c1ad116ba2cf09121676d6f37a8ae202acad7a87181425435a004635792882c27 SHA512 506d962f3393526f73f19631c9c5416968a84e717da5d949e906b42b200b91acbe3c18a810adcf94ed335c41733243a92ea5e4dcfd8010c6a7608ede7b172e68
+EBUILD opencascade-7.4.0-r3.ebuild 3874 BLAKE2B 08c690ed3ebef44cb620757cf3357d05a322696424d6038198ed9792d8fc647f7285d4a45e70981165a1f81961c02cd9c5fee6f0a17bfb6b88eea5ea4c4bdfe0 SHA512 d8e3d70a0b1affe0e2947470e1325d94d17d5ab678c83dff2c331339b39abe5607a90d236897766642c45efc59c302c6d448ac4869fc49e29c6b29755e2dc3ea
 MISC metadata.xml 887 BLAKE2B 1b9179667b3bb44f0b2c761f8dfed80f804c7313900087a2e61ce7a43ad140b7cb5a15ac0428d3ca0a7ba1087ac0f9014f0fa12d591a34b44a14edb90bfa57f5 SHA512 0d13482fbba741097d384878c333fbf4ed68bafbf4901dd296d1381953eee14112e03ec4bdeb817bdbba9ec5b0b2356d9eccc65cdebba4a47832446c263988f9
diff --git a/sci-libs/opencascade/opencascade-7.4.0-r2.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r3.ebuild
index 5abfadcc3ce5..a6957289df15 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r3.ebuild
@@ -84,6 +84,8 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 	use java && java-pkg-opt-2_src_prepare
+	sed -e 's/\/lib\$/\/'$(get_libdir)'\$/' \
+		-i adm/templates/OpenCASCADEConfig.cmake.in || die
 }
 
 src_configure() {
diff --git a/sci-libs/openlibm/Manifest b/sci-libs/openlibm/Manifest
index 04ddb614ac99..8f611b5162d6 100644
--- a/sci-libs/openlibm/Manifest
+++ b/sci-libs/openlibm/Manifest
@@ -1,5 +1,6 @@
-DIST openlibm-0.5.4.tar.gz 353072 BLAKE2B 2427d207f3b45a5b2a80c3405a6a749c8d62409eea0adb31f26eda6a5dc370f242f5874a6783ada79972ac22183bb55448de683290f4c052967e2e598367f011 SHA512 ca74936b9eb7a52566cc509ffb98dd9e1672cd4029ba0193162505e53fe671b8903c37ef4036c15d0872ca246079a792d1630f3a93024010ff0c232f78295192
+AUX openlibm-0.7.2-make_inc.patch 1593 BLAKE2B 192e3c50401fe9c6a063c3cd80f8a13c9d4c1adc01d6ae4e6175787e1facf79e53d8d576cf7739690b737bfc7e6ede9e73deb60dc448c3d86d7dbf9e8c27c1c8 SHA512 f9529ab9439cf1010b8ec417476a1267a1317b7334271ac83bbaee3895a4ac577851de2a84c2778d9128b0d9d48c5867836f7a4f205da98af6b131fe78210fd4
 DIST openlibm-0.7.0.tar.gz 366359 BLAKE2B 9dc545e3effedaadefda31ae75759ac8e5afb74250e8a7d9016b1406c235a298a375641207d3561365d750ec442e5ecdbfb1ce8b179a17bdaa48a5e2d5e5af25 SHA512 e52245ea93513fb1d9eade348f7c4ad4f1b500944024f7d52d71d43af908059e581ea77df6fc879414ff17c860263debec3aaf6ac86eea03ee1fe23d180487ed
-EBUILD openlibm-0.5.4.ebuild 710 BLAKE2B f4d3155d69697bd7303cb4d92e455590c767fdc91f7e6b848dd8e5f7e62215b9acc1196c585524317a7aa51f37fca26c775c5ef6849db62c8308905c06b5e17d SHA512 b3a4226d579f610bfb28ad9c46d5fcd11870afdca0e1d6133f7e891530615b3dd974bd8cd9452e98cf6d9847c106b53e2b629a3c682ef318431cf4d046a25458
+DIST openlibm-0.7.2.tar.gz 366285 BLAKE2B 0086d026e53c337e20dc895dad38157308b16392f590c8a2c2f7699f2bb8bd5bd0d1931672c2d31a320af0a5ad1cc2e10f2eeb953f30382cfcae5aaac0adc478 SHA512 25e5c28ef898d905ff589d24efb87a99f3772d59596ad5660afc7cafbcd709bca167e863aadc84b90b930add036d285db1332faa9adf1b73562abf1185b9ee5c
 EBUILD openlibm-0.7.0.ebuild 711 BLAKE2B ea950f0d7ac74e99dd4decf0b7b27b2ad1e67fe31c7e159b8226a6eedd3821655aad2db71e0695ce4bccb2e0b3c4f033590f9a94d9606c3ab3497e4e2bfc8f1a SHA512 092836047064e721859e8a8197bfa8fea07533f11b9ac1429bb15c0ccb6832bb1341f547d7b04f3dec10de70dcbf0d42ad95f29f927b38900001483ab7bbf223
+EBUILD openlibm-0.7.2.ebuild 877 BLAKE2B a888b30dc5a5686ce38de477d76a60b9ca57604bb7758f7e807c6a1c6f4d765fb692856a0591325e7bd133ce6f9e49080f44ddc4c7b3bf6b0fe94041b157e58c SHA512 e9bbacc7a896e2c142e02a46025809b2abb1913938ea8602be8cc299a489775c8db8d173e78fc7d463e29e835f035d65b6708e2a7f05e6762b269619943f25ce
 MISC metadata.xml 770 BLAKE2B a75ed3c2d1a22ecb086b22d9ffad8c6d4ab002b7bb63acc60867a88a3126ad3feb1b1ea75ded8e798cd59d128236ab776a53131c6428aa422e1ffa31ee66e5d7 SHA512 c95d57f8ffc872aa8e0b4433d7b51bdb2c06f57c7ba00a66f7ecce06310db0343ff91081249154e2c1e32c9a90ed510704603c337530c1ee1acf36ce808b7b70
diff --git a/sci-libs/openlibm/files/openlibm-0.7.2-make_inc.patch b/sci-libs/openlibm/files/openlibm-0.7.2-make_inc.patch
new file mode 100644
index 000000000000..dc42a98c68d5
--- /dev/null
+++ b/sci-libs/openlibm/files/openlibm-0.7.2-make_inc.patch
@@ -0,0 +1,81 @@
+diff --git a/Make.inc b/Make.inc
+index adeb33d..36520f0 100644
+--- a/Make.inc
++++ b/Make.inc
+@@ -10,41 +10,41 @@ VERSION = 0.7.0
+ SOMAJOR = 3
+ SOMINOR = 0
+ DESTDIR =
+-prefix = /usr/local
+-bindir = $(prefix)/bin
+-libdir = $(prefix)/lib
+-includedir = $(prefix)/include
++prefix ?= /usr/local
++bindir ?= $(prefix)/bin
++libdir ?= $(prefix)/lib
++includedir ?= $(prefix)/include
+ 
+ ifeq ($(OS), FreeBSD)
+-pkgconfigdir = $(prefix)/libdata/pkgconfig
++pkgconfigdir ?= $(prefix)/libdata/pkgconfig
+ else
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir ?= $(libdir)/pkgconfig
+ endif
+ 
+-USEGCC = 1
+-USECLANG = 0
++USEGCC ?= 1
++USECLANG ?= 0
+ 
+ ifneq (,$(findstring $(OS),Darwin FreeBSD OpenBSD))
+-USEGCC = 0
+-USECLANG = 1
++USEGCC ?= 0
++USECLANG ?= 1
+ endif
+ 
+ AR = $(TOOLPREFIX)ar
+ 
+ ifeq ($(ARCH),wasm32)
+-CC = clang-8
+-USEGCC = 0
++CC ?= clang-8
++USEGCC ?= 0
+ CFLAGS_add += -fno-builtin -fno-strict-aliasing
+ endif
+ 
+ ifeq ($(USECLANG),1)
+-USEGCC = 0
+-CC = clang
++USEGCC ?= 0
++CC ?= clang
+ CFLAGS_add += -fno-builtin -fno-strict-aliasing
+ endif
+ 
+ ifeq ($(USEGCC),1)
+-CC = $(TOOLPREFIX)gcc
++CC ?= $(TOOLPREFIX)gcc
+ CFLAGS_add += -fno-gnu89-inline -fno-builtin
+ endif
+ 
+@@ -84,9 +84,6 @@ override ARCH := mips
+ endif
+ 
+ # If CFLAGS does not contain a -O optimization flag, default to -O3
+-ifeq ($(findstring -O,$(CFLAGS)),)
+-CFLAGS_add += -O3
+-endif
+ 
+ ifneq (,$(findstring MINGW,$(OS)))
+ override OS=WINNT
+@@ -111,9 +111,6 @@ shlibdir = $(libdir)
+ endif
+ 
+ # Add `-march` to our CFLAGS if it's defined
+-ifneq ($(MARCH),)
+-CFLAGS_arch += -march=$(MARCH)
+-endif
+ 
+ ifeq ($(ARCH),i387)
+ CFLAGS_arch  += -m32
diff --git a/sci-libs/openlibm/openlibm-0.5.4.ebuild b/sci-libs/openlibm/openlibm-0.5.4.ebuild
deleted file mode 100644
index 7dbbc695f242..000000000000
--- a/sci-libs/openlibm/openlibm-0.5.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs fortran-2
-
-DESCRIPTION="High quality system independent, open source libm"
-HOMEPAGE="https://github.com/JuliaLang/openlibm"
-SRC_URI="https://github.com/JuliaLang/${PN}/archive/v${PV}.tar.gz -> ${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/openlibm/openlibm-0.7.2.ebuild b/sci-libs/openlibm/openlibm-0.7.2.ebuild
new file mode 100644
index 000000000000..83cb64621d13
--- /dev/null
+++ b/sci-libs/openlibm/openlibm-0.7.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="High quality system independent, open source libm"
+HOMEPAGE="https://github.com/JuliaLang/openlibm"
+SRC_URI="https://github.com/JuliaMath/openlibm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+"
+# See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.7.2-make_inc.patch )
+
+src_prepare() {
+	default
+	sed -e "/^OLM_LIBS :=/s/^/#/" \
+	    -e "/install: /s/install-static//" \
+	-i Makefile || die
+}
+
+src_configure() {
+	tc-export CC CXX FC AR LD
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+		libdir="${EPREFIX}/usr/$(get_libdir)" install
+	dodoc README.md
+}
diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest
index 789370f68806..c6db3ae2a12d 100644
--- a/sci-libs/pastix/Manifest
+++ b/sci-libs/pastix/Manifest
@@ -2,6 +2,6 @@ AUX pastix-5.2.2.22-isnan-floating-point-cast.patch 1901 BLAKE2B 3bb02c4898367e0
 AUX pastix-5.2.2.22-nosmp-undefined-variable.patch 494 BLAKE2B 06a9e3933d0a181f535ad2922c3b39375d50b81abc572a1363e5e1130e3647083940ffc929e40cf93d35e364eb7e36d84d57a53bd9fe247ff8f7fefde93a08f7 SHA512 c12719176b352b396cc58d7a4474955df0cb01459edce1b2f220c6352d99bf608d39c3b4d6b54b0ae8b4643879ed79b7a5fbd03b746dba0bf4cc265d81d6d38e
 DIST pastix_5.2.2.22.tar.bz2 2664470 BLAKE2B b1fbd12bf2c882aa8fd2c4891a6890df4bdc4488cedca2a7861e676ec5678063927f2e4a4edc47aa7ca0422b283f8f012aa1032af7212fe39f4c55e7f0f7adc4 SHA512 15ecdb10b5229e40f744c1ad54be7cac6560cb92e90df1937c90ca7da290df6bdb6f24a1e1c54197731b9df3e0dcc0b9fa39750479fcf03a0c08c304c5b9df70
 DIST pastix_5.2.3.tar.bz2 2246903 BLAKE2B b13cb31bbc2aeb122e932b2a934598ec975a55f327483bf1383280976584858426c56982f6980b52f32f04e05c6e6c8de1cf35e378e61a7be9dddb705b1c033a SHA512 69acffac1be8c756886783c2a6307269ab4d14abfc4a77268b3d14995e53b16084c298446812484233d9d52c317490d6ad67788166adf367075e6c8442147b95
-EBUILD pastix-5.2.2.22-r1.ebuild 3654 BLAKE2B 011dc06c539590029f38e2f95555fb7a406660355cfbd17dbbeb98562b00491f6a094b35d04c1c0b2bcaaf20d488bb2734acaf4c0bde0f85ffb45c1bf725fe58 SHA512 0d9e03c2cc8cd5724607b70eac6e3ea687c1ef55a2a8f67e3ad894e379775b704051af7a8e0596e74d56a0b54852dcdedb66976535bb8c3e050beda1a7d81e96
+EBUILD pastix-5.2.2.22-r1.ebuild 3653 BLAKE2B 2fde445d7fa06f9c7f38fd61d23550df25a3c5b414eb309c7b2a5ebaac6ff844052e8cf612ba5d6e308c970e6d2d5d317b52a62365bec4fecd2e70614595fbf5 SHA512 884c7d5eec941cc2fc55597a62d674ec239a62ea3d66ec9811671b2841dcb0723937298abc9599011fc431bc8cf2c27aea9ea396936e78edccd4e8d4c19d57bb
 EBUILD pastix-5.2.3.ebuild 3337 BLAKE2B 1d89f156e99b6a5d1fafeccfabe22d49b81fccd4d34229326627d3236f711fb2cf03e4024904d8270e0340e15af5ea29df54cc09146f7b53877cfae53d908639 SHA512 53dc6e0f18dfb4ce263fcab1b8d88338dd6eebb4eabd204c45d9d04fbab6e32870a0b1fb19140977a35c49156955b67a1e58166c527c7b284dd831c4cbce6675
 MISC metadata.xml 1055 BLAKE2B 237a5db431f2c60ea448c9627f943e88a7fd50509884af078c1de5b9ed51317806d815cf8f8ad9c1f85272077438df2d8c76e26fa9a1c9133bb17f3b1cd056ed SHA512 42f9f1f03c4a2df46918ef461d814ca3c0e80e0fa5420327a45d6ca7ec87dd3f14ad0e5a4384b49aebae971578a425b475fa0e1ed6b73370afb743222765bfde
diff --git a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
index 58b61bc3195d..4e3808900012 100644
--- a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
+++ b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/${PID}/${PN}_${PV}.tar.bz2"
 
 LICENSE="CeCILL-C"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc int64 mpi +smp starpu static-libs"
 
 RDEPEND="
diff --git a/sci-libs/plotmm/Manifest b/sci-libs/plotmm/Manifest
deleted file mode 100644
index 7072242efc6e..000000000000
--- a/sci-libs/plotmm/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX plotmm-0.1.2-libsigc++-2.2.patch 4037 BLAKE2B 10024df20b90fab7ea8a212789b84a94689169ae3099788f52ba4b087eea9a64783adc81192598b7e79231edfa7744337694cf88cff079e2e4bd715de71ac66d SHA512 3327b7fcd0311976bbf1a6990e9cf14c43c85fb4eea2de21501bc79e90ee7bbec9527b35dab8204534f797e318659f0d67faefa047bb6ef2a8b0962588e2b4b2
-DIST plotmm-0.1.2.tar.gz 473175 BLAKE2B f024abbe77e208443cdf58a7817cdea9d1a93435b55e62d4579c341ca773fc2199def0e93fbba980891dd38c0085515e01833a11fd37f87bdeb0b2737a8ff809 SHA512 68484d7ed3b4d6520782735e05ad3cf9a5749f723285a2a3d0d1fabe3b23df57856d24addb31c23e3f23174655095f55b9b9a8d10316812d7a80fe13e204fab6
-EBUILD plotmm-0.1.2.ebuild 1317 BLAKE2B 02c078345a1fa555adb19e5902fe1fff81e11e360117ee838d09ce92a9d1ad15c3c34b469ef4ab1e1aa01ead694bf48c34c78cc4a203cf218e86e91ffb474551 SHA512 53193ebe4603964c025be2662673f23c7cc08746a3f6759a101534108ded4bf829ff4e5fc8c8914f6bae6baa4a7c296287c3fa6c86399b3cc78450bf277d71e1
-MISC metadata.xml 243 BLAKE2B 8495df4aecff8a0fba05bc70c2fe798eb257086ad1c16da9f1fa77a6100e7936d455febc72d73609063c034117400a64c19f9bacaaa7e9c41e0937efc041dfb3 SHA512 d9179f9fde1433951047043a7c811ea571511473d16c0c4e2b0655933dd41cc7b0b56edbf3db9ed25037086a676de73ea6886a6935a3c3dff67ad441eaa1304a
diff --git a/sci-libs/plotmm/files/plotmm-0.1.2-libsigc++-2.2.patch b/sci-libs/plotmm/files/plotmm-0.1.2-libsigc++-2.2.patch
deleted file mode 100644
index a9aa53190d5f..000000000000
--- a/sci-libs/plotmm/files/plotmm-0.1.2-libsigc++-2.2.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -ur plotmm-0.1.2-old/plotmm/compat.h plotmm-0.1.2/plotmm/compat.h
---- plotmm-0.1.2-old/plotmm/compat.h	2005-11-09 17:36:02.000000000 +0100
-+++ plotmm-0.1.2/plotmm/compat.h	2008-07-25 00:13:55.000000000 +0200
-@@ -58,7 +58,7 @@
- #else
- 
- namespace PlotMM {
--  typedef SigC::ObjectBase ObjectBase;
-+  typedef sigc::ObjectBase ObjectBase;
- }
- 
- #endif
-diff -ur plotmm-0.1.2-old/plotmm/curve.h plotmm-0.1.2/plotmm/curve.h
---- plotmm-0.1.2-old/plotmm/curve.h	2005-11-09 17:47:21.000000000 +0100
-+++ plotmm-0.1.2/plotmm/curve.h	2008-07-25 00:24:02.000000000 +0200
-@@ -140,7 +140,7 @@
- 			  int from = 0, int to = -1);
- 
- 	//! Signals that this curve has changed in some way or the other
--	SigC::Signal0<void> signal_curve_changed;
-+	sigc::signal0<void> signal_curve_changed;
- 
-     protected:
- 	virtual void init(const Glib::ustring &title);
-diff -ur plotmm-0.1.2-old/plotmm/plot.cc plotmm-0.1.2/plotmm/plot.cc
---- plotmm-0.1.2-old/plotmm/plot.cc	2005-11-09 17:59:48.000000000 +0100
-+++ plotmm-0.1.2/plotmm/plot.cc	2008-07-25 00:24:30.000000000 +0200
-@@ -322,7 +322,7 @@
-       connect(sigc::mem_fun(*this,&Plot::on_canvas_expose_event));
- #else
-     canvas_.signal_expose_event().
--      connect(SigC::slot(*this,&Plot::on_canvas_expose_event));
-+      connect(sigc::slot(*this,&Plot::on_canvas_expose_event));
- #endif
- 
-     show_all();
-@@ -406,19 +406,19 @@
- }
- 
- //! Return the signal owned by plot canvas
--SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
-+sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
- {
-     return canvas_.signal_plot_mouse_press;
- }
- 
- //! Return the signal owned by plot canvas
--SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()
-+sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()
- {
-     return canvas_.signal_plot_mouse_release;
- }
- 
- //! Return the signal owned by plot canvas
--SigC::Signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
-+sigc::signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
- {
-     return canvas_.signal_plot_mouse_move;
- }
-diff -ur plotmm-0.1.2-old/plotmm/plot.h plotmm-0.1.2/plotmm/plot.h
---- plotmm-0.1.2-old/plotmm/plot.h	2004-03-09 10:51:55.000000000 +0100
-+++ plotmm-0.1.2/plotmm/plot.h	2008-07-25 00:25:17.000000000 +0200
-@@ -79,9 +79,9 @@
- 	virtual void clear();
- 	virtual void end_replot();
- 
--	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
--	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;
--	SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;
-+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
-+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;
-+	sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;
- 
-     protected:
- 	virtual bool on_expose_event(GdkEventExpose* event);
-@@ -141,9 +141,9 @@
- 	Scale *scale(PlotAxisID id) { return tickMark_[id]; }
- 	PlotLabel *label(PlotAxisID id) { return axisLabel_[id]; }
- 
--	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();
--	SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();
--	SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();
-+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();
-+	sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();
-+	sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();
- 
- 	void set_selection(const Rectangle &r);
- 	Rectangle get_selection() { return select_; }
-diff -ur plotmm-0.1.2-old/plotmm/scale.h plotmm-0.1.2/plotmm/scale.h
---- plotmm-0.1.2-old/plotmm/scale.h	2004-03-05 16:25:43.000000000 +0100
-+++ plotmm-0.1.2/plotmm/scale.h	2008-07-25 00:25:30.000000000 +0200
-@@ -133,7 +133,7 @@
- 	/*! This signal is thrown whenever the scale is enabled or disabled
- 	 *  \sa set_enabled, enabled
- 	 */
--	SigC::Signal1<void,bool> signal_enabled;
-+	sigc::signal1<void,bool> signal_enabled;
- 
-     protected:
- 	virtual void on_realize();
diff --git a/sci-libs/plotmm/metadata.xml b/sci-libs/plotmm/metadata.xml
deleted file mode 100644
index 6907b0a4da6b..000000000000
--- a/sci-libs/plotmm/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">plotmm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-libs/plotmm/plotmm-0.1.2.ebuild b/sci-libs/plotmm/plotmm-0.1.2.ebuild
deleted file mode 100644
index 5cf316ca2678..000000000000
--- a/sci-libs/plotmm/plotmm-0.1.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic
-
-DESCRIPTION="Plot widget for GTKmm"
-HOMEPAGE="http://plotmm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-cpp/gtkmm:2.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# NOTES:
-# somewhat, there is a dep on libsigc++ but it's much more via gtkmm
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-libsigc++-2.2.patch"
-
-	if ! use examples; then
-		sed -i -e "s:examples::" Makefile.in || die "sed failed"
-	fi
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		--disable-maintainer-mode \
-		--enable-fast-install \
-		--disable-libtool-lock
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-
-	if use examples; then
-		# rename installed bin files
-		mv "${D}"/usr/bin/curves "${D}"/usr/bin/${PN}-curves || die "mv failed"
-		mv "${D}"/usr/bin/simple "${D}"/usr/bin/${PN}-simple || die "mv failed"
-
-		# install sources
-		insinto /usr/share/doc/${PF}/examples/
-		doins examples/{curves/curves,simple/simple}.cc
-
-		elog "You can use examples by calling ${PN}-curves or ${PN}-simple."
-		elog "Examples source code is in /usr/share/doc/${PF}/examples."
-	fi
-}
diff --git a/sci-libs/pyshp/Manifest b/sci-libs/pyshp/Manifest
index e5552b5236ea..6069248d35e8 100644
--- a/sci-libs/pyshp/Manifest
+++ b/sci-libs/pyshp/Manifest
@@ -1,3 +1,5 @@
 DIST pyshp-2.1.0.tar.gz 215360 BLAKE2B 2b32a3db242b90f801abdbc31f3c930bc40c3ad0606433d90f62c6b9af3c0459e8c8467d60aec1075368779e5a4fffa9e3985e1875d82edf732faf982359c605 SHA512 ab0c7832f7e480ec3cdbf94ec29f84b590486625bde3d5cf465e5dc6ddca02998b99510b6c14d5ba005816c5b091044badc1e68988fd971f9e18266096ad86cb
+DIST pyshp-2.1.2.tar.gz 217857 BLAKE2B f4c50e16987b13b7968fe37e4e7f20329b6871c879b837113aac281527f6a00d5d13e10f93e8ecd5896cf089d801d76cec5d93645a6919fbc48d96d4318bb767 SHA512 54fadaa133d3fbf3b9a318be02dd21c2a35a3c58c15de8e6d0cffa6ca83eefe12603fe5930d3df63ad4c6a6d711336752f08923c6406168207ac291d05592582
 EBUILD pyshp-2.1.0.ebuild 549 BLAKE2B 34a54b03e748fae8daad52154dce55d32be41d1638242c183210007015945eba8acb5ba6a09c8d274334543e4ee8c939f669079555b748f7e8e8afff38612914 SHA512 7dfcab869adfc8aca9c706c2e63f9b80baa4f61efa59f0c10299644a7fccc9c867dee781e4c52914b8eeca6961ccf6b85793fd2ca1210e369689a477086041c0
+EBUILD pyshp-2.1.2.ebuild 549 BLAKE2B 34a54b03e748fae8daad52154dce55d32be41d1638242c183210007015945eba8acb5ba6a09c8d274334543e4ee8c939f669079555b748f7e8e8afff38612914 SHA512 7dfcab869adfc8aca9c706c2e63f9b80baa4f61efa59f0c10299644a7fccc9c867dee781e4c52914b8eeca6961ccf6b85793fd2ca1210e369689a477086041c0
 MISC metadata.xml 327 BLAKE2B 48f3a2409f354b39c05d8111f78f1bce40425f79db30c83d345f81a081d2098bdf42dfc49e47854ec788cf75841cb9427a5c2eb9b71dd139f3fbe398e1380346 SHA512 3b9fdbf92fc5ad41b8afe4b315bad42806062c974b37496875fcc861af525905cc8d4b81e0a4d20d3e9333ea38c57c7aae6764c64537ef9e27386a53168299b4
diff --git a/sci-libs/pyshp/pyshp-2.1.2.ebuild b/sci-libs/pyshp/pyshp-2.1.2.ebuild
new file mode 100644
index 000000000000..5499cd13c879
--- /dev/null
+++ b/sci-libs/pyshp/pyshp-2.1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-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
+
+DESCRIPTION="Pure Python read/write support for ESRI Shapefile format"
+HOMEPAGE="https://pypi.org/project/pyshp/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${EPYTHON}" shapefile.py || die
+}
diff --git a/sci-libs/qrupdate/Manifest b/sci-libs/qrupdate/Manifest
index 751cdf36a42b..378d36d0c46e 100644
--- a/sci-libs/qrupdate/Manifest
+++ b/sci-libs/qrupdate/Manifest
@@ -1,5 +1,5 @@
 AUX qrupdate-1.1.1-Makefiles.patch 2350 BLAKE2B 9d1e21e0118f1fd47699c94e242fb53df5e6fa26b85a56bd13718ce409ade64e618a858fab780a2c927f4ef988273a883872d5ecca57b62b90b16f132dce5bae SHA512 40945650175668ab5155c330a5e6be20059e90d8bb5f47173d14b385710703693b1c5fb77bc01f08328e064301e2fc0c90438a9fac7f6f1222e6b35835137682
 AUX qrupdate-1.1.2-install.patch 1263 BLAKE2B e9d18cda34264374e9456a2c3ed5f849bafe8ef461e1577e1cda4b04695f2c8ef03d0ef47d2d9ba6a56db7251b8a37cafc061a47b751e7947a94f1479df2a2d0 SHA512 3274d57666b2f453f50f0b5244c9f3dd5ea29a2fc05233dedfd43940945744a675d3bbd50e3a1aef7ec8613df16f97c05e0983c711db63364f8b45125e246bb8
 DIST qrupdate-1.1.2.tar.gz 49734 BLAKE2B e5bf9fb39f6c97ee4b4084e664f929d95bee407f9f11ea4dc6da2bdb06d1694eddc1f2f52e5f673f22d097d11addb293b6dc0fd7c30d09acc84dd050fd1d72e9 SHA512 cc4e466ea91958e15c66be82b0c4c8ad813fbe4643f21259a9cb3ca8e0a411dd764bb2397ece848a7045f322d30316801d1540c4ebf7912030bef6995b44917c
-EBUILD qrupdate-1.1.2-r1.ebuild 1271 BLAKE2B bf17b0d69dd27176bda4cc67401889c782f505efbb248be353f3a6260340594873b6cc56d423645607a83fb0b7a876107b32d98a02feaff95a1bf14b2b7a0712 SHA512 46088acf560b4de2a180daf5f9627f4b49fc66d8603154a3bad27f079aa79b5e6fdbd32f86662e27ef74e8e85da4d9bf7bb1f7c0b5a1c38696279f2a3a1bd6f5
+EBUILD qrupdate-1.1.2-r1.ebuild 1276 BLAKE2B 74e66218cb103c2231d08878399678854c6c2050886b3aaeabe874b32ecd5a05af0beb0b5e2de5988e63ca6e71c2bb3c29cc594de05adc846b888ac86df091bd SHA512 a7db85cf7c9788178e192fd03301663c36319b9a624977d868a8e170eba22f70919c56b2f21247c2d0781ed16759ba3e4760e2a50ef802c93351aa78400d7822
 MISC metadata.xml 331 BLAKE2B 7cb0302f290048b91c8777184229fa2f0af2647f5cd1d4f9f88f7afc0168b4c51a4ab01b08cfb695be567838f1a6025cf47e2e43df67d434cf676c47c537cc3e SHA512 59818fe84d5fc4b73f29b45e14152e52d7d4afeaef9200e862e2414213b8c05bd63119befabc3a68b67b0aced7e60ab0fe3f7e657966a58a44d751571c4828df
diff --git a/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild b/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
index 781d1d056c2f..bde3a5417097 100644
--- a/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
+++ b/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos"
 IUSE="static-libs"
 
 RDEPEND="virtual/lapack"
diff --git a/sci-libs/rtree/Manifest b/sci-libs/rtree/Manifest
new file mode 100644
index 000000000000..e5468bb11ca9
--- /dev/null
+++ b/sci-libs/rtree/Manifest
@@ -0,0 +1,3 @@
+DIST Rtree-0.9.4.tar.gz 62017 BLAKE2B 72a979a3b9b9e9e1d18ea8646bbf860413c18420ce40946108c4f2f0e59fcb5bb64971a57936a92714e02e13419f7dc594b2371e4b44a4fd6a3e3986c19f7d85 SHA512 59981ffefedac1162faaa86ea10d7d5503da46c7ae9588a57e1a49214043de5f41bd4836965651d4cd22e7959c37cc6d586d9912568a2aaf693a0afb7895b429
+EBUILD rtree-0.9.4-r1.ebuild 633 BLAKE2B 6b0a78df3e79e41a23174ba873f306fcc43f7ceddc93dafd66ac27d8dc2541b374b5f0d5a83715f263d4cad375d2a82f07b6bba147a372ebd92f5f05b1efac12 SHA512 c2bb26c76f00e08e8745c02096916ca66321fb8e351d009382ac35c8abb434605e146db33ec324e5406b0c88408c962b0bea0281c5e775587a16fb0c490b9274
+MISC metadata.xml 701 BLAKE2B 1f89c6481c0856f2bd0ca2431151ecef5c01b015c443efcfb837be7cbe84ac218b3811e3710e678650916094ab9c8e0d18b2bb0a8beea10a7b6c73e7df23d646 SHA512 c145907e76558f657c5ca11540fc83ed3fe42917b496c4885b9826fdeb6253594f8656f9e663bbb519b47f3590ef0068f28e75f2a14248f7cc9508d7f8d7db81
diff --git a/sci-libs/Rtree/metadata.xml b/sci-libs/rtree/metadata.xml
index d03728e20d7e..d03728e20d7e 100644
--- a/sci-libs/Rtree/metadata.xml
+++ b/sci-libs/rtree/metadata.xml
diff --git a/sci-libs/Rtree/Rtree-0.9.4.ebuild b/sci-libs/rtree/rtree-0.9.4-r1.ebuild
index ee3030b4dffd..a0940fd1901a 100644
--- a/sci-libs/Rtree/Rtree-0.9.4.ebuild
+++ b/sci-libs/rtree/rtree-0.9.4-r1.ebuild
@@ -4,12 +4,16 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
+MY_PN="Rtree"
+MY_P="${MY_PN}-${PV}"
+
 DESCRIPTION="R-Tree spatial index for Python GIS"
 HOMEPAGE="https://rtree.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="MIT"
 
 KEYWORDS="~amd64 ~x86"
@@ -22,3 +26,7 @@ RDEPEND="sci-libs/libspatialindex"
 distutils_enable_sphinx docs/source
 
 distutils_enable_tests pytest
+
+DEPEND+="
+	test? ( dev-python/numpy[${PYTHON_USEDEP}] )
+"
diff --git a/sci-libs/scikit-image/Manifest b/sci-libs/scikit-image/Manifest
new file mode 100644
index 000000000000..9af2f6832b4c
--- /dev/null
+++ b/sci-libs/scikit-image/Manifest
@@ -0,0 +1,5 @@
+DIST scikit-image-0.13.0.tar.gz 26101533 BLAKE2B c28284f64abd58c7bafa8f5f0c781496e8bb28af79c5c730df7cbf2fede958eb88ea420fd7f89e7b8d0d91719a98dd0935af3b2cc50fe501cc8d8d1d0ee56cb9 SHA512 923015e373c406ae2fbbfdf83ce8b91e83790bdf7842c4439fdc9fd58cffe46efc0cfc7a1b0b06e1b2d092a909a6f085335640850883e7608dbccd1074046550
+DIST scikit-image-0.17.2.tar.gz 29818001 BLAKE2B 360c5f8c23b8441d145029c09a3b1d1407d4103463497c63274583e6c03d1fc57baa3e6c53909cfaa5daba54d5909fc106e84dc7036f0240ad8de93804ef9f65 SHA512 3ca2511f03d533ac7f1850d72de396dc5493831bce6200f30d426c3f47eff9b25ec9b69e141100dc56e03f2310aab255f92ff4aff8bc7b80d15d669cbe2ebb5e
+EBUILD scikit-image-0.13.0-r1.ebuild 1738 BLAKE2B abf1e5df1eff25fddc3df6adeb9c8a2b289f9f51a8093318e7f0d0bad8d178b358377663f5a40cc0544765ee52f173222ffe3a342e41f212c2a6516e895393bf SHA512 50efaa381c1093a0e9602a4330253f44f46c56a993a6371527ab07dc987ee25b33cb7266894a3be9548b2e76616bb196e3c6cdabf83c33279c3d2165c06b850b
+EBUILD scikit-image-0.17.2.ebuild 1217 BLAKE2B ad8cee397fb0f4b3e906c08f63ef6b83b2932b0b77d230b3872ceae08a970e925a2eecd60e3d981656877210f22ec1dc65d0f66a638e034a9916dca7f7377a36 SHA512 3af9fcbdcd231564dc42df1feed4ef27d1e4064e4da0e9d6819c16895a6639b516a3939abb636097e14538d8a06fa27520f63aeab4883e3c5a72796e2eac40a2
+MISC metadata.xml 841 BLAKE2B d8e9c6247c250b668c91ef9341c9bd0c4d7a7c479530b02d2b05f2691a7d554e16cf744fd8e9fad919902a182a24bdcbf8aae890c58fccdbeb3a65116d7f9e5c SHA512 5e5ddb5f65b1e5b5a260af23bacc67775af9226fc97518d8146e05c922ae53e5863261a79382572920135e5ec70f1e5f083bbd7dadc9e9f899954baab67926da
diff --git a/sci-libs/scikits_image/metadata.xml b/sci-libs/scikit-image/metadata.xml
index 8e05ce3947d6..aa3d4f7f7fb5 100644
--- a/sci-libs/scikits_image/metadata.xml
+++ b/sci-libs/scikit-image/metadata.xml
@@ -6,14 +6,13 @@
     <name>Gentoo Science Project</name>
   </maintainer>
   <longdescription lang="en">
-  This SciKit (toolkit for SciPy) includes useful image processing
-  algorithms for use with Python and NumPy. While SciPy’s ndimage
-  provides low-level manipulation, scikits.image centres around
-  algorithms and applications.
-</longdescription>
+    This SciKit (toolkit for SciPy) includes useful image processing
+    algorithms for use with Python and NumPy. While SciPy’s ndimage
+    provides low-level manipulation, scikits.image centres around
+    algorithms and applications.
+  </longdescription>
   <use>
-    <flag name="freeimage">Enable support for image i/o via
-  <pkg>media-libs/freeimage</pkg></flag>
+    <flag name="freeimage">Enable support for image i/o via<pkg>media-libs/freeimage</pkg></flag>
     <flag name="pyamg">Enable support for algebraic solvers via <pkg>dev-python/pyamg</pkg></flag>
   </use>
   <upstream>
diff --git a/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild b/sci-libs/scikit-image/scikit-image-0.13.0-r1.ebuild
index 6764d75ad7cf..0db4ea687ed1 100644
--- a/sci-libs/scikits_image/scikits_image-0.13.0-r1.ebuild
+++ b/sci-libs/scikit-image/scikit-image-0.13.0-r1.ebuild
@@ -7,12 +7,9 @@ PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 optfeature virtualx
 
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
 DESCRIPTION="Image processing routines for SciPy"
 HOMEPAGE="https://scikit-image.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYP}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -35,8 +32,6 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (	dev-python/nose[${PYTHON_USEDEP}] )"
 
-S="${WORKDIR}/${MYP}"
-
 DOCS=( CONTRIBUTORS.txt DEPENDS.txt RELEASE.txt TASKS.txt TODO.txt )
 
 python_test() {
diff --git a/sci-libs/scikit-image/scikit-image-0.17.2.ebuild b/sci-libs/scikit-image/scikit-image-0.17.2.ebuild
new file mode 100644
index 000000000000..d88534989efb
--- /dev/null
+++ b/sci-libs/scikit-image/scikit-image-0.17.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Image processing routines for SciPy"
+HOMEPAGE="https://scikit-image.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/imageio[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pywavelets[${PYTHON_USEDEP}]
+	dev-python/scipy[sparse,${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+DOCS=( CONTRIBUTORS.txt RELEASE.txt )
+
+pkg_postinst() {
+	optfeature "FITS io capability" dev-python/astropy
+	optfeature "GTK" dev-python/pygtk
+	optfeature "Parallel computation" dev-python/dask
+	optfeature "io plugin providing most standard formats" dev-python/imread
+	# not in portage yet
+	#optfeature "io plugin providing a wide variety of formats, including specialized formats using in medical imaging." dev-python/simpleitk
+}
diff --git a/sci-libs/scikit-learn/Manifest b/sci-libs/scikit-learn/Manifest
new file mode 100644
index 000000000000..49ca10603d7b
--- /dev/null
+++ b/sci-libs/scikit-learn/Manifest
@@ -0,0 +1,5 @@
+DIST scikit-learn-0.22.2_p1.tar.gz 7034850 BLAKE2B 41c362ef6594e837a9fc798837e666fbb51e33954fdf700292650204fd9d1ab4fc4d1695890d02a24ad68f4dcc2d3cde8f0827eca70c6fb9a6f0e5c0d9c04fd5 SHA512 20bcda5c65f76bce9b71c5b5fb1b499f7f3a7a3f6fa5fade80a38dc658cb434e16e9d5a4906a9657157a5cc90a6d51080575d6e510207baa9f8b06c4fa761d5b
+DIST scikit-learn-0.23.2.tar.gz 7190564 BLAKE2B db90e3d05d9b563c6cd98a6820c27b541e757e3fb6c25262b720842811b9e26d41a4a9c1d73e675714573d84dab799a0c450e768f4a41a39a6a61f6930c4c79a SHA512 e9797185b1b9def3ee5525e9b72742784aeb78fe8b069bb5aeab1d0f4513cf738c4489ed894274606dea9d6a32ccd3df26170ce1951e443dc77f9287c372e8c5
+EBUILD scikit-learn-0.22.2_p1-r1.ebuild 1638 BLAKE2B 9809ad980840ecc42fe8d231e0582e21492017365e1304abfd207911c3b664ade403b04ce262a6b91fb5614cc38aec87f67bf8e52cdb175aef26702311c78a62 SHA512 03c98713763c75af89c205705d96983bada41014d0f67c1b9176fbc118832222d96908ed5f88ffd89919341cecb993e7669141f8165021f73cfb271c91212fd3
+EBUILD scikit-learn-0.23.2.ebuild 1501 BLAKE2B af43692648b23fed1fb2fe41694db9769c5e14f71dcac69c3c02a982b0eb68be107410cc28c179898d74b073f11ce03bd37d6160cca43d70f44e37983d52f9e5 SHA512 e5e97a70d745e9d4fa1bef9bf79e22448a2aaa1861f0d607a0efa348dd2d75131c553f56f320700e9f67fc2b6431d131a712d3a2e61c2adcf45dbbe3385bfd2d
+MISC metadata.xml 722 BLAKE2B 678b21d5cc514504a3dfef33f3066c55885285d85fc8a8582051b53a41675a8b9c589a0c226b838590e6bf1b740ce9d82840874f75049b92f7a681576bfeea78 SHA512 ac8ca303bd2df0f523496233edcec70ecf6cbe3fd863c4ac28ecd0250eed6b67135e39a74e93e6adcbbebac17766e4a8bcb9be2a73a2464400346f47afbfb440
diff --git a/sci-libs/scikits_learn/metadata.xml b/sci-libs/scikit-learn/metadata.xml
index 0f62a4aec772..681e5c20b1f3 100644
--- a/sci-libs/scikits_learn/metadata.xml
+++ b/sci-libs/scikit-learn/metadata.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@aisha.cc</email>
+    <name>Aisha Tammy</name>
+  </maintainer>
   <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
   <longdescription lang="en">
-  scikits.learn is a python library for machine learning. It aims to
-  implement classic machine learning algorithms while remaining simple
-  and efficient.
+    sklearn is a python library for machine learning. It aims to
+    implement classic machine learning algorithms while remaining simple
+    and efficient.
   </longdescription>
   <upstream>
     <remote-id type="pypi">scikit-learn</remote-id>
-    <remote-id type="sourceforge">scikit-learn</remote-id>
+    <remote-id type="github">scikit-learn/scikit-learn</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild b/sci-libs/scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild
index b60be666ce0d..db552f4ee708 100644
--- a/sci-libs/scikits_learn/scikits_learn-0.22.2_p1.ebuild
+++ b/sci-libs/scikit-learn/scikit-learn-0.22.2_p1-r1.ebuild
@@ -7,14 +7,12 @@ 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"
+HOMEPAGE="https://scikit-learn.org/stable/"
+SRC_URI="https://github.com/scikit-learn/scikit-learn/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}"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,9 +22,9 @@ IUSE="examples"
 RDEPEND="
 	dev-python/wheel[${PYTHON_USEDEP}]
 	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/joblib[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
-	sci-libs/scikits[${PYTHON_USEDEP}]
 	virtual/blas:=
 	virtual/cblas:=
 "
@@ -34,12 +32,6 @@ DEPEND="
 	virtual/blas:=
 	virtual/cblas:=
 "
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/joblib[${PYTHON_USEDEP}]
-	)
-"
 
 distutils_enable_tests pytest
 
diff --git a/sci-libs/scikit-learn/scikit-learn-0.23.2.ebuild b/sci-libs/scikit-learn/scikit-learn-0.23.2.ebuild
new file mode 100644
index 000000000000..626d84dd3335
--- /dev/null
+++ b/sci-libs/scikit-learn/scikit-learn-0.23.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+DESCRIPTION="Machine learning library for Python"
+HOMEPAGE="https://scikit-learn.org/stable/"
+SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="examples"
+
+DEPEND="
+	virtual/blas:=
+	virtual/cblas:=
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/wheel[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/joblib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/threadpoolctl[${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
+	fi
+}
diff --git a/sci-libs/scikit-optimize/Manifest b/sci-libs/scikit-optimize/Manifest
new file mode 100644
index 000000000000..a37b6a57b5ae
--- /dev/null
+++ b/sci-libs/scikit-optimize/Manifest
@@ -0,0 +1,3 @@
+DIST scikit-optimize-0.8.1.tar.gz 278751 BLAKE2B c53b921ed47a2146510a041e34129918cc1b9118e8ae3614f39cc16c87ba5a749e268b9694ade9d95132ec4fb11777f2ef2ec509b1be59c8864ff7b6edde2250 SHA512 8ffacb62869810e1812bdbd2f9f3fe83cad2be03cd795ae2e9aa4e1143ed613c3901ae06be85aecd63c1e3e5b4805e88331d2d8848cc9953988fddfbe62a0287
+EBUILD scikit-optimize-0.8.1.ebuild 638 BLAKE2B 6783889d12f564a883f93c957c6227cbb4a63db842c95ab8b9e075981f50f1428b127ae86e1e67139bbdc7d3cf6fdf0f785fbb1490b06df5d60653b82f11334f SHA512 388d437dad457fe6e23e7c5db18d80745271506089d65c9e2d3abe072dfe6283ad027a551f814d1b7b93bac89c9e66ac42769604f30b73a3d5ab784be25aa183
+MISC metadata.xml 525 BLAKE2B bd00fbf178b3d7faa54eedc8a0d39bbf2e38be82be836391a341674b418d4e9ccc3d99b5644fd6b1a2feb4637cf501523233d5bd86e05f9660545ec28756c180 SHA512 326647cfcdfebe6ef758ee7c5c51e27abbe1ed62c17c6466edd69952e6fad1990d03976453e6807a5e67acec25b5699af84052d4af9681d5454336bd8511ee11
diff --git a/sci-libs/scikit-optimize/metadata.xml b/sci-libs/scikit-optimize/metadata.xml
new file mode 100644
index 000000000000..11fe5dcb02d1
--- /dev/null
+++ b/sci-libs/scikit-optimize/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@aisha.cc</email>
+    <name>Aisha Tammy</name>
+  </maintainer>  
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">scikit-optimize</remote-id>
+    <remote-id type="github">scikit-optimize/scikit-optimize</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/scikit-optimize/scikit-optimize-0.8.1.ebuild b/sci-libs/scikit-optimize/scikit-optimize-0.8.1.ebuild
new file mode 100644
index 000000000000..c2d8bbb2631f
--- /dev/null
+++ b/sci-libs/scikit-optimize/scikit-optimize-0.8.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Sequential model-based optimization library"
+HOMEPAGE="https://scikit-optimize.github.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/joblib[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	sci-libs/scikit-learn[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/sci-libs/scikits_image/Manifest b/sci-libs/scikits_image/Manifest
deleted file mode 100644
index 501062ae8314..000000000000
--- a/sci-libs/scikits_image/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST scikit-image-0.13.0.tar.gz 26101533 BLAKE2B c28284f64abd58c7bafa8f5f0c781496e8bb28af79c5c730df7cbf2fede958eb88ea420fd7f89e7b8d0d91719a98dd0935af3b2cc50fe501cc8d8d1d0ee56cb9 SHA512 923015e373c406ae2fbbfdf83ce8b91e83790bdf7842c4439fdc9fd58cffe46efc0cfc7a1b0b06e1b2d092a909a6f085335640850883e7608dbccd1074046550
-EBUILD scikits_image-0.13.0-r1.ebuild 1816 BLAKE2B d0c8f32aa0f8e561567c605856c22125c408a722c1c953196234ef26ec7e77c9e203df29b052a98f176b7c4e17ec6cb9598fbc3205dd9f620d25d625ad73ca11 SHA512 a5ebd9e3edab500f6f45703a91c2c5f3ddc14416648a3765c0cd13cd0ccb9fa7624c34ebdb68625bc3238303059c814c0d7fafe0c675ff631a8e127f093ba45b
-MISC metadata.xml 834 BLAKE2B d6ed9731e0bfffb39fb127b1ccaa9d449e7cedc4038a5a4a915624fadad131d39df0d1d7123951539074758095d35c1b9730bb4a3da2278b02630903645eb769 SHA512 1c615479bc22c8c66b4f7a2189e38c69f9b8722f051c68473439069ef89598f0505dbd94fe06cbe56a07e41a1a6552f4d8d666703676ef9a165dbcf462e09e40
diff --git a/sci-libs/scikits_learn/Manifest b/sci-libs/scikits_learn/Manifest
deleted file mode 100644
index ecff55c949f6..000000000000
--- a/sci-libs/scikits_learn/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX scikits_learn-0.18.1-system-cblas.patch 1366 BLAKE2B 8678695de19e8c56b1a0f98193da79c69d32a81f1c419d0c594afe7865d5469312d7f9799ae0ccca307d2acbdc9f1a8641b446a7cb6b263a81c4b50ff260c1d4 SHA512 be8527fa924502453a9f43af5b3553db50f97b4b1f1ee14fcb2699319e77e3d0d3c19bf82bd66357c6464011dcb819e3625a83360923d322f5d340568a72cbf6
-AUX scikits_learn-0.20.2-fix-cdfast.patch 3401 BLAKE2B cb75c941c2d7a81cde7fe07dc46107730bed0323ce07030f3401138234816c9edc53aff18973545f66a5ed6c54ab11b7dd2a04faf7d106dd046d54c84533c697 SHA512 56ef8a8e66138df5b2899e38d04c9d1303882103fa3c16c31c592a42a22c2111ab490caa0cd6d83332b21184f9c88b13e735cf5317f4f58d7e1c0356a74e0114
-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 2840 BLAKE2B 28ea9aafe02b625f767fdee2411626044a2ef81bbca47a02e07ae959a4d8a59e62d1b33ad213ca8df28245546ae9f3799b1863e41f93dede03140e13fb842bbb SHA512 bfdadfd9a145460d38d2929ffad1e5e487c238ae7609993983ec058687e4abe3ed6eb56e3f3981587c4db163acb74f432d050ee89077e44edf5add2cf83812a6
-EBUILD scikits_learn-0.20.2.ebuild 2892 BLAKE2B e93d86e111aee0f94da2aa95a4c64ea6b58cca96ee806d23519322f3e6bdbb5c3fc529f035266abf83b46abfa1461fd83e1f760e66142cded0a07788314b33d4 SHA512 ce59b40301a261fa90b3646a8c1cc8b473b4fb5b29469df2fda1b951c9dbd17ea043f2a9838dcf12c22761952c83b0ea05d44ff51628d84d4760a13cf39827ae
-EBUILD scikits_learn-0.20.4.ebuild 2892 BLAKE2B e93d86e111aee0f94da2aa95a4c64ea6b58cca96ee806d23519322f3e6bdbb5c3fc529f035266abf83b46abfa1461fd83e1f760e66142cded0a07788314b33d4 SHA512 ce59b40301a261fa90b3646a8c1cc8b473b4fb5b29469df2fda1b951c9dbd17ea043f2a9838dcf12c22761952c83b0ea05d44ff51628d84d4760a13cf39827ae
-EBUILD scikits_learn-0.22.2_p1.ebuild 1773 BLAKE2B 782f6502c22d3e7b4956700ef3c82d0ebc7217fd7d53f78833e8ed8b1f3a5339aa599ac8b2532663abc0be497ee333324a74900ef55d9c362bb9d4d5625c274c SHA512 aa87ac0527c8767a56091dc7d257e03aacac2ef9dff3eea188d8354f7bcc0e4f4fd0cfdf2df525d597f184c953c0b0a8b9cd0f7e3519cf8f8dc77096dc6f5cd6
-MISC metadata.xml 605 BLAKE2B 46a657647a79f0a23cc07b39877b1e57158cdf94d9478c3aa4e7af0dbdbf60acf996d1431076697db764d42bec0d5e0517c1247e91dc36e85823a45784d00e71 SHA512 e14b6835108fa80eca44bab635c9a229da65f048ffcee16cd4ad7736c3a0fb364c94ff0bd9630030653bd3cd78d8dced191c43c7e5aacb3a7f6e61ac45b5bb3d
diff --git a/sci-libs/scikits_learn/files/scikits_learn-0.18.1-system-cblas.patch b/sci-libs/scikits_learn/files/scikits_learn-0.18.1-system-cblas.patch
deleted file mode 100644
index e60f64947b03..000000000000
--- a/sci-libs/scikits_learn/files/scikits_learn-0.18.1-system-cblas.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: scikit-learn-0.18.1/sklearn/_build_utils/__init__.py
-===================================================================
---- scikit-learn-0.18.1.orig/sklearn/_build_utils/__init__.py
-+++ scikit-learn-0.18.1/sklearn/_build_utils/__init__.py
-@@ -31,7 +31,7 @@ def get_blas_info():
-         return False
- 
-     blas_info = get_info('blas_opt', 0)
--    if (not blas_info) or atlas_not_found(blas_info):
-+    if (not blas_info):
-         cblas_libs = ['cblas']
-         blas_info.pop('libraries', None)
-     else:
-Index: scikit-learn-0.18.1/sklearn/setup.py
-===================================================================
---- scikit-learn-0.18.1.orig/sklearn/setup.py
-+++ scikit-learn-0.18.1/sklearn/setup.py
-@@ -63,14 +63,6 @@ def configuration(parent_package='', top
-                          libraries=libraries,
-                          )
- 
--    # some libs needs cblas, fortran-compiled BLAS will not be sufficient
--    blas_info = get_info('blas_opt', 0)
--    if (not blas_info) or (
--            ('NO_ATLAS_INFO', 1) in blas_info.get('define_macros', [])):
--        config.add_library('cblas',
--                           sources=[join('src', 'cblas', '*.c')])
--        warnings.warn(BlasNotFoundError.__doc__)
--
-     # the following packages depend on cblas, so they have to be build
-     # after the above.
-     config.add_subpackage('linear_model')
diff --git a/sci-libs/scikits_learn/files/scikits_learn-0.20.2-fix-cdfast.patch b/sci-libs/scikits_learn/files/scikits_learn-0.20.2-fix-cdfast.patch
deleted file mode 100644
index 1d1de4a3e0e5..000000000000
--- a/sci-libs/scikits_learn/files/scikits_learn-0.20.2-fix-cdfast.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- scikit-learn-0.20.3.orig/sklearn/linear_model/cd_fast.c	2019-08-09 03:05:05.351926119 +0500
-+++ scikit-learn-0.20.3/sklearn/linear_model/cd_fast.c	2019-08-09 03:05:35.022926006 +0500
-@@ -4889,7 +4889,7 @@
- 
- static PyObject *__pyx_pf_7sklearn_12linear_model_7cd_fast_8enet_coordinate_descent(CYTHON_UNUSED PyObject *__pyx_self, __Pyx_memviewslice __pyx_v_w, float __pyx_v_alpha, float __pyx_v_beta, __Pyx_memviewslice __pyx_v_X, __Pyx_memviewslice __pyx_v_y, int __pyx_v_max_iter, float __pyx_v_tol, PyObject *__pyx_v_rng, int __pyx_v_random, int __pyx_v_positive) {
-   PyObject *__pyx_v_dtype = NULL;
--  void (*__pyx_v_gemv)(enum CBLAS_ORDER, enum CBLAS_TRANSPOSE, int, int, float, float *, int, float *, int, float, float *, int);
-+  void (*__pyx_v_gemv)(CBLAS_ORDER, CBLAS_TRANSPOSE, int, int, float, float *, int, float *, int, float, float *, int);
-   float (*__pyx_v_dot)(int, float *, int, float *, int);
-   void (*__pyx_v_axpy)(int, float, float *, int, float *, int);
-   float (*__pyx_v_asum)(int, float *, int);
-@@ -6279,7 +6279,7 @@
- 
- static PyObject *__pyx_pf_7sklearn_12linear_model_7cd_fast_10enet_coordinate_descent(CYTHON_UNUSED PyObject *__pyx_self, __Pyx_memviewslice __pyx_v_w, double __pyx_v_alpha, double __pyx_v_beta, __Pyx_memviewslice __pyx_v_X, __Pyx_memviewslice __pyx_v_y, int __pyx_v_max_iter, double __pyx_v_tol, PyObject *__pyx_v_rng, int __pyx_v_random, int __pyx_v_positive) {
-   PyObject *__pyx_v_dtype = NULL;
--  void (*__pyx_v_gemv)(enum CBLAS_ORDER, enum CBLAS_TRANSPOSE, int, int, double, double *, int, double *, int, double, double *, int);
-+  void (*__pyx_v_gemv)(CBLAS_ORDER, CBLAS_TRANSPOSE, int, int, double, double *, int, double *, int, double, double *, int);
-   double (*__pyx_v_dot)(int, double *, int, double *, int);
-   void (*__pyx_v_axpy)(int, double, double *, int, double *, int);
-   double (*__pyx_v_asum)(int, double *, int);
-@@ -16246,8 +16246,8 @@
-   CYTHON_UNUSED float (*__pyx_v_asum)(int, float *, int);
-   void (*__pyx_v_copy)(int, float *, int, float *, int);
-   void (*__pyx_v_scal)(int, float, float *, int);
--  void (*__pyx_v_ger)(enum CBLAS_ORDER, int, int, float, float *, int, float *, int, float *, int);
--  void (*__pyx_v_gemv)(enum CBLAS_ORDER, enum CBLAS_TRANSPOSE, int, int, float, float *, int, float *, int, float, float *, int);
-+  void (*__pyx_v_ger)(CBLAS_ORDER, int, int, float, float *, int, float *, int, float *, int);
-+  void (*__pyx_v_gemv)(CBLAS_ORDER, CBLAS_TRANSPOSE, int, int, float, float *, int, float *, int, float, float *, int);
-   unsigned int __pyx_v_n_samples;
-   unsigned int __pyx_v_n_features;
-   unsigned int __pyx_v_n_tasks;
-@@ -17965,8 +17965,8 @@
-   CYTHON_UNUSED double (*__pyx_v_asum)(int, double *, int);
-   void (*__pyx_v_copy)(int, double *, int, double *, int);
-   void (*__pyx_v_scal)(int, double, double *, int);
--  void (*__pyx_v_ger)(enum CBLAS_ORDER, int, int, double, double *, int, double *, int, double *, int);
--  void (*__pyx_v_gemv)(enum CBLAS_ORDER, enum CBLAS_TRANSPOSE, int, int, double, double *, int, double *, int, double, double *, int);
-+  void (*__pyx_v_ger)(CBLAS_ORDER, int, int, double, double *, int, double *, int, double *, int);
-+  void (*__pyx_v_gemv)(CBLAS_ORDER, CBLAS_TRANSPOSE, int, int, double, double *, int, double *, int, double, double *, int);
-   unsigned int __pyx_v_n_samples;
-   unsigned int __pyx_v_n_features;
-   unsigned int __pyx_v_n_tasks;
diff --git a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild b/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
deleted file mode 100644
index 87abf6b9c1e3..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.19.0-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="https://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-# tried to unbundle virtual/python-funcsigs, funcsigs, odict
-# but it is a large mess to maintain
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	sci-libs/scikits[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	virtual/blas:=
-	virtual/cblas:=
-"
-
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	virtual/blas:=
-	virtual/cblas:=
-"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.18.1-system-cblas.patch )
-
-python_prepare_all() {
-	# bug #397605
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-
-	# scikits-learn now uses the horrible numpy.distutils automagic
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-
-	# remove bundled cblas
-	rm -r sklearn/src || die
-
-	# commented out, since it is a mess to maintain
-	# use system joblib
-	#rm -r sklearn/externals/joblib || die
-	#sed -i -e '/joblib/d' sklearn/externals/setup.py || die
-	#for f in sklearn/{*/,}*.py; do
-	#	sed -r -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
-	#		-e 's/from (sklearn|\.|)\.externals import/import/' -i $f || die
-	#done
-
-	# use system funcsigs and odict
-	#rm sklearn/externals/funcsigs.py || die
-	#rm sklearn/externals/odict.py || die
-	#for f in sklearn/{utils/fixes.py,gaussian_process/{tests/test_,}kernels.py}; do
-	#	sed -r -e 's/from (sklearn|\.|)\.externals\.funcsigs/from funcsigs/' -i $f || die
-	#done
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# doc builds and runs tests
-	use doc && return
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	esetup.py install \
-			  --root="${T}/test-${EPYTHON}" \
-			  --no-compile ${SCIPY_FCONFIG}
-	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
-	JOBLIB_MULTIPROCESSING=2 SKLEARN_SKIP_NETWORK_TESTS=1 nosetests -v sklearn --exe || die
-	popd > /dev/null
-}
-
-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/scikits_learn/scikits_learn-0.20.2.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
deleted file mode 100644
index 728231683290..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.20.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="https://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-
-RESTRICT="!test? ( test )"
-
-# tried to unbundle virtual/python-funcsigs, funcsigs, odict
-# but it is a large mess to maintain
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	sci-libs/scikits[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	virtual/blas:=
-	virtual/cblas:=
-"
-
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	virtual/blas:=
-	virtual/cblas:=
-"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.18.1-system-cblas.patch
-	"${FILESDIR}"/${PN}-0.20.2-fix-cdfast.patch )
-
-python_prepare_all() {
-	# bug #397605
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-
-	# 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"
-
-	# commented out, since it is a mess to maintain
-	# use system joblib
-	#rm -r sklearn/externals/joblib || die
-	#sed -i -e '/joblib/d' sklearn/externals/setup.py || die
-	#for f in sklearn/{*/,}*.py; do
-	#	sed -r -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
-	#		-e 's/from (sklearn|\.|)\.externals import/import/' -i $f || die
-	#done
-
-	# use system funcsigs and odict
-	#rm sklearn/externals/funcsigs.py || die
-	#rm sklearn/externals/odict.py || die
-	#for f in sklearn/{utils/fixes.py,gaussian_process/{tests/test_,}kernels.py}; do
-	#	sed -r -e 's/from (sklearn|\.|)\.externals\.funcsigs/from funcsigs/' -i $f || die
-	#done
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# doc builds and runs tests
-	use doc && return
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	esetup.py install \
-			  --root="${T}/test-${EPYTHON}" \
-			  --no-compile ${SCIPY_FCONFIG}
-	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
-	JOBLIB_MULTIPROCESSING=2 SKLEARN_SKIP_NETWORK_TESTS=1 nosetests -v sklearn --exe || die
-	popd > /dev/null
-}
-
-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/scikits_learn/scikits_learn-0.20.4.ebuild b/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
deleted file mode 100644
index 728231683290..000000000000
--- a/sci-libs/scikits_learn/scikits_learn-0.20.4.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 flag-o-matic
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Python modules for machine learning and data mining"
-HOMEPAGE="https://scikit-learn.org"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-
-RESTRICT="!test? ( test )"
-
-# tried to unbundle virtual/python-funcsigs, funcsigs, odict
-# but it is a large mess to maintain
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	sci-libs/scikits[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	virtual/blas:=
-	virtual/cblas:=
-"
-
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	virtual/blas:=
-	virtual/cblas:=
-"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.18.1-system-cblas.patch
-	"${FILESDIR}"/${PN}-0.20.2-fix-cdfast.patch )
-
-python_prepare_all() {
-	# bug #397605
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-
-	# 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"
-
-	# commented out, since it is a mess to maintain
-	# use system joblib
-	#rm -r sklearn/externals/joblib || die
-	#sed -i -e '/joblib/d' sklearn/externals/setup.py || die
-	#for f in sklearn/{*/,}*.py; do
-	#	sed -r -e '/^from/s/(sklearn|\.|)\.externals\.joblib/joblib/' \
-	#		-e 's/from (sklearn|\.|)\.externals import/import/' -i $f || die
-	#done
-
-	# use system funcsigs and odict
-	#rm sklearn/externals/funcsigs.py || die
-	#rm sklearn/externals/odict.py || die
-	#for f in sklearn/{utils/fixes.py,gaussian_process/{tests/test_,}kernels.py}; do
-	#	sed -r -e 's/from (sklearn|\.|)\.externals\.funcsigs/from funcsigs/' -i $f || die
-	#done
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# doc builds and runs tests
-	use doc && return
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	esetup.py install \
-			  --root="${T}/test-${EPYTHON}" \
-			  --no-compile ${SCIPY_FCONFIG}
-	pushd "${T}/test-${EPYTHON}/$(python_get_sitedir)" || die > /dev/null
-	JOBLIB_MULTIPROCESSING=2 SKLEARN_SKIP_NETWORK_TESTS=1 nosetests -v sklearn --exe || die
-	popd > /dev/null
-}
-
-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/shapely/Manifest b/sci-libs/shapely/Manifest
new file mode 100644
index 000000000000..be3d0db03bb6
--- /dev/null
+++ b/sci-libs/shapely/Manifest
@@ -0,0 +1,8 @@
+AUX shapely-1.6.4_p2-test_operations.patch 722 BLAKE2B 661659bc1d2f8c8a5d6b77f0ca746024aa9724f2c25047d8203d591a4f793982d4cf9bebaa6abcaf48c0cf1b266ef941b986897d26bece39519f8fcaf5dcaf96 SHA512 c1e9eda0cf8dbfbcee2d6994f470559507c754fa2bf03973ac692ca6bd2fcf62ce05e15116515877e8900a89c55c6b2bf6e70b74e2cfced8d3852608901b34db
+DIST Shapely-1.6.4.post2.tar.gz 225745 BLAKE2B 96e995db6dd1464bac7c2562efdc7f298a5f23c388e44f334db685b1cfa1025ff403db870e11328977a267483726504e03b6d7c47fe4234a3a5966a13b2b7311 SHA512 027c816ef2104f654569ca658b52b87c60e5ba6a45927fcc51c23dd1922f3f9f7fdcea3601160b0a999e39611617142833ccac790777093be8b96a0d9083f78f
+DIST shapely-1.7.0.tar.gz 281419 BLAKE2B 1a4e84104f21d2f5a5eb810883a89deb20fd47cf146efed884994786364b29bb5a194b063a50ae21842c07c335cbbee0c3d1a1e4ff4e43e0d083080fe33815ac SHA512 4d944fc6727e11d004ef7ba0325c159aa5ae03043f17b029ab0a399d6dcd361c4d299ad864a045a99b0229e333d5b42634bc6fd1ed94b914b7cf58fb886af2de
+DIST shapely-1.7.1.tar.gz 293368 BLAKE2B 14d9cb0c2b486a3a20b71c0cde7260ec357287ea020352c0320eea07b91674605bdcd22512b33c5ac5a71b89c3d811946f8dd6d3b90c61398203a4c68f30d067 SHA512 72070437960a8c1cf6504b5f4ccc8ec509f87fb6a90178e291aff14889f5add89f9ed4f7e9a19799ce0835c1aea3f0241eaa6efd4d8ea5b879f2167f7c1de50a
+EBUILD shapely-1.6.4_p2-r1.ebuild 1261 BLAKE2B 642299e5826a038c523a5bced181f9bbfedccd6cc09f9e7420ff8182f425ea94e54989fb595659a2e8a25054e40c80ea0ea1621d198e986b83432faf54e8edad SHA512 5a2df29e69ed543ee8bdcf3a9b972769a95000be8948ee2e08f0ed86d867b41eb4713d8137bbc9add0af9f888791c7a6d67e9e025374b867d7df3356b3ca7557
+EBUILD shapely-1.7.0.ebuild 841 BLAKE2B 215c6b3cbef150d7de204c0537962c68851578404ae0aeac37ee7339e74fdec6e4559dcb776c45be83eb56093f6b822ce41978132291495d98b892746388cac4 SHA512 4e19ff01ef50b6ce96a70052725d1bbf57f39d46d3305c9ac5fb12bec0581abf3c009ee2daae636ae3c57ae4ab35a70c08bf71d50fe5e0e9774fec5f59fe86ff
+EBUILD shapely-1.7.1.ebuild 839 BLAKE2B cdff940dce5acbd360bb81467475bdf7bd95d512f23c45c9bc7604c6769d56f5e111e0c6a830ab3c79ef84b17fe9878eb424ddd56b62588a80cb18115b68af2e SHA512 407d39827d32b759fc7944195bed880243424374555471a283700c47426e39ab3ec57ec6808e41b9670f1783f580f19737c0aeb12ca2f39da1ef32bf6e17e0e5
+MISC metadata.xml 783 BLAKE2B 365db96ce9bd755cd3c080f84883666ceb74d1b78a5a0692552f53a6a5b5dd468c973857f0d0e860ffc6a78c623518e6bd781682118ff0d1e355fca68bdc861c SHA512 e97b0011a6581773ddc9b13879517f2295c850822f267dc3af34b4dae0683f3e0e3b60900b2cf6206084da7bc32561e42f64e7c3709461a40305bf821667450b
diff --git a/sci-libs/Shapely/files/Shapely-1.6.4_p2-test_operations.patch b/sci-libs/shapely/files/shapely-1.6.4_p2-test_operations.patch
index a9213a333765..a9213a333765 100644
--- a/sci-libs/Shapely/files/Shapely-1.6.4_p2-test_operations.patch
+++ b/sci-libs/shapely/files/shapely-1.6.4_p2-test_operations.patch
diff --git a/sci-libs/Shapely/metadata.xml b/sci-libs/shapely/metadata.xml
index 4cb05623997a..c23d0b5a4d40 100644
--- a/sci-libs/Shapely/metadata.xml
+++ b/sci-libs/shapely/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>expeditioneer@gentoo.org</email>
-    <name>Dennis Lamm</name>
+  <maintainer type="project">
+    <email>3dprint@gentoo.org</email>
+    <name>Gentoo 3D Printer Project</name>
   </maintainer>
   <longdescription>
     Shapely is a BSD-licensed Python package for manipulation and analysis of planar geometric objects.
diff --git a/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild b/sci-libs/shapely/shapely-1.6.4_p2-r1.ebuild
index a9ad4b613f26..be793427c4b7 100644
--- a/sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild
+++ b/sci-libs/shapely/shapely-1.6.4_p2-r1.ebuild
@@ -3,6 +3,10 @@
 
 EAPI=7
 
+MY_PN="Shapely"
+MY_PV="$(ver_cut 1-3).post$(ver_cut 5)"
+MY_P="${MY_PN}-${MY_PV}"
+
 PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
@@ -10,14 +14,12 @@ inherit distutils-r1
 DESCRIPTION="Geometric objects, predicates, and operations"
 HOMEPAGE="https://pypi.org/project/Shapely/"
 
-MY_PV="$(ver_cut 1-3).post$(ver_cut 5)"
-
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/Toblerity/${PN}.git"
+	EGIT_REPO_URI="https://github.com/Toblerity/${MY_PN}.git"
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${MY_P}.tar.gz"
 	KEYWORDS="amd64 ~arm64 x86"
 fi
 
@@ -36,7 +38,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=( "${FILESDIR}/${P}-test_operations.patch" ) # bug 701624
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
 
 python_prepare_all() {
 	# fix install path for Cython definition file
diff --git a/sci-libs/Shapely/Shapely-1.7.0.ebuild b/sci-libs/shapely/shapely-1.7.0.ebuild
index a9bd484c2d61..3e2d10095cec 100644
--- a/sci-libs/Shapely/Shapely-1.7.0.ebuild
+++ b/sci-libs/shapely/shapely-1.7.0.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=7
 
+MY_PN="Shapely"
+MY_P="${MY_PN}-${PV}"
+
 PYTHON_COMPAT=( python3_{7..8} )
 
 inherit distutils-r1
@@ -24,6 +27,8 @@ BDEPEND="${RDEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]
 "
 
+S="${WORKDIR}/${MY_P}"
+
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs dev-python/matplotlib
diff --git a/sci-libs/shapely/shapely-1.7.1.ebuild b/sci-libs/shapely/shapely-1.7.1.ebuild
new file mode 100644
index 000000000000..483e0920ac6e
--- /dev/null
+++ b/sci-libs/shapely/shapely-1.7.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Shapely"
+MY_P="${MY_PN}-${PV}"
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Geometric objects, predicates, and operations"
+HOMEPAGE="https://pypi.org/project/Shapely/ https://github.com/Toblerity/Shapely"
+SRC_URI="https://github.com/Toblerity/Shapely/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/geos-3.3
+"
+
+BDEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs dev-python/matplotlib
+
+python_test() {
+	distutils_install_for_testing
+	${EPYTHON} -m pytest tests || die "tests failed under ${EPYTHON}"
+}
diff --git a/sci-libs/shogun/Manifest b/sci-libs/shogun/Manifest
deleted file mode 100644
index 476c2250092a..000000000000
--- a/sci-libs/shogun/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX shogun-4.1.0-remove-C-linkage.patch 825 BLAKE2B c95a7a322b669aa51a9a334700887914b239f240e2fc7932975aad8a5816dadb5a22ea4d2bc8ad86ea4bf3bf534d197ed9aa1144ea641bf1483ed1fe9886f3a2 SHA512 96bdedabcf2e5db1d37f87017c0c436acad97f4ba43a9a2f3c2bb920d8d764dfbc6a3825334e90ed19729870a283a658c24bea5f6ca0ac588a3f9b4bfae9a302
-AUX shogun-5.0.0-fix-buildsystem.patch 2889 BLAKE2B 63593dcf5f077310c31983446d5060c15c23d45d3eb5e3780c0d7a53074ccef57da79fb115ce67b109ed94f2e58aa1e5804bdbd1d0d0a13c05de716de7ed1058 SHA512 3119a95e8fe76804eb113361e09260bbb951679faeb3360d378c0a9afcdbf322ac75f02da6e4c799102949abbd97006f2bbb7550b5f5b01fa8b4335ac530f377
-DIST shogun-5.0.0.tar.bz2 2448509 BLAKE2B 85352d782740b4c671bb6081e0445bb7e801e27e36fdc0f82658b937fd6658c41016e4a91841ddb09ae9062b77d32f290f56b191318c1c34bf0812d1b9a8b364 SHA512 fa8d9dee4596acce12022540a6927cbdb62e08f8468c8be3790de07ebf3a53055032bcc532b28334ca83284c38f2b0153602634f12bafe4019acb9121b9ff236
-DIST shogun-data-0.9.tar.bz2 287533841 BLAKE2B 796830262205961b88715f4eb60a47ff2ad108426b7af8e4e1a0733920962ad8154a1ab9892356e9793be24d415fcbc358960210f089a0173f55a0091ea3c0d1 SHA512 ab501640e2db650603899c857866b451fac5c7bbbc7b4ef98559581928869cea49aa326dfca1bb398eee7ebc8843dcc8ee3105c9f462718f1af672aac6b9340a
-EBUILD shogun-5.0.0-r1.ebuild 3951 BLAKE2B 41165437edeb2f42204323c59cef31013e2decb0b2666b64baab9c8f6ab1382a9d5467f8dd52f4f67f31e242b15a4eecf94af19283289b3a0be49d3333bde74d SHA512 4e3136be78a8f23a75f340625bc9ee12b68ad929e6fdae491e8cf49d0ca73fee48abf0536af2932cb04659d0454d4e4b2428f6a778a206dc8ce866ea80c93c42
-MISC metadata.xml 1627 BLAKE2B 871fc71cd8ae67ef94fa060b50f249b233333ec934db4d8ad238f24408e491f071d1271903f57ad2548923b2091c0f2738a7ce3f269d5c24fd10300aaf179047 SHA512 babaf4f8a5d4a7d83e678d2ba1cb4f29a15a928740e7c2b312fe03ffd2c909f1f867a071573954269a03bd8f915f38f82c4c11782573ae08be6ec053cf3b54c6
diff --git a/sci-libs/shogun/files/shogun-4.1.0-remove-C-linkage.patch b/sci-libs/shogun/files/shogun-4.1.0-remove-C-linkage.patch
deleted file mode 100644
index 08edcfac97a2..000000000000
--- a/sci-libs/shogun/files/shogun-4.1.0-remove-C-linkage.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Prevent C linkage errors due to templates in extern "C" blocks:
-* /usr/lib/gcc/x86_64-pc-linux-gnu/5.3.0/include/g++-v5/bits/cpp_type_traits.h:85:3: error: template with C linkage
-*    template<bool>
-*    ^
-* /usr/lib/gcc/x86_64-pc-linux-gnu/5.3.0/include/g++-v5/bits/cpp_type_traits.h:89:3: error: template specialization with C linkage
-*    template<>
-*    ^
-extern "C" blocks can be removed in shogun, as R internally correctly protects C symbols
-
---- shogun-4.1.0/src/interfaces/r_modular/sg_print_functions.cpp
-+++ shogun-4.1.0/src/interfaces/r_modular/sg_print_functions.cpp
-@@ -1,4 +1,3 @@
--extern "C" {
- #include <R.h>
- #include <Rinternals.h>
- #include <Rdefines.h>
-@@ -7,7 +6,6 @@
- #include <Rinterface.h>
- #include <R_ext/RS.h>
- #include <R_ext/Error.h>
--}
- 
- #include <shogun/base/SGObject.h>
- #include <stdio.h>
diff --git a/sci-libs/shogun/files/shogun-5.0.0-fix-buildsystem.patch b/sci-libs/shogun/files/shogun-5.0.0-fix-buildsystem.patch
deleted file mode 100644
index 1eb7cd075ece..000000000000
--- a/sci-libs/shogun/files/shogun-5.0.0-fix-buildsystem.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-* Remove setting of user flags
-* Remove erroneous bundling of Eigen
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,15 +33,6 @@
- SET(EIGEN_VERSION_MINIMUM 3.1.2)
- SET(VIENNACL_VERSION_MINIMUM 1.5.0)
- 
--# Store system's or distribution's C[XX]FLAGS.
--SET(SYSTEM_C_FLAGS "${CMAKE_C_FLAGS}")
--SET(SYSTEM_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
--STRING(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_UC)
--IF(NOT ("${BUILD_TYPE_UC}" STREQUAL "DISTRIBUTION"))
--	SET(CMAKE_C_FLAGS "")
--	SET(CMAKE_CXX_FLAGS "")
--ENDIF(NOT ("${BUILD_TYPE_UC}" STREQUAL "DISTRIBUTION"))
--
- # CCACHE
- OPTION(ENABLE_CCACHE "Enable ccache for compilation" ON)
- FIND_PACKAGE(CCache)
-@@ -174,24 +165,6 @@
- 	SET(COMPILER_WARNINGS "-Wall -Wno-unused-parameter -Wformat -Wformat-security -Wparentheses -Wshadow -Wno-unknown-pragmas -Wno-deprecated")
- ENDIF()
- 
--IF(CMAKE_COMPILER_IS_GNUCXX)
--	SET(RELEASE_COMPILER_FLAGS "-fexpensive-optimizations -frerun-cse-after-loop -fcse-follow-jumps -finline-functions -fschedule-insns2 -fthread-jumps -fforce-addr -fstrength-reduce -funroll-loops")
--	IF (${MACHINE} MATCHES "x86_64" OR ${MACHINE} MATCHES "i686")
--		SET(RELEASE_COMPILER_FLAGS "${RELEASE_COMPILER_FLAGS} -mfpmath=sse")
--	ENDIF()
--ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
--	SET(RELEASE_COMPILER_FLAGS "-funroll-loops")
--ENDIF()
--SET(SWIG_CXX_COMPILER_FLAGS "-O0 -g")
--SET(CMAKE_C_FLAGS "${COMPILER_WARNINGS} ${CMAKE_C_FLAGS}")
--SET(CMAKE_CXX_FLAGS "${COMPILER_WARNINGS} ${CMAKE_CXX_FLAGS}")
--SET(CMAKE_C_FLAGS_RELEASE "-O3 ${RELEASE_COMPILER_FLAGS}")
--SET(CMAKE_CXX_FLAGS_RELEASE "-O3 ${RELEASE_COMPILER_FLAGS}")
--SET(CMAKE_C_FLAGS_DISTRIBUTION "-O2")
--SET(CMAKE_CXX_FLAGS_DISTRIBUTION "-O2")
--SET(CMAKE_C_FLAGS_DEBUG "-g")
--SET(CMAKE_CXX_FLAGS_DEBUG "-g")
--
- OPTION(ENABLE_COVERAGE "Enable code coverage" OFF)
- IF(ENABLE_COVERAGE)
- 	IF(NOT CMAKE_COMPILER_IS_GNUCXX)
-@@ -617,13 +590,6 @@
- 	include(external/Eigen3)
- 	LIST(APPEND SYSTEM_INCLUDES ${EIGEN_INCLUDE_DIR})
- ELSE()
--    # eigen3 bug related to aliasing operators and self-storing.
--    # TODO put in proper reference and version from when this is fixed
--    IF(${EIGEN_VERSION} VERSION_GREATER 3.2.90)
--        MESSAGE(WARNING "The system Eigen3 version ${EIGEN_VERSION} is buggy, manually bundling.")
--        include(external/Eigen3)
--    ENDIF()
--
- 	LIST(APPEND SYSTEM_INCLUDES ${EIGEN_INCLUDE_DIR})
- ENDIF()
- 
-@@ -957,11 +923,6 @@
- # Respect system's or distribution's C[XX]FLAGS.
- OPTION(SWIG_WITH_SYSTEM_CFLAGS "Enable system's C[XX]FLAGS for compilation of swig-binaries" ON)
- 
--IF(NOT ("${BUILD_TYPE_UC}" STREQUAL "DISTRIBUTION"))
--	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SYSTEM_C_FLAGS}")
--	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SYSTEM_CXX_FLAGS}")
--ENDIF(NOT ("${BUILD_TYPE_UC}" STREQUAL "DISTRIBUTION"))
--
- IF(SWIG_WITH_SYSTEM_CFLAGS)
- 	SET(SWIG_CXX_COMPILER_FLAGS "${SWIG_CXX_COMPILER_FLAGS} ${SYSTEM_CXX_FLAGS}")
- ENDIF(SWIG_WITH_SYSTEM_CFLAGS)
diff --git a/sci-libs/shogun/metadata.xml b/sci-libs/shogun/metadata.xml
deleted file mode 100644
index 88454ce87eb6..000000000000
--- a/sci-libs/shogun/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription lang="en">
-	SHOGUN - is a new machine learning toolbox with focus on large
-	scale kernel methods and especially on Support Vector Machines
-	(SVM) with focus to bioinformatics. It provides a generic SVM
-	object interfacing to several different SVM implementations. Each
-	of the SVMs can be combined with a variety of the many kernels
-	implemented. It can deal with weighted linear combination of a
-	number of sub-kernels, each of which not necessarily working on the
-	same domain, where	an optimal sub-kernel weighting can be learned
-	using Multiple Kernel Learning.	Apart from SVM 2-class
-	classification and regression problems, a number of linear methods
-	like Linear Discriminant Analysis (LDA), Linear Programming Machine
-	(LPM), (Kernel) Perceptrons and also algorithms to train hidden
-	markov models are implemented. The input feature-objects can be
-	dense, sparse or strings and of type int/short/double/char and can
-	be converted into different feature types. Chains of preprocessors
-	(e.g. substracting the mean) can be attached to each feature object
-	allowing for on-the-fly pre-processing.
-	</longdescription>
-	<use>
-		<flag name="R">Enable support for <pkg>dev-lang/R</pkg></flag>
-		<flag name="octave">Enable support for <pkg>sci-mathematics/octave</pkg></flag>
-		<flag name="opencl">Enable support for building against OpenCL</flag>
-	</use>
-</pkgmetadata>
diff --git a/sci-libs/shogun/shogun-5.0.0-r1.ebuild b/sci-libs/shogun/shogun-5.0.0-r1.ebuild
deleted file mode 100644
index d4e67145a5f1..000000000000
--- a/sci-libs/shogun/shogun-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils flag-o-matic python-single-r1 toolchain-funcs versionator
-
-MYPV=$(get_version_component_range 1-2)
-MYPD=${PN}-data-0.9
-
-DESCRIPTION="Large Scale Machine Learning Toolbox"
-HOMEPAGE="https://shogun-toolbox.org/"
-SRC_URI="
-	ftp://shogun-toolbox.org/shogun/releases/${MYPV}/sources/${P}.tar.bz2
-	test? ( ftp://shogun-toolbox.org/shogun/data/${MYPD}.tar.bz2 )
-	examples? ( ftp://shogun-toolbox.org/shogun/data/${MYPD}.tar.bz2 )"
-
-LICENSE="GPL-3 free-noncomm"
-SLOT="0/16"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_sse doc examples lua octave opencl python R ruby static-libs test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( python )"
-
-RDEPEND="
-	app-arch/bzip2
-	app-arch/gzip
-	app-arch/lzma
-	app-arch/snappy
-	dev-libs/lzo
-	dev-cpp/eigen:3
-	dev-libs/json-c:=
-	dev-libs/libxml2
-	dev-libs/protobuf:=
-	net-misc/curl
-	sci-libs/arpack
-	sci-libs/arprec
-	sci-libs/colpack
-	sci-libs/hdf5:=
-	sci-libs/nlopt
-	sci-mathematics/glpk:=
-	sci-mathematics/lpsolve:=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/blas
-	virtual/cblas
-	virtual/lapack
-	lua? ( dev-lang/lua:0 )
-	octave? ( >=sci-mathematics/octave-4.2.0:=[hdf5] )
-	opencl? ( virtual/opencl )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	R? ( dev-lang/R )
-	ruby? ( dev-ruby/narray )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.8.13-r1[dot]
-		dev-python/sphinx
-	)
-	lua? ( >=dev-lang/swig-3.0.12 )
-	octave? ( >=dev-lang/swig-3.0.12 )
-	python? (
-		>=dev-lang/swig-3.0.12
-		test? (
-			dev-python/scipy
-		)
-	)
-	R? ( >=dev-lang/swig-3.0.12 )
-	ruby? ( >=dev-lang/swig-3.0.12 )
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-		')
-		>=dev-cpp/gtest-1.8.0
-	)"
-
-# javamodular needs jblas (painful to package properly)
-# permodular work in progress (as 3.2.0)
-# could actually support multiple pythons, multiple rubys
-# feel free to do work for it
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.0-fix-buildsystem.patch
-	"${FILESDIR}"/${PN}-4.1.0-remove-C-linkage.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	export ATLAS_LIBRARY="$($(tc-getPKG_CONFIG) --libs cblas lapack)"
-	export CBLAS_LIBRARY="$($(tc-getPKG_CONFIG) --libs cblas)"
-	export ATLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas cblas lapack)"
-	export LAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-
-	append-cppflags "$($(tc-getPKG_CONFIG) --cflags cblas)"
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DCMAKE_SKIP_INSTALL_RPATH=ON
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DENABLE_TESTING=$(usex test)
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DDISABLE_SSE=$(usex !cpu_flags_x86_sse)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Pandoc=ON
-		$(cmake-utils_use_find_package doc Sphinx)
-		$(cmake-utils_use_find_package doc Doxygen)
-
-		# Features:
-		-DENABLE_COVERAGE=OFF
-		-DENABLE_COLPACK=ON
-		-DENABLE_PROTOBUF=ON
-		-DENABLE_PYTHON_DEBUG=OFF
-		-DENABLE_VIENNACL=$(usex opencl)
-		-DUSE_ARPREC=ON
-		-DUSE_HDF5=ON
-
-		# Bindings:
-		-DJavaModular=OFF
-		-DPerlModular=OFF
-		-DCSharpModular=OFF
-		-DLuaModular=$(usex lua)
-		-DOctaveModular=$(usex octave)
-		-DPythonModular=$(usex python)
-		-DRModular=$(usex R)
-		-DRubyModular=$(usex ruby)
-
-		# Disable bundled libs
-		-DBUNDLE_COLPACK=OFF
-		-DBUNDLE_JSON=OFF
-		-DBUNDLE_NLOPT=OFF
-	)
-	cmake-utils_src_configure
-
-	# gentoo bug #302621
-	has_version 'sci-libs/hdf5[mpi]' && export CXX=mpicxx CC=mpicc
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile -C doc
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc; then
-		local i
-		for i in lua octave python R ruby; do
-			if use $i; then
-				docinto html/${i,}_modular
-				dodoc -r "${BUILD_DIR}"/src/interfaces/${i,}_modular/modshogun/doxygen_xml/.
-			fi
-		done
-	fi
-}
diff --git a/sci-libs/sktime/Manifest b/sci-libs/sktime/Manifest
new file mode 100644
index 000000000000..392989374e96
--- /dev/null
+++ b/sci-libs/sktime/Manifest
@@ -0,0 +1,3 @@
+DIST sktime-0.4.2.tar.gz 9662976 BLAKE2B 248c2a9868f9199caab5c4c724ddcad61301a75ce1425baaabb2185da37d80a68332bf5c2d2d64a10e0b844bea9226be5291005d9893705eb0ff8f2018c6493d SHA512 855b33f42f938c671e99b8fa58ff6adbf67144daf53dd883ac041fe9b8cd5400cfbb8e27169d491c6bea2d76a53c035bae08d9e4f8a1c6f5f444c08bcd65c4f4
+EBUILD sktime-0.4.2.ebuild 754 BLAKE2B 755cb1ca5f841e6ff6602461a55fe498186d9c3e6ab0343a30ee15b81f5d11d8a389a0876ecfe59deba4f401a450c58c9d16debf6f77fed98381079f625c1524 SHA512 e78df11e7d3cb1cbdcb30ae0518b5d791d9c2f898644cfa58b315f572566ca3bb625b4a5f27bcfbc663e0f429a445b22077354c081e2a8f721e519f1025717c9
+MISC metadata.xml 513 BLAKE2B f62f3b568ddc39ea99a6335525b344a5ccca6d015c52aa0e4b6d440d446b8ef04f03902f58377be5ee138d4b1563a45bd94ba4cf5fa029ba336bb756cb4163c2 SHA512 be665b116579427beed389b5404f02cdd2d55e858a818e2ea2f9883bf4a9b6ad8aa819367db94540170afe04dd2f271911f756bd5e872484b13268be4185ff9a
diff --git a/sci-libs/sktime/metadata.xml b/sci-libs/sktime/metadata.xml
new file mode 100644
index 000000000000..a88194c685df
--- /dev/null
+++ b/sci-libs/sktime/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@aisha.cc</email>
+    <name>Aisha Tammy</name>
+  </maintainer>  
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">sktime</remote-id>
+    <remote-id type="github">alan-turing-institute/sktime</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-libs/sktime/sktime-0.4.2.ebuild b/sci-libs/sktime/sktime-0.4.2.ebuild
new file mode 100644
index 000000000000..b3b2954314fc
--- /dev/null
+++ b/sci-libs/sktime/sktime-0.4.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+DESCRIPTION="scikit-learn toolbox for working with time series"
+HOMEPAGE="https://sktime.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	sci-libs/scikit-learn[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_compile() {
+	distutils-r1_python_compile bdist_egg egg_info bdist_wheel
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
diff --git a/sci-libs/suitesparseconfig/Manifest b/sci-libs/suitesparseconfig/Manifest
index a63ed7f91c4e..8ef81ca6b75d 100644
--- a/sci-libs/suitesparseconfig/Manifest
+++ b/sci-libs/suitesparseconfig/Manifest
@@ -1,3 +1,3 @@
 DIST suitesparseconfig-5.4.0.tar.bz2 257352 BLAKE2B 3832e34281c742a7d704dde866c53c742420486d782075e047b605fb2062d77353cda8670138c4bef62c73d16e123a8a74f65272a01766f124c1e53f9ba32e9d SHA512 e91f60f426b73add473c6341e30512b8fbe65b7850cd83f3852e78f1e74ce067b7ae1577ccc795698e680a841a9d32c2ca073651a4fe95f0b723578721aec874
-EBUILD suitesparseconfig-5.4.0.ebuild 789 BLAKE2B 182d30c28c5f0f29e4e94ce1f99573edc6d577884161934869f8f9d5f6f5b5fe3c5aca84680bb887e629be9966c00311afbe07a34ecd01be5e6e2ef95b859ba9 SHA512 b9755384398eba837809d2b99976d035b90d1396930627dbba31154756a2043841daf4ae1baba651af0c8b1272c6db30754acdd71d962077d1b2dd546c57a456
+EBUILD suitesparseconfig-5.4.0.ebuild 788 BLAKE2B f83043838503cb99dbe1be0dc543264b820fab18d784f4112bc7d91a8657510e693f8a645964b88de0d851e0264549a19d18220206cbd67378f83da01eb7bba8 SHA512 b4f92cd3df8a867f8baea9a4a5dc76f7bf5f9819af5bea2d603f526705211aa02503f4f8863c6917be1e6e9dfea028fcdb5b980560c4e2749a5f5312f06ef5b5
 MISC metadata.xml 476 BLAKE2B f583e4dc6801797ee1572a38f1e4aaaac0811a709ce56a28d8e1f4f13f60f62a702b034809edc488d0b91920f8c5d40d48226213837d92a3e496cf65a6061c04 SHA512 fbbcd2de1d7b23e4eb45d8102fe76aa4251b83ce2b1fd7ef9cb599c7716ff662b8182060ce7b350ed3541b39483cf72c7c9ac810db1fe739f82406606412acb8
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
index ca2f33e39997..b73a80c867c8 100644
--- a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
+++ b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 # 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"
+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/sundials/Manifest b/sci-libs/sundials/Manifest
index aa4725544047..92b18ddce7e3 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -15,5 +15,5 @@ EBUILD sundials-4.0.2.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb
 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
-EBUILD sundials-5.2.0.ebuild 2067 BLAKE2B 9f3324ddf9158af16d2489ac656a660859f80470077afaa59f0758b2f1c936110701d29bf24c482261055fc43c7b8b3e9bf7497137bacc2b3d487d87034418ca SHA512 2c1d0f672ca0c2a3b5da077557665b9f481cc9a3c8b5bc5f96e59c8cfcd05d5f9956afd2f367ffc141467961642b39d8443ffbe166850280fb12a8a0d05a0e41
+EBUILD sundials-5.2.0.ebuild 2066 BLAKE2B 07034582741d9e807559a0ae33e3476a5d0162d875678cb540198cbea4edd4a95473bd2e311e0033d5be5737f885b0a9ba7f323f0e08e969f83e6f2ac6585f4c SHA512 dd808529c79eddb5a39b01649517f01a3a48806f4672f60be102f39e50e967a31cb4a23456857b45bfdadae4f7669704610c95c4775ea7b85c32ebb4b2b0e739
 MISC metadata.xml 1059 BLAKE2B 48ccadfac9b7ea4203334ffdadaa76ab3164273835c727e76085db3a5afc179404eb21c74aad77ceb368397377afb0efa27d798c849eab2ffc35153cd4fe7588 SHA512 47da8b9edc993c480a045642ad2746ff6180e54e1ad368823fd81b0d217e72c31394d7575cb4c2d5e5cfea065dffb01751bc8b1088f0f1a6feaaea15c2c7fb8f
diff --git a/sci-libs/sundials/sundials-5.2.0.ebuild b/sci-libs/sundials/sundials-5.2.0.ebuild
index c6bc6848c819..fb50f916f614 100644
--- a/sci-libs/sundials/sundials-5.2.0.ebuild
+++ b/sci-libs/sundials/sundials-5.2.0.ebuild
@@ -16,7 +16,7 @@ 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"
+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 )"
 
diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index 2a5b7eacfbf6..227ad46901c0 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -2,8 +2,11 @@ AUX superlu-4.3-autotools.patch 18676 BLAKE2B c6312a4db288aed46f696b57291268cfe4
 AUX superlu-4.3-format-security.patch 312 BLAKE2B 2ab1eaa7072a06abf80373a86e73d3cd131a5dfb1fee370fac330c7932d0b20dc94f2711be077d3739af0f1d6b9779080f0ccf75a65b50156aab35cfd451b7d4 SHA512 86072c671b946a73e8857fcf60499c589c0de8ca2433c2310701a2249eb32968e7ab83e638be1fcee3358d3b1432cba988cf11644962dbf09045b4907b9ebf6a
 AUX superlu-5.2.1-no-implicits.patch 4950 BLAKE2B 32a01cb343e21ee870fdfec54f3e529861ddc521966d732430effaad34e442d83f53da222301ff719d81777082ccfa85a262cddf577a8b0320d0a2fc63b1e042 SHA512 9bcf34847baddd7d330638d9115359cd2bd6d7630cc24a8fd9432b83485e6b2f1bb2500971f65b1fe26ec2ca70f7483105e1a02ba4083763ca79794dabe8551a
 AUX superlu-5.2.1-pkgconfig.patch 1013 BLAKE2B a36aac6c06fa8cb4bd3d19fcc74b27c092283b209665cb4dc5d3336f4b025f5145a190e76105b5e96f846e02fd4fe43a71b9542937beefe5e8b375b54ad87e05 SHA512 f22dcbaaa6857008b75b8c6481b219b11c09ebcfe2dffe0a4d4f0cba6392f18fc9a5a870b2a8efa7c31df321b78186cbde7cf8739da59dc089fa3b6ae836bf36
+AUX superlu-5.2.2-no-internal-blas.patch 733 BLAKE2B d289296570a02914591ed213e1c866124ae29f94348ca5cbfe9313dc581e12aba20fd34741b89b84988365c4c64b14c47d08b82c79870ab57f21dc8d0a0f6370 SHA512 496f5ed971cdd2dfaedf065d5ec52e0c6435506fcace45ed9059cb17d9ea1914cc9b0276b68a250728cc5bcf48a184bca5638e3fcadabd170eb1c8c9d342844c
 DIST superlu_4.3.tar.gz 2876631 BLAKE2B 0a563e6730394f8e69fe13f1418f9f046bd37c848c51063e93a24a209e50a67f91b725eb3978fd6c4d28e51615806d6c0b6a2539cbc0d7fd11b5e4f0a9360148 SHA512 5c13da47b79160be14719f62ccdf5d59142a172e25a988fa340eaeb001a64d7f45ba39e675cb7aa3571bec52cb3a7cda0bb7a708c9608184ba6251edb7990e8c
 DIST superlu_5.2.1.tar.gz 2560875 BLAKE2B b1dd51bddb55061f5756f3cf766f80e506f7cc12b272c2ceebbae71cab9314000308b72cf265d5948ed69c68d0ad0adeb938a4471250147b0fcfdc2b80298db7 SHA512 30538b4c2809294b8f34646bce6445944f21a1dffaf3ec0a0f29a55d5261caa56e4279d7722bb95cc9d89450d36ded969617edc82ecce7d0f1dfb24040d80d07
+DIST superlu_5.2.2.tar.gz 2481538 BLAKE2B db9d6437c8012f1aeeb3313212298a77e4ef04405c6ec853ceeef8b80426ea80d8b9fc30a0ca2dd7288131a0e21c43e17cafafaa7fb615d6d825b54f4beb84a2 SHA512 091928a3df3433b337ebdacdb28de341d6d29d655965de6ffd656a6de18cf11171555bfd3af73082af62b1cead6835b4c11e4ba524a32db7f7d28db47c9d490c
 EBUILD superlu-4.3-r1.ebuild 1681 BLAKE2B 259f8829b31303e21aefab2d76d9ef3771dc0bae7418ce3b606cb6f1d457d567de517b0332067427f5cbbeea93d1ac42fa5da60b5337088f3412d3f7713a4775 SHA512 482387eb781140c1822979529cdbf83ef1b665d00cd246bab98bd70bd843bd65077bc97817e3c04ff073a44d8ed072af8ee69cb9804532b7137e6c6f9088e10b
 EBUILD superlu-5.2.1-r1.ebuild 1528 BLAKE2B f5da9af1ae76566415e0df6d5ec814bacd79639f073f6c6fa881957033affb589360bf26e035e07073dca4eaedb76b60368961308c0a97018a0be98e330477e0 SHA512 3b0a798b47be26a58e4a296895206623389c9ed5f4fca43b0582b75e5dfa0707734403d7a6b96ca448b13dbf793259f3015920c431e923dab59bce442e3db769
+EBUILD superlu-5.2.2.ebuild 1174 BLAKE2B 680d9e9d025dcd7907c5b03c7f1c83b9cc2a56769787376544655ee99666b434b12eb28f73fdd00aa62d3b5ecaf93a95872f19be4b643145dee6d8c7dd3fbd6d SHA512 b44e8c182b85d87d1903df61a49a038aa90082285a7a5bb77d89b8acf5aa82281474fbcc6e0c09a217dd83ba13451cfc6372f90dd2213f7da158a220a7186423
 MISC metadata.xml 1404 BLAKE2B 3ab566d18d18307d9fc7dea889e492e19b76aa9fdebe0dce86b46b1cf7a2d53f65404f56da04cc8420e6a7c21867b948e537833693cb60521746c5a48f16bc6b SHA512 8b758572ed599bdf43898050e265ce8ea82c4952af97471c09ee0013e56cf6928df3f3a436516c4fae7a38a13bba4a3437e130f294f942eaaae05125fa5fbdea
diff --git a/sci-libs/superlu/files/superlu-5.2.2-no-internal-blas.patch b/sci-libs/superlu/files/superlu-5.2.2-no-internal-blas.patch
new file mode 100644
index 000000000000..e48a7c86fa31
--- /dev/null
+++ b/sci-libs/superlu/files/superlu-5.2.2-no-internal-blas.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 08027ce..8884585 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -121,13 +121,7 @@ if(BLAS_FOUND)
+   set(BLAS_LIB_EXPORT ${BLAS_LIB_STR})
+ else()
+   message("-- Did not find or specify BLAS so configure to build internal CBLAS ...")
+-  add_subdirectory(CBLAS)
+-  set(BLAS_LIB blas)
+-  if (BUILD_SHARED_LIBS)  # export to be referenced by downstream makefile
+-      set(BLAS_LIB_EXPORT ${CMAKE_INSTALL_PREFIX}/CBLAS/libblas.so)
+-  else()
+-      set(BLAS_LIB_EXPORT ${CMAKE_INSTALL_PREFIX}/CBLAS/libblas.a)
+-  endif()
++  message( FATAL_ERROR "Could not find BLAS, refusing to use internal copy" )
+ endif()
+ 
+ ######################################################################
diff --git a/sci-libs/superlu/superlu-5.2.2.ebuild b/sci-libs/superlu/superlu-5.2.2.ebuild
new file mode 100644
index 000000000000..723d6ba29bbc
--- /dev/null
+++ b/sci-libs/superlu/superlu-5.2.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_STANDARD=77
+
+inherit cmake fortran-2
+
+DESCRIPTION="Sparse LU factorization library"
+HOMEPAGE="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
+SRC_URI="https://crd-legacy.lbl.gov/~xiaoye/SuperLU//${PN}_${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig
+	test? ( app-shells/tcsh )"
+RDEPEND="virtual/blas"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.2.2-no-internal-blas.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	# respect user's CFLAGS
+	sed -i -e 's/O3//' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs+=(
+		-DCMAKE_INSTALL_INCLUDEDIR="include/superlu"
+		-DBUILD_SHARED_LIBS=ON
+		-Denable_internal_blaslib=OFF
+		-Denable_tests=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc -r DOC/html
+	if use examples; then
+		docinto examples
+		dodoc -r EXAMPLE FORTRAN
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest
index 28fe36575037..95c6511b6601 100644
--- a/sci-libs/symengine/Manifest
+++ b/sci-libs/symengine/Manifest
@@ -1,3 +1,3 @@
 DIST symengine-0.6.0.tar.gz 763481 BLAKE2B 37fe94ad08463b31c7387ab296b201a4dda821ba59dfa548d0c42e70d23958bae24df3f035bd3fffb46cc08cc010d13a25e607a9e0644e9b3c0602fa0eb363b3 SHA512 cc6f0468534e5bcd466a810d44f9884b17858ca6c7151cdcadb3af0f7d8faf0d96697d5887ab65fc9094de80df825f8243dabc54e3f5c387be544880f49b482b
-EBUILD symengine-0.6.0.ebuild 2193 BLAKE2B 775daf836fc5fc1a0860645201ca905184383f5409e95c482b702cdc4891658f2fcd70e99ef8c5667d536598f5025616398405f0670ec69ddaf42549bef7c00d SHA512 b966d73b297cea26f9b7f1d85014f8753ec009a268844e777a8f453934e13c352803bca48d855933450529c64471da1f09b6fba1d828928187ceed2a71171b92
+EBUILD symengine-0.6.0.ebuild 2205 BLAKE2B 4bbd97357a16e4bbad1fcfdf26034dc51f5bd6718369f709978d0f9a7b399b473ea776ac6562979d29e1accc2f84f897ef8f58d116d0331e4092da5ba0278abb SHA512 403bb10352daad01d3665f06858400dd03875802817e0e1a8a8bf936fbd6a3cdd191ea4523aa056d6f19874125ad9949cea3b950a75c6dca75688848ed107c76
 MISC metadata.xml 1265 BLAKE2B f91a4783ae464dee61dbca5f532bb73a217600b49633f0c80ee46f7650f27f2e37e32cd4f5e14e171e6a47eb4c612d686f883034378afb73520ed0c22862d564 SHA512 f2a634346a9f703565959b48d7648df6abb088a479819aa3f9818ae941df168dbfa3cb1867f48673fce9f24dc890d05134689d93edb0d6761f2a54f4c802037e
diff --git a/sci-libs/symengine/symengine-0.6.0.ebuild b/sci-libs/symengine/symengine-0.6.0.ebuild
index 2c9b5a766fd4..ae13a29f65d2 100644
--- a/sci-libs/symengine/symengine-0.6.0.ebuild
+++ b/sci-libs/symengine/symengine-0.6.0.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 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="arb benchmarks boost debug doc ecm flint llvm mpc mpfr openmp test tcmalloc threads"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/szip/Manifest b/sci-libs/szip/Manifest
index 83ff901f8bfa..701e71f32267 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 714 BLAKE2B 1af45888836f994bd11cfae25c3925cd3a78c9c3522052bd8c357969b948bda94358aa466b821f74aa44eef3c27acfb8dbb70f107d77c0c01cd1023a0c5b27dc SHA512 c63edb78e85d4b196fa4ecd815185ceff5fa21bb3826290efe0ae30d00b367feee6f71381ef888df739b6db063b87ffbf15a5745bcc4710a58cfe4a5a8ff9475
+EBUILD szip-2.1-r2.ebuild 713 BLAKE2B 8f6a03b312a63d2ce2bdac4ddf69a3e35d196cc58867b38e9384c00444ba3a4809beca8bd26b3b4bce57757b9751212b1914005ff0fd70b98fd10f6543c95f16 SHA512 b8266fe30066d7d0620cc72c24b5132998d1ae95faacd84169eb6eec91a29752f501e7826f104755039de241c60b9e52021f134139ed97bf9a0ab0f4924d9cdc
 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 da08b6a5c3c9..eeb985247c0a 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 48fc8141992a..aa87ea3172f1 100644
--- a/sci-libs/tensorflow-estimator/Manifest
+++ b/sci-libs/tensorflow-estimator/Manifest
@@ -3,7 +3,11 @@ DIST bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip 159656 BLA
 DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c
 DIST tensorflow-estimator-2.1.tar.gz 622792 BLAKE2B d1c8abb22d90c789ebfadaf78ca932f87428274afe6e1ac20670bf6d2b4c1c6ea8f367b1eb7ee64ff9f6e9b8ecdc2f64113924e7e2286e3f4e3d2c36cb101794 SHA512 4aaa21969299b02443e9396c238ef4c03af3bde1d0142a81c04d9706f18b02bfd125f3aaf8ffb47e0a3ffad949c3d3bca3909375f12a1c1e4c55ca1cc7930d51
 DIST tensorflow-estimator-2.2.0.tar.gz 627362 BLAKE2B 125792fc2167b8af837a99b08a9a26943bc5c1fda8ab3690b01c0d49a6dd39142ff4a063867dfe1bee3b99fb018981d0e4ee45d194caac2cd96a829ad22db0ad SHA512 aaf743835e2c606439fcccb56742997e930ba0e72c01d51633ce86824bbfaacd64607dc1fd7fb9604cc444feb65ebae60c2266be084e1b49ef2a1a9ca5a3d60d
+DIST tensorflow-estimator-2.3.0.tar.gz 642118 BLAKE2B 29ecf5b64da20e8e6981375f1631b9b7e8ad061f71d0a3f1ac567bcd04b02102c5854d24e5106660f6bcd7b4ca683bd3bfbde51f236669d0f17e8f847feb7039 SHA512 0befc9c04650a0cd91ce90bc2e9a5d17ae3f7d8d8e4b8f763f223bbb891c73c7e2cbe91a2779af36342008e16f02d118120d94165c6a8e3c14a723b32ee29cb0
+DIST tensorflow-estimator-2.4.0_rc0.tar.gz 660318 BLAKE2B d71988c29c237e686151627723890c623019ea8f3ff1bcdfde64fc29461f3ffd268feb6cee2d57535f45e48ab166331c93e8e48a4c323abc5f6ec08774c39d6a SHA512 1f0a4379e2da96e9ffc9c3a06291c885b0509e1a50806573e9cb15053b40a45aec4b9938356c450bb0abca88156c992c813037a8144cba8b584173d9e4fe5162
 EBUILD tensorflow-estimator-2.1.ebuild 1853 BLAKE2B 13a0aa24ad860e69af5c8e180d939bd074c909bfcef47d5e9d16074cf010927f51bb64e6a48a7db00a5a817db70f4aa7071a32e89439b6864cc406a3cc13c59e SHA512 295825f9278094596f880fe69898791b00b68f71b4e7b6fd2efdb7357d2090ace62eb0d45b7b649f222544c789d8375bba73776a5428b587ba01367024af6615
 EBUILD tensorflow-estimator-2.2.0-r1.ebuild 1978 BLAKE2B 790ff6c1a2facc9e5b652b346a9ad24b445494f156a90465d3fa278e49376122da03f182fd4264f2e1f17488f326353e58810122996fbd33b4deabb7ed1986b1 SHA512 419fdbe02e00fdabe285f122be8ac574181366fc5f48fcf56616a37c69867cf6b530ea7dae8f5cfd8c6114a1ccb945699e4e4674ea7a14ad4d6bc14619c6693c
 EBUILD tensorflow-estimator-2.2.0-r2.ebuild 1978 BLAKE2B 31f981c1afd0f9d9392480840e7af5cf77d8723c13aab512316f3a5b5817b18f9cc58153c33fe66ac6845c155b8c9564116dcc42996c04fd43e0475e0f9c074f SHA512 6e115396a5257a4be94741c2eae714389a4b75359cd7168021901745fa854063374f2fc3f6a3d4f2d54cb1dd98437fd0d5a8b143fa01a3043035180da92f9afc
+EBUILD tensorflow-estimator-2.3.0.ebuild 1998 BLAKE2B bec6777c916d8da554c4c363a71d54295b2beb40e544363eb46e28f381a32798403b17bc0602539531be6a3d7ab323291cc2aa9f56954ee49dee42845579cedb SHA512 72f337563437517917bde7e3ad0d7d14ce93886009a1352a8b4d8bfe204059d1d0377c96c5dbbed24ff9aa41258f6a1ec204ea03a8683d4835e4b525bc2c3de2
+EBUILD tensorflow-estimator-2.4.0_rc0.ebuild 2014 BLAKE2B 85accbe649ffd9a39cc19446f3ae76cbe8e751ab1c699e1953bb477309bd86e99046ff1c387dfde7ab4f30019aa523d7859338171a9b08b3997d0c4566ff5d44 SHA512 b179e5a9d21ae4b9dbef83ea719ae2292a83308f74a5fe41428e2a2f6141edb77a47be0d46f1ba71e2affdc3a4caf2cd2b9f2f71e11dbce92505d9797a48731c
 MISC metadata.xml 580 BLAKE2B fb81098968d0fdf34a3f28dabee76df16be5393cb9ea79ee4fa670af985ef3f70bb83f14be84a0cc0e564e6626007c2977851f8299460b483f88325be155f4cc SHA512 6aef6523502a3bcf0b2ca59cf7480b92032b53020cccfa715203e5a48c960ecc92c94fa75f98a234da2d51662d43e0c1a85a1537f3ab67287cdb8183476a0efa
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.3.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.3.0.ebuild
new file mode 100644
index 000000000000..5fa7d1782c3a
--- /dev/null
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.3.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+MY_PN="estimator"
+MY_PV=${PV/_rc/-rc}
+MY_P=${MY_PN}-${MY_PV}
+
+inherit bazel distutils-r1 flag-o-matic toolchain-funcs
+
+DESCRIPTION="A high-level TensorFlow API that greatly simplifies machine learning programming"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+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/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}"
+
+RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-java/java-config
+	>=dev-util/bazel-3"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	bazel_load_distfiles "${bazel_external_uris}"
+}
+
+src_prepare() {
+	bazel_setup_bazelrc
+	default
+	python_copy_sources
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home)
+
+	do_compile() {
+		ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package
+		ebazel shutdown
+
+		local srcdir="${T}/src-${EPYTHON/./_}"
+		mkdir -p "${srcdir}" || die
+		bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die
+	}
+
+	python_foreach_impl run_in_build_dir do_compile
+}
+
+src_install() {
+	do_install() {
+		cd "${T}/src-${EPYTHON/./_}" || die
+		esetup.py install
+		python_optimize
+	}
+	python_foreach_impl do_install
+
+	cd "${S}" || die
+	einstalldocs
+}
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.4.0_rc0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.4.0_rc0.ebuild
new file mode 100644
index 000000000000..1816ca18887a
--- /dev/null
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.4.0_rc0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+MY_PN="estimator"
+MY_PV=${PV/_rc/-rc}
+MY_P=${MY_PN}-${MY_PV}
+
+inherit bazel distutils-r1 flag-o-matic toolchain-funcs
+
+DESCRIPTION="A high-level TensorFlow API that greatly simplifies machine learning programming"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+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/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}"
+
+RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	dev-java/java-config
+	>=dev-util/bazel-3"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	bazel_load_distfiles "${bazel_external_uris}"
+}
+
+src_prepare() {
+	bazel_setup_bazelrc
+	default
+	python_copy_sources
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home)
+
+	do_compile() {
+		ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package
+		ebazel shutdown
+
+		local srcdir="${T}/src-${EPYTHON/./_}"
+		mkdir -p "${srcdir}" || die
+		bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die
+	}
+
+	python_foreach_impl run_in_build_dir do_compile
+}
+
+src_install() {
+	do_install() {
+		cd "${T}/src-${EPYTHON/./_}" || die
+		esetup.py install
+		python_optimize
+	}
+	python_foreach_impl do_install
+
+	cd "${S}" || die
+	einstalldocs
+}
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index d72f93e2668f..894312f24e4b 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -1,40 +1,67 @@
 DIST ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz 100612 BLAKE2B 84f81072d3298dde613b4c1ebabf852c67e04b5882a4ca0ed6f218b42e8fa3ea9598140b0c0009e8d6b62d08902622a6d57ee005ec3ad8a808c9fb21aa53430c SHA512 03a289d8099a5c4a5298cba8f516d2edb41220935d8db750970113ca7513372c78241c2c948d0ffcd60e84686e50ba1d7fd0b46efea6881dd320435eca92a7b9
+DIST OouraFFT-v1.0.tar.gz 110531 BLAKE2B de0e280407e21118e2bc6ca93a7caf3c4a49d0a13eda018b1497f98851af73dda4cef56460dba310336c7ed958e34feef4784ca2575a13287dec2c1ac9a5af6d SHA512 89c6e8fd57abf26351b3efb792008a1bbe62d404a4225dcae8aa666b3782a421be071bdc9760ebb0c95b5336ee5ea517d2fa43ab915045f7cf6fd76e73578079
 DIST abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz 1281523 BLAKE2B 955802c74ed9baf222dcd824d2940147ae89edbc88f12bb8f54839776fe18bb18c0fde23b0d3142bb3be65a57930c96d03fdd243e8da07435eeb04329c31483d SHA512 c2ae1bd789251ec70cd0baafd92521e48fb1648aee8d9d84a8269436300848b6a9d7aead6bef8a12d3a9040f19535ac725ae961f12566500d309bc13dfee26a4
+DIST abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz 1679879 BLAKE2B ce92197c564ff774db46027c32f97cfd55ff1d77b7cec5424e127d10a3b0a54d9e84537bd643c4eb330ca81959bcc0316b13c013b229df06b7f415864c451e46 SHA512 b429758c37749d3d5c5c220fe0dc00fa0e193b406545484095339b25674c4a3bb7850b76dd1a370ed2006729bcbbbb1b438995b614e149c2290bdb10038c49d1
 DIST backports.weakref-1.0rc1.tar.gz 7761 BLAKE2B 4cb2554a4b71bb1f8c41a790268511e4b382effc7e0328f74346d086de539a177111de9e2dabac19a44b2a1cdbf59a7425e30eee4caa4bfe66b0ca97f1f460a9 SHA512 f37e9eb0d9060d2e1588a941f623460bd4477d7e180b38b5cd46d9c1db1ee094ae63e4f5eeeb422823bf3d067f46c4124cb124a9e4ddb795bc0bfbc4802ab826
 DIST bazel-skylib.0.8.0.tar.gz 72941 BLAKE2B 1928989d3e5dc338fee974c5592a524adb492db172b1d2a849ed5f14f91dbb76606335d369e4b15c4eec41adfe3a23cdc5b4f3b2f1351a5e9c25103c002b96a2 SHA512 4729941cedca8ddb876a621b28221d3c17dbb5dd72af27e55f48274208f21db986c5e7cb8adb742c42124bfa8073eb782b49e2557cb3f3f95ca56833fef925c0
 DIST bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz 660374 BLAKE2B 549292aa3ad8a6e01c29391a123f3cbc84d1f714ff9c68bfc6c8df07fa0ba3b19c22e61627f227a8a484f6d7d6c59935fd7560c447559ff5e774ddf1437eefe1 SHA512 83531a2646a9f63557eff6fefaf551ee7e9f0ccdb31374d7a17c35b9f9d844b9b405597972fcd31b2b68e9da312511bbfd9c8fbb75222f5924e1d2500cd1c2a6
 DIST bazel_skylib-0.9.0.tar.gz 84644 BLAKE2B 40b69a524e632ea00d34b9cf805b882ac4c549dd465ef37f28e54729ff1b614a7610a4895cede4e0c938edba5b19f781f3c0bfdb62bde628ee0af21d6b679546 SHA512 af4bcb641fed05d15f2d0ffe0e3abdfe9c7a5deb9c53064992d6605d224ded1648b1bdfa293e161028913f9f2c178c68cc38bc16028892ca5b0f52b4e645209d
+DIST bazelbuild-apple_support-501b4afb27745c4813a88ffa28acd901408014e4.tar.gz 19956 BLAKE2B 73f04a13f8ac3552e6f0770d1ac4edcc1b5ef46e4a3c4f3b83f11eeffa632f764d37aa7a98b35b5be6bd0caef19f84d0dc1b88bc55ff5397012863af4ee6d902 SHA512 732f482338996a62db24bfa6acd2fde6b629ac0a49317ed4e4778a55bbbbb22225f42a6cfa18cdcc51c200e29abe82a1f2a5548df09b7244074ae52e1f62ef66
 DIST bazelbuild-apple_support.0.7.1.tar.gz 20070 BLAKE2B e72098fc5017e3371b6af0f33f392a42da18376052f30db5dd602c5ccc0176c1ac8002cca3f598845c5cb33406b4fd8d30c5ea47c69add6c530b75dc6566a4b0 SHA512 bbab25c229404123d7d424fa261480cf887c749ae729cc1a00bd6c2554d4b4b3fa81e0eaa670542b3a5d3301f3bd5dcd7727d011ba854f13dbbf4f65895e4b08
+DIST bazelbuild-rules_android-v0.1.1.zip 14654 BLAKE2B 1cfd5af08c6eab9602883f62d85ef1b9eb02383f73dcc31ae84af880c9ba228ae349ac6b017c550286e248347193e2c56eba30c86174432429809447dd940ed2 SHA512 80628a5e2ca9806ab031cd0c2f2999bd67f5621a83e8300a51fe6233373bdaf7c90ff8fa9551c81e60fc904c4d7b24554327ac8ed2ee101e92c4ab9319c53f4a
+DIST bazelbuild-rules_apple-5131f3d46794bf227d296c82f30c2499c9de3c5b.tar.gz 1951045 BLAKE2B d8c17f301de729bbf5254acacf89490ab1034b1180d5ea788251ae6ba3e2b704c82d7f66d33a086f52ce3909cd33df7739d7d536c6be070a2d3454e2f280517f SHA512 a23826d8e53d49de6347eca052e980878d50b431bf02c9b8333234c0659d5e290447121bf9519729639891e67d732474a3c3b7a7502752b32f830680bb334bad
 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_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz 7612 BLAKE2B de9edd2e1f49edaec782cf58c4ebd3dc3c6d144499a18ac76a0685e28bb9fa6898980ea769c54186816dc696b2e9186d929e99602d8ea535409e1fd23b87da7b SHA512 dd2aef9011c6006e8adc777c211174c26ab74e3cf186541aba865012669ceebf7d96fa34a202654cdfb2beee4f67904f5b7736be466f2838cf31dfb3970f69cd
 DIST bazelbuild-rules_python-0.0.1.tar.gz 2302092 BLAKE2B 1db52eebf2461d779f764f2afdd070d1d0dd65eb2b83ccd98c2831da1784614ca281b114064729a9f257c64eceb62975aac8362d231c84f32abdf19aee7a1852 SHA512 40fa069a4482e2f83e29dc8e109652d14d187b2ec8efdcd36e98d117de93d66a938ed74999b42a2293fcb6eccc0a111cbbcf65c5c155579214bb1b96644280a5
+DIST bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz 140484 BLAKE2B 2526d808a4763fffa16bb035de78993eefe6371a29139b152370081f548d8147868cc95194c06a54f1c5c0cd8b63ffbc59b00686bfaedede2463a448e38c2810 SHA512 e22a85a5dba52cc3474481798264571f6671aace19eecb058b24ac7d586ea7822ed3ae042b4a812671f81d4f9f8915aa2381fa6ac278da7969b976eaf28db636
 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 cub-1.9.9.zip 619595 BLAKE2B 265b797a906b03da886de88863236c9ab90daa31498ddf848fcaf5e5ee1342614ad9a41618120ca09cc4c0da3e96eeec5e20ca9d7ba3f9860c507f06d15e59e1 SHA512 8c9c0a3f66f8d518ec07f857b5625e006d52f28bade1c1478a0f37420e2f7586dc3ff029d551748a1802bb5544b16fde5388e8d5a45d61eec595201b9db7a30d
 DIST dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz 39637 BLAKE2B 532a3ce3d0e354a73c19433f0210a64ecbf00d9134d06a0ee7462baaff3f2b981524aa630cf250595671d6673105724482c7d69e803179aac247f2020c883bd0 SHA512 3728db5213e887fd946f64ba5dc0c336be9a72a0966ee83f146148749ffc93ddb342e0735df6117d7943874c18f87de5791a28e4a57ea420bb8a4e2a5b7338bc
+DIST eigen-011e0db31d1bed8b7f73662be6d57d9f30fa457a.tar.gz 2667179 BLAKE2B 8e48418615ca95b27c26725c95f0b21202497284ea439ce1d799f1c86e80bc4fcd5951d9e476c9279e1a902da0b4ad029a73bb59ae8fb216508729803598a566 SHA512 cea21877a0aa1a0c1f0bde32494a3f4ffea6ae859d2562cb28c8aafacf009fc7754a110be1be3aa92f0959b7d7ab607768a579bf25a68972b14e30f613f2f54c
+DIST eigen-386d809bde475c65b7940f290efe80e6a05878c4.tar.gz 2628283 BLAKE2B feac186ce8d18026b10be4955267ed65b65b4432f02bcf817da08960c9164bcb22b352c413f59890aac2de87c5e3e9e05ea48dff28635bc8901628af518dc4d2 SHA512 f183bfe235a98dc308c69a1d9e168b538cc92cfbbe35d4e35596b0b2588ecad66212efb3d3ffbba7c8adbd67be24cc4dda5dba8dcdd67245eca2b1a0fb94d380
 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 gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip 936866 BLAKE2B 0977df121a80de979a9996b58a0a8cad157db8d0862b96f95b3be1157cddbc6b40dff4fc7da4ee78f5986cbfff2a67c173155e849e772ae476398c51f3028311 SHA512 4bf036de43f5e0890f66e0b16cd9a0f52911b160f79c9c50cf403454fa9d6040df225d34e02f424da8bb8c5f7f5c002f88f4d232c61503aa825c907ad8742823
 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-7e825abd5704ce28b166f9463d4bd304348fd2a9.tar.gz 120301408 BLAKE2B 928117c2bae7bcdd2445e9f65297b45b009dfc62e9c16ed08a8f00aacee2497492b6fb4cbea0047a8aa1425b538e02af9b8e6dd21e52348cc45dfbb71ab3f47f SHA512 a9cfbd00a0530e4f5d001029c33be3723ed009799a42bd730a65319da671020a249ae5ba4496f1347a71a9ee69de4e9fe2b80c60ebd1bc4d6d4120bd3d6fecde
 DIST llvm-ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz 115788302 BLAKE2B ea18d6cb3cc8311a78e543996d88831e1ecf1dec58b7c890a80cd8fce86e1c52244b9cfc0d7ce0867480465c2d914555c16cf003bfdcf90056d63e8f4e0ea0c0 SHA512 5422762ffe1022ad4588bcf2bdce1a041c37b5edffed70fcefdd911b2dbf8b52cba9ec57670d48d7b69be6b71e354d333d6eaa5ac5260df56ed8ab18fd98fe88
+DIST llvm-f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz 127766458 BLAKE2B 7170f72e131ec672a1d81a8f33284568fc367608d2c5940b435a75cf8596dc71588c942c6d24c47a7e88c391b0c4030df6f18f6d1da15140587c8a9b078cd83c SHA512 6ebee8cece3845875d39678d7fe248c71e7c3463554bf345e03c06985afcdcd2a0052338358764ba366c7ecf72cd97703cb06613aeddec3110cf20c30eb70d25
 DIST nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz 107044 BLAKE2B fd018b1d40977add357e98382f41e3fa6456bdc9a181e2d6cc7a3bc7fb98d242b3216b5ed0c40323bbcc006ab5221b49819ebc1dccd0c8dd700d9504f085eed1 SHA512 e66f323abb68feeec41927cc23e3a85d82fd1b7105a6232626edba95acb9eb22b3fb8b28d1a7adb536c47c936f68271fe5d8f66d3059e3128608ad826dd7622e
+DIST nvidia-nccl-195232556936b39b01cc908296e1650b80d4a3e9.tar.gz 147607 BLAKE2B 4109d195e646d5d492ff0533aea4d95fca59e5fb97aee0261c1b6d1f4615c1e6facb54b14bd4d1fc710b938c0edeca72b528e9e91e57d4bffa3b28af909449f4 SHA512 e45f0e07fdfdfc859f1e5ac05224977af821c99b0d9e11c71e9983612e621f55272a8836049ca61fe26f7663c4f8180102684143403ab46be73fbc8ba15e0c56
 DIST nvidia-nccl-3701130b3c1bcdb01c14b3cb70fe52498c1e82b7.tar.gz 123898 BLAKE2B 9a268e089877fde9ac900b43bbf829f7dedfa701b017568647e3564670d5457dc18c96846a2cc8674b243c0c7d97d322e7466167c322588af3ad4f2d189b175b SHA512 9b090a963213eb088edf247e72b51a6cc79669f507831b88205c75a006a43f3d2257c4e75a34c33987c7d95c421e2273642db4c716b02907e8de1b1ef5d080f0
+DIST nvidia-nccl-5949d96f36d050e59d05872f8bbffd2549318e95.tar.gz 147548 BLAKE2B f3d3dd222ae90ac9ac1457a9695f112a21f5652a5b40e10ac049da910f07707b1c3910f59734fbe5e2c6523c1e83f3801f809efa77d122a57e859828c74ba8c2 SHA512 d9ea83caf7940fb47134293236fcb7478c0d4e40365d3b0a29427758e2e2dbb980c5e8c05fc9fc3956ed5e21a82ec0efaa31d973fe9c73fa3f50465f76756131
 DIST oourafft2d-20061228.tgz 54434 BLAKE2B 382dd5787155b877a2ad1d624596afb5dbbe146a7aedf044d7f016949deedac871a512a030b5e6ac9ea5310e216788ffb99af1dd9d2a0de3f1ad72d9e5e7a3db SHA512 af993f68e8e1eb3cb927a51e86da8f74cfafc912a7cd055515e50fe543dd19ab5a6f7b1c2be4a55d6f4a0e5d766ead34c3be4c5705be6353f78cb2a55bd5cf16
 DIST pybind11-v2.3.0.tar.gz 564520 BLAKE2B a7c1485aa8f63a00eccd3103cf9f531a080b049be02e6182b30503ae6dd6c55fc517684ed9d92aaec244efd5f77336c68d1ea546833f7f0ae2fd7b090c19a02d SHA512 04542fe9dca2ffdb86c15698a4bbc041446a9f11970092e89a482ae0ff64c932f62fff8f437b98bdaa006c1fccabddd79f0c7e376f27daed2150b1d2f988e8aa
+DIST pytorch-cpuinfo-6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip 3787039 BLAKE2B 3a529648d548b7570fd38783e5a3915bf3ad82ab028ee11f70fddaf09b8d64dc58f4d32ed54557b9f3087a8bb13ff4fd78b3597df6b1b5d3c3ef65c03193251a SHA512 8b34e580f19494f92796176db3f14680fd1b7b64458c0ef8e71ff1b3f1cbe12204e901167a585c1e04e95fbeaad5de104abc5edf3ea81a0da1c480a99f6bb94b
+DIST pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz 3489028 BLAKE2B aa6b7719eb9871b6cc71318cb4a9c2e2397e665662b7978daecd9e8380304691a78b95118eba5cbbb738c4b490352a847f6ce6b5c4ae29de0543b95ecc557cbb SHA512 ecd2115340fa82a67db7889ce286c3070d5ab9c30b02372b08aac893e90ccebc65c6b3e66aa02a9ae9c57892d2d8c3b77cb836e5fc3b88df2c75d33e574d90d2
 DIST re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz 316237 BLAKE2B 8a975bc3e78b690f70944651c7022c6d946f40b2eb5fe01b2e203141f94b890cf1ad5c72af8e7c6ff3c5242d42af5a8657ed69e3c74d9ac081beb15de6334c0c SHA512 e3e00e92700d08bc55ba0e96148ddf1e00de2d329c1fdac08691ff15976937829f66dbc84af886a4b749ad66ba4ab208d66811e97e33bb9c2d7359735406c450
+DIST ruy-34ea9f4993955fa1ff4eb58e504421806b7f2e8f.zip 312628 BLAKE2B e42c484092f5e93dee11bc7c6a92ade3b63533d3507fa5a805b16e3508b8a20b7cff734197ab9d8e9b0e67e9648987ccedc19a23deea93bb00269d2fc65424a4 SHA512 d1b5a73feb4cced7ee49e9bacb80f437b0bcde204c3bc082a2729efb1989517ac97d764d6fe00bd66f0d5349d19d9e0593868c8d22369dc38732cd2204419b1d
+DIST ruy-5bb02fbf90824c2eb6cd7418f766c593106a332b.zip 312653 BLAKE2B 57439930979de125ece2a2dec5e0813873866a167bd5b323b1bda2838def1b96e1925fca52eea9be851d15a99d0b43026be1f0d27cb9aa973b86891a480c3a8f SHA512 ed6bbc89fc44bd27b0bdca744d2c6822d7311045f99abf790c1ee0c9b3cbedbdb2d3f7098c55a6294890865050aaade3e6806c2c769c5827d4ac3eaaf81e5d44
 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-2.1.0.tar.gz 41637803 BLAKE2B 63aac95cdb71097d2e7a257a691a2b51703fb22d2535395494adebfae0d3f97f8dd9e0deaadf1c2f3d3d26138066a7c6fb9b9728b5b0ac3d54360d7b5e4bebff SHA512 6d09ba3c097e4b3d712e7164d649841572c418d56c207eea6d31e3b1851b84ce57e82801d9887d84cfd8fcf990a3ea4c4b4b05265f8d625509986412c230c3c6
 DIST tensorflow-2.2.0.tar.gz 42100791 BLAKE2B 8b773ae9945ca267af33a34d86f6aef02310976bea1cdd98858d1405e8da845640b72a073b71fcfccb2b73f08600a5eada2c2332a8d9480bba71e9f25dbb2220 SHA512 94a2663497d333d543f363e9fea94fbcfdcdbbc0dfbaf009ba9181a808713aeb78f9b8805f56bea5fd3925a36f105427b3996795750589f378d8afbdadc2b86d
+DIST tensorflow-2.3.1.tar.gz 46544608 BLAKE2B c3cb0954fcd060b95d63895cbeeca20f6af29ade999dc43db5fe010d6b33b6f650047d529f174a1663c23440a56e057e2f97c503a4a40bcdac9374b549f3220e SHA512 e497ef4564f50abf9f918be4522cf702f4cf945cb1ebf83af1386ac4ddc7373b3ba70c7f803f8ca06faf2c6b5396e60b1e0e9b97bfbd667e733b08b6e6d70ef0
+DIST tensorflow-2.4.0_rc1.tar.gz 53249752 BLAKE2B 14f4c1d37c9086485b768fa17c9cbdff2a5cb40bf4456aff8739b4ea224889551b08c02a7623866f2e7af3c7ec4a940de2b41cd64530ee4b47508e1747ad15db SHA512 38f06026dccff91c981e8ca0d1164f8f78710238184b6163e2e8ead26863fcf7daa074b1721114d0ee8efff127c42d94b65b696368ad91d74fcb81b5ef41a225
 DIST tensorflow-patches-2.1.0.tar.bz2 5737 BLAKE2B 67f5004312389ed19e810aad9f2d5d4839d806b5a7422963520e0dff06b91346683647db757ac463af13ca70861a7ed9c94be242910abacc6be350e162947225 SHA512 a20bfb619d59e0d2741a27ce36e3d38dbb7a5a706d6bc56f8aa94b5b72288139ad301fc06390b128ef1c3a88b758d09d0224351590dedcda9c5309cc55af6fed
 DIST tensorflow-patches-2.2.0-r1.tar.bz2 3890 BLAKE2B cf4e0d579992cd09136fe3a11c5016e7b996ea959dad9f3a1ccff2fa623c2c4eab1c6673dfaf08b3b01220fd00c9edd5966e1162049f6d1e4fe5af280f491850 SHA512 8d07c9351b75faf90a137f65c2e6147d884744c5ab9b0bacadfa7bdc7b66ec2ec92920c7d23396bb70f7f4fb290f3f818591f23c6a4e91ab1a79290cb4ea1533
+DIST tensorflow-patches-2.3.1-r1.tar.bz2 12300 BLAKE2B 068c127d7e980baf63068c524c9411e4f19bb79ee369221cf474a964a15ad340b28bde09504a8d524167eea036caf9d2dc52d0ad7ae1e52a76d1892833b033a0 SHA512 510676e4f999c12331a61bfeeca45b2526292d8bca8b0b42c1d8d466bc52722075fbd4df26a5f67dbe1ca4ccd9059e783c113cf694b436ff48c8114c99234cd3
+DIST tensorflow-patches-2.3.1.tar.bz2 11361 BLAKE2B 22ddd827f616e33fd259ce2b7da5cda539d856701ad108d1d3b52d1dab660bcddc809fd9e9db5e6496552df080493b0205b83a58dc32808dc70c60a5878aa8af SHA512 cdfc3407c775f8529cb8eb939b1046a7094ff999b8225e419e2ab4be19ecba6d853ebd8cd2dda77a7f60425a440f4d60bf3afca4a80688f0cba9967e14f8b8fb
+DIST tensorflow-patches-2.4.0_rc1.tar.bz2 1843 BLAKE2B 6d4188471502e4411a5a7a6e731142af38421961600c52e7d76d137f952a5b8327dc8d8b4a40b60d3fb46130fe3d40ae2adc3d60d9a882f9d9b07d424e45e194 SHA512 abf9fbd870a8fa59b9d4e1b8260c4fbb5badeeca3e2b77caa031036759302bccae4adf91b291bc7a12df3c679b887338a8cd98d41847eb8ddd0c2bf4b8ccf342
 EBUILD tensorflow-2.1.0.ebuild 12365 BLAKE2B d895256b37ee79be36d83745545e6515366b64121c0bd5ec79544827a4492a327ca26593d06ec0b42745ef9bfa213a251eef2bd7c9093d8b461b744035d18cf7 SHA512 d710ea279a2e0b73749a0b4a947a98753e11a6ac14799b9d5e45e3e63afd776aa8047d44d66b831d49df686fea65f0663133f8639080f722fbbd6254d6025b46
 EBUILD tensorflow-2.2.0-r1.ebuild 13506 BLAKE2B 075b271e2e559ca7640f1cb86f7392b4bd40a53d518d42f295ae762bcb465498b901fdd24805de76f8e50e5abacc1b47f00397553c471a7b5393ea8eb5dcb8fe SHA512 eb845b0233eab0782fc1213375b091a7a8be54df6796f46cae4863bcb4be92cd7028a30cacc43d9347bf04c14471283aaa0fbb6c56052fa0dd6cb6195b86ca94
 EBUILD tensorflow-2.2.0-r2.ebuild 13634 BLAKE2B c165b9acc3d6d507582cd2fce0986147cd41efe3c5648c7b054fae17c2a0672e3e9fa54eae097618781a6b9a97a7c5c9e5f4f3feee7965b49df367c2d4046558 SHA512 68f1ec80071b447d0c9cd459a3cd369f6dd619432ae6fe44d85e51487d0209e4960505bc7eae26d0b21680e37c30b76b0a4eed97b84f831be54c7041ca31c86b
+EBUILD tensorflow-2.3.1-r1.ebuild 15189 BLAKE2B e34ed5c8e554926f1b6441049b1f2368954e243dbe66f0ed1c0896f5c0eceb7b6613f2547b0a47b9493f08410d25813fbc800a3479138fe3e7f444f2d125f342 SHA512 4d46a272581266c1a905a675c1071b82027af7fcca3c86831eb2e9908cafa004da4fb399136568263e6aab7584025826c432dce86024cd34b59e1f7e8749da30
+EBUILD tensorflow-2.3.1.ebuild 15183 BLAKE2B 15f3de2530ffd1ea0c9e0383b0d90a2f0b7912ba62d497d56609ffa9be19df2e0f57304d6459a83b0a5e3bcb9410443656d8554595c3e5a2dd08803893c51467 SHA512 84ccd970c56eccdd9350fd56d4aeeffedbb1ad2e0be2fd58a416856f97b1d9f79ace4dffe41460fe6f2e6ae6d2030d7a3ee8720a99844fc3c97e23211cee50d7
+EBUILD tensorflow-2.4.0_rc1.ebuild 15113 BLAKE2B fa88f76a7c9e0a74ddbd0c5333b8b6542326853b6fda6fed186f9c98f0af09e05f1f036eda1081f9e008a37e41483b625986ed108269318e42d5c0ac4da6cebb SHA512 5b3f74a703dd1639175dd4d024e346b8d3068bc1f0d0516333d9efe8dccbd7d8106fa50be87fa1379cfc6adc00e6272e0209bee3e8334d66c1e5e4d66bc94b25
 MISC metadata.xml 500 BLAKE2B 05036ab51828503c91b561bf087bb0a4d0cd6aa2f68dafa51499a5b57c33bf04e4f413aca576b62eb60b233467405a346c08d72b3c771b9f3fb4e099a55bd3c5 SHA512 ca5c67f8ced7d0f5ebb5f261c7adbcf23ea31b099e0aa3e1a3f6fd37df7d3558706af4df8411fc421a3b99c8615df7c5f07c617d7af275eccc728e76ce509458
diff --git a/sci-libs/tensorflow/tensorflow-2.3.1-r1.ebuild b/sci-libs/tensorflow/tensorflow-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..5ac893347dd6
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-2.3.1-r1.ebuild
@@ -0,0 +1,405 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+inherit bazel check-reqs cuda distutils-r1 flag-o-matic prefix 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://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz
+	https://gitlab.com/libeigen/eigen/-/archive/386d809bde475c65b7940f290efe80e6a05878c4/eigen-386d809bde475c65b7940f290efe80e6a05878c4.tar.gz
+	https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz -> abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.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/archive/5131f3d46794bf227d296c82f30c2499c9de3c5b.tar.gz -> bazelbuild-rules_apple-5131f3d46794bf227d296c82f30c2499c9de3c5b.tar.gz
+	https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip
+	https://github.com/bazelbuild/apple_support/archive/501b4afb27745c4813a88ffa28acd901408014e4.tar.gz -> bazelbuild-apple_support-501b4afb27745c4813a88ffa28acd901408014e4.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_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz
+	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/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.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/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.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/7e825abd5704ce28b166f9463d4bd304348fd2a9.tar.gz -> llvm-7e825abd5704ce28b166f9463d4bd304348fd2a9.tar.gz
+	https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
+	https://github.com/google/ruy/archive/34ea9f4993955fa1ff4eb58e504421806b7f2e8f.zip -> ruy-34ea9f4993955fa1ff4eb58e504421806b7f2e8f.zip
+	https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz
+	https://github.com/pytorch/cpuinfo/archive/6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip -> pytorch-cpuinfo-6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip
+	cuda? (
+		https://github.com/nvidia/nccl/archive/5949d96f36d050e59d05872f8bbffd2549318e95.tar.gz -> nvidia-nccl-5949d96f36d050e59d05872f8bbffd2549318e95.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.28:=
+	net-misc/curl
+	sys-libs/zlib
+	>=sys-apps/hwloc-2
+	cuda? (
+		|| (
+		        ( =dev-util/nvidia-cuda-toolkit-10.2*[profiler] =dev-libs/cudnn-7* )
+		        ( =dev-util/nvidia-cuda-toolkit-10.1*[profiler] =dev-libs/cudnn-7* )
+		        ( =dev-util/nvidia-cuda-toolkit-10.0*[profiler] =dev-libs/cudnn-7.4* )
+		        ( =dev-util/nvidia-cuda-toolkit-9.2*[profiler] =dev-libs/cudnn-7.1* )
+		        ( =dev-util/nvidia-cuda-toolkit-9.1*[profiler] =dev-libs/cudnn-7.0* )
+		)
+	)
+	mpi? ( virtual/mpi )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/flatbuffers-1.12.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/h5py[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+		>=dev-python/google-pasta-0.1.8[${PYTHON_USEDEP}]
+		dev-python/opt-einsum[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.8.0[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+		>=dev-python/grpcio-1.28[${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.3.0[${PYTHON_USEDEP}]
+		dev-python/dill[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	python? (
+		dev-python/mock
+		dev-python/setuptools
+	)"
+PDEPEND="python? (
+		>=sci-libs/tensorflow-estimator-2.3.0[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.8.0
+	dev-java/java-config
+	dev-lang/swig
+	=dev-util/bazel-3*
+	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.28
+	)"
+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
+
+	# Relax version checks in setup.py
+	sed -i "/^    '/s/==/>=/g" tensorflow/tools/pip_package/setup.py || die
+	sed -i "/config_googleapis/d" WORKSPACE || die
+
+	# Prefixify hard-coded command locations
+	hprefixify -w /host_compiler_prefix/ third_party/gpus/cuda_configure.bzl
+
+	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 [[ *$(gcc-version)* != $(cuda-config -s) ]]; then
+				ewarn "TensorFlow is being built with Nvidia CUDA support. Your default compiler"
+				ewarn "version is not supported by the currently installed CUDA. TensorFlow will"
+				ewarn "instead be compiled using: ${GCC_HOST_COMPILER_PATH}."
+				ewarn "If the build fails with linker errors try rebuilding the relevant"
+				ewarn "dependencies using the same compiler version."
+			fi
+
+			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
+			dill_archive
+			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
+			tblib_archive
+			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
+
+		for cflag in $(pkg-config jsoncpp --cflags)
+		do
+			echo "build --copt=\"$cflag\"" >> .bazelrc || die
+			echo "build --host_copt=\"$cflag\"" >> .bazelrc || die
+		done
+	}
+	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/tensorflow/tensorflow-2.3.1.ebuild b/sci-libs/tensorflow/tensorflow-2.3.1.ebuild
new file mode 100644
index 000000000000..657eb270e10f
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-2.3.1.ebuild
@@ -0,0 +1,405 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+inherit bazel check-reqs cuda distutils-r1 flag-o-matic prefix 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://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz
+	https://gitlab.com/libeigen/eigen/-/archive/386d809bde475c65b7940f290efe80e6a05878c4/eigen-386d809bde475c65b7940f290efe80e6a05878c4.tar.gz
+	https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz -> abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.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/archive/5131f3d46794bf227d296c82f30c2499c9de3c5b.tar.gz -> bazelbuild-rules_apple-5131f3d46794bf227d296c82f30c2499c9de3c5b.tar.gz
+	https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip
+	https://github.com/bazelbuild/apple_support/archive/501b4afb27745c4813a88ffa28acd901408014e4.tar.gz -> bazelbuild-apple_support-501b4afb27745c4813a88ffa28acd901408014e4.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_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz
+	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/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.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/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.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/7e825abd5704ce28b166f9463d4bd304348fd2a9.tar.gz -> llvm-7e825abd5704ce28b166f9463d4bd304348fd2a9.tar.gz
+	https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
+	https://github.com/google/ruy/archive/34ea9f4993955fa1ff4eb58e504421806b7f2e8f.zip -> ruy-34ea9f4993955fa1ff4eb58e504421806b7f2e8f.zip
+	https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz
+	https://github.com/pytorch/cpuinfo/archive/6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip -> pytorch-cpuinfo-6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip
+	cuda? (
+		https://github.com/nvidia/nccl/archive/5949d96f36d050e59d05872f8bbffd2549318e95.tar.gz -> nvidia-nccl-5949d96f36d050e59d05872f8bbffd2549318e95.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.28
+	net-misc/curl
+	sys-libs/zlib
+	>=sys-apps/hwloc-2
+	cuda? (
+		|| (
+		        ( =dev-util/nvidia-cuda-toolkit-10.2*[profiler] =dev-libs/cudnn-7* )
+		        ( =dev-util/nvidia-cuda-toolkit-10.1*[profiler] =dev-libs/cudnn-7* )
+		        ( =dev-util/nvidia-cuda-toolkit-10.0*[profiler] =dev-libs/cudnn-7.4* )
+		        ( =dev-util/nvidia-cuda-toolkit-9.2*[profiler] =dev-libs/cudnn-7.1* )
+		        ( =dev-util/nvidia-cuda-toolkit-9.1*[profiler] =dev-libs/cudnn-7.0* )
+		)
+	)
+	mpi? ( virtual/mpi )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/flatbuffers-1.12.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/h5py[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+		>=dev-python/google-pasta-0.1.8[${PYTHON_USEDEP}]
+		dev-python/opt-einsum[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.8.0[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+		>=dev-python/grpcio-1.28[${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.3.0[${PYTHON_USEDEP}]
+		dev-python/dill[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	python? (
+		dev-python/mock
+		dev-python/setuptools
+	)"
+PDEPEND="python? (
+		>=sci-libs/tensorflow-estimator-2.3.0[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.8.0
+	dev-java/java-config
+	dev-lang/swig
+	=dev-util/bazel-3*
+	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.28
+	)"
+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
+
+	# Relax version checks in setup.py
+	sed -i "/^    '/s/==/>=/g" tensorflow/tools/pip_package/setup.py || die
+	sed -i "/config_googleapis/d" WORKSPACE || die
+
+	# Prefixify hard-coded command locations
+	hprefixify -w /host_compiler_prefix/ third_party/gpus/cuda_configure.bzl
+
+	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 [[ *$(gcc-version)* != $(cuda-config -s) ]]; then
+				ewarn "TensorFlow is being built with Nvidia CUDA support. Your default compiler"
+				ewarn "version is not supported by the currently installed CUDA. TensorFlow will"
+				ewarn "instead be compiled using: ${GCC_HOST_COMPILER_PATH}."
+				ewarn "If the build fails with linker errors try rebuilding the relevant"
+				ewarn "dependencies using the same compiler version."
+			fi
+
+			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
+			dill_archive
+			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
+			tblib_archive
+			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
+
+		for cflag in $(pkg-config jsoncpp --cflags)
+		do
+			echo "build --copt=\"$cflag\"" >> .bazelrc || die
+			echo "build --host_copt=\"$cflag\"" >> .bazelrc || die
+		done
+	}
+	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/tensorflow/tensorflow-2.4.0_rc1.ebuild b/sci-libs/tensorflow/tensorflow-2.4.0_rc1.ebuild
new file mode 100644
index 000000000000..1481f3084184
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-2.4.0_rc1.ebuild
@@ -0,0 +1,406 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+inherit bazel check-reqs cuda distutils-r1 flag-o-matic prefix 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://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz
+	https://gitlab.com/libeigen/eigen/-/archive/011e0db31d1bed8b7f73662be6d57d9f30fa457a/eigen-011e0db31d1bed8b7f73662be6d57d9f30fa457a.tar.gz
+	https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz -> abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.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_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip
+	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_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz
+	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/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.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/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.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/f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz -> llvm-f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz
+	https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
+	https://github.com/google/ruy/archive/5bb02fbf90824c2eb6cd7418f766c593106a332b.zip -> ruy-5bb02fbf90824c2eb6cd7418f766c593106a332b.zip
+	https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz
+	https://github.com/pytorch/cpuinfo/archive/6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip -> pytorch-cpuinfo-6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip
+	cuda? (
+		https://github.com/nvidia/nccl/archive/195232556936b39b01cc908296e1650b80d4a3e9.tar.gz -> nvidia-nccl-195232556936b39b01cc908296e1650b80d4a3e9.tar.gz
+		https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.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.13.0:=
+	>=dev-libs/re2-0.2019.06.01:=
+	media-libs/giflib
+	media-libs/libjpeg-turbo
+	media-libs/libpng:0
+	>=net-libs/grpc-1.28:=
+	net-misc/curl
+	sys-libs/zlib
+	>=sys-apps/hwloc-2
+	cuda? (
+		|| (
+		        ( =dev-util/nvidia-cuda-toolkit-11.1*[profiler] =dev-libs/cudnn-8* )
+		        ( =dev-util/nvidia-cuda-toolkit-11.0*[profiler] =dev-libs/cudnn-8* )
+		        ( =dev-util/nvidia-cuda-toolkit-10.2*[profiler] >=dev-libs/cudnn-7.6 )
+		        ( =dev-util/nvidia-cuda-toolkit-10.1*[profiler] >=dev-libs/cudnn-7.5 )
+		        ( =dev-util/nvidia-cuda-toolkit-10.0*[profiler] =dev-libs/cudnn-7.4* )
+		        ( =dev-util/nvidia-cuda-toolkit-9.2*[profiler] =dev-libs/cudnn-7.1* )
+		        ( =dev-util/nvidia-cuda-toolkit-9.1*[profiler] =dev-libs/cudnn-7.0* )
+		)
+	)
+	mpi? ( virtual/mpi )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/flatbuffers-1.12.0:=
+		dev-python/absl-py[${PYTHON_USEDEP}]
+		>=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
+		dev-python/astunparse[${PYTHON_USEDEP}]
+		dev-python/dill[${PYTHON_USEDEP}]
+		dev-python/flatbuffers[${PYTHON_USEDEP}]
+		>=dev-python/gast-0.3.3[${PYTHON_USEDEP}]
+		dev-python/h5py[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+		>=dev-python/google-pasta-0.1.8[${PYTHON_USEDEP}]
+		>=dev-python/opt-einsum-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.13.0[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		>=dev-python/grpcio-1.28[${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.2[${PYTHON_USEDEP}]
+		>=sci-visualization/tensorboard-2.3.0[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	python? (
+		dev-python/mock
+		dev-python/setuptools
+	)"
+PDEPEND="python? (
+		>=sci-libs/tensorflow-estimator-2.4.0_rc0[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.8.0
+	dev-java/java-config
+	=dev-util/bazel-3*
+	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.28
+	)"
+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
+
+	# Relax version checks in setup.py
+	sed -i "/^    '/s/==/>=/g" tensorflow/tools/pip_package/setup.py || die
+	sed -i "/config_googleapis/d" WORKSPACE || die
+
+	# Prefixify hard-coded command locations
+	hprefixify -w /host_compiler_prefix/ third_party/gpus/cuda_configure.bzl
+
+	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 [[ *$(gcc-version)* != $(cuda-config -s) ]]; then
+				ewarn "TensorFlow is being built with Nvidia CUDA support. Your default compiler"
+				ewarn "version is not supported by the currently installed CUDA. TensorFlow will"
+				ewarn "instead be compiled using: ${GCC_HOST_COMPILER_PATH}."
+				ewarn "If the build fails with linker errors try rebuilding the relevant"
+				ewarn "dependencies using the same compiler version."
+			fi
+
+			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
+			dill_archive
+			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
+			tblib_archive
+			termcolor_archive
+			typing_extensions_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
+
+		for cflag in $(pkg-config jsoncpp --cflags)
+		do
+			echo "build --copt=\"$cflag\"" >> .bazelrc || die
+			echo "build --host_copt=\"$cflag\"" >> .bazelrc || die
+		done
+	}
+	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/trilinos/Manifest b/sci-libs/trilinos/Manifest
index 4cd8b33cfbfe..d3808fa0537e 100644
--- a/sci-libs/trilinos/Manifest
+++ b/sci-libs/trilinos/Manifest
@@ -2,6 +2,9 @@ DIST trilinos-12.14.1-patches-r0.tar.xz 6448 BLAKE2B f852a4612c400ddfb6dcecb476e
 DIST trilinos-12.14.1.tar.gz 129036436 BLAKE2B e7401df2ff8408a7af4a8e90d93b1929df65228c4f5cf3c754d20ebdfa8f3835800f540e87c1198e0baf2fefe0920618ae497f59373720754ab0c9dc1da93136 SHA512 dfff0e0582cb5ad12614dd53e9635572c8d1ee86d96f432f5a6e046af63edb13f6bfa3037204ab89fbb0d27e9be9bd9661d47efb41ab2a6e421bca5eba6b6a87
 DIST trilinos-12.18.1-patches-r0.tar.xz 6236 BLAKE2B fdcdedde68ef855aa98671223ad2c42467284ad7ca364e2b5ca715094a6efacc463f2d1812ee63ac980ca87dbe16bb2ac04835f52efa1df34651a608cb5407e9 SHA512 e6db2be4642b8f9797b0be6dd05641ae469dd5117b1b04da54ed955bd56473d6aaa69d59dfd7869db1e7059d2d9b2cb2d9269dd5ef863663eabb90c5c256b987
 DIST trilinos-12.18.1.tar.gz 152007573 BLAKE2B 5dc2ee432d777712fb4ca1dc2d7ad68015f523fdbcbd4f55388a89d31c0946a1c5031b3e8f906952cf6b2f4f16928e6da5f17b1f6ee0f0e5669cfce5c8a09367 SHA512 e2a57df57e8e98ed97bbde9c1e768738f0eaccc32466aff6daa308573a860b3debee89bd570c113ca0f6a6458ff562aa6596ddf657236c368b7b2e26a4b4466b
+DIST trilinos-13.0.0-patches-r0.tar.xz 7672 BLAKE2B 6412f1226549086ef2fca3c4d8bba3c5541489879f4fa37c3598a7271128e3232fa1cc56a51d44fb88d679458a79a082c3984085ddbe4bc0884b0cb45ba683c0 SHA512 91372fe0f47a1f5d4dbc1856e2cfb9d4f1eb8cc0de941013a7a6e791730c9e10decdcd4ca39b36bae836ac66040bee70af187b4a056d46b0da0fe72e8c5943fc
+DIST trilinos-13.0.0.tar.gz 157960946 BLAKE2B 6336d71f469dd4561786092b175ec3396d6b7956aeec6ab8d9d6e87a1b1158a0840661a87514888fc16ea36c44d628dadb865a3244785c2c5d4b24213aca2096 SHA512 74b1e852971c8f040e8640688c879659bf6b03eed0bc6f76f31d768e7c4eb50b23fb8bfb9997d7f630001d80150161aac80fbd3237f52071657908320c1d723d
 EBUILD trilinos-12.14.1.ebuild 6148 BLAKE2B d8ef14be03e34742e59292426af03336fb3997f3e50b02e0d6a9d6114a5d67c7d3530e93f44e645e247f395343b1a3045383714f8408a41a0434cf125f6006c5 SHA512 b96f197cfd8435366940237eba40dd8cd48e950e6c814ebcb18b6c04125f374d4475cecaea3c25a2ec60b3685e3db2d52ac025a9f6031111c67039cfa00be2d8
 EBUILD trilinos-12.18.1.ebuild 6445 BLAKE2B 0e8efec55654b6f10ef389df708c6f3ce1f9d80be8f8d5a45a442520a656d59859a1ce7f796650445deaa8b16e5077ff4f2333401eb0a336ef3e5f50779036ad SHA512 639cf20e9bd4353c63a3c61e831ee6a24471c61cfccc4a9821f759b2fd652a63a9de7ac5c798aca5e65bbd856193659e105e1dc457f9f1ec0fa634e71935c515
+EBUILD trilinos-13.0.0.ebuild 6530 BLAKE2B 655911a00a65ff877f2c3eae666ab44136db8b9651683120f0e8f85fbb883206c3ebce2f5464d9d140e9246102af741d2ed2ff688e0146055ac1c9aae15d47bb SHA512 ab20c26d14b3b03e4e5d66c4aa5f69913bafa34d933891269007613694fb2ec7c54bde1164e81daf9f8cad33bcd221532773e2b79cd693fa18d96e8bb0f1a2d0
 MISC metadata.xml 2778 BLAKE2B 45cb2a647a1730c9b6b21271364b5f4acaf145f6ae33db356d0b9be7584705c29a645d3f96abfe0a9b87540ae55ab586ec202191776f4472b66291c274b9f24b SHA512 c58e98197353efe1c6fef038dd53d4a938e85aa66fc53f00cab0133d8ee89c629eead55c270c88583778b193f0a85b498c7235fc3f1e8f45a1abfff2d5f0cbec
diff --git a/sci-libs/trilinos/trilinos-13.0.0.ebuild b/sci-libs/trilinos/trilinos-13.0.0.ebuild
new file mode 100644
index 000000000000..efce4176d970
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-13.0.0.ebuild
@@ -0,0 +1,220 @@
+# 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 toolchain-funcs multilib toolchain-funcs
+
+DESCRIPTION="Scientific library collection for large scale problems"
+HOMEPAGE="http://trilinos.sandia.gov/"
+MY_PV="${PV//\./-}"
+PATCHSET="r0"
+SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-${PATCHSET}.tar.xz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+
+IUSE="
+	adolc arprec boost clp cuda eigen glpk gtest hdf5 hwloc hypre
+	matio metis mkl mumps netcdf petsc qd scalapack scotch sparse
+	superlu taucs tbb test threads tvmet yaml zlib X
+"
+
+# TODO: fix export cmake function for tests
+RESTRICT="test"
+
+RDEPEND="
+	sys-libs/binutils-libs
+	virtual/blas
+	virtual/lapack
+	virtual/mpi
+	adolc? ( sci-libs/adolc )
+	arprec? ( sci-libs/arprec )
+	boost? ( dev-libs/boost )
+	clp? ( sci-libs/coinor-clp )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
+	eigen? ( dev-cpp/eigen:3 )
+	glpk? ( sci-mathematics/glpk )
+	gtest? ( dev-cpp/gtest )
+	hdf5? ( sci-libs/hdf5[mpi] )
+	hypre? ( sci-libs/hypre )
+	hwloc? ( sys-apps/hwloc )
+	matio? ( sci-libs/matio )
+	mkl? ( sci-libs/mkl )
+	metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
+	mumps? ( sci-libs/mumps )
+	netcdf? ( sci-libs/netcdf )
+	petsc? ( sci-mathematics/petsc )
+	qd? ( sci-libs/qd )
+	scalapack? ( sci-libs/scalapack )
+	scotch? ( sci-libs/scotch )
+	sparse? ( sci-libs/cxsparse sci-libs/umfpack )
+	superlu? ( sci-libs/superlu )
+	taucs? ( sci-libs/taucs )
+	tbb? ( dev-cpp/tbb )
+	tvmet? ( dev-libs/tvmet )
+	yaml? ( dev-cpp/yaml-cpp )
+	zlib? ( sys-libs/zlib )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}"
+
+PATCHES=(
+	"${WORKDIR}"/patches
+)
+
+trilinos_conf() {
+	local dirs libs d
+	for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
+		dirs="${dirs};${d:2}"
+	done
+	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
+	for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
+		libs="${libs};${d:2}"
+	done
+	[[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
+	dirs=""
+	for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
+		dirs="${dirs};${d:2}"
+	done
+	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
+		-DCMAKE_SKIP_INSTALL_RPATH=ON
+		-DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
+		-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
+		-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
+		-DTrilinos_ENABLE_ALL_PACKAGES=ON
+		-DTrilinos_ENABLE_PyTrilinos=OFF
+		-DTrilinos_ENABLE_SEACAS=OFF
+		-DTrilinos_ENABLE_SEACASChaco=OFF
+		-DTrilinos_ENABLE_SEACASExodiff="$(usex netcdf)"
+		-DTrilinos_ENABLE_SEACASExodus="$(usex netcdf)"
+		-DTrilinos_ENABLE_TESTS="$(usex test)"
+		-DZoltan2_ENABLE_Experimental=ON
+		-DTPL_ENABLE_BinUtils=ON
+		-DTPL_ENABLE_BLAS=ON
+		-DTPL_ENABLE_LAPACK=ON
+		-DTPL_ENABLE_MPI=ON
+		-DTPL_ENABLE_ADOLC="$(usex adolc)"
+		-DTPL_ENABLE_AMD="$(usex sparse)"
+		-DTPL_ENABLE_ARPREC="$(usex arprec)"
+		-DTPL_ENABLE_BLACS="$(usex scalapack)"
+		-DTPL_ENABLE_BoostLib="$(usex boost)"
+		-DTPL_ENABLE_Boost="$(usex boost)"
+		-DTPL_ENABLE_Clp="$(usex clp)"
+		-DTPL_ENABLE_CSparse="$(usex sparse)"
+		-DTPL_ENABLE_CUDA="$(usex cuda)"
+		-DTPL_ENABLE_CUSPARSE="$(usex cuda)"
+		-DTPL_ENABLE_Eigen="$(usex eigen)"
+		-DTPL_ENABLE_GLPK="$(usex glpk)"
+		-DTPL_ENABLE_gtest="$(usex gtest)"
+		-DTPL_ENABLE_HDF5="$(usex hdf5)"
+		-DTPL_ENABLE_HWLOC="$(usex hwloc)"
+		-DTPL_ENABLE_HYPRE="$(usex hypre)"
+		-DTPL_ENABLE_Matio="$(usex matio)"
+		-DTPL_ENABLE_METIS="$(usex metis)"
+		-DTPL_ENABLE_MKL="$(usex mkl)"
+		-DTPL_ENABLE_MUMPS="$(usex mumps)"
+		-DTPL_ENABLE_Netcdf="$(usex netcdf)"
+		-DTPL_ENABLE_PARDISO_MKL="$(usex mkl)"
+		-DTPL_ENABLE_PETSC="$(usex petsc)"
+		-DTPL_ENABLE_Pthread="$(usex threads)"
+		-DTPL_ENABLE_QD="$(usex qd)"
+		-DTPL_ENABLE_SCALAPACK="$(usex scalapack)"
+		-DTPL_ENABLE_Scotch="$(usex scotch)"
+		-DTPL_ENABLE_SuperLU="$(usex superlu)"
+		-DTPL_ENABLE_TAUCS="$(usex taucs)"
+		-DTPL_ENABLE_TBB="$(usex tbb)"
+		-DTPL_ENABLE_Thrust="$(usex cuda)"
+		-DTPL_ENABLE_TVMET="$(usex tvmet)"
+		-DTPL_ENABLE_UMFPACK="$(usex sparse)"
+		-DTPL_ENABLE_X11="$(usex X)"
+		-DTPL_ENABLE_yaml-cpp="$(usex yaml)"
+		-DTPL_ENABLE_Zlib="$(usex zlib)"
+		-DML_ENABLE_SuperLU:BOOL=OFF
+	)
+
+	use eigen && \
+		mycmakeargs+=(
+		-DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3"
+	)
+	use hypre && \
+		mycmakeargs+=(
+		-DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre"
+	)
+	use scotch && \
+		mycmakeargs+=(
+		-DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch"
+	)
+
+	# cxsparse is a rewrite of csparse + extras
+	use sparse && \
+		mycmakeargs+=(
+		-DCSparse_LIBRARY_NAMES="cxsparse"
+	)
+
+	# mandatory blas and lapack
+	trilinos_conf blas BLAS
+	trilinos_conf lapack LAPACK
+	use superlu && trilinos_conf superlu SuperLU
+	use metis && trilinos_conf metis METIS
+
+	# blacs library is included in scalapack these days
+	if use scalapack; then
+		trilinos_conf scalapack SCALAPACK
+		mycmakeargs+=(
+			-DBLACS_LIBRARY_NAMES="scalapack"
+			-DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs"
+		)
+	fi
+
+	#
+	# Make sure we use the compiler wrappers in order to build trilinos.
+	#
+	export CC=mpicc CXX=mpicxx && tc-export CC CXX
+
+	#
+	# cmake-utils eclass patches the base directory CMakeLists.txt
+	# which does not work for complex Trilinos CMake modules
+	#
+	CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Clean up the mess:
+	mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
+	mv "${ED}/usr/$(get_libdir)"/trilinos/cmake/* "${ED}/usr/$(get_libdir)"/cmake || die "mv failed"
+	rmdir "${ED}/usr/$(get_libdir)/trilinos/cmake" || die "rmdir failed"
+	if [ -f "${ED}"/lib/exodus.py ]; then
+		mv "${ED}"/lib/exodus.py "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
+	fi
+	if [[ $(get_libdir) != lib ]]; then
+		mv "${ED}"/usr/lib/pkgconfig "${ED}/usr/$(get_libdir)"
+	fi
+
+	mv "${ED}"/include/* "${ED}"/usr/include || die "mv failed"
+	rmdir "${ED}"/include
+
+	#
+	# register $(get_libdir)/trilinos in LDPATH so that the dynamic linker
+	# has a chance to pick up the libraries...
+	#
+	cat >> "${T}"/99trilinos <<- EOF
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos"
+	PATH="${EPREFIX}/usr/$(get_libdir)/trilinos/bin"
+	EOF
+	doenvd "${T}"/99trilinos
+}
diff --git a/sci-libs/umfpack/Manifest b/sci-libs/umfpack/Manifest
index 269e4f6dc814..82db6241d589 100644
--- a/sci-libs/umfpack/Manifest
+++ b/sci-libs/umfpack/Manifest
@@ -1,3 +1,3 @@
 DIST umfpack-5.7.9.tar.bz2 772026 BLAKE2B 6d6dc1ba47b8f473884c1cb17d3eaa363d88281512e33586a0af0c2bcb7a523272bef4d8da0a29e2a5a84c8f0cd0ee6830ec10247971db63b4c319e6fa9a3c42 SHA512 5ad57467b5b7e4579f3cc9e2e7c92a0262ac2ef991a606d079b749b66e10da60aceaa4b0e741c116f8866da23c0f7c06368fe2b08d66d51383683f0dcbeddba3
-EBUILD umfpack-5.7.9.ebuild 967 BLAKE2B b781679848dd4c9921b43c28342c0a75d9672ce0214e663a3457b8388da6f86639328397e65c0f278794bbcb0ae9ffd91a383c1b9a92eec722d8aeb8ccc443d2 SHA512 3df2a8d58dabdcc55c502006b0a1eb897ceaab747dcf74a6b96876697a267adff1595f06d22dde4c092f494d217dd7d4a06533bb6610617ea1d628d7b5683a20
+EBUILD umfpack-5.7.9.ebuild 966 BLAKE2B e8736ac2725fdbd95a9b77bdcb40c5222d775049a075196d0160505421db9b170b85348aabe69583ac0ff68a6b42caee4e7a56946e088e472c43b8415940da17 SHA512 7f18ba356f3af2506eff80b5efb3e249c658eaacc4d91d7dc1de4db205b3ca5002dc397361317971ebdf9414d5b246452ed3bf5b68e0e2e1db5e1d8e74af0038
 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
index aab341988959..920e65cb2a72 100644
--- a/sci-libs/umfpack/umfpack-5.7.9.ebuild
+++ b/sci-libs/umfpack/umfpack-5.7.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 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="+cholmod doc"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 32f1846346ad..0e13fc83b1f4 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -1,5 +1,6 @@
 AUX vtk-8.1.0-openmpi-4-compatibility.patch 473 BLAKE2B 2f4994b5c745746b0c1391666d155e8ff79f6c57969177862e3f64956cc370b2b12a0ba223bd344734a7700c5eb728ccaf1ac7188d0fd049815b7b22c7648203 SHA512 6a2e25263070747657aa319d80b333375b2c10bbbd58fc98a1ab6cdb563e996afe9af8d4ae28d4aab24a437508993cfa3cacfc9284562d7af8a9e29fded73837
 AUX vtk-8.2.0-fno-common.patch 1694 BLAKE2B 7fe15b8ea0fc358360e06be2fcc6634005cbb294fdcfea87028ef67fd018085c33448a70babd0e3e6997767b801e69853381c7bd02926d9657ea3233a8bcd065 SHA512 fbccb357649cf0dc7c5a5123db05b87e26c6095c89005adcb9e799cc68531fac87f4f588d12f0ee2728517a60436192011a04885e06ef4975fc8b81ba54ba1ea
+AUX vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch 634 BLAKE2B c143e943cfc8130e4d1a72776639e49212d9efa66db71fba6a9469381aaf35f526f316e4a6e5bd144dc8054f857b3a3f7a179eb1875c9ad0859ba669c5d63215 SHA512 28fd381693a1ed9584be3d1acc3d3de20be3cb23a3605f3f66470cf9ec0bc66ef0e3f574fc760fbbd4aeca75ea3aa96c0e22b37fbdb54a22073fee179e4a26cb
 AUX vtk-8.2.0-gcc-10.patch 739 BLAKE2B 8b9ae179c5af17f5d0173674ffd616f5473bcc0830487343150b778cf143d762fc77c7212ee4e7f8f725878e85a7c1ccaa320393164212b276703e0b86e61e7f SHA512 7a2a8ea7ac3f6d3a5fd7d6553764eb5396ee4d89cc259bbf772493953125982b4cc8a43dc7b7a5e5c1ab6783eba6dd0d6edc791465985fd1f4b1ac9eb99062eb
 AUX vtk-8.2.0-py38.patch 8467 BLAKE2B ea624989f3f0a4900fa692fc271d47d1d10cc047043e464f8b6ae9ea6713a63c4f0ec75c84a70d7fc2523b29b1c24ada4b77e90e9016690868c62217dbe69a8b SHA512 9922b24551c4716bdd95d398b2ea9d48f5c098350821a16767128a97180e4e1575414755545dd71e40dec88b0a7a61fc63ba2e598bedfc07620b15b0efd02cf4
 AUX vtk-8.2.0-qt-5.15.patch 1153 BLAKE2B 2e0d041d15f547845c07d46da4f641df7a57c0df8d5f9d5290c44a91d403b58f4627ae713169696383afa1d9edd85c59606782b169238d08a5df0b7e28ac79b7 SHA512 d1460117738b33074fbd92ffc54a838452c5b2cdd668767295dced7a39c845cb58664f0ea91726015facf4e3b752a53f2a32e52c85dc187a815c95e0935d0f03
@@ -7,5 +8,5 @@ DIST VTK-8.2.0.tar.gz 35511819 BLAKE2B 908ed9377d75da6d0bd84de0078ba90a1e9396fcc
 DIST VTKData-8.2.0.tar.gz 304287875 BLAKE2B 0292d84be40e11203326dcb1bf45f4a6ad2a785968130d4868a230f1cfbdcb600d0c03d4dae3519e2737dc7a964f29c51500c91b3da4291069608dd80a2bce45 SHA512 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b
 DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d26599b48208b4104f41eaa90f99483689cd928cb00e3a7def396d65db2f03c9294d132854a27af74f66eb118c8319c4ce SHA512 8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588
 DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317
-EBUILD vtk-8.2.0.ebuild 9336 BLAKE2B 3ab298e9f884d3d816f7fd2af7606242f73b775f118b7f73abf730a955e46efde711d6b326f007dcf79e45395307b6310faf1531680d11a1b4cce719d17fcced SHA512 6ebb43154c78e61b32b8570a70b3aadece5cf87bec1acd7628a36d370182a06bf99c44185f258060a30ffbf947d940f93971b98648f417b58de7a8e91657797e
+EBUILD vtk-8.2.0.ebuild 9416 BLAKE2B a97dc772dab40af9fdd0d660ebe4532e26eb77055453b128bf5463d5689f4092ec5180697eed7d517f9f5b9b1a5e704336d311ef9f1137358df42843ece43746 SHA512 c8503ea91486214a0cdbda813c0fb012e6111015939e1d9aa701664e4e707f6043cf0dcd4e9dba961d33513fb66015f71528175d1c9e4cb935e8ef5572014655
 MISC metadata.xml 988 BLAKE2B 2533eda3936361d835dba2e30f1b1a19484facc289603d82b6c2012ee242e7778b1080d7136584c08113d7a82e0742d7bb2373984667301a4c7d52b4dbd8b087 SHA512 f4e29e15a05cfb49b24f4a8e24a6e43ac72ac0fa21ed640a70e5017263f23e21e514dedc489d963acd803407df8ee2bd2d6006c83eece795f91b4809d2ec2ff4
diff --git a/sci-libs/vtk/files/vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch b/sci-libs/vtk/files/vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
new file mode 100644
index 000000000000..b4674873508f
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
@@ -0,0 +1,18 @@
+--- VTK-8.2.0/ThirdParty/freetype/vtk_freetype.h.in.orig	2019-01-30 18:15:13.000000000 +0100
++++ VTK-8.2.0/ThirdParty/freetype/vtk_freetype.h.in	2020-10-17 00:03:32.730820908 +0200
+@@ -20,6 +20,15 @@
+ 
+ #ifdef VTK_USE_SYSTEM_FREETYPE
+ # include <ft2build.h>
++/* FT_CALLBACK_DEF no longer exported since freetype-2.10.3 */
++/* has been moved to <freetype/internal/compiler-macros.h> */
++# ifndef FT_CALLBACK_DEF
++#  ifdef __cplusplus
++#   define FT_CALLBACK_DEF( x )  extern "C"  x
++#  else
++#   define FT_CALLBACK_DEF( x )  static  x
++#  endif
++# endif /* FT_CALLBACK_DEF */
+ #else
+ # include <vtkfreetype/include/ft2build.h>
+ #endif
diff --git a/sci-libs/vtk/vtk-8.2.0.ebuild b/sci-libs/vtk/vtk-8.2.0.ebuild
index b0aa1a26e408..5f74a4c99e40 100644
--- a/sci-libs/vtk/vtk-8.2.0.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0.ebuild
@@ -129,6 +129,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc-10.patch # bug 723374
 	"${FILESDIR}"/${P}-fno-common.patch # bug 721048
 	"${FILESDIR}"/${P}-py38.patch
+	"${FILESDIR}"/${P}-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch # bug #751088
 )
 
 RESTRICT="test"
diff --git a/sci-libs/xylib/Manifest b/sci-libs/xylib/Manifest
index a97920ba232f..fd4360d8f702 100644
--- a/sci-libs/xylib/Manifest
+++ b/sci-libs/xylib/Manifest
@@ -1,3 +1,3 @@
-DIST xylib-1.2.tar.bz2 297167 BLAKE2B f30a397aea282626b2e5ea93053571ed6d617b4fdeff468751fed9c9f538595854c948d0f50656ce22dbadfe4ff99a59dc4a5fb70686e78c084bbe1db1c9c11a SHA512 16eaa4b37014914c75ca3d0188aaf236c342887c03e233a9bb770412b3bb16da6779ab82c8acd66677d98ada75537c77d1abad723defd33dbe6eda78c6c88b91
-EBUILD xylib-1.2.ebuild 622 BLAKE2B 1e167618f51dda4495240bc40a5ff438d0ac304044f2d4a0a50c933a300c8c8014f101426d9d7a66572f74d6e9aad7a7c352526cea6ad1d509bfdabd5a12a3a2 SHA512 ae4691ce2ece1d209d4769f454b060c1287b47a3510ec9c40b8556786f0fc784b20427d15eac77e69ab58f80193b360f8349c0d31b647d09e6297c99ecd4fc8c
+DIST xylib-1.6.tar.bz2 370765 BLAKE2B 76eb968f06a6a015ed7a29a493d888642767cda103733498b8706c973498aa4ac8576716b06f6eae8d95a1f625e9cd91ab02cfd53146d976e32fc9295f3c502f SHA512 9861cbf03f8b921a93a2d32a529ff94d77723e2510cd61096b4b85f91af4be6330ed82e8da94bc45dbca7f9814077360d1dae204315b28c2b6d85e3d2c7f6696
+EBUILD xylib-1.6.ebuild 807 BLAKE2B e15510175a2dd0013cadda8239039b4ac9a791265142f47f4be44b6538c0499256b5101ea96563cc1c2458a1ca3548b808909f213233bdac1c82df1f9618c574 SHA512 4c09b69be3205c1924a8cef18f4a5ca8fe5cfd73c2e83eb5d795f1c1b36117b2a50e5de8d64de73ccfdc31f7bb544906d645bc816b3669637432725c0d738950
 MISC metadata.xml 560 BLAKE2B 15a5a2f32f2c2285215daa40e7c5cb9cbff5c0f470c52e566812948cecd6cccdfa4a9eaee4a10ccbc46503c1a8ab2df557b88b37912def66bb79fe0cdbe5b8b7 SHA512 5bbf4b430ae8770e8d6ce2e084e093689acbbb36bb9aef5e0a6b21586870ee5fb0c4953588052aa053eb5d3418a84f18d0c6b7940282c9678a803bc1ae9ba8f3
diff --git a/sci-libs/xylib/xylib-1.2.ebuild b/sci-libs/xylib/xylib-1.2.ebuild
deleted file mode 100644
index ed9ee753d6c8..000000000000
--- a/sci-libs/xylib/xylib-1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Experimental x-y data reading library"
-HOMEPAGE="http://www.unipress.waw.pl/fityk/xylib/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 static-libs zlib"
-
-RDEPEND="
-	dev-libs/boost
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with bzip2 bzlib)
-		$(use_with zlib)
-	)
-	autotools-utils_src_configure
-}
diff --git a/sci-libs/xylib/xylib-1.6.ebuild b/sci-libs/xylib/xylib-1.6.ebuild
new file mode 100644
index 000000000000..49e226d26949
--- /dev/null
+++ b/sci-libs/xylib/xylib-1.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER=3.0-gtk3
+
+inherit wxwidgets
+
+DESCRIPTION="Experimental x-y data reading library"
+HOMEPAGE="https://github.com/wojdyr/xylib"
+SRC_URI="https://github.com/wojdyr/xylib/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gui zlib"
+
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	gui? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	zlib? ( sys-libs/zlib )"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost"
+
+src_configure() {
+	use gui && setup-wxwidgets
+
+	econf \
+		--disable-static \
+		$(use_with bzip2 bzlib) \
+		$(use_with gui) \
+		$(use_with zlib)
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}