Updating liguros repo21.1.2

296 files changed, 1805 insertions, 8001 deletions

diff --git a/sci-libs/amd/amd-2.4.6-r1.ebuild b/sci-libs/amd/amd-2.4.6-r1.ebuild
new file mode 100644
index 000000000000..f03f2eaa63da
--- /dev/null
+++ b/sci-libs/amd/amd-2.4.6-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fortran-2
+
+DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
+HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
+SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fortran"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( virtual/latex-base )"
+DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.4.6-dash_doc.patch )
+
+src_prepare(){
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable fortran) \
+		$(use_with doc)
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/amd/amd-2.4.6.ebuild b/sci-libs/amd/amd-2.4.6.ebuild
index 97354db25ab8..4bdd81880c37 100644
--- a/sci-libs/amd/amd-2.4.6.ebuild
+++ b/sci-libs/amd/amd-2.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/amd/files/amd-2.4.6-dash_doc.patch b/sci-libs/amd/files/amd-2.4.6-dash_doc.patch
new file mode 100644
index 000000000000..62d9071422ce
--- /dev/null
+++ b/sci-libs/amd/files/amd-2.4.6-dash_doc.patch
@@ -0,0 +1,16 @@
+diff --git a/Doc/Makefile.am b/Doc/Makefile.am
+index 44361ff..039b02f 100644
+--- a/Doc/Makefile.am
++++ b/Doc/Makefile.am
+@@ -1,9 +1,8 @@
+ 
+ AMD_UserGuide.pdf:
+-	echo '\begin{verbatim}' > amd_h.tex
++	printf '\\begin{verbatim}\n' > amd_h.tex
+ 	expand -8 $(top_srcdir)/Include/amd.h >> amd_h.tex
+-	echo '\end{verbatim}' >> amd_h.tex
+-	-ln -s $(srcdir)/*.{tex,bib} .
++	printf '\\end{verbatim}\n' >> amd_h.tex
+ 	$(PDFLATEX) AMD_UserGuide
+ 	$(BIBTEX)  AMD_UserGuide
+ 	$(PDFLATEX) AMD_UserGuide
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 05da76241a0a..b81f29c2eaee 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,3 +1,2 @@
 DIST armadillo-8.300.2.tar.xz 4593916 BLAKE2B 0cb9082d9452b43599dea810036a1cdcd8ef4ab6ce5b2bc7b9d9201f1f396666a2aecb81ffa62388e1ee3de9a8c7df083df594224af47e5df7ee4d3c2743d6cc SHA512 df069634db377e95e02dfca02312b082b34cab91bae0b1fd04a97339477074fc50c74f8adf92786ac6f0fc148044d527461617f382cc996523251b6d1287e41c
-DIST armadillo-9.800.3.tar.xz 4716468 BLAKE2B 4909cbcf1f8d6aedb366bb9b21784e865d9e68a3c833263d1c1df942e96ef679e31191ea9dbd8bcddab6086bd26c80915546c29dfdd16188f0d9e865e7b3c03f SHA512 6088f7254c54067421fcc0b69751c6d37ffe484474ab5955755fa5b3dd38ed4246e353701fb614c820d192675ec75f134e3bbb511a70612e4fbf133a89cacc21
 DIST armadillo-9.850.1.tar.xz 4715832 BLAKE2B 41256d8f54ec1f2d4f7cfdf58bd67e66cc2ffbe0f1daf259a4d76e0816d89708fa5528d57b244000393404108c8d0d613d03321f14e5653163d0c1cc6ec7e273 SHA512 b2b9f0290f8f39a687db71a02b127086d5ff22cee77fba5211da2ea8a8d8a5edc256b31b7fce8e98aa1955a84c63e488adcd22f8cd070015a6fcd4b4f1cb37c7
diff --git a/sci-libs/armadillo/armadillo-9.800.3.ebuild b/sci-libs/armadillo/armadillo-9.800.3.ebuild
deleted file mode 100644
index 9ac3a1fc5f8a..000000000000
--- a/sci-libs/armadillo/armadillo-9.800.3.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils toolchain-funcs multilib eutils
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="https://sourceforge.net/projects/arma/"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack blas doc examples hdf5 lapack mkl superlu test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( lapack )"
-
-#	atlas? ( sci-libs/atlas[lapack] )
-
-RDEPEND="
-	dev-libs/boost
-	arpack? ( sci-libs/arpack )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	superlu? ( >=sci-libs/superlu-5.2 )
-"
-
-DEPEND="${RDEPEND}
-	arpack? ( virtual/pkgconfig )
-	blas? ( virtual/pkgconfig )
-	hdf5? ( sci-libs/hdf5 )
-	lapack? ( virtual/pkgconfig )
-	mkl? ( sci-libs/mkl )
-"
-PDEPEND="${RDEPEND}
-	hdf5? ( sci-libs/hdf5 )
-	mkl? ( sci-libs/mkl )
-"
-
-src_prepare() {
-	# avoid the automagic cmake macros...
-	sed -i -e 's/^ *include(ARMA_Find/# No automagic include(ARMA_Find/g' CMakeLists.txt || die
-
-	# ... except for mkl, since without a license it's hard to figure out what to do there
-	if use mkl; then
-		sed -i -e 's/^# No automagic include(ARMA_FindMKL)/include(ARMA_FindMKL)/g' CMakeLists.txt || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-	if use arpack; then
-		mycmakeargs+=(
-			-DARPACK_FOUND=ON
-			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
-		)
-	else
-		mycmakeargs+=(
-			-DARPACK_FOUND=OFF
-		)
-	fi
-#	if use atlas; then
-#		local c=atlas-cblas l=atlas-clapack
-#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
-#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
-#		mycmakeargs+=(
-#			-DCBLAS_FOUND=ON
-#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
-#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
-#			-DCLAPACK_FOUND=ON
-#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
-#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
-#		)
-#	fi
-	if use blas; then
-		mycmakeargs+=(
-			-DBLAS_FOUND=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		)
-	else
-		mycmakeargs+=(
-			-DBLAS_FOUND=OFF
-		)
-	fi
-	if use hdf5; then
-		mycmakeargs+=(
-			-DHDF5_FOUND=ON
-			-DHDF5_LIBRARIES="-lhdf5"
-		)
-	else
-		mycmakeargs+=(
-			-DHDF5_FOUND=OFF
-		)
-	fi
-	if use lapack; then
-		mycmakeargs+=(
-			-DLAPACK_FOUND=ON
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-		)
-	else
-		mycmakeargs+=(
-			-DLAPACK_FOUND=OFF
-		)
-	fi
-	if use superlu; then
-		mycmakeargs+=(
-			-DSuperLU_FOUND=ON
-			-DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
-			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
-		)
-	else
-		mycmakeargs+=(
-			-DSuperLU_FOUND=OFF
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	pushd examples > /dev/null
-	emake \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
-		LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
-	emake clean
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.md
-	use doc && dodoc *pdf *html
-	if use examples; then
-		docinto /usr/share/doc/${PF}/examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-libs/arpack/Manifest b/sci-libs/arpack/Manifest
index 78188d3b5d33..94121d526f10 100644
--- a/sci-libs/arpack/Manifest
+++ b/sci-libs/arpack/Manifest
@@ -1,3 +1,3 @@
-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
diff --git a/sci-libs/arpack/arpack-3.7.0.ebuild b/sci-libs/arpack/arpack-3.8.0.ebuild
index e744d29d10a0..cea9accdebc2 100644
--- a/sci-libs/arpack/arpack-3.7.0.ebuild
+++ b/sci-libs/arpack/arpack-3.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools flag-o-matic fortran-2 toolchain-funcs
+inherit autotools fortran-2 toolchain-funcs
 
 DESCRIPTION="Arnoldi package library to solve large scale eigenvalue problems"
 HOMEPAGE="https://www.caam.rice.edu/software/ARPACK/ https://github.com/opencollab/arpack-ng"
@@ -33,10 +33,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# Fix should land in 3.8.0
-	test-flag-FC -fallow-argument-mismatch &&
-		append-fflags -fallow-argument-mismatch
-
 	econf \
 		--disable-static \
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
diff --git a/sci-libs/arpack/arpack-9999.ebuild b/sci-libs/arpack/arpack-9999.ebuild
index 11b44e345e33..f55221ca910e 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/arprec/Manifest b/sci-libs/arprec/Manifest
index f3d410c98815..0a2b22bfcab1 100644
--- a/sci-libs/arprec/Manifest
+++ b/sci-libs/arprec/Manifest
@@ -1,2 +1 @@
-DIST arprec-2.2.18.tar.gz 1751743 BLAKE2B de9a9a37bbe03357ad17d9d10d8bb42f73b9c9464643a35d4d1e209d049c205f967266dcae1af8972fc8c029f03053b298a4c85fdc48fb3f66d152aca8623a25 SHA512 372eb0a0c3aceac0d222679058f47c4d1037b5a51524b752b87f1b61c1b25101c34d4e56d9da45b4075ea7040dd59a597e0add4f34be902955dcf209423a6579
 DIST arprec-2.2.19.tar.gz 1962133 BLAKE2B a2fccc1908e791fd4759e61ff52b180fcaccbfbfa831ee1beca9b22a1a745d17d21040974ffe02ea21397a2339c819a30cd93a247738564a2b433f7cef14c9e4 SHA512 97cf090398aa169e31711077efd26dc6da1f62291ab37b241b133634838bdd44743f85b86b861a3be18d2696ae9132afb6cd1871502bedb9cc17dfb63fde2632
diff --git a/sci-libs/arprec/arprec-2.2.18.ebuild b/sci-libs/arprec/arprec-2.2.18.ebuild
deleted file mode 100644
index 8c4069fcd8da..000000000000
--- a/sci-libs/arprec/arprec-2.2.18.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit autotools fortran-2
-
-DESCRIPTION="Arbitrary precision float arithmetics and functions"
-HOMEPAGE="https://crd-legacy.lbl.gov/~dhbailey/mpdist/"
-SRC_URI="https://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran qd static-libs"
-
-DEPEND="qd? ( sci-libs/qd[fortran=] )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.18-fix-c++14.patch
-	"${FILESDIR}"/${P}-gold.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4) fma) \
-		$(use_enable fortran) \
-		$(use_enable qd)
-}
-
-src_compile() {
-	default
-
-	if use fortran; then
-		emake toolkit
-		cd toolkit || die
-		./mathinit || die "mathinit failed"
-	fi
-}
-
-src_install() {
-	default
-
-	if use fortran; then
-		cd toolkit || die
-
-		exeinto /usr/libexec/${PN}
-		doexe mathtool
-
-		insinto /usr/libexec/${PN}
-		doins *.dat
-
-		cat > mathtool.exe <<- _EOF_ || die
-			#!/usr/bin/env sh
-			cd "${EPREFIX}/usr/libexec/${PN}" && exec ./mathtool
-		_EOF_
-
-		newbin mathtool.exe mathtool
-		newdoc README README.mathtool
-	fi
-
-	if ! use doc; then
-		rm "${ED%/}"/usr/share/doc/${PF}/*.pdf || die
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/sci-libs/arprec/files/arprec-2.2.18-fix-c++14.patch b/sci-libs/arprec/files/arprec-2.2.18-fix-c++14.patch
deleted file mode 100644
index 680e921d6807..000000000000
--- a/sci-libs/arprec/files/arprec-2.2.18-fix-c++14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix compiling with C++14, due to changed operator T* -> operator bool semantics.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=593872
-
---- a/src/write.cpp
-+++ b/src/write.cpp
-@@ -196,6 +196,6 @@
- 
-   string str = to_string(precision, width, expn_width, 
-       fmt, showpos, uppercase, fill);
--  return (s << str) != 0;
-+  return static_cast<bool>(s << str);
- }
- 
diff --git a/sci-libs/arprec/files/arprec-2.2.18-gold.patch b/sci-libs/arprec/files/arprec-2.2.18-gold.patch
deleted file mode 100644
index 293b495f10a7..000000000000
--- a/sci-libs/arprec/files/arprec-2.2.18-gold.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- fortran/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/fortran/Makefile.am b/fortran/Makefile.am
-index 8eb4d19..91a125c 100644
---- a/fortran/Makefile.am
-+++ b/fortran/Makefile.am
-@@ -4,6 +4,7 @@ LDADD = libarprec_f_main.la libarprecmod.la $(top_builddir)/src/libarprec.la $(F
- 
- lib_LTLIBRARIES = libarprecmod.la libarprec_f_main.la
- libarprecmod_la_SOURCES = f_mp.cpp mp_mod.f mp_modm.f mp_modx.f
-+libarprecmod_la_LIBADD = $(top_builddir)/src/libarprec.la $(FCLIBS)
- libarprec_f_main_la_SOURCES = main.cpp
- 
- if UPCASE_MODULE
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index e7bc6b930bca..9de9f0dac5a1 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,4 +1,2 @@
-DIST avogadrolibs-1.91.0_pre20180415.tar.gz 2541101 BLAKE2B 526d2135af123d31220c8dd87351a35464e3dfd6b8d411d6dc9a6b3e74693090adfa3b61198a6a296eac99e6bbd67623f7aeda6a1752a09e3e3bcaa3df4d5008 SHA512 1cc646368f70523fcf20c6cf598025234162e0c81da64a3b5375c1691a6743f2aceb1f13230937bf9da045e725a23c1c89c8121e07b31ef9e2c7987b1feafccc
 DIST avogadrolibs-1.93.0.tar.gz 2735862 BLAKE2B b5d696f23aeeab27358ee390a30b2cf146e7119185a0d2e8d71b34d2744e534cd8b50b36d12928b5aa723118db470272b6428514593d64770d172c4bde730cf6 SHA512 1af220e5614cbd96656679c2879cb7f7c46acd135b4e6f2e5f8d0ba98601ce004e78f019a0a71c643f005451309bd194eb73eb9f66707685e5855b47e95f7eae
-DIST linux64-genXrdPattern 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
 DIST linux64-genXrdPattern-avogadrolibs-1.93.0 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
deleted file mode 100644
index f27d9ea8207e..000000000000
--- a/sci-libs/avogadrolibs/avogadrolibs-1.91.0_pre20180415.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=606debb5d7c2c4020478264c609f895584fc5e38
-inherit cmake-utils
-
-DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
-HOMEPAGE="https://www.openchemistry.org/"
-SRC_URI="https://github.com/OpenChemistry/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
-	vtk? ( https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern )"
-
-SLOT="0"
-LICENSE="BSD GPL-2+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="archive doc hdf5 qt5 static-plugins test vtk"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="vtk? ( qt5 )"
-
-# TODO: Not yet packaged:
-# sci-libs/libmsym (https://github.com/mcodev31/libmsym)
-# sci-libs/spglib (https://atztogo.github.io/spglib/)
-RDEPEND="
-	dev-libs/jsoncpp:=
-	>=sci-chemistry/molequeue-0.7
-	archive? ( app-arch/libarchive )
-	hdf5? ( sci-libs/hdf5:= )
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		media-libs/glew:0=
-		virtual/opengl
-	)
-	vtk? ( sci-libs/vtk[qt5,views] )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	qt5? ( dev-qt/linguist-tools:5 )
-	test? ( dev-cpp/gtest )"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.2-6464.patch
-	"${FILESDIR}/"${PN}-1.91.0_pre20180406-underlinking.patch
-	"${FILESDIR}/"${PN}-1.91.0_pre20180406-unbundle-jsoncpp.patch
-	"${FILESDIR}/"${PN}-1.91.0_pre20180406-bundled-genxrdpattern.patch
-	"${FILESDIR}/"${P}-qt-5.11b3.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use vtk; then
-		cp "${DISTDIR}"/linux64-genXrdPattern "${WORKDIR}/genXrdPattern" || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_PROTOCALL=OFF
-		-DBUILD_GPL_PLUGINS=ON
-		-DUSE_MOLEQUEUE=ON
-		-DUSE_LIBMSYM=OFF
-		-DUSE_LIBSPG=OFF
-		-DUSE_PYTHON=OFF
-		-DUSE_LIBARCHIVE=$(usex archive)
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DUSE_HDF5=$(usex hdf5)
-		-DENABLE_TRANSLATIONS=$(usex qt5)
-		-DUSE_OPENGL=$(usex qt5)
-		-DUSE_QT=$(usex qt5)
-		-DBUILD_STATIC_PLUGINS=$(usex static-plugins)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_VTK=$(usex vtk)
-	)
-	use vtk && mycmakeargs+=(
-		-DBUNDLED_GENXRDPATTERN="${WORKDIR}/genXrdPattern"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-0.7.2-6464.patch b/sci-libs/avogadrolibs/files/avogadrolibs-0.7.2-6464.patch
deleted file mode 100644
index f763c242cc48..000000000000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-0.7.2-6464.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- cmake/AvogadroLibsConfig.cmake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/AvogadroLibsConfig.cmake.in b/cmake/AvogadroLibsConfig.cmake.in
-index ad57195..8a63400 100644
---- a/cmake/AvogadroLibsConfig.cmake.in
-+++ b/cmake/AvogadroLibsConfig.cmake.in
-@@ -10,7 +10,7 @@ set(AvogadroLibs_VERSION         "${AvogadroLibs_VERSION_MAJOR}.${AvogadroLibs_V
- 
- set(AvogadroLibs_INSTALL_PREFIX  "@CMAKE_INSTALL_PREFIX@")
- set(AvogadroLibs_INCLUDE_DIRS    "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_INCLUDE_DIR@")
--set(AvogadroLibs_LIBRARY_DIR     "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@@LIB_SUFFIX@")
-+set(AvogadroLibs_LIBRARY_DIR     "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@")
- set(AvogadroLibs_RUNTIME_DIR     "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_RUNTIME_DIR@")
- set(AvogadroLibs_CMAKE_DIR       "${AvogadroLibs_LIBRARY_DIR}/cmake/avogadrolibs")
- 
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-unbundle-jsoncpp.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-unbundle-jsoncpp.patch
deleted file mode 100644
index 3b5280cdc47e..000000000000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-unbundle-jsoncpp.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 7e01a11dde25af75b21090fdaa2ca574ef703e53 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 8 Apr 2018 01:48:27 +0200
-Subject: [PATCH 1/2] Drop bogus jsoncpp.cpp include from spectra.cpp
-
----
- avogadro/qtplugins/spectra/spectra.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/avogadro/qtplugins/spectra/spectra.cpp b/avogadro/qtplugins/spectra/spectra.cpp
-index 043b52e..aa9c641 100644
---- a/avogadro/qtplugins/spectra/spectra.cpp
-+++ b/avogadro/qtplugins/spectra/spectra.cpp
-@@ -26,8 +26,6 @@
- #include <QtWidgets/QFileDialog>
- #include <avogadro/qtgui/molecule.h>
- 
--#include <jsoncpp.cpp>
--
- namespace Avogadro {
- namespace QtPlugins {
- 
--- 
-2.17.0
-
-
-From 52cd35662aa2094db77ab4002b7c44f3dab2802d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 8 Apr 2018 02:00:30 +0200
-Subject: [PATCH 2/2] Use pkgconfig to find system-jsoncpp
-
----
- CMakeLists.txt                                     | 5 ++++-
- avogadro/io/CMakeLists.txt                         | 4 ++--
- avogadro/qtplugins/importpqr/CMakeLists.txt        | 4 ++--
- avogadro/qtplugins/plugindownloader/CMakeLists.txt | 4 ++--
- avogadro/qtplugins/spectra/CMakeLists.txt          | 2 +-
- avogadro/quantumio/CMakeLists.txt                  | 4 ++--
- 6 files changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7574fa0..7ce80b0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,8 +52,11 @@ option(USE_PROTOCALL "Enable libraries that use ProtoCall" OFF)
- option(USE_MOLEQUEUE "Enable the MoleQueue dependent functionality" ON)
- option(USE_PYTHON "Use Python to wrap some of our API" OFF)
- 
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(JSONCPP jsoncpp)
-+
- add_subdirectory(utilities)
--add_subdirectory(thirdparty)
-+# add_subdirectory(thirdparty)
- add_subdirectory(avogadro)
- 
- if(ENABLE_TESTING)
-diff --git a/avogadro/io/CMakeLists.txt b/avogadro/io/CMakeLists.txt
-index 1dd7967..10ddbb6 100644
---- a/avogadro/io/CMakeLists.txt
-+++ b/avogadro/io/CMakeLists.txt
-@@ -15,7 +15,7 @@ endif()
- # compilers that support that notion.
- include_directories(SYSTEM "${EIGEN3_INCLUDE_DIR}"
-   "${AvogadroLibs_SOURCE_DIR}/thirdparty/pugixml"
--  "${AvogadroLibs_SOURCE_DIR}/thirdparty/jsoncpp")
-+  "${JSONCPP_INCLUDE_DIRS}")
- 
- if(DEFINED AvogadroLibs_MEMORY_INCLUDE_DIRS)
-   # The smart pointer classes just require headers.
-@@ -51,7 +51,7 @@ endif()
- 
- avogadro_add_library(AvogadroIO ${HEADERS} ${SOURCES})
- 
--target_link_libraries(AvogadroIO LINK_PUBLIC AvogadroCore LINK_PRIVATE jsoncpp)
-+target_link_libraries(AvogadroIO LINK_PUBLIC AvogadroCore LINK_PRIVATE ${JSONCPP_LIBRARIES})
- if(USE_HDF5)
-   target_link_libraries(AvogadroIO LINK_PRIVATE ${HDF5_LIBRARIES})
- endif()
-diff --git a/avogadro/qtplugins/importpqr/CMakeLists.txt b/avogadro/qtplugins/importpqr/CMakeLists.txt
-index ee27da9..365c51a 100644
---- a/avogadro/qtplugins/importpqr/CMakeLists.txt
-+++ b/avogadro/qtplugins/importpqr/CMakeLists.txt
-@@ -1,4 +1,4 @@
--include_directories(SYSTEM "${AvogadroLibs_SOURCE_DIR}/thirdparty/jsoncpp")
-+include_directories(SYSTEM ${JSONCPP_INCLUDE_DIRS})
- 
- # Extension
- set(importpqr_srcs
-@@ -17,4 +17,4 @@ avogadro_plugin(ImportPQR
-   ""
- )
- 
--target_link_libraries(ImportPQR LINK_PRIVATE ${Qt5Network_LIBRARIES} jsoncpp)
-+target_link_libraries(ImportPQR LINK_PRIVATE ${Qt5Network_LIBRARIES} ${JSONCPP_LIBRARIES})
-diff --git a/avogadro/qtplugins/plugindownloader/CMakeLists.txt b/avogadro/qtplugins/plugindownloader/CMakeLists.txt
-index 4b07a53..ab4c661 100644
---- a/avogadro/qtplugins/plugindownloader/CMakeLists.txt
-+++ b/avogadro/qtplugins/plugindownloader/CMakeLists.txt
-@@ -1,4 +1,4 @@
--include_directories(SYSTEM "${AvogadroLibs_SOURCE_DIR}/thirdparty/jsoncpp")
-+include_directories(SYSTEM ${JSONCPP_INCLUDE_DIRS})
- 
- find_package(LibArchive REQUIRED)
- include_directories(SYSTEM ${LIBARCHIVE_INCLUDE_DIRS})
-@@ -20,4 +20,4 @@ avogadro_plugin(PluginDownloader
- )
- 
- target_link_libraries(PluginDownloader LINK_PRIVATE ${Qt5Network_LIBRARIES}
--  ${LIBARCHIVE_LIBRARIES} jsoncpp)
-+  ${LIBARCHIVE_LIBRARIES} ${JSONCPP_LIBRARIES})
-diff --git a/avogadro/qtplugins/spectra/CMakeLists.txt b/avogadro/qtplugins/spectra/CMakeLists.txt
-index a2216b8..09d8fc9 100644
---- a/avogadro/qtplugins/spectra/CMakeLists.txt
-+++ b/avogadro/qtplugins/spectra/CMakeLists.txt
-@@ -1,4 +1,4 @@
--include_directories(SYSTEM "${AvogadroLibs_SOURCE_DIR}/thirdparty/jsoncpp")
-+include_directories(SYSTEM ${JSONCPP_INCLUDE_DIRS})
- 
- set(plugin_srcs
-   vibrationdialog.cpp
-diff --git a/avogadro/quantumio/CMakeLists.txt b/avogadro/quantumio/CMakeLists.txt
-index 15073e8..35fc766 100644
---- a/avogadro/quantumio/CMakeLists.txt
-+++ b/avogadro/quantumio/CMakeLists.txt
-@@ -2,7 +2,7 @@ find_package(Eigen3 REQUIRED)
- # Add as "system headers" to avoid warnings generated by them with
- # compilers that support that notion.
- include_directories(SYSTEM "${EIGEN3_INCLUDE_DIR}"
--  "${AvogadroLibs_SOURCE_DIR}/thirdparty/jsoncpp")
-+  ${JSONCPP_INCLUDE_DIRS})
- 
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
-@@ -30,4 +30,4 @@ set(SOURCES
- )
- 
- avogadro_add_library(AvogadroQuantumIO ${HEADERS} ${SOURCES})
--target_link_libraries(AvogadroQuantumIO LINK_PUBLIC AvogadroIO LINK_PRIVATE jsoncpp)
-+target_link_libraries(AvogadroQuantumIO LINK_PUBLIC AvogadroIO LINK_PRIVATE ${JSONCPP_LIBRARIES})
--- 
-2.17.0
-
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-underlinking.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-underlinking.patch
deleted file mode 100644
index f6f39c9e6b7b..000000000000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180406-underlinking.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix underlinking problems in shared libraries.
-
---- a/avogadro/qtplugins/playertool/CMakeLists.txt
-+++ b/avogadro/qtplugins/playertool/CMakeLists.txt
-@@ -7,3 +7,5 @@
-   ""
-   playertool.qrc
- )
-+
-+target_link_libraries(PlayerTool LINK_PRIVATE Qt5OpenGL)
---- a/avogadro/qtplugins/qtaim/CMakeLists.txt
-+++ b/avogadro/qtplugins/qtaim/CMakeLists.txt
-@@ -34,3 +34,5 @@
- 
- target_link_libraries(QTAIMScenePlugin
-   LINK_PRIVATE AvogadroRendering ${Qt5Concurrent_LIBRARIES})
-+target_link_libraries(QTAIMExtension
-+  LINK_PRIVATE ${Qt5Concurrent_LIBRARIES})
diff --git a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch b/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch
deleted file mode 100644
index 11816e438c28..000000000000
--- a/sci-libs/avogadrolibs/files/avogadrolibs-1.91.0_pre20180415-qt-5.11b3.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 03dd55beb878b5e15d891535a3c8b7ffa6133c92 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 17 Apr 2018 11:31:22 +0200
-Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
-
----
- avogadro/molequeue/CMakeLists.txt | 3 +--
- avogadro/qtgui/CMakeLists.txt     | 3 +--
- avogadro/qtopengl/CMakeLists.txt  | 3 +--
- avogadro/vtk/CMakeLists.txt       | 3 +--
- tests/qtgui/CMakeLists.txt        | 3 +--
- tests/qtopengl/CMakeLists.txt     | 2 --
- 6 files changed, 5 insertions(+), 12 deletions(-)
-
-diff --git a/avogadro/molequeue/CMakeLists.txt b/avogadro/molequeue/CMakeLists.txt
-index 43a9195..37431cd 100644
---- a/avogadro/molequeue/CMakeLists.txt
-+++ b/avogadro/molequeue/CMakeLists.txt
-@@ -41,6 +41,5 @@ qt5_wrap_ui(UI_SOURCES ${UIS})
- list(APPEND SOURCES ${UI_SOURCES})
- 
- avogadro_add_library(AvogadroMoleQueue ${HEADERS} ${SOURCES})
--qt5_use_modules(AvogadroMoleQueue Widgets Network)
- set_target_properties(AvogadroMoleQueue PROPERTIES AUTOMOC TRUE)
--target_link_libraries(AvogadroMoleQueue AvogadroQtGui MoleQueueClient)
-+target_link_libraries(AvogadroMoleQueue AvogadroQtGui MoleQueueClient Qt5::Widgets Qt5::Network)
-diff --git a/avogadro/qtgui/CMakeLists.txt b/avogadro/qtgui/CMakeLists.txt
-index e6cf8d3..3365261 100644
---- a/avogadro/qtgui/CMakeLists.txt
-+++ b/avogadro/qtgui/CMakeLists.txt
-@@ -99,5 +99,4 @@ qt5_add_resources(RC_SOURCES ${RCS})
- list(APPEND SOURCES ${RC_SOURCES})
- 
- avogadro_add_library(AvogadroQtGui ${HEADERS} ${SOURCES})
--qt5_use_modules(AvogadroQtGui Widgets)
--target_link_libraries(AvogadroQtGui AvogadroIO)
-+target_link_libraries(AvogadroQtGui AvogadroIO Qt5::Widgets)
-diff --git a/avogadro/qtopengl/CMakeLists.txt b/avogadro/qtopengl/CMakeLists.txt
-index 354638c..28a473e 100644
---- a/avogadro/qtopengl/CMakeLists.txt
-+++ b/avogadro/qtopengl/CMakeLists.txt
-@@ -16,5 +16,4 @@ set(SOURCES
- )
- 
- avogadro_add_library(AvogadroQtOpenGL ${HEADERS} ${SOURCES})
--qt5_use_modules(AvogadroQtOpenGL Widgets)
--target_link_libraries(AvogadroQtOpenGL AvogadroRendering AvogadroQtGui)
-+target_link_libraries(AvogadroQtOpenGL AvogadroRendering AvogadroQtGui Qt5::Widgets)
-diff --git a/avogadro/vtk/CMakeLists.txt b/avogadro/vtk/CMakeLists.txt
-index abac5a1..498529c 100644
---- a/avogadro/vtk/CMakeLists.txt
-+++ b/avogadro/vtk/CMakeLists.txt
-@@ -30,8 +30,7 @@ set(SOURCES
- )
- 
- avogadro_add_library(AvogadroVtk ${HEADERS} ${SOURCES})
--qt5_use_modules(AvogadroVtk Widgets)
- set_target_properties(AvogadroVtk PROPERTIES AUTOMOC TRUE)
- target_link_libraries(AvogadroVtk AvogadroRendering AvogadroQtGui
-   vtkRenderingOpenGL2 vtkGUISupportQt vtkRenderingVolumeOpenGL2
--  vtkRenderingFreeType vtkInteractionStyle)
-+  vtkRenderingFreeType vtkInteractionStyle Qt5::Widgets)
-diff --git a/tests/qtgui/CMakeLists.txt b/tests/qtgui/CMakeLists.txt
-index 1cfd51a..da08078 100644
---- a/tests/qtgui/CMakeLists.txt
-+++ b/tests/qtgui/CMakeLists.txt
-@@ -49,9 +49,8 @@ endforeach()
- 
- # Add a single executable for all of our tests.
- add_executable(AvogadroQtGuiTests ${testSrcs})
--qt5_use_modules(AvogadroQtGuiTests Widgets Test)
- target_link_libraries(AvogadroQtGuiTests AvogadroQtGui AvogadroMoleQueue
--  MoleQueueClient ${GTEST_BOTH_LIBRARIES} ${EXTRA_LINK_LIB})
-+  MoleQueueClient ${GTEST_BOTH_LIBRARIES} ${EXTRA_LINK_LIB} Qt5::Widgets Qt5::Test)
- 
- # Now add all of the tests, using the gtest_filter argument so that only those
- # cases are run in each test invocation.
-diff --git a/tests/qtopengl/CMakeLists.txt b/tests/qtopengl/CMakeLists.txt
-index 370f28f..60fc5ae 100644
---- a/tests/qtopengl/CMakeLists.txt
-+++ b/tests/qtopengl/CMakeLists.txt
-@@ -44,8 +44,6 @@ create_test_sourcelist(testDriver qtopengltests.cpp ${testSrcs})
- 
- add_executable(AvogadroQtOpenGLTests ${testDriver})
- 
--qt5_use_modules(AvogadroQtOpenGLTests OpenGL)
--
- target_link_libraries(AvogadroQtOpenGLTests
-   AvogadroQtOpenGL
-   vtkImagingCore
--- 
-2.17.0
-
diff --git a/sci-libs/avogadrolibs/metadata.xml b/sci-libs/avogadrolibs/metadata.xml
index e71a4963a682..eb2105247cd8 100644
--- a/sci-libs/avogadrolibs/metadata.xml
+++ b/sci-libs/avogadrolibs/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="archive">Enable archive support using <pkg>app-arch/libarchive</pkg></flag>
-		<flag name="static-plugins">Build all plugins statically into main plugin modules</flag>
 		<flag name="vtk">Enable <pkg>sci-libs/vtk</pkg> support</flag>
 	</use>
 	<upstream>
diff --git a/sci-libs/blis/Manifest b/sci-libs/blis/Manifest
index a251246c916c..470da790704a 100644
--- a/sci-libs/blis/Manifest
+++ b/sci-libs/blis/Manifest
@@ -1,2 +1 @@
-DIST blis-0.5.2.tar.gz 3502383 BLAKE2B b09fda20711086c8bde0d4efc3f3c9b0f6072e1ddb8bd2846465877f0353cced27548abe1239b6a042fe655e85e4b7b3c960322e39b2c733866b8e17777718bd SHA512 4f91a7834ef0ed39544dd21856814467416a222240050cca323917b0fc61b9201ae4dbd109aa687cdecb27ddee5d6bf4510ef023e1c1dc73599faef0482d3d04
 DIST blis-0.6.0.tar.gz 5107257 BLAKE2B cd589ad1216486e8bb0cf574cc096c1e1f2bb9587b182c2bcff44db322468d9f027323c0bf2d22ea0fabb1902dc047d2bf62253ef1c2797fc3de9ba53d7fc34a SHA512 74e9da5146f7986cbd11651d7cd0837562a1603c667b9e6d3f79b5057443de657b60d7463cb2d64daf3eff7d33fc05a64e6d8eb807f4cabe0c3121517924a206
diff --git a/sci-libs/blis/blis-0.5.2.ebuild b/sci-libs/blis/blis-0.5.2.ebuild
deleted file mode 100644
index f1d7e6409bdf..000000000000
--- a/sci-libs/blis/blis-0.5.2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit python-any-r1
-
-DESCRIPTION="BLAS-like Library Instantiation Software Framework"
-HOMEPAGE="https://github.com/flame/blis"
-SRC_URI="https://github.com/flame/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="openmp pthread serial static-libs eselect-ldso doc 64bit-index"
-REQUIRED_USE="?? ( openmp pthread serial ) ?? ( eselect-ldso 64bit-index )"
-
-RDEPEND="eselect-ldso? ( !app-eselect/eselect-cblas
-                         >=app-eselect/eselect-blas-0.2 )"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-rpath.patch"
-	"${FILESDIR}/${P}-blas-provider.patch"
-	"${FILESDIR}/${P}-gh313.patch"
-)
-
-src_configure() {
-	local BLIS_FLAGS=()
-	local confname
-	# determine flags
-	if use openmp; then
-		BLIS_FLAGS+=( -t openmp )
-	elif use pthread; then
-		BLIS_FLAGS+=( -t pthreads )
-	else
-		BLIS_FLAGS+=( -t no )
-	fi
-	use 64bit-index && BLIS_FLAGS+=( -b 64 -i 64 )
-	# determine config name
-	case "${ARCH}" in
-		"x86" | "amd64")
-			confname=auto ;;
-		"ppc64")
-			confname=generic ;;
-		*)
-			confname=generic ;;
-	esac
-	# This is not an autotools configure file. We don't use econf here.
-	./configure \
-		--enable-verbose-make \
-		--prefix="${BROOT}"/usr \
-		--libdir="${BROOT}"/usr/$(get_libdir) \
-		$(use_enable static-libs static) \
-		--enable-blas \
-		--enable-cblas \
-		"${BLIS_FLAGS[@]}" \
-		--enable-shared \
-		$confname || die
-}
-
-src_compile() {
-	DEB_LIBBLAS=libblas.so.3 DEB_LIBCBLAS=libcblas.so.3 \
-		LDS_BLAS="${FILESDIR}"/blas.lds LDS_CBLAS="${FILESDIR}"/cblas.lds \
-		default
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-	use doc && dodoc README.md docs/*.md
-
-	if use eselect-ldso; then
-		dodir /usr/$(get_libdir)/blas/blis
-		insinto /usr/$(get_libdir)/blas/blis
-		doins lib/*/lib{c,}blas.so.3
-		dosym libblas.so.3 usr/$(get_libdir)/blas/blis/libblas.so
-		dosym libcblas.so.3 usr/$(get_libdir)/blas/blis/libcblas.so
-	fi
-}
-
-pkg_postinst() {
-	use eselect-ldso || return
-
-	local libdir=$(get_libdir) me="blis"
-
-	# 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
-}
-
-pkg_postrm() {
-	use eselect-ldso && eselect blas validate
-}
diff --git a/sci-libs/blis/files/blis-0.5.2-blas-provider.patch b/sci-libs/blis/files/blis-0.5.2-blas-provider.patch
deleted file mode 100644
index 5999f847929c..000000000000
--- a/sci-libs/blis/files/blis-0.5.2-blas-provider.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 2d31fee..7008682 100644
---- a/Makefile
-+++ b/Makefile
-@@ -659,6 +659,8 @@ else
- 	@$(LINKER) $(SOFLAGS) -o $(LIBBLIS_SO_OUTPUT_NAME) $? $(LDFLAGS)
- endif
- endif
-+	$(LINKER) $(SOFLAGS) -o $(BASE_LIB_PATH)/$(DEB_LIBBLAS) $? $(LDFLAGS) -Wl,--soname,$(DEB_LIBBLAS) -Wl,--version-script=$(LDS_BLAS)
-+	$(LINKER) $(SOFLAGS) -o $(BASE_LIB_PATH)/$(DEB_LIBCBLAS) $? $(LDFLAGS) -Wl,--soname,$(DEB_LIBCBLAS) -Wl,--version-script=$(LDS_CBLAS)
- 
- # Local symlink for shared library.
- # NOTE: We use a '.loc' suffix to avoid filename collisions in case this
diff --git a/sci-libs/blis/files/blis-0.5.2-gh313.patch b/sci-libs/blis/files/blis-0.5.2-gh313.patch
deleted file mode 100644
index fab3a8a09ee3..000000000000
--- a/sci-libs/blis/files/blis-0.5.2-gh313.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff --git a/common.mk b/common.mk
-index 5513098a5..999df774b 100644
---- a/common.mk
-+++ b/common.mk
-@@ -118,7 +118,8 @@ get-noopt-cxxflags-for   = $(strip $(CFLAGS_PRESET) \
- get-refinit-cflags-for   = $(strip $(call load-var-for,COPTFLAGS,$(1)) \
-                                    $(call get-noopt-cflags-for,$(1)) \
-                                    -DBLIS_CNAME=$(1) \
--                                   $(BUILD_FLAGS) \
-+                                   $(BUILD_CPPFLAGS) \
-+                                   $(BUILD_SYMFLAGS) \
-                             )
- 
- get-refkern-cflags-for   = $(strip $(call load-var-for,CROPTFLAGS,$(1)) \
-@@ -126,23 +127,27 @@ get-refkern-cflags-for   = $(strip $(call load-var-for,CROPTFLAGS,$(1)) \
-                                    $(call get-noopt-cflags-for,$(1)) \
-                                    $(COMPSIMDFLAGS) \
-                                    -DBLIS_CNAME=$(1) \
--                                   $(BUILD_FLAGS) \
-+                                   $(BUILD_CPPFLAGS) \
-+                                   $(BUILD_SYMFLAGS) \
-                             )
- 
- get-config-cflags-for    = $(strip $(call load-var-for,COPTFLAGS,$(1)) \
-                                    $(call get-noopt-cflags-for,$(1)) \
--                                   $(BUILD_FLAGS) \
-+                                   $(BUILD_CPPFLAGS) \
-+                                   $(BUILD_SYMFLAGS) \
-                             )
- 
- get-frame-cflags-for     = $(strip $(call load-var-for,COPTFLAGS,$(1)) \
-                                    $(call get-noopt-cflags-for,$(1)) \
--                                   $(BUILD_FLAGS) \
-+                                   $(BUILD_CPPFLAGS) \
-+                                   $(BUILD_SYMFLAGS) \
-                             )
- 
- get-kernel-cflags-for    = $(strip $(call load-var-for,CKOPTFLAGS,$(1)) \
-                                    $(call load-var-for,CKVECFLAGS,$(1)) \
-                                    $(call get-noopt-cflags-for,$(1)) \
--                                   $(BUILD_FLAGS) \
-+                                   $(BUILD_CPPFLAGS) \
-+                                   $(BUILD_SYMFLAGS) \
-                             )
- 
- # When compiling sandboxes, we use flags similar to those of general framework
-@@ -153,19 +158,24 @@ get-kernel-cflags-for    = $(strip $(call load-var-for,CKOPTFLAGS,$(1)) \
- get-sandbox-c99flags-for = $(strip $(call load-var-for,COPTFLAGS,$(1)) \
-                                    $(call get-noopt-cflags-for,$(1)) \
-                                    $(CSBOXINCFLAGS) \
--                                   $(BUILD_FLAGS) \
-+                                   $(BUILD_CPPFLAGS) \
-+                                   $(BUILD_SYMFLAGS) \
-                             )
- get-sandbox-cxxflags-for = $(strip $(call load-var-for,COPTFLAGS,$(1)) \
-                                    $(call get-noopt-cxxflags-for,$(1)) \
-                                    $(CSBOXINCFLAGS) \
--                                   $(BUILD_FLAGS) \
-+                                   $(BUILD_CPPFLAGS) \
-+                                   $(BUILD_SYMFLAGS) \
-                             )
- 
- # Define a separate function that will return appropriate flags for use by
- # applications that want to use the same basic flags as those used when BLIS
--# was compiled. (This is the same as get-frame-cflags-for(), except that it
--# omits the BUILD_FLAGS, which are exclusively for use when BLIS is being
--# compiled.)
-+# was compiled. (NOTE: This is the same as the $(get-frame-cflags-for ...)
-+# function, except that it omits two variables that contain flags exclusively
-+# for use when BLIS is being compiled/built: BUILD_CPPFLAGS, which contains a
-+# cpp macro that confirms that BLIS is being built; and BUILD_SYMFLAGS, which
-+# contains symbol export flags that are only needed when a shared library is
-+# being compiled/linked.)
- get-user-cflags-for      = $(strip $(call load-var-for,COPTFLAGS,$(1)) \
-                                    $(call get-noopt-cflags-for,$(1)) \
-                             )
-@@ -627,22 +637,26 @@ $(foreach c, $(CONFIG_LIST_FAM), $(eval $(call append-var-for,CPICFLAGS,$(c))))
- 
- # --- Symbol exporting flags (shared libraries only) ---
- 
-+# NOTE: These flags are only applied when building BLIS and not used by
-+# applications that import BLIS compilation flags via the
-+# $(get-user-cflags-for ...) function.
-+
- # Determine default export behavior / visibility of symbols for gcc.
- ifeq ($(CC_VENDOR),gcc)
- ifeq ($(IS_WIN),yes)
- ifeq ($(EXPORT_SHARED),all)
--CMISCFLAGS := -Wl,--export-all-symbols, -Wl,--enable-auto-import
-+BUILD_SYMFLAGS := -Wl,--export-all-symbols, -Wl,--enable-auto-import
- else # ifeq ($(EXPORT_SHARED),public)
--CMISCFLAGS := -Wl,--exclude-all-symbols
-+BUILD_SYMFLAGS := -Wl,--exclude-all-symbols
- endif
- else # ifeq ($(IS_WIN),no)
- ifeq ($(EXPORT_SHARED),all)
- # Export all symbols by default.
--CMISCFLAGS := -fvisibility=default
-+BUILD_SYMFLAGS := -fvisibility=default
- else # ifeq ($(EXPORT_SHARED),public)
- # Hide all symbols by default and export only those that have been annotated
- # as needing to be exported.
--CMISCFLAGS := -fvisibility=hidden
-+BUILD_SYMFLAGS := -fvisibility=hidden
- endif
- endif
- endif
-@@ -653,11 +667,11 @@ endif
- ifeq ($(CC_VENDOR),icc)
- ifeq ($(EXPORT_SHARED),all)
- # Export all symbols by default.
--CMISCFLAGS := -fvisibility=default
-+BUILD_SYMFLAGS := -fvisibility=default
- else # ifeq ($(EXPORT_SHARED),public)
- # Hide all symbols by default and export only those that have been annotated
- # as needing to be exported.
--CMISCFLAGS := -fvisibility=hidden
-+BUILD_SYMFLAGS := -fvisibility=hidden
- endif
- endif
- 
-@@ -667,27 +681,25 @@ ifeq ($(IS_WIN),yes)
- ifeq ($(EXPORT_SHARED),all)
- # NOTE: clang on Windows does not appear to support exporting all symbols
- # by default, and therefore we ignore the value of EXPORT_SHARED.
--CMISCFLAGS :=
-+BUILD_SYMFLAGS :=
- else # ifeq ($(EXPORT_SHARED),public)
- # NOTE: The default behavior of clang on Windows is to hide all symbols
- # and only export functions and other declarations that have beenannotated
- # as needing to be exported.
--CMISCFLAGS :=
-+BUILD_SYMFLAGS :=
- endif
- else # ifeq ($(IS_WIN),no)
- ifeq ($(EXPORT_SHARED),all)
- # Export all symbols by default.
--CMISCFLAGS := -fvisibility=default
-+BUILD_SYMFLAGS := -fvisibility=default
- else # ifeq ($(EXPORT_SHARED),public)
- # Hide all symbols by default and export only those that have been annotated
- # as needing to be exported.
--CMISCFLAGS := -fvisibility=hidden
-+BUILD_SYMFLAGS := -fvisibility=hidden
- endif
- endif
- endif
- 
--$(foreach c, $(CONFIG_LIST_FAM), $(eval $(call append-var-for,CMISCFLAGS,$(c))))
--
- # --- Language flags ---
- 
- # Enable C99.
-@@ -1026,7 +1038,7 @@ VERS_DEF       := -DBLIS_VERSION_STRING=\"$(VERSION)\"
- # Define a C preprocessor flag that is *only* defined when BLIS is being
- # compiled. (In other words, an application that #includes blis.h will not
- # get this cpp macro.)
--BUILD_FLAGS    := -DBLIS_IS_BUILDING_LIBRARY
-+BUILD_CPPFLAGS := -DBLIS_IS_BUILDING_LIBRARY
- 
- 
- 
-diff --git a/configure b/configure
-index 5b5695cd5..bb21671f0 100755
---- a/configure
-+++ b/configure
-@@ -152,13 +152,13 @@ print_usage()
- 	echo "                 functions and variables that belong to public APIs are"
- 	echo "                 exported in shared libraries. However, the user may"
- 	echo "                 instead export all symbols in BLIS, even those that were"
--	echo "                 intended for internal use only. Note Note that the public"
--	echo "                 APIs encompass all functions that almost any user would"
--	echo "                 ever want to call, including the BLAS/CBLAS compatibility"
--	echo "                 APIs as well as the basic and expert interfaces to the"
--	echo "                 typed and object APIs that are unique to BLIS. Also note"
--	echo "                 that changing this option to 'all' will have no effect in"
--	echo "                 some environments, such as when compiling with clang on"
-+	echo "                 intended for internal use only. Note that the public APIs"
-+	echo "                 encompass all functions that almost any user would ever"
-+	echo "                 want to call, including the BLAS/CBLAS compatibility APIs"
-+	echo "                 as well as the basic and expert interfaces to the typed"
-+	echo "                 and object APIs that are unique to BLIS. Also note that"
-+	echo "                 changing this option to 'all' will have no effect in some"
-+	echo "                 environments, such as when compiling with clang on"
- 	echo "                 Windows."
- 	echo " "
- 	echo "   -t MODEL, --enable-threading[=MODEL], --disable-threading"
diff --git a/sci-libs/blis/files/blis-0.5.2-rpath.patch b/sci-libs/blis/files/blis-0.5.2-rpath.patch
deleted file mode 100644
index a8b5a46870d1..000000000000
--- a/sci-libs/blis/files/blis-0.5.2-rpath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/common.mk b/common.mk
-index ef0acfb..e1ce31d 100644
---- a/common.mk
-+++ b/common.mk
-@@ -527,7 +527,7 @@ LIBBLIS_L      := $(LIBBLIS_SO)
- LIBBLIS_LINK   := $(LIBBLIS_SO_PATH)
- ifeq ($(IS_WIN),no)
- # For Linux and OS X: set rpath property of shared object.
--LDFLAGS        += -Wl,-rpath,$(BASE_LIB_PATH)
-+#LDFLAGS        += -Wl,-rpath,$(BASE_LIB_PATH)
- endif
- endif
- endif
diff --git a/sci-libs/bmrblib/Manifest b/sci-libs/bmrblib/Manifest
index d8adcfe96818..972017e2dd4a 100644
--- a/sci-libs/bmrblib/Manifest
+++ b/sci-libs/bmrblib/Manifest
@@ -1,2 +1 @@
-DIST bmrblib-1.0.3.tar.bz2 51246 BLAKE2B e2adc970523b33c88b73451b1c3d50c218e4600e0e1019bb6fa4dbae1c6a6737bcd1661bf68b6863a1199c46f3df1b0ba36c155efe1010152e120ccc23b034ab SHA512 b03ad9e4ca035439165ebd1b7ba93ede427b2a233a4179be4e8089db988f1dcdce68b1e97348fe22fe7f2c3827ed003b654e0674a4d16a9e32a8a7c255c4b248
 DIST bmrblib-1.0.4.tar.bz2 51211 BLAKE2B 4d901c085648971af0e271d5524d4fe0f0e085f9ab34cde4cbc2d7b17d1dd37ffd4051c219e769738a9eac8b11b6950c5575d1bd9b9193ef48a698560de3fd96 SHA512 579f3beaf343416c58b344a33ee94d42bcedba558b33c2b9f98662d2ffc685887617229b5f7e75acf61712fe4f03827ca4413bc08e3bd2e72f69d952310891e0
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 44e8e987188a..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,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="API abstracting the BioMagResBank (BMRB) NMR-STAR format"
-HOMEPAGE="https://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/brial/brial-1.2.10.ebuild b/sci-libs/brial/brial-1.2.10.ebuild
index e1831c017fc6..8abd8547852e 100644
--- a/sci-libs/brial/brial-1.2.10.ebuild
+++ b/sci-libs/brial/brial-1.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BRiAl/BRiAl/releases/download/${PV}/${P}.tar.bz2"
 # The top-level license is GPL2+, but cudd/LICENSE is BSD.
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="png static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/brial/brial-1.2.8.ebuild b/sci-libs/brial/brial-1.2.8.ebuild
index 69b0340dc6fe..26e826d9b26f 100644
--- a/sci-libs/brial/brial-1.2.8.ebuild
+++ b/sci-libs/brial/brial-1.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BRiAl/BRiAl/releases/download/${PV}/${P}.tar.bz2"
 # The top-level license is GPL2, but cudd/LICENSE is BSD.
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="png static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/btf/btf-1.2.6.ebuild b/sci-libs/btf/btf-1.2.6.ebuild
index 2ba8aa986ce9..66bd6a7db7b8 100644
--- a/sci-libs/btf/btf-1.2.6.ebuild
+++ b/sci-libs/btf/btf-1.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/camd/camd-2.4.6-r1.ebuild b/sci-libs/camd/camd-2.4.6-r1.ebuild
new file mode 100644
index 000000000000..fb5a430ed408
--- /dev/null
+++ b/sci-libs/camd/camd-2.4.6-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
+HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
+SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( virtual/latex-base )"
+DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.4.6-dash_doc.patch )
+
+src_prepare(){
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_with doc)
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/camd/camd-2.4.6.ebuild b/sci-libs/camd/camd-2.4.6.ebuild
index b2702e44ebc6..78e606743466 100644
--- a/sci-libs/camd/camd-2.4.6.ebuild
+++ b/sci-libs/camd/camd-2.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/camd/files/camd-2.4.6-dash_doc.patch b/sci-libs/camd/files/camd-2.4.6-dash_doc.patch
new file mode 100644
index 000000000000..c70ed070f2a3
--- /dev/null
+++ b/sci-libs/camd/files/camd-2.4.6-dash_doc.patch
@@ -0,0 +1,16 @@
+diff --git a/Doc/Makefile.am b/Doc/Makefile.am
+index 80f5653..71c130a 100644
+--- a/Doc/Makefile.am
++++ b/Doc/Makefile.am
+@@ -1,9 +1,8 @@
+ 
+ CAMD_UserGuide.pdf:
+-	echo '\begin{verbatim}' > camd_h.tex
++	printf '\\begin{verbatim}\n' > camd_h.tex
+ 	expand -8 $(top_srcdir)/Include/camd.h >> camd_h.tex
+-	echo '\end{verbatim}' >> camd_h.tex
+-	-ln -s $(srcdir)/*.{tex,bib} .
++	printf '\\end{verbatim}\n' >> camd_h.tex
+ 	$(PDFLATEX) CAMD_UserGuide
+ 	$(BIBTEX)  CAMD_UserGuide
+ 	$(PDFLATEX) CAMD_UserGuide
diff --git a/sci-libs/cantera/cantera-2.4.0-r4.ebuild b/sci-libs/cantera/cantera-2.4.0-r4.ebuild
deleted file mode 100644
index 1b27bfee3fae..000000000000
--- a/sci-libs/cantera/cantera-2.4.0-r4.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
-HOMEPAGE="https://www.cantera.org"
-SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+cti fortran pch +python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( cti )
-	${PYTHON_REQUIRED_USE}
-	"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	<sci-libs/sundials-5.2.0:0=
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost
-	dev-libs/libfmt
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	test? (
-		>=dev-cpp/gtest-1.8.0
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}_${PV}_env.patch"
-	"${FILESDIR}/${PN}_${PV}_env_python_install.patch"
-	"${FILESDIR}/${PN}_${PV}_sundials4.patch"
-	)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-## Full list of configuration options of Cantera is presented here:
-## http://cantera.org/docs/sphinx/html/compiling/config-options.html
-
-src_configure() {
-	scons_vars=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		cc_flags="${CXXFLAGS}"
-		cxx_flags="-std=c++11"
-		debug="no"
-		FORTRAN="$(tc-getFC)"
-		FORTRANFLAGS="${CXXFLAGS}"
-		optimize_flags="-Wno-inline"
-		renamed_shared_libraries="no"
-		use_pch=$(usex pch)
-## In some cases other order can break the detection of right location of Boost: ##
-		system_fmt="y"
-		system_sundials="y"
-		system_eigen="y"
-		env_vars="all"
-		extra_inc_dirs="/usr/include/eigen3"
-	)
-	use test || scons_vars+=( googletest="none" )
-
-	scons_targets=(
-		f90_interface=$(usex fortran y n)
-		python2_package="none"
-	)
-
-	if use cti ; then
-		local scons_python=$(usex python full minimal)
-		scons_targets+=( python3_package="${scons_python}" python3_cmd="${EPYTHON}" )
-	else
-		scons_targets+=( python3_package="none" )
-	fi
-}
-
-src_compile() {
-	escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
-}
-
-src_test() {
-	escons test
-}
-
-src_install() {
-	escons install stage_dir="${D}" libdirname="$(get_libdir)"
-	if ! use cti ; then
-		rm -r "${D}/usr/share/man" || die "Can't remove man files."
-	else
-		# Run the byte-compile of modules
-		python_optimize "${D}/$(python_get_sitedir)/${PN}"
-	fi
-}
-
-pkg_postinst() {
-	if use cti && ! use python ; then
-		elog "Cantera was build without 'python' use-flag therefore the CTI tool 'ck2cti'"
-		elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
-	fi
-
-	local post_msg=$(usex fortran "and Fortran " "")
-	elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
-
-	if use python ; then
-		elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
-	fi
-}
diff --git a/sci-libs/cantera/files/cantera_2.4.0_env_python_install.patch b/sci-libs/cantera/files/cantera_2.4.0_env_python_install.patch
deleted file mode 100644
index 2e01fed1fa93..000000000000
--- a/sci-libs/cantera/files/cantera_2.4.0_env_python_install.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nur old/interfaces/cython/SConscript new/interfaces/cython/SConscript
---- old/interfaces/cython/SConscript	2018-08-24 16:24:45.000000000 +0300
-+++ new/interfaces/cython/SConscript	2019-08-14 04:28:41.000000000 +0300
-@@ -83,10 +83,10 @@
-             extra = ''
-         elif localenv['OS'] == 'Darwin':
-             extra = localenv.subst(' --prefix=${python%s_prefix}' % major)
--        elif localenv['libdirname'] == 'lib64':
--            # 64-bit RHEL / Fedora
-+        elif localenv['libdirname'] != 'lib':
-+            # 64-bit RHEL / Fedora etc. or e.g. x32 Gentoo profile
-             extra = localenv.subst(
--                ' --prefix=${python%s_prefix} --install-lib=${python%s_prefix}/lib64/python%s.%s/site-packages' % (major, major, major, minor))
-+                ' --prefix=${python%s_prefix} --install-lib=${python%s_prefix}/${libdirname}/python%s.%s/site-packages' % (major, major, major, minor))
-         else:
-             extra = '--user'
-             localenv.AppendENVPath(
diff --git a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
index 34fa1fbb8b4f..dc269a9c4432 100644
--- a/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
+++ b/sci-libs/ccolamd/ccolamd-2.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage//${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index 14225a2fe012..d4be6d38173b 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -1,2 +1,3 @@
 DIST cfitsio-3.360.tar.gz 4104894 BLAKE2B 7a84177c28679db5c27d0586cb6959a0663918a84d46ced9aea6ef7e6bdd32955946807efd4cd852e55128dbc887c4a2135b2eba26847b265011bfd6df049335 SHA512 158819b4a3a29c29a5f017283e2b20067420994e881d202dbf3ba199c9e564dc1e74f8be5ce84f78107126d2a8688cc55cc7ed284540ca647e44cdc3b0b02072
 DIST cfitsio-3.410.tar.gz 4194529 BLAKE2B 31250b9add5b6a85c919c33251d127117ceab81c2243e0b9f8bbe2ef0fd09c85a938b7525338bc718a9b3035efa3660ecffa17ec79e3e278c8014e727f23473b SHA512 cc1de2a4314e7c82bdd6855e11dea4e18dc4e7bcb27b0d15b884cbaeb4acd3b1e12dadd17ab83c7917570934913f89337035470ee4921e7b62409a81052d70cd
+DIST cfitsio-3.49.tar.gz 4934662 BLAKE2B ca8b701f0fec399d989efb61fdaa2bfbf49d0eea2d3ff47e156757c5a99bc77c23a1b91b4c91166696293c71c78210065dc48d0bb3c77039815f326d0ed55f0a SHA512 9836a4af3bbbfed1ea1b4c70b9d500ac485d7c3d8131eb8a25ee6ef6662f46ba52b5161c45c709ed9a601ff0e9ec36daa5650eaaf4f2cc7d6f4bb5640f10da15
diff --git a/sci-libs/cfitsio/cfitsio-3.360.ebuild b/sci-libs/cfitsio/cfitsio-3.360.ebuild
index fc2d56932a63..d281612a65bf 100644
--- a/sci-libs/cfitsio/cfitsio-3.360.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.360.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -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 ~sparc-solaris ~sparc64-solaris"
 IUSE="doc examples fortran static-libs +tools threads"
 
 RDEPEND="sys-libs/zlib"
@@ -48,9 +48,10 @@ src_install() {
 	use fortran && dodoc docs/fitsio.doc
 	use doc && dodoc docs/{quick,cfitsio,fpackguide}.pdf
 	use doc && use fortran && dodoc docs/fitsio.pdf
+
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins cookbook.c testprog.c speed.c smem.c
-		use fortran && doins cookbook.f testf77.f
+		docinto examples
+		dodoc cookbook.c testprog.c speed.c smem.c
+		use fortran && dodoc cookbook.f testf77.f
 	fi
 }
diff --git a/sci-libs/cfitsio/cfitsio-3.410.ebuild b/sci-libs/cfitsio/cfitsio-3.410.ebuild
index 9d508f38125b..2ff8d4bbe26e 100644
--- a/sci-libs/cfitsio/cfitsio-3.410.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.410.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~sparc-solaris ~sparc64-solaris"
 IUSE="bzip2 doc examples fortran static-libs +tools threads"
 
 RDEPEND="
@@ -50,9 +50,9 @@ multilib_src_install_all() {
 	use doc && dodoc docs/{quick,cfitsio,fpackguide}.pdf
 	use doc && use fortran && dodoc docs/fitsio.pdf
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins cookbook.c testprog.c speed.c smem.c
-		use fortran && doins cookbook.f testf77.f
+		docinto examples
+		dodoc cookbook.c testprog.c speed.c smem.c
+		use fortran && dodoc cookbook.f testf77.f
 	fi
 	prune_libtool_files --all
 }
diff --git a/sci-libs/cfitsio/cfitsio-3.490.ebuild b/sci-libs/cfitsio/cfitsio-3.490.ebuild
new file mode 100644
index 000000000000..d3052d10eec6
--- /dev/null
+++ b/sci-libs/cfitsio/cfitsio-3.490.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-${PV%0*}"
+inherit fortran-2 multilib-minimal
+
+DESCRIPTION="C and Fortran library for manipulating FITS files"
+HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
+SRC_URI="http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ISC"
+SLOT="0/9"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="bzip2 curl cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-lang/cfortran
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ldflags.patch"
+	"${FILESDIR}/${P}-system-zlib.patch"
+	"${FILESDIR}/${P}-pkgconfig.patch"
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Avoid internal cfortran
+	mv cfortran.h cfortran.h.disabled || die
+	ln -s "${EPREFIX}"/usr/include/cfortran.h . || die
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with bzip2)
+		$(use_enable curl)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable cpu_flags_x86_ssse3 ssse3)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	dodoc README docs/changes.txt
+
+	dodoc docs/{quick,cfitsio,fpackguide}.pdf
+	dodoc docs/fitsio.pdf
+
+	docinto examples
+	dodoc cookbook.c testprog.c speed.c smem.c
+	dodoc cookbook.f testf77.f
+
+	# Remove static libs
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch b/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch
new file mode 100644
index 000000000000..4b04fb9cc4fe
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-3.490-ldflags.patch
@@ -0,0 +1,14 @@
+diff -Naur a/configure b/configure
+--- a/configure	2018-05-09 21:16:00.000000000 +0200
++++ b/configure	2018-05-23 17:17:18.452431657 +0200
+@@ -4215,8 +4215,8 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-LDFLAGS="$CFLAGS"
+-LDFLAGS_BIN="$LDFLAGS"
++# LDFLAGS="$CFLAGS"
++LDFLAGS_BIN="$CFLAGS"
+ 
+ if test "x$FC" = "xnone" ; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: cfitsio: == Fortran compiler search has been overridden" >&5
diff --git a/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch
new file mode 100644
index 000000000000..37b47c7b820f
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-3.490-pkgconfig.patch
@@ -0,0 +1,20 @@
+diff -ur a/cfitsio.pc.in b/cfitsio.pc.in
+--- a/cfitsio.pc.in	2019-05-08 17:34:49.000000000 +0200
++++ b/cfitsio.pc.in	2019-08-01 15:56:52.064310329 +0200
+@@ -1,12 +1,12 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir=@includedir@
++includedir=@includedir@/cfitsio
+ 
+ Name: cfitsio
+ Description: FITS File Subroutine Library
+ URL: https://heasarc.gsfc.nasa.gov/fitsio/
+ Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@
+-Libs: -L${libdir} -lcfitsio
+-Libs.private: -lm @LIBS@
+-Cflags: -I${includedir}
++Libs: -L${libdir} -lcfitsio
++Libs.private: -lm -lz @LIBS@
++Cflags: -D_REENTRANT -I${includedir}
diff --git a/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch b/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch
new file mode 100644
index 000000000000..6ade40ce62f3
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-3.490-system-zlib.patch
@@ -0,0 +1,60 @@
+diff -ur a/Makefile.in b/Makefile.in
+--- a/Makefile.in	2019-05-08 17:34:50.000000000 +0200
++++ b/Makefile.in	2019-08-01 15:52:57.829760351 +0200
+@@ -68,9 +68,7 @@
+ 		pliocomp.c fits_hcompress.c fits_hdecompress.c \
+ 		simplerng.c @GSIFTP_SRC@
+ 
+-ZLIB_SOURCES =	zlib/adler32.c zlib/crc32.c zlib/deflate.c zlib/infback.c \
+-		zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \
+-		zlib/uncompr.c zlib/zcompress.c zlib/zuncompress.c zlib/zutil.c
++ZLIB_SOURCES = zlib/zcompress.c zlib/zuncompress.c
+ 
+ SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@
+ 
+@@ -103,7 +101,7 @@
+ shared: lib${PACKAGE}${SHLIB_SUFFIX}
+ 
+ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
+-		${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS}
++		${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS}
+ 		@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
+ 			ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
+ 			ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
+@@ -140,28 +138,28 @@
+ 		${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
+ 
+ smem:		smem.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz
+ 
+ testprog:	testprog.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ fpack:		fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ funpack:	funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ fitscopy:	fitscopy.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ speed:		speed.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ imcopy:		imcopy.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ cookbook:	cookbook.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ eval:		# Rebuild eval_* files from flex/bison source
+ 		${FLEX} -t eval.l > eval_l.c1
diff --git a/sci-libs/cgnslib/Manifest b/sci-libs/cgnslib/Manifest
index 69e9eac02ce7..2890a188617c 100644
--- a/sci-libs/cgnslib/Manifest
+++ b/sci-libs/cgnslib/Manifest
@@ -1,2 +1 @@
-DIST cgnslib-3.3.0.tar.gz 3314889 BLAKE2B 3b8af11e04c211ca60f512c7995e9b23e0dd79180f3443f238562216073740de6b845c5bb78d6fb017bbf41e5249c1f58c27130047fd50afb4b20bbc778a046b SHA512 eb5c79d3830f8ee1fa30a67fbf32133c13a276c4b18a553826e4670bd4aa7262d7751bccb74c5e208cd47703f9076bde2e2e0db70408c88fde3ac11b638e6ff3
 DIST cgnslib-3.4.0.tar.gz 3393312 BLAKE2B 279d4502ff70701df6a266495ccc7750e9c51ac14bd3d5072ae8e1448b4f1e4afaefaaf254cf0afe1cc984e4d9fc7d5c161f7696f62726aaf567990ded3c9056 SHA512 e26cfb0d9f3061242d327a6c18fe40ed51bf63b61ae0d6b5cce7e6b4aa623b00e1c3fd9fe240d993323c6f4eec043fde5296a82b1f9108027f945300eec541ec
diff --git a/sci-libs/cgnslib/cgnslib-3.3.0.ebuild b/sci-libs/cgnslib/cgnslib-3.3.0.ebuild
deleted file mode 100644
index 0caf0cca3b06..000000000000
--- a/sci-libs/cgnslib/cgnslib-3.3.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED="fortran"
-FORTRAN_STANDARD="90 2003"
-
-inherit cmake-utils fortran-2
-
-DESCRIPTION="CFD General Notation System standard library"
-HOMEPAGE="https://www.cgns.org/"
-SRC_URI="https://github.com/CGNS/CGNS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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 )"
-
-RDEPEND="hdf5? ( sci-libs/hdf5:=[mpi=,szip=] )
-	tools? (
-		dev-lang/tcl:=
-		dev-lang/tk:=
-		x11-libs/libXmu:=
-		virtual/glu
-		virtual/opengl
-	)"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/CGNS-${PV}"
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	# gentoo libdir
-	sed -e '/DESTINATION/s|lib)|lib${LIB_SUFFIX})|g' \
-		-e 's|lib LIBDIR|lib${LIB_SUFFIX} LIBDIR|' \
-		-e 's|/lib"|/lib${LIB_SUFFIX}"|'\
-		-i CMakeLists.txt 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
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCGNS_BUILD_SHARED=ON
-		-DCGNS_USED_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
-}
-
-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
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.md changelog 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
-}
diff --git a/sci-libs/cgnslib/cgnslib-3.4.0.ebuild b/sci-libs/cgnslib/cgnslib-3.4.0.ebuild
index 864fad93e273..f89f204e4e4a 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="https://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/cholmod/cholmod-2.1.2.ebuild b/sci-libs/cholmod/cholmod-2.1.2.ebuild
index 1a52bba26f00..4bc6ca5590c7 100644
--- a/sci-libs/cholmod/cholmod-2.1.2.ebuild
+++ b/sci-libs/cholmod/cholmod-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 
 LICENSE="minimal? ( LGPL-2.1 ) !minimal? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc lapack metis minimal static-libs"
 
 RDEPEND="
diff --git a/sci-libs/cholmod/cholmod-3.0.13.ebuild b/sci-libs/cholmod/cholmod-3.0.13.ebuild
index 96d60a60ddcf..a2dc0b63a54f 100644
--- a/sci-libs/cholmod/cholmod-3.0.13.ebuild
+++ b/sci-libs/cholmod/cholmod-3.0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc +lapack +matrixops +modify +partition"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/cholmod/cholmod-3.0.14.ebuild b/sci-libs/cholmod/cholmod-3.0.14.ebuild
index 566f5c250c17..94e8ad014818 100644
--- a/sci-libs/cholmod/cholmod-3.0.14.ebuild
+++ b/sci-libs/cholmod/cholmod-3.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc +lapack +matrixops +modify +partition"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/clblas/Manifest b/sci-libs/clblas/Manifest
index 304f9e7bde34..5ccea72193cb 100644
--- a/sci-libs/clblas/Manifest
+++ b/sci-libs/clblas/Manifest
@@ -1 +1 @@
-DIST clblas-2.10.tar.gz 1154117 BLAKE2B 67035b03ab3a8fa07f32cb8d1d40af39fd885ceb21d9754f8a49a62adcfacbeeec703dfdae922ec0fc915a2dcadff2fc2f07a6c5ced74db3da6cd85c6c63f4d5 SHA512 5ed43104aae565292e0df4cc9e014cf483ccc0ff89257ebb5817f6508bfc9593585ed658da639f2167fbfb5d92ef116be4d5de3694f56e1a1e228bd42b1c05c6
+DIST clblas-2.12.tar.gz 1157445 BLAKE2B 27352a7775db94808ce21f2b4a39fe505d4f37be4305dc7fb5a4068a86d3f51a9e4863931f634150762b31256f9f7e8e5d0d8b70f404b5a9ddb8a489b800aea6 SHA512 5d9b0c58adde69e83d95e9c713e0cdc5f64785fe7e05553a14c57fa483c4ef39e9dc780c26880a7f15924967d5ce4ea29035c29d63eac7ee5a2ae5ddacac2b72
diff --git a/sci-libs/clblas/clblas-2.10.ebuild b/sci-libs/clblas/clblas-2.10.ebuild
deleted file mode 100644
index 5ba2f703879a..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,7,8,9,10} )
-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..9ee81fa2f62e
--- /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,7,8,9,10} )
+
+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 5163b24bc02c..67d39b02d571 100644
--- a/sci-libs/cln/Manifest
+++ b/sci-libs/cln/Manifest
@@ -1,3 +1 @@
-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
diff --git a/sci-libs/cln/cln-1.3.3.ebuild b/sci-libs/cln/cln-1.3.3.ebuild
deleted file mode 100644
index 9687c7bb01a1..000000000000
--- a/sci-libs/cln/cln-1.3.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils flag-o-matic
-
-DESCRIPTION="Class library (C++) for numbers"
-HOMEPAGE="https://www.ginac.de/CLN/"
-SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/gmp:0="
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.2-arm.patch )
-
-pkg_setup() {
-	use sparc && append-cppflags -DNO_ASM
-	use hppa && append-cppflags -DNO_ASM
-	use arm && append-cppflags -DNO_ASM
-}
-
-src_prepare() {
-	# avoid building examples
-	# do it in Makefile.in to avoid time consuming eautoreconf
-	sed -i \
-		-e '/^SUBDIRS.*=/s/examples doc benchmarks/doc/' \
-		Makefile.in || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=( --disable-static )
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	if use doc; then
-		cd "${BUILD_DIR}"
-		export VARTEXFONTS="${T}/fonts"
-		emake html pdf
-		DOCS=("${BUILD_DIR}/doc/cln.pdf")
-		HTML_DOCS=("${BUILD_DIR}/doc/")
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.cc
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/cln/cln-1.3.4.ebuild b/sci-libs/cln/cln-1.3.4.ebuild
deleted file mode 100644
index 29ac33c74b05..000000000000
--- a/sci-libs/cln/cln-1.3.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils flag-o-matic
-
-DESCRIPTION="Class library (C++) for numbers"
-HOMEPAGE="https://www.ginac.de/CLN/"
-SRC_URI="https://www.ginac.de/CLN/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/gmp:0="
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.2-arm.patch )
-
-pkg_setup() {
-	use sparc && append-cppflags -DNO_ASM
-	use hppa && append-cppflags -DNO_ASM
-	use arm && append-cppflags -DNO_ASM
-}
-
-src_prepare() {
-	# avoid building examples
-	# do it in Makefile.in to avoid time consuming eautoreconf
-	sed -i \
-		-e '/^SUBDIRS.*=/s/examples doc benchmarks/doc/' \
-		Makefile.in || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=( --disable-static )
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	if use doc; then
-		cd "${BUILD_DIR}"
-		export VARTEXFONTS="${T}/fonts"
-		emake html pdf
-		DOCS=("${BUILD_DIR}/doc/cln.pdf")
-		HTML_DOCS=("${BUILD_DIR}/doc/")
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.cc
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/cln/cln-1.3.6.ebuild b/sci-libs/cln/cln-1.3.6.ebuild
index 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/cln/files/cln-1.3.2-arm.patch b/sci-libs/cln/files/cln-1.3.2-arm.patch
deleted file mode 100644
index 571bd24e68f6..000000000000
--- a/sci-libs/cln/files/cln-1.3.2-arm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/base/digitseq/cl_asm_arm_.cc	2009-05-10 16:32:30.000000000 -0400
-+++ src/base/digitseq/cl_asm_arm_.cc.new	2009-12-29 09:03:02.161401990 -0500
-@@ -77,8 +77,8 @@
- #else
- #define DECLARE_FUNCTION(x)
- #endif
--#define GLABEL(x) _##x##:
--#define LABEL(x) x##:
-+#define GLABEL(x) _##x:
-+#define LABEL(x) x:
- #define RRX rrx
- #define END
- 
diff --git a/sci-libs/coinhsl/Manifest b/sci-libs/coinhsl/Manifest
index a3111d0391ba..2f8053212e27 100644
--- a/sci-libs/coinhsl/Manifest
+++ b/sci-libs/coinhsl/Manifest
@@ -1,2 +1 @@
-DIST coinhsl-2014.01.10.tar.gz 906586 BLAKE2B d58d200cd3402cdb694ff84bf4228bb548bd70e98a4aeaccad94544385fb241c68dad1ebb1c35a5549f852baa82f264864ee1db75f5a7019a252cf01ec10ba21 SHA512 fe71b07c4fc11a8a7a40a115457588b91aa4481726e523502d92d6604c5fda13cffcc4620ada64b9332cb3502f8bfbc4ee856125cd5fd987cccf49bae5d46711
 DIST coinhsl-2015.06.23.tar.gz 908522 BLAKE2B ccc64a7790b1f9105439f6690e87bed52ff48306132db5fa27a036b4ce87472dfc3ca92f3e9d94aefdf737ed292568f36831eb24ac94d77f4b9bab84bc3ea36e SHA512 ad831d6ffd3c1e46481da8e58c7075adc69cb02800002c2067053fd354c5971214025982b24a9b74c681c2c3d86fd5adac78820242209feb75898165cf38753f
diff --git a/sci-libs/coinhsl/coinhsl-2014.01.10.ebuild b/sci-libs/coinhsl/coinhsl-2014.01.10.ebuild
deleted file mode 100644
index c9159d65bcb6..000000000000
--- a/sci-libs/coinhsl/coinhsl-2014.01.10.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=yes
-FORTRAN_STANDARD="77 90"
-
-inherit autotools-utils fortran-2 toolchain-funcs
-
-DESCRIPTION="HSL mathematical software library for IPOPT"
-HOMEPAGE="https://www.hsl.rl.ac.uk/ipopt"
-SRC_URI="${P}.tar.gz"
-
-LICENSE="HSL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="
-	sci-libs/metis
-	virtual/blas"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-RESTRICT="mirror fetch"
-
-src_configure() {
-	export LIBS="$($(tc-getPKG_CONFIG) --libs metis blas lapack)"
-	autotools-utils_src_configure
-	MAKEOPTS+=" -j1"
-}
diff --git a/sci-libs/coinor-alps/Manifest b/sci-libs/coinor-alps/Manifest
index 8a32c925926a..1e572a16a1cf 100644
--- a/sci-libs/coinor-alps/Manifest
+++ b/sci-libs/coinor-alps/Manifest
@@ -1,2 +1 @@
-DIST Alps-1.4.9.tgz 5564207 BLAKE2B a0a38b0b9da0703f2b67d20fe4fe99cfa5a31c288caf30f6581263b421963f7274bdb1251fc78db572381ad091f341c879336c60c08c254895f4f7dabe53ae97 SHA512 b8f557d33f3d02d0bf98541309934eeebebd21829fe1e2a438b07e6e17f0a1de1a970ed97b28cdaddc8b14eb1092a86db4d44838cef70bae3d091cd48fe8e2d8
 DIST Alps-1.5.4.tgz 5691940 BLAKE2B 9a1d78d8957a4fd2156d35ba348f7db442bf6f6128031b9dd0d2b0c1176e5eb408208d3c90fb8563c39efbf0f4aaa9daea705f25ed711a922ab32f1e1d0b8027 SHA512 eace2f0e3dde682ee92b8e185ba6ea226a681dbcecb5fcf5258334e6deed89705b2c61821896b07323459fbd8575a31fa91c3342becbc9f6173efdf094d39555
diff --git a/sci-libs/coinor-alps/coinor-alps-1.4.9.ebuild b/sci-libs/coinor-alps/coinor-alps-1.4.9.ebuild
deleted file mode 100644
index 4376c5b2118d..000000000000
--- a/sci-libs/coinor-alps/coinor-alps-1.4.9.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-MYPN=Alps
-
-DESCRIPTION="COIN-OR Framework for implementing parallel graph search algorithms"
-HOMEPAGE="https://projects.coin-or.org/CHiPPS/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
-
-LICENSE="CPL-1.0"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-utils:=
-	sci-libs/coinor-clp:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	test? ( sci-libs/coinor-sample sci-libs/coinor-cgl )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	# as-needed fix
-	# hack to avoid eautoreconf (coinor has its own weird autotools)
-	sed -i \
-		-e 's:\(libAlps_la_LIBADD.*=\).*:\1 @ALPSLIB_LIBS@:g' \
-		src/Makefile.in || die
-	# bug for later versions of subversions
-	sed -i \
-		-e 's/xexported/xexported -a "x$svn_rev_tmp" != "xUnversioned directory"/' \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-dependency-linking
-		$(use_with doc dot)
-	)
-	PKG_CONFIG_PATH+="${ED}"/usr/$(get_libdir)/pkgconfig \
-		autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(usex doc doxydoc "")
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	use doc && HTML_DOC=("${BUILD_DIR}/doxydocs/html/.")
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/colamd/colamd-2.9.6.ebuild b/sci-libs/colamd/colamd-2.9.6.ebuild
index 15cc9b507d95..f68a50a39544 100644
--- a/sci-libs/colamd/colamd-2.9.6.ebuild
+++ b/sci-libs/colamd/colamd-2.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND=">=sci-libs/suitesparseconfig-5.4.0"
diff --git a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
index 1b981adafbed..c5df715062a8 100644
--- a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
+++ b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
index 9501743cada0..6b90d4478b44 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -1,3 +1 @@
-DIST dcmtk-3.6.3.tar.gz 6269785 BLAKE2B 8f0797840fa5ab4ffb60e46f65b16739d3ed0cb7591b20cbfba81a59de97344a663f73bed8fc7f349a99accc46fd2fde3cff021861bde6f07957a433a4db67a3 SHA512 5b907422d2d80e417ae8239e159d1300da4ed8db7e92cee619cc1d37116165e8824f8a9103605e07a95b1bffe94bbd2d5e05125f068281d241e8e78755d0b5e8
-DIST dcmtk-3.6.4.tar.gz 6402734 BLAKE2B 2d362789e7819089b7da46a9601fa5d53b8e8aab1ac7d30bf1180b3da0645d015a177c97188dc9255c6962a9d7246cf287b20824a78fbe9612b9bc277e68d294 SHA512 735f85d04410437a5163b154f43c8a299aff7a8f810605ce6c5027ae4569ff1323a69f70a2603805cec9d826a31166fd904bb53c3edc1137bfc41ba2902c2261
 DIST dcmtk-3.6.5.tar.gz 6483626 BLAKE2B 6182ef207b42b16ee91e94397cc8a5b2d108435a30d4c86f0b7e39af91186604f16be07a75e176bf50575446abcab21b2f63158dc4e5f2cb6de3996a0881b295 SHA512 c0cf61b0095c5708709406bfef5e8bb82dd01dbf77df7f2af2118004920bda68218eb1e4174bf92941cdae0acdb275c886570dafd29476eee2eb815e9a82830a
diff --git a/sci-libs/dcmtk/dcmtk-3.6.3.ebuild b/sci-libs/dcmtk/dcmtk-3.6.3.ebuild
deleted file mode 100644
index 4990be778c72..000000000000
--- a/sci-libs/dcmtk/dcmtk-3.6.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="The DICOM Toolkit"
-HOMEPAGE="https://dicom.offis.de/dcmtk.php.en"
-SRC_URI="ftp://dicom.offis.de/pub/dicom/offis/software/${PN}/${PN}363/${P}.tar.gz"
-
-LICENSE="OFFIS"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="doc png ssl tcpd tiff +threads xml zlib"
-
-RDEPEND="
-	dev-libs/icu:=
-	virtual/jpeg:0
-	png? ( media-libs/libpng:0= )
-	ssl? ( dev-libs/openssl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	tiff? ( media-libs/tiff:0= )
-	xml? ( dev-libs/libxml2:2= )
-	zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
-	media-gfx/graphviz
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-dcmqrdb-cfg.patch
-	"${FILESDIR}"/${P}-nostrip.patch
-	"${FILESDIR}"/${P}-fix-gcc9.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s:share/doc/dcmtk:&-${PV}:" \
-		-e "s:DIR \"/:DIR \"/usr/:" \
-		-e "s:usr/etc:etc:" \
-		-e "s:/lib\":/$(get_libdir)\":" \
-		-e "s:COPYRIGHT::" \
-		-i CMakeLists.txt || die
-	sed -e 's:${CMAKE_INSTALL_PREFIX}/::' \
-		-i dcmwlm/data/CMakeLists.txt doxygen/CMakeLists.txt || die
-	# Temporary workaround: docs are not built with CMake
-	sed -i -e '/include/d' doxygen/Makefile.in || die
-
-	# fix -D deprecation warnings
-	sed -i -e "s|_BSD_SOURCE|_DEFAULT_SOURCE|g" \
-		"${S}"/config/configure.in \
-		"${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DDCMTK_WITH_ICU=ON
-		-DDCMTK_WITH_TIFF=$(usex tiff)
-		-DDCMTK_WITH_PNG=$(usex png)
-		-DDCMTK_WITH_XML=$(usex xml)
-		-DDCMTK_WITH_ZLIB=$(usex zlib)
-		-DDCMTK_WITH_OPENSSL=$(usex ssl)
-		-DDCMTK_WITH_DOXYGEN=$(usex doc)
-		-DDCMTK_WITH_THREADS=$(usex threads)
-	)
-
-	cmake-utils_src_configure
-
-	if use doc; then
-		cd "${S}"/doxygen || die
-		econf
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		emake -C "${S}"/doxygen
-	fi
-}
-
-src_install() {
-	doman doxygen/manpages/man1/*
-
-	if use doc; then
-		local HTML_DOCS=( "${S}"/doxygen/htmldocs/. )
-	fi
-	cmake-utils_src_install
-}
diff --git a/sci-libs/dcmtk/dcmtk-3.6.4-r1.ebuild b/sci-libs/dcmtk/dcmtk-3.6.4-r1.ebuild
deleted file mode 100644
index f701d3e9f5b5..000000000000
--- a/sci-libs/dcmtk/dcmtk-3.6.4-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="The DICOM Toolkit"
-HOMEPAGE="https://dicom.offis.de/dcmtk.php.en"
-SRC_URI="http://dicom.offis.de/download/dcmtk/release/${P}.tar.gz"
-
-LICENSE="OFFIS"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="doc png ssl tcpd tiff +threads xml zlib"
-
-RDEPEND="
-	dev-libs/icu:=
-	virtual/jpeg:0
-	png? ( media-libs/libpng:* )
-	ssl? ( dev-libs/openssl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	tiff? ( media-libs/tiff:0 )
-	xml? ( dev-libs/libxml2:2 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	media-gfx/graphviz
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s:share/doc/dcmtk:&-${PV}:" \
-		-e "s:DIR \"/:DIR \"/usr/:" \
-		-e "s:usr/etc:etc:" \
-		-e "s:/lib\":/$(get_libdir)\":" \
-		-e "s:COPYRIGHT::" \
-		-i CMakeLists.txt || die
-	sed -e 's:${CMAKE_INSTALL_PREFIX}/::' \
-		-i dcmwlm/data/CMakeLists.txt doxygen/CMakeLists.txt || die
-	# Temporary workaround: docs are not built with CMake
-	sed -i -e '/include/d' doxygen/Makefile.in || die
-
-	# fix -D deprecation warnings
-	sed -i -e "s|_BSD_SOURCE|_DEFAULT_SOURCE|g" \
-		"${S}"/config/configure.in \
-		"${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DDCMTK_WITH_ICU=ON
-		-DDCMTK_WITH_TIFF=$(usex tiff)
-		-DDCMTK_WITH_PNG=$(usex png)
-		-DDCMTK_WITH_XML=$(usex xml)
-		-DDCMTK_WITH_ZLIB=$(usex zlib)
-		-DDCMTK_WITH_OPENSSL=$(usex ssl)
-		-DDCMTK_WITH_DOXYGEN=$(usex doc)
-		-DDCMTK_WITH_THREADS=$(usex threads)
-	)
-
-	cmake-utils_src_configure
-
-	if use doc; then
-		cd "${S}"/doxygen || die
-		econf
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		emake -C "${S}"/doxygen
-	fi
-}
-
-src_install() {
-	doman doxygen/manpages/man1/*
-
-	if use doc; then
-		local HTML_DOCS=( "${S}"/doxygen/htmldocs/. )
-	fi
-	cmake-utils_src_install
-}
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
index 58d21bcacae1..17f4eb3f34de 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://dicom.offis.de/dcmtk.php.en"
 SRC_URI="https://dicom.offis.de/download/dcmtk/release/${P}.tar.gz"
 
 LICENSE="OFFIS"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 SLOT="0"
 IUSE="doc png ssl tcpd tiff +threads xml zlib"
 
diff --git a/sci-libs/dcmtk/files/dcmtk-3.6.3-dcmqrdb-cfg.patch b/sci-libs/dcmtk/files/dcmtk-3.6.3-dcmqrdb-cfg.patch
deleted file mode 100644
index 4ccb58d4e34d..000000000000
--- a/sci-libs/dcmtk/files/dcmtk-3.6.3-dcmqrdb-cfg.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Author: Jürgen Salk <jsa@debian.org>
-Description: The original maintainer Jürgen Salk applied
- a set of patches to the original code.  This file contains
- changes to C++ code
-
-Index: dcmtk-3.6.0/dcmqrdb/etc/dcmqrscp.cfg
-===================================================================
---- a/dcmqrdb/etc/dcmqrscp.cfg	2010-09-09 19:20:25.000000000 +0200
-+++ b/dcmqrdb/etc/dcmqrscp.cfg	2011-01-28 09:49:02.000000000 +0100
-@@ -10,7 +10,9 @@
- NetworkTCPPort  = 104
- MaxPDUSize      = 16384
- MaxAssociations = 16
-+UserName        = "dcmtk"
-+GroupName       = "dcmtk"
- 
- #
- # Default settings for specific character set behavior:
- # SpecificCharacterSet = fallback
-@@ -28,12 +30,13 @@
- # NOTE: in the current implementation you cannot substitute an IP address
- # for a hostname.
- #
--acme1           = (ACME1, acmehost1, 5678)
--acme2           = (ACME2, acmehost2, 5678)
--acmeCTcompany   = acme1, acme2
--united1         = (UNITED1, unitedhost1, 104)
--united2         = (UNITED2, unitedhost2, 104)
--unitedMRcompany = united1, united2
-+# Example:
-+#acme1           = (ACME1, acmehost1, 5678)
-+#acme2           = (ACME2, acmehost2, 5678)
-+#acmeCTcompany   = acme1, acme2
-+#united1         = (UNITED1, unitedhost1, 104)
-+#united2         = (UNITED2, unitedhost2, 104)
-+#unitedMRcompany = united1, united2
- #
- HostTable END
- 
-@@ -51,8 +54,9 @@
- #       VendorName = SymbolicName
- # The symbolic name should be defined in the HostTable.
- #
--"Acme CT Company"   = acmeCTcompany
--"United MR Company" = unitedMRcompany
-+# Example:
-+#"Acme CT Company"   = acmeCTcompany
-+#"United MR Company" = unitedMRcompany
- #
- VendorTable END
- 
-@@ -70,8 +74,13 @@
- #               Entry in HostTable                      |
- #               ANY
- #
--COMMON       /home/dicom/db/COMMON       R  (200, 1024mb) ANY
--ACME_STORE   /home/dicom/db/ACME_STORE   RW (9, 1024mb)   acmeCTcompany
--UNITED_STORE /home/dicom/db/UNITED_STORE RW (9, 1024mb)   unitedMRcompany
-+# Example:
-+#
-+#ACME_STORE   /var/lib/dcmtk/db/ACME_STORE   RW (9, 1024mb)   acmeCTcompany
-+#UNITED_STORE /var/lib/dcmtk/db/UNITED_STORE RW (9, 1024mb)   unitedMRcompany
-+#
-+# Uncomment and adjust the following lines for a common r/rw storage area:
-+#READWRITE     /var/lib/dcmtk/db/READWRITE    RW (10, 1024mb)  ANY
-+#READ          /var/lib/dcmtk/db/READ         R  (200, 1024mb) ANY
- #
- AETable END
-Index: dcmtk-3.6.0/dcmqrdb/docs/dcmqrcnf.txt
---- a/dcmqrdb/docs/dcmqrcnf.txt	2010-09-09 19:20:12.000000000 +0200
-+++ b/dcmqrdb/docs/dcmqrcnf.txt	2011-01-28 09:46:02.000000000 +0100
-@@ -44,8 +44,8 @@
- MaxPDUSize           = 8192
- MaxAssociations      = 20
- SpecificCharacterSet = fallback
--UserName             = (do not change user)
--GroupName            = (do not change group)
-+UserName             = "dcmtk"
-+GroupName            = "dcmtk"
- 
- Available options for specific character sets are:
- 
-Index: dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile	2011-01-28 09:46:02.000000000 +0100
-@@ -0,0 +1 @@
-+
diff --git a/sci-libs/dcmtk/files/dcmtk-3.6.3-fix-gcc9.patch b/sci-libs/dcmtk/files/dcmtk-3.6.3-fix-gcc9.patch
deleted file mode 100644
index 596a1ae21b95..000000000000
--- a/sci-libs/dcmtk/files/dcmtk-3.6.3-fix-gcc9.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/686592
-
-In file included from /var/tmp/portage/sci-libs/dcmtk-3.6.3/work/dcmtk-3.6.3/ofstd/include/dcmtk/ofstd/variadic/variant.h:19,
-                 from /var/tmp/portage/sci-libs/dcmtk-3.6.3/work/dcmtk-3.6.3/ofstd/include/dcmtk/ofstd/ofvriant.h:379,
-                 from /var/tmp/portage/sci-libs/dcmtk-3.6.3/work/dcmtk-3.6.3/ofstd/tests/tvariant.cc:26:
-/var/tmp/portage/sci-libs/dcmtk-3.6.3/work/dcmtk-3.6.3/ofstd/include/dcmtk/ofstd/variadic/helpers.h:57:32: error: narrowing conversion of ‘-1’ from ‘int’ to ‘long unsigned int’ [-Wnarrowing]
-   57 | : OFintegral_constant<size_t,-1> {};
-      |
-
---- a/ofstd/include/dcmtk/ofstd/variadic/helpers.h
-+++ b/ofstd/include/dcmtk/ofstd/variadic/helpers.h
-@@ -14,6 +14,8 @@
- #ifndef VARIADIC_HELPERS_H
- #define VARIADIC_HELPERS_H
- 
-+#include <limits>
-+
- #include "dcmtk/config/osconfig.h"    /* make sure OS specific configuration is included first */
- 
- #include "dcmtk/ofstd/oftraits.h"
-@@ -54,7 +56,7 @@
- 
- template<size_t Index,typename T>
- struct OFvariadic_find_type_t<Index,T>
--: OFintegral_constant<size_t,-1> {};
-+: OFintegral_constant<size_t,std::numeric_limits<size_t>::max()> {};
- 
- template<typename T,typename T0=OFvariadic_nil,typename T1=OFvariadic_nil,typename T2=OFvariadic_nil,typename T3=OFvariadic_nil,typename T4=OFvariadic_nil,typename T5=OFvariadic_nil,typename T6=OFvariadic_nil,typename T7=OFvariadic_nil,typename T8=OFvariadic_nil,typename T9=OFvariadic_nil,typename T10=OFvariadic_nil,typename T11=OFvariadic_nil,typename T12=OFvariadic_nil,typename T13=OFvariadic_nil,typename T14=OFvariadic_nil,typename T15=OFvariadic_nil,typename T16=OFvariadic_nil,typename T17=OFvariadic_nil,typename T18=OFvariadic_nil,typename T19=OFvariadic_nil,typename T20=OFvariadic_nil,typename T21=OFvariadic_nil,typename T22=OFvariadic_nil,typename T23=OFvariadic_nil,typename T24=OFvariadic_nil,typename T25=OFvariadic_nil,typename T26=OFvariadic_nil,typename T27=OFvariadic_nil,typename T28=OFvariadic_nil,typename T29=OFvariadic_nil,typename T30=OFvariadic_nil,typename T31=OFvariadic_nil,typename T32=OFvariadic_nil,typename T33=OFvariadic_nil,typename T34=OFvariadic_nil,typename T35=OFvariadic_nil,typename T36=OFvariadic_nil,typename T37=OFvariadic_nil,typename T38=OFvariadic_nil,typename T39=OFvariadic_nil,typename T40=OFvariadic_nil,typename T41=OFvariadic_nil,typename T42=OFvariadic_nil,typename T43=OFvariadic_nil,typename T44=OFvariadic_nil,typename T45=OFvariadic_nil,typename T46=OFvariadic_nil,typename T47=OFvariadic_nil,typename T48=OFvariadic_nil,typename T49=OFvariadic_nil>
- struct OFvariadic_find_type
diff --git a/sci-libs/dcmtk/files/dcmtk-3.6.3-nostrip.patch b/sci-libs/dcmtk/files/dcmtk-3.6.3-nostrip.patch
deleted file mode 100644
index 83bd3a62fd90..000000000000
--- a/sci-libs/dcmtk/files/dcmtk-3.6.3-nostrip.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-Remove all hardcoded calls to `strip` command
-
-Index: dcmtk-3.6.0/config/templates/Makefile.src
-===================================================================
---- a/config/templates/Makefile.src	2009-01-30 10:27:58.000000000 +0100
-+++ b/config/templates/Makefile.src	2011-01-28 09:53:28.000000000 +0100
-@@ -31,7 +31,7 @@
- install-bin: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmdata/apps/Makefile.in
-===================================================================
---- a/dcmdata/apps/Makefile.in	2009-11-04 10:58:05.000000000 +0100
-+++ b/dcmdata/apps/Makefile.in	2011-01-28 09:53:45.000000000 +0100
-@@ -76,7 +76,7 @@
- install-bin: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmimage/apps/Makefile.in
-===================================================================
---- a/dcmimage/apps/Makefile.in	2009-10-13 16:08:33.000000000 +0200
-+++ b/dcmimage/apps/Makefile.in	2011-01-28 09:53:59.000000000 +0100
-@@ -42,7 +42,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmimgle/apps/Makefile.in
-===================================================================
---- a/dcmimgle/apps/Makefile.in	2009-10-28 10:53:39.000000000 +0100
-+++ b/dcmimgle/apps/Makefile.in	2011-01-28 09:54:11.000000000 +0100
-@@ -39,7 +39,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmjpeg/apps/Makefile.in
-===================================================================
---- a/dcmjpeg/apps/Makefile.in	2009-10-07 14:44:33.000000000 +0200
-+++ b/dcmjpeg/apps/Makefile.in	2011-01-28 09:54:28.000000000 +0100
-@@ -72,7 +72,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- clean:
-Index: dcmtk-3.6.0/dcmnet/apps/Makefile.in
-===================================================================
---- a/dcmnet/apps/Makefile.in	2009-11-04 11:24:29.000000000 +0100
-+++ b/dcmnet/apps/Makefile.in	2011-01-28 09:54:50.000000000 +0100
-@@ -52,7 +52,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmpstat/apps/Makefile.in
-===================================================================
---- a/dcmpstat/apps/Makefile.in	2009-10-13 16:57:49.000000000 +0200
-+++ b/dcmpstat/apps/Makefile.in	2011-01-28 09:55:10.000000000 +0100
-@@ -113,7 +113,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmqrdb/apps/Makefile.in
-===================================================================
---- a/dcmqrdb/apps/Makefile.in	2009-11-04 11:24:30.000000000 +0100
-+++ b/dcmqrdb/apps/Makefile.in	2011-01-28 09:55:24.000000000 +0100
-@@ -57,7 +57,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmsign/apps/Makefile.in
-===================================================================
---- a/dcmsign/apps/Makefile.in	2009-09-04 17:42:31.000000000 +0200
-+++ b/dcmsign/apps/Makefile.in	2011-01-28 09:55:35.000000000 +0100
-@@ -33,7 +33,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmsr/apps/Makefile.in
-===================================================================
---- a/dcmsr/apps/Makefile.in	2009-10-13 16:57:49.000000000 +0200
-+++ b/dcmsr/apps/Makefile.in	2011-01-28 09:55:48.000000000 +0100
-@@ -44,7 +44,7 @@
- install-bin: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmwlm/apps/Makefile.in
-===================================================================
---- a/dcmwlm/apps/Makefile.in	2009-11-04 11:24:30.000000000 +0100
-+++ b/dcmwlm/apps/Makefile.in	2011-01-28 09:55:58.000000000 +0100
-@@ -49,7 +49,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmwlm/wwwapps/Makefile.in
-===================================================================
---- a/dcmrt/apps/Makefile.in	2009-11-04 11:24:30.000000000 +0100
-+++ b/dcmrt/apps/Makefile.in	2011-01-28 09:56:33.000000000 +0100
-@@ -55,7 +55,7 @@
- install-bin: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
-Index: dcmtk-3.6.0/dcmjpls/apps/Makefile.in
-===================================================================
---- a/dcmjpls/apps/Makefile.in	2011-01-28 09:56:54.000000000 +0100
-+++ b/dcmjpls/apps/Makefile.in	2011-01-28 09:57:00.000000000 +0100
-@@ -71,7 +71,7 @@
- install: all
- 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	for prog in $(progs); do \
--		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
-+		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
- 	done
- 
- 
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index c506bf565ca3..d60fb6eed2b5 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -1,4 +1,2 @@
-DIST dealii-9.1.1-offline_documentation.tar.gz 211103151 BLAKE2B ef7cf48aa8019a2d42a38804744ff72cc7f744255fa27df852f8f93c86a02f2125458e0e525e57510bb98adc27aed933fefa27d556d8203c991dae9866c7d57a SHA512 5e2b71e9bdeb80875772356e2c873bc1f065f2a8c5c47923b74b471d464e4867c257e3a47b32341aa60af98e74e3ed2eceba8dedb4b157ab872681576ecbd5db
-DIST dealii-9.1.1.tar.gz 19911088 BLAKE2B e8488833f11339ccffd4791b9b46ab77f1982cbbdeb11fab7f6b74ca2e17c3d648a2940f4462d0ac9c68bd619b3c4f43b4d8052d2903cbb9cae2fece93d81987 SHA512 02dd91e2b0f395960f900f4cbe00bd307a4762ffbc5f3838dcc34828937e96727efbbcc66fc3d357d6b00b0dddcbc6cd7709c4c03f067d92a8f72d4631b88bf1
 DIST dealii-9.2.0-offline_documentation.tar.gz 277987911 BLAKE2B d14e15bc252f481707b04e9ca3fd05b5469035537a099466a8272fa1d56833c99d845871534df75bbb2efb29063e738700a5a2815b653cdd14b49b3a93add368 SHA512 9680731b4d837561c3682a65391b442cfb8d2a947b0e4e37cad1df83877b371997d084eac52e2bf34b190ea54996d41ddd89bee79fff24d710199417f3f345ab
 DIST dealii-9.2.0.tar.gz 24688964 BLAKE2B 60a8ede72a49cb2e658b3d6d53fb332a96f44a7fb9bb499ba54175138d49f38a9b75d9bea2eaddcaa3f50d97ce53961692b35f89578f535d32301680e6f1d68b SHA512 7c76435e45c9c302c4f95f588229f5a9b81f0450bd029729553c706a25dfd16f5c02c50fd2618d7e285d18927b63426110d2c6a074242b91cf789bd4bc77acc5
diff --git a/sci-libs/dealii/dealii-9.1.1.ebuild b/sci-libs/dealii/dealii-9.1.1.ebuild
deleted file mode 100644
index 40009692cefe..000000000000
--- a/sci-libs/dealii/dealii-9.1.1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils eutils multilib
-
-# deal.II uses its own FindLAPACK.cmake file that calls into the system
-# FindLAPACK.cmake module and does additional internal setup. Do not remove
-# any of these modules:
-CMAKE_REMOVE_MODULES_LIST=""
-
-DESCRIPTION="Solving partial differential equations with the finite element method"
-HOMEPAGE="https://www.dealii.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dealii/dealii.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
-		doc? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz )"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="
-	adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f
-	cpu_flags_x86_sse2 cuda +debug doc +examples gmsh +gsl hdf5 +lapack
-	metis mpi muparser nanoflann opencascade netcdf p4est petsc scalapack
-	slepc +sparse static-libs sundials symengine +tbb trilinos
-"
-
-# TODO: add slepc use flag once slepc is packaged for gentoo-science
-REQUIRED_USE="
-	p4est? ( mpi )
-	slepc? ( petsc )
-	trilinos? ( mpi )"
-
-RDEPEND="dev-libs/boost
-	app-arch/bzip2
-	sys-libs/zlib
-	adolc? ( sci-libs/adolc )
-	arpack? ( sci-libs/arpack[mpi=] )
-	assimp? ( media-libs/assimp )
-	cuda? ( dev-util/nvidia-cuda-sdk )
-	gmsh? ( sci-libs/gmsh )
-	gsl? ( sci-libs/gsl )
-	hdf5? ( sci-libs/hdf5[mpi=] )
-	lapack? ( virtual/lapack )
-	metis? ( >=sci-libs/parmetis-4 )
-	mpi? ( virtual/mpi )
-	muparser? ( dev-cpp/muParser )
-	nanoflann? ( sci-libs/nanoflann )
-	netcdf? ( sci-libs/netcdf-cxx:0 )
-	opencascade? ( sci-libs/opencascade:* )
-	p4est? ( sci-libs/p4est[mpi] )
-	petsc? ( sci-mathematics/petsc[mpi=] )
-	scalapack? ( sci-libs/scalapack )
-	slepc? ( sci-mathematics/slepc[mpi=] )
-	sparse? ( sci-libs/umfpack )
-	sundials? ( <sci-libs/sundials-4:= )
-	symengine? ( >=sci-libs/symengine-0.4:= )
-	tbb? ( dev-cpp/tbb )
-	trilinos? ( sci-libs/trilinos )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] dev-lang/perl )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
-)
-
-src_configure() {
-	# deal.II needs a custom build type:
-	local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
-
-	local mycmakeargs=(
-		-DDEAL_II_PACKAGE_VERSION="${PV}"
-		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
-		-DDEAL_II_ALLOW_AUTODETECTION=OFF
-		-DDEAL_II_ALLOW_BUNDLED=OFF
-		-DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
-		-DDEAL_II_COMPILE_EXAMPLES=OFF
-		-DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html"
-		-DDEAL_II_DOCREADME_RELDIR="share/doc/${P}"
-		-DDEAL_II_COMPILE_EXAMPLES=OFF
-		-DDEAL_II_EXAMPLES_RELDIR="share/doc/${P}/examples"
-		-DDEAL_II_LIBRARY_RELDIR="$(get_libdir)"
-		-DDEAL_II_SHARE_RELDIR="share/${PN}"
-		-DDEAL_II_WITH_ZLIB=ON
-		-DDEAL_II_WITH_ADOLC="$(usex adolc)"
-		-DDEAL_II_WITH_ASSIMP="$(usex assimp)"
-		-DDEAL_II_WITH_ARPACK="$(usex arpack)"
-		-DDEAL_II_WITH_CUDA="$(usex cuda)"
-		-DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)"
-		-DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)"
-		-DDEAL_II_WITH_GMSH="$(usex gmsh)"
-		-DDEAL_II_WITH_GSL="$(usex gsl)"
-		-DDEAL_II_WITH_HDF5="$(usex hdf5)"
-		-DDEAL_II_WITH_LAPACK="$(usex lapack)"
-		-DDEAL_II_WITH_METIS="$(usex metis)"
-		-DDEAL_II_WITH_MPI="$(usex mpi)"
-		-DDEAL_II_WITH_MUPARSER="$(usex muparser)"
-		-DDEAL_II_WITH_NANOFLANN="$(usex nanoflann)"
-		-DDEAL_II_WITH_NETCDF="$(usex netcdf)"
-		-DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)"
-		-DDEAL_II_WITH_P4EST="$(usex p4est)"
-		-DDEAL_II_WITH_PETSC="$(usex petsc)"
-		-DDEAL_II_WITH_SCALAPACK="$(usex scalapack)"
-		-DDEAL_II_WITH_SLEPC="$(usex slepc)"
-		-DDEAL_II_WITH_SUNDIALS="$(usex sundials)"
-		-DDEAL_II_WITH_SYMENGINE="$(usex symengine)"
-		-DDEAL_II_WITH_UMFPACK="$(usex sparse)"
-		-DBUILD_SHARED_LIBS="$(usex !static-libs)"
-		-DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)"
-		-DDEAL_II_WITH_THREADS="$(usex tbb)"
-		-DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
-	)
-
-	# Do a little dance for purely cosmetic "QA" reasons.
-	use opencascade && mycmakeargs+=( -DOPENCASCADE_DIR="${CASROOT}" )
-
-	# Do a little dance for purely cosmetic "QA" reasons. The build system
-	# does query for the highest instruction set first and skips the other
-	# variables if a "higher" variant is set
-	if use cpu_flags_x86_avx512f; then
-		mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes )
-	elif use cpu_flags_x86_avx; then
-		mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes )
-	elif use cpu_flags_x86_avx; then
-		mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use doc && [[ ${PV} != *9999* ]]; then
-		# copy missing images to the build directory:
-		cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \
-			"${BUILD_DIR}"/doc/doxygen/deal.II || die
-		# replace links:
-		sed -i \
-			's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
-			"${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed"
-	fi
-	cmake-utils_src_install
-
-	# decompress the installed example sources:
-	use examples && docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index 6682430cf3ae..63c671d911e7 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,2 +1 @@
 DIST dlib-19.16.tar.gz 10411975 BLAKE2B 93047590a4d8f4685970d3db6841cbf9cc90ca8a5e50f0929a106d887e5db1b4fd96bbe14380537a3e28369a8db6d9d8c067e7768000ac3c7d0f225b46369326 SHA512 4e040ef88acff05e1a48e499b813c876b22ad3f989d076bdf19969d01036b62e51a0dff30b70046910ba31dfa1b1c2450a7fad41ae3142b7285ed74b8d584887
-DIST dlib-19.9.tar.gz 8892457 BLAKE2B d18548e09f8169bbc9d7f339599bd58b940410839b259a8d7be9cb999f82e634ad5cd0539adb45239dab821ea1029493d24ae9990ca32c75c744e2c5d9e218f6 SHA512 1e2123c22e1b13cc84108fa627bfa92eadc9dee63f93a9f45676bbf2b752c8728117d915ac327f5223b0cdbce87dd3bef2f4d8d5ed3f8f5a314ffa9e8962a246
diff --git a/sci-libs/dlib/dlib-19.9.ebuild b/sci-libs/dlib/dlib-19.9.ebuild
deleted file mode 100644
index 7aebb3d2b307..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,7,8,9,10} )
-inherit python-r1 cmake-utils cuda
-
-DESCRIPTION="Numerical and networking C++ library"
-HOMEPAGE="https://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/dsdp/dsdp-5.8-r3.ebuild b/sci-libs/dsdp/dsdp-5.8-r3.ebuild
index aa32624cc96c..6ddc6b9b3640 100644
--- a/sci-libs/dsdp/dsdp-5.8-r3.ebuild
+++ b/sci-libs/dsdp/dsdp-5.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://www.mcs.anl.gov/hs/software/DSDP/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc examples"
 
 RDEPEND="virtual/lapack"
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild
index dcbf5194f3b9..93f521fd137d 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="static-libs openmp cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_avx512dq cpu_flags_x86_avx512vl"
 
 # Our autotools patch hacks in PKG_CHECK_MODULES calls.
diff --git a/sci-libs/fftw/fftw-2.1.5-r9.ebuild b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
index d5f00f831cf9..2d25e734e055 100644
--- a/sci-libs/fftw/fftw-2.1.5-r9.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="https://www.fftw.org"
 SRC_URI="http://www.fftw.org/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 LICENSE="GPL-2+"
 SLOT="2.1"
diff --git a/sci-libs/fftw/fftw-3.3.8-r1.ebuild b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
index 842d4011aaa7..8737bbe2294a 100644
--- a/sci-libs/fftw/fftw-3.3.8-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
index 57268b2585c6..00ec7f15efe3 100644
--- a/sci-libs/fftw/fftw-3.3.9.ebuild
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index f75396705901..cfb9fc03e7a2 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sci-libs/fplll/Manifest b/sci-libs/fplll/Manifest
index 7de415791455..7f69fe9daa2f 100644
--- a/sci-libs/fplll/Manifest
+++ b/sci-libs/fplll/Manifest
@@ -1,4 +1,2 @@
 DIST fplll-5.3.2.tar.gz 1284989 BLAKE2B 66d022c1a6acb3f029c871bebf4925ec5f9447af71829c6d52f2065155bf75f075965a41918722d095546ca18e8e87a85f181a76f5e42abd20c8de8165210bab SHA512 eacd990c468b1d919e1d6cc04f99656d982d5a3807970e0a1dd910a2703eb5b8eff913bc5c0e45790a547bb7aa71189fb9022024186bb84ee04d8602c9980ac2
-DIST fplll-5.3.3.tar.gz 1289510 BLAKE2B 116af9013a9c030301f2a37fae9c4865244c93de8d7a06e6f605387c4e421f9e0735c456291cb1e44d6da3c82dbea3a8f91709eea3f69a4aab1fee876f534aff SHA512 f69b98c9befe9f2ce15fdcb1b4c1bf83a7267f606770228e05416e13930d1ecb745824b1793ccc11ab13ddb0140c1daa6cfade50f2e79f93dee296880d98bef4
 DIST fplll-5.4.0.tar.gz 2612340 BLAKE2B 723230856461ac6418dad00e82fc7505dbbb7bfbbf68fa7f4f3240402d62f3e1ded3049c436a0f6aad9f020727d10acb3fe15dfb8b8a907f5b3c7b191e55e9a9 SHA512 a583aac73e4618ba240c28d3e8485cef6b9c184c11b33799404e96ab99502023073ed1c6fc0d3fbc4e6737415e9ea1a273f3f1e59ccba69d1546f56903567ebe
-DIST libfplll-4.0.4.tar.gz 413519 BLAKE2B afeea5a813d3d5b1b7fe3e81d5a8e9bce66ee4f8a3d265dacaa0ba7ff2f632f0f533182027322e2fd17645f5bc5816b266b167da0e36a00a38f73e794e22a522 SHA512 81cf61118f0dadca8fd82cc58df2fb5f0dc3ddd15a9b5de95a7777e0ece77d8f6a6d50d14ba7fdd6be6697cf375fac2e60792c94cc65f5a181c427dea84d552d
diff --git a/sci-libs/fplll/fplll-4.0.4.ebuild b/sci-libs/fplll/fplll-4.0.4.ebuild
deleted file mode 100644
index 9c700f965a13..000000000000
--- a/sci-libs/fplll/fplll-4.0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils ltprune
-
-DESCRIPTION="Different implementations of the floating-point LLL reduction algorithm"
-HOMEPAGE="https://perso.ens-lyon.fr/damien.stehle/index.html#software"
-SRC_URI="http://perso.ens-lyon.fr/damien.stehle/fplll/lib${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DEPEND=">=dev-libs/gmp-4.2.0:0
-	>=dev-libs/mpfr-2.3.0:0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/lib${P}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README" default
-	dohtml README.html
-	prune_libtool_files
-}
diff --git a/sci-libs/fplll/fplll-5.3.3.ebuild b/sci-libs/fplll/fplll-5.3.3.ebuild
deleted file mode 100644
index 2757d1e1f4a1..000000000000
--- a/sci-libs/fplll/fplll-5.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Implementations of the floating-point LLL reduction algorithm"
-HOMEPAGE="https://github.com/fplll/fplll"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-BDEPEND=""
-DEPEND="dev-libs/gmp:0
-	dev-libs/mpfr:0"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# Support for --with-qd is problematic at the moment.
-	# https://github.com/fplll/fplll/issues/405
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index a0df7a3993e1..5464ee184064 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,2 +1,3 @@
 DIST gdal-3.0.4.tar.gz 14379480 BLAKE2B 1ced7f791608be2ea1aede8705826135a015a3bf376af087b10e0b17a6884c141df4b24654eeac136afd959c1360ce0cf1f1312438093ca305fa38a242d7e364 SHA512 bc5032a123a2cc90145fef8b467a4c9b78ddf7b4d850ceaae8350aacc3f6f23e13dd52219844a2b930b59d000854d3f2cce117643d62ead176b71939f4760ce9
 DIST gdal-3.2.0.tar.gz 18928960 BLAKE2B b6cd2f2700cc26c8dd585667cd7b2e3bd9b78d294b3fa397edc1f4fa326d29dfc29e9646c6f655bcb88f7fa4c80662008fe78ba8460d9fb974fc6ae5dc310061 SHA512 695f32856effc1811931f8722dc1105d78f305ce582a6ba33bf4e1848657a57ad658f3d904c0af48e2c47e48d5d84afbe2c46a3774df43d58b1827fce9bd368f
+DIST gdal-3.2.1.tar.gz 18953600 BLAKE2B b47994849bcf6bc2b2f53daabb85ef99cdc9ce2a06134bc591652bf7e5304d503701d2b07cae520ca71ad6238dd0b073d2034743e59b072fc5eb50c13bc143e6 SHA512 152dd97464a8242ea1da7a3a215b1d3326bab5aa4b0884fcab6880da460577c80075f87ea7b9513d796e899e98b40701c0b6a63f1e5275607905480ec547e688
diff --git a/sci-libs/gdal/gdal-3.0.4-r1.ebuild b/sci-libs/gdal/gdal-3.0.4-r1.ebuild
index 55223e76bc6b..c67f676024bc 100644
--- a/sci-libs/gdal/gdal-3.0.4-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/3.0"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="armadillo +aux-xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 REQUIRED_USE="
diff --git a/sci-libs/gdal/gdal-3.2.0-r1.ebuild b/sci-libs/gdal/gdal-3.2.0-r1.ebuild
index 6a83fc42a1e6..e3cd66af1933 100644
--- a/sci-libs/gdal/gdal-3.2.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/3.2"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="armadillo +aux-xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 REQUIRED_USE="
diff --git a/sci-libs/gdal/gdal-3.2.1.ebuild b/sci-libs/gdal/gdal-3.2.1.ebuild
new file mode 100644
index 000000000000..96f3765e2545
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.2.1.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_OPTIONAL=1
+inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module toolchain-funcs
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="https://gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0/3.2"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="armadillo +aux-xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
+
+REQUIRED_USE="
+	mdb? ( java )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	spatialite? ( sqlite )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	java? (
+		dev-java/ant-core
+		dev-lang/swig:0
+		>=virtual/jdk-1.7:*
+	)
+	perl? ( dev-lang/swig:0 )
+	python? (
+		dev-lang/swig:0
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-libs/expat
+	dev-libs/json-c:=
+	dev-libs/libpcre
+	dev-libs/libxml2:2
+	media-libs/tiff
+	>=sci-libs/libgeotiff-1.5.1-r1:=
+	>=sci-libs/proj-6.0.0:=
+	sys-libs/zlib[minizip(+)]
+	armadillo? ( sci-libs/armadillo:=[lapack] )
+	curl? ( net-misc/curl )
+	fits? ( sci-libs/cfitsio:= )
+	geos? ( >=sci-libs/geos-3.8.0 )
+	gif? ( media-libs/giflib:= )
+	gml? ( >=dev-libs/xerces-c-3.1 )
+	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
+	jpeg? ( virtual/jpeg:0= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma
+	) )
+	mdb? ( dev-java/jackcess:1 )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf:= )
+	odbc? ( dev-db/unixODBC )
+	ogdi? ( sci-libs/ogdi )
+	opencl? ( virtual/opencl )
+	oracle? ( dev-db/oracle-instantclient:= )
+	pdf? ( app-text/poppler:= )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	spatialite? ( dev-db/spatialite )
+	sqlite? ( dev-db/sqlite:3 )
+	webp? ( media-libs/libwebp:= )
+	xls? ( dev-libs/freexl )
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.7:* )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.3-soname.patch"
+	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
+)
+
+src_prepare() {
+	default
+
+	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+		-i configure.ac || die
+
+	sed -e 's:^ar:$(AR):g' \
+		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
+
+	# SWIG: Use of the include path to find the input file is deprecated and will not work with ccache.
+	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
+		-i swig/python/GNUmakefile || die "sed python makefile failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		# charls - not packaged in Gentoo ebuild repository
+		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+		# bsb - legal issues
+		# ingres - same story as oracle oci
+		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
+		# podofo - we use poppler instead they are exclusive for each other
+		# tiff is a hard dep
+		--includedir="${EPREFIX}"/usr/include/${PN}
+		--disable-lto
+		--disable-static
+		--disable-driver-bsb
+		--disable-driver-mrf
+		--disable-pdf-plugin
+		--enable-shared
+		--enable-driver-grib
+		--with-bash-completion="$(get_bashcompdir)"
+		--with-cpp14
+		--with-cryptopp=no
+		--with-expat
+		--with-geotiff
+		--with-gnm
+		--with-hide-internal-symbols
+		--with-libjson-c="${EPREFIX}"/usr/
+		--with-libtiff
+		--with-libtool
+		--with-libz="${EPREFIX}"/usr/
+		--without-charls
+		--without-dods-root
+		--without-ecw
+		--without-epsilon
+		--without-fgdb
+		--without-fme
+		--without-gta
+		--without-grass
+		--without-hdf4
+		--without-idb
+		--without-ingres
+		--without-jasper
+		--without-jp2lura
+		--without-jp2mrsid
+		--without-kakadu
+		--without-kea
+		--without-libkml
+		--without-mongocxx
+		--without-mrsid
+		--without-mrsid_lidar
+		--without-msg
+		--without-rasdaman
+		--without-rasterlite2
+		--without-pcraster
+		--without-pdfium
+		--without-perl
+		--without-podofo
+		--without-python
+		--without-qhull
+		--without-sfcgal
+		--without-sosi
+		--without-teigha
+		$(use_enable debug)
+		$(use_with armadillo)
+		$(use_with aux-xml pam)
+		$(use_with curl)
+		$(use_with fits cfitsio)
+		$(use_with geos)
+		$(use_with gif)
+		$(use_with gml xerces)
+		$(use_with hdf5)
+		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
+		$(use_with jpeg)
+		$(use_with jpeg2k openjpeg)
+		$(use_with lzma liblzma)
+		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
+		$(use_with netcdf)
+		$(use_with oracle oci)
+		$(use_with odbc)
+		$(use_with ogdi ogdi "${EPREFIX}"/usr)
+		$(use_with opencl)
+		$(use_with pdf poppler)
+		$(use_with png)
+		$(use_with postgres pg)
+		$(use_with spatialite)
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+		$(use_with threads)
+		$(use_with webp)
+		$(use_with xls freexl)
+		$(use_with zstd)
+	)
+
+	tc-export AR RANLIB
+
+	if use java; then
+		myconf+=(
+			--with-java=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-lib=dlopen
+			$(use_with mdb)
+		)
+	else
+		myconf+=( --without-java --without-mdb )
+	fi
+
+	if use sqlite; then
+		append-libs -lsqlite3
+	fi
+
+	# bug #632660
+	if use ogdi; then
+		append-cflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+		append-cxxflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# mysql-config puts this in (and boy is it a PITA to get it out)
+	if use mysql; then
+		sed -e "s: -rdynamic : :" \
+			-i GDALmake.opt || die "sed LIBS failed"
+	fi
+}
+
+src_compile() {
+	if use perl; then
+		rm "${S}"/swig/perl/*_wrap.cpp || die
+		emake -C "${S}"/swig/perl generate
+	fi
+
+	# gdal-config needed before generating Python bindings
+	default
+
+	if use java; then
+		pushd "${S}"/swig/java > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+
+	if use perl; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null || die
+	fi
+
+	if use python; then
+		rm -f "${S}"/swig/python/*_wrap.cpp || die
+		emake -C "${S}"/swig/python generate
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+
+	use doc && emake docs
+}
+
+src_install() {
+	local DOCS=( NEWS )
+	use doc && local HTML_DOCS=( html/. )
+
+	default
+
+	use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
+
+	if use perl; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		myinst=( DESTDIR="${D}" )
+		perl-module_src_install
+		popd > /dev/null || die
+		perl_delete_localpod
+	fi
+
+	if use python; then
+		# Don't clash with gdal's docs
+		unset DOCS HTML_DOCS
+
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+
+		newdoc swig/python/README.rst README-python.rst
+
+		insinto /usr/share/${PN}/samples
+		doins -r swig/python/samples/.
+	fi
+
+	doman "${S}"/man/man*/*
+	find "${ED}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 7ba340960fc8..c486bce0963a 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,2 +1,2 @@
 DIST geos-3.8.1.tar.bz2 2505407 BLAKE2B 43053ea9e29d190f41c37d5d382b689ef477e0256cfd5705f4f2f316cac21a1674660bcf0900c51db72909c41d46be7a41d297958de48e108ae6d6bd1ca9d247 SHA512 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056
-DIST geos-3.9.0.tar.bz2 4760200 BLAKE2B f4d610ac4693fea1c10bbb3b9d328b3d4eded15efc740cb1577a516f399f23e42e22d88130479d94722a2867c1b787c7c266d5e976ec823ea17f63045db2ae54 SHA512 518be112b2e05063d97c09d0e568b784e6c65b0a7be1368cefbd481b3f4ac2d8fc89611e6e205a95f4d1740ab4f47b3929fb4c801bcf9a9e9b6ae86a54e62933
+DIST geos-3.9.0-r1.tar.bz2 4710957 BLAKE2B dab0f4e0bfb1bd244c2faf5ee6149b65d142eea78e87490025f90b672eee0d25d4ba9bc4c3b223e78ea0c9d34625b4750c7ba03852e5ea9540ad5c479d84b995 SHA512 1081f2aa20e671450953f7bb53b17c703804a1c9f4987c9da0987ff24339af5811b2c8b79c8e438d04ca38e4d06164dc5a4206f266f7efc19af3f9d9ea8f71f8
diff --git a/sci-libs/geos/geos-3.8.1.ebuild b/sci-libs/geos/geos-3.8.1.ebuild
index baade73842c7..e6f8a36be5da 100644
--- a/sci-libs/geos/geos-3.8.1.ebuild
+++ b/sci-libs/geos/geos-3.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://download.osgeo.org/geos/${PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc ruby static-libs"
 
 BDEPEND="
diff --git a/sci-libs/geos/geos-3.9.0.ebuild b/sci-libs/geos/geos-3.9.0-r2.ebuild
index dd73711e579f..69116e672afc 100644
--- a/sci-libs/geos/geos-3.9.0.ebuild
+++ b/sci-libs/geos/geos-3.9.0-r2.ebuild
@@ -1,39 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Geometry engine library for Geographic Information Systems"
 HOMEPAGE="https://trac.osgeo.org/geos/"
-SRC_URI="http://download.osgeo.org/geos/${PN}-${PV}.tar.bz2"
+
+# Arrow can be removed at next version bump. Upstream mistakenly
+# released rc1 as 3.9.0. So, we need(ed) a new Manifest entry to get the
+# real 3.9.0
+SRC_URI="https://download.osgeo.org/geos/${PN}-${PV}.tar.bz2 -> ${PN}-${PV}-r1.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc ruby static-libs"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="doc static-libs"
 
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	ruby? ( dev-lang/swig:0 )
-"
-RDEPEND="
-	ruby? ( dev-lang/ruby:* )
-"
-DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 RESTRICT="test"
 
-src_prepare() {
-	default
-	echo "#!${EPREFIX}/bin/bash" > py-compile
-}
-
 src_configure() {
-	local myeconfargs=(
-		--disable-python
-		$(use_enable ruby)
-		$(use_enable static-libs static)
-	)
+	local myeconfargs=(	$(use_enable static-libs static) )
 	use arm && myeconfargs+=( --disable-inline ) # bug 709368
 
 	econf "${myeconfargs[@]}"
diff --git a/sci-libs/givaro/givaro-4.1.1.ebuild b/sci-libs/givaro/givaro-4.1.1.ebuild
index 935649abda69..82c862d823f5 100644
--- a/sci-libs/givaro/givaro-4.1.1.ebuild
+++ b/sci-libs/givaro/givaro-4.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/linbox-team/givaro/releases/download/v${PV}/${P}.tar
 
 LICENSE="CeCILL-B"
 SLOT="0/9"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/gmsh/gmsh-4.6.0.ebuild b/sci-libs/gmsh/gmsh-4.6.0.ebuild
index d42169d7ba05..8789ca2a8215 100644
--- a/sci-libs/gmsh/gmsh-4.6.0.ebuild
+++ b/sci-libs/gmsh/gmsh-4.6.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3 free-noncomm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 ## cgns is not compiling ATM, maybe fix cgns lib first
-IUSE="blas cgns examples jpeg lua med metis mpi netgen opencascade petsc png python X zlib"
+IUSE="blas cgns examples jpeg med metis mpi netgen opencascade petsc png python X zlib"
 
 REQUIRED_USE="med? ( mpi )"
 
@@ -25,7 +25,6 @@ RDEPEND="
 	blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
 	cgns? ( sci-libs/cgnslib )
 	jpeg? ( virtual/jpeg:0 )
-	lua? ( dev-lang/lua:0 )
 	med? ( sci-libs/med[mpi] )
 	opencascade? ( sci-libs/opencascade:* )
 	png? ( media-libs/libpng:0 )
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 00fc6640e730..916572058e4f 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1,5 +1,4 @@
 DIST gsl-1.16-cblas.patch.bz2 2810 BLAKE2B 364c9f93a386e5d95c86789a3c00231cdfbe588fe4371ae85447bc6574b7798721a8559fda747ee656de96e7d8c5657901db86dc9c59bcee27789c918222e38f SHA512 55a2dab850697b1e378ecf64d299ed6f021f1b1eb7dbad749f5014e5b7f275ec6c981a5699a87969c4d0794677efa51a5a2317526b58ca96aabb3f6a68cabd81
 DIST gsl-1.16.tar.gz 3534080 BLAKE2B 1c55a41e5ed57b57f671074240d23416aa8f23e3cc2bb832e455d4f44d307e6be6adfa3671dbbf2aa14604ea49f96ff636de7909f3532cdc811f6bd99b0aa59d SHA512 94e998953f30d701e1cd0a5e05d572c5cca7b6f40f0533aa85394ba4218946826408093ffe3049a0ab13d6ba87034fcec1a7d52a67d0b8860dc02b5fd4feb8eb
 DIST gsl-2.3-cblas.patch.bz2 12036 BLAKE2B ddad801cc42f925581e2e4995292f3eab0d2faf70c43c3b205fcf521b98e426df1d0824ed7d98b2c4cc89bbc4068fd45f2595dc02d23bded5c702b5a01bbfdb2 SHA512 37b867a21e60cd96c453ae24139bcf16c00c85bb6d5a3dcece81185fd9af5870c5167d2fa3c74cffce55bfb84f72be34d28ea94e0889904f8dda8687f66b4d23
-DIST gsl-2.4.tar.gz 5916715 BLAKE2B f22c07b2d5759a383e05b8bfdba70071672cc27f12ff2a8c755451fe7e10c8e2d80e3fcc601508c5e9942e4cfd05e51c43ba96666326b760e4390eb0c2552886 SHA512 12442b023dd959e8b22a9c486646b5cedec7fdba0daf2604cda365cf96d10d99aefdec2b42e59c536cc071da1525373454e5ed6f4b15293b305ca9b1dc6db130
 DIST gsl-2.5.tar.gz 7303881 BLAKE2B 7c6d10c21071a1af1f03123f83244476d2e90fcd27d05a115b03a74fe631eb7d8081f5260e534ae58ab0997c1111f980a5e4cb50d110ca626fe810c44be70180 SHA512 5b4c5c023f9029ce220f4e09aa4d0234fed94d42ac224d58fda095fe0532d54237a7c33278f8b5d0ba051f6004486edb38d0adb4fcb49337a8c1d8a18cf4a24a
diff --git a/sci-libs/gsl/gsl-1.16.ebuild b/sci-libs/gsl/gsl-1.16.ebuild
index 9e12fd2e9bdf..dd0a369c37c3 100644
--- a/sci-libs/gsl/gsl-1.16.ebuild
+++ b/sci-libs/gsl/gsl-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas )"
diff --git a/sci-libs/gsl/gsl-2.4.ebuild b/sci-libs/gsl/gsl-2.4.ebuild
deleted file mode 100644
index 717234335f10..000000000000
--- a/sci-libs/gsl/gsl-2.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${PN}-2.3-cblas.patch.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cblas-external +deprecated static-libs"
-
-RDEPEND="cblas-external? ( virtual/cblas:= )"
-DEPEND="${RDEPEND}
-	app-eselect/eselect-cblas
-	virtual/pkgconfig"
-
-PATCHES=( "${WORKDIR}"/${PN}-2.3-cblas.patch )
-
-pkg_pretend() {
-	# prevent to use external cblas from a previously installed gsl
-	local current_lib
-	if use cblas-external; then
-		current_lib=$(eselect cblas show | cut -d' ' -f2)
-		if [[ ${current_lib} == gsl ]]; then
-			ewarn "USE flag cblas-external is set: linking gsl with an external cblas."
-			ewarn "However the current selected external cblas is gsl."
-			ewarn "Please install and/or eselect another cblas"
-			die "Circular gsl dependency"
-		fi
-	fi
-}
-
-src_prepare() {
-	ESELECT_PROF="gsl"
-
-	# bug 349005
-	[[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(tc-getCC)$ != *apple* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \
-		&& filter-mfpmath sse
-	filter-flags -ffast-math
-
-	default
-	if use deprecated; then
-		sed -i -e "/GSL_DISABLE_DEPRECATED/,+2d" configure.ac || die
-	fi
-	eautoreconf
-
-	cp "${FILESDIR}"/eselect.cblas.gsl "${T}"/ || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.gsl || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.cblas.gsl || die
-	fi
-}
-
-src_configure() {
-	if use cblas-external; then
-		export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
-		export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
-	fi
-	econf \
-		--enable-shared \
-		$(use_with cblas-external) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	local MAKEOPTS="${MAKEOPTS} -j1"
-	default
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	# take care of pkgconfig file for cblas implementation.
-	sed \
-		-e "s/@LIBDIR@/$(get_libdir)/" \
-		-e "s/@PV@/${PV}/" \
-		-e "/^prefix=/s:=:=${EPREFIX}:" \
-		-e "/^libdir=/s:=:=${EPREFIX}:" \
-		"${FILESDIR}"/cblas.pc.in > cblas.pc \
-		|| die "sed cblas.pc failed"
-	insinto /usr/$(get_libdir)/blas/gsl
-	doins cblas.pc
-	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.gsl \
-		${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=cblas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/gsl/gsl-2.5-r1.ebuild b/sci-libs/gsl/gsl-2.5-r1.ebuild
index f1d81874a93a..2a2625d5c3de 100644
--- a/sci-libs/gsl/gsl-2.5-r1.ebuild
+++ b/sci-libs/gsl/gsl-2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external +deprecated static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/gsl/gsl-2.5.ebuild b/sci-libs/gsl/gsl-2.5.ebuild
deleted file mode 100644
index 491d3cbe7610..000000000000
--- a/sci-libs/gsl/gsl-2.5.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Scientific Library"
-HOMEPAGE="https://www.gnu.org/software/gsl/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${PN}-2.3-cblas.patch.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/23"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cblas-external +deprecated static-libs"
-
-RDEPEND="cblas-external? ( virtual/cblas:= )"
-DEPEND="${RDEPEND}
-	app-eselect/eselect-cblas
-	virtual/pkgconfig"
-
-PATCHES=( "${WORKDIR}"/${PN}-2.3-cblas.patch )
-
-pkg_pretend() {
-	# prevent to use external cblas from a previously installed gsl
-	local current_lib
-	if use cblas-external; then
-		current_lib=$(eselect cblas show | cut -d' ' -f2)
-		if [[ ${current_lib} == gsl ]]; then
-			ewarn "USE flag cblas-external is set: linking gsl with an external cblas."
-			ewarn "However the current selected external cblas is gsl."
-			ewarn "Please install and/or eselect another cblas"
-			die "Circular gsl dependency"
-		fi
-	fi
-}
-
-src_prepare() {
-	ESELECT_PROF="gsl"
-
-	# bug 349005
-	[[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(tc-getCC)$ != *apple* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \
-		&& filter-mfpmath sse
-	filter-flags -ffast-math
-
-	default
-	if use deprecated; then
-		sed -i -e "/GSL_DISABLE_DEPRECATED/,+2d" configure.ac || die
-	fi
-	eautoreconf
-
-	cp "${FILESDIR}"/eselect.cblas.gsl "${T}"/ || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.gsl || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.cblas.gsl || die
-	fi
-}
-
-src_configure() {
-	if use cblas-external; then
-		export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
-		export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
-	fi
-	econf \
-		--enable-shared \
-		$(use_with cblas-external) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	local MAKEOPTS="${MAKEOPTS} -j1"
-	default
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	# take care of pkgconfig file for cblas implementation.
-	sed \
-		-e "s/@LIBDIR@/$(get_libdir)/" \
-		-e "s/@PV@/${PV}/" \
-		-e "/^prefix=/s:=:=${EPREFIX}:" \
-		-e "/^libdir=/s:=:=${EPREFIX}:" \
-		"${FILESDIR}"/cblas.pc.in > cblas.pc \
-		|| die "sed cblas.pc failed"
-	insinto /usr/$(get_libdir)/blas/gsl
-	doins cblas.pc
-	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.gsl \
-		${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=cblas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index 5fbf047ece69..e10b0af4e450 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,2 +1 @@
-DIST hdf-4.2.11.tar.bz2 3173535 BLAKE2B a35a366858cc67d6ef68959cf407c21a929d5dca82834937b648eded506c7c3f75dd67be763f0d1fc24b7be92849b53d688abb25611cbc9b918340dbb23a83e1 SHA512 b3be9a91c62fa258c8aa6f97d1ccbd8301225e43938b525a826c639fd8b30b7dd566f58f4d54e365606d861ad01660887163e5ca6521293791080e5ed41ef781
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
diff --git a/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch b/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch
deleted file mode 100644
index f6f15545d66b..000000000000
--- a/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -Nur hdf-4.2.11.orig/hdf/examples/Makefile.am hdf-4.2.11/hdf/examples/Makefile.am
---- hdf-4.2.11.orig/hdf/examples/Makefile.am	2016-03-16 20:07:45.103492925 +0000
-+++ hdf-4.2.11/hdf/examples/Makefile.am	2016-03-16 22:16:35.836304451 +0000
-@@ -46,8 +46,8 @@
- INSTALL_TOP_FILES = README
- 
- # Where to install example files
--EXAMPLEDIR=$(prefix)/examples/c
--EXAMPLETOPDIR=$(prefix)/examples
-+EXAMPLEDIR=$(docdir)/examples/c
-+EXAMPLETOPDIR=$(docdir)/examples
- 
- # How to build C programs using h4cc
- $(EXTRA_PROG): $(H4CC)
-diff -Nur hdf-4.2.11.orig/hdf/fortran/examples/Makefile.am hdf-4.2.11/hdf/fortran/examples/Makefile.am
---- hdf-4.2.11.orig/hdf/fortran/examples/Makefile.am	2016-03-16 20:07:45.103492925 +0000
-+++ hdf-4.2.11/hdf/fortran/examples/Makefile.am	2016-03-16 22:17:58.775261767 +0000
-@@ -41,7 +41,7 @@
- INSTALL_SCRIPT_FILES = run-fortran-ex.sh
- 
- # Where to install Fortran example files
--EXAMPLEDIR=$(prefix)/examples/fortran
-+EXAMPLEDIR=$(docdir)/examples/fortran
- 
- # How to build Fortran programs using h4fc
- $(EXTRA_PROG): $(H4FC)
-diff -Nur hdf-4.2.11.orig/mfhdf/examples/Makefile.am hdf-4.2.11/mfhdf/examples/Makefile.am
---- hdf-4.2.11.orig/mfhdf/examples/Makefile.am	2016-03-16 20:07:45.183491919 +0000
-+++ hdf-4.2.11/mfhdf/examples/Makefile.am	2016-03-16 22:18:38.304764814 +0000
-@@ -23,7 +23,7 @@
- 	SD_get_info.c SD_find_sds_by_name.c SD_set_get_dim_info.c        \
- 	SD_dimscale_vs_sds.c SD_set_attr.c SD_get_attr.c SD_chunking_example.c
- 
--EXAMPLEDIR=$(prefix)/examples/c
-+EXAMPLEDIR=$(docdir)/examples/c
- 
- # How to build programs using h4cc
- $(EXTRA_PROG): $(H4CC)
-diff -Nur hdf-4.2.11.orig/mfhdf/fortran/examples/Makefile.am hdf-4.2.11/mfhdf/fortran/examples/Makefile.am
---- hdf-4.2.11.orig/mfhdf/fortran/examples/Makefile.am	2016-03-16 20:07:45.183491919 +0000
-+++ hdf-4.2.11/mfhdf/fortran/examples/Makefile.am	2016-03-16 22:18:15.075056851 +0000
-@@ -24,7 +24,7 @@
- 	SD_set_attr.f SD_get_attr.f SD_compress_sds.f SD_chunking_example.f
- 
- # Where to install example files
--EXAMPLEDIR=$(prefix)/examples/fortran
-+EXAMPLEDIR=$(docdir)/examples/fortran
- 
- # How to build Fortran programs using h4fc
- $(EXTRA_PROG): $(H4FC)
-diff -up hdf-4.2.11/config/examples.am.destdir hdf-4.2.11/config/examples.am
---- hdf-4.2.11/config/examples.am.destdir	2015-02-09 09:43:05.000000000 -0700
-+++ hdf-4.2.11/config/examples.am	2015-02-13 13:24:09.008230956 -0700
-@@ -44,7 +44,7 @@ CHECK_CLEANFILES+= *.hdf
- CLEANFILES=$(EXAMPLE_PROG)
- 
- # How to create EXAMPLEDIR if it doesn't already exist
--$(EXAMPLEDIR):
-+$(DESTDIR)$(EXAMPLEDIR):
- 	mkdir -p $@
- 
- # Install and uninstall rules.  We install the source files, not the
-@@ -54,42 +54,42 @@ install-data-local:
- uninstall-local:
- 	@$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
- 
--install-examples: $(EXAMPLEDIR) 
-+install-examples: $(DESTDIR)$(EXAMPLEDIR) 
- 	@for f in X $(INSTALL_FILES); do                                     \
- 	  if test $$f != X; then                                             \
--	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);    \
--	    chmod a-x $(EXAMPLEDIR)/$$f;                                     \
-+	    (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1);    \
-+	    chmod a-x $(DESTDIR)$(EXAMPLEDIR)/$$f;                                     \
- 	  fi;                                                                \
- 	done
- 	@for f in X $(INSTALL_SCRIPT_FILES); do                              \
- 	  if test $$f != X; then                                             \
--	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);    \
-+	    (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1);    \
- 	  fi;                                                                \
- 	done
- 	@for f in X $(INSTALL_TOP_FILES); do                                 \
- 	  if test $$f != X; then                                             \
--	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
--	    chmod a-x $(EXAMPLETOPDIR)/$$f;                                  \
-+	    (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
-+	    chmod a-x $(DESTDIR)$(EXAMPLETOPDIR)/$$f;                                  \
- 	  fi;                                                                \
- 	done
- 	@for f in X $(INSTALL_TOP_SCRIPT_FILES); do                          \
- 	  if test $$f != X; then                                             \
--	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLETOPDIR)/. || exit 1); \
-+	    (set -x; $(INSTALL) $(srcdir)/$$f $(DESTDIR)$(EXAMPLETOPDIR)/. || exit 1); \
- 	  fi;                                                                \
- 	done
- 
- uninstall-examples:
--	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then           \
--	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);              \
-+	@if test -n "$(INSTALL_FILES)" -a -d $(DESTDIR)$(EXAMPLEDIR); then           \
-+	  set -x; cd $(DESTDIR)$(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);              \
- 	fi
--	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(EXAMPLEDIR); then    \
--	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);       \
-+	@if test -n "$(INSTALL_SCRIPT_FILES)" -a -d $(DESTDIR)$(EXAMPLEDIR); then    \
-+	  set -x; cd $(DESTDIR)$(EXAMPLEDIR) && $(RM) $(INSTALL_SCRIPT_FILES);       \
- 	fi
--	@if test -n "$(INSTALL_TOP_FILES)" -a -d $(EXAMPLETOPDIR); then    \
--	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES);       \
-+	@if test -n "$(INSTALL_TOP_FILES)" -a -d $(DESTDIR)$(EXAMPLETOPDIR); then    \
-+	  set -x; cd $$(DESTDIR)(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_FILES);       \
- 	fi
--	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(EXAMPLETOPDIR); then    \
--	  set -x; cd $(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);       \
-+	@if test -n "$(INSTALL_TOP_SCRIPT_FILES)" -a -d $(DESTDIR)$(EXAMPLETOPDIR); then    \
-+	  set -x; cd $(DESTDIR)$(EXAMPLETOPDIR) && $(RM) $(INSTALL_TOP_SCRIPT_FILES);       \
- 	fi
- 
- installcheck-local:
diff --git a/sci-libs/hdf/hdf-4.2.11.ebuild b/sci-libs/hdf/hdf-4.2.11.ebuild
deleted file mode 100644
index e898f4d07374..000000000000
--- a/sci-libs/hdf/hdf-4.2.11.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 toolchain-funcs autotools flag-o-matic ltprune
-
-MYP=${P/_p/-patch}
-
-DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="https://www.hdfgroup.org/hdf4.html"
-SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
-
-SLOT="0"
-LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples fortran szip static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( szip )"
-
-RDEPEND="
-	sys-libs/zlib
-	virtual/jpeg:0
-	szip? ( virtual/szip )"
-DEPEND="${RDEPEND}
-	test? ( virtual/szip )"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.11-fix-szip-detection.patch
-	"${FILESDIR}"/${PN}-4.2.11-enable-fortran-shared.patch
-	"${FILESDIR}"/${PN}-4.2.11-fix-examples-dir.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
-	eautoreconf
-	[[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--enable-production=gentoo \
-		--disable-netcdf \
-		$(use_enable fortran) \
-		$(use_enable static-libs static) \
-		$(use_with szip szlib) \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	default
-	use static-libs || prune_libtool_files --all
-	dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
-	cd "${ED}"usr
-	use examples || rm -rf share/doc/${PF}/examples
-	mv bin/ncgen{,-hdf} || die
-	mv bin/ncdump{,-hdf} || die
-	mv share/man/man1/ncgen{,-hdf}.1 || die
-	mv share/man/man1/ncdump{,-hdf}.1 || die
-}
diff --git a/sci-libs/hypre/Manifest b/sci-libs/hypre/Manifest
index 73775a2eb873..fc080f5581bf 100644
--- a/sci-libs/hypre/Manifest
+++ b/sci-libs/hypre/Manifest
@@ -1,3 +1 @@
-DIST hypre-2.14.0.tar.gz 7312329 BLAKE2B 93de48bdd05c383c74fb1b3b25ddcd5830be099aa7557262547932e17eba524c25ff69ff94d10f29ffdabfef9c05281fd485a7c9b999141f2488ae4fc0238736 SHA512 c7b59fb7ab1cc906e339fcc00603898e44234a65aa74600f740bc825aa94aa66ff0cbd4bd4b7f339c0d28ff5bd9494f15b57f2017a22348fee14b4e8333f1e6c
-DIST hypre-2.18.0.tar.gz 5698227 BLAKE2B e6562b78dcff6592a7df86d2162e3669c9ea3f71cc8926402038da319cb6c1b801a7ac5e44612ba86762ccdd63ae30cd2976451368309622b46e67a7a7dc1d83 SHA512 41292d590285703b5fb91c767fc9d064e36911f09583a81a3da9f2b5524143b23bb1beba3449d759e3f681760d9ad155072e1762d7d6bbe0e65660d5b16c472a
 DIST hypre-2.18.2.tar.gz 5699792 BLAKE2B 6adb343d23594adea60a4009f589285236365a5769b1d5cb66908ce83984dd48b3be929e6c7298c7b9cb1e2d67b1fe7ea641c8a160562d223edb9809977fb684 SHA512 7b343a5c8530d7f5e31cad6c940c2f154b2b954566d4fe8525d690fec41db23936a46fb642a994791de32984e696c624804fb1fde1f0c9ce026f1a6e46b9c0f4
diff --git a/sci-libs/hypre/hypre-2.14.0.ebuild b/sci-libs/hypre/hypre-2.14.0.ebuild
deleted file mode 100644
index a7d775a6c575..000000000000
--- a/sci-libs/hypre/hypre-2.14.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit cmake-utils fortran-2 toolchain-funcs flag-o-matic
-
-DESCRIPTION="Parallel matrix preconditioners library"
-HOMEPAGE="https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods"
-SRC_URI="https://github.com/LLNL/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc examples fei fortran int64 openmp mpi"
-
-RDEPEND="
-	sci-libs/superlu:=
-	virtual/blas
-	virtual/lapack
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( CHANGELOG COPYRIGHT README )
-
-# 2.11.1: fei and mli wrappers still buggy with big integers
-REQUIRED_USE="int64? ( !fei )"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] &&\
-		use openmp && [[ $(tc-getCC)$ == *gcc* ]] && tc-check-openmp
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && \
-		   use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp ; then
-		ewarn "You are using a non capable gcc compiler ( < 4.2 ? )"
-		die "Need an OpenMP capable compiler"
-	fi
-}
-
-src_prepare() {
-	default
-	# link with system superlu and propagate LDFLAGS
-	sed -e "s:@LIBS@:@LIBS@ $($(tc-getPKG_CONFIG) --libs superlu):" \
-		-e 's:_SHARED@:_SHARED@ $(LDFLAGS):g' \
-		-i src/config/Makefile.config.in || die
-	sed -e '/HYPRE_ARCH/s: = :=:g' \
-		-i src/configure || die
-	# link with system blas and lapack
-	sed -e '/^BLASFILES/d' \
-		-e '/^LAPACKFILES/d' \
-		-i src/lib/Makefile || die
-}
-
-src_configure() {
-	tc-export CC CXX
-	append-flags -Dhypre_dgesvd=dgesvd_
-	use openmp && [[ $(tc-getCC)$ == *gcc* ]] && \
-		append-flags -fopenmp && append-ldflags -fopenmp
-	use mpi && CC=mpicc FC=mpif77 CXX=mpicxx
-
-	cd src
-
-	# without-superlu: means do not use bundled one
-	econf \
-		--enable-shared \
-		--with-blas-libs="$($(tc-getPKG_CONFIG) --libs-only-l blas | sed -e 's/-l//g')" \
-		--with-blas-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L blas | sed -e 's/-L//g')" \
-		--with-lapack-libs="$($(tc-getPKG_CONFIG) --libs-only-l lapack | sed -e 's/-l//g')" \
-		--with-lapack-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L lapack | sed -e 's/-L//g')" \
-		--with-timing \
-		--without-superlu \
-		$(use_enable debug) \
-		$(use_enable openmp hopscotch) \
-		$(use_enable int64 bigint) \
-		$(use_enable fortran) \
-		$(use_with fei) \
-		$(use_with fei mli) \
-		$(use_with openmp) \
-		$(use_with mpi MPI)
-}
-
-src_compile() {
-	emake -C src
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/src/lib:${LD_LIBRARY_PATH}" \
-				   PATH="${S}/src/test:${PATH}" \
-				   emake -C src check
-}
-
-src_install() {
-	emake -C src install \
-		  HYPRE_INSTALL_DIR="${ED}" \
-		  HYPRE_LIB_INSTALL="${ED}/usr/$(get_libdir)" \
-		  HYPRE_INC_INSTALL="${ED}$/usr/include/hypre"
-	use doc && dodoc docs/*.pdf
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r src/examples
-	fi
-}
diff --git a/sci-libs/hypre/hypre-2.18.0.ebuild b/sci-libs/hypre/hypre-2.18.0.ebuild
deleted file mode 100644
index 7f9dd4cc4b14..000000000000
--- a/sci-libs/hypre/hypre-2.18.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit cmake-utils fortran-2 toolchain-funcs flag-o-matic
-
-DESCRIPTION="Parallel matrix preconditioners library"
-HOMEPAGE="https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods"
-SRC_URI="https://github.com/${PN}-space/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug examples fortran int64 openmp mpi"
-
-RDEPEND="
-	sci-libs/superlu:=
-	virtual/blas
-	virtual/lapack
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( CHANGELOG COPYRIGHT README )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] &&\
-		use openmp && [[ $(tc-getCC)$ == *gcc* ]] && tc-check-openmp
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && \
-		   use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp ; then
-		ewarn "You are using a non capable gcc compiler ( < 4.2 ? )"
-		die "Need an OpenMP capable compiler"
-	fi
-}
-
-src_prepare() {
-	default
-	# link with system superlu and propagate LDFLAGS
-	sed -e "s:@LIBS@:@LIBS@ $($(tc-getPKG_CONFIG) --libs superlu):" \
-		-e 's:_SHARED@:_SHARED@ $(LDFLAGS):g' \
-		-i src/config/Makefile.config.in || die
-	sed -e '/HYPRE_ARCH/s: = :=:g' \
-		-i src/configure || die
-	# link with system blas and lapack
-	sed -e '/^BLASFILES/d' \
-		-e '/^LAPACKFILES/d' \
-		-i src/lib/Makefile || die
-}
-
-src_configure() {
-	tc-export CC CXX
-	append-flags -Dhypre_dgesvd=dgesvd_
-	use openmp && [[ $(tc-getCC)$ == *gcc* ]] && \
-		append-flags -fopenmp && append-ldflags -fopenmp
-	use mpi && CC=mpicc FC=mpif77 CXX=mpicxx
-
-	cd src
-
-	# without-superlu: means do not use bundled one
-	econf \
-		--enable-shared \
-		--with-blas-libs="$($(tc-getPKG_CONFIG) --libs-only-l blas | sed -e 's/-l//g')" \
-		--with-blas-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L blas | sed -e 's/-L//g')" \
-		--with-lapack-libs="$($(tc-getPKG_CONFIG) --libs-only-l lapack | sed -e 's/-l//g')" \
-		--with-lapack-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L lapack | sed -e 's/-L//g')" \
-		--with-timing \
-		--without-superlu \
-		$(use_enable debug) \
-		$(use_enable openmp hopscotch) \
-		$(use_enable int64 bigint) \
-		$(use_enable fortran) \
-		$(use_with openmp) \
-		$(use_with mpi MPI)
-}
-
-src_compile() {
-	emake -C src
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/src/lib:${LD_LIBRARY_PATH}" \
-				   PATH="${S}/src/test:${PATH}" \
-				   emake -C src check
-}
-
-src_install() {
-	emake -C src install \
-		  HYPRE_INSTALL_DIR="${ED}" \
-		  HYPRE_LIB_INSTALL="${ED}/usr/$(get_libdir)" \
-		  HYPRE_INC_INSTALL="${ED}$/usr/include/hypre"
-
-	if use examples; then
-		dodoc -r src/examples
-	fi
-}
diff --git a/sci-libs/hypre/metadata.xml b/sci-libs/hypre/metadata.xml
index 299cc8d463b5..43f4ff0391e9 100644
--- a/sci-libs/hypre/metadata.xml
+++ b/sci-libs/hypre/metadata.xml
@@ -14,7 +14,6 @@
   </upstream>
   <use>
     <flag name="int64">Build the 64 bits integer library</flag>
-    <flag name="fei">Build the internal Finite Element Interface routines</flag>
   </use>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/sci-libs/idlmarkwardt/Manifest b/sci-libs/idlmarkwardt/Manifest
index 3e5d8f56dc12..77ed7f9fedcf 100644
--- a/sci-libs/idlmarkwardt/Manifest
+++ b/sci-libs/idlmarkwardt/Manifest
@@ -1,2 +1 @@
-DIST idlmarkwardt-20130418.tar.gz 703131 BLAKE2B 6898edaeebfadb827773bfd8653b581788fdfa45bd605a4b905f93cebe5a478b28abaace2e2494f022105370738adad3fb58f5594d3b5a901cfa26d72cf5472d SHA512 e93187ffa6c719c9b3b54bf61d5b138abd6c7cc91029b0802b9542c6699c29c3d8ee26e3afeccf10bfabecea36d588cd27031621739ab509e3dfd6c0ade7b4cc
 DIST idlmarkwardt-20160319.tar.gz 705496 BLAKE2B 094cf3b7c83d717ede077ede9b62aca8de23e5c680569a0853183719d324aa7ae76552c3468ba6bfa7688e08db88d3247547c537ea219fb5dc7403632bb02599 SHA512 b0eb3ee4cf4ac9450e2557f1ec53660ed6e618a4602f592d551d0a81270aba15cd4eeefb1307b415f2b6f498c192db54ca1ef5e07400260b25a2f7f4b308ecdc
diff --git a/sci-libs/idlmarkwardt/idlmarkwardt-20130418.ebuild b/sci-libs/idlmarkwardt/idlmarkwardt-20130418.ebuild
deleted file mode 100644
index 327e2a4e975b..000000000000
--- a/sci-libs/idlmarkwardt/idlmarkwardt-20130418.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Craig Markwardt IDL procedures (MPFIT, CMSVLIB, etc)"
-HOMEPAGE="https://cow.physics.wisc.edu/~craigm/idl/idl.html"
-SRC_URI="http://www.physics.wisc.edu/~craigm/idl/down/cmtotal.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Markwardt"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/gdl"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/gnudatalanguage/${PN}
-	doins *.pro
-	dodoc *README
-}
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index b7f2faea90cf..bc54b8bf2c0d 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,4 +1,3 @@
-DIST indilib-1.7.5.tar.xz 1380436 BLAKE2B 092f4100894218bf749ee0d7c910c4ee20026cf471f4f65686b67dd37a924b448b6de3733e70d7047dca6a77fd8ae26b9a568f8249336be78d052984838a2ccf SHA512 57205ed9ea9d8e8215886b17d9f0307755bca571d599967dc607320fad5ec62096f31526280f3b184ffeb0434d9adb71e65a7d6f89d29edaa643d729765f47a8
 DIST indilib-1.8.3.tar.gz 2062250 BLAKE2B f46b557dfbbe16070605ad638111505577b801ac6abc2cf42df3a322eaec35a25e6f8efe3ea740b5758b3aeadd656efb4b98e284d531621ab34ca00f28e39a2e SHA512 09c23299659efea795ec430566a5b51181878c382c72f1e530ef3abe3b996b670506f6f5f1bca4eb88fbdc756854c3a36d8bd646a2cf13e397e09ace1f1af044
-DIST indilib-1.8.6.tar.gz 2166393 BLAKE2B 65998b90a66938f0fa7cf702da83c86a0a5d22cde6ebca6ec2e7ab65fb310ef3f6aa0b8ae0ede48cbcd78788741433a43907ea9d020fcf3362d012a1464d1905 SHA512 c966b92cd9d66dcafd26b5ff7b062c22d035367111496c84777dfed5b22403631107f43dcdc535036198d2e108689aa99e003e9ad047a0af687ad247df155850
 DIST indilib-1.8.7.tar.gz 2195976 BLAKE2B 3c206e5775b9c16d44cf28b6fa70b186ee9c46c2e6ec639ebf39a97ba553314108481c0dd3ee29ed5297667e9691169bc4aefeee9ef290ee22b1c57967509afa SHA512 bb128ab0641f023039f32d2e3bdf9dfd5e54638bbce252e5f393fd5b2375df0311c472663e78dd498896db8f4669b21f231a095fed639710dc8cba4bb3bf2eb8
+DIST indilib-1.8.8.tar.gz 2234987 BLAKE2B 542c77e1826002e6268be82048014cdd7db2e58d6860bf21e058775acccbca49091218c24d5910f91705aebcf592e21f9008d780f39bb0458115b073319e3949 SHA512 0598b117fa582daaaf7c71524fd40866a37fcdc47b523b2ee1ed3301701c7351b027a3aab794e2e1405aec7293ecc6705d5f7852bb472cd21f40d7e3d7733d1d
diff --git a/sci-libs/indilib/indilib-1.7.5.ebuild b/sci-libs/indilib/indilib-1.7.5.ebuild
deleted file mode 100644
index 45012f5a0a87..000000000000
--- a/sci-libs/indilib/indilib-1.7.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="https://www.indilib.org/"
-# SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
-
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="ogg test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-misc/curl
-	sci-libs/cfitsio:=
-	sci-libs/gsl:=
-	sci-libs/libnova
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libusb:0
-	ogg? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-"
-DEPEND="${RDEPEND}
-	kernel_linux? ( sys-kernel/linux-headers )
-	test? ( >=dev-cpp/gtest-1.8.0 )
-"
-
-S="${WORKDIR}/lib${PN/lib/}"
-
-src_test() {
-	BUILD_DIR="${BUILD_DIR}"/test cmake-utils_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINDI_BUILD_QT5_CLIENT=OFF
-		-DINDI_BUILD_UNITTESTS=$(usex test)
-		-DUDEVRULES_INSTALL_DIR="$(get_udevdir)"
-		$(cmake-utils_use_find_package ogg OggTheora)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/indilib/indilib-1.8.7.ebuild b/sci-libs/indilib/indilib-1.8.7.ebuild
index dc1c02bc3d9b..d133f7e42252 100644
--- a/sci-libs/indilib/indilib-1.8.7.ebuild
+++ b/sci-libs/indilib/indilib-1.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="ogg test websocket"
 
 RDEPEND="
diff --git a/sci-libs/indilib/indilib-1.8.6.ebuild b/sci-libs/indilib/indilib-1.8.8.ebuild
index dc1c02bc3d9b..e6ee5b9fd220 100644
--- a/sci-libs/indilib/indilib-1.8.6.ebuild
+++ b/sci-libs/indilib/indilib-1.8.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sci-libs/ipopt/Manifest b/sci-libs/ipopt/Manifest
index bc13ac4fb942..88b452baabea 100644
--- a/sci-libs/ipopt/Manifest
+++ b/sci-libs/ipopt/Manifest
@@ -1,3 +1 @@
-DIST Ipopt-3.11.7.tgz 4749511 BLAKE2B c344634e427a6603544e50d661cafcf6004b4192a3912453dee96cfa143ca5f290f0efc39f46e983dcba6fe5b8a0becb2fa75bd6cc6f27be5c8ea8dc05f1ec4c SHA512 a9edd33b59c9744dc4e09d709519be1fc3d014cc4f50254402784aa8035d21617323f2879c430245886f2a13165cc81d26779331dc1601f0edfc406953dca56f
-DIST Ipopt-3.11.8.tgz 4749758 BLAKE2B c5ee5d3f01f1e8b4b6a1cd7606e2ad1a24c09fb0a8d8ed93fda7af61d543ac4f4579d7bb8817607d916223d9214693e1156f908cef1233a75df8759a1099b5d2 SHA512 1f60ea769dd7305348af3a5d4ed56938f04e59c36fb7a3fa0b808e4788dccee4711f82c3767e2aae87d21618d2a840d0bb22491c21c40bc2f9ebdf4b3a01aeec
 DIST Ipopt-3.12.12.tgz 4530034 BLAKE2B 8a8e24e4e5d8ad5bc1fcfa2de525e1e39c88a4c6dd77b51c0549249f517b3d6a1279e355a7cb606ebd8e606551031b653b78cd4d1cb51dd369e051ffa010011f SHA512 c543695feaa39a69b01e0025ebcd8a8772deb369ea1072f17da4ba34c1b522d322959067f3a6cfc40446e00c2e6dd2d6704a55623aba5d61dff44333727368cb
diff --git a/sci-libs/ipopt/ipopt-3.11.7.ebuild b/sci-libs/ipopt/ipopt-3.11.7.ebuild
deleted file mode 100644
index c0838cc7dedc..000000000000
--- a/sci-libs/ipopt/ipopt-3.11.7.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=yes
-FORTRAN_NEEDED="mumps"
-inherit eutils autotools-utils multilib toolchain-funcs fortran-2
-
-MYPN=Ipopt
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="Interior-Point Optimizer for large-scale nonlinear optimization"
-HOMEPAGE="https://projects.coin-or.org/Ipopt/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYP}.tgz"
-
-LICENSE="EPL-1.0 hsl? ( HSL )"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples hsl lapack mpi mumps static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/blas
-	hsl? ( sci-libs/coinhsl )
-	lapack? ( virtual/lapack )
-	mumps? ( sci-libs/mumps[mpi=] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	test? ( sci-libs/coinor-sample sci-libs/mumps )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	if use mumps && ! use mpi; then
-		ln -s "${EPREFIX}"/usr/include/mpiseq/mpi.h \
-			src/Algorithm/LinearSolvers/
-	elif use mpi; then
-		export CXX=mpicxx FC=mpif77 F77=mpif77 CC=mpicc
-	fi
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-blas-lib="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-coin-instdir="${ED}"/usr
-		$(use_with doc dot)
-	)
-
-	if use lapack; then
-		myeconfargs+=( --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" )
-	else
-		myeconfargs+=( --without-lapack )
-	fi
-	if use mumps; then
-		myeconfargs+=(
-			--with-mumps-incdir="${EPREFIX}"/usr/include
-			--with-mumps-lib="-lmumps_common -ldmumps -lzmumps -lsmumps -lcmumps" )
-	else
-		myeconfargs+=( --without-mumps )
-	fi
-	if use hsl; then
-		myeconfargs+=(
-			--with-hsl-incdir="${EPREFIX}"/usr/include
-			--with-hsl-lib="$($(tc-getPKG_CONFIG) --libs coinhsl)" )
-	else
-		myeconfargs+=( --without-hsl )
-	fi
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(use doc && echo doxydoc)
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	use doc && HTML_DOC=("${AUTOTOOLS_BUILD_DIR}/doxydocs/html/")
-	autotools-utils_src_install
-	# already installed
-	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/ipopt/ipopt-3.11.8.ebuild b/sci-libs/ipopt/ipopt-3.11.8.ebuild
deleted file mode 100644
index 00636336536d..000000000000
--- a/sci-libs/ipopt/ipopt-3.11.8.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=yes
-FORTRAN_NEEDED="mumps"
-
-inherit eutils autotools-utils multilib toolchain-funcs fortran-2
-
-MYPN=Ipopt
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="Interior-Point Optimizer for large-scale nonlinear optimization"
-HOMEPAGE="https://projects.coin-or.org/Ipopt/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYP}.tgz"
-
-LICENSE="EPL-1.0 hsl? ( HSL )"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples hsl lapack mpi mumps static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/blas
-	hsl? ( sci-libs/coinhsl:0= )
-	lapack? ( virtual/lapack )
-	mumps? ( sci-libs/mumps:0=[mpi=] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	test? ( sci-libs/coinor-sample sci-libs/mumps )"
-
-S="${WORKDIR}/${MYPN}-${PV}/${MYPN}"
-
-src_prepare() {
-	if use mumps && ! use mpi; then
-		ln -s "${EPREFIX}"/usr/include/mpiseq/mpi.h \
-			src/Algorithm/LinearSolvers/
-	elif use mpi; then
-		export CXX=mpicxx FC=mpif77 F77=mpif77 CC=mpicc
-	fi
-	sed -i \
-		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:g" \
-		configure || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# needed for the --with-coin-instdir
-	dodir /usr
-	local myeconfargs=(
-		--enable-dependency-linking
-		--with-blas-lib="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-coin-instdir="${ED}"/usr
-		$(use_with doc dot)
-	)
-
-	if use lapack; then
-		myeconfargs+=( --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" )
-	else
-		myeconfargs+=( --without-lapack )
-	fi
-	if use mumps; then
-		myeconfargs+=(
-			--with-mumps-incdir="${EPREFIX}"/usr/include
-			--with-mumps-lib="-lmumps_common -ldmumps -lzmumps -lsmumps -lcmumps" )
-	else
-		myeconfargs+=( --without-mumps )
-	fi
-	if use hsl; then
-		myeconfargs+=(
-			--with-hsl-incdir="${EPREFIX}"/usr/include
-			--with-hsl-lib="$($(tc-getPKG_CONFIG) --libs coinhsl)" )
-	else
-		myeconfargs+=( --without-hsl )
-	fi
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile all $(use doc && echo doxydoc)
-}
-
-src_test() {
-	autotools-utils_src_test test
-}
-
-src_install() {
-	use doc && HTML_DOC=("${AUTOTOOLS_BUILD_DIR}/doxydocs/html/")
-	autotools-utils_src_install
-	# already installed
-	rm "${ED}"/usr/share/coin/doc/${MYPN}/{README,AUTHORS,LICENSE} || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/keras-applications/Manifest b/sci-libs/keras-applications/Manifest
index 0a73422f78b7..ab10fe6c757d 100644
--- a/sci-libs/keras-applications/Manifest
+++ b/sci-libs/keras-applications/Manifest
@@ -1,2 +1 @@
-DIST keras-applications-1.0.7.tar.gz 289570 BLAKE2B 5f6fe2419b2de41f718e6beae56c8c4910efe0e6c282ad32b792f50a8b9ebc88c866eed84fb8c7dcbbd1680de605036a0012458af6d14250b1f8624ead5013b7 SHA512 5f2c5fb7b7f644a881f8cc9040633a69d3a72562206dd0601c8b31bf4fd3bb2aeee07a0d7040311f0fd42f16330bc249d306cdfa01c7b60717b05726040a0b78
 DIST keras-applications-1.0.8.tar.gz 288909 BLAKE2B 41d70552f5dfdd0c1385a7ca0b527ce0e0c3441c1ee3f72c90569f3e43e6a82485d0d4affee83afc645f3b99a519facb41d11a3fc1384c98f44182dddbea02bb SHA512 58af0d8e0289d97b416559bf235deeb9a5405d50f2a2c93612cdbde36e4d6d006db5c570acb814c209414a4b61c2310a99257aa0e2feaf24e5260d549b8b94f6
diff --git a/sci-libs/keras-applications/keras-applications-1.0.7.ebuild b/sci-libs/keras-applications/keras-applications-1.0.7.ebuild
deleted file mode 100644
index 08de3113fe76..000000000000
--- a/sci-libs/keras-applications/keras-applications-1.0.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Keras deep learning library reference implementations of deep learning models"
-HOMEPAGE="https://keras.io/applications/"
-SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-libs/keras-preprocessing/Manifest b/sci-libs/keras-preprocessing/Manifest
index de26366e09fc..781641ec7d63 100644
--- a/sci-libs/keras-preprocessing/Manifest
+++ b/sci-libs/keras-preprocessing/Manifest
@@ -1,3 +1,2 @@
 DIST Keras_Preprocessing-1.1.2.tar.gz 163598 BLAKE2B 94d0bac41ac140015a5d46453c99e1180c8c06d8fab4d6707890b1f24466d287f6da54d66b395e5e50c7aac67cc0abc8153fbfbeb4ffb0e79561bca528a6b81b SHA512 aae4d52accdfb9df260070336b1c5a628e57563978f7cb299aa67a6265f26eb44deb803cef795616a5e94cd8bcd2b9aa067570258fff96642b88cc0c701c3cec
-DIST keras-preprocessing-1.0.9.tar.gz 46476 BLAKE2B af80a6647bb56f8c4dba93120bc2b70db36d2c6a0e36c3be9a4843e5c36c9ffe50db1cd9396eecd47f6c0595c110825d70d2e6b28a29a0a199b5cfcc499e4440 SHA512 93ef9b294638bfeaea82170b323f08b261a2519f5ee8b9aac7d88e5b32c6486646d91075cea71bfbc27780c8af55125319873361f0431d48b451e574d1e7a400
 DIST keras-preprocessing-1.1.0.tar.gz 50631 BLAKE2B 235a1a7d296684e5405c6472026a53b1930923e74065529ba6921e91bf8849d35c02378f8eeabc4f532a4e25937e8fd8f712a59067c5b358afe10b88e1531fcb SHA512 68c71e82ea2139d3db4142c86a2c404e4d65a9a881f72b07b4ccf28733b93a9e4837f91534a20c3ca5128600d8b885cc8723181d96c9045d5280ad7f84091cbb
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild
deleted file mode 100644
index 14704b0a6031..000000000000
--- a/sci-libs/keras-preprocessing/keras-preprocessing-1.0.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Easy data preprocessing and data augmentation for deep learning models"
-HOMEPAGE="https://keras.io/"
-SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-libs/klu/files/klu-1.3.9-dash_doc.patch b/sci-libs/klu/files/klu-1.3.9-dash_doc.patch
new file mode 100644
index 000000000000..1f7bc8edfe10
--- /dev/null
+++ b/sci-libs/klu/files/klu-1.3.9-dash_doc.patch
@@ -0,0 +1,27 @@
+diff --git a/Doc/Makefile.am b/Doc/Makefile.am
+index 7d1116a..fd46b1d 100644
+--- a/Doc/Makefile.am
++++ b/Doc/Makefile.am
+@@ -1,15 +1,14 @@
+ 
+ KLU_UserGuide.pdf:
+-	echo '\begin{verbatim}' > klu_h.tex
++	printf '\\begin{verbatim}\n' > klu_h.tex
+ 	expand -8 $(top_srcdir)/Include/klu.h >> klu_h.tex
+-	echo '\end{verbatim}' >> klu_h.tex
+-	echo '\begin{verbatim}' > btf_h.tex
+-	echo 'See your btf.h local install' >> btf_h.tex
+-	echo '\end{verbatim}' >> btf_h.tex
+-	echo '\begin{verbatim}' > klu_simple_c.tex
++	printf '\\end{verbatim}\n' >> klu_h.tex
++	printf '\\begin{verbatim}\n' > btf_h.tex
++	printf 'See your btf.h local install\n' >> btf_h.tex
++	printf '\\end{verbatim}\n' >> btf_h.tex
++	printf '\\begin{verbatim}\n' > klu_simple_c.tex
+ 	expand -8 $(top_srcdir)/Demo/klu_simple.c >> klu_simple_c.tex
+-	echo '\end{verbatim}' >> klu_simple_c.tex
+-	-ln -s $(srcdir)/*.{tex,bib} .
++	printf '\\end{verbatim}\n' >> klu_simple_c.tex
+ 	$(PDFLATEX) KLU_UserGuide
+ 	$(BIBTEX)  KLU_UserGuide
+ 	$(PDFLATEX) KLU_UserGuide
diff --git a/sci-libs/klu/klu-1.3.9-r1.ebuild b/sci-libs/klu/klu-1.3.9-r1.ebuild
new file mode 100644
index 000000000000..21b8a26a6f26
--- /dev/null
+++ b/sci-libs/klu/klu-1.3.9-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Sparse LU factorization for circuit simulation"
+HOMEPAGE="https://faculty.cse.tamu.edu/davis/suitesparse.html"
+SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc static-libs"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( virtual/latex-base )"
+DEPEND="
+	>=sci-libs/amd-2.4
+	>=sci-libs/btf-1.2
+	>=sci-libs/colamd-2.9"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.3.9-dash_doc.patch )
+
+src_prepare(){
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with doc)
+}
+
+src_install() {
+	default
+
+	# remove .la file
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/lapack/lapack-3.8.0-r1.ebuild b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
index 530aa1d93d04..3d482fa86bbb 100644
--- a/sci-libs/lapack/lapack-3.8.0-r1.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="lapacke deprecated doc eselect-ldso"
 # TODO: static-libs 64bit-index
 
diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild
index a45bf2268e24..d5ccba815e41 100644
--- a/sci-libs/lapack/lapack-3.8.0.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="lapacke doc eselect-ldso"
 # TODO: static-libs 64bit-index
 
diff --git a/sci-libs/lapack/lapack-3.9.0.ebuild b/sci-libs/lapack/lapack-3.9.0.ebuild
index 0b10230eaaab..bf8674a2fab8 100644
--- a/sci-libs/lapack/lapack-3.9.0.ebuild
+++ b/sci-libs/lapack/lapack-3.9.0.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-#CMAKE_MAKEFILE_GENERATOR="emake"
 inherit cmake
 
 DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
@@ -12,19 +11,21 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 # 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/ldl/ldl-2.2.6.ebuild b/sci-libs/ldl/ldl-2.2.6.ebuild
index 07660da8ad5d..427934d23f00 100644
--- a/sci-libs/ldl/ldl-2.2.6.ebuild
+++ b/sci-libs/ldl/ldl-2.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/libaec/Manifest b/sci-libs/libaec/Manifest
index 084380af185c..58dd6adaa818 100644
--- a/sci-libs/libaec/Manifest
+++ b/sci-libs/libaec/Manifest
@@ -1,2 +1 @@
-DIST libaec-1.0.2.tar.gz 767910 BLAKE2B 4d843839b21d93a7ae0f90627217978d1d7262dff35962bb7fe7a9f62f57b5042c36278ff61ad7d7aa3ad1a7cdd1ceb75a59dcc1ab9b3d1c899c506ffe5819d3 SHA512 28a8839089e4b643b259cb8679b96e602a35098d1129baae6b3923767060e5deabfa33256d628a8bcbf205368cda5f2e6701078de0caccf44e0597d932a67ba2
 DIST libaec-1.0.4.tar.gz 2775768 BLAKE2B e083c5e268296227b5193c2192f7c52d47f8cef08823de013453ffd2c5f8c115921a79c60286e7582cbfcbb914c5e8ad4c2493e4ec89395df3be2206bc893591 SHA512 74d01208ad3a426d68895dbfa8a830c96618a219f27745ecfd94b248462748e772c266e7fb0d4e4f4c75f8953a97f835fb2ece67317cf9e9a7495360362d22eb
diff --git a/sci-libs/libaec/libaec-1.0.2.ebuild b/sci-libs/libaec/libaec-1.0.2.ebuild
deleted file mode 100644
index 522312775eda..000000000000
--- a/sci-libs/libaec/libaec-1.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils vcs-snapshot
-
-DESCRIPTION="Adaptive Entropy Coding library"
-HOMEPAGE="https://gitlab.dkrz.de/k202009/libaec"
-SRC_URI="https://gitlab.dkrz.de/k202009/libaec/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/2"
-KEYWORDS="~amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+szip"
-
-DEPEND=""
-RDEPEND="szip? ( !sci-libs/szip )"
-
-src_install() {
-	cmake-utils_src_install
-	# avoid conflict with szip (easier than to patch)
-	if ! use szip; then
-		rm "${ED}"/usr/include/szlib.h || die
-		rm "${ED}"/usr/$(get_libdir)/libsz* || die
-		rm "${ED}"/usr/share/doc/${PF}/README.SZIP || die
-	fi
-}
diff --git a/sci-libs/libccd/Manifest b/sci-libs/libccd/Manifest
index 59ed2f7be0f4..6c8f3bc992e9 100644
--- a/sci-libs/libccd/Manifest
+++ b/sci-libs/libccd/Manifest
@@ -1,2 +1 @@
-DIST libccd-2.0.tar.gz 68103 BLAKE2B 30a91dba9b5dec5edc40d014dd0cba23d75e99f296918b6e58199890508c39813f5170456b1301e9304c433ca3531b1f23c4cdbfc0f20fca21eeafe53991467d SHA512 627426f1acd24779e7d596fd5b18dede4cf3c13d3cceda87a8b2d0195b72d9ada45290fd41baa20d6e3adafda75074db355cb95a60f80023c32b5ad4e72235bf
 DIST libccd-2.1.tar.gz 73971 BLAKE2B 77feeb42426e72cfc1392351acf84f4c4670ea7f6a555a2b15dd8927e49b855423c4262e319b06774a8d887423238b8d018021ebeba5ee188e52accf5aeb48a1 SHA512 ff037d9c4df50f09600cf9b3514b259b2850ff43f74817853f5665d22812891168f70bd3cc3969b2c9e3c706f6254991a65421476349607fbd04d894b217456d
diff --git a/sci-libs/libccd/libccd-2.0.ebuild b/sci-libs/libccd/libccd-2.0.ebuild
deleted file mode 100644
index 4d6ba231792e..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="https://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 4cfdaad1c28d..4f4672557288 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="https://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 bf3c7962163f..d5e95a3d4cef 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="https://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 b544725d4687..d6183c5f9755 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/libcerf-1.5.ebuild b/sci-libs/libcerf/libcerf-1.5.ebuild
index cd1f053a2f24..17435575d70e 100644
--- a/sci-libs/libcerf/libcerf-1.5.ebuild
+++ b/sci-libs/libcerf/libcerf-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
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/libgeotiff/libgeotiff-1.5.1-r1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
index 58b7bdac277c..3ffe18121a54 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/5"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug doc static-libs"
 
 BDEPEND="
diff --git a/sci-libs/libh2oxx/libh2oxx-0.2-r1.ebuild b/sci-libs/libh2oxx/libh2oxx-0.2-r1.ebuild
index 041756e0f45f..7691373a4d3a 100644
--- a/sci-libs/libh2oxx/libh2oxx-0.2-r1.ebuild
+++ b/sci-libs/libh2oxx/libh2oxx-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sci-libs/libnova/libnova-0.16.0.ebuild b/sci-libs/libnova/libnova-0.16.0.ebuild
index e64539feaf34..995ae6f444b7 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 969f811ebebc..2469b09cc2b3 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,4 +1,3 @@
 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
+DIST libqalculate-3.15.0.tar.gz 1747863 BLAKE2B eed4cf8f11546b80e9556cfdf09e48d8c4c29948e6bdc02b3f9efd9aa6dce8e6c5eecf440bf4b6243ddcdb59cb7176f1eb054a3ef73cc91444d86ed7645f3a37 SHA512 b8f2af83218a3f90326cb7f679b71cac328cf0591178ed718920cd491d682cf7341c702934b3a232bea5a67ec2d2e09b4321a7ac938c5bc1e221bee086ae4c36
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/libsc/Manifest b/sci-libs/libsc/Manifest
index b334e463e47c..9357d90a6a87 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1,2 +1 @@
-DIST libsc-2.0.tar.gz 296392 BLAKE2B b5e1ca5cf6802ed38c32db5e7a77aec2fc636d88f2562314088dc16d13a0dccd24706276b05f8ddd70bc3769270a378c0089873fb2a21ebc93d6ca2622d7a58e SHA512 e4cfe42a1c1fe17412e1ffb6ebebe1f760861a7fb707a6f8fd01cdebda96b166ee05e7ff034f3b9e30de5e9baa82c9a2cebe93d40772dbd206603321de40559c
 DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
diff --git a/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch b/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch
new file mode 100644
index 000000000000..c2cbdb1b003b
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-2.2-autoconf_lua_version.patch
@@ -0,0 +1,51 @@
+--- a/config/sc_include.m4
++++ b/config/sc_include.m4
+@@ -281,7 +281,7 @@ AC_DEFUN([SC_CHECK_LIBRARIES],
+ [
+ SC_REQUIRE_LIB([m], [fabs])
+ SC_CHECK_LIB([z], [adler32_combine], [ZLIB], [$1])
+-SC_CHECK_LIB([lua52 lua5.2 lua51 lua5.1 lua lua5], [lua_createtable],
++SC_CHECK_LIB([$LUA_IMPL], [lua_createtable],
+ 	     [LUA], [$1])
+ SC_CHECK_BLAS_LAPACK([$1])
+ SC_BUILTIN_ALL_PREFIX([$1])
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,7 +74,7 @@ echo "| Checking headers"
+ echo "o---------------------------------------"
+ 
+ AC_CHECK_HEADERS([execinfo.h signal.h sys/time.h sys/types.h time.h])
+-AC_CHECK_HEADERS([lua.h lua5.1/lua.h lua5.2/lua.h lua5.3/lua.h])
++AC_CHECK_HEADERS([$LUA_IMPL/lua.h])
+ 
+ echo "o---------------------------------------"
+ echo "| Checking functions"
+--- a/src/sc_lua.h
++++ b/src/sc_lua.h
+@@ -30,23 +30,9 @@
+ 
+ SC_EXTERN_C_BEGIN;
+ 
+-#ifdef SC_HAVE_LUA5_2_LUA_H
+-#include <lua5.2/lua.h>
+-#include <lua5.2/lualib.h>
+-#include <lua5.2/lauxlib.h>
+-#else
+-#ifdef SC_HAVE_LUA5_1_LUA_H
+-#include <lua5.1/lua.h>
+-#include <lua5.1/lualib.h>
+-#include <lua5.1/lauxlib.h>
+-#else
+-#ifdef SC_HAVE_LUA_H
+-#include <lua.h>
+-#include <lualib.h>
+-#include <lauxlib.h>
+-#endif
+-#endif
+-#endif
++#include <@LUA_IMPL@/lua.h>
++#include <@LUA_IMPL@/lualib.h>
++#include <@LUA_IMPL@/lauxlib.h>
+ 
+ SC_EXTERN_C_END;
+ 
diff --git a/sci-libs/libsc/files/libsc-9999_20201220-autoconf_lua_version.patch b/sci-libs/libsc/files/libsc-9999_20201220-autoconf_lua_version.patch
new file mode 100644
index 000000000000..c138bb3fc4ba
--- /dev/null
+++ b/sci-libs/libsc/files/libsc-9999_20201220-autoconf_lua_version.patch
@@ -0,0 +1,57 @@
+--- a/config/sc_include.m4
++++ b/config/sc_include.m4
+@@ -281,7 +281,7 @@ AC_DEFUN([SC_CHECK_LIBRARIES],
+ [
+ SC_REQUIRE_LIB([m], [fabs])
+ SC_CHECK_LIB([z], [adler32_combine], [ZLIB], [$1])
+-SC_CHECK_LIB([lua53 lua5.3 lua52 lua5.2 lua51 lua5.1 lua lua5], [lua_createtable],
++SC_CHECK_LIB([$LUA_IMPL], [lua_createtable],
+ 	     [LUA], [$1])
+ SC_CHECK_BLAS_LAPACK([$1])
+ SC_BUILTIN_ALL_PREFIX([$1])
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,7 +74,7 @@ echo "| Checking headers"
+ echo "o---------------------------------------"
+ 
+ AC_CHECK_HEADERS([execinfo.h signal.h sys/time.h sys/types.h time.h])
+-AC_CHECK_HEADERS([lua.h lua5.1/lua.h lua5.2/lua.h lua5.3/lua.h])
++AC_CHECK_HEADERS([$LUA_IMPL/lua.h])
+ 
+ echo "o---------------------------------------"
+ echo "| Checking functions"
+--- a/src/sc_lua.h
++++ b/src/sc_lua.h
+@@ -30,29 +30,9 @@
+ 
+ SC_EXTERN_C_BEGIN;
+ 
+-#ifdef SC_HAVE_LUA5_3_LUA_H
+-#include <lua5.3/lua.h>
+-#include <lua5.3/lualib.h>
+-#include <lua5.3/lauxlib.h>
+-#else
+-#ifdef SC_HAVE_LUA5_2_LUA_H
+-#include <lua5.2/lua.h>
+-#include <lua5.2/lualib.h>
+-#include <lua5.2/lauxlib.h>
+-#else
+-#ifdef SC_HAVE_LUA5_1_LUA_H
+-#include <lua5.1/lua.h>
+-#include <lua5.1/lualib.h>
+-#include <lua5.1/lauxlib.h>
+-#else
+-#ifdef SC_HAVE_LUA_H
+-#include <lua.h>
+-#include <lualib.h>
+-#include <lauxlib.h>
+-#endif
+-#endif
+-#endif
+-#endif
++#include <@LUA_IMPL@/lua.h>
++#include <@LUA_IMPL@/lualib.h>
++#include <@LUA_IMPL@/lauxlib.h>
+ 
+ SC_EXTERN_C_END;
+ 
diff --git a/sci-libs/libsc/libsc-2.0.ebuild b/sci-libs/libsc/libsc-2.2-r100.ebuild
index d64ac2899044..c32ffab9633d 100644
--- a/sci-libs/libsc/libsc-2.0.ebuild
+++ b/sci-libs/libsc/libsc-2.2-r100.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools toolchain-funcs eutils
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit autotools lua-single toolchain-funcs eutils
 
 DESCRIPTION="Support for parallel scientific applications"
 HOMEPAGE="https://www.p4est.org/"
@@ -23,10 +25,10 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="debug examples mpi openmp romio static-libs threads"
 
-REQUIRED_USE="romio? ( mpi )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	romio? ( mpi )"
 
-RDEPEND="
-	dev-lang/lua:*
+RDEPEND="${LUA_DEPS}
 	sys-apps/util-linux
 	virtual/blas
 	virtual/lapack
@@ -36,6 +38,10 @@ DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2-autoconf_lua_version.patch
+)
+
 DOCS=( AUTHORS NEWS README )
 
 AUTOTOOLS_AUTORECONF=true
@@ -50,8 +56,10 @@ pkg_pretend() {
 src_prepare() {
 	default
 
+	sed -i -e "s/@LUA_IMPL@/${ELUA}/" "${S}"/src/sc_lua.h || die
+
 	# Inject a version number into the build system
-	echo "${PV}" > ${S}/.tarball-version
+	echo "${PV}" > ${S}/.tarball-version || die
 	eautoreconf
 }
 
@@ -66,7 +74,7 @@ src_configure() {
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
 	)
-	econf "${myeconfargs[@]}"
+	econf LUA_IMPL="${ELUA}" "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/sci-libs/libsc/libsc-2.2.ebuild b/sci-libs/libsc/libsc-2.2.ebuild
index 400c0e6fd7ca..5bf05ea37778 100644
--- a/sci-libs/libsc/libsc-2.2.ebuild
+++ b/sci-libs/libsc/libsc-2.2.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
@@ -26,7 +26,7 @@ IUSE="debug examples mpi openmp romio static-libs threads"
 REQUIRED_USE="romio? ( mpi )"
 
 RDEPEND="
-	dev-lang/lua:*
+	dev-lang/lua:0=
 	sys-apps/util-linux
 	virtual/blas
 	virtual/lapack
diff --git a/sci-libs/libsc/libsc-9999.ebuild b/sci-libs/libsc/libsc-9999.ebuild
index d64ac2899044..fe7d111cc1c5 100644
--- a/sci-libs/libsc/libsc-9999.ebuild
+++ b/sci-libs/libsc/libsc-9999.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools toolchain-funcs eutils
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit autotools lua-single toolchain-funcs eutils
 
 DESCRIPTION="Support for parallel scientific applications"
 HOMEPAGE="https://www.p4est.org/"
@@ -23,10 +25,10 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="debug examples mpi openmp romio static-libs threads"
 
-REQUIRED_USE="romio? ( mpi )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	romio? ( mpi )"
 
-RDEPEND="
-	dev-lang/lua:*
+RDEPEND="${LUA_DEPS}
 	sys-apps/util-linux
 	virtual/blas
 	virtual/lapack
@@ -36,6 +38,10 @@ DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999_20201220-autoconf_lua_version.patch
+)
+
 DOCS=( AUTHORS NEWS README )
 
 AUTOTOOLS_AUTORECONF=true
@@ -50,8 +56,10 @@ pkg_pretend() {
 src_prepare() {
 	default
 
+	sed -i -e "s/@LUA_IMPL@/${ELUA}/" "${S}"/src/sc_lua.h || die
+
 	# Inject a version number into the build system
-	echo "${PV}" > ${S}/.tarball-version
+	echo "${PV}" > ${S}/.tarball-version || die
 	eautoreconf
 }
 
@@ -66,7 +74,7 @@ src_configure() {
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
 	)
-	econf "${myeconfargs[@]}"
+	econf LUA_IMPL="${ELUA}" "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/sci-libs/libspatialindex/Manifest b/sci-libs/libspatialindex/Manifest
index 48a85c3a79ce..d830821da52e 100644
--- a/sci-libs/libspatialindex/Manifest
+++ b/sci-libs/libspatialindex/Manifest
@@ -1,2 +1 @@
-DIST spatialindex-src-1.8.5.tar.bz2 407871 BLAKE2B 936d0fc4950b4c685088c84019aa22e720371c623bd1883725dc497380e90072333c25f979e13fbc91b7d164b87cb21a285c037bdbe0b8df84eb3876590e8dd1 SHA512 d3e47982cc2809d04490fae27796b31cdb59675790010d8b45e1a98b5a23048a4a44e321a2470dd36c01aba6f6e7620cafc4988a02b55e4f59d1b7fa9b588b06
 DIST spatialindex-src-1.9.3.tar.bz2 520817 BLAKE2B 89bbb4ef76f620042cbaa2822daad1459bb8a3801fcdedaa73fdc666efcae0e5329e15e79607e3a31ef9a651fbbf9d3657f5bada19b229eaf37fe232935b8dae SHA512 7922807a2f7026542a014d3d7943da5410429b291cf469267ffea5b8075eab2a94e68b6c013425615d221b930fd319c403f3bf43404c9b1d2c92d0e2baae3066
diff --git a/sci-libs/libspatialindex/files/libspatialindex-1.8.1-QA.patch b/sci-libs/libspatialindex/files/libspatialindex-1.8.1-QA.patch
deleted file mode 100644
index 446452dc9ef1..000000000000
--- a/sci-libs/libspatialindex/files/libspatialindex-1.8.1-QA.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- spatialindex-src-1.8.0/configure.ac
-+++ spatialindex-src-1.8.0/configure.ac
-@@ -49,10 +49,10 @@
- AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes] turn on debugging [default=$debug_default]],, enable_debug=$debug_default)
- 
- if test "x$enable_debug" = "xyes"; then
--	CXXFLAGS="$CXXFLAGS -g -DDEBUG"
-+	CXXFLAGS="$CXXFLAGS -DDEBUG"
- 	AC_MSG_RESULT(checking wether debug information is enabled... yes)
- else
--	CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
-+	CXXFLAGS="$CXXFLAGS -DNDEBUG"
- 	AC_MSG_RESULT(checking wether debug information is enabled... no)
- fi
- 
diff --git a/sci-libs/libspatialindex/libspatialindex-1.8.5-r1.ebuild b/sci-libs/libspatialindex/libspatialindex-1.8.5-r1.ebuild
deleted file mode 100644
index 2e959536740f..000000000000
--- a/sci-libs/libspatialindex/libspatialindex-1.8.5-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils ltprune
-
-MY_PN="spatialindex-src"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="General framework for developing spatial indices"
-HOMEPAGE="https://libspatialindex.github.com/"
-SRC_URI="http://download.osgeo.org/libspatialindex/${MY_P}.tar.bz2"
-LICENSE="MIT"
-
-KEYWORDS="amd64 x86"
-SLOT="0/4"
-IUSE="debug static-libs"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.1-QA.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-	use static-libs || prune_libtool_files
-}
diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3.ebuild b/sci-libs/libspatialindex/libspatialindex-1.9.3.ebuild
index b923ee62d39f..b38f1950daa6 100644
--- a/sci-libs/libspatialindex/libspatialindex-1.9.3.ebuild
+++ b/sci-libs/libspatialindex/libspatialindex-1.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/libspatialindex/${PN}/releases/download/${PV}/${MY_P
 
 LICENSE="MIT"
 SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/libticalcs2/Manifest b/sci-libs/libticalcs2/Manifest
index b4b9479c4e6c..d8b8166215ca 100644
--- a/sci-libs/libticalcs2/Manifest
+++ b/sci-libs/libticalcs2/Manifest
@@ -1,2 +1 @@
-DIST libticalcs2-1.1.8.tar.bz2 524151 BLAKE2B ace580d1bb810b741fd40d310cd55d0743212fbd279e900e5a9e26000169e21a63a970300d7e355cff13f5893f61e79d02a633f4cfecd42f1a0446c8f666323a SHA512 0e09148006f5ee227d1b347ef44a6e755cb1dd757b8ff99e0f006aec0bc37c40dc5e293e44a0d91fc966b47da9113b4f00a71d9d9aa5cfbea4b01487232c1c08
 DIST libticalcs2-1.1.9.tar.bz2 269963 BLAKE2B 9cebc63647afe5b7e45b44f4e6a48902b9ae551d38eeb4bb2112a84988355bb7beafb27192b90c597b9613f8cb2dfb67f2b2eeb2e270b1d3fdd620f8f8d0c2cf SHA512 a55fa92df787929397f4ed3e8f922355f71c7883459ceb98fbb8d39d18f06441147188aaabf7a67083d70549443e439744e68527742e2b7b5d3d2838cc41b4da
diff --git a/sci-libs/libticalcs2/libticalcs2-1.1.8.ebuild b/sci-libs/libticalcs2/libticalcs2-1.1.8.ebuild
deleted file mode 100644
index eeb464acc0e6..000000000000
--- a/sci-libs/libticalcs2/libticalcs2-1.1.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Library for communication with TI calculators"
-HOMEPAGE="https://lpg.ticalc.org/prj_tilp/"
-SRC_URI="mirror://sourceforge/tilp/tilp2-linux/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc nls static-libs"
-
-RDEPEND="
-	dev-libs/glib:2
-	>=sci-libs/libticables2-1.3.3
-	>=sci-libs/libticonv-1.1.3
-	>=sci-libs/libtifiles2-1.1.5
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS LOGO NEWS README ChangeLog docs/api.txt )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-rpath
-		$(use_enable nls)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && dohtml docs/html/*
-}
diff --git a/sci-libs/libticonv/Manifest b/sci-libs/libticonv/Manifest
index 62910082886d..25a7d26591ed 100644
--- a/sci-libs/libticonv/Manifest
+++ b/sci-libs/libticonv/Manifest
@@ -1,2 +1 @@
-DIST libticonv-1.1.4.tar.bz2 344616 BLAKE2B 38ab1d2c60873c8c544de13a605429212d75799d665470a2aabcde0f74bdd42a71b2ef7fce25cd41a691bb7f43ca68e0db8dce44643e22bea5db405865de80b8 SHA512 15ceb5acff888c841febc0d3ae96e3df649cce302b4ae2dc4ca150e3cb483337548fff0b32f0308bc759a08e6a167beaa8a2a4349f8ce47a2a7b62755a601018
 DIST libticonv-1.1.5.tar.bz2 86036 BLAKE2B 494494f59c8fbdad183c2e7d4b66f3313ce1b968b5898b31da9bc3d54f73aafbe93ce676928dd9b986fa5eaafe12ad333e9dc0da2e3abf94bddfeebf481727e2 SHA512 ea589344a656c5c7d28ed45e8da36bf7b746b7a82d77a257ddd305e2ebdc34f0ae14a6090e991f47ef7ad37cdc8d7182181c705fb0814e671ef764ca2a6dc2bf
diff --git a/sci-libs/libticonv/libticonv-1.1.4.ebuild b/sci-libs/libticonv/libticonv-1.1.4.ebuild
deleted file mode 100644
index f5624106b2ae..000000000000
--- a/sci-libs/libticonv/libticonv-1.1.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Charset conversion library for TI calculators"
-HOMEPAGE="https://lpg.ticalc.org/prj_tilp/"
-SRC_URI="mirror://sourceforge/tilp/tilp2-linux/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc iconv static-libs"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS LOGO NEWS README ChangeLog docs/api.txt )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable iconv)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		dohtml docs/html/*
-		docinto charsets
-		dohtml docs/charsets/*
-	fi
-}
diff --git a/sci-libs/linbox/linbox-1.6.3.ebuild b/sci-libs/linbox/linbox-1.6.3.ebuild
index db82ccb781cd..3e7c890e6f65 100644
--- a/sci-libs/linbox/linbox-1.6.3.ebuild
+++ b/sci-libs/linbox/linbox-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc opencl openmp static-libs cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sci-libs/lmfit/Manifest b/sci-libs/lmfit/Manifest
index 3fab8e98b75f..ba6266162adc 100644
--- a/sci-libs/lmfit/Manifest
+++ b/sci-libs/lmfit/Manifest
@@ -1,4 +1 @@
-DIST lmfit-5.1.tgz 345077 BLAKE2B df27621745601ffacd2110b28f3e3ea2b06d4c8c3c8fad5dda13bb4d6c2bd9f2a793ff88fab4f6d8c78075278bb26f3f424bd0074095e67ab1780a9d57b72b4b SHA512 1df6ed51d7f2137529793948f6c57ef3658932c9198776925a9f6e1d586352651c93aa053a064db7a201dbb848a7108f284223feff45171d142087539d834b29
-DIST lmfit-6.4.tgz 388809 BLAKE2B 48aa619642ac3fd009ec6a8f8b44ee4c800fc3f33e2603b557218cdf37c789159dc3947a648d560b9e2dd7fef08a6644fd25ac61505859dc3b1d151eeea58c27 SHA512 2bd0f24dd4638345b8b1ce6803ddcf45ca3ef888eb285e99f9f158c2e30b0f96016d9d84a112cdbf28f2ba98470e54fe773416179a65264426043c9a5186757d
-DIST lmfit-7.0.tgz 37950 BLAKE2B a509110f70e7e863d1172b8d91f7439763f0434702f265751e9955494f4982b4c17f0baaa080af86e5cae7f535555e27b98b45ba6a529061d107e53bdb9fd698 SHA512 78f479786c6e5c417781c6d629f5a517335fac70df049fafdefd511485da4e542c988d69c998f96eaab4306160de4bb09a631ca6ffff74bba70c51428d734fc3
 DIST lmfit-8.2.2.tgz 31970 BLAKE2B 67eebc0e58d3d78057afcd84f35adcfea783c8501a5f8934dd07c38eb2419b1c43bedd3401a830a993005913138bdf8d1dc73c2142983b9f881f0db9bec06b93 SHA512 5835dce914027429cb36765543cf6b872e4ef1acd8feaeca281f9edf286fda89db78fbc0713dcfea4e4f2fe55a1b05317e6428980060bc3acce579ef1fa0c271
diff --git a/sci-libs/lmfit/files/lmfit-7.0-cmake.patch b/sci-libs/lmfit/files/lmfit-7.0-cmake.patch
deleted file mode 100644
index 9ca4efb248e9..000000000000
--- a/sci-libs/lmfit/files/lmfit-7.0-cmake.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 4e66272e1f5ebb220af517ca4d8804936f7f465c Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@votca.org>
-Date: Thu, 31 May 2018 18:11:26 -0600
-Subject: [PATCH] cmake: minor distribution tweaks
-
-- Use GNUInstallDirs to allow to configure install dirs
-- Allow to disable injecting c flags
-
-Signed-off-by: Christoph Junghans <junghans@votca.org>
----
- CMakeLists.txt     | 7 +++++--
- lib/CMakeLists.txt | 4 ++--
- man/CMakeLists.txt | 2 +-
- 3 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f2d0bdf..75753d3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,9 +13,12 @@ set(lmfit_VERSION ${lmfit_SOVERSION}.0) # lib version
- # --- Declare project-wide user flags, and set default values ---
- option(FITTEST "Build with FitTest" OFF)
- 
--set(destination ${CMAKE_INSTALL_PREFIX})
-+include(GNUInstallDirs)
- 
--set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses  -Wno-unknown-pragmas -Werror")
-+option(INJECT_C_FLAGS "Inject a bunch of useful c flags" ON)
-+if (INJECT_C_FLAGS)
-+    set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses  -Wno-unknown-pragmas -Werror")
-+endif()
- 
- add_subdirectory(lib)
- add_subdirectory(demo)
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 51b79bb..754f60f 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -17,9 +17,9 @@ target_link_libraries(${library_name} m)
- 
- install(
-     TARGETS ${library_name} LIBRARY
--    DESTINATION ${destination}/lib
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     COMPONENT Libraries)
- install(
-     FILES ${inc_files}
--    DESTINATION ${destination}/include
-+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-     COMPONENT Headers)
-diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
-index a718d3d..4a15597 100644
---- a/man/CMakeLists.txt
-+++ b/man/CMakeLists.txt
-@@ -15,7 +15,7 @@ function(one_page pname section)
-     )
-     install(
-         FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section}
--        DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man${section}"
-+        DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}"
-     )
- endfunction()
- 
--- 
-2.16.4
-
diff --git a/sci-libs/lmfit/lmfit-5.1.ebuild b/sci-libs/lmfit/lmfit-5.1.ebuild
deleted file mode 100644
index c4263be9ca8d..000000000000
--- a/sci-libs/lmfit/lmfit-5.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune
-
-DESCRIPTION="library for Levenberg-Marquardt least-squares minimization and curve fitting"
-HOMEPAGE="https://apps.jcns.fz-juelich.de/doku/sc/lmfit"
-SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/old/${P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/sci-libs/lmfit/lmfit-6.4.ebuild b/sci-libs/lmfit/lmfit-6.4.ebuild
deleted file mode 100644
index c4263be9ca8d..000000000000
--- a/sci-libs/lmfit/lmfit-6.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune
-
-DESCRIPTION="library for Levenberg-Marquardt least-squares minimization and curve fitting"
-HOMEPAGE="https://apps.jcns.fz-juelich.de/doku/sc/lmfit"
-SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/old/${P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/sci-libs/lmfit/lmfit-7.0.ebuild b/sci-libs/lmfit/lmfit-7.0.ebuild
deleted file mode 100644
index 0585a930e651..000000000000
--- a/sci-libs/lmfit/lmfit-7.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="library for Levenberg-Marquardt least-squares minimization and curve fitting"
-HOMEPAGE="https://apps.jcns.fz-juelich.de/doku/sc/lmfit"
-SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/old/${P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DINJECT_C_FLAGS=OFF
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/lrslib/Manifest b/sci-libs/lrslib/Manifest
index e6fd1344b669..65d38903cb37 100644
--- a/sci-libs/lrslib/Manifest
+++ b/sci-libs/lrslib/Manifest
@@ -1 +1,2 @@
 DIST lrslib-062.tar.gz 292745 BLAKE2B 1a2c0e264d590c38d83ee35616b1ec36d8a093b5c7f08179019261d8b321d5b95d8889ca6555ae69853f919d6d66358a865a8a2002516dfd560bec6658f3913d SHA512 1d644a7798580457ff266730f42f6fac317ec8cdf2509ad6028e7a838e5c4c948bd0f9499b840c227bad4269f7144ff72b87fe3a19bdb9ad0925ebe4a7bc4f9f
+DIST lrslib-071.tar.gz 460165 BLAKE2B 67be1ffac1c09a94773c69fc2215db19623bc8bc78be74342a1eda497b70eed2d8cb8e9b34ce269177154a4aed6f7bde02f632a536999b24f3116b3e69be456e SHA512 451aa5dada106516aeed1688c1e939a2e216ac760addb483f9cc1d5d4ac62e88af2772a6fa589b217b544621d041d94386a79502483db2eeaf04e90c4a3fd78e
diff --git a/sci-libs/lrslib/lrslib-071.ebuild b/sci-libs/lrslib/lrslib-071.ebuild
new file mode 100644
index 000000000000..701a30f70848
--- /dev/null
+++ b/sci-libs/lrslib/lrslib-071.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Self-contained C implementation of the reverse search algorithm"
+HOMEPAGE="https://cgm.cs.mcgill.ca/~avis/C/lrs.html"
+SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="gmp mpi"
+
+RDEPEND="
+	gmp? (
+		dev-libs/gmp:0=
+		mpi? ( virtual/mpi )
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -e "s/-O3/${CFLAGS}/g" \
+		-e 's/$(CC) -shared/$(CC) $(LDFLAGS) -shared/' \
+		-e "s,/usr/local,${EPREFIX}/usr,g" \
+		-e "s,/lib,/$(get_libdir),g" \
+		-i makefile || die
+}
+
+src_compile() {
+	if use gmp ; then
+		emake
+		emake all-shared
+		use mpi && emake mplrs
+	else
+		emake allmp
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install-common
+	if use gmp; then
+		emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+		use mpi && dobin mplrs
+	fi
+	dodoc README
+}
diff --git a/sci-libs/m4ri/m4ri-20200115.ebuild b/sci-libs/m4ri/m4ri-20200115.ebuild
index 8521f51be38f..bfa4cd0d8535 100644
--- a/sci-libs/m4ri/m4ri-20200115.ebuild
+++ b/sci-libs/m4ri/m4ri-20200115.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug openmp cpu_flags_x86_sse2 png static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/m4ri/m4ri-20200125.ebuild b/sci-libs/m4ri/m4ri-20200125.ebuild
index 09158e5ef290..6e72eea8742a 100644
--- a/sci-libs/m4ri/m4ri-20200125.ebuild
+++ b/sci-libs/m4ri/m4ri-20200125.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug openmp cpu_flags_x86_sse2 png static-libs"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/m4rie/m4rie-20200115.ebuild b/sci-libs/m4rie/m4rie-20200115.ebuild
index 676a82f2a93a..7030c39b71d0 100644
--- a/sci-libs/m4rie/m4rie-20200115.ebuild
+++ b/sci-libs/m4rie/m4rie-20200115.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug static-libs"
 
 DEPEND=">=sci-libs/m4ri-20140914"
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index d194ed33c615..ed743f578265 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,3 +1,2 @@
 DIST STIX_font.tgz 2450541 BLAKE2B f725eb0264d9c3cb7c32a935e8857c4a21cb905a1dc6c9cc8a16408afdc7dd9b6fcd312a8c2f77aff5484605a39a9ee36e86ad0234adb5d6bcc5c8839101194c SHA512 c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5
-DIST mathgl-2.4.1.tar.gz 22665490 BLAKE2B a9c9e0ec7d145262994a754dfbcf1f789d2777f9334c8b4e73696265adba4d2fd7283621857318264c2162841e81427df21f7bc7b951d83876fbc066d3b9068f SHA512 10fd016662ca60b9507942691f85b4d9151104319627732f4add0175475f7e8dff16e3645bb858c283b747f34e58f410d0532e94dc64cf8cf472938d3966402d
 DIST mathgl-2.4.4.tar.gz 23917716 BLAKE2B 11d36195c65b11f0eedbc1c946f600fd33bdc6ab8d3ff95c65634300527b2e06ffbb6615e4425896b87435fdb45bfad806f00e79edd26af4ab67bf223695d5cf SHA512 6955cb3630b4c17ab7eeb7542569a7fba653f592640f30700988abe340ecb17f09f1cbcd3903232797e9debc9f74ba2ea1f76f51935749bc8dec5e05951bb573
diff --git a/sci-libs/mathgl/files/mathgl-2.4.1-mutex.patch b/sci-libs/mathgl/files/mathgl-2.4.1-mutex.patch
deleted file mode 100644
index 4ce7bb733114..000000000000
--- a/sci-libs/mathgl/files/mathgl-2.4.1-mutex.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/canvas.cpp b/src/canvas.cpp
-index ba4ffededb9b..7ea755d18265 100644
---- a/src/canvas.cpp
-+++ b/src/canvas.cpp
-@@ -1219,9 +1219,9 @@ void mglCanvas::Pop()
- {

- 	B = stack.back(); 

- #if MGL_HAVE_PTHREAD

--	pthread_mutex_lock(&m);

-+	pthread_mutex_lock(&mutexStk);

- 	stack.pop_back();

--	pthread_mutex_unlock(&m);

-+	pthread_mutex_unlock(&mutexStk);

- #else

- #pragma omp critical(stk)

- 	stack.pop_back();

diff --git a/sci-libs/mathgl/mathgl-2.4.1-r2.ebuild b/sci-libs/mathgl/mathgl-2.4.1-r2.ebuild
deleted file mode 100644
index d9a8bd85cb4f..000000000000
--- a/sci-libs/mathgl/mathgl-2.4.1-r2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER=3.0
-
-inherit cmake-utils eutils wxwidgets multilib flag-o-matic
-
-DESCRIPTION="Math Graphics Library"
-HOMEPAGE="https://sourceforge.net/projects/mathgl/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz mirror://sourceforge/${PN}/STIX_font.tgz"
-
-LICENSE="LGPL-3"
-SLOT="0/7.5.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fltk gif glut gsl hdf hdf5 jpeg mpi octave opengl openmp pdf
-	png qt5 static-libs threads wxwidgets zlib"
-
-LANGS="ru"
-for l in ${LANGS}; do
-	IUSE+=" l10n_${l}"
-done
-unset l
-
-RDEPEND="
-	virtual/opengl
-	fltk? ( x11-libs/fltk:1 )
-	gif? ( media-libs/giflib )
-	glut? ( media-libs/freeglut )
-	gsl? ( >=sci-libs/gsl-2 )
-	hdf? ( sci-libs/hdf )
-	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
-	jpeg? ( virtual/jpeg:0 )
-	octave? ( >=sci-mathematics/octave-3.4.0 )
-	openmp? ( sys-cluster/openmpi )
-	pdf? ( media-libs/libharu )
-	png? ( media-libs/libpng:0 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-	)
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-	zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/texi2html virtual/texi2dvi )
-	octave? ( dev-lang/swig )"
-
-REQUIRED_USE="
-	mpi? ( hdf5 )
-	openmp? ( !threads )
-	png? ( zlib )
-	pdf? ( png )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-mutex.patch
-)
-
-pkg_setup() {
-	use mpi && export CC=mpicc CXX=mpicxx
-}
-
-src_unpack() {
-	default
-	if ! [[ -d "${S}"/fonts ]]; then
-		mkdir "${S}"/fonts || die
-	fi
-	cd "${S}"/fonts || die
-	unpack STIX_font.tgz
-}
-
-src_prepare() {
-	# fix for location of hdf headers
-	sed -i -e 's:hdf/::g' src/data_io.cpp || die
-	# bored of reporting bad libdir upstream
-	sed -i \
-		-e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \
-		{src,widgets}/CMakeLists.txt || die
-	echo "" > lang/install.m || die
-	# fix desktop file
-	sed -i -e 's/.png//' udav/udav.desktop || die
-	# prevent sandbox violation
-	sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
-	sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die
-
-	use wxwidgets && need-wxwidgets unicode
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=()
-	if use hdf; then
-		mycmakeargs+=(
-			-DHDF4_INCLUDE_DIR="${EPREFIX}/usr/include"
-		)
-	fi
-	mycmakeargs+=(
-		# No clue about this option:
-		# option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'")
-		-DMathGL_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-Denable-all-docs=$(usex doc)
-		-Denable-fltk=$(usex fltk)
-		-Denable-gif=$(usex gif)
-		-Denable-glut=$(usex glut)
-		-Denable-gsl=$(usex gsl)
-		-Denable-hdf4=$(usex hdf)
-		-Denable-hdf5=$(usex hdf5)
-		-Denable-jpeg=$(usex jpeg)
-		-Denable-mpi=$(usex mpi)
-		-Denable-octave=$(usex octave)
-		-Denable-opengl=$(usex opengl)
-		-Denable-openmp=$(usex openmp)
-		-Denable-pdf=$(usex pdf)
-		-Denable-png=$(usex png)
-		-Denable-qt4=OFF
-		-Denable-qt5=$(usex qt5)
-		-Denable-qt5asqt=$(usex qt5)
-		-Denable-pthread=$(usex threads)
-		-Denable-pthr-widget=$(usex threads)
-		-Denable-python=OFF
-		-Denable-wx=$(usex wxwidgets)
-		-Denable-zlib=$(usex zlib)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README* *.txt AUTHORS
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/*.a || die
-	fi
-	if use qt5 ; then
-		local lang
-		insinto /usr/share/udav
-		for lang in ${LANGS} ; do
-			use l10n_${lang} && doins udav/udav_${lang}.qm
-		done
-	fi
-	if use octave ; then
-		insinto /usr/share/${PN}/octave
-		doins "${CMAKE_BUILD_DIR}"/lang/${PN}.tar.gz
-	fi
-}
-
-pkg_postinst() {
-	if use octave; then
-		octave <<-EOF
-		pkg install ${EROOT}/usr/share/${PN}/octave/${PN}.tar.gz
-		EOF
-	fi
-}
-
-pkg_prerm() {
-	if use octave; then
-		octave <<-EOF
-		pkg uninstall ${PN}
-		EOF
-	fi
-}
diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest
index fc47f4350349..a9596fd783e7 100644
--- a/sci-libs/med/Manifest
+++ b/sci-libs/med/Manifest
@@ -1,2 +1 @@
-DIST med-4.0.0.tar.gz 47849098 BLAKE2B 0bc6710f7b5156e09962e3125349573989429e614a203f649843f00dea06217040ebee70e481eed9c0dd304cb7d167efcd216c3600f6954a74f262cc845fff63 SHA512 2840437010481fc5f12a56e3282f8ca5e94df541899e2b511756702f86d0f87dbf2f6e086d8e591e2bd370d8f4bab8089e7f7f939fea16354a23e2b5a4d96cd7
 DIST med-4.1.0.tar.gz 50375039 BLAKE2B 514ca19baf15e349ecbce870b318b37c51bfb57ac9b03c2b2c1b28836fec7fcf2dce573b9ea155f358d5e0bcee120c12a31598cd4f1e44837eca787553bb70d4 SHA512 94d07663c2f6a3cd497f54b480c3d742476d2a25172feb567980c9e75d49f4661aa2c6aaf570470938265997154e348bc1608065b86d42afda52d4e6361fedf8
diff --git a/sci-libs/med/files/med-3.3.1-cmake-fortran.patch b/sci-libs/med/files/med-3.3.1-cmake-fortran.patch
deleted file mode 100644
index 1f475d584843..000000000000
--- a/sci-libs/med/files/med-3.3.1-cmake-fortran.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Make cmake properly disable fortran upon user requirments
-
---- ./CMakeLists.txt.orig	2016-07-01 15:28:57.139304608 +0300
-+++ ./CMakeLists.txt	2016-07-01 15:34:22.295899455 +0300
-@@ -8,10 +8,13 @@
- 
- INCLUDE(CheckLanguage)
- CHECK_LANGUAGE(Fortran)
--IF(CMAKE_Fortran_COMPILER)
-+OPTION (MEDFILE_BUILD_FORTRAN "Build fortran library" ON)
-+IF(MEDFILE_BUILD_FORTRAN)
-   ENABLE_LANGUAGE(Fortran)
-+  IF(NOT CMAKE_Fortran_COMPILER)
-+      MESSAGE(FATAL_EROOR "Fortran support was requested but not found")
-+  ENDIF()
- ELSE()
--  MESSAGE(STATUS "No Fortran support")
- ENDIF()
- 
- ## Version number 
-
diff --git a/sci-libs/med/files/med-3.3.1-disable-python-compile.patch b/sci-libs/med/files/med-3.3.1-disable-python-compile.patch
deleted file mode 100644
index 642b404ba880..000000000000
--- a/sci-libs/med/files/med-3.3.1-disable-python-compile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./config/cmake_files/medMacros.cmake	2016-10-24 09:55:35.000000000 +0200
-+++ ./config/cmake_files/medMacros.cmake.new	2018-01-24 10:50:15.146953227 +0100
-@@ -412,9 +412,9 @@
-   FOREACH(input ${PYFILE2COMPINST})
-     GET_FILENAME_COMPONENT(inputname ${input} NAME)
-     INSTALL(FILES ${input} DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYFILELOC})
--    INSTALL(CODE "MESSAGE(STATUS \"py compiling ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")")
--    INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")")
--    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")")
--    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")")
-+	#INSTALL(CODE "MESSAGE(STATUS \"py compiling ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")")
-+	#INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")")
-+	#INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")")
-+	#INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")")
-   ENDFOREACH(input ${PYFILE2COMPINST})
- ENDMACRO(INSTALL_AND_COMPILE_PYTHON_FILE PYFILE2COMPINST PYFILELOC)
-
diff --git a/sci-libs/med/files/med-4.0.0-cmakelist.patch b/sci-libs/med/files/med-4.0.0-cmakelist.patch
deleted file mode 100644
index 4c023cf24b31..000000000000
--- a/sci-libs/med/files/med-4.0.0-cmakelist.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/src/CMakeLists.txt	2018-07-28 16:37:01.180598992 +0200
-+++ a/src/CMakeLists.txt.new	2018-07-28 17:14:49.147775461 +0200
-@@ -1,7 +1,3 @@
--INCLUDE_DIRECTORIES(
--  ${HDF5_INCLUDE_DIRS}
--  ${MPI_INCLUDE_DIRS})
--
- # On Win platform, we need to make sure symbols are properly exported in
- # the intermediary OBJECT targes built in the sub-directories:
- # The definition "-D<target>_EXPORTS" is normally added automatically by CMake
-@@ -19,6 +15,12 @@
- INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include 
-     ${PROJECT_SOURCE_DIR}/include)
-
-+# these includes must go after project ones to avoid masking by
-+# previous versions already installed
-+INCLUDE_DIRECTORIES(
-+  ${HDF5_INCLUDE_DIRS}
-+  ${MPI_INCLUDE_DIRS})
-+
- # Get pure C intermediary targets:
- ADD_SUBDIRECTORY(hdfi)
- ADD_SUBDIRECTORY(ci)
---- a/tools/mdump/CMakeLists.txt	2018-07-29 09:24:35.714930029 +0200
-+++ a/tools/mdump/CMakeLists.txt.new	2018-07-29 09:58:48.667089767 +0200
-@@ -33,6 +33,6 @@
- CONFIGURE_FILE(xmdump3.in ${PROJECT_BINARY_DIR}/xmdump3 @ONLY)
- 
- INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/xmdump2 ${PROJECT_BINARY_DIR}/xmdump3 DESTINATION bin)
--INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump3 mdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)")
--INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump3 xmdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)")
-+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump3 mdump WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\")")
-+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump3 xmdump WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\")")
- 
---- a/src/2.3.6/CMakeLists.txt	2018-07-30 22:45:56.205079148 +0200
-+++ a/src/2.3.6/CMakeLists.txt.new	2018-07-30 22:49:43.520096835 +0200
-@@ -1,8 +1,3 @@
--INCLUDE_DIRECTORIES(
--  ${HDF5_INCLUDE_DIRS}
--  ${MPI_INCLUDE_DIRS}
--)
-- 
- SET(med236_SOURCES MEDaffiche.c)
- 
- # Definitions
-@@ -13,6 +8,13 @@
-     "${PROJECT_BINARY_DIR}/include/2.3.6"
-     "${PROJECT_SOURCE_DIR}/include/2.3.6")
- 
-+# these includes must go after project ones to avoid masking by
-+# previous versions already installed
-+INCLUDE_DIRECTORIES(
-+  ${HDF5_INCLUDE_DIRS}
-+  ${MPI_INCLUDE_DIRS}
-+)
-+ 
- # Build intermediate targets _cfi236, _hdfi236, _misc236 and _ci236 
- # (and their static counterpart):
- ADD_SUBDIRECTORY(cfi)
diff --git a/sci-libs/med/files/med-4.0.0-installdoc.patch b/sci-libs/med/files/med-4.0.0-installdoc.patch
deleted file mode 100644
index 2d9361c42657..000000000000
--- a/sci-libs/med/files/med-4.0.0-installdoc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./CMakeLists.txt	2019-02-26 11:59:15.276962751 +0100
-+++ ./CMakeLists.txt.new	2019-02-26 11:59:26.660962707 +0100
-@@ -137,9 +137,10 @@
- ENDIF()
- 
- ## Installation of the doc
-+set(MEDFILE_DOC_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} CACHE PATH "install dir for documentation")
- IF(MEDFILE_INSTALL_DOC  OR MEDFILE_BUILD_DOC)
--  INSTALL(DIRECTORY doc/html.dox/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} REGEX "Makefile*" EXCLUDE PATTERN "*.am" EXCLUDE)
--  INSTALL(DIRECTORY doc/gif doc/jpg doc/png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} FILES_MATCHING PATTERN "*.gif" PATTERN "*.jpg" PATTERN "*.svg" PATTERN "*.png")
-+  INSTALL(DIRECTORY doc/html.dox/ DESTINATION ${MEDFILE_DOC_DIRECTORY} REGEX "Makefile*" EXCLUDE PATTERN "*.am" EXCLUDE)
-+  INSTALL(DIRECTORY doc/gif doc/jpg doc/png DESTINATION ${MEDFILE_DOC_DIRECTORY} FILES_MATCHING PATTERN "*.gif" PATTERN "*.jpg" PATTERN "*.svg" PATTERN "*.png")
- ENDIF()
- 
- #######################
diff --git a/sci-libs/med/med-4.0.0-r2.ebuild b/sci-libs/med/med-4.0.0-r2.ebuild
deleted file mode 100644
index a0e73d4e0322..000000000000
--- a/sci-libs/med/med-4.0.0-r2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# EAPI=7 uses ninja generator by default but it's incompatible with USE=fortran
-# https://github.com/Kitware/ninja/tree/features-for-fortran#readme
-CMAKE_MAKEFILE_GENERATOR=emake
-
-FORTRAN_NEEDED=fortran
-
-# NOTE:The build for multiple python versions should be possible but
-# complicated for the build system
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit cmake fortran-2 python-single-r1
-
-DESCRIPTION="A library to store and exchange meshed data or computation results"
-HOMEPAGE="https://www.salome-platform.org/user-section/about/med"
-SRC_URI="https://files.salome-platform.org/Salome/other/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fortran mpi python test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test ) python? ( test )"
-
-# dev-lang/tk is needed for wish-based xmdump utility
-RDEPEND="
-	!sci-libs/libmed
-	dev-lang/tk:0=
-	>=sci-libs/hdf5-1.10.2:=[fortran?,mpi?]
-	mpi? ( virtual/mpi[fortran=] )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="python? ( >=dev-lang/swig-3.0.8 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.3.1-cmake-fortran.patch"
-	"${FILESDIR}/${PN}-3.3.1-disable-python-compile.patch"  # managed by function of python eclass
-	"${FILESDIR}/${P}-cmakelist.patch"
-	"${FILESDIR}/${P}-installdoc.patch"
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	if use python; then
-		# fixes for correct libdir name
-		local pysite=$(python_get_sitedir)
-		pysite="${pysite##/usr/}"
-		sed \
-			-e 's@SET(_install_dir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/med)@SET(_install_dir '${pysite}'/med)@' \
-			-i ./python/CMakeLists.txt || die "sed on ./python/CMakeLists.txt failed"
-	fi
-	for cm in ./src/CMakeLists.txt ./tools/medimport/CMakeLists.txt
-	do
-		sed -i -e "s@INSTALL(TARGETS \(.*\) DESTINATION lib)@INSTALL(TARGETS \1 DESTINATION $(get_libdir))@" \
-			"${cm}" || die "sed on ${cm} failed"
-	done
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# as indicated in the CMakeLists.txt, the shipped documentation is generated by a custom doxygen,
-		# so let's avoid rebuilding it because it will be different
-		-DMEDFILE_BUILD_DOC=OFF
-		-DMEDFILE_BUILD_FORTRAN=$(usex fortran)
-		-DMEDFILE_BUILD_PYTHON=$(usex python)
-		-DMEDFILE_BUILD_SHARED_LIBS=ON
-		-DMEDFILE_BUILD_STATIC_LIBS=OFF
-		-DMEDFILE_BUILD_TESTS=$(usex test)
-		-DMEDFILE_DOC_DIRECTORY="${EPREFIX}"/usr/share/doc/${PF}/html   # custom var created by patches
-		-DMEDFILE_INSTALL_DOC=$(usex doc)
-		-DMEDFILE_USE_MPI=$(usex mpi)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# we don't need old 2.3.6 include files
-	rm -r "${ED}"/usr/include/2.3.6 || die "failed to delete obsolete include dir"
-
-	# the optimization done in CMakeLists.txt has been disabled so
-	# we need to do it manually
-	use python && python_optimize
-
-	# Prevent test executables being installed
-	if use test; then
-		rm -r "${ED}"/usr/bin/testc || die "failed to delete C test executables"
-		if use fortran; then
-			rm -r "${ED}"/usr/bin/testf || die "failed to delete fortran test executables"
-		fi
-		if use python; then
-			rm -r "${ED}"/usr/bin/testpy || die "failed to delete python test executables"
-		fi
-	fi
-}
-
-src_test() {
-	# override parallel mode only for tests
-	local myctestargs=( "-j 1" )
-	cmake_src_test
-}
diff --git a/sci-libs/med/metadata.xml b/sci-libs/med/metadata.xml
index 306a461a3bdc..ef03cbff96a8 100644
--- a/sci-libs/med/metadata.xml
+++ b/sci-libs/med/metadata.xml
@@ -15,7 +15,7 @@
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
-		<description>Gentoo Proxy Maintainers</description>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/sci-libs/mpfi/Manifest b/sci-libs/mpfi/Manifest
index 6e2dfd16d376..92158f018311 100644
--- a/sci-libs/mpfi/Manifest
+++ b/sci-libs/mpfi/Manifest
@@ -1,2 +1 @@
-DIST mpfi-1.5.3.tar.bz2 447256 BLAKE2B 67bb9af362ec96c015571cbdaba09befc2241e0113b6177dd76eec97b619bbf9c924ba4d16583df664cafdb1a78c8700712e30633e91e5ae6f1d5e084c3ede5c SHA512 9c3cdf665fccff8b383c96827f4acb7aa62efdf7854cff271455273f00f8e7ecf84fbe191b02e5f51fe067aaae564fd2a0add062070ff5c1f542d61a021f967d
 DIST mpfi-1.5.4.tgz 261696 BLAKE2B 264453870fbf18afc0876eef72a3fc9690e9eee1da5179831a24409159abe75b88dc373e2d20b8171c846e870ded876715b2c9034ab4f0d0f0ff10e34abd099d SHA512 72ba7d8c950f4d4e2c7a3da8570cdcec08f75b73580cdf64c4cc3b24f8add23c46ccf78a6de2158e81bd77e6efabceebbae418988d536e7484356b8102e10ce1
diff --git a/sci-libs/mpfi/mpfi-1.5.3.ebuild b/sci-libs/mpfi/mpfi-1.5.3.ebuild
deleted file mode 100644
index 4dcc4fa3de14..000000000000
--- a/sci-libs/mpfi/mpfi-1.5.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit out-of-source
-
-DESCRIPTION="Multiple precision interval arithmetic library based on MPFR"
-HOMEPAGE="https://perso.ens-lyon.fr/nathalie.revol/software.html"
-SRC_URI="https://gforge.inria.fr/frs/download.php/37331/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/gmp-4.1.2:0=
-	>=dev-libs/mpfr-2.4:0="
-RDEPEND="${DEPEND}"
-
-my_src_configure() {
-	econf --disable-static
-}
-
-my_src_install() {
-	default
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/mpfi/mpfi-1.5.4.ebuild b/sci-libs/mpfi/mpfi-1.5.4.ebuild
index 88f5869d2132..fbeee087274a 100644
--- a/sci-libs/mpfi/mpfi-1.5.4.ebuild
+++ b/sci-libs/mpfi/mpfi-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/file/38111/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-libs/gmp:0=
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index 0313b4c4e45b..d9ece8a2318f 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -1,3 +1,2 @@
 DIST mpir-2.6.0.tar.lzma 2472231 BLAKE2B ec768fb78317220d677fac24609fdc4db1315e3c5594d7e098a0f502c38eb8dcf69bac5317c3b7afd629c089504856bb686aa4de65ad54b4f728325e100db44f SHA512 e2608beeb72651c9b2e47f8fb2bcf672f8c74e2cd622e17cd19b12100b66e929ee31d102d2901816379b23aee1a3ea3a854e3e10ebffe2a6e4772748858f911d
-DIST mpir-2.7.2.tar.bz2 3771429 BLAKE2B c3431bcb84207fdb1bc0242fe56b7c2d45643e8c21c4b215162f824bed3a395972f734907f966bc14c58a28d30bb35f441b16b2762a9c8ef9c02d164f804bc82 SHA512 8436a0123201f9e30130ea340331c5a6445dddb58ce1f6c6a3a8303c310ac5b3c279c83b5c520a757cba82c2b14e92da44583e0eec287090cf69cbb29d516a9c
 DIST mpir-3.0.0.tar.bz2 2572041 BLAKE2B f564944dd76586ca6e50c39f1199468b905a3db7bbb8b2ee6cf3dcdfb00757d7eefc57e010d5cfc3d6db7ba2676e36f7980365e85c87827b4901ec4e80349915 SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e
diff --git a/sci-libs/mpir/files/mpir-2.7.2-sed-backport.patch b/sci-libs/mpir/files/mpir-2.7.2-sed-backport.patch
deleted file mode 100644
index 897642909ca0..000000000000
--- a/sci-libs/mpir/files/mpir-2.7.2-sed-backport.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index a3821c5..15fa93d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2595,7 +2595,7 @@ for tmp_fn in $gmp_mpn_functions; do
-             sed -n 's/^[ 	]*MULFUNC_PROLOGUE(\(.*\))/\1/p' $tmp_file ;
-             sed -n 's/^[ 	]*PROLOGUE(\([^,]*\).*)/\1/p' $tmp_file ;
-             sed -n 's/^;[ 	]*PROLOGUE(\([^,]*\).*)/\1/p' $tmp_file ;
--            sed -n 's/[^G]*GLOBAL_FUNC[:space:]*\(.*\)/\1/p' $tmp_file ;
-+            sed -n 's/[^G]*GLOBAL_FUNC[[:space:]]*\(.*\)/\1/p' $tmp_file ;
-           `]
-           for gmp_tmp in $gmp_ep; do
-             AC_DEFINE_UNQUOTED(HAVE_NATIVE_$gmp_tmp)
diff --git a/sci-libs/mpir/mpir-2.7.2.ebuild b/sci-libs/mpir/mpir-2.7.2.ebuild
deleted file mode 100644
index 2b6ac41d8577..000000000000
--- a/sci-libs/mpir/mpir-2.7.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Library for arbitrary precision integer arithmetic (fork of gmp)"
-HOMEPAGE="https://www.mpir.org/"
-SRC_URI="http://www.mpir.org/${P}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0/16"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+cxx cpudetection static-libs"
-
-DEPEND="
-	x86? ( dev-lang/yasm )
-	amd64? ( dev-lang/yasm )
-"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ABI-multilib.patch
-	"${FILESDIR}"/${P}-sed-backport.patch
-)
-
-src_prepare() {
-	tc-export CC
-
-	default
-
-	# In the same way there was QA regarding executable stacks
-	# with GMP we have some here as well. We cannot apply the
-	# GMP solution as yasm is used, at least on x86/amd64.
-	# Furthermore we are able to patch config.ac.
-	ebegin "Patching assembler files to remove executable sections"
-	local i
-	for i in $(find . -type f -name '*.asm') ; do
-		cat >> $i <<-EOF
-			#if defined(__linux__) && defined(__ELF__)
-			.section .note.GNU-stack,"",%progbits
-			#endif
-		EOF
-	done
-
-	for i in $(find . -type f -name '*.as') ; do
-		cat >> $i <<-EOF
-			%ifidn __OUTPUT_FORMAT__,elf
-			section .note.GNU-stack noalloc noexec nowrite progbits
-			%endif
-		EOF
-	done
-	eend
-	eautoreconf
-}
-
-src_configure() {
-	# beware that cpudetection aka fat binaries is x86/amd64 only.
-	# Place mpir in profiles/arch/$arch/package.use.mask
-	# when making it available on $arch.
-	myeconfargs+=(
-		--with-system-yasm
-		$(use_enable cxx)
-		$(use_enable cpudetection fat)
-		$(use_enable static-libs static)
-	)
-	econf ${myeconfargs[@]}
-}
-
-src_install() {
-	default
-	rm "${ED}"/usr/$(get_libdir)/*la || die
-}
diff --git a/sci-libs/mumps/Manifest b/sci-libs/mumps/Manifest
index d914fe1d94c4..222fe61900a1 100644
--- a/sci-libs/mumps/Manifest
+++ b/sci-libs/mumps/Manifest
@@ -1,2 +1 @@
-DIST MUMPS_5.1.2.tar.gz 3351215 BLAKE2B 1c77c2a217c101245a9a96a59be6b9bfd67ceffa603d807b5a7173026c5c33e2c4de78c14833d7b7f0a90130b9ebc0ac9c7d4ebfbf881d0bd2210a542887c239 SHA512 38a63b14a8df835be68b5fa310b39aa1815799220d56c176e4005797800959e9e08c9a6bf11d308ab82ea40b6f34d36072cebe7c1de39e0c314eb138b93f1b74
-DIST MUMPS_5.3.3.tar.gz 3912935 BLAKE2B 03b88e23b8dd49832c43aef4717edd440328ca7c63eed9005a6baa008090f63089e7a259fb8091ce462e249196c2a1de0ec1e864173e3ecc3265d5a9cef8b869 SHA512 fb2da6acfd0a413ed5a9b2ea346a191ecea4a057f26a8c3b8ed2400843753a354055eb911e53d9f6ed5a6818e653ab926579c1a4a261b791c5ae421fcd5a7945
+DIST MUMPS_5.3.5.tar.gz 3940501 BLAKE2B f1767483bb23744a2c5ed11b0823c5b023377d5212abbe29a177cce5b5e51e6f2f391d7caa17022646e36c9e4b4fb4af80b03ac6cf8e89f37502ed960138bbbe SHA512 6e3bb081f38af8540ada7b4fb54c6e766739c854e2a3dd253e3e012eee05dae30064b1b4a8d7493f10691725aba4cc9e80544b0fe5b71670cb0b2726ccfc4439
diff --git a/sci-libs/mumps/mumps-5.1.2-r1.ebuild b/sci-libs/mumps/mumps-5.1.2-r1.ebuild
deleted file mode 100644
index 25e6b81e8cee..000000000000
--- a/sci-libs/mumps/mumps-5.1.2-r1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fortran-2 toolchain-funcs
-
-MYP=MUMPS_${PV}
-
-DESCRIPTION="MUltifrontal Massively Parallel sparse direct matrix Solver"
-HOMEPAGE="https://mumps.enseeiht.fr/"
-SRC_URI="http://mumps.enseeiht.fr/${MYP}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples metis mpi +scotch static-libs"
-
-RDEPEND="
-	virtual/blas
-	metis? (
-		   || ( >=sci-libs/metis-5 >=sci-libs/parmetis-4 )
-		   mpi? ( >=sci-libs/parmetis-4 )
-	)
-	mpi? ( sci-libs/scalapack )
-	scotch? ( >=sci-libs/scotch-6.0.1:=[mpi=] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MYP}"
-
-get_version_component_count() {
-	local cnt=( $(ver_rs 1- ' ') )
-	echo ${#cnt[@]}
-}
-
-static_to_shared() {
-	local libstatic=${1}
-	shift
-	local libname=$(basename ${libstatic%.a})
-	local soname=${libname}$(get_libname $(ver_cut 1-2))
-	local libdir=$(dirname ${libstatic})
-
-	einfo "Making ${soname} from ${libstatic}"
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
-			-Wl,-all_load -Wl,${libstatic} \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-	else
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-shared -Wl,-soname=${soname} \
-			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-
-		if [[ $(get_version_component_count) -ge 1 ]] ; then
-			ln -s ${soname} ${libdir}/${libname}$(get_libname $(ver_cut 1)) || die
-		fi
-
-		ln -s ${soname} ${libdir}/${libname}$(get_libname) || die
-	fi
-}
-
-src_prepare() {
-	sed -e "s:^\(CC\s*=\).*:\1$(tc-getCC):" \
-		-e "s:^\(FC\s*=\).*:\1$(tc-getFC):" \
-		-e "s:^\(FL\s*=\).*:\1$(tc-getFC):" \
-		-e "s:^\(AR\s*=\).*:\1$(tc-getAR) cr :" \
-		-e "s:^\(RANLIB\s*=\).*:\1$(tc-getRANLIB):" \
-		-e "s:^\(LIBBLAS\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs blas):" \
-		-e "s:^\(INCPAR\s*=\).*:\1:" \
-		-e 's:^\(LIBPAR\s*=\).*:\1$(SCALAP):' \
-		-e "s:^\(OPTF\s*=\).*:\1${FFLAGS} -DALLOW_NON_INIT \$(PIC):" \
-		-e "s:^\(OPTC\s*=\).*:\1${CFLAGS} \$(PIC):" \
-		-e "s:^\(OPTL\s*=\).*:\1${LDFLAGS}:" \
-		Make.inc/Makefile.inc.generic > Makefile.inc || die
-	# fixed a missing copy of libseq to libdir
-
-	default
-}
-
-src_configure() {
-	LIBADD="$($(tc-getPKG_CONFIG) --libs blas) -Llib -lpord"
-	local ord="-Dpord"
-	if use metis && use mpi; then
-		sed -i \
-			-e "s:#\s*\(LMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs parmetis):" \
-			-e "s:#\s*\(IMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --cflags parmetis):" \
-			Makefile.inc || die
-		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs parmetis)"
-		ord="${ord} -Dparmetis"
-	elif use metis; then
-		sed -i \
-			-e "s:#\s*\(LMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs metis):" \
-			-e "s:#\s*\(IMETIS\s*=\).*:\1$($(tc-getPKG_CONFIG) --cflags metis):" \
-			Makefile.inc || die
-		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs metis)"
-		ord="${ord} -Dmetis"
-	fi
-	if use scotch && use mpi; then
-		sed -i \
-			-e "s:#\s*\(LSCOTCH\s*=\).*:\1-lptesmumps -lptscotch -lptscotcherr:" \
-			-e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${ESYSROOT}/usr/include/scotch:" \
-			Makefile.inc || die
-		LIBADD="${LIBADD} -lptesmumps -lptscotch -lptscotcherr"
-		ord="${ord} -Dptscotch"
-	elif use scotch; then
-		sed -i \
-			-e "s:#\s*\(LSCOTCH\s*=\).*:\1-lesmumps -lscotch -lscotcherr:" \
-			-e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${ESYSROOT}/usr/include/scotch:" \
-			Makefile.inc || die
-		LIBADD="${LIBADD} -lesmumps -lscotch -lscotcherr"
-		ord="${ord} -Dscotch"
-	fi
-	if use mpi; then
-		sed -i \
-			-e "s:^\(CC\s*=\).*:\1mpicc:" \
-			-e "s:^\(FC\s*=\).*:\1mpif90:" \
-			-e "s:^\(FL\s*=\).*:\1mpif90:" \
-			-e "s:^\(SCALAP\s*=\).*:\1$($(tc-getPKG_CONFIG) --libs scalapack):" \
-			Makefile.inc || die
-		export LINK=mpif90
-		LIBADD="${LIBADD} $($(tc-getPKG_CONFIG) --libs scalapack)"
-	else
-		sed -i \
-			-e 's:-Llibseq:-L$(topdir)/libseq:' \
-			-e 's:PAR):SEQ):g' \
-			-e "s:^\(SCALAP\s*=\).*:\1:" \
-			-e 's:^LIBSEQNEEDED =:LIBSEQNEEDED = libseqneeded:g' \
-			Makefile.inc || die
-		export LINK="$(tc-getFC)"
-	fi
-	sed -i -e "s:^\s*\(ORDERINGSF\s*=\).*:\1 ${ord}:" Makefile.inc || die
-}
-
-src_compile() {
-	# Workaround #462602
-	export FAKEROOTKEY=1
-
-	# -j1 because of static archive race
-	emake -j1 alllib PIC="-fPIC"
-	if ! use mpi; then
-		#$(tc-getAR) crs lib/libmumps_common.a libseq/*.o || die
-		LIBADD+=" -Llibseq -lmpiseq"
-		static_to_shared libseq/libmpiseq.a
-	fi
-
-	static_to_shared lib/libpord.a ${LIBADD}
-	static_to_shared lib/libmumps_common.a ${LIBADD}
-
-	local i
-	for i in c d s z; do
-		static_to_shared lib/lib${i}mumps.a -Llib -lmumps_common ${LIBADD}
-	done
-
-	if use static-libs; then
-		emake clean
-		emake -j1 alllib
-	fi
-}
-
-src_test() {
-	emake all
-
-	local dotest
-	if use mpi; then
-		dotest="mpirun -np 2"
-	else
-		export LD_LIBRARY_PATH="${S}/libseq:${LD_LIBRARY_PATH}"
-	fi
-
-	cd examples
-	${dotest} ./ssimpletest < input_simpletest_real || die
-	${dotest} ./dsimpletest < input_simpletest_real || die
-	${dotest} ./csimpletest < input_simpletest_cmplx || die
-	${dotest} ./zsimpletest < input_simpletest_cmplx || die
-	einfo "The solutions should be close to (1,2,3,4,5)"
-	${dotest} ./c_example || die
-	einfo "The solution should be close to (1,2)"
-	emake clean
-}
-
-src_install() {
-	dolib.so lib/lib*$(get_libname)*
-	use static-libs && dolib.a lib/lib*.a
-	insinto /usr
-
-	doins -r include
-	if ! use mpi; then
-		dolib.so libseq/lib*$(get_libname)*
-		insinto /usr/include/mpiseq
-		doins libseq/*.h
-		use static-libs && dolib.a libseq/libmpiseq.a
-	fi
-
-	dodoc README ChangeLog VERSION
-	use doc && dodoc doc/*.pdf
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/sci-libs/mumps/mumps-5.3.3.ebuild b/sci-libs/mumps/mumps-5.3.5.ebuild
index d84647b2d6d0..e321cebd1397 100644
--- a/sci-libs/mumps/mumps-5.3.3.ebuild
+++ b/sci-libs/mumps/mumps-5.3.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit fortran-2 toolchain-funcs
+inherit fortran-2 flag-o-matic toolchain-funcs
 
 MYP=MUMPS_${PV}
 
@@ -62,6 +62,9 @@ static_to_shared() {
 }
 
 src_prepare() {
+	# workaround for gcc10 (bug #743442)
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
 	sed -e "s;^\(CC\s*=\).*;\1$(tc-getCC);" \
 		-e "s;^\(FC\s*=\).*;\1$(tc-getFC);" \
 		-e "s;^\(FL\s*=\).*;\1$(tc-getFC);" \
@@ -82,6 +85,7 @@ src_prepare() {
 src_configure() {
 	LIBADD="$($(tc-getPKG_CONFIG) --libs blas) -Llib -lpord"
 	local ord="-Dpord"
+
 	if use metis && use mpi; then
 		sed -i \
 			-e "s;#\s*\(LMETIS\s*=\).*;\1$($(tc-getPKG_CONFIG) --libs parmetis);" \
@@ -137,8 +141,7 @@ src_compile() {
 	# Workaround #462602
 	export FAKEROOTKEY=1
 
-	# -j1 because of static archive race
-	emake -j1 alllib PIC="-fPIC"
+	emake alllib PIC="-fPIC"
 	if ! use mpi; then
 		#$(tc-getAR) crs lib/libmumps_common.a libseq/*.o || die
 		LIBADD+=" -Llibseq -lmpiseq"
@@ -155,7 +158,7 @@ src_compile() {
 
 	if use static-libs; then
 		emake clean
-		emake -j1 alllib
+		emake alllib
 	fi
 }
 
diff --git a/sci-libs/netcdf-fortran/Manifest b/sci-libs/netcdf-fortran/Manifest
index eda8ccb1d20f..fdc76a3e95b3 100644
--- a/sci-libs/netcdf-fortran/Manifest
+++ b/sci-libs/netcdf-fortran/Manifest
@@ -1,3 +1 @@
-DIST netcdf-fortran-4.2.tar.gz 2479928 BLAKE2B 4816bfb20d3d0ad0dd1ead756b5b5d296b9e44ba78b5a82880840d8004c56bec95d7407db216f59b14ca6ec41ec953470d8fba369cb499d1ecc46aad7d1d43dd SHA512 af5d489df7b3ff5c3208115af4abdbf12d74d6bc0b9e3c729cfd24b55efafc3766de21c0f9957e037c25726637e9129a1f7009676e81d7e59650fec56d6e776e
-DIST netcdf-fortran-4.4.2.tar.gz 1246344 BLAKE2B 9d0fffde97b39df0de795ba046fb3c02d75656829fefd162e27b7464b0655d75e9b91fec305f1ee7615680c0e7651f0623c836766238b46359ecd269a2e23124 SHA512 c3f025c0f5a08a0141fa09f570c647fc63992f9fd707969b37c7b0590c3578172200e45ecee497ed054129366fd1c73e3cd069aba879015b13a143e77a181c0f
 DIST netcdf-fortran-4.4.3.tar.gz 1286951 BLAKE2B 6e68505359328bac4155065419cb9c2fb2df0de875210c0eb9a4e63312b2ec272d63ecfa73b5dcebe7cf75b58a184d1a0ccb2c06c45869d3f4573590d610d9e0 SHA512 94f51b4be889d6a9d6a86e3fcb2639ac58288969160d0f334ed6965e3c9cbacff7289b1fc54ed06e6ec8b845b19f5c409fbdcab432c8edf5c96efde887920924
diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.2.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.2.ebuild
deleted file mode 100644
index a722ccdc91f6..000000000000
--- a/sci-libs/netcdf-fortran/netcdf-fortran-4.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_STANDARD="77 90"
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils fortran-2
-
-DESCRIPTION="Scientific library and interface for array oriented data access"
-HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
-SRC_URI="ftp://ftp.unidata.ucar.edu/pub/netcdf/${P}.tar.gz"
-
-LICENSE="UCAR-Unidata"
-SLOT="0/5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs"
-
-RDEPEND="sci-libs/netcdf"
-DEPEND="${RDEPEND}
-	dev-lang/cfortran
-"
-
-src_prepare() {
-	# use system cfortran
-	rm fortran/cfortran.h || die
-	autotools-utils_src_prepare
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.4.2.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.4.2.ebuild
deleted file mode 100644
index a7ba9edabdff..000000000000
--- a/sci-libs/netcdf-fortran/netcdf-fortran-4.4.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_STANDARD="77 90"
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils fortran-2
-
-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-fortran/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UCAR-Unidata"
-SLOT="0/6"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs"
-
-RDEPEND="sci-libs/netcdf"
-DEPEND="${RDEPEND}
-	dev-lang/cfortran
-"
-
-src_prepare() {
-	# use system cfortran
-	rm libsrc/cfortran.h || die
-
-	autotools-utils_src_prepare
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 5271389b4f2f..f0ad551c5b0a 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,2 +1,3 @@
 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
diff --git a/sci-libs/netcdf/netcdf-4.6.1.ebuild b/sci-libs/netcdf/netcdf-4.6.1.ebuild
deleted file mode 100644
index ed2f91c0b4a4..000000000000
--- a/sci-libs/netcdf/netcdf-4.6.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune
-
-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/11"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+dap examples hdf +hdf5 mpi static-libs szip test tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dap? ( net-misc/curl:0= )
-	hdf? ( sci-libs/hdf:0= sci-libs/hdf5:0= )
-	hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )"
-DEPEND="${RDEPEND}"
-# doc generation is missing many doxygen files in tar ball
-#	doc? ( app-doc/doxygen[dot] )"
-
-REQUIRED_USE="test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )"
-
-S="${WORKDIR}/${PN}-c-${PV}"
-
-src_configure() {
-	local myconf
-	if use mpi; then
-		export CC=mpicc
-	fi
-	econf "${myconf}" \
-		--disable-examples \
-		--disable-dap-remote-tests \
-		$(use_enable dap) \
-		$(use_enable hdf hdf4) \
-		$(use_enable hdf5 netcdf-4) \
-		$(use_enable static-libs static) \
-		$(use_enable tools utilities)
-}
-
-src_test() {
-	# fails parallel tests: bug #621486
-	emake check -j1
-}
-
-src_install() {
-	default
-	use examples && dodoc -r examples
-	prune_libtool_files
-}
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/octomap/Manifest b/sci-libs/octomap/Manifest
index 8b77e9933585..bd5f56925609 100644
--- a/sci-libs/octomap/Manifest
+++ b/sci-libs/octomap/Manifest
@@ -1,2 +1 @@
-DIST octomap-1.9.0.tar.gz 1682421 BLAKE2B a299b4a956d5f9b6a67b05548f2239ad1181a4a1e673e5868d56d6e2d8f0101b2c75b114d1b7995c244c138fe04c8972104c25ca2f4ca6f75639f7326f06d8d7 SHA512 335a4ee3fe20f456afd2d8491f8fe6cfc2527d6e26aa690a69a39c1468e41d312fd84c85a1247deb11f513b9d50b8c69d34b46876f8257c205b0a99bac826237
 DIST octomap-1.9.5.tar.gz 1682781 BLAKE2B 1ced023160d10c424d4bff76a0481ffe6c87c5bf8133480afe6c47ee0ee116304a811293cc0af0b303ebcad370b7ce433e85212f070ac921a9c5be41905a94ea SHA512 e58c6d33c351b14e9596e18a8702715d167c136fd029b1078ddd13a5926fe451d3b619231b5a8ccfb64b6e5fc6db8b57e6ef329099828d2f5195c0988700b581
diff --git a/sci-libs/octomap/octomap-1.9.0.ebuild b/sci-libs/octomap/octomap-1.9.0.ebuild
deleted file mode 100644
index 854b68aafd95..000000000000
--- a/sci-libs/octomap/octomap-1.9.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 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/OctoMap/octomap"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/OctoMap/octomap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="An Efficient Probabilistic 3D Mapping Framework Based on Octrees"
-HOMEPAGE="https://octomap.github.io/"
-IUSE="qt5 dynamicEDT3D doc"
-LICENSE="BSD qt5? ( GPL-2 )"
-SLOT="0/19"
-
-RDEPEND="
-	qt5? (
-		virtual/opengl
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		x11-libs/libQGLViewer:=
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-
-PATCHES=( "${FILESDIR}/qglqt5.patch" )
-
-src_prepare() {
-	sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
-		-i */CMakeLists.txt \
-		-i */CMakeModules/InstallPkgConfigFile.cmake || die
-	sed -e 's/iewer-qt4/iewer-qt5/g' \
-		-i octovis/CMakeModules/FindQGLViewer.cmake || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt5 ON OFF)"
-		"-DOCTOVIS_QT5=TRUE"
-		"-DBUILD_DYNAMICETD3D_SUBPROJECT=$(usex dynamicEDT3D ON OFF)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc ; then
-		cd "${BUILD_DIR}/octomap"
-		emake docs
-		if use dynamicEDT3D ; then
-			cd "${BUILD_DIR}/dynamicEDT3D"
-			emake docs_dynamicEDT3D
-		fi
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/html/octomap
-		doins -r "${S}/octomap/doc/html/"*
-		if use dynamicEDT3D ; then
-			insinto /usr/share/doc/${PF}/html/dynamicEDT3D
-			doins -r "${S}/dynamicEDT3D/doc/html/"*
-		fi
-	fi
-
-	insinto /usr/share/ros_packages/${PN}
-	doins "${ED}/usr/share/${PN}/package.xml"
-	if use qt5; then
-		insinto /usr/share/ros_packages/octovis
-		doins "${ED}/usr/share/octovis/package.xml"
-	fi
-}
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 13a601adbeed..76d50dca6158 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,3 +1,2 @@
-DIST openblas-0.3.10.tar.gz 12246979 BLAKE2B 507aa3f058b841f477720cff98480afda5c3e236b688fb1a12ff45ce20c42c6e84c786d62a5db7e6de6d133d40286e58777fcb51d6542b7030629d55ba12086f SHA512 64a5f983b2f6e02cdb6e0f14433498cc5daa1ccfb49246f7a2dcd38f9982fa608f2abea069fe0e35012af8c1441c43d1f6418eaccd40795f5002fed1c36ce05d
 DIST openblas-0.3.12.tar.gz 12325103 BLAKE2B 3d6706e59e83f87dd58b287753bf697de99e83c8a4484453f120d8f8c9c69ea5b481a143db04342a1dcb1779ce548a49618cf4941d08d636e12ed481305e8fb5 SHA512 1ff5a065c41f7e460857f8428fc77900b189f051fa8129eea9ae93237f234d387cc1c6e627c2c95636164f512d4d721d4229729f04a04e8d5f655abbf5463d98
-DIST openblas-0.3.9.tar.gz 12189745 BLAKE2B 3cc4c6a403d6a52845cf4ff8cef254f57587e17e3d09bfb6ed7c02ad06a6002e50b340177c73a944c2a621c12b7f494c516025751c194d019662c0b4db17f4dc SHA512 c6b8ee465f1cf53b37f21ec3ff9a28d5cafe20fec59d8c1bff5923a9e1989dfa5ae8c032a5d43988fe7722ed08c64c7957a3d30e6ae917e2e7aa2977a91e67a3
+DIST openblas-0.3.13.tar.gz 12437434 BLAKE2B d8f9d3296506c6148cd506278f0b6a2a4fe50975a7fd3f54108e98e88a13002b1035f5697322ba73df7c6397faee6d0772c1d4d46b66db8e862f17b980dbdf97 SHA512 86e7f496587cc35d7feede99cbe3cf627ef690dd7489bb03b95f7d15ed758e32baf17d79f17b1de187184394233f60a8249a64dd53c3d59a9540db92269b7ee4
diff --git a/sci-libs/openblas/openblas-0.3.12-r1.ebuild b/sci-libs/openblas/openblas-0.3.12-r1.ebuild
index 6e459253ec12..db46a09f243c 100644
--- a/sci-libs/openblas/openblas-0.3.12-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.3.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,8 +12,8 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-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.10.ebuild b/sci-libs/openblas/openblas-0.3.13.ebuild
index 40ff41fbb699..3b4329a4c9e9 100644
--- a/sci-libs/openblas/openblas-0.3.10.ebuild
+++ b/sci-libs/openblas/openblas-0.3.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,74 +8,126 @@ inherit flag-o-matic fortran-2 toolchain-funcs
 DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
 HOMEPAGE="https://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 test"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-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-cblas
-			>=app-eselect/eselect-lapack-0.2 )"
+	eselect-ldso? (
+		>=app-eselect/eselect-blas-0.2
+		>=app-eselect/eselect-lapack-0.2
+	)
+"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/shared-blas-lapack.patch"
+	"${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"
 
-	export CC=$(tc-getCC) FC=$(tc-getFC)
+	# 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 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1
+		export DYNAMIC_ARCH=1 \
+		       NO_AFFINITY=1 \
+		       TARGET=GENERIC
 
-	# disable submake with -j
-	export MAKE_NB_JOBS=-1
+	export NUM_PARALLEL=${OPENBLAS_NPARALLEL:-8} \
+	       NUM_THREADS=${OPENBLAS_NTHREAD:-64}
 
-	# Set these to "nothing" to prevent the default optimization flags
-	# from being added in Makefile.system.
-	export COMMON_OPT=" " FCOMMON_OPT=" "
+	# 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
 
-	USE_THREAD=0
-	if use openmp; then
-		USE_THREAD=1; USE_OPENMP=1;
-	elif use pthread; then
-		USE_THREAD=1; USE_OPENMP=0;
+	export NO_STATIC=1
+
+	BUILD_RELAPACK=1
+	if ! use relapack; then
+		BUILD_RELAPACK=0
 	fi
-	export USE_THREAD USE_OPENMP
 
-	export PREFIX="${EPREFIX}/usr"
+	export PREFIX="${EPREFIX}/usr" BUILD_RELAPACK
 }
 
-src_unpack() {
+src_prepare() {
 	default
 
-	mv "${WORKDIR}"/*OpenBLAS* "${S}" || die
+	# 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() {
-	# We have to try extra hard to override AR for now.
-	# https://github.com/xianyi/OpenBLAS/issues/2654
-	emake AR="$(tc-getAR)"
-	emake AR="$(tc-getAR)" -Cinterface shared-blas-lapack
+	default
+	cd interface || die
+	emake shared-blas-lapack
+
 	if use index-64bit; then
-		emake -C"${S}-index-64bit" INTERFACE64=1 LIBPREFIX=libopenblas64
+		emake -C"${S}-index-64bit" \
+		      INTERFACE64=1 \
+		      LIBPREFIX=libopenblas64
 	fi
 }
 
@@ -84,10 +136,16 @@ src_test() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
-		OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir)
+	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
@@ -98,11 +156,8 @@ src_install() {
 		insinto /usr/$(get_libdir)/lapack/openblas/
 		doins interface/liblapack.so.3
 		dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
-	fi
-
-	if use index-64bit; then
-		insinto /usr/$(get_libdir)/
-		dolib.so "${S}-index-64bit"/libopenblas64*.so*
+		doins interface/liblapacke.so.3
+		dosym liblapacke.so.3 usr/$(get_libdir)/lapack/openblas/liblapacke.so
 	fi
 }
 
diff --git a/sci-libs/openblas/openblas-0.3.9-r1.ebuild b/sci-libs/openblas/openblas-0.3.9-r1.ebuild
deleted file mode 100644
index ecb383969252..000000000000
--- a/sci-libs/openblas/openblas-0.3.9-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# 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="https://xianyi.github.com/OpenBLAS/"
-SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="dynamic eselect-ldso index-64bit openmp pthread test"
-REQUIRED_USE="?? ( openmp pthread )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	eselect-ldso? ( >=app-eselect/eselect-blas-0.2
-			!app-eselect/eselect-cblas
-			>=app-eselect/eselect-lapack-0.2 )"
-
-DEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/shared-blas-lapack.patch"
-	"${FILESDIR}/dont-clobber-fflags.patch"
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	use openmp && tc-check-openmp
-
-	# We need to filter these while building the library, and not just
-	# while building the test suite. Will hopefully get fixed upstream:
-	# https://github.com/xianyi/OpenBLAS/issues/2657
-	use test && filter-flags "-fbounds-check" "-fcheck=bounds" "-fcheck=all"
-
-	export CC=$(tc-getCC) FC=$(tc-getFC)
-
-	use dynamic && \
-		export DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1
-
-	# disable submake with -j
-	export MAKE_NB_JOBS=-1
-
-	# Set these to "nothing" to prevent the default optimization flags
-	# from being added in Makefile.system.
-	export COMMON_OPT=" " FCOMMON_OPT=" "
-
-	USE_THREAD=0
-	if use openmp; then
-		USE_THREAD=1; USE_OPENMP=1;
-	elif use pthread; then
-		USE_THREAD=1; USE_OPENMP=0;
-	fi
-	export USE_THREAD USE_OPENMP
-
-	export PREFIX="${EPREFIX}/usr"
-}
-
-src_unpack() {
-	default
-	mv "${WORKDIR}"/*OpenBLAS* "${S}" || die
-	if use index-64bit; then
-		cp -aL "${S}" "${S}-index-64bit" || die
-	fi
-}
-
-src_compile() {
-	# We have to try extra hard to override AR for now.
-	# https://github.com/xianyi/OpenBLAS/issues/2654
-	emake AR="$(tc-getAR)"
-	emake AR="$(tc-getAR)" -Cinterface shared-blas-lapack
-	if use index-64bit; then
-		emake -C"${S}-index-64bit" INTERFACE64=1 LIBPREFIX=libopenblas64
-	fi
-}
-
-src_test() {
-	emake tests
-}
-
-src_install() {
-	emake install DESTDIR="${D}" OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
-		OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir)
-	dodoc GotoBLAS_*.txt *.md Changelog.txt
-
-	if use eselect-ldso; then
-		insinto /usr/$(get_libdir)/blas/openblas/
-		doins interface/libblas.so.3
-		dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so
-		doins interface/libcblas.so.3
-		dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so
-
-		insinto /usr/$(get_libdir)/lapack/openblas/
-		doins interface/liblapack.so.3
-		dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
-	fi
-
-	if use index-64bit; then
-		insinto /usr/$(get_libdir)/
-		dolib.so "${S}-index-64bit"/libopenblas64*.so*
-	fi
-}
-
-pkg_postinst() {
-	use eselect-ldso || return
-	local libdir=$(get_libdir) me="openblas"
-
-	# check blas
-	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
-	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
-		eselect blas set ${libdir} ${me}
-		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
-	else
-		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
-		elog "To use blas [${me}] implementation, you have to issue (as root):"
-		elog "\t eselect blas set ${libdir} ${me}"
-	fi
-
-	# check lapack
-	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
-	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
-		eselect lapack set ${libdir} ${me}
-		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
-	else
-		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
-		elog "To use lapack [${me}] implementation, you have to issue (as root):"
-		elog "\t eselect lapack set ${libdir} ${me}"
-	fi
-}
-
-pkg_postrm() {
-	if use eselect-ldso; then
-		eselect blas validate
-		eselect lapack validate
-	fi
-}
diff --git a/sci-libs/openlibm/Manifest b/sci-libs/openlibm/Manifest
index b4c9f9e7e5ea..7165687c80a6 100644
--- a/sci-libs/openlibm/Manifest
+++ b/sci-libs/openlibm/Manifest
@@ -1,2 +1 @@
-DIST openlibm-0.7.0.tar.gz 366359 BLAKE2B 9dc545e3effedaadefda31ae75759ac8e5afb74250e8a7d9016b1406c235a298a375641207d3561365d750ec442e5ecdbfb1ce8b179a17bdaa48a5e2d5e5af25 SHA512 e52245ea93513fb1d9eade348f7c4ad4f1b500944024f7d52d71d43af908059e581ea77df6fc879414ff17c860263debec3aaf6ac86eea03ee1fe23d180487ed
 DIST openlibm-0.7.2.tar.gz 366285 BLAKE2B 0086d026e53c337e20dc895dad38157308b16392f590c8a2c2f7699f2bb8bd5bd0d1931672c2d31a320af0a5ad1cc2e10f2eeb953f30382cfcae5aaac0adc478 SHA512 25e5c28ef898d905ff589d24efb87a99f3772d59596ad5660afc7cafbcd709bca167e863aadc84b90b930add036d285db1332faa9adf1b73562abf1185b9ee5c
diff --git a/sci-libs/openlibm/openlibm-0.7.0.ebuild b/sci-libs/openlibm/openlibm-0.7.0.ebuild
deleted file mode 100644
index aae8815fd2f8..000000000000
--- a/sci-libs/openlibm/openlibm-0.7.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils toolchain-funcs fortran-2
-
-DESCRIPTION="High quality system independent, open source libm"
-HOMEPAGE="https://github.com/JuliaLang/openlibm"
-SRC_URI="https://codeload.github.com/JuliaMath/openlibm/tar.gz/v${PV} -> ${P}.tar.gz"
-
-LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+"
-SLOT="0/${PV}.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="static-libs"
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" install
-	use static-libs || rm "${D}/${EPREFIX}/usr/$(get_libdir)/libopenlibm.a" || die "rm failed"
-	dodoc README.md
-}
diff --git a/sci-libs/orocos_kdl/Manifest b/sci-libs/orocos_kdl/Manifest
index 40912926d343..1e4e4131ca21 100644
--- a/sci-libs/orocos_kdl/Manifest
+++ b/sci-libs/orocos_kdl/Manifest
@@ -1,2 +1 @@
-DIST orocos_kinematics_dynamics-1.3.1.tar.gz 202471 BLAKE2B 46b7bdb62c09e9077b84d914b4d780995f27d486d9c734ef2ee1f8b8c2219265cdba5e63830225e2435b5760b79f00d478670e95b71666959afa773f8bcfe5ce SHA512 93abd9dd5aef3710f784f9db8eea4738458bffa5295923993e2d77656c18f7354559412fb7eb5f1e9da7112de19aa36d3f0f68f149852f955bce960fd3b719e7
 DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
deleted file mode 100644
index e45b79724fb4..000000000000
--- a/sci-libs/orocos_kdl/orocos_kdl-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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/orocos/orocos_kinematics_dynamics"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
-fi
-
-DESCRIPTION="Kinematics and Dynamics Library (KDL)"
-HOMEPAGE="https://www.orocos.org/kdl"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc test examples models"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-cpp/eigen:3"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )
-	doc? ( app-doc/doxygen )"
-REQUIRED_USE="examples? ( models )"
-
-DOCS=( README )
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	S=${WORKDIR}/${P}/orocos_kdl
-else
-	S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/orocos_kdl
-fi
-
-src_configure() {
-	local mycmakeargs=(
-		"$(cmake-utils_use_enable test TESTS)"
-		"$(cmake-utils_use_enable examples EXAMPLES)"
-		"-DBUILD_MODELS=$(usex models ON OFF)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	cd "${BUILD_DIR}"
-	use doc && emake docs
-}
-
-src_test() {
-	cd "${BUILD_DIR}"
-	emake check
-}
-
-src_install() {
-	cmake-utils_src_install
-	cd "${BUILD_DIR}"
-	use doc && dohtml -r doc/api/html/*
-	use examples && dobin "${BUILD_DIR}/examples/"{geometry,trajectory_example,chainiksolverpos_lma_demo}
-
-	# Need to have package.xml in our custom gentoo path
-	insinto /usr/share/ros_packages/${PN}
-	doins "${ED}/usr/share/${PN}/package.xml"
-}
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index 09c06d0c267f..1ef6b587e4ef 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,4 +1,2 @@
-DIST libsc-2.0.tar.gz 296392 BLAKE2B b5e1ca5cf6802ed38c32db5e7a77aec2fc636d88f2562314088dc16d13a0dccd24706276b05f8ddd70bc3769270a378c0089873fb2a21ebc93d6ca2622d7a58e SHA512 e4cfe42a1c1fe17412e1ffb6ebebe1f760861a7fb707a6f8fd01cdebda96b166ee05e7ff034f3b9e30de5e9baa82c9a2cebe93d40772dbd206603321de40559c
 DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
-DIST p4est-2.0.tar.gz 1296762 BLAKE2B 1d755ec72905da069b9c91182a437c59107189402eb26444cf7fc1755b81bdbfad9aa25802720df401e8d434e5ac67e68b1d7dd5bf312f881017925498ad7514 SHA512 05f8a95ad431bd36fd3e48ca9360de0f90d1af7dfc77601cd46766898a9bc82b9157e22bdb6135e7003f59c7ecc4cd9ad34b89de25ba3c6f11a86d46cac8592c
 DIST p4est-2.2.tar.gz 1323529 BLAKE2B 262cb8d1ceff1329a71fd302b12c1650e9c099e72a9a93b4abef5822b16a28af0ee1ce9a338c524c2077d4bff83e607e9346f5bb1c660aa9afa8241bb631a637 SHA512 8475e0b6ab1225b22e7538c9c9b227f9aef86f78adf0706065a05f4682618f8f5d3878c18c11b8b13b3912e1de95f40b0ef5f5f5d217c02196993ac07f085299
diff --git a/sci-libs/p4est/p4est-2.0.ebuild b/sci-libs/p4est/p4est-2.2-r100.ebuild
index 8c34d7cea664..b5e1c71ef75b 100644
--- a/sci-libs/p4est/p4est-2.0.ebuild
+++ b/sci-libs/p4est/p4est-2.2-r100.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 # The build system currently fails with everything newer than 1.11.
 WANT_AUTOMAKE=1.11
 
-inherit autotools toolchain-funcs eutils
+inherit autotools lua-single toolchain-funcs eutils
 
 DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
 HOMEPAGE="https://www.p4est.org/"
@@ -29,11 +31,11 @@ SLOT="0"
 
 # TODO petsc
 IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary"
-REQUIRED_USE="romio? ( mpi )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	romio? ( mpi )"
 
-RDEPEND="
-	~sci-libs/libsc-${PV}[mpi=,openmp=,romio=,static-libs=,threads=]
-	dev-lang/lua:*
+RDEPEND="${LUA_DEPS}
+	~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=]
 	sys-apps/util-linux
 	virtual/blas
 	virtual/lapack
diff --git a/sci-libs/p4est/p4est-2.2.ebuild b/sci-libs/p4est/p4est-2.2.ebuild
index 9ea762ebd1f6..0a17d7a6e440 100644
--- a/sci-libs/p4est/p4est-2.2.ebuild
+++ b/sci-libs/p4est/p4est-2.2.ebuild
@@ -33,7 +33,7 @@ REQUIRED_USE="romio? ( mpi )"
 
 RDEPEND="
 	~sci-libs/libsc-${PV}[mpi=,openmp=,romio=,static-libs=,threads=]
-	dev-lang/lua:*
+	dev-lang/lua:0=
 	sys-apps/util-linux
 	virtual/blas
 	virtual/lapack
diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
index 8c34d7cea664..b5e1c71ef75b 100644
--- a/sci-libs/p4est/p4est-9999.ebuild
+++ b/sci-libs/p4est/p4est-9999.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 # The build system currently fails with everything newer than 1.11.
 WANT_AUTOMAKE=1.11
 
-inherit autotools toolchain-funcs eutils
+inherit autotools lua-single toolchain-funcs eutils
 
 DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
 HOMEPAGE="https://www.p4est.org/"
@@ -29,11 +31,11 @@ SLOT="0"
 
 # TODO petsc
 IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary"
-REQUIRED_USE="romio? ( mpi )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	romio? ( mpi )"
 
-RDEPEND="
-	~sci-libs/libsc-${PV}[mpi=,openmp=,romio=,static-libs=,threads=]
-	dev-lang/lua:*
+RDEPEND="${LUA_DEPS}
+	~sci-libs/libsc-${PV}[${LUA_SINGLE_USEDEP},mpi=,openmp=,romio=,static-libs=,threads=]
 	sys-apps/util-linux
 	virtual/blas
 	virtual/lapack
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index 49d699a14fd3..d847e57fb44c 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,2 +1 @@
-DIST pcl-1.11.0.tar.gz 67091890 BLAKE2B 77dcaf99e19cd3042a01176e57441a38e7f5095d7bd9b08c9ad4464384eb6c603eab9734a6bcbb52eff9da55c3aaa69b3744a10137b8264e5729c2432a678f71 SHA512 1cde48349b2630d1bb89fa50b2844054802fe02d22c810516bc41a712823a26cd5fa1b14297718f517b88c371a637567b31fb8c4c9b4908e94fb3a7208095127
 DIST pcl-1.11.1.tar.gz 68515312 BLAKE2B b6e8810861ca715acd9e97ad2b7d62ba9bf18b6a5ce3f13d7e2967f994ac39c42ba08aca83e1ae2186b986e4caf065d25d80d16d2c81a33838bde29326657e7a SHA512 93dd3180443a1a26f019bfd1e34855014619b3b74326ae93806a2711dba392b1c76f2aa682cc3955c651a45ce829a0c89d1cae7cef09cdea60fcb671aefe4da2
diff --git a/sci-libs/pcl/pcl-1.11.0.ebuild b/sci-libs/pcl/pcl-1.11.0.ebuild
deleted file mode 100644
index 04c17c371e91..000000000000
--- a/sci-libs/pcl/pcl-1.11.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
-fi
-
-inherit ${SCM} cmake-utils multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-HOMEPAGE="https://pointclouds.org/"
-DESCRIPTION="2D/3D image and point cloud processing"
-LICENSE="BSD"
-SLOT="0/1.11"
-IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=sci-libs/flann-1.7.1
-	dev-libs/boost:=[threads]
-	dev-cpp/eigen:3
-	opengl? ( virtual/opengl media-libs/freeglut )
-	openni? ( dev-libs/OpenNI )
-	openni2? ( dev-libs/OpenNI2 )
-	pcap? ( net-libs/libpcap )
-	png? ( media-libs/libpng:0= )
-	qhull? ( media-libs/qhull )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtcore:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtopengl:5
-	)
-	usb? ( virtual/libusb:1 )
-	vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
-"
-DEPEND="${RDEPEND}
-	!!dev-cpp/metslib
-	test? ( >=dev-cpp/gtest-1.6.0 )
-"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink )
-	virtual/pkgconfig"
-
-REQUIRED_USE="
-	openni? ( usb )
-	openni2? ( usb )
-	tutorials? ( doc )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLIB_INSTALL_DIR=$(get_libdir)"
-		"-DWITH_CUDA=$(usex cuda TRUE FALSE)"
-		"-DWITH_LIBUSB=$(usex usb TRUE FALSE)"
-		"-DWITH_OPENGL=$(usex opengl TRUE FALSE)"
-		"-DWITH_PNG=$(usex png TRUE FALSE)"
-		"-DWITH_QHULL=$(usex qhull TRUE FALSE)"
-		"-DWITH_QT=$(usex qt5 TRUE FALSE)"
-		"-DWITH_VTK=$(usex vtk TRUE FALSE)"
-		"-DWITH_PCAP=$(usex pcap TRUE FALSE)"
-		"-DWITH_OPENNI=$(usex openni TRUE FALSE)"
-		"-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)"
-		"-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
-		"-DWITH_DOCS=$(usex doc TRUE FALSE)"
-		"-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)"
-		"-DBUILD_TESTS=$(usex test TRUE FALSE)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/pcl/pcl-1.11.1.ebuild b/sci-libs/pcl/pcl-1.11.1.ebuild
index 04c17c371e91..4d7299fc43e6 100644
--- a/sci-libs/pcl/pcl-1.11.1.ebuild
+++ b/sci-libs/pcl/pcl-1.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ RDEPEND="
 	openni2? ( dev-libs/OpenNI2 )
 	pcap? ( net-libs/libpcap )
 	png? ( media-libs/libpng:0= )
-	qhull? ( media-libs/qhull )
+	qhull? ( media-libs/qhull:= )
 	qt5? (
 		dev-qt/qtgui:5
 		dev-qt/qtcore:5
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild
index 04c17c371e91..4d7299fc43e6 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ RDEPEND="
 	openni2? ( dev-libs/OpenNI2 )
 	pcap? ( net-libs/libpcap )
 	png? ( media-libs/libpng:0= )
-	qhull? ( media-libs/qhull )
+	qhull? ( media-libs/qhull:= )
 	qt5? (
 		dev-qt/qtgui:5
 		dev-qt/qtcore:5
diff --git a/sci-libs/plplot/plplot-5.15.0-r100.ebuild b/sci-libs/plplot/plplot-5.15.0-r100.ebuild
index e4307e9d95b9..cb98cd3ce4ea 100644
--- a/sci-libs/plplot/plplot-5.15.0-r100.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r100.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 WX_GTK_VER=3.0-gtk3
 FORTRAN_NEEDED=fortran
-LUA_COMPAT=( lua5-1 )
+LUA_COMPAT=( lua5-{1..4} luajit )
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 
 inherit cmake flag-o-matic fortran-2 java-pkg-opt-2 lua-single python-single-r1 toolchain-funcs virtualx wxwidgets
diff --git a/sci-libs/profphd-utils/profphd-utils-1.0.10.ebuild b/sci-libs/profphd-utils/profphd-utils-1.0.10.ebuild
deleted file mode 100644
index 49afe145c1e6..000000000000
--- a/sci-libs/profphd-utils/profphd-utils-1.0.10.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit fortran-2 toolchain-funcs
-
-DESCRIPTION="Additional utils for profphd"
-HOMEPAGE="https://rostlab.org/"
-SRC_URI="ftp://rostlab.org/profphd-utils/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-lang/perl"
-
-src_compile() {
-	emake \
-		F77=$(tc-getF77) \
-		AM_FFLAGS=""
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		prefix="${EPREFIX}" \
-		install
-	dodoc ChangeLog AUTHORS
-}
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 1f08c67c17f1..9c5e1d4ebb34 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,4 +1,5 @@
 DIST proj-7.0.1.tar.gz 5312488 BLAKE2B 421a3b5324ab7c952a8b45036e6db2c8cfc1fd2db3d050d2e644cb1c1c78fe669a20c6d8428debf75233a975a989e3ad2ce6a83cd944825641ffd3107cc44a02 SHA512 034d1b916980c80fe9f8e67d2897814e611920af3e852f152fcd9e3fc4ec8cbc39bbd8f8296949a3c3f5e6708bb9d84e61c4cba9c01476a3888448135e97dc33
 DIST proj-7.1.1.tar.gz 5509592 BLAKE2B f745df3ef276b8a3213aff5ed92890f9c8f4b82a61a1e55fd013925befb018f01d7e60264dc996ea5aa9630b3ee3c149a7f37ca87d89c9df2f29367d4b26b19b SHA512 9f092318835006ffe864bb54ac456054196d30ff367546b41f1e49a5f1cc99a4b0b19e3d09c0ce7a336d1562df5784805560e7f725380411b1013a6baf90cf56
+DIST proj-7.2.1.tar.gz 5714666 BLAKE2B 9379ef758b1221b9487f162a27e7afa737e668ad7a13fc7adbd8e1e2c1c4699263d5d3105d03781b423f284205de3c79fc68850b9fba6aa05f1dc553b77b0842 SHA512 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
diff --git a/sci-libs/proj/proj-7.0.1.ebuild b/sci-libs/proj/proj-7.0.1.ebuild
index 5d236f000813..e7f70f68ee19 100644
--- a/sci-libs/proj/proj-7.0.1.ebuild
+++ b/sci-libs/proj/proj-7.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0/19"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="curl europe static-libs test +tiff"
 REQUIRED_USE="test? ( !europe )"
 
diff --git a/sci-libs/proj/proj-7.1.1.ebuild b/sci-libs/proj/proj-7.1.1.ebuild
index 5a90105f20d9..7709f61d762f 100644
--- a/sci-libs/proj/proj-7.1.1.ebuild
+++ b/sci-libs/proj/proj-7.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0/19"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="curl europe static-libs test +tiff"
 REQUIRED_USE="test? ( !europe )"
 
diff --git a/sci-libs/proj/proj-7.2.1.ebuild b/sci-libs/proj/proj-7.2.1.ebuild
new file mode 100644
index 000000000000..1228ef8a650d
--- /dev/null
+++ b/sci-libs/proj/proj-7.2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
+EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.6.tar.gz"
+
+DESCRIPTION="PROJ coordinate transformation software"
+HOMEPAGE="https://proj4.org/"
+SRC_URI="
+	https://download.osgeo.org/proj/${P}.tar.gz
+	https://download.osgeo.org/proj/${DATUMGRID}
+	europe? ( https://download.osgeo.org/proj/${EUROPE_DATUMGRID} )
+"
+
+LICENSE="MIT"
+SLOT="0/19"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="curl europe static-libs test +tiff"
+REQUIRED_USE="test? ( !europe )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-db/sqlite:3
+	curl? ( net-misc/curl )
+	tiff? ( media-libs/tiff )
+"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"/data || die
+	mv README README.DATA || die
+	unpack ${DATUMGRID}
+	use europe && unpack ${EUROPE_DATUMGRID}
+}
+
+src_configure() {
+	econf \
+		$(use_with curl) \
+		$(use_enable static-libs static) \
+		$(use_enable tiff)
+}
+
+src_install() {
+	default
+	cd data || die
+	dodoc README.{DATA,DATUMGRID}
+	use europe && dodoc README.EUROPE
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/pyshp/Manifest b/sci-libs/pyshp/Manifest
index 4ed1738c29eb..53f8a3330680 100644
--- a/sci-libs/pyshp/Manifest
+++ b/sci-libs/pyshp/Manifest
@@ -1,2 +1 @@
-DIST pyshp-2.1.0.tar.gz 215360 BLAKE2B 2b32a3db242b90f801abdbc31f3c930bc40c3ad0606433d90f62c6b9af3c0459e8c8467d60aec1075368779e5a4fffa9e3985e1875d82edf732faf982359c605 SHA512 ab0c7832f7e480ec3cdbf94ec29f84b590486625bde3d5cf465e5dc6ddca02998b99510b6c14d5ba005816c5b091044badc1e68988fd971f9e18266096ad86cb
 DIST pyshp-2.1.2.tar.gz 217857 BLAKE2B f4c50e16987b13b7968fe37e4e7f20329b6871c879b837113aac281527f6a00d5d13e10f93e8ecd5896cf089d801d76cec5d93645a6919fbc48d96d4318bb767 SHA512 54fadaa133d3fbf3b9a318be02dd21c2a35a3c58c15de8e6d0cffa6ca83eefe12603fe5930d3df63ad4c6a6d711336752f08923c6406168207ac291d05592582
diff --git a/sci-libs/pyshp/pyshp-2.1.0.ebuild b/sci-libs/pyshp/pyshp-2.1.0.ebuild
deleted file mode 100644
index 53b4b4aae76f..000000000000
--- a/sci-libs/pyshp/pyshp-2.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Pure Python read/write support for ESRI Shapefile format"
-HOMEPAGE="https://pypi.org/project/pyshp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" shapefile.py || die
-}
diff --git a/sci-libs/qd/Manifest b/sci-libs/qd/Manifest
index 85f87c998a4b..61b75a6891b2 100644
--- a/sci-libs/qd/Manifest
+++ b/sci-libs/qd/Manifest
@@ -1,2 +1 @@
-DIST qd-2.3.17.tar.gz 1445774 BLAKE2B f2af961db49747475a96dc0abecbcffcf88e43265b6ae21b4d6539ac7ce1086bb40e2cfd795dc9c78dd4b0f790a1a51c5b53d6bbfa224c5d3484d58a222c1872 SHA512 9c6f5dc8d5ad7c9c3d0ec626f7089eb760f31fb14b36daee9c6ba403ab146ff7ce99e01a8750960117a34d662c11620db2ec999e9cf44eb0f80e9224e365d496
 DIST qd-2.3.22.tar.gz 1427456 BLAKE2B 628fb88b8cb105baa689380e4084cc2e327415674fcebca59721cc163e1043f39e48c1b2a2bdc68ba402d311f37e71c9e3c390a119515128e0296aa413c850d5 SHA512 2228b6ed019d1462939957d0d0f64ab2ecfa98ac5aefecf56e9dbcf0c6ed63bdd895b86019fbb0dfdbc22d047c4c2d4e42ff91ca18846b5c1bdaa1ad28a55c2b
diff --git a/sci-libs/qd/files/qd-2.3.17-fix-build-system.patch b/sci-libs/qd/files/qd-2.3.17-fix-build-system.patch
deleted file mode 100644
index 7fa3af79895d..000000000000
--- a/sci-libs/qd/files/qd-2.3.17-fix-build-system.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-Fix build system
-* --enable options were misspecified
-* Targets were missing dependencies
-* Disable setting CXXFLAGS
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -18,14 +18,14 @@
- 
- AC_CONFIG_AUX_DIR(config)
- AM_INIT_AUTOMAKE([nostdinc])
--AM_CONFIG_HEADER([config.h])
--AM_CONFIG_HEADER([include/qd/qd_config.h])
-+AC_CONFIG_HEADERS([config.h])
-+AC_CONFIG_HEADERS([include/qd/qd_config.h])
- 
- AC_CANONICAL_HOST
- 
- # Checks for arguments
- # --enable-inline
--AC_ARG_ENABLE(enable_inline, AC_HELP_STRING(--enable-inline, [inline commonly used functions.  [[default=yes]]]))
-+AC_ARG_ENABLE([inline], AS_HELP_STRING(--enable-inline, [inline commonly used functions.  [[default=yes]]]))
- AC_MSG_CHECKING([if commonly used function is to be inlined])
- if test "$enable_inline" != "no"; then
-   enable_inline="yes"
-@@ -34,7 +34,7 @@
- AC_MSG_RESULT($enable_inline)
- 
- # --enable-ieee-add
--AC_ARG_ENABLE(enable_ieee_add, AC_HELP_STRING(--enable-ieee-add, [use addition that satisfies IEEE-style error bound instead of Cray-style error bound.  [[default=no]]]))
-+AC_ARG_ENABLE([ieee-add], AS_HELP_STRING(--enable-ieee-add, [use addition that satisfies IEEE-style error bound instead of Cray-style error bound.  [[default=no]]]))
- AC_MSG_CHECKING([if addition with IEEE-style error bound is to be used])
- if test "$enable_ieee_add" = "yes"; then
-   AC_DEFINE([QD_IEEE_ADD], [1], [Define to 1 to use additions with IEEE-style error bounds.])
-@@ -44,7 +44,7 @@
- AC_MSG_RESULT($enable_ieee_add)
- 
- # --enable-sloppy-mul
--AC_ARG_ENABLE(enable_sloppy_mul, AC_HELP_STRING(--enable-sloppy-mul, [use fast but slightly inaccurate multiplication.  [[default=yes]]]))
-+AC_ARG_ENABLE([sloppy-mul], AS_HELP_STRING(--enable-sloppy-mul, [use fast but slightly inaccurate multiplication.  [[default=yes]]]))
- AC_MSG_CHECKING([if sloppy multiplication is to be used])
- if test "$enable_sloppy_mul" != "no"; then
-   enable_sloppy_mul="yes"
-@@ -53,7 +53,7 @@
- AC_MSG_RESULT($enable_sloppy_mul)
- 
- # --enable-sloppy-div
--AC_ARG_ENABLE(enable_sloppy_div, AC_HELP_STRING(--enable-sloppy-div, [use fast but slightly inaccurate division.  [[default=yes]]]))
-+AC_ARG_ENABLE([sloppy-div], AS_HELP_STRING(--enable-sloppy-div, [use fast but slightly inaccurate division.  [[default=yes]]]))
- AC_MSG_CHECKING([if sloppy division is to be used])
- if test "$enable_sloppy_div" != "no"; then
-   enable_sloppy_div="yes"
-@@ -63,7 +63,7 @@
- 
- 
- # --enable-debug
--AC_ARG_ENABLE(enable_debug, AC_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]]))
-+AC_ARG_ENABLE([debug], AS_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]]))
- AC_MSG_CHECKING([if debugging code is to be enabled])
- if test "$enable_debug" = "yes"; then
-   AC_DEFINE([QD_DEBUG], [1], [Define to 1 to enable debugging code.])
-@@ -73,7 +73,7 @@
- AC_MSG_RESULT($enable_debug)
- 
- # --enable-warnings
--AC_ARG_ENABLE(enable_warnings, AC_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]]))
-+AC_ARG_ENABLE([warnings], AS_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]]))
- AC_MSG_CHECKING([if compiler warnings is to be enabled])
- if test "$enable_warnings" != "yes"; then
-   enable_warnings="no"
-@@ -83,13 +83,6 @@
- 
- # Checks for programs.
- AC_LANG(C++)
--if test "$CXXFLAGS" = ""; then
--  if test "$enable_debug" = "yes"; then
--    CXXFLAGS="-O"
--  else
--    CXXFLAGS="-O2"
--  fi
--fi
- 
- # Set up compiler search list.  DUe to possible case insensitive filesystems, 
- # Cygwin and Apple systems sometimes gets confused between cc and CC.
-@@ -106,50 +99,10 @@
- fi
- AC_PROG_CC
- 
--
--CXX_PROG_NAME=`basename $CXX`
--case $host in
--  powerpc*-*-*)
--    case "$CXX_PROG_NAME" in
--      xlC*) 
--        REQ_CXXFLAGS="$REQ_CXXFLAGS -qstrict"
--      ;;
--    esac
--  ;;
--  i?86-*-* | k?*-*-* | athlon-*-* | ia64-*-* | x86_64-*-*)
--    case "$CXX_PROG_NAME" in
--      icc|icpc|ecc)
--        REQ_CXXFLAGS="$REQ_CXXFLAGS -mp"
--        if test "$enable_warnings" = "yes"; then
--          CXXFLAGS="$CXXFLAGS -wd1572 -wd981 -wd1418 -wd1419"
--        fi
--      ;;
--    esac
--  ;;
--  alpha*-*-*)
--    case "$CXX_PROG_NAME" in
--      cxx) 
--        CXXFLAGS="$CXXFLAGS -std strict_ansi -tweak"
--      ;;
--    esac
--  ;;
--esac
--
--AC_SUBST(REQ_CXXFLAGS)
--CXXFLAGS="$CXXFLAGS $REQ_CXXFLAGS"
--
--if test "$enable_warnings" = "yes"; then
--  if test "$GCC" = "yes"; then
--    CXXFLAGS="$CXXFLAGS -Wall"
--  fi
--fi
--
--if test "$enable_debug" = "yes"; then
--  CXXFLAGS="$CXXFLAGS -g"
--fi
-+CXXFLAGS="${CXXFLAGS} -Wall"
- 
- # --enable-fma
--AC_ARG_ENABLE(enable_fma, AC_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler).  Use this option with care.  [[default=auto]]]))
-+AC_ARG_ENABLE([fma], AS_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler).  Use this option with care.  [[default=auto]]]))
- if test "x$enable_fma" = "x"; then
-   enable_fma="auto"
- fi
-@@ -248,7 +201,7 @@
-     FCFLAGS="-O2"
-   fi
- fi
--AC_ARG_ENABLE(enable_fortran, AC_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]]))
-+AC_ARG_ENABLE([fortran], AS_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]]))
- if test "$enable_fortran" != "no"; then
-   AC_LANG_PUSH(Fortran)
-   AC_PROG_FC([xlf95 ifort pathf95 f95 gfortran g95 pgf95 lf95 fort ifc efc pathf90 xlf90 pgf90 epcf90 xlf f90])
-@@ -312,8 +265,7 @@
- AC_CHECK_LIB(m,sqrt)
- 
- # libtool stuff
--AC_DISABLE_SHARED
--AC_PROG_LIBTOOL
-+LT_INIT
- 
- # Output
- AC_CONFIG_FILES([Makefile config/Makefile src/Makefile include/Makefile 
---- a/fortran/Makefile.am
-+++ b/fortran/Makefile.am
-@@ -16,7 +16,9 @@
- 
- lib_LTLIBRARIES = libqdmod.la libqd_f_main.la
- libqdmod_la_SOURCES = ddext.f ddmod.f qdext.f qdmod.f f_dd.cpp f_qd.cpp
-+libqdmod_la_LIBADD = $(top_builddir)/src/libqd.la $(FCLIBS)
- libqd_f_main_la_SOURCES = main.cpp
-+libqd_f_main_la_LIBADD = $(top_builddir)/src/libqd.la libqdmod.la $(FCLIBS)
- ddmod.lo: $(DDEXT) ddext.lo
- qdmod.lo: ddmod.lo $(DDMOD) qdext.lo
- $(QDMOD): qdmod.lo $(DDMOD)
---- a/qd-config.in
-+++ b/qd-config.in
-@@ -14,7 +14,7 @@
- build_CXXFLAGS="@CXXFLAGS@"
- build_LDFLAGS="@LDFLAGS@"
- CXX="@CXX@"
--CXXFLAGS="-I$includedir @REQ_CXXFLAGS@"
-+CXXFLAGS="-I$includedir"
- FC="@FC@"
- 
- LDFLAGS="-L$libdir -lqd @LIBS@"
diff --git a/sci-libs/qd/qd-2.3.17.ebuild b/sci-libs/qd/qd-2.3.17.ebuild
deleted file mode 100644
index 2e7467e99c79..000000000000
--- a/sci-libs/qd/qd-2.3.17.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools fortran-2
-
-DESCRIPTION="Quad-double and double-double float arithmetics"
-HOMEPAGE="https://www.davidhbailey.com/dhbsoftware/"
-SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran static-libs"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.3.17-fix-build-system.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-ieee-add \
-		--disable-sloppy-mul \
-		--disable-sloppy-div \
-		--enable-inline \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4) fma) \
-		$(use_enable fortran)
-}
-
-src_install() {
-	default
-
-	dosym qd_real.h /usr/include/qd/qd.h
-	dosym dd_real.h /usr/include/qd/dd.h
-
-	if ! use doc; then
-		rm "${ED%/}"/usr/share/doc/${PF}/*.pdf || die
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
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/scalapack/Manifest b/sci-libs/scalapack/Manifest
index d30e37fd8aab..7d24374ac476 100644
--- a/sci-libs/scalapack/Manifest
+++ b/sci-libs/scalapack/Manifest
@@ -1,2 +1,2 @@
-DIST scalapack-2.0.2.tgz 4779534 BLAKE2B c2aabd87bc8f7c0d9af31bd8ad8c933703dcbba399658d15c1e5256da2350c1a0feac2ca4a205f697b1c48083df89cbcd64ba432da036081c0f33d5d2acddc9b SHA512 92c71d3de0900955511c527ab3ca57ff69d6d9edc390e69f93ac3769d32ce83a714326bcb6218c8c74b8874be2fdc8aad5e42c912a12581e8d4ce8829ea39248
+DIST scalapack-2.1.0-gcc10.patch 231026 BLAKE2B dacecca8307cd2bf7a20e6453fb17bc1f5a3f2926b6d8f3b89f7f8d34993368574804f0427f228de4525f2b2d73105de561588ba5a4d2fb609d5ed035f51ddc9 SHA512 a11057599639c167e907f8e4d45204174fd326e2ffb9e2d05533db23d8e2dd8cfc1d37f06d5502baa3d5714092fbf4638cf4d9fea84ca9d4fb150e21cc57861e
 DIST scalapack-2.1.0.tgz 5307441 BLAKE2B 4aea055fc3e437bce7108d1555e93c50109bcfe84354903fd711509eedbe686349fda4030e2fa70faf1a9e7e3255e46e48c32b96a2916af6812b8aebceb750c2 SHA512 0e77fb535ebcc28e2d97499ef4bd5161f76ca0ba4a3e308c26ce5071cfc4be4f3814262f3fb38f378ce0b5b31c0913432fea00a1e9e3f7717b853d1182bdf5b4
diff --git a/sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch b/sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch
deleted file mode 100644
index a1604a8fd856..000000000000
--- a/sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/CMakeLists.txt	2012-05-02 05:58:24.000000000 +0200
-+++ b/CMakeLists.txt	2018-10-15 23:57:22.716171671 +0200
-@@ -101,8 +101,8 @@
- # Organize output files.  On Windows this also keeps .dll files next
- # to the .exe files that need them, making tests easy to run.
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/TESTING)
--set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib)
--set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib)
-+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX})
-+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX})
- 
- # --------------------------------------------------
- # Check for any necessary platform specific compiler flags
-@@ -163,8 +163,8 @@
-         PREFIX ${SCALAPACK_BINARY_DIR}/dependencies
-       )
- 	  if (UNIX)
--         SET(LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/liblapack.a CACHE STRING "LAPACK library" FORCE)
--         SET(BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/libblas.a CACHE STRING "BLAS library" FORCE)
-+         SET(LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX}/liblapack.a CACHE STRING "LAPACK library" FORCE)
-+         SET(BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX}/libblas.a CACHE STRING "BLAS library" FORCE)
- 	  else (UNIX) # On Windows
-          SET(LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/liblapack.lib CACHE STRING "LAPACK library" FORCE)
-          SET(BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/libblas.lib CACHE STRING "BLAS library" FORCE)
-@@ -283,7 +283,7 @@
- if( NOT LAPACK_FOUND )
-  install(FILES
-   ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}
--  DESTINATION lib
-+  DESTINATION lib${LIB_SUFFIX}
-    )
- endif( NOT LAPACK_FOUND )
- 
-@@ -303,9 +303,9 @@
- install(FILES
-   ${SCALAPACK_BINARY_DIR}/CMakeFiles/scalapack-config.cmake
-   ${SCALAPACK_BINARY_DIR}/scalapack-config-version.cmake
--  DESTINATION lib/cmake/scalapack-${SCALAPACK_VERSION}
-+  DESTINATION lib${LIB_SUFFIX}/cmake/scalapack-${SCALAPACK_VERSION}
-   )
- 
- install(EXPORT scalapack-targets
--  DESTINATION lib/cmake/scalapack-${SCALAPACK_VERSION})
-+  DESTINATION lib${LIB_SUFFIX}/cmake/scalapack-${SCALAPACK_VERSION})
- 
diff --git a/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild b/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
deleted file mode 100644
index 7f9fbd15720e..000000000000
--- a/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils fortran-2 toolchain-funcs
-
-DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous (MPI) computing"
-HOMEPAGE="https://www.netlib.org/scalapack/"
-SRC_URI="https://www.netlib.org/scalapack/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/lapack
-	virtual/mpi"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-libdir.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use static-libs; then
-		mkdir "${WORKDIR}/${PN}_static" || die
-	fi
-	# mpi does not have a pc file
-	sed -i -e 's/mpi//' scalapack.pc.in || die
-}
-
-src_configure() {
-	scalapack_configure() {
-		local mycmakeargs=(
-			-DUSE_OPTIMIZED_LAPACK_BLAS=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-			-DBUILD_TESTING=$(usex test)
-			$@
-		)
-		cmake-utils_src_configure
-	}
-
-	scalapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
-	use static-libs && \
-		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" scalapack_configure \
-		-DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use static-libs && \
-		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	use static-libs && \
-		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
-
-	insinto /usr/include/blacs
-	doins BLACS/SRC/*.h
-
-	insinto /usr/include/scalapack
-	doins PBLAS/SRC/*.h
-}
diff --git a/sci-libs/scalapack/scalapack-2.1.0.ebuild b/sci-libs/scalapack/scalapack-2.1.0.ebuild
index a1979a20ad64..d755a5b1ea9d 100644
--- a/sci-libs/scalapack/scalapack-2.1.0.ebuild
+++ b/sci-libs/scalapack/scalapack-2.1.0.ebuild
@@ -1,13 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils fortran-2 toolchain-funcs
+inherit cmake fortran-2 toolchain-funcs
+
+GCC10_PATCH_HASH="bc6cad585362aa58e05186bb85d4b619080c45a9"
 
 DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous (MPI) computing"
 HOMEPAGE="https://www.netlib.org/scalapack/"
-SRC_URI="https://www.netlib.org/scalapack/${P}.tgz"
+SRC_URI="
+	https://www.netlib.org/scalapack/${P}.tgz
+	https://github.com/Reference-ScaLAPACK/scalapack/commit/${GCC10_PATCH_HASH}.patch -> ${P}-gcc10.patch
+	"
 
 LICENSE="BSD"
 SLOT="0"
@@ -15,17 +20,16 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	virtual/lapack
 	virtual/mpi"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
-PATCHES=(
-)
+PATCHES=( "${DISTDIR}/${P}-gcc10.patch" )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	if use static-libs; then
 		mkdir "${WORKDIR}/${PN}_static" || die
@@ -43,7 +47,7 @@ src_configure() {
 			-DBUILD_TESTING=$(usex test)
 			$@
 		)
-		cmake-utils_src_configure
+		cmake_src_configure
 	}
 
 	scalapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
@@ -53,15 +57,15 @@ src_configure() {
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	use static-libs && \
-		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile
+		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake_src_compile
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use static-libs && \
-		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install
+		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake_src_install
 
 	insinto /usr/include/blacs
 	doins BLACS/SRC/*.h
diff --git a/sci-libs/scikit-image/Manifest b/sci-libs/scikit-image/Manifest
index f69f2243258b..a8480d99294a 100644
--- a/sci-libs/scikit-image/Manifest
+++ b/sci-libs/scikit-image/Manifest
@@ -1,2 +1 @@
-DIST scikit-image-0.13.0.tar.gz 26101533 BLAKE2B c28284f64abd58c7bafa8f5f0c781496e8bb28af79c5c730df7cbf2fede958eb88ea420fd7f89e7b8d0d91719a98dd0935af3b2cc50fe501cc8d8d1d0ee56cb9 SHA512 923015e373c406ae2fbbfdf83ce8b91e83790bdf7842c4439fdc9fd58cffe46efc0cfc7a1b0b06e1b2d092a909a6f085335640850883e7608dbccd1074046550
 DIST scikit-image-0.17.2.tar.gz 29818001 BLAKE2B 360c5f8c23b8441d145029c09a3b1d1407d4103463497c63274583e6c03d1fc57baa3e6c53909cfaa5daba54d5909fc106e84dc7036f0240ad8de93804ef9f65 SHA512 3ca2511f03d533ac7f1850d72de396dc5493831bce6200f30d426c3f47eff9b25ec9b69e141100dc56e03f2310aab255f92ff4aff8bc7b80d15d669cbe2ebb5e
diff --git a/sci-libs/scikit-image/metadata.xml b/sci-libs/scikit-image/metadata.xml
index 6a40d24c4fbc..a54abdac7d8b 100644
--- a/sci-libs/scikit-image/metadata.xml
+++ b/sci-libs/scikit-image/metadata.xml
@@ -11,10 +11,6 @@
     provides low-level manipulation, scikits.image centres around
     algorithms and applications.
   </longdescription>
-  <use>
-    <flag name="freeimage">Enable support for image i/o via<pkg>media-libs/freeimage</pkg></flag>
-    <flag name="pyamg">Enable support for algebraic solvers via <pkg>dev-python/pyamg</pkg></flag>
-  </use>
   <upstream>
     <remote-id type="pypi">scikit-image</remote-id>
   </upstream>
diff --git a/sci-libs/scikit-image/scikit-image-0.13.0-r1.ebuild b/sci-libs/scikit-image/scikit-image-0.13.0-r1.ebuild
deleted file mode 100644
index 514cedd20d38..000000000000
--- a/sci-libs/scikit-image/scikit-image-0.13.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Image processing routines for SciPy"
-HOMEPAGE="https://scikit-image.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc freeimage pyamg test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pywavelets[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[sparse,${PYTHON_USEDEP}]
-	freeimage? ( media-libs/freeimage )
-	pyamg? ( dev-python/pyamg[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.23[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )"
-
-DOCS=( CONTRIBUTORS.txt DEPENDS.txt RELEASE.txt TASKS.txt TODO.txt )
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
-	echo "backend : Agg" > matplotlibrc || die
-	#echo "backend.qt4 : PyQt4" >> matplotlibrc || die
-	#echo "backend.qt4 : PySide" >> matplotlibrc || die
-	MPLCONFIGDIR=. virtx nosetests --exe -v skimage
-}
-
-pkg_postinst() {
-	optfeature "FITS io capability" dev-python/astropy
-	optfeature "GTK" dev-python/pygtk
-	optfeature "Parallel computation" dev-python/dask
-	# not in portage yet
-	#optfeature "io plugin providing a wide variety of formats, including specialized formats using in medical imaging." dev-python/simpleitk
-	#optfeature "io plugin providing most standard formats" dev-python/imread
-}
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 317610da13c5..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,7,8,9,10} )
-
-inherit python-r1
-
-DESCRIPTION="Common files for python scikits"
-HOMEPAGE="https://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/scikits_optimization/Manifest b/sci-libs/scikits_optimization/Manifest
deleted file mode 100644
index 402b40290eb6..000000000000
--- a/sci-libs/scikits_optimization/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST scikits.optimization-0.3.tar.gz 25297 BLAKE2B 1001ee772fb115e620f98547332f26f3876b38c9718e9f3c9a47e17863f2efbd6d9f6551da2340fda1ce612b385f757123bd32786764dcd3e287689313cac4ec SHA512 e8f33f4770d9b0514854e36127c53554823a159363c69d1ca0445a05ca9ebc55bc7105b35b2c615bfbef0c63a2b658d628befccb0ab09bcf98d91f8cb4d8be72
diff --git a/sci-libs/scikits_optimization/metadata.xml b/sci-libs/scikits_optimization/metadata.xml
deleted file mode 100644
index 07089cbd4f36..000000000000
--- a/sci-libs/scikits_optimization/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">scikits.optimization</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/sci-libs/scikits_optimization/scikits_optimization-0.3-r1.ebuild b/sci-libs/scikits_optimization/scikits_optimization-0.3-r1.ebuild
deleted file mode 100644
index 3b8d7442ce08..000000000000
--- a/sci-libs/scikits_optimization/scikits_optimization-0.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-MY_P="${P/scikits_/scikits.}"
-
-DESCRIPTION="Python module for numerical optimization"
-HOMEPAGE="https://projects.scipy.org/scipy/scikits"
-SRC_URI="mirror://pypi/${PN:0:1}/scikits.optimization/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scikits[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/sci-libs/scikits_timeseries/Manifest b/sci-libs/scikits_timeseries/Manifest
deleted file mode 100644
index fec2665f1289..000000000000
--- a/sci-libs/scikits_timeseries/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST scikits.timeseries-0.91.3-html_docs.zip 907495 BLAKE2B e06c295bb4b093c2d7d5e767a8c03cb71e84ef3207790203c920ad9a9d57488f926c7a761ffb41fbc6829a9847327d40fa202776fa36fe473663066e41ecdee4 SHA512 9fb474e2a13dee865801fa5aa5f05bb74ea2387b7e14d716210898d9b338b63b7f1935f7a5514d72ffcd6f4a8552054094244fab199e18c819815d4b19cd3f23
-DIST scikits.timeseries-0.91.3.tar.gz 323771 BLAKE2B 74c14a1ec903dd02f8b3134867d4e371bac00d1a7b22de38962c3ca27afb603296b415e3ab2f21114b9c34890c24ea10379e5465d557778c6c794470235a311e SHA512 ea7292bf4d9bcce416b6f0e2c99fc40afe97a3a0210c535bd68f43a4a553d8a30cb77ce00f96ffc26340d5ff837faf5d480ea775385769495eccb5a196a88617
diff --git a/sci-libs/scikits_timeseries/metadata.xml b/sci-libs/scikits_timeseries/metadata.xml
deleted file mode 100644
index c2f319ba6374..000000000000
--- a/sci-libs/scikits_timeseries/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  The scikits.timeseries module provides classes and functions for
-  manipulating, reporting, and plotting time series of various
-  frequencies. The focus is on convenient data access and manipulation
-  while leveraging the existing mathematical functionality in numpy
-  and scipy.
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">pytseries</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild b/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild
deleted file mode 100644
index 4c7982649682..000000000000
--- a/sci-libs/scikits_timeseries/scikits_timeseries-0.91.3-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-MY_P="${P/scikits_/scikits.}"
-
-DESCRIPTION="SciPy module for manipulating, reporting, and plotting time series"
-HOMEPAGE="https://sourceforge.net/projects/pytseries/index.html"
-SRC_URI="
-	mirror://sourceforge/pytseries/${MY_P}.tar.gz
-	doc? ( mirror://sourceforge/pytseries/${MY_P}-html_docs.zip )"
-
-LICENSE="BSD eGenixPublic-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="
-	dev-python/scipy[${PYTHON_USEDEP}]
-	sci-libs/scikits[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pytables[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	distutils-r1_python_install
-	rm "${D}"$(python_get_sitedir)/scikits/__init__.py || die
-}
-
-python_install_all() {
-	use doc && HTMLDOCS=( "${WORKDIR}/html" )
-	distutils-r1_python_install_all
-}
diff --git a/sci-libs/shapely/Manifest b/sci-libs/shapely/Manifest
index 0ef111bb11b9..2848f35bb31b 100644
--- a/sci-libs/shapely/Manifest
+++ b/sci-libs/shapely/Manifest
@@ -1,3 +1 @@
-DIST Shapely-1.6.4.post2.tar.gz 225745 BLAKE2B 96e995db6dd1464bac7c2562efdc7f298a5f23c388e44f334db685b1cfa1025ff403db870e11328977a267483726504e03b6d7c47fe4234a3a5966a13b2b7311 SHA512 027c816ef2104f654569ca658b52b87c60e5ba6a45927fcc51c23dd1922f3f9f7fdcea3601160b0a999e39611617142833ccac790777093be8b96a0d9083f78f
-DIST shapely-1.7.0.tar.gz 281419 BLAKE2B 1a4e84104f21d2f5a5eb810883a89deb20fd47cf146efed884994786364b29bb5a194b063a50ae21842c07c335cbbee0c3d1a1e4ff4e43e0d083080fe33815ac SHA512 4d944fc6727e11d004ef7ba0325c159aa5ae03043f17b029ab0a399d6dcd361c4d299ad864a045a99b0229e333d5b42634bc6fd1ed94b914b7cf58fb886af2de
 DIST shapely-1.7.1.tar.gz 293368 BLAKE2B 14d9cb0c2b486a3a20b71c0cde7260ec357287ea020352c0320eea07b91674605bdcd22512b33c5ac5a71b89c3d811946f8dd6d3b90c61398203a4c68f30d067 SHA512 72070437960a8c1cf6504b5f4ccc8ec509f87fb6a90178e291aff14889f5add89f9ed4f7e9a19799ce0835c1aea3f0241eaa6efd4d8ea5b879f2167f7c1de50a
diff --git a/sci-libs/shapely/files/shapely-1.6.4_p2-test_operations.patch b/sci-libs/shapely/files/shapely-1.6.4_p2-test_operations.patch
deleted file mode 100644
index a9213a333765..000000000000
--- a/sci-libs/shapely/files/shapely-1.6.4_p2-test_operations.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Mark test_operations as xfail.
-         # Intersection
- >       self.assertIsInstance(point.intersection(Point(-1, -1)),
-                               GeometryCollection)
- E       AssertionError: <shapely.geometry.point.Point object at 0xffffb6e2c250> is not an instance of <class 'shapely.geometry.collection.GeometryCollection'>
-Author: Bas Couwenberg <sebastic@debian.org>
-
---- a/tests/test_operations.py
-+++ b/tests/test_operations.py
-@@ -7,6 +7,7 @@ from shapely.geos import TopologicalErro
- 
- class OperationsTestCase(unittest.TestCase):
- 
-+    @pytest.mark.xfail(reason="Intersection: Point is not an instance of GeometryCollection")
-     def test_operations(self):
-         point = Point(0.0, 0.0)
- 
diff --git a/sci-libs/shapely/shapely-1.6.4_p2-r1.ebuild b/sci-libs/shapely/shapely-1.6.4_p2-r1.ebuild
deleted file mode 100644
index 061a2f75fb7c..000000000000
--- a/sci-libs/shapely/shapely-1.6.4_p2-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="Shapely"
-MY_PV="$(ver_cut 1-3).post$(ver_cut 5)"
-MY_P="${MY_PN}-${MY_PV}"
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely/"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/Toblerity/${MY_PN}.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/geos-3.3"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}/${P}-test_operations.patch" ) # bug 701624
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# fix install path for Cython definition file
-	sed -i \
-		-e "s|\(data_files.*\)'shapely'|\1'share/shapely'|" \
-		setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}/lib" || die
-	cp -r "${S}/tests" . || die
-	py.test tests || die
-}
diff --git a/sci-libs/shapely/shapely-1.7.0.ebuild b/sci-libs/shapely/shapely-1.7.0.ebuild
deleted file mode 100644
index 2452e9002484..000000000000
--- a/sci-libs/shapely/shapely-1.7.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="Shapely"
-MY_P="${MY_PN}-${PV}"
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Geometric objects, predicates, and operations"
-HOMEPAGE="https://pypi.org/project/Shapely/ https://github.com/Toblerity/Shapely"
-SRC_URI="https://github.com/Toblerity/Shapely/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/geos-3.3
-"
-
-BDEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs dev-python/matplotlib
-
-python_test() {
-	distutils_install_for_testing
-	${EPYTHON} -m pytest tests || die "tests failed under ${EPYTHON}"
-}
diff --git a/sci-libs/stellarsolver/Manifest b/sci-libs/stellarsolver/Manifest
new file mode 100644
index 000000000000..c0a501c85fc9
--- /dev/null
+++ b/sci-libs/stellarsolver/Manifest
@@ -0,0 +1 @@
+DIST stellarsolver-1.5.tar.gz 9113711 BLAKE2B 3fe4489df71bbfa4d75f02a8a0ea26202165a7fe321b626fedceccce52122502be0040a47347abdd4e52b3c3402451f10d79b8258db53d6da029bd20dd02c279 SHA512 eb1d8b8b94a4a4d165b49cd55ffef5e0ae32e7da1bb6b3e061421ba1a5a27ec30438b789c5c56bad22b512de9bf091aeb24b991c9a146cc852b22a9ca97cf3ce
diff --git a/sci-libs/stellarsolver/metadata.xml b/sci-libs/stellarsolver/metadata.xml
new file mode 100644
index 000000000000..1ef5855568e8
--- /dev/null
+++ b/sci-libs/stellarsolver/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci-astronomy@gentoo.org</email>
+		<name>Gentoo Astronomy project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rlancaste/stellarsolver</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/sci-libs/stellarsolver/stellarsolver-1.5.ebuild b/sci-libs/stellarsolver/stellarsolver-1.5.ebuild
new file mode 100644
index 000000000000..ff0cde6a60c7
--- /dev/null
+++ b/sci-libs/stellarsolver/stellarsolver-1.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Cross-platform Sextractor and Astrometry.net-Based internal astrometric solver"
+HOMEPAGE="https://github.com/rlancaste/stellarsolver"
+SRC_URI="https://github.com/rlancaste/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sci-libs/cfitsio:=
+	sci-libs/gsl:=
+	sci-astronomy/wcslib:=
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
index 7d58a9cc490f..332704d4abfe 100644
--- a/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
+++ b/sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 # SuiteSparse_config directory".
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 multilib_src_configure() {
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index 0ad406c16c2b..8e2bf49a6617 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -1,6 +1,2 @@
 DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad6281f8d29580d9558ad3146dbbaab52794013e9cb56ad83f7309dbd3084a1ccaf6972c6b1468cefcc86bf30d3a460c SHA512 1f3e4b12f368e4f50c38b970c012f1702e339319ee0a858661bdf83e5739bb5b8a36f98b82e2ef76d1ce8a473123046347ee1b44f3cb685509823864f0af1384
-DIST sundials-4.0.2.tar.gz 17183377 BLAKE2B e322a978186f41d84a936faa55962ef6794bf99d6c6a108bfa2bd5615f27f32f7ab6ca4989802fa052d3132b53dca3069b7e4ec9941f95efb92de7bf0792dd88 SHA512 6d0a6fc49c695e70593da71892f0906585dee9c94899bb6b8c9a56c85f345809565166a62544647fdac411d22e37276b9b1bb78ba9be46eaeb28dcd3f6162ef5
-DIST sundials-4.1.0.tar.gz 17221960 BLAKE2B 598c7adc9e37fcfb1f44a3235f58af489ad907d053cb67ee0d3b076076621958374eb847e48318ddf7ced85a7601c5330ac640c7abe8723aaee7d650e3298b8d SHA512 1922dca3f0b8869098670aede802e48abec39607c96304e4efd9b03d195b16920175846fce10641aeebc48c216bda73c8691139dce57ffa7731a6bc8194b81b0
-DIST sundials-5.0.0.tar.gz 18820465 BLAKE2B 77bc7bd489b52ff316f3e889aad4ec27830c42650591270443d45a0aa958d06663e93931a8933ca2d228619263219be4d7441cb473eaaedeab958ae47418a44e SHA512 4962adabcde19207b5044d1e63758d58b5d3cfeefcd0eae65ddfe5499931bf19fa98bafbd4742045cc255f6b4a45653f41df7a7739f86d6eb47c79c9312b4471
-DIST sundials-5.1.0.tar.gz 18496945 BLAKE2B bfe2c88bd1a43c6e0b50e30a4498d23da9e495b4a27e67ff309a032f892cfd8ce54010f567f26b1ecd40a2e21e9364f0b75d0b5dde2771c9e35ad4912e7abf64 SHA512 ad2fef1197fe5680651b63a1da8fab0087416c943f9142e6d0ac8388113fb7e33a7297847f550585d7e8fed1d33111ab85235b3a2f94ac81004f5f3eb584c021
 DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f
diff --git a/sci-libs/sundials/files/sundials-4.0.2-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-4.0.2-fix-license-install-path.patch
deleted file mode 100644
index fbcf53c410cf..000000000000
--- a/sci-libs/sundials/files/sundials-4.0.2-fix-license-install-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur old/CMakeLists.txt new/CMakeLists.txt
---- old/CMakeLists.txt	2019-01-23 01:05:44.000000000 +0300
-+++ new/CMakeLists.txt	2019-06-23 00:35:57.000000000 +0300
-@@ -1210,10 +1210,10 @@
- # install license and notice files
- INSTALL(
-   FILES ${PROJECT_SOURCE_DIR}/LICENSE
--  DESTINATION include/sundials
-+  DESTINATION share/doc/sundials-4.0.2
-   )
- INSTALL(
-   FILES ${PROJECT_SOURCE_DIR}/NOTICE
--  DESTINATION include/sundials
-+  DESTINATION share/doc/sundials-4.0.2
-   )
- 
diff --git a/sci-libs/sundials/files/sundials-4.1.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-4.1.0-fix-license-install-path.patch
deleted file mode 100644
index 6eb75ce59cff..000000000000
--- a/sci-libs/sundials/files/sundials-4.1.0-fix-license-install-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur old/CMakeLists.txt new/CMakeLists.txt
---- old/CMakeLists.txt	2019-02-12 21:50:51.000000000 +0300
-+++ new/CMakeLists.txt	2019-06-23 00:39:23.000000000 +0300
-@@ -1168,10 +1168,10 @@
- # install license and notice files
- INSTALL(
-   FILES ${PROJECT_SOURCE_DIR}/LICENSE
--  DESTINATION include/sundials
-+  DESTINATION share/doc/sundials-4.1.0
-   )
- INSTALL(
-   FILES ${PROJECT_SOURCE_DIR}/NOTICE
--  DESTINATION include/sundials
-+  DESTINATION share/doc/sundials-4.1.0
-   )
- 
diff --git a/sci-libs/sundials/files/sundials-5.0.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.0.0-fix-license-install-path.patch
deleted file mode 100644
index 5de76573630a..000000000000
--- a/sci-libs/sundials/files/sundials-5.0.0-fix-license-install-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d5436bf..76b27c5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1122,9 +1122,9 @@ endif()
- # install license and notice files
- install(
-   FILES ${PROJECT_SOURCE_DIR}/LICENSE
--  DESTINATION include/sundials
-+  DESTINATION share/doc/sundials-5.0.0
-   )
- install(
-   FILES ${PROJECT_SOURCE_DIR}/NOTICE
--  DESTINATION include/sundials
-+  DESTINATION share/doc/sundials-5.0.0
-   )
diff --git a/sci-libs/sundials/files/sundials-5.1.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.1.0-fix-license-install-path.patch
deleted file mode 100644
index 48b019611cb2..000000000000
--- a/sci-libs/sundials/files/sundials-5.1.0-fix-license-install-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d5436bf..76b27c5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1146,9 +1146,9 @@ endif()
- # install license and notice files
- install(
-   FILES ${PROJECT_SOURCE_DIR}/LICENSE
--  DESTINATION include/sundials
-+  DESTINATION share/doc/sundials-5.1.0
-   )
- install(
-   FILES ${PROJECT_SOURCE_DIR}/NOTICE
--  DESTINATION include/sundials
-+  DESTINATION share/doc/sundials-5.1.0
-   )
diff --git a/sci-libs/sundials/sundials-4.0.2.ebuild b/sci-libs/sundials/sundials-4.0.2.ebuild
deleted file mode 100644
index 54f396b21f78..000000000000
--- a/sci-libs/sundials/sundials-4.0.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu:= )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-		ewarn "OpenMP is not available in your current selected gcc"
-		die "need openmp capable gcc"
-	fi
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DCXX_ENABLE="$(usex cxx)"
-		-DFCMIX_ENABLE="$(usex fortran)"
-		-DF90_ENABLE="$(usex fortran)"
-		-DHYPRE_ENABLE="$(usex hypre)"
-		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
-		-DLAPACK_ENABLE="$(usex lapack)"
-		-DMPI_ENABLE="$(usex mpi)"
-		-DOPENMP_ENABLE="$(usex openmp)"
-		-DPTHREAD_ENABLE="$(usex threads)"
-		-DSUPERLUMT_ENABLE="$(usex superlumt)"
-		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
-		-DSUPERLUMT_LIBRARY="superlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/*/*.pdf
-	cd src
-	for r in */README; do
-		newdoc ${r} README-${r%/*}
-	done
-}
diff --git a/sci-libs/sundials/sundials-4.1.0.ebuild b/sci-libs/sundials/sundials-4.1.0.ebuild
deleted file mode 100644
index 54f396b21f78..000000000000
--- a/sci-libs/sundials/sundials-4.1.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu:= )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-		ewarn "OpenMP is not available in your current selected gcc"
-		die "need openmp capable gcc"
-	fi
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DCXX_ENABLE="$(usex cxx)"
-		-DFCMIX_ENABLE="$(usex fortran)"
-		-DF90_ENABLE="$(usex fortran)"
-		-DHYPRE_ENABLE="$(usex hypre)"
-		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
-		-DLAPACK_ENABLE="$(usex lapack)"
-		-DMPI_ENABLE="$(usex mpi)"
-		-DOPENMP_ENABLE="$(usex openmp)"
-		-DPTHREAD_ENABLE="$(usex threads)"
-		-DSUPERLUMT_ENABLE="$(usex superlumt)"
-		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
-		-DSUPERLUMT_LIBRARY="superlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/*/*.pdf
-	cd src
-	for r in */README; do
-		newdoc ${r} README-${r%/*}
-	done
-}
diff --git a/sci-libs/sundials/sundials-5.0.0.ebuild b/sci-libs/sundials/sundials-5.0.0.ebuild
deleted file mode 100644
index 9505cbb40bfd..000000000000
--- a/sci-libs/sundials/sundials-5.0.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu:= )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-		ewarn "OpenMP is not available in your current selected gcc"
-		die "need openmp capable gcc"
-	fi
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DCXX_ENABLE="$(usex cxx)"
-		-DFCMIX_ENABLE="$(usex fortran)"
-		-DF90_ENABLE="$(usex fortran)"
-		-DHYPRE_ENABLE="$(usex hypre)"
-		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
-		-DLAPACK_ENABLE="$(usex lapack)"
-		-DMPI_ENABLE="$(usex mpi)"
-		-DOPENMP_ENABLE="$(usex openmp)"
-		-DPTHREAD_ENABLE="$(usex threads)"
-		-DSUPERLUMT_ENABLE="$(usex superlumt)"
-		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
-		-DSUPERLUMT_LIBRARY="-lsuperlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/*/*.pdf
-}
diff --git a/sci-libs/sundials/sundials-5.1.0.ebuild b/sci-libs/sundials/sundials-5.1.0.ebuild
deleted file mode 100644
index c6bc6848c819..000000000000
--- a/sci-libs/sundials/sundials-5.1.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD="77 90"
-# if FFLAGS and FCFLAGS are set then should be equal
-
-inherit cmake fortran-2 toolchain-funcs
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-		ewarn "OpenMP is not available in your current selected gcc"
-		die "need openmp capable gcc"
-	fi
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DCXX_ENABLE="$(usex cxx)"
-		-DFCMIX_ENABLE="$(usex fortran)"
-		-DF90_ENABLE="$(usex fortran)"
-		-DHYPRE_ENABLE="$(usex hypre)"
-		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DLAPACK_ENABLE="$(usex lapack)"
-		-DMPI_ENABLE="$(usex mpi)"
-		-DOPENMP_ENABLE="$(usex openmp)"
-		-DPTHREAD_ENABLE="$(usex threads)"
-		-DSUPERLUMT_ENABLE="$(usex superlumt)"
-		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
-		-DSUPERLUMT_LIBRARY="-lsuperlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	use sparse && mycmakeargs+=( -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so" )
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc doc/*/*.pdf
-}
diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index 531452d54e54..3f0630c28ea9 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -1,3 +1,2 @@
 DIST superlu_4.3.tar.gz 2876631 BLAKE2B 0a563e6730394f8e69fe13f1418f9f046bd37c848c51063e93a24a209e50a67f91b725eb3978fd6c4d28e51615806d6c0b6a2539cbc0d7fd11b5e4f0a9360148 SHA512 5c13da47b79160be14719f62ccdf5d59142a172e25a988fa340eaeb001a64d7f45ba39e675cb7aa3571bec52cb3a7cda0bb7a708c9608184ba6251edb7990e8c
-DIST superlu_5.2.1.tar.gz 2560875 BLAKE2B b1dd51bddb55061f5756f3cf766f80e506f7cc12b272c2ceebbae71cab9314000308b72cf265d5948ed69c68d0ad0adeb938a4471250147b0fcfdc2b80298db7 SHA512 30538b4c2809294b8f34646bce6445944f21a1dffaf3ec0a0f29a55d5261caa56e4279d7722bb95cc9d89450d36ded969617edc82ecce7d0f1dfb24040d80d07
 DIST superlu_5.2.2.tar.gz 2481538 BLAKE2B db9d6437c8012f1aeeb3313212298a77e4ef04405c6ec853ceeef8b80426ea80d8b9fc30a0ca2dd7288131a0e21c43e17cafafaa7fb615d6d825b54f4beb84a2 SHA512 091928a3df3433b337ebdacdb28de341d6d29d655965de6ffd656a6de18cf11171555bfd3af73082af62b1cead6835b4c11e4ba524a32db7f7d28db47c9d490c
diff --git a/sci-libs/superlu/files/superlu-5.2.1-no-implicits.patch b/sci-libs/superlu/files/superlu-5.2.1-no-implicits.patch
deleted file mode 100644
index 587380ce2e35..000000000000
--- a/sci-libs/superlu/files/superlu-5.2.1-no-implicits.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-diff --git a/SRC/clacon2.c b/SRC/clacon2.c
-index 107bb64..39deb83 100644
---- a/SRC/clacon2.c
-+++ b/SRC/clacon2.c
-@@ -106,6 +106,11 @@ clacon2_(int *n, complex *v, complex *x, float *est, int *kase, int isave[3])
-     extern float smach(char *);
-     extern int icmax1_slu(int *, complex *, int *);
-     extern double scsum1_slu(int *, complex *, int *);
-+#ifdef _CRAY
-+    extern int CCOPY(int *, complex *, int *, complex [], int *);
-+#else
-+    extern int ccopy_(int *, complex *, int *, complex [], int *);
-+#endif
- 
-     safmin = smach("Safe minimum");  /* lamch_("Safe minimum"); */
-     if ( *kase == 0 ) {
-diff --git a/SRC/dmach.c b/SRC/dmach.c
-index 73beacb..cafdf1c 100644
---- a/SRC/dmach.c
-+++ b/SRC/dmach.c
-@@ -11,6 +11,7 @@ at the top-level directory.
- #include <float.h>
- #include <math.h>
- #include <stdio.h>
-+#include <string.h>
- 
- double dmach(char *cmach)
- {
-diff --git a/SRC/ilu_cdrop_row.c b/SRC/ilu_cdrop_row.c
-index 4987548..09b8a93 100644
---- a/SRC/ilu_cdrop_row.c
-+++ b/SRC/ilu_cdrop_row.c
-@@ -28,6 +28,7 @@ extern void caxpy_(int *, complex *, complex [], int *, complex [], int *);
- extern void ccopy_(int *, complex [], int *, complex [], int *);
- extern float scasum_(int *, complex *, int *);
- extern float scnrm2_(int *, complex *, int *);
-+extern void scopy_(int *, float [], int *, float [], int *);
- extern double dnrm2_(int *, double [], int *);
- extern int icamax_(int *, complex [], int *);
- 
-diff --git a/SRC/ilu_zdrop_row.c b/SRC/ilu_zdrop_row.c
-index f434dd9..2de1226 100644
---- a/SRC/ilu_zdrop_row.c
-+++ b/SRC/ilu_zdrop_row.c
-@@ -29,6 +29,7 @@ extern void zcopy_(int *, doublecomplex [], int *, doublecomplex [], int *);
- extern double dzasum_(int *, doublecomplex *, int *);
- extern double dznrm2_(int *, doublecomplex *, int *);
- extern double dnrm2_(int *, double [], int *);
-+extern void dcopy_(int *, double [], int *, double [], int *);
- extern int izamax_(int *, doublecomplex [], int *);
- 
- static double *A;  /* used in _compare_ only */
-diff --git a/SRC/slacon2.c b/SRC/slacon2.c
-index 7c93341..50efe78 100644
---- a/SRC/slacon2.c
-+++ b/SRC/slacon2.c
-@@ -157,7 +157,7 @@ L40:
- #ifdef _CRAY
-     isave[1] = ISAMAX(n, &x[0], &c__1);   /* j */
- #else
--    isave[1] = idamax_(n, &x[0], &c__1);  /* j */
-+    isave[1] = isamax_(n, &x[0], &c__1);  /* j */
- #endif
-     --isave[1];  /* --j; */
-     isave[2] = 2;  /* iter = 2; */
-diff --git a/SRC/smach.c b/SRC/smach.c
-index fff6c5f..0b69991 100644
---- a/SRC/smach.c
-+++ b/SRC/smach.c
-@@ -11,6 +11,7 @@ at the top-level directory.
- #include <float.h>
- #include <math.h>
- #include <stdio.h>
-+#include <string.h>
- 
- float smach(char *cmach)
- {
-diff --git a/SRC/sp_ienv.c b/SRC/sp_ienv.c
-index 855d901..ce2865e 100644
---- a/SRC/sp_ienv.c
-+++ b/SRC/sp_ienv.c
-@@ -24,6 +24,7 @@ at the top-level directory.
-  * History:             Modified from lapack routine ILAENV
-  */
- #include "slu_Cnames.h"
-+extern int input_error(char *, int *);
- 
- /*! \brief
- 
-diff --git a/SRC/zlacon2.c b/SRC/zlacon2.c
-index b43c619..ed5f2b7 100644
---- a/SRC/zlacon2.c
-+++ b/SRC/zlacon2.c
-@@ -106,6 +106,11 @@ zlacon2_(int *n, doublecomplex *v, doublecomplex *x, double *est, int *kase, int
-     extern double dmach(char *);
-     extern int izmax1_slu(int *, doublecomplex *, int *);
-     extern double dzsum1_slu(int *, doublecomplex *, int *);
-+#ifdef _CRAY
-+    extern int CCOPY(int *, doublecomplex *, int *, doublecomplex *, int *);
-+#else
-+    extern int zcopy_(int *, doublecomplex *, int *, doublecomplex *, int *);
-+#endif
- 
-     safmin = dmach("Safe minimum");  /* lamch_("Safe minimum"); */
-     if ( *kase == 0 ) {
-diff --git a/TESTING/zdrive.c b/TESTING/zdrive.c
-index 23e96fc..1e7d0aa 100644
---- a/TESTING/zdrive.c
-+++ b/TESTING/zdrive.c
-@@ -21,6 +21,7 @@ at the top-level directory.
-  * Purpose:             MAIN test program
-  */
- #include <string.h>
-+#include <unistd.h>
- #include "slu_zdefs.h"
- 
- #define NTESTS    5      /* Number of test types */
-diff --git a/TESTING/cdrive.c b/TESTING/cdrive.c
-index 8bc8d10..00fe0d8 100644
---- a/TESTING/cdrive.c
-+++ b/TESTING/cdrive.c
-@@ -21,6 +21,7 @@ at the top-level directory.
-  * Purpose:             MAIN test program
-  */
- #include <string.h>
-+#include <unistd.h>
- #include "slu_cdefs.h"
- 
- #define NTESTS    5      /* Number of test types */
-diff --git a/TESTING/sdrive.c b/TESTING/sdrive.c
-index 5b98038..cba0c83 100644
---- a/TESTING/sdrive.c
-+++ b/TESTING/sdrive.c
-@@ -21,6 +21,7 @@ at the top-level directory.
-  * Purpose:             MAIN test program
-  */
- #include <string.h>
-+#include <unistd.h>
- #include "slu_sdefs.h"
- 
- #define NTESTS    5      /* Number of test types */
-diff --git a/TESTING/ddrive.c b/TESTING/ddrive.c
-index 2c3f6fe..35685c5 100644
---- a/TESTING/ddrive.c
-+++ b/TESTING/ddrive.c
-@@ -21,6 +21,7 @@ at the top-level directory.
-  * Purpose:             MAIN test program
-  */
- #include <string.h>
-+#include <unistd.h>
- #include "slu_ddefs.h"
- 
- #define NTESTS    5      /* Number of test types */
diff --git a/sci-libs/superlu/files/superlu-5.2.1-pkgconfig.patch b/sci-libs/superlu/files/superlu-5.2.1-pkgconfig.patch
deleted file mode 100644
index 63252dffdb57..000000000000
--- a/sci-libs/superlu/files/superlu-5.2.1-pkgconfig.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d8abc1b..5883b34 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -143,3 +143,6 @@ endif()
- #  ${CMAKE_C_COMPILER}  )
- configure_file(${CMAKE_SOURCE_DIR}/make.inc.in ${CMAKE_SOURCE_DIR}/make.inc)
-  
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/superlu.pc.in ${CMAKE_CURRENT_BINARY_DIR}/superlu.pc @ONLY)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/superlu.pc
-+	DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-diff --git a/superlu.pc.in b/superlu.pc.in
-new file mode 100644
-index 0000000..09b1fff
---- /dev/null
-+++ b/superlu.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
-+includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@
-+
-+Name: @CMAKE_PROJECT_NAME@
-+Description: Direct solution of large, sparse systems of linear equations
-+Version: @PROJECT_VERSION@
-+URL: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/
-+
-+Libs: -L${libdir} -lsuperlu
-+Libs.private: @BLAS_LIB@ -lm
-+Cflags: -I${includedir}
diff --git a/sci-libs/superlu/superlu-4.3-r1.ebuild b/sci-libs/superlu/superlu-4.3-r2.ebuild
index 1c9edf1a9d4a..7ff9a6d2020e 100644
--- a/sci-libs/superlu/superlu-4.3-r1.ebuild
+++ b/sci-libs/superlu/superlu-4.3-r2.ebuild
@@ -1,37 +1,34 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=true
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils fortran-2 toolchain-funcs multilib
+inherit autotools fortran-2 toolchain-funcs
 
 MY_PN=SuperLU
 
 DESCRIPTION="Sparse LU factorization library"
 HOMEPAGE="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
 SRC_URI="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/${PN}_${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}_${PV}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
+IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	virtual/blas"
-DEPEND="${RDEPEND}
+RDEPEND="virtual/blas"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	test? ( app-shells/tcsh )"
-
-S="${WORKDIR}/${MY_PN}_${PV}"
+	test? ( app-shells/tcsh )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-autotools.patch
 	"${FILESDIR}"/${P}-format-security.patch
-	)
+)
 
 src_prepare() {
 	unset VERBOSE
@@ -40,17 +37,22 @@ src_prepare() {
 		-e "s:= ranlib:= $(tc-getRANLIB):g" \
 		-i make.inc || die
 
-	autotools-utils_src_prepare
+	default
+	eautoreconf
 }
 
 src_configure() {
-	local myeconfargs=( --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" )
-	autotools-utils_src_configure
+	local myeconfargs=(
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+	)
+
+	econf
+
 	rm EXAMPLE/*itersol1 || die
 }
 
 src_test() {
-	cd "${BUILD_DIR}"/TESTING
+	cd TESTING || die
 	emake -j1 \
 		CC="$(tc-getCC)" \
 		FORTRAN="$(tc-getFC)" \
@@ -65,10 +67,17 @@ src_test() {
 }
 
 src_install() {
-	autotools-utils_src_install
-	use doc && dodoc DOC/ug.pdf && dohtml DOC/html/*
+	default
+
+	if use doc; then
+		dodoc DOC/ug.pdf
+		dodoc DOC/html/*
+	fi
+
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r EXAMPLE FORTRAN
+		docinto examples
+		dodoc EXAMPLE FORTRAN
 	fi
+
+	find "${ED}" -name "*.a" -delete || die
 }
diff --git a/sci-libs/superlu/superlu-5.2.1-r1.ebuild b/sci-libs/superlu/superlu-5.2.1-r1.ebuild
deleted file mode 100644
index 2f7f382cf88d..000000000000
--- a/sci-libs/superlu/superlu-5.2.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_STANDARD=77
-
-inherit cmake-utils fortran-2
-
-MY_PN=SuperLU
-
-if [[ ${PV} != *9999* ]]; then
-	inherit versionator
-	SRC_URI="https://crd-legacy.lbl.gov/~xiaoye/SuperLU//${PN}_${PV}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-	SLOT="0/$(get_major_version)"
-	S="${WORKDIR}/SuperLU_${PV}"
-else
-	inherit git-r3
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/xiaoyeli/${PN}"
-	SLOT="0/9999"
-	KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Sparse LU factorization library"
-HOMEPAGE="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
-LICENSE="BSD"
-
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/blas"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( app-shells/tcsh )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-implicits.patch
-	"${FILESDIR}"/${P}-pkgconfig.patch
-)
-
-S="${WORKDIR}/${MY_PN}_${PV}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# respect user's CFLAGS
-	sed -i -e 's/O3//' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs+=(
-		-DCMAKE_INSTALL_INCLUDEDIR="include/superlu"
-		-DBUILD_SHARED_LIBS=ON
-		-Denable_blaslib=OFF
-		-Denable_tests=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc -r DOC/html
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r EXAMPLE FORTRAN
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sci-libs/superlu/superlu-5.2.2.ebuild b/sci-libs/superlu/superlu-5.2.2.ebuild
index 723d6ba29bbc..6753908584c6 100644
--- a/sci-libs/superlu/superlu-5.2.2.ebuild
+++ b/sci-libs/superlu/superlu-5.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/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 a12a30c2f8f8..368635eff994 100644
--- a/sci-libs/tensorflow-estimator/Manifest
+++ b/sci-libs/tensorflow-estimator/Manifest
@@ -2,4 +2,4 @@ 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
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 c1e97e448a1e..c1e97e448a1e 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 30c85e81acfc..dd935933df64 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,29 +12,20 @@ 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
+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
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 86928ee13fb9..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,9,10} )
-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 539ccfc11e58..c7c1b063714f 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 539ccfc11e58..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,9,10} )
-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/trilinos/Manifest b/sci-libs/trilinos/Manifest
index 53dace0ee157..cf213f061639 100644
--- a/sci-libs/trilinos/Manifest
+++ b/sci-libs/trilinos/Manifest
@@ -1,6 +1,2 @@
-DIST trilinos-12.14.1-patches-r0.tar.xz 6448 BLAKE2B f852a4612c400ddfb6dcecb476e0b9b2cd0f38ac9cd74fd09fc1f99ccb2588a4703f8c8514689c81d23aa218aff3cdcbe9b5205becea8936723d6e339705d54d SHA512 206bd08f0a5b7f7107e60c9e9c1a15fa7e74916bacb5399cccdd936b426768834ff24424ea77e8d1706afa98d88bb5a098b3b0203039024a3b5f5388c4a9735b
-DIST trilinos-12.14.1.tar.gz 129036436 BLAKE2B e7401df2ff8408a7af4a8e90d93b1929df65228c4f5cf3c754d20ebdfa8f3835800f540e87c1198e0baf2fefe0920618ae497f59373720754ab0c9dc1da93136 SHA512 dfff0e0582cb5ad12614dd53e9635572c8d1ee86d96f432f5a6e046af63edb13f6bfa3037204ab89fbb0d27e9be9bd9661d47efb41ab2a6e421bca5eba6b6a87
-DIST trilinos-12.18.1-patches-r0.tar.xz 6236 BLAKE2B fdcdedde68ef855aa98671223ad2c42467284ad7ca364e2b5ca715094a6efacc463f2d1812ee63ac980ca87dbe16bb2ac04835f52efa1df34651a608cb5407e9 SHA512 e6db2be4642b8f9797b0be6dd05641ae469dd5117b1b04da54ed955bd56473d6aaa69d59dfd7869db1e7059d2d9b2cb2d9269dd5ef863663eabb90c5c256b987
-DIST trilinos-12.18.1.tar.gz 152007573 BLAKE2B 5dc2ee432d777712fb4ca1dc2d7ad68015f523fdbcbd4f55388a89d31c0946a1c5031b3e8f906952cf6b2f4f16928e6da5f17b1f6ee0f0e5669cfce5c8a09367 SHA512 e2a57df57e8e98ed97bbde9c1e768738f0eaccc32466aff6daa308573a860b3debee89bd570c113ca0f6a6458ff562aa6596ddf657236c368b7b2e26a4b4466b
 DIST trilinos-13.0.0-patches-r0.tar.xz 7672 BLAKE2B 6412f1226549086ef2fca3c4d8bba3c5541489879f4fa37c3598a7271128e3232fa1cc56a51d44fb88d679458a79a082c3984085ddbe4bc0884b0cb45ba683c0 SHA512 91372fe0f47a1f5d4dbc1856e2cfb9d4f1eb8cc0de941013a7a6e791730c9e10decdcd4ca39b36bae836ac66040bee70af187b4a056d46b0da0fe72e8c5943fc
-DIST trilinos-13.0.0.tar.gz 157960946 BLAKE2B 6336d71f469dd4561786092b175ec3396d6b7956aeec6ab8d9d6e87a1b1158a0840661a87514888fc16ea36c44d628dadb865a3244785c2c5d4b24213aca2096 SHA512 74b1e852971c8f040e8640688c879659bf6b03eed0bc6f76f31d768e7c4eb50b23fb8bfb9997d7f630001d80150161aac80fbd3237f52071657908320c1d723d
+DIST trilinos-13.0.1.tar.gz 157950374 BLAKE2B 79f337b02a0fe9ddf7b55334e035946204b3bb469b92fff4063896a378c82d9c5f04c0bf0e9ddd21603ecf9d84a91860606482b545916f16029a11d2b6c64aa0 SHA512 22241a9ad8b6b6ab9117aba254f65195fc0c8e1b52eacb16e763c999086b6da6b0c180d8864fbe421704e0fe0c433d37512099755d54e60f13ed525dc6c0fd57
diff --git a/sci-libs/trilinos/trilinos-12.14.1.ebuild b/sci-libs/trilinos/trilinos-12.14.1.ebuild
deleted file mode 100644
index 44974ab8213a..000000000000
--- a/sci-libs/trilinos/trilinos-12.14.1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake-utils toolchain-funcs multilib toolchain-funcs
-
-DESCRIPTION="Scientific library collection for large scale problems"
-HOMEPAGE="https://trilinos.sandia.gov/"
-MY_PV="${PV//\./-}"
-PATCHSET="r0"
-SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-${PATCHSET}.tar.xz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-
-IUSE="
-	adolc arprec boost clp cuda eigen glpk gtest hdf5 hwloc hypre
-	matio metis mkl mumps netcdf petsc qd scalapack scotch sparse
-	superlu taucs tbb test threads tvmet yaml zlib X
-"
-
-# TODO: fix export cmake function for tests
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/binutils-libs
-	virtual/blas
-	virtual/lapack
-	virtual/mpi
-	adolc? ( sci-libs/adolc )
-	arprec? ( sci-libs/arprec )
-	boost? ( dev-libs/boost )
-	clp? ( sci-libs/coinor-clp )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
-	eigen? ( dev-cpp/eigen:3 )
-	glpk? ( sci-mathematics/glpk )
-	gtest? ( dev-cpp/gtest )
-	hdf5? ( sci-libs/hdf5[mpi] )
-	hypre? ( sci-libs/hypre )
-	hwloc? ( sys-apps/hwloc )
-	matio? ( sci-libs/matio )
-	mkl? ( sci-libs/mkl )
-	metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
-	mumps? ( sci-libs/mumps )
-	netcdf? ( sci-libs/netcdf )
-	petsc? ( sci-mathematics/petsc )
-	qd? ( sci-libs/qd )
-	scalapack? ( sci-libs/scalapack )
-	scotch? ( sci-libs/scotch )
-	sparse? ( sci-libs/cxsparse sci-libs/umfpack )
-	superlu? ( sci-libs/superlu )
-	taucs? ( sci-libs/taucs )
-	tbb? ( dev-cpp/tbb )
-	tvmet? ( dev-libs/tvmet )
-	yaml? ( dev-cpp/yaml-cpp )
-	zlib? ( sys-libs/zlib )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}"
-
-PATCHES=(
-	"${WORKDIR}"/patches
-)
-
-trilinos_conf() {
-	local dirs libs d
-	for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
-		dirs="${dirs};${d:2}"
-	done
-	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
-	for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
-		libs="${libs};${d:2}"
-	done
-	[[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
-	dirs=""
-	for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
-		dirs="${dirs};${d:2}"
-	done
-	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
-		-DCMAKE_SKIP_INSTALL_RPATH=ON
-		-DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
-		-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
-		-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
-		-DTrilinos_ENABLE_ALL_PACKAGES=ON
-		-DTrilinos_ENABLE_PyTrilinos=OFF
-		-DTrilinos_ENABLE_SEACASChaco=OFF
-		-DTrilinos_ENABLE_SEACASExodiff="$(usex netcdf)"
-		-DTrilinos_ENABLE_SEACASExodus="$(usex netcdf)"
-		-DTrilinos_ENABLE_TESTS="$(usex test)"
-		-DZoltan2_ENABLE_Experimental=ON
-		-DTPL_ENABLE_BinUtils=ON
-		-DTPL_ENABLE_BLAS=ON
-		-DTPL_ENABLE_LAPACK=ON
-		-DTPL_ENABLE_MPI=ON
-		-DTPL_ENABLE_ADOLC="$(usex adolc)"
-		-DTPL_ENABLE_AMD="$(usex sparse)"
-		-DTPL_ENABLE_ARPREC="$(usex arprec)"
-		-DTPL_ENABLE_BLACS="$(usex scalapack)"
-		-DTPL_ENABLE_BoostLib="$(usex boost)"
-		-DTPL_ENABLE_Boost="$(usex boost)"
-		-DTPL_ENABLE_Clp="$(usex clp)"
-		-DTPL_ENABLE_CSparse="$(usex sparse)"
-		-DTPL_ENABLE_CUDA="$(usex cuda)"
-		-DTPL_ENABLE_CUSPARSE="$(usex cuda)"
-		-DTPL_ENABLE_Eigen="$(usex eigen)"
-		-DTPL_ENABLE_GLPK="$(usex glpk)"
-		-DTPL_ENABLE_gtest="$(usex gtest)"
-		-DTPL_ENABLE_HDF5="$(usex hdf5)"
-		-DTPL_ENABLE_HWLOC="$(usex hwloc)"
-		-DTPL_ENABLE_HYPRE="$(usex hypre)"
-		-DTPL_ENABLE_Matio="$(usex matio)"
-		-DTPL_ENABLE_METIS="$(usex metis)"
-		-DTPL_ENABLE_MKL="$(usex mkl)"
-		-DTPL_ENABLE_MUMPS="$(usex mumps)"
-		-DTPL_ENABLE_Netcdf="$(usex netcdf)"
-		-DTPL_ENABLE_PARDISO_MKL="$(usex mkl)"
-		-DTPL_ENABLE_PETSC="$(usex petsc)"
-		-DTPL_ENABLE_Pthread="$(usex threads)"
-		-DTPL_ENABLE_QD="$(usex qd)"
-		-DTPL_ENABLE_SCALAPACK="$(usex scalapack)"
-		-DTPL_ENABLE_Scotch="$(usex scotch)"
-		-DTPL_ENABLE_SuperLU="$(usex superlu)"
-		-DTPL_ENABLE_TAUCS="$(usex taucs)"
-		-DTPL_ENABLE_TBB="$(usex tbb)"
-		-DTPL_ENABLE_Thrust="$(usex cuda)"
-		-DTPL_ENABLE_TVMET="$(usex tvmet)"
-		-DTPL_ENABLE_UMFPACK="$(usex sparse)"
-		-DTPL_ENABLE_X11="$(usex X)"
-		-DTPL_ENABLE_yaml-cpp="$(usex yaml)"
-		-DTPL_ENABLE_Zlib="$(usex zlib)"
-		-DML_ENABLE_SuperLU:BOOL=OFF
-	)
-
-	use eigen && \
-		mycmakeargs+=(
-		-DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3"
-	)
-	use hypre && \
-		mycmakeargs+=(
-		-DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre"
-	)
-	use scotch && \
-		mycmakeargs+=(
-		-DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch"
-	)
-
-	# cxsparse is a rewrite of csparse + extras
-	use sparse && \
-		mycmakeargs+=(
-		-DCSparse_LIBRARY_NAMES="cxsparse"
-	)
-
-	# mandatory blas and lapack
-	trilinos_conf blas BLAS
-	trilinos_conf lapack LAPACK
-	use superlu && trilinos_conf superlu SuperLU
-	use metis && trilinos_conf metis METIS
-
-	# blacs library is included in scalapack these days
-	if use scalapack; then
-		trilinos_conf scalapack SCALAPACK
-		mycmakeargs+=(
-			-DBLACS_LIBRARY_NAMES="scalapack"
-			-DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs"
-		)
-	fi
-
-	#
-	# Make sure we use the compiler wrappers in order to build trilinos.
-	#
-	export CC=mpicc CXX=mpicxx && tc-export CC CXX
-
-	#
-	# cmake-utils eclass patches the base directory CMakeLists.txt
-	# which does not work for complex Trilinos CMake modules
-	#
-	CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Clean up the mess:
-	mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
-	if [ -f "${ED}"/lib/exodus.py ]; then
-		mv "${ED}"/lib/exodus.py "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
-	fi
-
-	#
-	# register $(get_libdir)/trilinos in LDPATH so that the dynamic linker
-	# has a chance to pick up the libraries...
-	#
-	cat >> "${T}"/99trilinos <<- EOF
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos"
-	PATH="${EPREFIX}/usr/$(get_libdir)/trilinos/bin"
-	EOF
-	doenvd "${T}"/99trilinos
-}
diff --git a/sci-libs/trilinos/trilinos-12.18.1.ebuild b/sci-libs/trilinos/trilinos-12.18.1.ebuild
deleted file mode 100644
index b6df10a2d145..000000000000
--- a/sci-libs/trilinos/trilinos-12.18.1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CMAKE_MAKEFILE_GENERATOR=emake
-
-inherit cmake-utils toolchain-funcs multilib toolchain-funcs
-
-DESCRIPTION="Scientific library collection for large scale problems"
-HOMEPAGE="https://trilinos.sandia.gov/"
-MY_PV="${PV//\./-}"
-PATCHSET="r0"
-SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-${PATCHSET}.tar.xz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-
-IUSE="
-	adolc arprec boost clp cuda eigen glpk gtest hdf5 hwloc hypre
-	matio metis mkl mumps netcdf petsc qd scalapack scotch sparse
-	superlu taucs tbb test threads tvmet yaml zlib X
-"
-
-# TODO: fix export cmake function for tests
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/binutils-libs
-	virtual/blas
-	virtual/lapack
-	virtual/mpi
-	adolc? ( sci-libs/adolc )
-	arprec? ( sci-libs/arprec )
-	boost? ( dev-libs/boost )
-	clp? ( sci-libs/coinor-clp )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
-	eigen? ( dev-cpp/eigen:3 )
-	glpk? ( sci-mathematics/glpk )
-	gtest? ( dev-cpp/gtest )
-	hdf5? ( sci-libs/hdf5[mpi] )
-	hypre? ( sci-libs/hypre )
-	hwloc? ( sys-apps/hwloc )
-	matio? ( sci-libs/matio )
-	mkl? ( sci-libs/mkl )
-	metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
-	mumps? ( sci-libs/mumps )
-	netcdf? ( sci-libs/netcdf )
-	petsc? ( sci-mathematics/petsc )
-	qd? ( sci-libs/qd )
-	scalapack? ( sci-libs/scalapack )
-	scotch? ( sci-libs/scotch )
-	sparse? ( sci-libs/cxsparse sci-libs/umfpack )
-	superlu? ( sci-libs/superlu )
-	taucs? ( sci-libs/taucs )
-	tbb? ( dev-cpp/tbb )
-	tvmet? ( dev-libs/tvmet )
-	yaml? ( dev-cpp/yaml-cpp )
-	zlib? ( sys-libs/zlib )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}"
-
-PATCHES=(
-	"${WORKDIR}"/patches
-)
-
-trilinos_conf() {
-	local dirs libs d
-	for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
-		dirs="${dirs};${d:2}"
-	done
-	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
-	for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
-		libs="${libs};${d:2}"
-	done
-	[[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
-	dirs=""
-	for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
-		dirs="${dirs};${d:2}"
-	done
-	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
-		-DCMAKE_SKIP_INSTALL_RPATH=ON
-		-DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
-		-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
-		-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
-		-DTrilinos_ENABLE_ALL_PACKAGES=ON
-		-DTrilinos_ENABLE_PyTrilinos=OFF
-		-DTrilinos_ENABLE_SEACAS=OFF
-		-DTrilinos_ENABLE_SEACASChaco=OFF
-		-DTrilinos_ENABLE_SEACASExodiff="$(usex netcdf)"
-		-DTrilinos_ENABLE_SEACASExodus="$(usex netcdf)"
-		-DTrilinos_ENABLE_TESTS="$(usex test)"
-		-DZoltan2_ENABLE_Experimental=ON
-		-DTPL_ENABLE_BinUtils=ON
-		-DTPL_ENABLE_BLAS=ON
-		-DTPL_ENABLE_LAPACK=ON
-		-DTPL_ENABLE_MPI=ON
-		-DTPL_ENABLE_ADOLC="$(usex adolc)"
-		-DTPL_ENABLE_AMD="$(usex sparse)"
-		-DTPL_ENABLE_ARPREC="$(usex arprec)"
-		-DTPL_ENABLE_BLACS="$(usex scalapack)"
-		-DTPL_ENABLE_BoostLib="$(usex boost)"
-		-DTPL_ENABLE_Boost="$(usex boost)"
-		-DTPL_ENABLE_Clp="$(usex clp)"
-		-DTPL_ENABLE_CSparse="$(usex sparse)"
-		-DTPL_ENABLE_CUDA="$(usex cuda)"
-		-DTPL_ENABLE_CUSPARSE="$(usex cuda)"
-		-DTPL_ENABLE_Eigen="$(usex eigen)"
-		-DTPL_ENABLE_GLPK="$(usex glpk)"
-		-DTPL_ENABLE_gtest="$(usex gtest)"
-		-DTPL_ENABLE_HDF5="$(usex hdf5)"
-		-DTPL_ENABLE_HWLOC="$(usex hwloc)"
-		-DTPL_ENABLE_HYPRE="$(usex hypre)"
-		-DTPL_ENABLE_Matio="$(usex matio)"
-		-DTPL_ENABLE_METIS="$(usex metis)"
-		-DTPL_ENABLE_MKL="$(usex mkl)"
-		-DTPL_ENABLE_MUMPS="$(usex mumps)"
-		-DTPL_ENABLE_Netcdf="$(usex netcdf)"
-		-DTPL_ENABLE_PARDISO_MKL="$(usex mkl)"
-		-DTPL_ENABLE_PETSC="$(usex petsc)"
-		-DTPL_ENABLE_Pthread="$(usex threads)"
-		-DTPL_ENABLE_QD="$(usex qd)"
-		-DTPL_ENABLE_SCALAPACK="$(usex scalapack)"
-		-DTPL_ENABLE_Scotch="$(usex scotch)"
-		-DTPL_ENABLE_SuperLU="$(usex superlu)"
-		-DTPL_ENABLE_TAUCS="$(usex taucs)"
-		-DTPL_ENABLE_TBB="$(usex tbb)"
-		-DTPL_ENABLE_Thrust="$(usex cuda)"
-		-DTPL_ENABLE_TVMET="$(usex tvmet)"
-		-DTPL_ENABLE_UMFPACK="$(usex sparse)"
-		-DTPL_ENABLE_X11="$(usex X)"
-		-DTPL_ENABLE_yaml-cpp="$(usex yaml)"
-		-DTPL_ENABLE_Zlib="$(usex zlib)"
-		-DML_ENABLE_SuperLU:BOOL=OFF
-	)
-
-	use eigen && \
-		mycmakeargs+=(
-		-DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3"
-	)
-	use hypre && \
-		mycmakeargs+=(
-		-DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre"
-	)
-	use scotch && \
-		mycmakeargs+=(
-		-DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch"
-	)
-
-	# cxsparse is a rewrite of csparse + extras
-	use sparse && \
-		mycmakeargs+=(
-		-DCSparse_LIBRARY_NAMES="cxsparse"
-	)
-
-	# mandatory blas and lapack
-	trilinos_conf blas BLAS
-	trilinos_conf lapack LAPACK
-	use superlu && trilinos_conf superlu SuperLU
-	use metis && trilinos_conf metis METIS
-
-	# blacs library is included in scalapack these days
-	if use scalapack; then
-		trilinos_conf scalapack SCALAPACK
-		mycmakeargs+=(
-			-DBLACS_LIBRARY_NAMES="scalapack"
-			-DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs"
-		)
-	fi
-
-	#
-	# Make sure we use the compiler wrappers in order to build trilinos.
-	#
-	export CC=mpicc CXX=mpicxx && tc-export CC CXX
-
-	#
-	# cmake-utils eclass patches the base directory CMakeLists.txt
-	# which does not work for complex Trilinos CMake modules
-	#
-	CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Clean up the mess:
-	mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
-	mv "${ED}/usr/$(get_libdir)"/trilinos/cmake/* "${ED}/usr/$(get_libdir)"/cmake || die "mv failed"
-	rmdir "${ED}/usr/$(get_libdir)/trilinos/cmake" || die "rmdir failed"
-	if [ -f "${ED}"/lib/exodus.py ]; then
-		mv "${ED}"/lib/exodus.py "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
-	fi
-	if [[ $(get_libdir) != lib ]]; then
-		mv "${ED}"/usr/lib/pkgconfig "${ED}/usr/$(get_libdir)"
-	fi
-
-	#
-	# register $(get_libdir)/trilinos in LDPATH so that the dynamic linker
-	# has a chance to pick up the libraries...
-	#
-	cat >> "${T}"/99trilinos <<- EOF
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos"
-	PATH="${EPREFIX}/usr/$(get_libdir)/trilinos/bin"
-	EOF
-	doenvd "${T}"/99trilinos
-}
diff --git a/sci-libs/trilinos/trilinos-13.0.0.ebuild b/sci-libs/trilinos/trilinos-13.0.1.ebuild
index cad6fd456769..2cb536ce445d 100644
--- a/sci-libs/trilinos/trilinos-13.0.0.ebuild
+++ b/sci-libs/trilinos/trilinos-13.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://trilinos.sandia.gov/"
 MY_PV="${PV//\./-}"
 PATCHSET="r0"
 SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-${PATCHSET}.tar.xz"
+	https://dev.gentoo.org/~tamiko/distfiles/${PN}-13.0.0-patches-${PATCHSET}.tar.xz"
 
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
@@ -101,7 +101,6 @@ src_configure() {
 		-DTrilinos_ENABLE_SEACASExodiff="$(usex netcdf)"
 		-DTrilinos_ENABLE_SEACASExodus="$(usex netcdf)"
 		-DTrilinos_ENABLE_TESTS="$(usex test)"
-		-DZoltan2_ENABLE_Experimental=ON
 		-DTPL_ENABLE_BinUtils=ON
 		-DTPL_ENABLE_BLAS=ON
 		-DTPL_ENABLE_LAPACK=ON
diff --git a/sci-libs/ufconfig/ufconfig-3.7.1.ebuild b/sci-libs/ufconfig/ufconfig-3.7.1.ebuild
index d5f90510a176..7d5d606c6dbc 100644
--- a/sci-libs/ufconfig/ufconfig-3.7.1.ebuild
+++ b/sci-libs/ufconfig/ufconfig-3.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
 IUSE="static-libs"
 
 src_compile() {
diff --git a/sci-libs/umfpack/umfpack-5.7.9.ebuild b/sci-libs/umfpack/umfpack-5.7.9.ebuild
index e52ff8212c92..cce4f4abf247 100644
--- a/sci-libs/umfpack/umfpack-5.7.9.ebuild
+++ b/sci-libs/umfpack/umfpack-5.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+cholmod doc"
 
 BDEPEND="virtual/pkgconfig
diff --git a/sci-libs/volk/Manifest b/sci-libs/volk/Manifest
index 76da000db8d5..1311005993ad 100644
--- a/sci-libs/volk/Manifest
+++ b/sci-libs/volk/Manifest
@@ -1 +1 @@
-DIST volk-2.3.0.tar.gz 344763 BLAKE2B 0f0e0cb7e6cd28086802c1618685ec30dedf5cdf67bef7ed09f3a7482f84d6e7972f4b22c096676bdef34c66c60d936ca8ab300cd4da07f6714cface1c2846ed SHA512 9e3b405b7be46b4f5ff61a4d42fa9013fc55169bc18c9cf9253e446fe23fd12dc0356adb9aa176e33dfa4cc478e4b9226bee906a2d89ef83bac3b28f52816382
+DIST volk-2.4.1.tar.xz 315072 BLAKE2B 1ce1d220f9e1e9251332fb6caf7d72eaf3db85009a49434edbf6490b02ab016c4b1eb8677f0e5f446f5783615f2256710621b1806684dffeb1ff441756e4a635 SHA512 7c16a5d750cdea2927c3b08dcad29e19f10932a3b7b35cb25ecc66554d7e441c95906a4746fcf62f895709aee1191f1bb91189c3509b444b6b4ba37a306f9909
diff --git a/sci-libs/volk/volk-2.3.0-r2.ebuild b/sci-libs/volk/volk-2.4.1.ebuild
index 1c1902614b12..be60ab06145a 100644
--- a/sci-libs/volk/volk-2.3.0-r2.ebuild
+++ b/sci-libs/volk/volk-2.4.1.ebuild
@@ -11,10 +11,10 @@ inherit cmake python-single-r1
 
 DESCRIPTION="vector optimized library of kernels"
 HOMEPAGE="https://libvolk.org"
-SRC_URI="https://github.com/gnuradio/volk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/gnuradio/volk/releases/download/v${PV}/${P}.tar.xz -> ${P}.tar.xz"
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="orc test"
 
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 63e70fa584a8..8722a7ac5072 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -5,5 +5,6 @@ DIST votca-tools-1.5.tar.gz 129464 BLAKE2B 2ab72758cc7c9bed5a49c924f7f0a93dc562a
 DIST votca-tools-1.6.1.tar.gz 110141 BLAKE2B 948908a3aedb360d63aaf4077de366fb8dad7b5c97cd4532458a67e90e6e0271ba4ef30a23be264f426a1f860708592360982f283346d0a4788111719d3a8ee9 SHA512 e7dc03df46670f83139c0283824a630d8bec6cda5da156bc09e35e3c373f1cc65359ddb912e6bf19431a588acc5569ad57000045083d155fcc15c93980cfd26e
 DIST votca-tools-1.6.2.tar.gz 109808 BLAKE2B 1eebb2950004ec5b0a0494904b35f5dc539a5a93e36d40ffdfba911632e48ef9431bfd8d6305c0b5f516c70cff8156976efa6d216ae061a77e018047e543beee SHA512 03139591e934ae97b6c0ddcd0fa9480b4b9d28c05882489b9067b9519727a97a1589a645c3d9ad959d65fa622e3845e8d1d5141f210e2704907d7d6f0bff2abc
 DIST votca-tools-1.6.3.tar.gz 109937 BLAKE2B 4cc6a0f061c3455ff326eada36c5b66e31aedbc6aac297db42a128940c17d81dbd41e47c7c9af012ab5b24a7fe9f12575bf3563fd566d62492d1c79f1887db02 SHA512 2bc780f7b852e0d63ef1a6ff697c75aa67666121b8192a965442b62167fe33f69b0d4c18fb6b255326d02ba3cffd02c6af8f5d67364fafd9de597897ab30e349
+DIST votca-tools-1.6.4.tar.gz 109929 BLAKE2B 8bc55fcd0a021002f11d412440a369a169c3c62ae5978781010de0a05502e43ed1ccbe5066e3d46ac8ef6fd0c1471baca70d35f6468ccbfd480dc0fa6f2b5047 SHA512 7a334071086e755960a3bd938c1baa1979c4cc9cd8f865af00540fa45365bf1c3153ffb8a5a5948618c47ebafcda9ecc62850d44ea06b7f35ac4587bd423439a
 DIST votca-tools-1.6.tar.gz 109824 BLAKE2B e030899e210e0f3030d43796a468ea20a573fe7ee62fbfde53e2e6865a9c0657d92ed06ddc44ebfa1c37c6142c865e97380e00570070351d75c403ead6fcfd19 SHA512 0159bc10066e05da8ba0f70e3c70d8cb4cd7b07ebd58edff1ccfeb86504af855eb5cae7184200e5c8ee3a3f6b6b85ec46a045f00dc8e681073ae8fdbbfc3965a
 DIST votca-tools-1.6_rc1.tar.gz 128577 BLAKE2B d9270739c00f945ff4af24e45a529e73ff0da596956791991f03b5586134d16b5fec077b3859dcd685de96a334f419f5f82ede7df60614482c9fddc61a01ca8d SHA512 42b0eae148bb93293ac16e193d2595aaa850dcee0dcaab1f6cf0ca8e36a95a1719a03243d421fbfb1034c81baf2ef294768a86530f0d69b59862df95846241ed
diff --git a/sci-libs/votca-tools/votca-tools-1.4.1.ebuild b/sci-libs/votca-tools/votca-tools-1.4.1.ebuild
index d9cb94b3c737..cc17560b818c 100644
--- a/sci-libs/votca-tools/votca-tools-1.4.1.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit cmake-utils eutils multilib
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-1.4.ebuild b/sci-libs/votca-tools/votca-tools-1.4.ebuild
index fd137907ed97..3de1b65b21d2 100644
--- a/sci-libs/votca-tools/votca-tools-1.4.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit cmake-utils eutils multilib
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-macos"
+	KEYWORDS="amd64 x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-1.5.1.ebuild b/sci-libs/votca-tools/votca-tools-1.5.1.ebuild
index e05a081732f1..741f5b86e097 100644
--- a/sci-libs/votca-tools/votca-tools-1.5.1.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit cmake-utils eutils multilib
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-1.5.ebuild b/sci-libs/votca-tools/votca-tools-1.5.ebuild
index 83eeb1e5452a..ba3d6028f559 100644
--- a/sci-libs/votca-tools/votca-tools-1.5.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit cmake-utils eutils multilib
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-macos"
+	KEYWORDS="amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-1.6.1.ebuild b/sci-libs/votca-tools/votca-tools-1.6.1.ebuild
index 2ecbbae0b609..3d1ec55f4652 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.1.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit cmake-utils eutils multilib
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-1.6.2.ebuild b/sci-libs/votca-tools/votca-tools-1.6.2.ebuild
index d9d3d01cd6d3..fb6d4f4febc5 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.2.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit cmake eutils multilib
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-1.6.3.ebuild b/sci-libs/votca-tools/votca-tools-1.6.3.ebuild
index d9d3d01cd6d3..fb6d4f4febc5 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.3.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit cmake eutils multilib
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-1.6.4.ebuild b/sci-libs/votca-tools/votca-tools-1.6.4.ebuild
new file mode 100644
index 000000000000..fb6d4f4febc5
--- /dev/null
+++ b/sci-libs/votca-tools/votca-tools-1.6.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake eutils multilib
+
+if [ "${PV}" != "9999" ]; then
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+	S="${WORKDIR}/${P#votca-}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Votca tools library"
+HOMEPAGE="https://www.votca.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-cpp/eigen-3.3
+	sci-libs/fftw:3.0"
+
+DEPEND="${RDEPEND}
+	>=app-text/txt2tags-2.5
+	virtual/pkgconfig"
+
+DOCS=( NOTICE )
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_RC_FILES=OFF
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/votca-tools/votca-tools-1.6.ebuild b/sci-libs/votca-tools/votca-tools-1.6.ebuild
index 9800b633291b..7e038034e03e 100644
--- a/sci-libs/votca-tools/votca-tools-1.6.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit cmake-utils eutils multilib
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-macos"
+	KEYWORDS="amd64 x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild b/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild
index bdf432881340..91bf3627c8a8 100644
--- a/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit cmake-utils eutils multilib
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index d9d3d01cd6d3..fb6d4f4febc5 100644
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit cmake eutils multilib
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 	S="${WORKDIR}/${P#votca-}"
 else
 	inherit git-r3
diff --git a/sci-libs/vtk/vtk-8.2.0-r1.ebuild b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
index f77873d09305..80798fc42c82 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 e271caaafe47..ac45968b3a42 100644
--- a/sci-libs/xdrfile/Manifest
+++ b/sci-libs/xdrfile/Manifest
@@ -1,2 +1 @@
-DIST xdrfile-1.1.1.tar.gz 378942 BLAKE2B 21b1524a7c31e957b28b93dab4b83b88c183528e534864b06ff76e3f31422129c22ac4bc24a054749dd1b5b80d93a82d873cae82571f0b89c16d55ef0de267c7 SHA512 bff06b08e547b956825f9b16a55fe93d07ff0c529426b892fd4b39be538774aa06facffc68994215e22e36edfa5642674653022da0762ca7cd1b7bc654112868
 DIST xdrfile-1.1.4.tar.gz 815342 BLAKE2B 9f2703cdd67dd6cb3156ab96e496dd4fa37d3a60d660da0a6129562ed295bb52ed5d5acb54aab1bd8b682e31f6155e96541dd47fee7226ae058d62f6efe3937a SHA512 70352efcce989172893e34855edd17990c80f3b5f956b2d8b03a5e75593280e981a56b00616adb950a7da5713729029aecb5dd2cd4c52a658a77eca43aa290df
diff --git a/sci-libs/xdrfile/xdrfile-1.1.1.ebuild b/sci-libs/xdrfile/xdrfile-1.1.1.ebuild
deleted file mode 100644
index 3c0007812e99..000000000000
--- a/sci-libs/xdrfile/xdrfile-1.1.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED="fortran"
-
-inherit autotools-multilib fortran-2
-
-DESCRIPTION="Library to read gromacs trajectory and topology files"
-HOMEPAGE="https://www.gromacs.org/Developer_Zone/Programming_Guide/XTC_Library"
-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"
-IUSE="fortran static-libs"
-
-src_configure() {
-	local myeconfargs=( $(use_enable fortran) )
-
-	autotools-multilib_src_configure
-}
diff --git a/sci-libs/xdrfile/xdrfile-1.1.4.ebuild b/sci-libs/xdrfile/xdrfile-1.1.4.ebuild
index b3e63756ff76..bf345cc87c00 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-2021 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() {