gentoo new year resync : 01.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
commit: 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree: 53bf797418ac5e9b99c41ca0382c87b82421e5de /sci-libs
parent: 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
76 files changed, 807 insertions, 1398 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index e1452c889eb2..3f6db8231fb7 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/arpack/Manifest b/sci-libs/arpack/Manifest
index 08587ec525bd..393861ca0c0f 100644
--- a/sci-libs/arpack/Manifest
+++ b/sci-libs/arpack/Manifest
@@ -1,6 +1,8 @@
 DIST arpack-3.7.0.tar.gz 989570 BLAKE2B bdab72f080d223ebbe5a279102d54fc196aac3ad1b8360be0e3814cb5e14e8f26a1f37b4b27b66db4b88b0c651c039666aa94a98fcdb34977feea7fc7d10808c SHA512 cc07cdd1fba4881907b507ff6b6c9bce9e3dadd8ef744194f08ee718a6210c039ac0c51c12edd720503f8e59bcd11c178fc323e1a59696be8c3b8262cf47a452
+DIST arpack-3.8.0.tar.gz 1014494 BLAKE2B 6daf8a237fdfce527935d777292df150b2f78892d9975f8696a37024fcb78174b29afd300e7abca2684c1907eeda658eb4478f09f580835896c0e10d106cdbbd SHA512 8969c74c4c0459ea2d29ea49d5260f668fd33f73886df0da78a42a94aea93c9f5fb70f5df035266db68807ab09a92c13487a7a4e6ca64922145aade8a148a2de
 DIST tutorial.ps.gz 105599 BLAKE2B 99570e6a0cc1c020b9c271e8ce1cc224f69ff5333cc818c10b063dc8ffbaf66a9f5c6ede99541b4212286d422146b1c4e332eba7e1635c99efa0e4c2620f0630 SHA512 a7b8fefd1a572ed477ae208d49094c1c65c9368990d12de9b3528e33fed546c947659f74e54a810d04154b4a1b0f9a94bcba4db0cf59d379e20786a261066aa4
 DIST ug.ps.gz 248543 BLAKE2B ac010aef470060636fa00360636ba093f0d24d219fa927c79fb1726b798160eda74fa8b4be6c7dff94f5759efcf30afa99ad310e7959115e028738beb8aa125d SHA512 3349117fb10b07207ffbab2ffa31b406d026855ea4c16e8649b14c7d70bc94e11b5730672e34acd654817799136d4bd76569ac50ec78d787df5582d18ed61328
 EBUILD arpack-3.7.0.ebuild 1498 BLAKE2B d949ed75d793e6158ef2c75169a160c1cc6cf028c1b958341063453ef558d365c153f882ccec5275162403079592480052a3f7e3035573b54017a3a842b6c23e SHA512 345b83614edbaa0f8303da238faf05777c11c44829ff04bf501a8060e85e7dcd4a8f40f44f06bdc13ba414058cac448eb35afdc2cc38ec89649ac923176e6a62
-EBUILD arpack-9999.ebuild 1247 BLAKE2B bbbec3f3b0fce5ffc831382cd9257e7db4a2c118cc64ec7954d457dbab5943f546258a61a22f2d2bb3a6617df0b61e26869698c1aba2c0bbb1b871d85b78cedd SHA512 00dba333d657689664eff0120eeaef5f9753d9169ee644004aea7099279c1d443be9c170a9d2ef570d8d2f2be7b795914767547150d95ca1cec17f05eef51fe1
+EBUILD arpack-3.8.0.ebuild 1377 BLAKE2B d3f2280ab61c6dca7379f8ce8867a81fe6060c0a82a837e46dd901cf6a502faf32328910e7751debb56d8d377cbe084438a21af393bcf82a9809edc74087dbe9 SHA512 2e0c8225e44af23003f0a0d8e5fb5c70fbc74be864b2bbc062605d0f9f12a21e212d468e244fa8820cc0d1047bd3d354aa67a2e6ae2ff12c4e49e82f334a9226
+EBUILD arpack-9999.ebuild 1312 BLAKE2B a0d2b9895489d5072ff6127d4df0cefb9ea9ede42d826edda67c1bf46aafc443fa5fb640dafb213e10eab3acde4d13e5d1ba6f86434df2541263fdbf3303fc32 SHA512 3ea7dc8d88cd389fdea1096fbd34a4961f29460b7d5ab6a5b11bde3653652e3296af5ee6b0f4dabba9c21b80c9bccefd98c1fa3b37ca9a17154f95b63fbdc890
 MISC metadata.xml 974 BLAKE2B c9121a0b23acddc3268d4bdbf4537104217a00d09263d29b6cc6f832c87f9a9775f6fab567976078dc1dfa54f2bac627d792b1819a9ea698f3a1534bc52c39da SHA512 c3e094cab53fb61c9acf3eff6ca0c0fc53a71ec135315ba833fbfe6a5ae9481f2b4de5270ccd19ec84cf85dfb18df179e1e234d268eef1af98be218575dcd4bf
diff --git a/sci-libs/arpack/arpack-3.8.0.ebuild b/sci-libs/arpack/arpack-3.8.0.ebuild
new file mode 100644
index 000000000000..e5986de25b70
--- /dev/null
+++ b/sci-libs/arpack/arpack-3.8.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools 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() {
+	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 "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/arpack/arpack-9999.ebuild b/sci-libs/arpack/arpack-9999.ebuild
index eac5961625d4..2cab409d95ab 100644
--- a/sci-libs/arpack/arpack-9999.ebuild
+++ b/sci-libs/arpack/arpack-9999.ebuild
@@ -52,4 +52,7 @@ src_install() {
 			dodoc -r PARPACK/EXAMPLES/MPI
 		fi
 	fi
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/bmrblib/Manifest b/sci-libs/bmrblib/Manifest
index 1065c65d71d5..a0eb7fbc1748 100644
--- a/sci-libs/bmrblib/Manifest
+++ b/sci-libs/bmrblib/Manifest
@@ -1,5 +1,3 @@
-DIST bmrblib-1.0.3.tar.bz2 51246 BLAKE2B e2adc970523b33c88b73451b1c3d50c218e4600e0e1019bb6fa4dbae1c6a6737bcd1661bf68b6863a1199c46f3df1b0ba36c155efe1010152e120ccc23b034ab SHA512 b03ad9e4ca035439165ebd1b7ba93ede427b2a233a4179be4e8089db988f1dcdce68b1e97348fe22fe7f2c3827ed003b654e0674a4d16a9e32a8a7c255c4b248
 DIST bmrblib-1.0.4.tar.bz2 51211 BLAKE2B 4d901c085648971af0e271d5524d4fe0f0e085f9ab34cde4cbc2d7b17d1dd37ffd4051c219e769738a9eac8b11b6950c5575d1bd9b9193ef48a698560de3fd96 SHA512 579f3beaf343416c58b344a33ee94d42bcedba558b33c2b9f98662d2ffc685887617229b5f7e75acf61712fe4f03827ca4413bc08e3bd2e72f69d952310891e0
-EBUILD bmrblib-1.0.3.ebuild 413 BLAKE2B 04fabbdb185f55d9b8ee1029599ada8ca9d6fc8e6ab67af917019253ecdec2583ee89e79bdb94f45ac5819804f557f00baa27566c318c76de51dd2cd75c9cec4 SHA512 56bebeb0e341bafb0cb7f7b24b5b4322c9c15c8b13ea98b16b0ae44a5dc0d76f6b81ed6d44cfd0e0b334d2722d6bf63fe2aa3461affd6e0c2f51aaf5d472c4e7
 EBUILD bmrblib-1.0.4.ebuild 423 BLAKE2B c1faf463f55358e92bd9f9bdeb175ad3e11e47330f3be985f8f6cf974ac06ed10daabd7f350c673312d9de665624f006f08e92ee90142f10cd92969e133f05ce SHA512 15114ff8bee909682384780887f7dd2227fe44e5709d8d1268db815af7240a4890f55f86d9f56154f23b148dfce504a0a8fe3a646175ac3ea1785f7a6f3accdd
 MISC metadata.xml 697 BLAKE2B 6448efc90859f836649dc91366bc8662fbccac80ee2079880078238b2c9bd7897cb3337aecc727f2dc2da2f8916e766c25bcd5703d1b0eb4b263c3e3481fffb7 SHA512 c09f4efba0b36032d60b363ff7f18a6b477f6a321c7d8069ebcc4bcd0deee1448c1230e5651371a5748cdd66c9032e8ff7c480dfa3af7a712503f3589d282f28
diff --git a/sci-libs/bmrblib/bmrblib-1.0.3.ebuild b/sci-libs/bmrblib/bmrblib-1.0.3.ebuild
deleted file mode 100644
index dbc65bf5220c..000000000000
--- a/sci-libs/bmrblib/bmrblib-1.0.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="API abstracting the BioMagResBank (BMRB) NMR-STAR format"
-HOMEPAGE="http://gna.org/projects/bmrblib/"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index c7540260fb97..044f58bc95c2 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -1,5 +1,5 @@
 DIST cfitsio-3.360.tar.gz 4104894 BLAKE2B 7a84177c28679db5c27d0586cb6959a0663918a84d46ced9aea6ef7e6bdd32955946807efd4cd852e55128dbc887c4a2135b2eba26847b265011bfd6df049335 SHA512 158819b4a3a29c29a5f017283e2b20067420994e881d202dbf3ba199c9e564dc1e74f8be5ce84f78107126d2a8688cc55cc7ed284540ca647e44cdc3b0b02072
 DIST cfitsio-3.410.tar.gz 4194529 BLAKE2B 31250b9add5b6a85c919c33251d127117ceab81c2243e0b9f8bbe2ef0fd09c85a938b7525338bc718a9b3035efa3660ecffa17ec79e3e278c8014e727f23473b SHA512 cc1de2a4314e7c82bdd6855e11dea4e18dc4e7bcb27b0d15b884cbaeb4acd3b1e12dadd17ab83c7917570934913f89337035470ee4921e7b62409a81052d70cd
-EBUILD cfitsio-3.360.ebuild 1463 BLAKE2B 8c415b822dc2210c49edc6de38d1c120b56314453d565cfab7fab28ca112b0e7ee9e1e3fad0f7bb1959dcce1580b2ba2f8a59b572292b540ecc05f4a52343f0e SHA512 839e339b221a4f83f4e2366ca895b43fbbc57cf510a8355b5fd6d09ba4b82d1769786fdde1c30af4030119becea08ec46c8aea805c8fff0cc27eeb866a00412f
-EBUILD cfitsio-3.410.ebuild 1596 BLAKE2B 63e3b35ef3c45751b22b9a416f77750bea8913336fad59f0bb9f5d9119d3a7057fed898d8ca9577cf4a404aff0cf9b808f359c6179092f140ef214e7ee308934 SHA512 105aa186e88703bb5622a08d19b73b5af4b7d45a6fe8f3d61de9b9f5c26925a77822a6a0e6951e09bff77370d2a679047f6cde97fa0abfccb93425bc2c947fe8
+EBUILD cfitsio-3.360.ebuild 1464 BLAKE2B 124a1331c7a494995e8cc91f6f5a0c2a6b9c6e71a40556b00162c40330bdb366ce21a70cde10817cecf0a73aa7d139f2e65aae1c40c1fab5ecb9fb9a98d49b11 SHA512 270f4fe29b970cc87a9ba6bda72e00df8667a80efc8b8b87e3827c1e46744738f9e7700c5b2b0f462cf929454a84f8270f56254e728968d2622d68b3c5ff3bcf
+EBUILD cfitsio-3.410.ebuild 1597 BLAKE2B bd5a91bb4b2c02977691b606835c8397d05090147402bb5f2f9abe3cdc1c233e6f961c517c99a689033fdc02cb72a050345ed46e0414ba683f04f3565468fe69 SHA512 6cb2c395fbe830cdf0b1a3f2fc79c0d0e4ae2923de95f7b24fed1cfb1cb23809bd041adca03316659b95e2af7b4604b4bdd39b5b51a930af5719e57796dbf7ff
 MISC metadata.xml 840 BLAKE2B 6f024cc96a9da7bef155b5138d55b518a1ae917af045cd2970227ca1993461659eea8883dc3b6b9e4d3d2aaa5c49b4900e122dbb83a437aa3d94351c333934d7 SHA512 946044116d9a865e3b7e883b41f7d74a3f54c72cd857aed4dcb454cfe559385004b3e55562a306bfa3347cfc035a5af9a5aaa8a4d8dc7fe154b8d0dae7a7390b
diff --git a/sci-libs/cfitsio/cfitsio-3.360.ebuild b/sci-libs/cfitsio/cfitsio-3.360.ebuild
index fc2d56932a63..365477171540 100644
--- a/sci-libs/cfitsio/cfitsio-3.360.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.360.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="doc examples fortran static-libs +tools threads"
 
 RDEPEND="sys-libs/zlib"
diff --git a/sci-libs/cfitsio/cfitsio-3.410.ebuild b/sci-libs/cfitsio/cfitsio-3.410.ebuild
index 9d508f38125b..640d3bb018f4 100644
--- a/sci-libs/cfitsio/cfitsio-3.410.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.410.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="bzip2 doc examples fortran static-libs +tools threads"
 
 RDEPEND="
diff --git a/sci-libs/cgnslib/Manifest b/sci-libs/cgnslib/Manifest
index f40a3a8e33d4..03cd56cf491a 100644
--- a/sci-libs/cgnslib/Manifest
+++ b/sci-libs/cgnslib/Manifest
@@ -1,5 +1,5 @@
 DIST cgnslib-3.3.0.tar.gz 3314889 BLAKE2B 3b8af11e04c211ca60f512c7995e9b23e0dd79180f3443f238562216073740de6b845c5bb78d6fb017bbf41e5249c1f58c27130047fd50afb4b20bbc778a046b SHA512 eb5c79d3830f8ee1fa30a67fbf32133c13a276c4b18a553826e4670bd4aa7262d7751bccb74c5e208cd47703f9076bde2e2e0db70408c88fde3ac11b638e6ff3
 DIST cgnslib-3.4.0.tar.gz 3393312 BLAKE2B 279d4502ff70701df6a266495ccc7750e9c51ac14bd3d5072ae8e1448b4f1e4afaefaaf254cf0afe1cc984e4d9fc7d5c161f7696f62726aaf567990ded3c9056 SHA512 e26cfb0d9f3061242d327a6c18fe40ed51bf63b61ae0d6b5cce7e6b4aa623b00e1c3fd9fe240d993323c6f4eec043fde5296a82b1f9108027f945300eec541ec
 EBUILD cgnslib-3.3.0.ebuild 2000 BLAKE2B 46ef19a44d29f372e00dea7eefd869e6eb7a19368b9660fe98f905954478b1b2b64235bbc0b385cf8a4b2a98f3f6460d8eb090ea9824fcbe0dd469a210a92223 SHA512 b0267e8f0f1e69cd6008a650c9c9baccb7efbc360d6a81c5a8fb29c5d06b829c834066d335c05e4162d486c34a02ec0dd25059991653182779097d8f368c22f9
-EBUILD cgnslib-3.4.0.ebuild 1943 BLAKE2B 37b583d0eab7c94aacb3cc9b4aa435c7ce21954a98a66f157881e71ea7a063cbad4b32a244b12be831a641e68042f86dbfc88a617714ba113e63d4f3ae94bbe8 SHA512 3eb50cc045678bd10c93fe269b8b046d1a924e954e39f16cf2f0011ba2c8297cb187d368b69784a8b60a765edf79352817abef2c50e4ab56febb9bbe92437895
+EBUILD cgnslib-3.4.0.ebuild 2084 BLAKE2B 51a8a6dd325255f70d60ce55ddc4870f6bee34cc30f7c98672626288be4ac17ae2a274ff31f80ec4262b6dd92cc4ac0513d26863177432674c7edf66a43771c8 SHA512 21b14ae07d64569ae4db22afb03b0623948beb190a99486e00a6565c10ca2adc77345acc75dfb2cde5c1adf9be27f21e34a117bbcfd4741f43ae5cfb59c0fa6f
 MISC metadata.xml 1126 BLAKE2B 9ee9f1c8457293509d5b8cb4c0b64b4f1dcc7b4858d0f7ba99e79388118be318b8567719ca7deffa8b161e5d0acbba125c63b07baf61864e77f0ae6502f74a34 SHA512 969a67120b9dd3878f479e9ae2e2274c31c477660f1ffec8f67bd033ccd5d35588bd454b8e82efcede970c1393336c3c36f66aedba07b4d8c1b93c053a78efad
diff --git a/sci-libs/cgnslib/cgnslib-3.4.0.ebuild b/sci-libs/cgnslib/cgnslib-3.4.0.ebuild
index e5889cb043ad..6eac6426bb89 100644
--- a/sci-libs/cgnslib/cgnslib-3.4.0.ebuild
+++ b/sci-libs/cgnslib/cgnslib-3.4.0.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED="fortran"
 FORTRAN_STANDARD="90 2003"
 
-inherit cmake-utils fortran-2
+# fails to build with ninja
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake fortran-2
 
 DESCRIPTION="CFD General Notation System standard library"
 HOMEPAGE="http://www.cgns.org/"
@@ -16,7 +19,15 @@ LICENSE="ZLIB"
 SLOT="0/3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fortran hdf5 legacy mpi static-libs szip test tools"
-RESTRICT="!test? ( test )"
+RESTRICT="
+	fortran? ( test )
+	!test? ( test )
+"
+
+REQUIRED_USE="
+	mpi? ( hdf5 )
+	szip? ( hdf5 )
+"
 
 RDEPEND="hdf5? ( sci-libs/hdf5:=[mpi=,szip=] )
 	tools? (
@@ -37,41 +48,47 @@ pkg_setup() {
 src_prepare() {
 	# gentoo libdir
 	sed -e 's|/lib|/'$(get_libdir)'|' \
-            -e '/DESTINATION/s|lib|'$(get_libdir)'|g' \
-            -i src/CMakeLists.txt || die
+		-e '/DESTINATION/s|lib|'$(get_libdir)'|g' \
+		-i src/CMakeLists.txt || die
 	# dont hard code link
 	sed -e '/link_directories/d' \
 		-i src/tools/CMakeLists.txt src/cgnstools/*/CMakeLists.txt || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DCGNS_BUILD_SHARED=ON
-		-DCGNS_USED_SHARED=ON
+		-DCGNS_USE_SHARED=ON
 		-DCGNS_BUILD_CGNSTOOLS="$(usex tools)"
 		-DCGNS_ENABLE_FORTRAN="$(usex fortran)"
 		-DCGNS_ENABLE_HDF5="$(usex hdf5)"
 		-DCGNS_ENABLE_LEGACY="$(usex legacy)"
 		-DCGNS_ENABLE_TESTS="$(usex test)"
-		-DHDF5_NEED_MPI="$(usex mpi)"
-		-DHDF5_NEED_SZIP="$(usex szip)"
-		-DHDF5_NEED_ZLIB="$(usex szip)"
 	)
-	cmake-utils_src_configure
+
+	if use hdf5; then
+		mycmakeargs+=(
+			-DHDF5_NEED_MPI="$(usex mpi)"
+			-DHDF5_NEED_SZIP="$(usex szip)"
+			-DHDF5_NEED_ZLIB="$(usex szip)"
+		)
+	fi
+
+	cmake_src_configure
 }
 
 src_compile() {
 	# hack to allow parallel building by first producing fortran module
 	use fortran && cd "${BUILD_DIR}"/src && emake cgns_f.o
-	cmake-utils_src_compile
+	cmake_src_compile
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	dodoc README.md release_docs/Release.txt
 	use static-libs || rm "${ED}"/usr/$(get_libdir)/libcgns.a
-	use doc && dodoc *pdf release_docs/*.pdf
-	insinto /usr/share/doc/${PF}
-	use examples && doins -r src/examples
+	use doc && dodoc release_docs/*.pdf
+	docompress -x /usr/share/doc/${PF}/examples
+	use examples && dodoc -r src/examples
 }
diff --git a/sci-libs/clblas/Manifest b/sci-libs/clblas/Manifest
index e52e6cd3c2d3..e5ff9a1139e2 100644
--- a/sci-libs/clblas/Manifest
+++ b/sci-libs/clblas/Manifest
@@ -1,9 +1,10 @@
-AUX clblas-2.10-disable-multilib-cflags.patch 854 BLAKE2B 1f639c6a8d010f7afab50c208613ca837960981ac0fe3eb688cd632fbf29a75e34df8c2bd3544a9f20dca02cb91b85cc8f1708bc031564f9101bd75b4a7eaedd SHA512 39d144be9667b907bdbf1d0d48684196a959801126fa4a9f3b376a1824eaecfc3a5cb3e7d6b8c233e0f8e807b1b241449f6e9554c46ee49d6eca30779c860bff
-AUX clblas-2.10-fix-blas-dot-calls.patch 2732 BLAKE2B 8e92b645d36b314c8bed51a4fbe03a2ca56a739540bc27a2ec1bfeeb3a396834b93167e5f81fbcade118d500fa4088d83e086bb7c5f14a7baa2e3903a3e3a177 SHA512 07c1ac79cf9e9432f0f01cfc01c88c88bf4d733de259236eb1087c7e6b6f0539987cb2caf576ec6db24e6efb15de2d1655bdc5afcbd6512e3d15acedbcfbd995
-AUX clblas-2.10-fix-doxygen-output-dir.patch 639 BLAKE2B 2fc330008b347bfccf19b2d9b8e41129ed69dd3bd1419734497fbfdf49ad233227676f41407304616fb6f0cd8e843fb1c8e3bbb06eb82b802d77bb0e25f56675 SHA512 295dfccb9cd860f354abe775c142e0d68b31d2bc25f427b5b8ec4103865e73ce3a4d43967834eaaf3e40f978f48dddcdac1451138b4d53d5f973321d7f27aa74
-AUX clblas-2.10-fix-pthread-linkage.patch 684 BLAKE2B 6f50b130f57a3a36a202c516bd9413f6ce36490a344b5a2ab130076f88b71b381ba1afe4cdd7c71315b60b46c8b783387f1ef78c148dc16d285e033391d9a006 SHA512 ae42cb7a59caa407df20ec3cfd8e593003bd2653dd43471c39591907159bc6b557c1b7fc4062f662b5986de8fd89cf9b2a287f4b6116701b55baf3ad6acab273
-AUX clblas-2.10-use-boost-dynamic-libs.patch 579 BLAKE2B bd7d7913b72baf15dd733a75050a5981c369fd42ea9c4ad2e6edcc084d52476b65a0b7269ce6c6083fc8fd86c2e2df0716cf0db9a645918c55b52e23165aebd1 SHA512 a07163684bcf69dba8c2df69d120a25ca7186104d40c27bf4d0267a21320460f3585d3fb1fb132df5cc5a1bca2905623c0285bffceb125c1f7d89129a3cc4f65
-AUX clblas-2.10-use-system-mathjax.patch 765 BLAKE2B ced4d5efddcaae15a5844bb2b2cdf32f03f117d394ee9daeffa5c4f0bc10310e7898a2c305774970263cc9e1d3d7e247d23cf477dea906d64af45395d6770807 SHA512 156a0a664bbab80a17f3032c759656769eee36db0a93e4fd4a983eb584ef56d2023aef37b565c8cf81adb507f00f6b83ca9d31ace66c620f2279ca82aa512744
-DIST clblas-2.10.tar.gz 1154117 BLAKE2B 67035b03ab3a8fa07f32cb8d1d40af39fd885ceb21d9754f8a49a62adcfacbeeec703dfdae922ec0fc915a2dcadff2fc2f07a6c5ced74db3da6cd85c6c63f4d5 SHA512 5ed43104aae565292e0df4cc9e014cf483ccc0ff89257ebb5817f6508bfc9593585ed658da639f2167fbfb5d92ef116be4d5de3694f56e1a1e228bd42b1c05c6
-EBUILD clblas-2.10.ebuild 2374 BLAKE2B 87793a3a270e7079eca8c29429395b3f6f9ad1312fc8dd13af70b05842673852d2a4a0c139aecbf161a8e35a10937f64fe75cc448287f6eb5412309c3b9bb29b SHA512 051e69dc0fc3b07936d1e3ff3040440d97e53451e05f39ed104512ec4296041b1320f2d589b6b41aaab704e358a4e4d32a49bbafa73a30f388146b99b0d4f66a
+AUX clblas-2.12-Detect-CBLAS-when-building-the-client.patch 631 BLAKE2B 61ebeed443138fc49e6c30fc593eeebe6a265937766c4aac346a82fc2e7630b4c2bfaf3910250dbca648b78e5f5c1c17a339c176a84a13dd5e9cc3f7121f475e SHA512 749aadc8eb17643d4853473e68c2ac3c45f3d958f9bb04bb893da20f0a095bbc3cbffbf37e89e13d09cf43ca31a00178d974984bba6bb0149b9d0163b263833d
+AUX clblas-2.12-disable-multilib-cflags.patch 1132 BLAKE2B efcd473b84abf17b6a708b1e93250312b84ffce55d599b41d55214ad8b0a8465852ef0556763fe76c5f32abe5d2074d26cde431570d81ab345c3488cdec9e15f SHA512 1ba6c93c65a28565ef3dfb40b527233505ae6f94fc3dc1dff5cf4e68b67763188ee85fc51aeca61f607816cfac1b0d74cfb8c8777b84484225359161feb3897e
+AUX clblas-2.12-fix-doxygen-output-dir.patch 639 BLAKE2B 2fc330008b347bfccf19b2d9b8e41129ed69dd3bd1419734497fbfdf49ad233227676f41407304616fb6f0cd8e843fb1c8e3bbb06eb82b802d77bb0e25f56675 SHA512 295dfccb9cd860f354abe775c142e0d68b31d2bc25f427b5b8ec4103865e73ce3a4d43967834eaaf3e40f978f48dddcdac1451138b4d53d5f973321d7f27aa74
+AUX clblas-2.12-fix-pthread-linkage.patch 702 BLAKE2B a2b03a94fe7298d3524a0aa4b9bc20e5c46f74b2176fb2c1b388486a156ceefaace5ca85690221f660538f5ace43baf273c2187851ca483b09f000f02a84fac0 SHA512 5855c4c59126020a561c514182030f9c185d4d94de497c146471c2e185a9cf0b80844dcdf8132fda74cbcbe619c73bbcc7866b41c71c5a722438968c59c5c149
+AUX clblas-2.12-reproducible-build.patch 669 BLAKE2B fb51f4ef1658becfa3e4e2e01af0d862600c803052eee5997888377fd5451f95c33c1cb41cf74fda7d497a1887c651ff7449d210d8685a4f0d920c2f8c8ce5b3 SHA512 51123396efa541a510fa778c2e59ed7911aacaf1d5b6b624082bb994e5c04237c62384aaa685a49d9eefbd83efa216de3df4210f00f419b45ae73b55885b71f6
+AUX clblas-2.12-use-boost-dynamic-libs.patch 597 BLAKE2B c65bfa09a6636041ef1816dc55c0a0874f747d49eb1ea5934dca5080dd86215ea40933cd156c2015eb73ba31a0c563343adf7048ac0eed03abfb3edbbeac6b46 SHA512 d32230ea4a707a78fd0e7d081176ee3d3cf814c749ae3eee4d4c1be8e08687eee458e1d538874ce47537a32832adaace8bf8918bf3ec37a3b63dcc35ce7f68d4
+AUX clblas-2.12-use-system-mathjax.patch 765 BLAKE2B ced4d5efddcaae15a5844bb2b2cdf32f03f117d394ee9daeffa5c4f0bc10310e7898a2c305774970263cc9e1d3d7e247d23cf477dea906d64af45395d6770807 SHA512 156a0a664bbab80a17f3032c759656769eee36db0a93e4fd4a983eb584ef56d2023aef37b565c8cf81adb507f00f6b83ca9d31ace66c620f2279ca82aa512744
+DIST clblas-2.12.tar.gz 1157445 BLAKE2B 27352a7775db94808ce21f2b4a39fe505d4f37be4305dc7fb5a4068a86d3f51a9e4863931f634150762b31256f9f7e8e5d0d8b70f404b5a9ddb8a489b800aea6 SHA512 5d9b0c58adde69e83d95e9c713e0cdc5f64785fe7e05553a14c57fa483c4ef39e9dc780c26880a7f15924967d5ce4ea29035c29d63eac7ee5a2ae5ddacac2b72
+EBUILD clblas-2.12.ebuild 2015 BLAKE2B 0975f9088a4e4ebd8ecdfe22dc3337cddb63cdad5c228d471d6a22e88c09c48c08e3a05ee96143f7f2716f8070f7a354986f5be7de243cbc09b375970f4e1aef SHA512 a570b15291defd8d14c6a7b3fa491e4f4903f952118b5e055ea26dc064e42f11e472178695a7b4c47264834e72fa7a04279c357c83f91fcf6ab33b872d6959fe
 MISC metadata.xml 1029 BLAKE2B 9f21ddf2d9d08fccdf4f40c7324feaa5dc003a8ee0abe35f6158e3d9f507edb593f89216802ea04192486615ef5effb9ce5d70d42d4da5000c246be4db5c4e48 SHA512 62e2f6461060977e68d8f175f40d8de1801f5c4f635e33817ffb04dba9b8a19747bcd99206972e21b8780f5f0499290ff8b0d46bf5bdc1463659a8dd5cebb483
diff --git a/sci-libs/clblas/clblas-2.10.ebuild b/sci-libs/clblas/clblas-2.10.ebuild
deleted file mode 100644
index 112150552dc8..000000000000
--- a/sci-libs/clblas/clblas-2.10.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-FORTRAN_NEEDED=test
-
-inherit cmake-utils python-single-r1 toolchain-funcs fortran-2
-
-MYPN="clBLAS"
-
-DESCRIPTION="Library containing BLAS routines for OpenCL"
-HOMEPAGE="https://github.com/clMathLibraries/clBLAS"
-SRC_URI="https://github.com/clMathLibraries/${MYPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/2" # soname version
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client doc examples ktest performance test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="performance? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	virtual/opencl
-	doc? ( dev-libs/mathjax )
-	performance? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-	   dev-cpp/gtest
-	   dev-libs/boost
-	   virtual/pkgconfig
-	   virtual/blas
-	)
-"
-
-S="${WORKDIR}/${MYPN}-${PV}"
-CMAKE_USE_DIR="${S}/src"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-disable-multilib-cflags.patch
-	"${FILESDIR}"/${P}-fix-blas-dot-calls.patch
-	"${FILESDIR}"/${P}-fix-doxygen-output-dir.patch
-	"${FILESDIR}"/${P}-fix-pthread-linkage.patch
-	"${FILESDIR}"/${P}-use-boost-dynamic-libs.patch
-	"${FILESDIR}"/${P}-use-system-mathjax.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_RUNTIME=ON
-		-DBUILD_SAMPLE=OFF
-		-DBUILD_CLIENT="$(usex client)"
-		-DBUILD_KTEST="$(usex ktest)"
-		-DBUILD_PERFORMANCE="$(usex performance)"
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DBUILD_TEST=ON
-			-DUSE_SYSTEM_GTEST=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		)
-	else
-		mycmakeargs+=( -DBUILD_TEST=OFF	)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		cd doc
-		doxygen clBLAS.doxy || die
-	fi
-}
-
-src_test() {
-	pushd "${BUILD_DIR}/staging" > /dev/null
-	LD_LIBRARY_PATH="${BUILD_DIR}/library:${LD_LIBRARY_PATH}" \
-				   ./test-short
-	popd > /dev/null
-
-	# horrible hack to avoid installing compiled tests
-	# this will trigger some overcompilation
-	mycmakeargs+=( -DBUILD_TEST=OFF	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	cmake-utils_src_install
-	dodoc CHANGELOG  CONTRIBUTING.md NOTICE  README.md
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r src/samples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-libs/clblas/clblas-2.12.ebuild b/sci-libs/clblas/clblas-2.12.ebuild
new file mode 100644
index 000000000000..700aa880f9f3
--- /dev/null
+++ b/sci-libs/clblas/clblas-2.12.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-any-r1 toolchain-funcs cmake
+
+MYPN="clBLAS"
+
+DESCRIPTION="Library containing BLAS routines for OpenCL"
+HOMEPAGE="https://github.com/clMathLibraries/clBLAS"
+SRC_URI="https://github.com/clMathLibraries/${MYPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/2" # soname version
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+client doc examples ktest performance test"
+# the testsuite is hopelessly broken and upstream is pretty much dead
+RESTRICT="test"
+
+RDEPEND="
+	virtual/opencl
+	client? ( virtual/cblas )
+	doc? ( dev-libs/mathjax )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	client? ( virtual/pkgconfig )"
+
+S="${WORKDIR}/${MYPN}-${PV}"
+CMAKE_USE_DIR="${S}/src"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.12-disable-multilib-cflags.patch
+	"${FILESDIR}"/${PN}-2.12-fix-pthread-linkage.patch
+	"${FILESDIR}"/${PN}-2.12-fix-doxygen-output-dir.patch
+	"${FILESDIR}"/${PN}-2.12-use-system-mathjax.patch
+	"${FILESDIR}"/${PN}-2.12-reproducible-build.patch
+	"${FILESDIR}"/${PN}-2.12-use-boost-dynamic-libs.patch
+	"${FILESDIR}"/${PN}-2.12-Detect-CBLAS-when-building-the-client.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_RUNTIME=ON
+		-DBUILD_SAMPLE=OFF
+		# tests are beyond repair
+		-DBUILD_TEST=OFF
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_KTEST=$(usex ktest)
+		-DBUILD_PERFORMANCE=$(usex performance)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	use client && mycmakeargs+=(
+		-DNetlib_LIBRARIES="$($(tc-getPKG_CONFIG) --libs cblas blas)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		cd doc || die
+		doxygen clBLAS.doxy || die
+		HTML_DOCS=( doc/html/. )
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc CHANGELOG CONTRIBUTING.md NOTICE README.md
+	if use examples; then
+		docinto examples
+		dodoc -r src/samples/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/sci-libs/clblas/files/clblas-2.10-disable-multilib-cflags.patch b/sci-libs/clblas/files/clblas-2.10-disable-multilib-cflags.patch
deleted file mode 100644
index a7e59d913f06..000000000000
--- a/sci-libs/clblas/files/clblas-2.10-disable-multilib-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: disable multilib flags
-Author: Ghislain Antony Vaillant <ghisvail@gmail.com>
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -296,9 +296,9 @@
-     # Don't use -rpath.
-     set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
- 
--    set(CMAKE_C_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_C_FLAGS}")
--    set(CMAKE_CXX_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_CXX_FLAGS}")
--    set(CMAKE_Fortran_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_Fortran_FLAGS}")
-+    #set(CMAKE_C_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_C_FLAGS}")
-+    #set(CMAKE_CXX_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_CXX_FLAGS}")
-+    #set(CMAKE_Fortran_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_Fortran_FLAGS}")
- 
-     if(TARGET_PLATFORM EQUAL 32)
-         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-builtin")
diff --git a/sci-libs/clblas/files/clblas-2.10-fix-blas-dot-calls.patch b/sci-libs/clblas/files/clblas-2.10-fix-blas-dot-calls.patch
deleted file mode 100644
index cc2c6c3c1766..000000000000
--- a/sci-libs/clblas/files/clblas-2.10-fix-blas-dot-calls.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/src/tests/correctness/blas-lapack.c b/src/tests/correctness/blas-lapack.c
-index 9687bdf..54666b1 100644
---- a/src/tests/correctness/blas-lapack.c
-+++ b/src/tests/correctness/blas-lapack.c
-@@ -655,7 +655,7 @@ complex cdotu( int n, complex *x, int incx, complex *y, int incy)
-     #elif defined( __APPLE__)
-         cblas_cdotu_sub(n, x, incx, y, incy, &ans);
-     #else
--        cdotusub_(&n, x, &incx, y, &incy, &ans);
-+        ans = cdotu_(&n, x, &incx, y, &incy);
-     #endif
- 
-     return ans;
-@@ -670,7 +670,7 @@ doublecomplex zdotu( int n, doublecomplex *x, int incx,  doublecomplex *y, int i
-     #elif defined(__APPLE__)
-         cblas_zdotu_sub(n, x, incx, y, incy, &ans);
-     #else
--        zdotusub_(&n, x, &incx, y, &incy, &ans);
-+        ans = zdotu_(&n, x, &incx, y, &incy);
-     #endif
- 
-     return ans;
-@@ -685,7 +685,7 @@ complex cdotc( int n, complex *x, int incx, complex *y, int incy)
-     #elif defined(__APPLE__)
-         cblas_cdotc_sub(n, x, incx, y, incy, &ans);
-     #else
--        cdotcsub_(&n, x, &incx, y, &incy, &ans);
-+        ans = cdotc_(&n, x, &incx, y, &incy);
-     #endif
- 
-     return ans;
-@@ -700,7 +700,7 @@ doublecomplex zdotc( int n, doublecomplex *x, int incx,  doublecomplex *y, int i
-     #elif defined(__APPLE__)
-         cblas_zdotc_sub(n, x, incx, y, incy, &ans);
-     #else
--        zdotcsub_(&n, x, &incx, y, &incy, &ans);
-+        ans = zdotc_(&n, x, &incx, y, &incy);
-     #endif
- 
-     return ans;
-diff --git a/src/tests/correctness/blas-lapack.h b/src/tests/correctness/blas-lapack.h
-index d2db1aa..8619e1e 100644
---- a/src/tests/correctness/blas-lapack.h
-+++ b/src/tests/correctness/blas-lapack.h
-@@ -1170,10 +1170,10 @@ double ddot_(int *n, double *x, int *incx, double* y, int *incy);
-     complex cdotc_(int *n, complex *x, int *incx, complex* y, int *incy);
-     doublecomplex zdotc_(int *n, doublecomplex *x, int *incx, doublecomplex* y, int *incy);
- #else
--    void cdotusub_(int *n, complex *x, int *incx, complex* y, int *incy, complex *ans);
--    void zdotusub_(int *n, doublecomplex *x, int *incx, doublecomplex* y, int *incy, doublecomplex *ans);
--    void cdotcsub_(int *n, complex *x, int *incx, complex* y, int *incy, complex *ans);
--    void zdotcsub_(int *n, doublecomplex *x, int *incx, doublecomplex* y, int *incy, doublecomplex *ans);
-+    complex cdotu_(int *n, complex *x, int *incx, complex* y, int *incy);
-+    doublecomplex zdotu_(int *n, doublecomplex *x, int *incx, doublecomplex* y, int *incy);
-+    complex cdotc_(int *n, complex *x, int *incx, complex* y, int *incy);
-+    doublecomplex zdotc_(int *n, doublecomplex *x, int *incx, doublecomplex* y, int *incy);
- #endif
- 
- void sswap_(int *n, float *x, int *incx, float* y, int *incy);
diff --git a/sci-libs/clblas/files/clblas-2.12-Detect-CBLAS-when-building-the-client.patch b/sci-libs/clblas/files/clblas-2.12-Detect-CBLAS-when-building-the-client.patch
new file mode 100644
index 000000000000..bfe94dfd7074
--- /dev/null
+++ b/sci-libs/clblas/files/clblas-2.12-Detect-CBLAS-when-building-the-client.patch
@@ -0,0 +1,24 @@
+From: Ghislain Antony Vaillant <ghisvail@gmail.com>
+Date: Sat, 21 Jan 2017 16:49:27 +0000
+Subject: Detect CBLAS when building the client
+
+---
+ src/CMakeLists.txt | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index bf351c1..28d6a60 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -267,10 +267,7 @@ if( BUILD_TEST )
+ endif( )
+ 
+ if( BUILD_CLIENT )
+-    if( NETLIB_FOUND )
+-    else( )
+-        message( WARNING "Not find Netlib; BUILD_CLIENT needs the Netlib CBLAS library" )
+-    endif()
++    find_package( Netlib COMPONENTS BLAS REQUIRED )
+ endif()
+ 
+ 
diff --git a/sci-libs/clblas/files/clblas-2.12-disable-multilib-cflags.patch b/sci-libs/clblas/files/clblas-2.12-disable-multilib-cflags.patch
new file mode 100644
index 000000000000..8e8f14871ef1
--- /dev/null
+++ b/sci-libs/clblas/files/clblas-2.12-disable-multilib-cflags.patch
@@ -0,0 +1,26 @@
+Description: disable multilib flags
+Author: Ghislain Antony Vaillant <ghisvail@gmail.com>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -305,18 +305,6 @@
+     # Don't use -rpath.
+     set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
+ 
+-    # Need to determine the target machine of the C compiler, because
+-    # the '-m32' and '-m64' flags are supported on x86 but not on e.g. ARM.
+-    exec_program( "${CMAKE_C_COMPILER} -dumpmachine"
+-        OUTPUT_VARIABLE CMAKE_C_COMPILER_MACHINE )
+-    message( STATUS "CMAKE_C_COMPILER_MACHINE: ${CMAKE_C_COMPILER_MACHINE}" )
+-    # The "86" regular expression matches x86, x86_64, i686, etc.
+-    if(${CMAKE_C_COMPILER_MACHINE} MATCHES "86")
+-        set(CMAKE_C_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_C_FLAGS}")
+-        set(CMAKE_CXX_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_CXX_FLAGS}")
+-        set(CMAKE_Fortran_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_Fortran_FLAGS}")
+-    endif()
+-
+     if(TARGET_PLATFORM EQUAL 32)
+         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-builtin")
+     endif()
diff --git a/sci-libs/clblas/files/clblas-2.10-fix-doxygen-output-dir.patch b/sci-libs/clblas/files/clblas-2.12-fix-doxygen-output-dir.patch
index 31abb89b1c3a..31abb89b1c3a 100644
--- a/sci-libs/clblas/files/clblas-2.10-fix-doxygen-output-dir.patch
+++ b/sci-libs/clblas/files/clblas-2.12-fix-doxygen-output-dir.patch
diff --git a/sci-libs/clblas/files/clblas-2.10-fix-pthread-linkage.patch b/sci-libs/clblas/files/clblas-2.12-fix-pthread-linkage.patch
index aa99529df034..c920c8140d8d 100644
--- a/sci-libs/clblas/files/clblas-2.10-fix-pthread-linkage.patch
+++ b/sci-libs/clblas/files/clblas-2.12-fix-pthread-linkage.patch
@@ -5,9 +5,9 @@ Forwarded: no
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/library/CMakeLists.txt
 +++ b/src/library/CMakeLists.txt
-@@ -888,6 +888,10 @@
+@@ -889,6 +889,10 @@
  set_target_properties( clBLAS PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
- target_link_libraries(clBLAS ${OPENCL_LIBRARIES} ${MATH_LIBRARY})
+ target_link_libraries(clBLAS ${OPENCL_LIBRARIES} ${MATH_LIBRARY} ${THREAD_LIBRARY})
  
 +set(THREADS_PREFER_PTHREAD_FLAG ON)
 +find_package(Threads REQUIRED)
diff --git a/sci-libs/clblas/files/clblas-2.12-reproducible-build.patch b/sci-libs/clblas/files/clblas-2.12-reproducible-build.patch
new file mode 100644
index 000000000000..9d7c2b771e41
--- /dev/null
+++ b/sci-libs/clblas/files/clblas-2.12-reproducible-build.patch
@@ -0,0 +1,17 @@
+Description: make package build reproducible
+ By disabling the HTML timestamp setting in Doxygen.
+Author: Ghislain Antony Vaillant <ghisvail@gmail.com>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/clBLAS.doxy
++++ b/doc/clBLAS.doxy
+@@ -974,7 +974,7 @@
+ # page will contain the date and time when the page was generated. Setting 
+ # this to NO can help when comparing the output of multiple runs.
+ 
+-HTML_TIMESTAMP         = YES
++HTML_TIMESTAMP         = NO
+ 
+ # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+ # documentation will contain sections that can be hidden and shown after the 
diff --git a/sci-libs/clblas/files/clblas-2.10-use-boost-dynamic-libs.patch b/sci-libs/clblas/files/clblas-2.12-use-boost-dynamic-libs.patch
index 57c585da11fc..64388c90dc48 100644
--- a/sci-libs/clblas/files/clblas-2.10-use-boost-dynamic-libs.patch
+++ b/sci-libs/clblas/files/clblas-2.12-use-boost-dynamic-libs.patch
@@ -5,12 +5,12 @@ Forwarded: no
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -270,7 +270,7 @@
+@@ -279,7 +279,7 @@
  
  # Find Boost on the system, and configure the type of boost build we want
  set( Boost_USE_MULTITHREADED ON )
 -set( Boost_USE_STATIC_LIBS   ON )
 +set( Boost_USE_STATIC_LIBS   OFF )
  set( Boost_DETAILED_FAILURE_MSG   ON )
- set( Boost_DEBUG ON )
- set( Boost_ADDITIONAL_VERSIONS "1.44.0" "1.44" "1.47.0" "1.47" )
+ # set( Boost_DEBUG ON )
+ set( Boost_ADDITIONAL_VERSIONS "1.44.0" "1.44" "1.47.0" "1.47" "1.60.0" "1.60" )
diff --git a/sci-libs/clblas/files/clblas-2.10-use-system-mathjax.patch b/sci-libs/clblas/files/clblas-2.12-use-system-mathjax.patch
index 775a669e96a8..775a669e96a8 100644
--- a/sci-libs/clblas/files/clblas-2.10-use-system-mathjax.patch
+++ b/sci-libs/clblas/files/clblas-2.12-use-system-mathjax.patch
diff --git a/sci-libs/cln/Manifest b/sci-libs/cln/Manifest
index 11346f509892..093892b63c2f 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 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
+EBUILD cln-1.3.3.ebuild 1439 BLAKE2B 6e99f79f0c010b4b695521f8813e17225f5651f82166760c126d342251687b13d767859407eab9689f541c7beec0a6854a6a6386ba4645a6cd6086227d1a79aa SHA512 ed8b4adc9bdc56a49bb79f55daa9e85ead595a8c5883f285dd36e5701239c22a2f88e7b267aff7ba4c23eebde13a4453c12844025a4dff6c512ed6ad85b37ce1
+EBUILD cln-1.3.4.ebuild 1422 BLAKE2B 83b0a014ed2dd1fe0b6d0f6474bd4a814feca2731deaa1b2b70b8c129420b76fa769581cea811bc2a5c474bdcc81fe849c955b8b4910ffb6525e3f63efc29579 SHA512 940c182c3acb23d7c206d682108ea8d9f3a733583deec183d10895d7319f83cfb49e722dbc5600302e66197c9ecb827171098795e4265010d4244c2fd7417121
+EBUILD cln-1.3.6.ebuild 1215 BLAKE2B ac20e7073ee6094ab8ffc70cc8ccff9ec3d01ea3b64d3fab27aa41d3fc43bfc0fff6f762f34d74feffba78d074dcc13f6f8328ac15985c97471f88a8dc8273de SHA512 c3b4ed1486a26a9d3f42b3f515c6e32aaad4c9bbe11f1ce1890e4f4884f7e70f60de1c54fb371dc00105ece0855e6daf6c33400cce008a4bdc03503716810647
 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 9687c7bb01a1..e7a8fa5e0ad6 100644
--- a/sci-libs/cln/cln-1.3.3.ebuild
+++ b/sci-libs/cln/cln-1.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="dev-libs/gmp:0="
diff --git a/sci-libs/cln/cln-1.3.4.ebuild b/sci-libs/cln/cln-1.3.4.ebuild
index 29ac33c74b05..c57efba5bf28 100644
--- a/sci-libs/cln/cln-1.3.4.ebuild
+++ b/sci-libs/cln/cln-1.3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ginac.de/CLN/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="dev-libs/gmp:0="
diff --git a/sci-libs/cln/cln-1.3.6.ebuild b/sci-libs/cln/cln-1.3.6.ebuild
index 1fa4e64dd112..88ac5650e971 100644
--- a/sci-libs/cln/cln-1.3.6.ebuild
+++ b/sci-libs/cln/cln-1.3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ginac.de/CLN/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="dev-libs/gmp:0="
diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index 1b07c09561d0..388a9758a4de 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,5 +1,3 @@
 DIST dlib-19.16.tar.gz 10411975 BLAKE2B 93047590a4d8f4685970d3db6841cbf9cc90ca8a5e50f0929a106d887e5db1b4fd96bbe14380537a3e28369a8db6d9d8c067e7768000ac3c7d0f225b46369326 SHA512 4e040ef88acff05e1a48e499b813c876b22ad3f989d076bdf19969d01036b62e51a0dff30b70046910ba31dfa1b1c2450a7fad41ae3142b7285ed74b8d584887
-DIST dlib-19.9.tar.gz 8892457 BLAKE2B d18548e09f8169bbc9d7f339599bd58b940410839b259a8d7be9cb999f82e634ad5cd0539adb45239dab821ea1029493d24ae9990ca32c75c744e2c5d9e218f6 SHA512 1e2123c22e1b13cc84108fa627bfa92eadc9dee63f93a9f45676bbf2b752c8728117d915ac327f5223b0cdbce87dd3bef2f4d8d5ed3f8f5a314ffa9e8962a246
 EBUILD dlib-19.16-r1.ebuild 2843 BLAKE2B ae97763c222aff271a8726f9aa2b0653b9a3f7a9952f45e7715e2a3b175c7cf46ed780463e767e6f0ec11a9307d0d7c933a72a0b4335cecb109cb34cea9fa5b7 SHA512 0b201837d08d22452e8b292bdb8f0fdea967b8e4758fe1c0b6bf9dc4d599bab7fb88a2ec01886e0f306f263327207b16c60d80ff3f63c1c0723e8498699828aa
-EBUILD dlib-19.9.ebuild 2062 BLAKE2B 8d693459b90472916c37d9d20febf48c7120116d368346277926e7ad9ec5b0aa3c5ccdf9f1d7e1cb62ff22b7cb8fcf269ab43087b51a3d149be79f002db54db0 SHA512 370d72e972404a9a709dd499203abb7652f85126cda4b400dc59d1396badbeb331a117120889eae0835eb7fe311cae4bb11f6c0f590dd2fa3fe05d7383822a6d
 MISC metadata.xml 1002 BLAKE2B 899d622186d6ed4ab0c8c448bdbe312be12f0eeeec5e4d4ae031de4dcb26d73f0489b697375893d4c4bd16651c6b2d40ac156b67be0b376ec270d7d99a6f465a SHA512 1977d192107b78b97d5336d3e5b2e43a7ea12ede631a864ce14aeab2f9d328526f815fab0d62ae1417842cdfe9e1e7c0494fcf79be535dbfc4e3ca9342447b5c
diff --git a/sci-libs/dlib/dlib-19.9.ebuild b/sci-libs/dlib/dlib-19.9.ebuild
deleted file mode 100644
index fcc55d70b0e1..000000000000
--- a/sci-libs/dlib/dlib-19.9.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit python-r1 cmake-utils cuda
-
-DESCRIPTION="Numerical and networking C++ library"
-HOMEPAGE="http://dlib.net/"
-SRC_URI="https://github.com/davisking/dlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas debug cuda examples gif jpeg lapack mkl png python sqlite static-libs test X"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# doc needs a bunch of deps not in portage
-
-RDEPEND="
-	cblas? ( virtual/cblas:= )
-	cuda? ( dev-libs/cudnn:= )
-	jpeg? ( virtual/jpeg:0= )
-	lapack? ( virtual/lapack:= )
-	mkl? ( sci-libs/mkl:= )
-	png? ( media-libs/libpng:0= )
-	python? ( ${PYTHON_DEPS} )
-	sqlite? ( dev-db/sqlite:3= )
-	X? ( x11-libs/libX11:= )
-"
-DEPEND="test? ( ${RDEPEND} )"
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
-	sed -i -e '/LICENSE.txt/d' dlib/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-		-DDLIB_ENABLE_ASSERTS="$(usex debug)"
-		-DDLIB_ENABLE_STACK_TRACE="$(usex debug)"
-		-DDLIB_GIF_SUPPORT="$(usex gif)"
-		-DDLIB_JPEG_SUPPORT="$(usex jpeg)"
-		-DDLIB_PNG_SUPPORT="$(usex png)"
-		-DDLIB_LINK_WITH_SQLITE3="$(usex sqlite)"
-		-DDLIB_NO_GUI_SUPPORT="$(usex X OFF ON)"
-		-DDLIB_USE_BLAS="$(usex cblas)"
-		-DDLIB_USE_CUDA="$(usex cuda)"
-		-DDLIB_USE_LAPACK="$(usex lapack)"
-		-DBOOST_LIBRARYDIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	mkdir "${BUILD_DIR}"/dlib/test || die
-	pushd "${BUILD_DIR}"/dlib/test > /dev/null || die
-	cmake "${S}"/dlib/test && emake
-	./dtest --runall || die
-	popd > /dev/null || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use python; then
-		python_foreach_impl python_domodule ${PN}
-	fi
-	dodoc docs/README.txt
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index 1eac2c0fcc29..25cd267f19a5 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -3,5 +3,5 @@ DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37
 DIST lapack-3.9.0.tar.gz 7534567 BLAKE2B 408013a11a72e0262d144adfdf6db28a6efa3bb5446f9ff959bb88fe10459dfa621149ed0144630a55e73e3b5be3c704269a716eb195f6db7b39d345b4db8270 SHA512 424956ad941a60a4b71e0d451ad48db12a692f8a71a90f3ca7f71d6ecc1922f392746ea84df1c47a46577ed2db32e9e47ec44ad248207c5ac7da179becb712ef
 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
+EBUILD lapack-3.9.0.ebuild 2977 BLAKE2B e10b1e4e2b28f54248880ab5069dfe604dea1802bed264efcc50afd592aa8dfa57fe1b4f600595f24666f3e640d1262221a84628fb96f22878cbab015ceed263 SHA512 b9599f61ad404cbdbe3bb4396e5b6f9dae78b708a2df37eca38f75ab183bee24ef14db57f8cc1900f017c45ebe5735f452e703de814d2664bdd29a871ec0f226
 MISC metadata.xml 1490 BLAKE2B bcb933b7cc3c3ae6f33e7c8ae9ef12475477ecd3351901cfba5dc955430def35df18e5ab41624cb99f2c1551fc38153138195e4e95ab40d3cf92e5685ce68fc5 SHA512 a99af3086d63488e7a2b8cda2f3727ce31eb0e62dd75a9cf64e44a203068866a06c7d6e119665e663c49a1afccb7a70982fd831735d958b73b6dcdf52c8ef5b1
diff --git a/sci-libs/lapack/lapack-3.9.0.ebuild b/sci-libs/lapack/lapack-3.9.0.ebuild
index 311a994271d3..ccbb4f596994 100644
--- a/sci-libs/lapack/lapack-3.9.0.ebuild
+++ b/sci-libs/lapack/lapack-3.9.0.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-#CMAKE_MAKEFILE_GENERATOR="emake"
 inherit cmake
 
 DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
@@ -13,18 +12,20 @@ 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"
-IUSE="lapacke doc eselect-ldso test"
 # TODO: static-libs 64bit-index
+IUSE="lapacke doc eselect-ldso test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
-	eselect-ldso? ( >=app-eselect/eselect-blas-0.2
-	>=app-eselect/eselect-lapack-0.2 )
 	!app-eselect/eselect-cblas
 	virtual/fortran
+	eselect-ldso? (
+		>=app-eselect/eselect-blas-0.2
+		>=app-eselect/eselect-lapack-0.2
+	)
 	doc? ( app-doc/blas-docs )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.9.0-build-tests.patch"
@@ -35,7 +36,7 @@ src_configure() {
 		-DCBLAS=ON
 		-DLAPACKE=$(usex lapacke)
 		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTING=ON
+		-DBUILD_TESTING=$(usex test)
 	)
 
 	cmake_src_configure
diff --git a/sci-libs/libccd/Manifest b/sci-libs/libccd/Manifest
index 345ddaa4b510..c29d4f657396 100644
--- a/sci-libs/libccd/Manifest
+++ b/sci-libs/libccd/Manifest
@@ -1,6 +1,4 @@
-DIST libccd-2.0.tar.gz 68103 BLAKE2B 30a91dba9b5dec5edc40d014dd0cba23d75e99f296918b6e58199890508c39813f5170456b1301e9304c433ca3531b1f23c4cdbfc0f20fca21eeafe53991467d SHA512 627426f1acd24779e7d596fd5b18dede4cf3c13d3cceda87a8b2d0195b72d9ada45290fd41baa20d6e3adafda75074db355cb95a60f80023c32b5ad4e72235bf
 DIST libccd-2.1.tar.gz 73971 BLAKE2B 77feeb42426e72cfc1392351acf84f4c4670ea7f6a555a2b15dd8927e49b855423c4262e319b06774a8d887423238b8d018021ebeba5ee188e52accf5aeb48a1 SHA512 ff037d9c4df50f09600cf9b3514b259b2850ff43f74817853f5665d22812891168f70bd3cc3969b2c9e3c706f6254991a65421476349607fbd04d894b217456d
-EBUILD libccd-2.0.ebuild 1129 BLAKE2B 656f1592c08b5747a911939696afb80d8b85a1668b462d8dbc4ef91845bb45ea1a2f62e8540d7ac0939a1569b6f28c951bb968815b1fd5d1974f452959fa9522 SHA512 bb7d70c13dd6871be004c309c5adb92953ecd4fb73613fe34abad10dc8050dace2169d10f8da49d7ba96edd11153149b1edef5078cebeba4d5fa41e82292c7e3
-EBUILD libccd-2.1.ebuild 1300 BLAKE2B 23cc9c165588a2d3a368a989f483dc06cd4586221ee364f8624426765c86908e2ddf0e0af17851169a3d450a9d8edcd91cf935b53f2ee2f3146740cb7d4c9780 SHA512 2964261d0268750a495f70e09b401d2656fa7c0c29dd86f150f1a658b09a0383f47138e34717ccd38f912aa245f48e562a7ee5e36de86e9a4650977f382a895f
-EBUILD libccd-9999.ebuild 1055 BLAKE2B 0f1a439abcc3f1a8963d4dae843865a8118209610df25e63f477508ac71a3ac54d00b2b1e3e4d30c286a8954911376bf811deb7031329e270937e4c8cd04c662 SHA512 5a4e556da14ab3980af8ad10c96692c2ade98636636838d1e1048a661e0d1ac4ccbf1fce1195533f62da7d1efe31b55f7f49dbf45d71e57122aa288b0581cc8f
-MISC metadata.xml 974 BLAKE2B 0f267202a50f7e56124878ff2f01990c83fb07b36f69db357b8e8786c3fb9720d0090adbb2916c40c1ab53b391af9f458d1732b3c907e256c06dcde9052750ef SHA512 b53567e44a76b4e123b7883fee66868f05ed25448c369ec77eae8ff4c4d93debf798d71db3623d3cc680cb2064cb96d20de8bd590b9d8f1f75eaadd0a8649238
+EBUILD libccd-2.1.ebuild 1184 BLAKE2B 98a9bfae8127dfdf408a2e96bcf8681c027d8d7bab6be337407165a8329769677c46b0f973af0ba3af0397b0e42524e63c8b2d57a08aa7d618e86656899556db SHA512 64affb0c204c9838f51f88ed3ade1b9ada36e616180b3dde3f811cf4b63ac5261b3264641400b62c2558945f01f91bf32744a90b5a87f7d2dbae63739ff4029f
+EBUILD libccd-9999.ebuild 939 BLAKE2B 6fc52c9f2c74cd15ee958a2a123e618613679e67e97f05f50fc9e155f147c6f8f4dec6b5af926cffd68180bc177f062e5581ccf6be46dee51c9a563dc2b69a5f SHA512 b33aa828ed3831120273250ba518ef389fcac60a94797f528b6f0685fadb14563b7177e03b5c270f7a99bd85daaa4777510d1bd4c91607d77493d29975b7b4db
+MISC metadata.xml 863 BLAKE2B 7e57005359bab39ede76ae671e59cc2b3c9aa92cd6b35609aae7a3b47e23ef29131ed9f5775f1c9a3232147adffae8f4ddaa42b58c725acced30651407fc71bc SHA512 494fbbd6f3421545a6fb2be7c091a945da5031d303003f6c6c85c71dd52092130642534ea966b6a20d149839c054bb0130fc44f3dec48debd1c77a31fabce5f8
diff --git a/sci-libs/libccd/libccd-2.0.ebuild b/sci-libs/libccd/libccd-2.0.ebuild
deleted file mode 100644
index 894309a26239..000000000000
--- a/sci-libs/libccd/libccd-2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/danfis/libccd"
-fi
-
-inherit ${SCM} cmake-utils toolchain-funcs
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="http://libccd.danfis.cz/files/${P}.tar.gz"
-fi
-
-DESCRIPTION="Library for collision detection between two convex shapes"
-HOMEPAGE="http://libccd.danfis.cz/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="double doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-DOCS=( README )
-
-src_configure() {
-	local mycmakeargs=(
-		"-DCCD_DOUBLE=$(usex double TRUE FALSE)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc ; then
-		cd "${S}/doc"
-		emake SPHINXBUILD=sphinx-build html
-	fi
-}
-
-src_test() {
-	cd src/testsuites
-	tc-export CC
-	LDFLAGS="-L${BUILD_DIR} ${LDFLAGS}" \
-	LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" \
-		emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dohtml -r "${S}/doc/_build/html/"*
-}
diff --git a/sci-libs/libccd/libccd-2.1.ebuild b/sci-libs/libccd/libccd-2.1.ebuild
index 8691045954d5..cdc23db29212 100644
--- a/sci-libs/libccd/libccd-2.1.ebuild
+++ b/sci-libs/libccd/libccd-2.1.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 inherit cmake
 
-if [ "${PV}" = "9999" ] ; then
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/danfis/libccd/${PN}.git"
+	EGIT_REPO_URI="https://github.com/danfis/libccd.git"
 else
 	SRC_URI="https://github.com/danfis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
@@ -19,14 +19,10 @@ HOMEPAGE="http://libccd.danfis.cz/
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="+double-precision doc +shared test"
+IUSE="+double-precision doc test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
+BDEPEND="doc? ( dev-python/sphinx )"
 
 src_prepare() {
 	# upstream issue 72
@@ -40,11 +36,9 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCUMENTATION=$(usex doc ON OFF)
-		-DBUILD_SHARED_LIBS=$(usex shared ON OFF)
 		-DENABLE_DOUBLE_PRECISION=$(usex double-precision ON OFF)
 	)
 
-	local CMAKE_BUILD_TYPE="Release"
 	cmake_src_configure
 }
 
diff --git a/sci-libs/libccd/libccd-9999.ebuild b/sci-libs/libccd/libccd-9999.ebuild
index 6f8c7c9f77b5..8c95229c7747 100644
--- a/sci-libs/libccd/libccd-9999.ebuild
+++ b/sci-libs/libccd/libccd-9999.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 inherit cmake
 
-if [ "${PV}" = "9999" ] ; then
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/danfis/libccd/${PN}.git"
+	EGIT_REPO_URI="https://github.com/danfis/libccd.git"
 else
 	SRC_URI="https://github.com/danfis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
@@ -19,23 +19,17 @@ HOMEPAGE="http://libccd.danfis.cz/
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="+double-precision doc +shared test"
+IUSE="+double-precision doc test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
+BDEPEND="doc? ( dev-python/sphinx )"
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCUMENTATION=$(usex doc ON OFF)
-		-DBUILD_SHARED_LIBS=$(usex shared ON OFF)
 		-DENABLE_DOUBLE_PRECISION=$(usex double-precision ON OFF)
 	)
 
-	local CMAKE_BUILD_TYPE="Release"
 	cmake_src_configure
 }
 
diff --git a/sci-libs/libccd/metadata.xml b/sci-libs/libccd/metadata.xml
index 62004119dcce..8f3764e44754 100644
--- a/sci-libs/libccd/metadata.xml
+++ b/sci-libs/libccd/metadata.xml
@@ -11,8 +11,6 @@
     implements algorithm Minkowski Portal Refinement (MPR, a.k.a. XenoCollide) as described in Game Programming Gems 7.
   </longdescription>
   <use>
-    <flag name="shared">Build shared library</flag>
-    <flag name="double">Use double precision floats</flag>
     <flag name="double-precision">More precise calculations at the expense of speed</flag>
   </use>
   <upstream>
diff --git a/sci-libs/libcerf/Manifest b/sci-libs/libcerf/Manifest
index 2a9207d81fa1..65e56da3698e 100644
--- a/sci-libs/libcerf/Manifest
+++ b/sci-libs/libcerf/Manifest
@@ -1,3 +1,3 @@
 DIST libcerf-1.5.tgz 413926 BLAKE2B 1208c77658625d00d37f95f5dda9e07f99c91dc6b6fede4b8f936637dddd7450fa42c0ed3c8ff4c72bca0abe0195d6ebb58fdaa8c1bd535d8a488344fcccafad SHA512 bb97a1142d26dd2507a3fabc543accd5416f5ef3565bad6ea68ca8a62e13cb480b6e05bd8fe2215ed0133f43d4107fdc72efaedfcff7ffc0314492e97a92a8a3
-EBUILD libcerf-1.5.ebuild 809 BLAKE2B 3d81a43562d215ed052c370d0b381baee17a6d4fe4e0240d0972e284a4936a2817a7b5a1d08bdfbf6d2cd5d59cb874f54c07843e5d4091d4dd06e0672d5b6b29 SHA512 f1275560a5c7c861c7f3106b7af9b5df0c3c4d21b358576f109661213b5a1481bdf88351022103e7ff61b8d1365c4b7b1c92f1f9fc75bb34e39b575689927aa7
+EBUILD libcerf-1.5.ebuild 810 BLAKE2B 904310fe49b0694fda0792dce49e31dea2869223b4cdfaee2a3da0b6149eded62c51d64a6e6e2831cf9070afee2d2a36a821c4996fb26960223c73bbfcac12e5 SHA512 84d652e1851b62f2e13160d8ffc90b4ac9aac77f42e52b519530f7bebd8ee877258d27dc552e7918a66e418fb3d85521fc17565284e45e575a431fa309cd9f8c
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/libcerf/libcerf-1.5.ebuild b/sci-libs/libcerf/libcerf-1.5.ebuild
index e254c3c379e4..b47e632732d2 100644
--- a/sci-libs/libcerf/libcerf-1.5.ebuild
+++ b/sci-libs/libcerf/libcerf-1.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libgeodecomp/Manifest b/sci-libs/libgeodecomp/Manifest
index 9098e3462e23..fce978984a62 100644
--- a/sci-libs/libgeodecomp/Manifest
+++ b/sci-libs/libgeodecomp/Manifest
@@ -1,4 +1,5 @@
 AUX libgeodecomp-0.5.0_pre20201009-mpi.patch 13752 BLAKE2B ed5e2cafc0c8777e30ecf7e3b896aab1226b110c948e984dabf15d0bb85fa931f6991e1c108e55bab4016131c6f142d589500004e4ac76cb840c41eb975f41ea SHA512 b33ddbe1e0293e14b9f6b2a982cf8717d5c6dbceb34c476a5896c2eb3776ecbac9e219f11b9aea6a10a108b1fae3a2b373976e7636ff80b0f381b6bd4e1b0722
+AUX libgeodecomp-0.5.0_pre20201009-opencv.patch 8236 BLAKE2B 34225d96e409d5c6921042279cef75f1affd3ce0fc038cbd8f9dfd591bfbded0a38e9b88603730954c3b0babc81f89fbb850bacb200b3c1145277903cb01b314 SHA512 5345088f5b6ea4ccb8c40e77c1eb949695aa4a0a2d82b703caa2bcd4f54952c335e0e8fba433b8c4a6a4695637387a9d42d4e880022654bc8abb2c8640bb820a
 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
+EBUILD libgeodecomp-0.5.0_pre20201009.ebuild 1707 BLAKE2B db611929f80ba61f318722b4748d8a6e7fb3960a4586a86068445929895984c58c9cc807d94ca9c3f7a220aca69cdccff3d39dc9194926b5a95e740a129fa5df SHA512 d8cd7e45686cf0d40cfd19c347fccf5bf13e435c49bb27b7411f602357c7fac9346af91ab5468b44415a912ff5d9e53a03da549f0f67738532160c00b0b6aad9
 MISC metadata.xml 1345 BLAKE2B d6cb11021ade1a8c9007bf7a57c1e9355e19331498b66f746405bbd52dd5562656e827ab1db290190c37b283f579512609cf730d0ea27f6c31629d7e1fc38266 SHA512 f377ab4249dc9bb3dc2518e7d86ad6c2b44cd1249474480a5a71aa5b944c220ddc1608a8171d1abeaffa3d4628f4f327956cfb412ac14336f75705b7d8fe0fd9
diff --git a/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20201009-opencv.patch b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20201009-opencv.patch
new file mode 100644
index 000000000000..0a0632812493
--- /dev/null
+++ b/sci-libs/libgeodecomp/files/libgeodecomp-0.5.0_pre20201009-opencv.patch
@@ -0,0 +1,186 @@
+From 3a20ca303ccc8d9d7cfd9787b392f1436d266243 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Mon, 28 Dec 2020 15:03:16 +0100
+Subject: [PATCH] cmake: Fix build with OpenCV
+
+The FindOpenCV module assumes that OpenCV in installed into a separate
+directory which makes sense for cluster machines etc.
+
+However, on Gentoo OpenCV is installed by portage and the corresponding Cmake
+module can be used directly.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ CMakeModules/FindOpenCV.cmake | 160 ----------------------------------
+ 1 file changed, 160 deletions(-)
+ delete mode 100644 CMakeModules/FindOpenCV.cmake
+
+diff --git a/CMakeModules/FindOpenCV.cmake b/CMakeModules/FindOpenCV.cmake
+deleted file mode 100644
+index 68d629da5a4d..000000000000
+--- a/CMakeModules/FindOpenCV.cmake
++++ /dev/null
+@@ -1,160 +0,0 @@
+-###########################################################
+-#                  Find OpenCV Library
+-# See http://sourceforge.net/projects/opencvlibrary/
+-#----------------------------------------------------------
+-#
+-## 1: Setup:
+-# The following variables are optionally searched for defaults
+-#  OpenCV_DIR:            Base directory of OpenCv tree to use.
+-#
+-## 2: Variable
+-# The following are set after configuration is done: 
+-#  
+-#  OpenCV_FOUND
+-#  OpenCV_LIBS
+-#  OpenCV_INCLUDE_DIR
+-#  OpenCV_VERSION (OpenCV_VERSION_MAJOR, OpenCV_VERSION_MINOR, OpenCV_VERSION_PATCH)
+-#
+-#
+-# Deprecated variable are used to maintain backward compatibility with
+-# the script of Jan Woetzel (2006/09): www.mip.informatik.uni-kiel.de/~jw
+-#  OpenCV_INCLUDE_DIRS
+-#  OpenCV_LIBRARIES
+-#  OpenCV_LINK_DIRECTORIES
+-# 
+-## 3: Version
+-#
+-# 2010/04/07 Benoit Rat, Correct a bug when OpenCVConfig.cmake is not found.
+-# 2010/03/24 Benoit Rat, Add compatibility for when OpenCVConfig.cmake is not found.
+-# 2010/03/22 Benoit Rat, Creation of the script.
+-#
+-#
+-# tested with:
+-# - OpenCV 2.1:  MinGW, MSVC2008
+-# - OpenCV 2.0:  MinGW, MSVC2008, GCC4
+-#
+-#
+-## 4: Licence:
+-#
+-# LGPL 2.1 : GNU Lesser General Public License Usage
+-# Alternatively, this file may be used under the terms of the GNU Lesser
+-
+-# General Public License version 2.1 as published by the Free Software
+-# Foundation and appearing in the file LICENSE.LGPL included in the
+-# packaging of this file.  Please review the following information to
+-# ensure the GNU Lesser General Public License version 2.1 requirements
+-# will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+-# 
+-#----------------------------------------------------------
+-
+-
+-find_path(OpenCV_DIR "OpenCVConfig.cmake" /usr/share/OpenCV DOC "Root directory of OpenCV")
+-
+-##====================================================
+-## Find OpenCV libraries
+-##----------------------------------------------------
+-if(EXISTS "${OpenCV_DIR}")
+-
+-        #When its possible to use the Config script use it.
+-        if(EXISTS "${OpenCV_DIR}/OpenCVConfig.cmake")
+-
+-                ## Include the standard CMake script
+-                include("${OpenCV_DIR}/OpenCVConfig.cmake")
+-
+-                ## Search for a specific version
+-                set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
+-
+-        #Otherwise it try to guess it.
+-        else(EXISTS "${OpenCV_DIR}/OpenCVConfig.cmake")
+-
+-                set(OPENCV_LIB_COMPONENTS cxcore cv ml highgui cvaux)
+-                find_path(OpenCV_INCLUDE_DIR "cv.h" PATHS "${OpenCV_DIR}" PATH_SUFFIXES "include" "include/opencv" DOC "")
+-                if(EXISTS  ${OpenCV_INCLUDE_DIR})
+-                        include_directories(${OpenCV_INCLUDE_DIR})
+-                endif(EXISTS  ${OpenCV_INCLUDE_DIR})
+-
+-                #Find OpenCV version by looking at cvver.h
+-                file(STRINGS ${OpenCV_INCLUDE_DIR}/cvver.h OpenCV_VERSIONS_TMP REGEX "^#define CV_[A-Z]+_VERSION[ \t]+[0-9]+$")
+-                string(REGEX REPLACE ".*#define CV_MAJOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_MAJOR ${OpenCV_VERSIONS_TMP})
+-                string(REGEX REPLACE ".*#define CV_MINOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_MINOR ${OpenCV_VERSIONS_TMP})
+-                string(REGEX REPLACE ".*#define CV_SUBMINOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_PATCH ${OpenCV_VERSIONS_TMP})
+-                set(OpenCV_VERSION ${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.${OpenCV_VERSION_PATCH} CACHE STRING "" FORCE)
+-                set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
+-
+-        endif(EXISTS "${OpenCV_DIR}/OpenCVConfig.cmake")
+-
+-
+-
+-
+-        ## Initiate the variable before the loop
+-        set(GLOBAL OpenCV_LIBS "")
+-        set(OpenCV_FOUND_TMP true)
+-
+-        ## Loop over each components
+-        foreach(__CVLIB ${OPENCV_LIB_COMPONENTS})
+-                
+-                find_library(OpenCV_${__CVLIB}_LIBRARY_DEBUG NAMES "${__CVLIB}${CVLIB_SUFFIX}d" "lib${__CVLIB}${CVLIB_SUFFIX}d" PATHS "${OpenCV_DIR}/lib" NO_DEFAULT_PATH)
+-                find_library(OpenCV_${__CVLIB}_LIBRARY_RELEASE NAMES "${__CVLIB}${CVLIB_SUFFIX}" "lib${__CVLIB}${CVLIB_SUFFIX}" PATHS "${OpenCV_DIR}/lib" NO_DEFAULT_PATH)
+-                
+-                #Remove the cache value
+-                set(OpenCV_${__CVLIB}_LIBRARY "" CACHE STRING "" FORCE)
+-                
+-                #both debug/release
+-                if(OpenCV_${__CVLIB}_LIBRARY_DEBUG AND OpenCV_${__CVLIB}_LIBRARY_RELEASE)
+-                        set(OpenCV_${__CVLIB}_LIBRARY debug ${OpenCV_${__CVLIB}_LIBRARY_DEBUG} optimized ${OpenCV_${__CVLIB}_LIBRARY_RELEASE}  CACHE STRING "" FORCE)
+-                #only debug
+-                elseif(OpenCV_${__CVLIB}_LIBRARY_DEBUG)
+-                        set(OpenCV_${__CVLIB}_LIBRARY ${OpenCV_${__CVLIB}_LIBRARY_DEBUG}  CACHE STRING "" FORCE)
+-                #only release
+-                elseif(OpenCV_${__CVLIB}_LIBRARY_RELEASE)
+-                        set(OpenCV_${__CVLIB}_LIBRARY ${OpenCV_${__CVLIB}_LIBRARY_RELEASE}  CACHE STRING "" FORCE)
+-                #no library found
+-                else()
+-                        set(OpenCV_FOUND_TMP false)
+-                endif()
+-                
+-                #Add to the general list
+-                if(OpenCV_${__CVLIB}_LIBRARY)
+-                        set(OpenCV_LIBS ${OpenCV_LIBS} ${OpenCV_${__CVLIB}_LIBRARY})
+-                endif(OpenCV_${__CVLIB}_LIBRARY)
+-                
+-        endforeach(__CVLIB)
+-
+-
+-        set(OpenCV_FOUND ${OpenCV_FOUND_TMP} CACHE BOOL "" FORCE)
+-
+-
+-else(EXISTS "${OpenCV_DIR}")
+-        set(ERR_MSG "Please specify OpenCV directory using OpenCV_DIR env. variable")
+-endif(EXISTS "${OpenCV_DIR}")
+-##====================================================
+-
+-
+-##====================================================
+-## Print message
+-##----------------------------------------------------
+-if(NOT OpenCV_FOUND)
+-        # make FIND_PACKAGE friendly
+-        if(NOT OpenCV_FIND_QUIETLY)
+-                if(OpenCV_FIND_REQUIRED)
+-                        message(FATAL_ERROR "OpenCV required but some headers or libs not found. ${ERR_MSG}")
+-                else(OpenCV_FIND_REQUIRED)
+-                        message(STATUS "WARNING: OpenCV was not found. ${ERR_MSG}")
+-                endif(OpenCV_FIND_REQUIRED)
+-        endif(NOT OpenCV_FIND_QUIETLY)
+-endif(NOT OpenCV_FOUND)
+-##====================================================
+-
+-
+-##====================================================
+-## Backward compatibility
+-##----------------------------------------------------
+-if(OpenCV_FOUND)
+-        option(OpenCV_BACKWARD_COMPA "Add some variable to make this script compatible with the other version of FindOpenCV.cmake" false)
+-        if(OpenCV_BACKWARD_COMPA)
+-                find_path(OpenCV_INCLUDE_DIRS "cv.h" PATHS "${OpenCV_DIR}" PATH_SUFFIXES "include" "include/opencv" DOC "Include directory") 
+-                find_path(OpenCV_INCLUDE_DIR "cv.h" PATHS "${OpenCV_DIR}" PATH_SUFFIXES "include" "include/opencv" DOC "Include directory")
+-                set(OpenCV_LIBRARIES "${OpenCV_LIBS}" CACHE STRING "" FORCE)
+-        endif(OpenCV_BACKWARD_COMPA)
+-endif(OpenCV_FOUND)
+-##====================================================
+-- 
+2.26.2
+
diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20201009.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20201009.ebuild
index 70aa22852709..3b63da935131 100644
--- a/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20201009.ebuild
+++ b/sci-libs/libgeodecomp/libgeodecomp-0.5.0_pre20201009.ebuild
@@ -42,7 +42,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/libgeodecomp-${MY_COMMIT}"
 
-PATCHES=( "${FILESDIR}/${P}-mpi.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-mpi.patch"
+	"${FILESDIR}/${P}-opencv.patch"
+)
 
 DOCS=( README )
 
diff --git a/sci-libs/libnova/Manifest b/sci-libs/libnova/Manifest
index 3796d90f8c71..103d9ecec1e9 100644
--- a/sci-libs/libnova/Manifest
+++ b/sci-libs/libnova/Manifest
@@ -1,3 +1,3 @@
 DIST libnova-0.16.0.tar.xz 909212 BLAKE2B ae7efef8295dafd3715c37506d7403fc38a951c9a7c43e41e3c6ca3c922243a396052bbb71f07901bbd3aae2b2bee183efbd9e3e9c50dce72379f6ced80d5701 SHA512 f1c33421b7f09097223afe1bd5c31fa9a4591e4c965ba8a5ae1f164367717aa03986970ffe9c01e400b27aea43843fbb67cfbfe6ef44ec2c519f524aab9ea86f
-EBUILD libnova-0.16.0.ebuild 853 BLAKE2B 76dd1587dcc1bdb6296b4264b802ba8ee4cc89068c5fe1db40001e8cc04e649c393957ca9e39851ff2e95a09136e7d658154bde1322ff276f861b8e5f78bb991 SHA512 0b9e853243791483e3fec08ea65217131eff21446775e37aea7d7ad41b6c1a1c96fb22dc370f10a5ce1971d0e4c90c6a06d404db88cf7e264c8cc2f601e15a36
+EBUILD libnova-0.16.0.ebuild 854 BLAKE2B fae4c60646141ebfba8e0d37a2e9dc3616eb9c92e0a211fe9b84e9d86f59c57c3b699f7a70461a61f518f9288a73496e385b60a75aefba4f6b6d9013a4503ecb SHA512 51d60ce87fcef595d5df68e6bb0a37592972ef70306e994dca16698a13263d86b5aa5ba53bd1417e07627f8af4580fc632c10d4f611c50348e77325d8315a6bd
 MISC metadata.xml 637 BLAKE2B dff43562550feffed3b305c3aa5473a1ea4256c10f1db163b8e7af9f751611525d0720d18eff17a64dd3cd0de1a441a912b79e86e43e307d50b439cb95ccc480 SHA512 f94be1667b076464ade40edbc7fdc3e73ee743c518e862df1277914826e91d9adc075d1a756e6a48a309bc32da384dfc17d5973f1e2b9e116d48cda697c5ece8
diff --git a/sci-libs/libnova/libnova-0.16.0.ebuild b/sci-libs/libnova/libnova-0.16.0.ebuild
index e30955f870a3..88c69ae3b516 100644
--- a/sci-libs/libnova/libnova-0.16.0.ebuild
+++ b/sci-libs/libnova/libnova-0.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0/0.16"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 75d915cf77fe..490011dc372c 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,10 +1,8 @@
 AUX libqalculate-0.9.9-readline.patch 424 BLAKE2B be67a73b0ee7c01c059111261305450b1c6c1547062eee955f6dac2d22582a70df85a3feb8189b304ee388b2a8aee69a8a9ce7bb7408d5fc9957178b66f3dd0f SHA512 677589db5ce91c8092666f20d54e8f607a4ad06beaddbe8a1b11262d70eb2707cf70a608b797efa20b635e018da082585d74309e6506f78f931c09487b8c9aa2
 DIST libqalculate-0.9.9.tar.gz 1509180 BLAKE2B 3f309add80ddb6b21730eab25d37c2d8fee163a79768a09ec5e7e5d329aa11ed9dafbf77f4ce194a96c2ac6a3b55a9c0d16755d5e106123cc2a5f931f6872d91 SHA512 c7692dcd91e0a7aea8184ca5366a3caf704b6e716c9e8552f4214ce7fc3157cf127daf7a063196383e4d5a99f8703486f2282c7fb01acafee5e1b3d8993de384
-DIST libqalculate-2.2.0.tar.gz 1717207 BLAKE2B 020ca544683ff140ab5f8256a5a955c895a6ea09a581e9e75ab6c0a0657886c352a1ec2d34400057fe80004481d3198998613113ca40fb4feebfca010445dced SHA512 e6f3693e4dba2beffca300b673657b90037a6b7acc5bbd4e659863f4f5aec148d6d385fc3c666b16b2be713d0a8ad1b4d7fda557cef0e2be340ca2435f62aae7
 DIST libqalculate-2.8.1.tar.gz 1961535 BLAKE2B 074d83a44cbc6cb5d8afe5121e4c34cec46f2f6fecf046f6b4e67c6ebc612030ccbd0f42c303cc675267374502ecb3e831c9bbfca0f13d339e31fb8933a99b7a SHA512 a258bf4f67db70263626ac77822afc75fd7a9e5af2feb1930314daff219865b28c43e82fef6ceae4f3f23957447d6eaebdc709e606d28457bca0f47eefb9274a
-DIST libqalculate-3.2.0.tar.gz 2035352 BLAKE2B 4ad9f1acaaa34693e3167514d16193b06af5a2d441946e636439cd9374c0061e0f20e72126a2cb020fed2e7c82e7144636a7eb545196bd6879af5a09320c3245 SHA512 6d0e1bbc1c9e4436208cd0ea855cc1d90b8a6d0525cd25bc9414db6e610e1e48aa84a9b552248926bd3c6f91db4997afb60658a5579502bac7194178e36fb857
-EBUILD libqalculate-0.9.9.ebuild 1441 BLAKE2B 6e05f435d1d5d5a4c635a7ce59d88104f8af68714a9620c2f273451cb00d280edd578429943d0e9271d89286d56176216b360ebdcde1ac039795cd44ca1b2330 SHA512 0e976d34bdcb93d81ce132e8ada4e28d461d238b130ea1f357b6ed73947113a1b5f62e85a78cd01e7eefae232c42dde532b953f5077995a8bb65076146edfe47
-EBUILD libqalculate-2.2.0.ebuild 1349 BLAKE2B ea1df54be1d8970a19f229dcc268627ec760e586c3c9c5e9526c747d15d95b91cf3bb0fb90e56fda9191191a22ebd23728bb8921a6b608eae8fa5e7b149785ee SHA512 739d3946688533002637177352784a9884a08931ed9d70ec3012e76b3bfdb7d7831d54fc401e3e74ff4f73b1a015fc18c8cbbf8ee27913d5149c44094cdc16f8
+DIST libqalculate-3.15.0.tar.gz 1747863 BLAKE2B eed4cf8f11546b80e9556cfdf09e48d8c4c29948e6bdc02b3f9efd9aa6dce8e6c5eecf440bf4b6243ddcdb59cb7176f1eb054a3ef73cc91444d86ed7645f3a37 SHA512 b8f2af83218a3f90326cb7f679b71cac328cf0591178ed718920cd491d682cf7341c702934b3a232bea5a67ec2d2e09b4321a7ac938c5bc1e221bee086ae4c36
+EBUILD libqalculate-0.9.9.ebuild 1442 BLAKE2B 642e3aef938dcc78f032a5a087ece871d08bd3bee90a8d709e1f56825fcacb048215b9ce4b92893fe68fc0f3659f9709fb5c335646b9ccf99d5d500009c4caa3 SHA512 c7738173ce5ba9290d6571f20089649b93133e2ac1d3ab84acf2bce312bf8dcb69ea7acdde2bce526a07df24312819da88dd24906406195091159bce509668ef
 EBUILD libqalculate-2.8.1.ebuild 1438 BLAKE2B 0550f2dc76b323b0f6d6a20fbef66a7d65011ffb4747c0e1dd812a752d75fe2cdf57ad37ad8080a3d9336a12918ba0937a3be39899461e32b40933855410e8c8 SHA512 990790716b50742317fbd56ed110b69d1573fb89d1fdf3f735087c7364f576c6af4fd882c67c2d4d69e867555656976e2a5ba7607a4a483136d4200a616800c4
-EBUILD libqalculate-3.2.0-r1.ebuild 1441 BLAKE2B 2bbeab865e61e3bf0a14e94dbeaff047ff1cd21337e82d0b201fc3a79aae2a98fc6f09ab95596d1058b13739d831da19fa4ca94b8aae9a38cd60f885efdd90b7 SHA512 dfb669c337ecf1c80f831b1fc7c63df442c3a2c3c8fa729967adf921000fbd8f42414bf5a04fb049df87ed3824df23f9c52d15c8ac6d82b7cc4ff33056c725a7
+EBUILD libqalculate-3.15.0-r1.ebuild 1430 BLAKE2B a3d6f44135ec92a7580145908cd76ee5b6e82625164f679b73ec1b2d202c7584de298d2a3d3b346ef6e0fdf46eb3606c066a5a92ce5c022cc6950c26f083031b SHA512 f0007784f901a4ca786d7fb274337f4d8df3b954a96a8f59152551abb6d0fd21402066ceb64b12e90fc9bf7321b63c92be251a7bb41888ce80eac036d3051750
 MISC metadata.xml 412 BLAKE2B 6cb8a434ec8e0eaa50982720079db60a5a2211c9d67852712351e9d6698edb1d70058f8f093ecf7b93fb7f853b1f1c138bc0871a6751975d35c24c622510dde5 SHA512 b6c55b741bda2a497dae278d47c6931611cbda132e08deb16a9c4efef59c7cb18bc464e7d242380b7afde2af4ab6f8e7f72b7db4ed3fd6b8f4cdc9c0359550ce
diff --git a/sci-libs/libqalculate/libqalculate-0.9.9.ebuild b/sci-libs/libqalculate/libqalculate-0.9.9.ebuild
index 19d324e74252..205d51b8dc7a 100644
--- a/sci-libs/libqalculate/libqalculate-0.9.9.ebuild
+++ b/sci-libs/libqalculate/libqalculate-0.9.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gnuplot readline static-libs"
 
 COMMON_DEPEND="
diff --git a/sci-libs/libqalculate/libqalculate-2.2.0.ebuild b/sci-libs/libqalculate/libqalculate-2.2.0.ebuild
deleted file mode 100644
index 4b4799063525..000000000000
--- a/sci-libs/libqalculate/libqalculate-2.2.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A modern multi-purpose calculator library"
-HOMEPAGE="https://qalculate.github.io/"
-SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="gnuplot readline static-libs"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	>=sci-libs/cln-1.2
-	sys-libs/zlib
-	readline? ( sys-libs/readline:0= )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/wget
-	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
-
-src_prepare() {
-	default
-
-	cat >po/POTFILES.skip <<-EOF
-	# Required by make check
-	data/currencies.xml.in
-	data/datasets.xml.in
-	data/elements.xml.in
-	data/functions.xml.in
-	data/planets.xml.in
-	data/units.xml.in
-	data/variables.xml.in
-	src/defs2doc.cc
-	EOF
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with readline)
-}
-
-src_install() {
-	# docs/reference/Makefile.am -> referencedir=
-	emake \
-		DESTDIR="${D}" \
-		referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		install
-
-	dodoc AUTHORS ChangeLog NEWS README* TODO
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/libqalculate/libqalculate-3.2.0-r1.ebuild b/sci-libs/libqalculate/libqalculate-3.15.0-r1.ebuild
index 059d1ce9b78a..822797484de7 100644
--- a/sci-libs/libqalculate/libqalculate-3.2.0-r1.ebuild
+++ b/sci-libs/libqalculate/libqalculate-3.15.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,11 +8,11 @@ HOMEPAGE="https://qalculate.github.io/"
 SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="0/22"
+SLOT="0/21"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="curl icu gnuplot readline static-libs"
+IUSE="curl icu gnuplot readline"
 
-COMMON_DEPEND="
+DEPEND="
 	dev-libs/gmp:0=
 	dev-libs/libxml2:2
 	dev-libs/mpfr:0=
@@ -20,33 +20,35 @@ COMMON_DEPEND="
 	curl? ( net-misc/curl )
 	icu? ( dev-libs/icu:= )
 	readline? ( sys-libs/readline:0= )"
-DEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
+	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
+BDEPEND="
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
 
 src_prepare() {
 	default
 
-	cat >po/POTFILES.skip <<-EOF
-	# Required by make check
-	data/currencies.xml.in
-	data/datasets.xml.in
-	data/elements.xml.in
-	data/functions.xml.in
-	data/planets.xml.in
-	data/units.xml.in
-	data/variables.xml.in
-	src/defs2doc.cc
+	cat >po/POTFILES.skip <<-EOF || die
+		# Required by make check
+		data/currencies.xml.in
+		data/datasets.xml.in
+		data/elements.xml.in
+		data/functions.xml.in
+		data/planets.xml.in
+		data/prefixes.xml.in
+		data/units.xml.in
+		data/variables.xml.in
+		src/defs2doc.cc
 	EOF
 }
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_with curl libcurl) \
+		$(use_with gnuplot gnuplot-call) \
 		$(use_with icu) \
 		$(use_with readline)
 }
@@ -57,8 +59,7 @@ src_install() {
 		DESTDIR="${D}" \
 		referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		install
-
-	dodoc AUTHORS ChangeLog NEWS README* TODO
+	einstalldocs
 
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest
index b214a11c1a08..f78545861851 100644
--- a/sci-libs/med/Manifest
+++ b/sci-libs/med/Manifest
@@ -8,4 +8,4 @@ DIST med-4.0.0.tar.gz 47849098 BLAKE2B 0bc6710f7b5156e09962e3125349573989429e614
 DIST med-4.1.0.tar.gz 50375039 BLAKE2B 514ca19baf15e349ecbce870b318b37c51bfb57ac9b03c2b2c1b28836fec7fcf2dce573b9ea155f358d5e0bcee120c12a31598cd4f1e44837eca787553bb70d4 SHA512 94d07663c2f6a3cd497f54b480c3d742476d2a25172feb567980c9e75d49f4661aa2c6aaf570470938265997154e348bc1608065b86d42afda52d4e6361fedf8
 EBUILD med-4.0.0-r2.ebuild 3493 BLAKE2B 119f7121365e2467dd99d77aa39eefe69356b78a09a4d7926d5386520d0150612ad0cdc1c6e462f41bd3b4eb8367169262c4d5d15e901f1b6c041b8b435a0fc5 SHA512 b613150305bd7b95312b05addfbb140d61f5d19a860798379f26e5690fa624fcdc5186f6f9493835dd8b32a694712a3d6a12c55e2fb8816ada8850078408a706
 EBUILD med-4.1.0.ebuild 3231 BLAKE2B 336bfbfba073d30dd9ef1efb0b00ef5cdc90f53ab3de07002219f3750d433c8aabccdd02c439ef262058cfc3ce9676562e808863ce09af741671b2a107953c73 SHA512 d45cc92458137499e6f735fb4f440d5f823710dd0167c71302dbdea59e0d1938e009fe25d23d60f0aef9eb5df785f9288ea6faedcf30f65c31cda71aa65294c1
-MISC metadata.xml 618 BLAKE2B ab2f432dd6d02b0a02c8963cf9895ed800b94a30814e761363ff85d4e07801cb187a7f6ecb45084d6cb61683afc0b2e00bc0b2418a33b8d4ab25c974e7f67407 SHA512 f1553fb2e6269fc0b6db2dd5b08765987ac9e80da53aa40445ef7b80d3e2ccc11b6266984544476dc6ba5e1817bf9f06b7e9d16553e1e24e6e7b9c3ba04c506b
+MISC metadata.xml 597 BLAKE2B 4a83011ca9dd5e87df8d4940cb55bc0c6e374eb6be638373c5ee574033340d2ee68186531ff0825726847d4545030739885dd774ecea3291fa60740678e6002c SHA512 f2f194d0c776f646ec4dfe45a82d98670b72ab350fcca731b755d3dcc0a3ac379f54908595a0bc163fe0cac0f1d1da157e2cc00ba8957f18f27d27528074c797
diff --git a/sci-libs/med/metadata.xml b/sci-libs/med/metadata.xml
index 9f49ce730ae1..bd426681320e 100644
--- a/sci-libs/med/metadata.xml
+++ b/sci-libs/med/metadata.xml
@@ -15,6 +15,6 @@
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
-		<description>Gentoo Proxy Maintainers</description>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index e906966ab14c..b0729b37ccf8 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,7 +1,9 @@
 AUX netcdf-4.3.2-HDF5-1.8.13+-compat.patch 5258 BLAKE2B ef4afcaf5f9139c6db2898e8e6339e77de8534218c7e00a6b16ff68bdaeb470a96b06493637a6b7734bc00a4813f21a4fd179bc12d1cf156a04ee651380bfc5e SHA512 aa54ec936aff884b105217a8c87f5d7722b8b76a4bdd8b8804366c6509abba9962fdcdbfda2361662fec3732be1a1c2b7a2ae8abea1862d2ad7fd3b0f3828f59
 DIST netcdf-4.3.2.tar.gz 5013938 BLAKE2B 7acef16284bf8586750bdeb03da3e2e2a1c543b80423269eb2542d179e1b52dd51e30584a13f604e75c295ae9ff993c814183fbb5a78ad1141c62f8dbdda6525 SHA512 9cb9c761bf1e17a37601c37000fdc0bb654afcf111e5ac2fb7dcf037c6aa827e66beb29d5c661edc50ea3f84849f3dee387aab9e85ef81a9b6ca3f36e45debdd
 DIST netcdf-4.6.1.tar.gz 18201700 BLAKE2B 2dab9add736d0db3ad91fb1ccda63c200fe5a2c6e56e2dd5b76375f6535807c6f462623d1709235f03e0940b66a8c2d1c3fd896b042b8b0004c87f038852befb SHA512 e290b10e763f9f6ef56b5224f834834853de7c21347ef6a078a2e7d819757fc8069814431784d0a0387ba2ce1f01776556e3051f9465829da0ffd3849571cd61
+DIST netcdf-4.7.4.tar.gz 19711158 BLAKE2B b49532e6f87b458e7f5654f70ec932d6c8c81272c97ce44df3d27bb61b01d3e005f918b959ce12e42e26f7c12309ab72eeb57a35216d20ab5761837db65741a4 SHA512 15922818fdd71be285eb7dd2fc9be2594fe9af979de3ed316465636c7bbdaec65eb151ca57ef8b703e6a360cdba036b8f9bc193ddff01ff7ce4214c0a66efa79
 EBUILD netcdf-4.3.2-r1.ebuild 1499 BLAKE2B 7bfd5e8ac228a24e707089b4c0c7853051804b368c588080a1abf6080c2e81470a18814b4a999660e2e4af229b5ab68fe6d2d8f08e4f3a4bbc7a85446003d82d SHA512 63d12e90ba69030eda48a8d2c905f6cd2337b9cf9d1aa96856c4e45227f65bcb113a3aba0d0d1f7a5781a23fdbcdf0aa34c9322a4feb2b5533e591c85ca234de
 EBUILD netcdf-4.6.1-r1.ebuild 1339 BLAKE2B 93c0f23f0abfa4d52bd4de02f67a7521400ad82c91ade18d6c09e18fe8fb9b4e053ee7864fa0e21b472df0d813680d74c91589c9049da100191646fea03553ba SHA512 6d3b500df1de3f15a694b8162d1bc52cd4d91428a57946db1f9fa1a81adb911feb9710cf57b96693388994ad301d5600c08eb00cfcfd4aa9979815078302bc55
 EBUILD netcdf-4.6.1.ebuild 1341 BLAKE2B bc9e4f661439c5bad7436f5bfb6f0b9aed1bb1192365c519fd66b97997e8f06199a916c53c46ec48b088c41eea94d833c2f345a3525dc76f04eb06c0ba1118e9 SHA512 8db8eb13f11d42ffeb244a330a80abc0d9909364c3697f9b92f6db1665a3dca6372cdcfbfabca2023443147fc0ccc2738affee1a41a5961e25d00fa10f0c6c5e
+EBUILD netcdf-4.7.4.ebuild 1425 BLAKE2B 66579ba0c24b480c9cd0254daf6f166bfcb687925610ff6f25169632583f562184af9c39d10d376c5fcdfc3fc7a5cde644482b5c765e201692f3341da24e0c0f SHA512 fd5f93864cbfa93dffb46b7d1ab8a6f6ffd605de1818cd076df7098d58bfce6f88658eb1edc7663d88d25e2ad6afc65347470839969ed1dead1450fae79be966
 MISC metadata.xml 1064 BLAKE2B 7980e918eb2d2f438aeb5deb4a678c2e324606b40e8d04e592df7d24492bdfbc548082f6fa372c168b09597c3511df15a046cd8f6d746db3d9aeae31cf3604ac SHA512 2aaa7a6c4659ff3daf81bdb63541ce08359f43bb7007f38dea333d0a05fc920e6780b79a9b0f79fec59d4e05a005efd3642acaedcd3223a21d5aa919110545dd
diff --git a/sci-libs/netcdf/netcdf-4.7.4.ebuild b/sci-libs/netcdf/netcdf-4.7.4.ebuild
new file mode 100644
index 000000000000..8f99b01c1bde
--- /dev/null
+++ b/sci-libs/netcdf/netcdf-4.7.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Scientific library and interface for array oriented data access"
+HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
+SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UCAR-Unidata"
+SLOT="0/18"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+dap doc examples hdf +hdf5 mpi szip test tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dap? ( net-misc/curl:0= )
+	hdf? (
+		sci-libs/hdf:0=
+		sci-libs/hdf5:0=
+		virtual/jpeg
+	)
+	hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+	virtual/pkgconfig"
+
+REQUIRED_USE="
+	test? ( tools )
+	szip? ( hdf5 )
+	mpi? ( hdf5 )"
+
+S="${WORKDIR}/${PN}-c-${PV}"
+
+src_prepare() {
+	# skip test that requires network
+	sed -i -e '/run_get_hdf4_files/d' hdf4_test/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	use mpi && export CC=mpicc
+
+	local mycmakeargs=(
+		-DENABLE_DAP_REMOTE_TESTS=OFF
+		-DBUILD_UTILITIES=$(usex tools)
+		-DENABLE_DAP=$(usex dap)
+		-DENABLE_DOXYGEN=$(usex doc)
+		-DENABLE_EXAMPLES=$(usex examples)
+		-DENABLE_HDF4=$(usex hdf)
+		-DENABLE_NETCDF_4=$(usex hdf5)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# fails parallel tests: bug #621486
+	cmake_src_test -j1
+}
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index fa959779eeae..836515560d50 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -4,8 +4,10 @@ AUX openblas-0.3.12-shared-blas-lapack.patch 2008 BLAKE2B 2d3a4a90d8144cbf149b77
 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.13.tar.gz 12437434 BLAKE2B d8f9d3296506c6148cd506278f0b6a2a4fe50975a7fd3f54108e98e88a13002b1035f5697322ba73df7c6397faee6d0772c1d4d46b66db8e862f17b980dbdf97 SHA512 86e7f496587cc35d7feede99cbe3cf627ef690dd7489bb03b95f7d15ed758e32baf17d79f17b1de187184394233f60a8249a64dd53c3d59a9540db92269b7ee4
 DIST openblas-0.3.9.tar.gz 12189745 BLAKE2B 3cc4c6a403d6a52845cf4ff8cef254f57587e17e3d09bfb6ed7c02ad06a6002e50b340177c73a944c2a621c12b7f494c516025751c194d019662c0b4db17f4dc SHA512 c6b8ee465f1cf53b37f21ec3ff9a28d5cafe20fec59d8c1bff5923a9e1989dfa5ae8c032a5d43988fe7722ed08c64c7957a3d30e6ae917e2e7aa2977a91e67a3
 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.12-r1.ebuild 5745 BLAKE2B b45d551cf3bdcef581574e2261b58bf7610c945a048e5b4503c7e3ef4668e9549fa347a9a4481abdc81da76f768b51cf5c171c226758f796fb22fb0d03698e43 SHA512 a603bf8aade07cbe3463d5b7dbaf447665c58e5951cea47aea2ae22ee2405baaa9af6a36dc5f994788d247d93b474097b8221740992101301f49ca94f19947fb
+EBUILD openblas-0.3.13.ebuild 5746 BLAKE2B d68962c2c993f87836564febcc37311b93f4c17e49e9b9050923e9170f984d7cb8b74616f9bf1f5bd0e7fab3a06e6b053c9ac2f7c8988095715f9216437e845c SHA512 608cd1c978f76285de494bec53eea2647f0e7910a5fa7e70a59687cf27985da49b2548adfff51fd9a8323ee243a1f768acf4c38cee6fdcdd56b892951619785d
 EBUILD openblas-0.3.9-r1.ebuild 4075 BLAKE2B fe030c9249e08b2695cdacc10042ba128a184e2f21193d21a602bff4ec6d307fadae33937b721cb7aec7151e31e4427df95e08f639698492cd4154a43e04261d SHA512 dd96938cb36e36989e600955d4171241f66d2eb8725ba3e193cc08c7222fc6f0fea977358679eb6890d8dac6699aff1a601160ef425defd991c86381b35efd2c
 MISC metadata.xml 1546 BLAKE2B 3e6379f0e8624978c09272d6440f8234379ebc886e1f72d05f89ffd9914da46cd66d94f5d408f11bb585ac28bde6d222b89e2b9608de550d94fdcbae25e2d910 SHA512 a4680cd8f28c4028acfb9621281ee0a08916f62c99cec883e953390ac9d55d47fa3c667c4fabb54121f7010f67d1e180c1c1faa5eceffe6a89d379ef4419cca7
diff --git a/sci-libs/openblas/openblas-0.3.12-r1.ebuild b/sci-libs/openblas/openblas-0.3.12-r1.ebuild
index ef165228c141..6f996986647a 100644
--- a/sci-libs/openblas/openblas-0.3.12-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.3.12-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/OpenBLAS-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~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 +relapack test"
 REQUIRED_USE="?? ( openmp pthread )"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/openblas/openblas-0.3.13.ebuild b/sci-libs/openblas/openblas-0.3.13.ebuild
new file mode 100644
index 000000000000..ef165228c141
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.3.13.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/qrupdate/Manifest b/sci-libs/qrupdate/Manifest
index 378d36d0c46e..d293f3e16786 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 1276 BLAKE2B 74e66218cb103c2231d08878399678854c6c2050886b3aaeabe874b32ecd5a05af0beb0b5e2de5988e63ca6e71c2bb3c29cc594de05adc846b888ac86df091bd SHA512 a7db85cf7c9788178e192fd03301663c36319b9a624977d868a8e170eba22f70919c56b2f21247c2d0781ed16759ba3e4760e2a50ef802c93351aa78400d7822
+EBUILD qrupdate-1.1.2-r1.ebuild 1277 BLAKE2B ab4919a083f5ed78ca8cff239a80231cea6ebfdd0c1db89bd2dd516858cb69bef3364c8444133eff6d08b7b5316cd483e9a68865d7debdc4c011d615f6c009d4 SHA512 cf1417278be63c8211df93a1706debffd5f7f1b6d47acd5c90f5336c6e2bab8b2e5da8e37e1cf64ba794289c7a360aef1090fb95e50108d040f0b154ca1b05e1
 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 bde3a5417097..12576510a909 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 arm64 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
index e5468bb11ca9..8742ab275c3f 100644
--- a/sci-libs/rtree/Manifest
+++ b/sci-libs/rtree/Manifest
@@ -1,3 +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
+EBUILD rtree-0.9.4-r1.ebuild 633 BLAKE2B 7422f19efe9e8993116547554672181ff941b557169b15df70747f47b9931c037ed2f79404250fdbeba44a0f344af6e48e719bfc0b4fed55b6edb663aab4ddad SHA512 8e108f5d47c11427ad09fdde497ce48c6635fe286d3a8e4891a4948b784c828d562e656301c1e9f5fe3c631f50a79eaf38becc5c84df5290488eed7db7e08815
 MISC metadata.xml 701 BLAKE2B 1f89c6481c0856f2bd0ca2431151ecef5c01b015c443efcfb837be7cbe84ac218b3811e3710e678650916094ab9c8e0d18b2bb0a8beea10a7b6c73e7df23d646 SHA512 c145907e76558f657c5ca11540fc83ed3fe42917b496c4885b9826fdeb6253594f8656f9e663bbb519b47f3590ef0068f28e75f2a14248f7cc9508d7f8d7db81
diff --git a/sci-libs/rtree/rtree-0.9.4-r1.ebuild b/sci-libs/rtree/rtree-0.9.4-r1.ebuild
index a0940fd1901a..300f78330022 100644
--- a/sci-libs/rtree/rtree-0.9.4-r1.ebuild
+++ b/sci-libs/rtree/rtree-0.9.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/sci-libs/scikits/Manifest b/sci-libs/scikits/Manifest
index c14777fce2f1..4271e0f5a317 100644
--- a/sci-libs/scikits/Manifest
+++ b/sci-libs/scikits/Manifest
@@ -1,4 +1,3 @@
 DIST scikits.example-0.1.tar.gz 2401 BLAKE2B 4c67adb2e74be9c94d68e99bf44017eb75c054608b69045523c5cfeee18edb01384640e8ed3cba4765bc181e7dfb9a2e70d1a97ad2b6176d2df7112172adce55 SHA512 9e5534a9f12f5a11e7f9d7c3d4f16cdbfa34293b29882e6bc9ec597b6e7ac306cc65e2b197da8c0bfc8e319b01db31f34b06018b5420c3ad68e8cc3f490259e1
-EBUILD scikits-0.1-r1.ebuild 738 BLAKE2B 567a32a5ab294ba1d053bcbebf68da3998c633f9e6a943180bc968a2ac0b2ea5140ace14456b77f499ecc4b20dd82417e74c8a5959c8245e43cfd95ec2fc9f0d SHA512 c2c03a129d86ca4e68a99302375a811abfa4a750750425713c91d51ef58ba203bbd46e4ddd2f9f2841b9d61f4a5c06da6b8bb9b2111e56111d581028d73d535b
 EBUILD scikits-0.1-r2.ebuild 756 BLAKE2B c5688ed662d8c90d3e79dd99e3463952060572dd6a61851e7b28fb1729eff349a21f7393d6a7fa1bc5d1f01a18116278eb66b54d07362909b2ff7f3198dd08ae SHA512 dc82efcf0fde9b4db145a0d729074c930a79164228d547c58bd6ec71ba8a50966d4bfef2be0a323b4f0c75f038f925976b212bb4cf4d096926bac51a21c210ee
 MISC metadata.xml 341 BLAKE2B 0fabc7259ef405a99a200a7150ae82fb8435cccccd845ad17ac4ba782097dac4f3b8bd12476268102b7c222a258caa97c613e623d294a46015b051f777370355 SHA512 15f7eceb096968dda17a2c584857aeb53f445101c8caee162a0004891c5c3d9f96c621996ce6f1f75ff3a47a319c460f9e05918abfec363d4db79877cc172991
diff --git a/sci-libs/scikits/scikits-0.1-r1.ebuild b/sci-libs/scikits/scikits-0.1-r1.ebuild
deleted file mode 100644
index cc7e76891648..000000000000
--- a/sci-libs/scikits/scikits-0.1-r1.ebuild
+++ /dev/null
@@ -1,34 +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 python-r1
-
-DESCRIPTION="Common files for python scikits"
-HOMEPAGE="http://projects.scipy.org/scipy/scikits"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}.example/${PN}.example-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_install() {
-	python_moduleinto scikits
-	python_foreach_impl python_domodule scikits.example*/scikits/__init__.py
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r scikits.example*/*
-	fi
-}
diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index 227ad46901c0..ccf61633c31d 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -8,5 +8,5 @@ DIST superlu_5.2.1.tar.gz 2560875 BLAKE2B b1dd51bddb55061f5756f3cf766f80e506f7cc
 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
+EBUILD superlu-5.2.2.ebuild 1173 BLAKE2B a247b0de4dfd4e1afdae68e83a2a1f9f704eb4bcc7b4a18a77207a8b16a9a2d52d2b957f8bcdac5573a5c8d8d5eb9e1da65d3f538bc6dd12cde14a5c173bc479 SHA512 8d5c7e9e6b7c9a225d1fbefcf4940120b957363b5242d4ef4e4e500993418bf96ef124ece647d6336b8cdd51a66006069ef019d2a2f86651bb550bd2e6e79a60
 MISC metadata.xml 1404 BLAKE2B 3ab566d18d18307d9fc7dea889e492e19b76aa9fdebe0dce86b46b1cf7a2d53f65404f56da04cc8420e6a7c21867b948e537833693cb60521746c5a48f16bc6b SHA512 8b758572ed599bdf43898050e265ce8ea82c4952af97471c09ee0013e56cf6928df3f3a436516c4fae7a38a13bba4a3437e130f294f942eaaae05125fa5fbdea
diff --git a/sci-libs/superlu/superlu-5.2.2.ebuild b/sci-libs/superlu/superlu-5.2.2.ebuild
index 723d6ba29bbc..e527066b1ec1 100644
--- a/sci-libs/superlu/superlu-5.2.2.ebuild
+++ b/sci-libs/superlu/superlu-5.2.2.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/szip/Manifest b/sci-libs/szip/Manifest
index 701e71f32267..aba0f14a0e2e 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 713 BLAKE2B 8f6a03b312a63d2ce2bdac4ddf69a3e35d196cc58867b38e9384c00444ba3a4809beca8bd26b3b4bce57757b9751212b1914005ff0fd70b98fd10f6543c95f16 SHA512 b8266fe30066d7d0620cc72c24b5132998d1ae95faacd84169eb6eec91a29752f501e7826f104755039de241c60b9e52021f134139ed97bf9a0ab0f4924d9cdc
+EBUILD szip-2.1-r2.ebuild 714 BLAKE2B 9dc26725ac8c60c2ef6584e8539a53b65fd57f06bc0f532d2fa01c237965682d4af51c8b80d62522d4caf7bb52b65a377e3b544e6be2385a2e7f8314327d034c SHA512 9b7048475053f2086c4d5a76e790f077bb2d6a3c3058a8e6dfb59c6f03544c91bfae640fdd44d5ef6d1aa787c869fb7a92d3f5ce5ca6795a62c98e22adb57796
 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 eeb985247c0a..7a6d73025d4d 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 5d53c0a08e19..b0d11c783263 100644
--- a/sci-libs/tensorflow-estimator/Manifest
+++ b/sci-libs/tensorflow-estimator/Manifest
@@ -2,7 +2,7 @@ DIST bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip 72534 BLAK
 DIST bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip 159656 BLAKE2B c2ebed5165907e5452db2e8797253ce17fb39a00d3ca3aab11dec475399821dd529629d710af6f9892b74d0654293bd7989fa2be24caf5836490e8df566c7c18 SHA512 deecf484f5e888db345a57c3b557d6548e4e71fd4c62ea10b4dc9c47be9d303df55c03bb446158675b131064c4eccb401bf217e131e78d629c8fc1836600cb51
 DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c
 DIST tensorflow-estimator-2.3.0.tar.gz 642118 BLAKE2B 29ecf5b64da20e8e6981375f1631b9b7e8ad061f71d0a3f1ac567bcd04b02102c5854d24e5106660f6bcd7b4ca683bd3bfbde51f236669d0f17e8f847feb7039 SHA512 0befc9c04650a0cd91ce90bc2e9a5d17ae3f7d8d8e4b8f763f223bbb891c73c7e2cbe91a2779af36342008e16f02d118120d94165c6a8e3c14a723b32ee29cb0
-DIST tensorflow-estimator-2.4.0_rc0.tar.gz 660318 BLAKE2B d71988c29c237e686151627723890c623019ea8f3ff1bcdfde64fc29461f3ffd268feb6cee2d57535f45e48ab166331c93e8e48a4c323abc5f6ec08774c39d6a SHA512 1f0a4379e2da96e9ffc9c3a06291c885b0509e1a50806573e9cb15053b40a45aec4b9938356c450bb0abca88156c992c813037a8144cba8b584173d9e4fe5162
+DIST tensorflow-estimator-2.4.0.tar.gz 660203 BLAKE2B b270536fe976fc718bb6ba558d9d91817b14951c8769365348d2cc13b621e30efe2154aa3040d2c0ea750d4f45b1aadd36d7f98b16bc2d3dcdec89f95ec6246b SHA512 31538614fb96c90228eebbc3edf7d7f7157dab1a9271858d47af2104d9fafab9f3386dc42a45ad46999df54fd757d544dd27fc23ee519596dd0a453a652bed13
 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
+EBUILD tensorflow-estimator-2.4.0.ebuild 2014 BLAKE2B 85accbe649ffd9a39cc19446f3ae76cbe8e751ab1c699e1953bb477309bd86e99046ff1c387dfde7ab4f30019aa523d7859338171a9b08b3997d0c4566ff5d44 SHA512 b179e5a9d21ae4b9dbef83ea719ae2292a83308f74a5fe41428e2a2f6141edb77a47be0d46f1ba71e2affdc3a4caf2cd2b9f2f71e11dbce92505d9797a48731c
 MISC metadata.xml 580 BLAKE2B fb81098968d0fdf34a3f28dabee76df16be5393cb9ea79ee4fa670af985ef3f70bb83f14be84a0cc0e564e6626007c2977851f8299460b483f88325be155f4cc SHA512 6aef6523502a3bcf0b2ca59cf7480b92032b53020cccfa715203e5a48c960ecc92c94fa75f98a234da2d51662d43e0c1a85a1537f3ab67287cdb8183476a0efa
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.4.0_rc0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.4.0.ebuild
index 1816ca18887a..1816ca18887a 100644
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.4.0_rc0.ebuild
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.4.0.ebuild
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 92e85bc74eb6..b9de140f515c 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -4,9 +4,7 @@ DIST abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz 1679879 BLAKE2B
 DIST backports.weakref-1.0rc1.tar.gz 7761 BLAKE2B 4cb2554a4b71bb1f8c41a790268511e4b382effc7e0328f74346d086de539a177111de9e2dabac19a44b2a1cdbf59a7425e30eee4caa4bfe66b0ca97f1f460a9 SHA512 f37e9eb0d9060d2e1588a941f623460bd4477d7e180b38b5cd46d9c1db1ee094ae63e4f5eeeb422823bf3d067f46c4124cb124a9e4ddb795bc0bfbc4802ab826
 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-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_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip 171775 BLAKE2B ec0ece4555d779bc8380937baac517a8adf3b0176c4bfb1324943a91366ad9688f528a4bd69e4587bcc4ad427c71a53016a3e2d32a050d9d4ec99caac4967a8e SHA512 5c5e82f276c1c962fbd9c7ddf21df9aa4291f3285f3fa07cd2c2790475ccba670b0627fc3d6faedd1508eca4d80bdae64a31383f001f04f3031112be81c3e697
 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
@@ -14,33 +12,22 @@ DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLA
 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 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 farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz 467122 BLAKE2B 8b9dd426f4b9f732df6c8c09d868d1b1cc006c395b1525c46ea91c75318b723358c8e64bb0d86a73aace2032eded93f0d80cc7c2c77fddd6a39e3402ab4f2cb7 SHA512 7f5110514a8cdc7ce48d33fd94ad67d96a24e42e11b203e4d0986f4190545f051b2a63f8e09f2ac38c3aa4a5c62d9a0e02cd8ce02045037381fb62a99f0dcd00
 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-7e825abd5704ce28b166f9463d4bd304348fd2a9.tar.gz 120301408 BLAKE2B 928117c2bae7bcdd2445e9f65297b45b009dfc62e9c16ed08a8f00aacee2497492b6fb4cbea0047a8aa1425b538e02af9b8e6dd21e52348cc45dfbb71ab3f47f SHA512 a9cfbd00a0530e4f5d001029c33be3723ed009799a42bd730a65319da671020a249ae5ba4496f1347a71a9ee69de4e9fe2b80c60ebd1bc4d6d4120bd3d6fecde
 DIST llvm-f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz 127766458 BLAKE2B 7170f72e131ec672a1d81a8f33284568fc367608d2c5940b435a75cf8596dc71588c942c6d24c47a7e88c391b0c4030df6f18f6d1da15140587c8a9b078cd83c SHA512 6ebee8cece3845875d39678d7fe248c71e7c3463554bf345e03c06985afcdcd2a0052338358764ba366c7ecf72cd97703cb06613aeddec3110cf20c30eb70d25
 DIST nvidia-nccl-195232556936b39b01cc908296e1650b80d4a3e9.tar.gz 147607 BLAKE2B 4109d195e646d5d492ff0533aea4d95fca59e5fb97aee0261c1b6d1f4615c1e6facb54b14bd4d1fc710b938c0edeca72b528e9e91e57d4bffa3b28af909449f4 SHA512 e45f0e07fdfdfc859f1e5ac05224977af821c99b0d9e11c71e9983612e621f55272a8836049ca61fe26f7663c4f8180102684143403ab46be73fbc8ba15e0c56
-DIST nvidia-nccl-5949d96f36d050e59d05872f8bbffd2549318e95.tar.gz 147548 BLAKE2B f3d3dd222ae90ac9ac1457a9695f112a21f5652a5b40e10ac049da910f07707b1c3910f59734fbe5e2c6523c1e83f3801f809efa77d122a57e859828c74ba8c2 SHA512 d9ea83caf7940fb47134293236fcb7478c0d4e40365d3b0a29427758e2e2dbb980c5e8c05fc9fc3956ed5e21a82ec0efaa31d973fe9c73fa3f50465f76756131
 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.3.1.tar.gz 46544608 BLAKE2B c3cb0954fcd060b95d63895cbeeca20f6af29ade999dc43db5fe010d6b33b6f650047d529f174a1663c23440a56e057e2f97c503a4a40bcdac9374b549f3220e SHA512 e497ef4564f50abf9f918be4522cf702f4cf945cb1ebf83af1386ac4ddc7373b3ba70c7f803f8ca06faf2c6b5396e60b1e0e9b97bfbd667e733b08b6e6d70ef0
-DIST tensorflow-2.4.0_rc3.tar.gz 53251141 BLAKE2B 45a05fc1bc6f5f940487ecfd53a5dd37718a39a2a3dfd536cb6e41ba1da9fbac9e166aeb288ad122adc6474af94c13a2370779c37aa7162de3cb0c015acd5c44 SHA512 c02901fb41aa996a4d3c4a118cd76c62502e99be64f6ecf98208b2c65ed9f8c87c4060dcc983f6fe8280207b3bfa967e5f325e2d926aa1b4429f99fc0153c2e1
-DIST tensorflow-2.4.0_rc4.tar.gz 53246897 BLAKE2B 4020cfa0ac72e4c06ee0ce69f44b3560132d2e885fd828bfcba9a951bc968d779c8de1507e888e36a3094510a973efc9e97304448b60f7b9847fab052de8e234 SHA512 fe69642a5cd0a6f7e8ae7abb93dec06225958d02f037936421a2b0c75bfc7d99efd5e1c6e0e3c2d0a6d3404516f4d178349d1fa88d81a14adb65d027339cb237
-DIST tensorflow-patches-2.3.1-r1.tar.bz2 12300 BLAKE2B 068c127d7e980baf63068c524c9411e4f19bb79ee369221cf474a964a15ad340b28bde09504a8d524167eea036caf9d2dc52d0ad7ae1e52a76d1892833b033a0 SHA512 510676e4f999c12331a61bfeeca45b2526292d8bca8b0b42c1d8d466bc52722075fbd4df26a5f67dbe1ca4ccd9059e783c113cf694b436ff48c8114c99234cd3
-DIST tensorflow-patches-2.4.0_rc3.tar.bz2 1843 BLAKE2B 6d4188471502e4411a5a7a6e731142af38421961600c52e7d76d137f952a5b8327dc8d8b4a40b60d3fb46130fe3d40ae2adc3d60d9a882f9d9b07d424e45e194 SHA512 abf9fbd870a8fa59b9d4e1b8260c4fbb5badeeca3e2b77caa031036759302bccae4adf91b291bc7a12df3c679b887338a8cd98d41847eb8ddd0c2bf4b8ccf342
-DIST tensorflow-patches-2.4.0_rc4.tar.bz2 1843 BLAKE2B 69d2bec532fbd65fcd44589ab554f3f9069112203a201c8ca2d19fedf1f4fa4211197b35a59cc487496e226f55a8e21e3865e04aee3df87fc13727558e5a3b74 SHA512 835055001c291bc7a32a0ec41e33ec9a8d17fada25af47d9d075c2991699ac52006f225b59ee9d828f71066e7fba3f5f1549388034b25ca0bedbebe0a3946355
-EBUILD tensorflow-2.3.1-r1.ebuild 15189 BLAKE2B e34ed5c8e554926f1b6441049b1f2368954e243dbe66f0ed1c0896f5c0eceb7b6613f2547b0a47b9493f08410d25813fbc800a3479138fe3e7f444f2d125f342 SHA512 4d46a272581266c1a905a675c1071b82027af7fcca3c86831eb2e9908cafa004da4fb399136568263e6aab7584025826c432dce86024cd34b59e1f7e8749da30
-EBUILD tensorflow-2.4.0_rc3.ebuild 15113 BLAKE2B eef8b30297a6205c06d0f30f99e6334d8e47caab65aa373b4f11030e9a70f35ded6ed79b1d645056768df3909a5b4743986c976e88f56cf1a4191f866aabb18d SHA512 aee40802e22d700fa218a73abc847dc16ef0460e1b6777600abca6614c7d0729b9f3fdca112d007662b0bbbe6ee136e78180ea86d50561e9d7c276a9d687925f
-EBUILD tensorflow-2.4.0_rc4.ebuild 15113 BLAKE2B eef8b30297a6205c06d0f30f99e6334d8e47caab65aa373b4f11030e9a70f35ded6ed79b1d645056768df3909a5b4743986c976e88f56cf1a4191f866aabb18d SHA512 aee40802e22d700fa218a73abc847dc16ef0460e1b6777600abca6614c7d0729b9f3fdca112d007662b0bbbe6ee136e78180ea86d50561e9d7c276a9d687925f
+DIST tensorflow-2.4.0.tar.gz 53257138 BLAKE2B 21973f67a7a4cb91baccbd3a4d9c8bce4c7f488ed44e834122b0fa0fc47b22d48276ecd9b580fa839c32a3dacac73bc010f91a27e5568df4dd9986b14b7eeb4f SHA512 4860c148fd931c4dc7c558128e545e2b6384e590a3fbc266a5bfe842a8307f23f1f7e0103bda3a383e7c77edad2bb76dec02da8be400a40956072df19c5d4dbd
+DIST tensorflow-patches-2.4.0.tar.bz2 1842 BLAKE2B ac35a02e3494b0cb6cfcc9212557d5b5480aea41b09d74b918471e688b489bafd2dbc609320abde609a461db1c8d0043fce4053ad9a223bc93fb883176417199 SHA512 39b3ebe710eb3bb5c4575dbbad66ae1bd2a81b803fb9007709154320eaf31cbac213ea5dc6c2e674e685db1cea5ff524f723f3893dfe5f31af32be7756882b28
+EBUILD tensorflow-2.4.0.ebuild 14620 BLAKE2B 3d70ee3abc8b33f505eb4f0a203bc5923e5ecd34001fd138b63185752edc7bca37c1e6095f098c8f15817be4117cf956a06671f5c405afeb343e4b11f9f5900f SHA512 d068f330cfdc8c5c0d0f8498fedf8f8be4f4fb11a95031cbe1b26ded45b046eec3ff06f3112ad6841cf491e1c894f29a7dab6c871521c2f998067cad464d63b8
 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
deleted file mode 100644
index 5ac893347dd6..000000000000
--- a/sci-libs/tensorflow/tensorflow-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,405 +0,0 @@
-# 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_rc3.ebuild b/sci-libs/tensorflow/tensorflow-2.4.0.ebuild
index 3ffae5ad6f7f..cf9a7cb8b168 100644
--- a/sci-libs/tensorflow/tensorflow-2.4.0_rc3.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.4.0.ebuild
@@ -84,13 +84,7 @@ RDEPEND="
 	>=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* )
+			( =dev-util/nvidia-cuda-toolkit-11.1*[profiler] =dev-libs/cudnn-8* )
 		)
 	)
 	mpi? ( virtual/mpi )
@@ -126,7 +120,7 @@ DEPEND="${RDEPEND}
 		dev-python/setuptools
 	)"
 PDEPEND="python? (
-		>=sci-libs/tensorflow-estimator-2.4.0_rc0[${PYTHON_USEDEP}]
+		>=sci-libs/tensorflow-estimator-2.4.0[${PYTHON_USEDEP}]
 	)"
 BDEPEND="
 	app-arch/unzip
diff --git a/sci-libs/tensorflow/tensorflow-2.4.0_rc4.ebuild b/sci-libs/tensorflow/tensorflow-2.4.0_rc4.ebuild
deleted file mode 100644
index 3ffae5ad6f7f..000000000000
--- a/sci-libs/tensorflow/tensorflow-2.4.0_rc4.ebuild
+++ /dev/null
@@ -1,406 +0,0 @@
-# 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.4.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/ufconfig/Manifest b/sci-libs/ufconfig/Manifest
index 4bfb4c8d05dc..559a385178ee 100644
--- a/sci-libs/ufconfig/Manifest
+++ b/sci-libs/ufconfig/Manifest
@@ -1,3 +1,3 @@
 DIST UFconfig-3.7.1.tar.gz 8523 BLAKE2B fee3520b4c1305c4684ef4d0fd6cbcc27cd6db957b838642241f75cd6de4468fb5dd61282a0c1484318e56c5b06b8354a78eed2e6df6a5d21e4250883ad1c42a SHA512 a9d562205b6d047d8064d6f61e4f9fdb782774637f0522abef6031e8633c7372db108c69b48098e8b41ffdf786ce7bda0d8df9a3dee634dfb11b5e6073996a22
-EBUILD ufconfig-3.7.1.ebuild 1616 BLAKE2B d5d1d7b2b76e78b3840e5596ca3e0c82ecff02a560e37acd2f169e5f48ee842df06cb05651cf5bdf9ed5d092231c5bc8815e28f09099aaf3a33bbc3cc5b7e4b9 SHA512 e897064043d3678f0547a8d7020cf9e62abc7d46d8a78e8982ca0fe11e960dd246c06773829fad32e72a23168df34a3142d341c9db7090be95618472a93f1d52
+EBUILD ufconfig-3.7.1.ebuild 1617 BLAKE2B 7b602dea0fc316992f09def335a9b50b45ed4f744ecca1aa8b9f8ba19f47fb73f7b8d747d65a3d477e77612386f8966a5a1f54d74eda17a33a0b9515332410ac SHA512 501a5ceec1187d5b0494aa9bb3ba41099343eefee6b26d43e0a96aa0fae7a773ce0b04a2b46a9e7a8a476f804e0e515426aed22e1effe0a975bf919b006278c7
 MISC metadata.xml 455 BLAKE2B ef292722ed6835d852c0eec069e85bde94e717df3b834ebced68ae5a0d63fce105b2d6c7beb8aeff495b054ac849017cb3d5c1a47643f2058feef549bba4991e SHA512 e5e8a1c204cb3651501705adcd10789c9a1e093ade44625745f0c40244f6fab7c7774da47d23a7eb0f7aa23adb1074bcc80335385567cd41ffee0c130a14900d
diff --git a/sci-libs/ufconfig/ufconfig-3.7.1.ebuild b/sci-libs/ufconfig/ufconfig-3.7.1.ebuild
index 4298dfb1fab8..a7dd82b21892 100644
--- a/sci-libs/ufconfig/ufconfig-3.7.1.ebuild
+++ b/sci-libs/ufconfig/ufconfig-3.7.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_PN}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 src_compile() {
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 334d48899df7..ca322beaa0b2 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -9,6 +9,6 @@ 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-r1.ebuild 9669 BLAKE2B 38b3bc7417127e19dbc8c22579962eba03de99511d203f0d6cf84b3ccebaa96287231af74bc9c3946dc8a8e78383a3244f43b38f66b07fe90803016b0462dcff SHA512 161cd5531a389509a917b0b4cbfe24edd1ed68c5289303156a12f42f8dadcbcdec1bcebee24424228aff7b0021e9ae7dbfd61999f98cd2961f7aef9486e4ef8f
+EBUILD vtk-8.2.0-r1.ebuild 9702 BLAKE2B bacdaea2d94f676ed4ffb06161c9c045c40c26ff979033a7863be5389ec59e2b810a6412df68d2581076b0d20887d69430105c1501ebe30ad4b72785f141f98d SHA512 51bba04470f8ace05a9401b12a57b3c2e483f61a329a1db974bb63686c9f588bd6659eafdcd19ef373e2cacab009864cc386ff655121816184bc822d247a2b05
 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/vtk-8.2.0-r1.ebuild b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
index d0d4b52214cf..2902ddb123bd 100644
--- a/sci-libs/vtk/vtk-8.2.0-r1.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
@@ -64,6 +64,7 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXmu
 	x11-libs/libXt
+	all-modules? ( dev-libs/pegtl )
 	boost? ( dev-libs/boost:=[mpi?] )
 	examples? (
 		dev-qt/qtcore:5
diff --git a/sci-libs/xdrfile/Manifest b/sci-libs/xdrfile/Manifest
index 36aaa1c2149f..319de4844415 100644
--- a/sci-libs/xdrfile/Manifest
+++ b/sci-libs/xdrfile/Manifest
@@ -1,5 +1,5 @@
 DIST xdrfile-1.1.1.tar.gz 378942 BLAKE2B 21b1524a7c31e957b28b93dab4b83b88c183528e534864b06ff76e3f31422129c22ac4bc24a054749dd1b5b80d93a82d873cae82571f0b89c16d55ef0de267c7 SHA512 bff06b08e547b956825f9b16a55fe93d07ff0c529426b892fd4b39be538774aa06facffc68994215e22e36edfa5642674653022da0762ca7cd1b7bc654112868
 DIST xdrfile-1.1.4.tar.gz 815342 BLAKE2B 9f2703cdd67dd6cb3156ab96e496dd4fa37d3a60d660da0a6129562ed295bb52ed5d5acb54aab1bd8b682e31f6155e96541dd47fee7226ae058d62f6efe3937a SHA512 70352efcce989172893e34855edd17990c80f3b5f956b2d8b03a5e75593280e981a56b00616adb950a7da5713729029aecb5dd2cd4c52a658a77eca43aa290df
 EBUILD xdrfile-1.1.1.ebuild 597 BLAKE2B 95ee6146aa52f9f1d0b3a0d73bc834ffae55c6f1f779408c105e52d8ec864f6e26de74422fd52a4717491c608519f2043ee733662743b1fee543997a98127475 SHA512 ab0156c4e760395f0320e640e5f452edab209da13abcb496717bfabaa03c86d001e30bdc4e1365eb18ed58dc287199b724635c304a72d5b6763df826dc37dae6
-EBUILD xdrfile-1.1.4.ebuild 562 BLAKE2B a1e86a9bc547f651d80598e7fa6a058f03b48e4cf86701fc72a0391c2de0a0510d0f24b74d15723098cad7e6cf666a178b57f163c6538f84643c5a5762496a72 SHA512 a8b0ba154efe06925c20c0a0b35e82b3c15dd0105e64bf191a5d48bb5e2564c2b3cfb19dbe3e3bdcc9ff9b80f8113dc97dc05d2978ee78f5c0bef3e9531caa78
+EBUILD xdrfile-1.1.4.ebuild 558 BLAKE2B caa0d29626c03bf08ad9f2444fb1b8dadd02c6448adcebaa40b1207a4343776a7dbd3d8666e5728dea010013011b94346b8dea006e3c5161dbe40af7dc8a42b5 SHA512 b0df2c8319a07b36acdddc5b141cdd0063c22306b2fca6024ab4f9499636102a317700a04b69b654d51075bfd80b13c8259f481d8ce6d31edd83f634cebb757b
 MISC metadata.xml 373 BLAKE2B f02aa6fee8d485b12b280def0754651f3831474773215f4b20002544e84575dab97ba478adbd6031a9545482576783e854f69e69deb7df27fcdb14e1128587b1 SHA512 e8817074c54b6f66a21bbb69f4c5cc51e28282dd23e10f322b6e676a1859d47fbef3baea4b55d4f343517ae4de9bda3a009ed76b49ebdf898d875f29b13083ac
diff --git a/sci-libs/xdrfile/xdrfile-1.1.4.ebuild b/sci-libs/xdrfile/xdrfile-1.1.4.ebuild
index 9789dad9d61d..e306c0118cba 100644
--- a/sci-libs/xdrfile/xdrfile-1.1.4.ebuild
+++ b/sci-libs/xdrfile/xdrfile-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.gromacs.org/pub/contrib/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="fortran static-libs"
 
 src_configure() {
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
commit	129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree	53bf797418ac5e9b99c41ca0382c87b82421e5de /sci-libs
parent	441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)