gentoo resync : 05.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
commit: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree: c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /sci-libs
parent: e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)
110 files changed, 2040 insertions, 1207 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 863cb9089f2e..25d02eb8f1e8 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/adolc/Manifest b/sci-libs/adolc/Manifest
index 4bbe30d33a58..e51341ad989f 100644
--- a/sci-libs/adolc/Manifest
+++ b/sci-libs/adolc/Manifest
@@ -1,5 +1,5 @@
 DIST adolc-2.7.2-patches.tar.bz2 6227 BLAKE2B 6ed9ca3c3128233308b6f4a57d839ac668a031a4d48e612b79929541b496dff67e463197c3c5233bda459fba17422827df6c81fba986ea7fe2affbee2cb8cbf0 SHA512 b468753efbde773c5c7d7f0211abee049193d9b64405ae57a4a902a93a4c06e4f205f531aeee9f30d7dddef19243e1a76b77a8e8727d8e36ee3867f5990e2fbb
 DIST adolc-2.7.2.tar.gz 2447479 BLAKE2B 0f871ce1dcb50bb14684e45e265cf45807f514dd3ca0dbaaedede2c7117d34cc5a34b0096a34c8ec37023e50aec7fd4be6561819d6297771e7f7fcaa7ba0e507 SHA512 b896650077367fd7388a6c5a40e5d8bb3f19af9e3bc5b067fd1d9a769809b77ccdfb5ef11ef481ab791c0f040401aaed0053cba55d4c2a3383c0d056122280f6
-EBUILD adolc-2.7.2.ebuild 1796 BLAKE2B a063021049460e99836a9429c24e3084d45b8ddb238c55b517d078e850200858e50b7a626251c5ab0c02926170b00b88ad05faf8a482578ee1f172074d65d2b7 SHA512 6cbc132dddf6d1768314077717bdd8dcbdd54b331b5c7c589e6818f924619351ec8e8047708aafb26019a453530ed41f7dbdd5417f3fdace797f1cb66b166947
+EBUILD adolc-2.7.2.ebuild 1794 BLAKE2B 00e6019dcd9266b5510fe5a94d24be9309eb7ab6b7c0116e06f7a8edc5fa5e8e2210dc261739edde44b8692745bc23eedcbed930cab52bfea6322db317201234 SHA512 66562a8894d61ce4fa29d26f6668435f30cbe11bf36646f5fd744aff61eaeb0097c6af8a36f7b23c2c3a15b2929a454309276dfdad80ca49fde0fb5a667b93c3
 EBUILD adolc-9999.ebuild 1625 BLAKE2B 41ae54bbfb6934c626b15bdfba17604c8f705ad64f078a9e084050fe5e314b0135b640871f6f50ccefabd740077a2458d869a45c084ec5e5855aed1d41b328f8 SHA512 b2c55ed1919d6dae5deca1f5db84e72bfd2c12a8d42583923d50e86bb421e29b805fd889814975134fcb2e5ba0f0ca7377b6ba68300c207702eca9242e9dbb7b
 MISC metadata.xml 737 BLAKE2B 92ed3294a4511473f081d3cf957a0b8538faec13cea3163985387ddc040defff8b908994572aefbd388313454c469388d10a5524c051a548ac001ee402a1a4b8 SHA512 8736523790d05b594a27b4bb679653f3a807de9442754c998a5ce3f0abee0cc4c94e1f31a1a639d9079c7a2574c2440f4e735efa271629bb0f83ac09eacf94b0
diff --git a/sci-libs/adolc/adolc-2.7.2.ebuild b/sci-libs/adolc/adolc-2.7.2.ebuild
index 3a94424b3115..629cca0f4fb5 100644
--- a/sci-libs/adolc/adolc-2.7.2.ebuild
+++ b/sci-libs/adolc/adolc-2.7.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://github.com/coin-or/ADOL-C/archive/releases/${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.7.2-patches.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/ADOL-C-releases-${PV}"
 fi
 
diff --git a/sci-libs/blis/Manifest b/sci-libs/blis/Manifest
index 537b23ebb27b..d857e3975579 100644
--- a/sci-libs/blis/Manifest
+++ b/sci-libs/blis/Manifest
@@ -1,7 +1,10 @@
 AUX blas.lds 204 BLAKE2B 0e24237d75a95258e8e8bb6880fa8e5ecf0b59c15d03ed94af2a75f59c13d3ac6b81e630fe488a07eea5f738664604b3e7720ebc4d1865959c05d26d367d6294 SHA512 bfe176f5a707e3698d78983fc71e9bbb36bb433584b4abdb8add9bde2ae9d159c861f3662a3d8caa6f412a3acfda243f6d8ca650f596d2d444fe77cc5df10672
 AUX blis-0.6.0-blas-provider.patch 581 BLAKE2B bde52a363fa6a7b26da98ae6cf8af06311bd9fe2f5729d1759621238cc33437abb9b0fbf01d80a6f6a80a7871fd687e9fe047efcb8cc05c5a3cdc0cdf7e4a7d9 SHA512 e291becb8f5b99a11b75779f7a549681fb38cf04fe15516225caadf2672dda8ed5db9e24030c5cd3c261f5fc2b6d96d7e078aa9076e3fd46dfce39afc5681515
 AUX blis-0.6.0-rpath.patch 384 BLAKE2B f5a0390384d30d2929fcb5ff22424770dc3b6a4b9e3796b675a0237d9a1971c358463d5a98aee2f4851396b81b85f67d49e8015e94ce433d2b3a6f7f17e54b15 SHA512 626acf971adfdcee9d8578283f64f2e4e5dad14da4a6d38b7198635c775823312b54cd1b11e3f4a79e79716358f1f4260d5b88be74705ae6ec4eb3fd4ce2723a
+AUX blis-0.8.1-pkg-config.patch 332 BLAKE2B da0a76014ea73f251ac57fa609a20c73dc2c942104ac7cee11845084f0d5c107b5e572c4f2ee05eda6416f26f8285bf13d85865d73c9f84a35b940d884a41554 SHA512 00aabb7992bd90f508c054c23c2db3ccbee6e8db2c499b73bfc82e008a5df66eec3980d7a71935573a7905e2598bc9ae154cb4d1ff12d24df93afb8b8930e993
 AUX cblas.lds 205 BLAKE2B ab2c41b571dbb9b55e36fa5afe4344ed9ef33454f6b7a5cda0726aa7f98a61dcef3065976cc02ab593aad94c5d6c0a23efce726da30673bd06cf57b64e826b93 SHA512 23008248e2b2c221a9ce36c2aca3e2acf58a6d434ffde498a058689af5d16d6e87ab56900508bb0403c5f5a1fc9366b202a7fc44a42d04c409197ec1ec164408
 DIST blis-0.6.0.tar.gz 5107257 BLAKE2B cd589ad1216486e8bb0cf574cc096c1e1f2bb9587b182c2bcff44db322468d9f027323c0bf2d22ea0fabb1902dc047d2bf62253ef1c2797fc3de9ba53d7fc34a SHA512 74e9da5146f7986cbd11651d7cd0837562a1603c667b9e6d3f79b5057443de657b60d7463cb2d64daf3eff7d33fc05a64e6d8eb807f4cabe0c3121517924a206
+DIST blis-0.8.1.tar.gz 13442609 BLAKE2B cc4167aaa6461b73876f428de2ab02107803fd6d63df101bf30de4c6ca57241e29f09dfb82fe1cfec8c661b2d9efe65ab854ad7719bf36e27f8a33bf3dd4bb92 SHA512 f920e6ae699af899caca27274b55bb944c886c882dfc06bc2f66d069c08e6d4999c130626cd96297308c1b7e85e77e6552bf981cce37dbbaa5acdf0cb5078e02
 EBUILD blis-0.6.0.ebuild 2655 BLAKE2B 88cfec3304d3cd5c642f738b5cbb6a3417b9b210522e66a27491e383e956f054dc46f897a0d1d3de5762cc7c1f2c2015eae01d737570453170341157f67e0d5c SHA512 ad8782822a00d827aeb1cc0f730abc7373812999f1e24071f73638107906b8b60ff87f54579adea89c6c18d6fa8a3f73d15dd63febda2aa4d5f08fe5a47c9c2f
+EBUILD blis-0.8.1.ebuild 2700 BLAKE2B afe92a05b694a13709d7a4ec4f4c54cc1bb4cf4c4c3cbe5ab2dc128399ad5741d69b7ea26654b029c8479106908ac76b51cb9b555aef317b734c15b17ea3426c SHA512 f47aa66f3f62b46a45896f290ad9cfcafc452e77d967b447c74b3552f399d26f17f289fce74fe16bb348ce927be5faf84925465f59a22068ff09ebf5fc6b8b60
 MISC metadata.xml 1623 BLAKE2B 03c7ba201758ab9743139857eb4a56119f45e4ba1afbb3bcf20ee44e9b4de928343ebde1cd40b957b32337f39356891e9969f426c6a49704169f33c53bb61c3e SHA512 221f8c9d86ba7795f8baaa29c176ff042df1086295da47bf1aa75b822a594f28e2b76033d2a795eb6a417eaf806292db1582980f7ebb920ba354ca1c57f1fc22
diff --git a/sci-libs/blis/blis-0.8.1.ebuild b/sci-libs/blis/blis-0.8.1.ebuild
new file mode 100644
index 000000000000..e94157178cb8
--- /dev/null
+++ b/sci-libs/blis/blis-0.8.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..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="doc eselect-ldso openmp pthread serial static-libs 64bit-index"
+REQUIRED_USE="
+	?? ( openmp pthread serial )
+	?? ( eselect-ldso 64bit-index )"
+
+DEPEND="
+	eselect-ldso? (
+		!app-eselect/eselect-cblas
+		>=app-eselect/eselect-blas-0.2
+	)"
+
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.0-rpath.patch
+	"${FILESDIR}"/${PN}-0.6.0-blas-provider.patch
+	"${FILESDIR}"/${P}-pkg-config.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
+		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.8.1-pkg-config.patch b/sci-libs/blis/files/blis-0.8.1-pkg-config.patch
new file mode 100644
index 000000000000..2e1f189422a3
--- /dev/null
+++ b/sci-libs/blis/files/blis-0.8.1-pkg-config.patch
@@ -0,0 +1,9 @@
+diff -Nur a/blis.pc.in b/blis.pc.in
+--- a/blis.pc.in	2021-11-29 13:23:43.692800836 +0800
++++ b/blis.pc.in	2021-11-29 13:25:52.150795803 +0800
+@@ -7,5 +7,4 @@
+ Description: BLAS-like Library Instantiation Software Framework
+ Version: @PACKAGE_VERSION@
+ Libs: -L${libdir} -lblis
+-Libs.private: @LDFLAGS@
+ Cflags: -I${includedir}/blis
diff --git a/sci-libs/btf/Manifest b/sci-libs/btf/Manifest
index 24ec87684c38..98cd1830e3c6 100644
--- a/sci-libs/btf/Manifest
+++ b/sci-libs/btf/Manifest
@@ -1,3 +1,3 @@
 DIST btf-1.2.6.tar.bz2 285699 BLAKE2B 4addeea7b9abe87281f826a67a8a372118579f498057c888008ac93da1cdbfcf8554af6e843d92a07989ff0b24f537588f933fcc33c97317f47536980e551531 SHA512 39c08ec9bf2a85915aeed040dc02c42c10adf5034c3797910dc7cb6942ac6e2ccea47cea4ab0c37e8ed3eb8eac8d2ce946d281c9ec643cccd282af7be5276960
-EBUILD btf-1.2.6.ebuild 629 BLAKE2B 572423f5bd4c5c9de71e81323f449f0c186be2248568214b5f927bde20d3d64e85dd8451376385912da4acd5a2f1a52e38c29f610263db46ec98845d239b8f3a SHA512 7e4d2c4c76adf78a6818004c7a8a9b153c1b5c59851b8589b55ff37cf226b53d80a005d812b90401f3ffcb45b7978ffd1dd690aebe17ceb3b864bb3327f2681a
+EBUILD btf-1.2.6.ebuild 636 BLAKE2B e7a544dceb8602b79bde57b1f65ac930e8c6ea0a83993b91e18d116127553d376697cba3ac9965d5afd2fdfff3de3393d60efadde3ff60a5431d34753df7d07e SHA512 8dc5968741bbe9aa9a962704e25ffb70add6cf1689c7d03fd92f1ee6539def461e4e80923a3a796c2fa4441571a47cdf2e668a16c8d4e7bcf4c05b395333457d
 MISC metadata.xml 535 BLAKE2B c5ac79d8f5907d406ba3c9f9f40bf3956305fb20296a1712debba36b65353076247b1c6e9f5b8f7992865b562d7475b9fcbc8a20c649572075940e7527e7219b SHA512 a6d8266b06a85f3645bb4e3b3ba20ff2c91a4f0b10916eab355b7e60ebf01d3b38b9fdd906df9801da9846171162d24cf7b5b4b06621edad8dc6b56ab6c22270
diff --git a/sci-libs/btf/btf-1.2.6.ebuild b/sci-libs/btf/btf-1.2.6.ebuild
index 2398cf4d63b9..33a2422291ed 100644
--- a/sci-libs/btf/btf-1.2.6.ebuild
+++ b/sci-libs/btf/btf-1.2.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="sci-libs/suitesparseconfig"
 RDEPEND="${DEPEND}"
diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index bcf168ef5d0d..f48732dade04 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,5 +1,3 @@
-DIST cartopy-0.18.0.tar.gz 14191937 BLAKE2B bb10791ef2534dad404cc492e378161a4a078813b09d6e2c16d0d465c7dcfbaa7f24d3818cfe0f1f46e7683bdf2e00440640534835ce064492d5321489e355bc SHA512 912d5ab57c96b9e6c51b3ad26f94d77e495eb9c3a8fb8a68bdd957c11b1bc8a3ddc97e76e0d8a5ec9afca9302b01fe5753f4208ec3829df8741ee0ebbaafe30f
 DIST cartopy-0.19.0.tar.gz 11738107 BLAKE2B 129a32850947e3439505812655b0feb25f33e3b45a909be56a0093cba41acbf777be7e899b528cc910e044fc8844438283eff4d20a1433ab5ea3c58f240efa0f SHA512 5019c752fed18295048cdbe927e28040b61327414262c67c079572969e8ec3abd76f4cb0e6dd1f8ee4cfb88426cbd926ff9a2e934e8d47b8a3180bf748bd7364
-EBUILD cartopy-0.18.0.ebuild 1708 BLAKE2B ba4dccb35ad843290b8ec0cf9433dbb640a1422011589c50e709004388e0b9787771b307789c5787c0b7b98c2081ed7c97dcc4256a52ab882ec42e01ae44adaf SHA512 ed9fb4e0abbab15feb9e4a21a7e4b2c04a4a76bbd0763b9239c4cb4148de894d9f8d048d514f60275388a4ae6e30bdc3d744fca100cdb5838c86f16482eb1c29
 EBUILD cartopy-0.19.0.ebuild 1833 BLAKE2B 97c1bc9e16e40c882a9236294dc06120aa668edd7c467d258276dd2e4486c4acb5c9ad2082ba6c371db70a3760049ad49be1c3d0dcab4f87bb59deabf651ab0a SHA512 35f5d1dce3a2ec606d6b5322329b3a5b8345a7e5ad2d57fb17d485b00193c847e014e96cb94e119d679414408a45530d823e4dc4b6e1ece77bd0ec13847cd086
 MISC metadata.xml 603 BLAKE2B dc4da38fb25d4785362faa8475edb2d3b44aa99c0ce3f3f21ee3c1812a385a715a0d18ece3d58b63e298f997fdebd4762f8395335042bbac6e6fc2aadefee695 SHA512 3fb87e6057c17a7430519fc5e434847cfe13bdf06fa4aab6ed3b6aefe574a078c8750915c65a9d1ed12cecc8c25353e1218aae69dbe0a9e661b9d7499994dea3
diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild b/sci-libs/cartopy/cartopy-0.18.0.ebuild
deleted file mode 100644
index ffeef0d90707..000000000000
--- a/sci-libs/cartopy/cartopy-0.18.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 virtualx
-
-MY_PV=${PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Python package for geospatial data processing and analysis"
-HOMEPAGE="https://scitools.org.uk/cartopy"
-SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/pyshp[${PYTHON_USEDEP}]
-	sci-libs/shapely[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/pillow[jpeg,${PYTHON_USEDEP}]
-	sci-libs/gdal[python,${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	sci-libs/geos
-	sci-libs/proj
-"
-
-distutils_enable_tests pytest
-
-DEPEND+="test? (
-		dev-python/filelock[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-	# drop test file requiring network access, which got not covered by markers
-	rm "${S}"/lib/cartopy/tests/mpl/test_crs.py || die
-	# prepare matplotlib backend for test suite
-	export MPLCONFIGDIR="${T}"
-	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cd "${BUILD_DIR}"
-	# drop all tests needing network access
-	virtx pytest -vv -m "not network and not natural_earth" || die "test failed"
-}
diff --git a/sci-libs/cddlib/Manifest b/sci-libs/cddlib/Manifest
index d2c573e22ed0..cbcc9ecc79b9 100644
--- a/sci-libs/cddlib/Manifest
+++ b/sci-libs/cddlib/Manifest
@@ -1,3 +1,3 @@
 DIST cddlib-0.94m.tar.gz 1351298 BLAKE2B 0e1931ba94771f0dcae0ee10b003940ca331839eb8ce001ab02c4f1b382dde74d7dfcf74f4c62e1ae7214a3139547c09f56ef0cba5df74fc03a63ab741b64690 SHA512 50997bda38c36990456345881dc1eac65b1880aa510ea3812ae46a122ba7696bf3577f2b6976ff16811ee00f0a920c8ed6f1e7de0a4060bfaa96def11bab816e
-EBUILD cddlib-094m-r1.ebuild 1406 BLAKE2B 9fd279d6051a414e49c84f40f70e10f00f0de47788d4ce3b0f5e381c56847affbb79a336a79d96d0d11d92ff26043d4f13b70f9fff9e685da3af8f43ad5a791f SHA512 83195fe0ff4f39e76885119d6c0aad8d61799b3db2317f7c6ec89f935ef45fd669db252ae7260c92efb24787795ef445c9450dc5a71e460a7586bd61f803409b
+EBUILD cddlib-094m-r1.ebuild 1414 BLAKE2B 45051b76609e6befc0eb22b7f99dfd6be34deed84f2b98a0710c377e380f624b6c0b1105feb29c900decff8cfe724444832ce62a8fd64076e50c530a1ffb994c SHA512 a24bc9dbebc2befd6fc51ef2cbe6643fc0d6191bfa3df5fd02c979c47c943ab31248275cdbdb6794bedc3c1a5d6173e16bea1ce169c8ac83098229022bf10970
 MISC metadata.xml 1848 BLAKE2B 98d72e3809807ac701b575e31068012b568893cc4db0cb8b12c0a0ec6c83862e3e132981192026a279c1bf516fda829e20fb9e314ddd3fa0bcd5613f2e074f33 SHA512 d4b7eccde619f6be50621dba566a186b46c62537dfb26c3d34157ddad7179040ea9ddfaa7b63e363053c935d101581bdeb3a4350db955665d4d163b322e43367
diff --git a/sci-libs/cddlib/cddlib-094m-r1.ebuild b/sci-libs/cddlib/cddlib-094m-r1.ebuild
index 3fd1ce1f01e5..bcfb95f450cd 100644
--- a/sci-libs/cddlib/cddlib-094m-r1.ebuild
+++ b/sci-libs/cddlib/cddlib-094m-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${MY_P}.tar.g
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs tools"
 
 DEPEND="dev-libs/gmp:0"
diff --git a/sci-libs/cifparse-obj/Manifest b/sci-libs/cifparse-obj/Manifest
index aacd697c9e29..d03d01d2ee36 100644
--- a/sci-libs/cifparse-obj/Manifest
+++ b/sci-libs/cifparse-obj/Manifest
@@ -1,5 +1,5 @@
 AUX cifparse-obj-7.025-gcc5_6.patch 524 BLAKE2B 5cf4ce9f5c0615636b5701cd64613e01f0ac130ba4166fd12a8b92d7ffffc368fd5666ebdd8ac9cd983359a97ed4294e6f66e0984b3c826c56ecfa8b130cadef SHA512 f2469b15eb74192b61b78c165249e8b953c58d0f7478d38f1bebf8c2c884e95ad42ba18af23b1ea7e4915979b5d4f70c2637e083a14a2c40e20f83a09acf616e
 AUX cifparse-obj-7.105-makefile.patch 3790 BLAKE2B 11372dceab4e570e420bf639020769a1b1fb6f956a4ff75befcbb0016053d616cf271946ae0e6bb5667dffef863baa246f75fc34d36e80ddeb7e7c17a5befae7 SHA512 310f13e88f7dfb19ac2bdc003a2ab2f095583a90694d27232c1ab15a298bc88313e89590e062274da10d5eaba53f6bfcb3341d1d4f7d1c388520c75643364d61
 DIST cifparse-obj-v7.105-prod-src.tar.gz 931151 BLAKE2B c362fc528e0c88b41ef8433c6d0235ae0bd4055c8c1704d2f1be8ba8aa27a7526b3d19172f2a4ffda79c323140a54dcb2b0a2eb78f30780473c9bcfb2ab6c6f9 SHA512 d626aa055bdd6762eda4b5b04121f37fff3bc09460b12cd6cb80566545d23e5c08a8ad54fa184076932d2cff38aa9d91fa659fbe9a70d4a07b8b1677c28549f4
-EBUILD cifparse-obj-7.105.ebuild 1116 BLAKE2B 3c14c2f21ded575d460468600d335b0f0eb4e054c87c0e4a0908de9e9eea91565a81dc8c10922131f33efc9276ab5d3896d5c4f6e69e2e669b288529d784ba00 SHA512 0962d210a3aa3b61aebd725a1d739bd45ebb4ba1832add1c7d2999694b136da86abc39514e21f457ae02aa65eb749ab15022d5acb04580f1a44bfa81a6aa7cf4
+EBUILD cifparse-obj-7.105.ebuild 1117 BLAKE2B 7149dca4b0123b02b612c3edd3368ec07166d6f32393baba309e1bd8b8213dff1804f74ba6d958db50349d8a2f04b0a4482097306088ed9ecae28cd6c80885a0 SHA512 57c2d7ea69aae1bcda908d08f1a2b390ca7185685390d39105f0b5ffcadffcb064b51a46d19cfbdc218243954896434c7d50249e92ef4d57c898487b7f5e0306
 MISC metadata.xml 272 BLAKE2B 531e98b72776bbe9126811b70943add0f6f43141b01cb75b17ac2c8d1cfb6a9b349022fd411894d2b8eeb0612a73db10aed4ba71f9624bd6dbd172a05fca2c76 SHA512 04f5575703aaaa95e575460ae3de428d3da173b3b741ab52b4aad31e381fef78b325f49f99622ec26a65024437759ea013fc525bd63ee553003c71afcc40d10c
diff --git a/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild b/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
index 3f986636840b..98ce8d0e6f95 100644
--- a/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
+++ b/sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://sw-tools.pdb.org/apps/CIFPARSE-OBJ/source/${MY_P}.tar.gz"
 
 LICENSE="PDB"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/sci-libs/coinor-csdp/Manifest b/sci-libs/coinor-csdp/Manifest
index fc3bdcbe79f4..0779c7b4a691 100644
--- a/sci-libs/coinor-csdp/Manifest
+++ b/sci-libs/coinor-csdp/Manifest
@@ -1,3 +1,4 @@
-DIST Csdp-6.1.1.tgz 441574 BLAKE2B 0f8dbea26e64c5854a877e89b51d6b0c7a19af31c967f665bb27b20df872c32905882703537b67c6df3dd5f3335afdb30f9145a620f4176acb73b90204e626a2 SHA512 ba5dc0faea223bad6293f131ee63daee0a395a6e84c76fe108dbbefb3ab0696b2a59f435766c78a2d22244801a9abda2719798cbfe30dd9e1c32317e0283fd2e
-EBUILD coinor-csdp-6.1.1-r1.ebuild 2924 BLAKE2B 0124cc078130b000c3d70d6155e035370edddb09a2261fad96b9c566a0d947ce0364ff946615cb4aa3d384094bc95c07de024c8bb9dceb8ea3437247dabdcc16 SHA512 40f824fc2ec8fcc3d2c0bbfbd8425a7153d19b7fc70979c8ea75c60c1bedae14dfbc92604bc28bf5a3340308b2c6747e2fadac6860928a98459ccb902bf8035b
+AUX coinor-csdp-6.2.0_toolchain-vars.patch 2795 BLAKE2B 4a3278cab9ddd6991a78dfea8a82df6cd572f761517208d0dd861b2681f0ec31e341305882bdb1215253920508fd09d9373b59c700a1137d019ff71ab265a935 SHA512 c8c58cfc511076067795be183795c3519fc93572d44756671ba6ef58a65662782d413559e6f8b38a9c6e166d23ef5bc884d4209f849fe766e1d803ccaacc5f65
+DIST coinor-csdp-6.2.0.tar.gz 526179 BLAKE2B af2ac8cb4268aef006cf68fb85d344a0f9eb9f47b78c38e176c24f87ac1c88059cf47eb40cf638d131e093b6d469b6a458a1eb59fa8eb33c53b49d1a4c50aae2 SHA512 6362e174f2935645dac359c48879c42cfd387c403fc264974922322de2f02f5ffac5a35f991eb793cf8ba5516a144f5e107d1cddd0ec0da79e7ebb9c1375269f
+EBUILD coinor-csdp-6.2.0.ebuild 2717 BLAKE2B d90a47d9a029d7ac8560c4f7820ed0822f44280723f7be020167718ed0653e8a308023574ed46099bb5593de8d013f29afdd6a41fdea15a9f1f6659e238afc5e SHA512 71ee5aae32bb60a3a4557ebc2e028ab38b9b80b146a23513f94a83621001dbd53a6b4f89ed05ca0f9d5e09330b2b51d05d88ddfc9473fe9be849468935f27eec
 MISC metadata.xml 884 BLAKE2B ebe74eef2755e5db041a0da7b9f422f25b0862522d96503c8e3ca73851ab87af72d433723a463ca100253bde856a02fda9f82d116f54569272894c7b59602a14 SHA512 07b7fd9ba383cae23255d7e6dd3955f498c62b0ba200ceed34552950925ae590c985413fbdf3a5ae1d7b2964f6799a881e0fb6d56136533aa76b8c8da347a165
diff --git a/sci-libs/coinor-csdp/coinor-csdp-6.1.1-r1.ebuild b/sci-libs/coinor-csdp/coinor-csdp-6.2.0.ebuild
index bc7b2d55620f..a00b0d8e16f1 100644
--- a/sci-libs/coinor-csdp/coinor-csdp-6.1.1-r1.ebuild
+++ b/sci-libs/coinor-csdp/coinor-csdp-6.2.0.ebuild
@@ -1,33 +1,43 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit versionator toolchain-funcs flag-o-matic  multilib
+inherit flag-o-matic multilib toolchain-funcs
 
-MYPN=Csdp
+MY_PN="Csdp"
+MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="COIN-OR C Library for Semi-Definite Programming"
 HOMEPAGE="https://projects.coin-or.org/Csdp/"
-SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
+SRC_URI="https://www.coin-or.org/download/source/${MY_PN}/${MY_P}.tgz -> ${P}.tar.gz"
 
-LICENSE="CPL-1.0"
+LICENSE="EPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples openmp static-libs"
+IUSE="doc examples openmp"
 
-RDEPEND="
-	virtual/blas
+RDEPEND="virtual/blas
 	virtual/lapack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${MYPN}-${PV}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.0_toolchain-vars.patch
+)
+
+S="${WORKDIR}"/${MY_P}
+
+_get_version_component_count() {
+	local cnt=( $(ver_rs 1- ' ') )
+	echo ${#cnt[@]} || die
+}
 
 static_to_shared() {
-	local libstatic=${1}; shift
+	local libstatic=${1}
+	shift
 	local libname=$(basename ${libstatic%.a})
-	local soname=${libname}$(get_libname $(get_version_component_range 1-2))
+	local soname=${libname}$(get_libname $(ver_cut 1-2))
 	local libdir=$(dirname ${libstatic})
 
 	einfo "Making ${soname} from ${libstatic}"
@@ -41,43 +51,48 @@ static_to_shared() {
 			-shared -Wl,-soname=${soname} \
 			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
 			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-		[[ $(get_version_component_count) -gt 1 ]] && \
-			ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version))
-		ln -s ${soname} ${libdir}/${libname}$(get_libname)
+
+		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
 }
 
 pkg_setup() {
-	if use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp; then
-		eerror "Your selected gcc compiler does not support OpenMP"
-		die "OpenMP non capable gcc"
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		 use openmp && tc-check-openmp
 	fi
 }
 
 src_prepare() {
-	find . -name Makefile -exec sed -i -e 's:make:$(MAKE):g' '{}' + || die
+	default
+
 	append-cflags -DNOSHORTS -DUSEGETTIME -I../include
+
 	if use openmp; then
-		[[ $(tc-getCC) == *gcc* ]] && append-cflags -fopenmp \
-			&& append-ldflags -fopenmp
-		[[ $(tc-getCC) == *icc* ]] && append-cflags -openmp
-			append-cflags -DUSEOPENMP
+		append-cflags -DUSEOPENMP
+
+		if [[ $(tc-getCC) == *icc* ]]; then
+			append-cflags -openmp
+		else
+			append-cflags -fopenmp
+			append-ldflags -fopenmp
+		fi
 	fi
+
 	use amd64 && append-cflags -DBIT64
+
 	[[ $($(tc-getPKG_CONFIG) --libs blas) =~ atlas ]] && append-cflags -DUSEATLAS
-	sed -i \
-		-e "s:-O3:${CFLAGS} ${LDFLAGS}:" \
-		-e "s:ar :$(tc-getAR) :" \
-		*/Makefile || die
 
 	tc-export CC
 }
 
 src_compile() {
 	emake CFLAGS="${CFLAGS} -fPIC" -C lib
-	local libs="$($(tc-getPKG_CONFIG) --libs blas lapack)"
+	local libs="$($(tc-getPKG_CONFIG) --libs blas lapack)" || die
 	static_to_shared lib/libsdp.a ${libs}
-	use static-libs && emake -C lib clean && emake -C lib
 	emake -C solver LIBS="${libs} -L../lib -lsdp -lm"
 	emake -C theta LIBS="${libs} -L../lib -lsdp -lm"
 }
@@ -89,13 +104,12 @@ src_test() {
 src_install() {
 	dobin solver/csdp theta/{theta,graphtoprob,complement,rand_graph}
 	dolib.so lib/libsdp$(get_libname)*
-	use static-libs && dolib.a lib/libsdp.a
 	insinto /usr/include/${PN}
 	doins include/*
 	dodoc AUTHORS README
 	use doc && dodoc doc/csdpuser.pdf
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins example/*
+		docinto examples
+		dodoc example/*
 	fi
 }
diff --git a/sci-libs/coinor-csdp/files/coinor-csdp-6.2.0_toolchain-vars.patch b/sci-libs/coinor-csdp/files/coinor-csdp-6.2.0_toolchain-vars.patch
new file mode 100644
index 000000000000..d00528f66fe1
--- /dev/null
+++ b/sci-libs/coinor-csdp/files/coinor-csdp-6.2.0_toolchain-vars.patch
@@ -0,0 +1,63 @@
+--- a/example/Makefile
++++ b/example/Makefile
+@@ -6,7 +6,7 @@
+ # This builds the example code.
+ #
+ example: example.o 
+-	$(CC) $(CFLAGS) example.o $(LIBS) -o example
++	$(CC) $(CFLAGS) $(LDFLAGS) example.o $(LIBS) -o example
+ #
+ # To clean up the directory.
+ #
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -2,7 +2,7 @@
+ #  Build the library.
+ #
+ libsdp.a: readprob.o sdp.o op_o.o psd_feas.o op_a.o op_at.o  Fnorm.o calc_pobj.o calc_dobj.o trace_prod.o zero_mat.o mat_mult.o sym_mat.o copy_mat.o addscaledmat.o  user_exit.o make_i.o allocmat.o initsoln.o initparams.o add_mat.o writesol.o readsol.o easysdp.o writeprob.o solvesys.o makefill.o mat_multsp.o norms.o linesearch.o matvec.o chol.o  qreig.o tweakgap.o freeprob.o packed.o  sortentries.o
+-	ar cr libsdp.a  readprob.o sdp.o op_o.o psd_feas.o op_a.o op_at.o  Fnorm.o calc_pobj.o calc_dobj.o trace_prod.o zero_mat.o mat_mult.o sym_mat.o copy_mat.o addscaledmat.o  user_exit.o make_i.o allocmat.o initsoln.o initparams.o add_mat.o writesol.o readsol.o easysdp.o writeprob.o solvesys.o makefill.o mat_multsp.o norms.o linesearch.o matvec.o chol.o qreig.o tweakgap.o freeprob.o packed.o sortentries.o
++	$(AR) cr libsdp.a  readprob.o sdp.o op_o.o psd_feas.o op_a.o op_at.o  Fnorm.o calc_pobj.o calc_dobj.o trace_prod.o zero_mat.o mat_mult.o sym_mat.o copy_mat.o addscaledmat.o  user_exit.o make_i.o allocmat.o initsoln.o initparams.o add_mat.o writesol.o readsol.o easysdp.o writeprob.o solvesys.o makefill.o mat_multsp.o norms.o linesearch.o matvec.o chol.o qreig.o tweakgap.o freeprob.o packed.o sortentries.o
+ #
+ # On some systems, you might need to add after "ar cr libsdp.a ..."
+ #        ranlib libsdp.a
+--- a/solver/Makefile
++++ b/solver/Makefile
+@@ -2,7 +2,7 @@
+ #  This builds the stand alone solver.
+ #
+ csdp: csdp.o 
+-	$(CC) $(CFLAGS) csdp.o $(LIBS) -o csdp
++	$(CC) $(CFLAGS) $(LDFLAGS) csdp.o $(LIBS) -o csdp
+ #
+ # To clean out the directory:
+ #
+--- a/theta/Makefile
++++ b/theta/Makefile
+@@ -6,23 +6,23 @@
+ # This builds the theta number code. 
+ #
+ theta: theta.o 
+-	$(CC) $(CFLAGS) theta.o $(LIBS) -o theta
++	$(CC) $(CFLAGS) $(LDFLAGS) theta.o $(LIBS) -o theta
+ #
+ # Complement computes the complement of a graph.
+ #
+ complement: complement.o 
+-	$(CC) $(CFLAGS) complement.o $(LIBS) -o complement
++	$(CC) $(CFLAGS) $(LDFLAGS) complement.o $(LIBS) -o complement
+ #
+ # rand_graph generates a random graph.  
+ #
+ rand_graph: rand_graph.o
+-	$(CC) $(CFLAGS) rand_graph.o $(LIBS) -o rand_graph
++	$(CC) $(CFLAGS) $(LDFLAGS) rand_graph.o $(LIBS) -o rand_graph
+ #
+ # graphtoprob converts a file in the graph format to an SDP problem in our
+ # SDP format.
+ #
+ graphtoprob: graphtoprob.o 
+-	$(CC) $(CFLAGS) graphtoprob.o $(LIBS) -o graphtoprob
++	$(CC) $(CFLAGS) $(LDFLAGS) graphtoprob.o $(LIBS) -o graphtoprob
+ #
+ # To clean up the directory.
+ #
diff --git a/sci-libs/colpack/Manifest b/sci-libs/colpack/Manifest
index 5bc680085d01..ea9d8b53c837 100644
--- a/sci-libs/colpack/Manifest
+++ b/sci-libs/colpack/Manifest
@@ -1,3 +1,3 @@
 DIST colpack-1.0.10.tar.gz 658087 BLAKE2B af6409969f0dfee465ad88515d0d4f82525047a8268ac9fd4b0784de1f4fd30ce7ba968502a5d92ad3a86f554fb8f1a786defb09396c8e678f62aeaa3cc25397 SHA512 566b7906c5d0dbcd6dcb9c359510ee8b13bf3249e56d8f88f7806493d1df14f54638a0558d601ab4dbc28f36093795eede57a059a7c4e66438b47bf5a0119808
-EBUILD colpack-1.0.10.ebuild 964 BLAKE2B 7eb95ce55b514534abef11dd91cbfc16fda336107dd398d9c802a75c67c5ea90e2356a78a498f21d162c04d0a9eab2ea9536b49a954111e062404d8fdcb06e24 SHA512 9a03e742d5b765f68d3d0b05867d15a24ba4d8949419cb0e0c33437bedb0134348272acbfec8406ef8cf3cc9ca65e9ca9bf09370fd25c1d79366401205fc5d8e
+EBUILD colpack-1.0.10.ebuild 962 BLAKE2B c65068bd9e54245d204fad7ebb58e28ca1eaa1de6c981cd616945bb3ce1553f1f35c75fee472c5220873dbbe655b14c604985944dbce29870c1d054a2487fb7d SHA512 b796d15281bc6f7fce5255a011d7bb4a17ecf17dd748ff08fa3db245958ac89b851d3aafad730ac5f4a04144fd9e79d7670082baf90c10b4f9a3849b97f5fc3f
 MISC metadata.xml 606 BLAKE2B 6d62ec670ced7058bee94be97ad61fd6e12b6e51e76e1e2e35e8e0928958bb9c77f0d99c3d881b0e63bc4e55a677888813ff7f277da39d891aed8cdb37a8be24 SHA512 cddb0eddbbdbc91ee7e2c39911cdebe572fdf2985131fa0e8dc5705f1722747283b0bcef141e57559a9ad0f5f9629a8bdb76644900bab3d025ee5ca3867549b2
diff --git a/sci-libs/colpack/colpack-1.0.10.ebuild b/sci-libs/colpack/colpack-1.0.10.ebuild
index 91abe0eccbeb..144befd4d418 100644
--- a/sci-libs/colpack/colpack-1.0.10.ebuild
+++ b/sci-libs/colpack/colpack-1.0.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/CSCsw/${MYPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="openmp"
 
 S="${WORKDIR}/${MYPN}-${PV}"
diff --git a/sci-libs/fcl/Manifest b/sci-libs/fcl/Manifest
index 6dfa04471fa9..cc738e4b024a 100644
--- a/sci-libs/fcl/Manifest
+++ b/sci-libs/fcl/Manifest
@@ -1,6 +1,4 @@
-DIST fcl-0.5.0.tar.gz 5760425 BLAKE2B 5eac7ace3801740a6317bcc558199b5791e3e5c4fbd63305e5173597b1ecf647388a92bc894629598f963aacd0dd6f894717ae76b3bf7fc9c62a55d9330caf20 SHA512 8741c664720cb32e368e0139881ce69c29e3ccb9633ddc22f47b89918774dbc19541c68e1dbfd78a91f4c8c226ad4c0e1867b6e62111d4311fe907310fc71794
 DIST fcl-0.6.1.tar.gz 6208928 BLAKE2B 174176b3844b18ada60884f641c49475357b1c25cb58cdfc1c4545d595add58713020ffaf148676dae14eca87397495cc971423f06fd19af5cffac1bde584603 SHA512 9d5382c1f2701f2cc6988b3e3969f44c401ea0eb4fdfc5ae69c27dd5bb59a0f17de82ef49e7dce0e1fd91a133db6f10aef9581ca2e32b919046f72921593ebf4
-EBUILD fcl-0.5.0-r1.ebuild 845 BLAKE2B adff9938c496730fe2b944d45031fb77297c794ec0c4e0967a833b27c14815b69230e66632a67ede3bf048c0e9707573ae8d400bcc4cab6691c85a09cafb7110 SHA512 3aaf55a8ba7312d0e9b7f0ddf4bbfd4154c7afaa907819accd604b76afd427330b892d81faa3917699e3fed1bc103fa39bb49e24dfd0ff23db792cac91636a08
 EBUILD fcl-0.6.1-r1.ebuild 1875 BLAKE2B 5cb3246c01b9dcd6f5c4d420003d4a0fd7c48244e86f498f913d70b641ccf14660b26f199fca208d34626695c4cb468e985e44a8c6cf9cf6f7f704480e7962ef SHA512 c3ae75939d1fb3992bc4ca0c7df402cdc4fe81e4281dacd43a8143ffd0d9b8eabf893d0b33de87d80d1f0cdc3ae83ff10378af991c39d614a11b05daa22362ec
 EBUILD fcl-9999.ebuild 1524 BLAKE2B 5ce477559198e86bbbc378c579395713856aeffb8c4577d99f4cd8d8f8e1fa0293d23e67f4f0118cf9e5a4c0f35ace173a28247b7b08db237acf7417949fa729 SHA512 ea0b0dbf08fafabc789fccf0a6ae5ce460d6e7f9d662e791c749c8cdd654aef8c94bf6082d70f00bad5b8c8faaeeec53b678b407e2fac255ebb53dfec7b25eeb
 MISC metadata.xml 770 BLAKE2B c8517aec53bc53d21d9e69f24060c6c261b93102549771958ce2ccd4511d9b572ec4e48f9d877f81957f10492869f75cff1a7578fd8b05bde2def6e7a7415b27 SHA512 318a900e8ed14e304ff87ea524aaf1c28824963e7bed62961ceb26616b53f52d211fc6eb06732f25bc75168059fcebfe3bf106d8327a270afcb7d4db59a98928
diff --git a/sci-libs/fcl/fcl-0.5.0-r1.ebuild b/sci-libs/fcl/fcl-0.5.0-r1.ebuild
deleted file mode 100644
index ed568a3218b8..000000000000
--- a/sci-libs/fcl/fcl-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 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/flexible-collision-library/fcl"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/flexible-collision-library/fcl/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="The Flexible Collision Library"
-HOMEPAGE="http://gamma.cs.unc.edu/FCL/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="cpu_flags_x86_sse"
-
-RDEPEND="
-	sci-libs/octomap:=
-	sci-libs/flann
-	dev-libs/boost:=[threads(+)]
-	sci-libs/libccd"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		"-DFCL_USE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index 5a1c671ee0aa..b5d88af80652 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1,3 +1,4 @@
+AUX gmsh-4.8.4-gcc11.patch 2821 BLAKE2B 21977c525d2359cddcc7dd189a8aa5fa74acb9bd9badd9accac7a7e8334311f4f2c007079c5580118e2f991d802af3ce4d54c93a8e9ada76dc5b41279cdfc848 SHA512 fdeced297f2188461d0d61bafdeb4bf0c2663a7d7cda9cc4aa61f4211173243cb7e6ea68f8db15ed45422a4d0914d628231060f6a3f30251765da768975b0f5b
 DIST gmsh-4.8.4-source.tgz 13838352 BLAKE2B 26c7f68e41d1c339c7d5fd499b2261c2ce79c38648df9f4f3853ba69421d59be36992d8aac1d1ebc1fe872bb828769693c12fd9770878fa3b59c179176105ea4 SHA512 c3880e67af03aa6d00300b5f56fd229ffe37da9af66e8c7c87a3bbf7abcb3a90b4858ec76093ef8f039a70d4da1d5cc7f7c687c05b6642299c95e1a07f9513bf
-EBUILD gmsh-4.8.4.ebuild 1784 BLAKE2B 0cd3d1b0981c3dfd5739e10dc2bbf2e2c40130a09997982105ba331dec9ac1ac669e6e50ec12ecca5233cbe5e4e194af708334ec1e9c549fe2bdec9cec9ddd1a SHA512 aec9980a9dae689db3d6a1adcc44614c718922e624ce473571d00d59836b5a4d36027f7fd1c6a695d4cefe5320d22d6900ceb98c7f86eb1297a9962448616150
+EBUILD gmsh-4.8.4.ebuild 1829 BLAKE2B c2fea1f86e8702ca0ac8dca319edc91e7f275a5e321ab46532fbbd7567335a2ff793036810a3549494ad7f85e22dc51b8262264889ced6df614b32af4f70e812 SHA512 93a4fd7f2022ef2ffe72c8f4d3a2aab46599f56e778f9c292eea53aef25e796359d014394983000450289221b5b0d1d22195dbce0829cd2ba241a28a5dba5a63
 MISC metadata.xml 738 BLAKE2B 8df642f68bf20aaa8742b4e8c2e469b0af3e9c61f17905604a17f2dade702423927c2d146d68781b056335269a20717cee6502447eb9d30a7bc0684990cd1312 SHA512 5634ec209dad65d0b5845007b9f29aaee6137a6a85a142fde6c8e6d357e4d6acf339cf65c5dc3018305f73c40f653dfc50ed7ff9a321ced62407a98b6a3f710f
diff --git a/sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch b/sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch
new file mode 100644
index 000000000000..3f16ef476d7f
--- /dev/null
+++ b/sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch
@@ -0,0 +1,80 @@
+https://gitlab.onelab.info/gmsh/gmsh/-/commit/e7cd675083f72c6c01701cb0f16d1639aca121ba
+https://bugs.gentoo.org/800536
+
+From: Tristan Carel <tristan.carel@epfl.ch>
+Date: Wed, 28 Jul 2021 10:55:40 +0200
+Subject: [PATCH] Fix symbol conflict in picojson with GCC 11 internal macro
+
+Build issue on MacOS with GCC 11 from brew:
+```
+/usr/local/Cellar/gcc/11.1.0_1/lib/gcc/11/gcc/x86_64-apple-darwin20/11.1.0/include/serializeintrin.h:37: note: macro "_serialize" defined here
+   37 | #define _serialize()    __builtin_ia32_serialize ()
+      |
+```
+--- a/Common/picojson.h
++++ b/Common/picojson.h
+@@ -186,8 +186,8 @@ public:
+ private:
+   template <typename T> value(const T *); // intentionally defined to block implicit conversion of pointer to bool
+   template <typename Iter> static void _indent(Iter os, int indent);
+-  template <typename Iter> void _serialize(Iter os, int indent) const;
+-  std::string _serialize(int indent) const;
++  template <typename Iter> void serialize_(Iter os, int indent) const;
++  std::string serialize_(int indent) const;
+   void clear();
+ };
+ 
+@@ -549,11 +549,11 @@ template <typename Iter> void serialize_str(const std::string &s, Iter oi) {
+ }
+ 
+ template <typename Iter> void value::serialize(Iter oi, bool prettify) const {
+-  return _serialize(oi, prettify ? 0 : -1);
++  return serialize_(oi, prettify ? 0 : -1);
+ }
+ 
+ inline std::string value::serialize(bool prettify) const {
+-  return _serialize(prettify ? 0 : -1);
++  return serialize_(prettify ? 0 : -1);
+ }
+ 
+ template <typename Iter> void value::_indent(Iter oi, int indent) {
+@@ -563,7 +563,7 @@ template <typename Iter> void value::_indent(Iter oi, int indent) {
+   }
+ }
+ 
+-template <typename Iter> void value::_serialize(Iter oi, int indent) const {
++template <typename Iter> void value::serialize_(Iter oi, int indent) const {
+   switch (type_) {
+   case string_type:
+     serialize_str(*u_.string_, oi);
+@@ -580,7 +580,7 @@ template <typename Iter> void value::_serialize(Iter oi, int indent) const {
+       if (indent != -1) {
+         _indent(oi, indent);
+       }
+-      i->_serialize(oi, indent);
++      i->serialize_(oi, indent);
+     }
+     if (indent != -1) {
+       --indent;
+@@ -608,7 +608,7 @@ template <typename Iter> void value::_serialize(Iter oi, int indent) const {
+       if (indent != -1) {
+         *oi++ = ' ';
+       }
+-      i->second._serialize(oi, indent);
++      i->second.serialize_(oi, indent);
+     }
+     if (indent != -1) {
+       --indent;
+@@ -628,9 +628,9 @@ template <typename Iter> void value::_serialize(Iter oi, int indent) const {
+   }
+ }
+ 
+-inline std::string value::_serialize(int indent) const {
++inline std::string value::serialize_(int indent) const {
+   std::string s;
+-  _serialize(std::back_inserter(s), indent);
++  serialize_(std::back_inserter(s), indent);
+   return s;
+ }
+ 
+GitLab
diff --git a/sci-libs/gmsh/gmsh-4.8.4.ebuild b/sci-libs/gmsh/gmsh-4.8.4.ebuild
index df5ea5533a0a..0c32a563f7a1 100644
--- a/sci-libs/gmsh/gmsh-4.8.4.ebuild
+++ b/sci-libs/gmsh/gmsh-4.8.4.ebuild
@@ -40,6 +40,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P}-source
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc11.patch
+)
+
 pkg_setup() {
 	fortran-2_pkg_setup
 }
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index eba4f5de3f55..8e6d01213eb1 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1,4 +1,6 @@
 DIST gsl-2.7-cblas.patch.bz2 12073 BLAKE2B 71f2bdafdb1f42ca5c3515f8e39266242185218495705018d88e523be9bc776b39749156500cdc5746a16e481e9cfe2b79660e250eb1a70f3b18819d16fe11c5 SHA512 5b9b2a798079610d7d4981b83672cc978ed44b66aaf6e671794685f10bd4069764bb358870019dc0eec1e251639cde12aaa3598cae0e2fc050ea39c79435fe2f
+DIST gsl-2.7.1.tar.gz 7509209 BLAKE2B dd216c2fdb536e57b6e29613e46e1a05183fd18c47434039caac68fefffc0390cfe2f21eb117347d4bbdf9004de837ef2db02c17c01eaea4b615e3e45a4fd90f SHA512 3300a748b63b583374701d5ae2a9db7349d0de51061a9f98e7c145b2f7de9710b3ad58b3318d0be2a9a287ace4cc5735bb9348cdf48075b98c1f6cc1029df131
 DIST gsl-2.7.tar.gz 7508761 BLAKE2B a9da4df40ea57374880026a0586f2f218dbb0c9154cc661b3e7f5cd414311b95300e60faa2d7f4d3c6cdae5cfdf77cb8052075b56f51564aec2649cc4ad5f7f9 SHA512 a14ac5400acaf4884620430dbeb6f0b28eafe946923b792ab0eccc2a2abc9113d8ce342f4b1e5396f05247649f7d6f953944a8e6bdbf9ee1adb9e67b7c3df2b5
+EBUILD gsl-2.7.1-r1.ebuild 1491 BLAKE2B fdc04dace80cb6559ae818c8745b4d0ef5819c768db3dd22aec091787c8f50dec9f9f92fe1ffc834f0483822d80d8548f9163fe4b90a719cabf4f6eedae129da SHA512 34af5b2a22be49309281f1ded21f5026cb548a286c65222e4136f761a0d15dcd94fe48b9514b51b68a31d05cc2c91f62cf72d2e18a357ee7167ac4b0c92f340f
 EBUILD gsl-2.7.ebuild 1456 BLAKE2B b5fb1ef6587526b39804ce175d0f67a7917a0f48a90ff3585577b51ba7547b026e3518801fb66f43cff5c8228142189e65cfe5e1bf0ef7cdb3c166b9532b5231 SHA512 14e1f9ee0d3d7b3e9942082b143971426352011c27ff4cfdeb9e63294c68598e38b2ff8074f4431909b1d06603b8120288a4504981732c6e8beb2fb0e597dcf3
 MISC metadata.xml 1191 BLAKE2B 856a9a1b3195a76a6c1fffe65dbb94b90a135ce4290c33d772efca43be04f29db7efee5083ee997660c5831aa75773993423645a28e82072b3ceb877135d6810 SHA512 9cb110e5202df7ca123da18ffd0ac60d1d9d5577a29dacff001b24b0c0eae4f96851273d72956dd7b0b94c9fabd392ea13ae6aae54e801d118032d215ede59b2
diff --git a/sci-libs/gsl/gsl-2.7.1-r1.ebuild b/sci-libs/gsl/gsl-2.7.1-r1.ebuild
new file mode 100644
index 000000000000..f12a875ff1a2
--- /dev/null
+++ b/sci-libs/gsl/gsl-2.7.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 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/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.7-cblas.patch.bz2"
+
+LICENSE="GPL-3"
+# Usually 0/${PV} but check
+SLOT="0/27"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="cblas-external +deprecated static-libs"
+
+RDEPEND="cblas-external? ( virtual/cblas:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-2.7-cblas.patch
+)
+
+src_prepare() {
+	# 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
+}
+
+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' -delete || die
+}
diff --git a/sci-libs/hipCUB/Manifest b/sci-libs/hipCUB/Manifest
index 7c68b18a0357..053911d0ddf3 100644
--- a/sci-libs/hipCUB/Manifest
+++ b/sci-libs/hipCUB/Manifest
@@ -1,3 +1,6 @@
+AUX hipCUB-4.3.0-add-memory-header.patch 421 BLAKE2B cd05a027dbf75098fd199783c0abc2c37627e5b55b92f1b4ffb828995fbdb7ebf46f3f1d66a87c37eb35ddd16bd472541537d1ea250474c541bd01b10bd386c5 SHA512 7865f3942b7b157095c477da8790bf9632a630aa3456cde3b1a7b267e62db720a257e1c0e0501b88f8a0b187aa8ec520c4e7693e97af72358a6ff518be1f10a3
 DIST hipCUB-4.0.0.tar.gz 137513 BLAKE2B b7ef4d53037fba04771162ae8993def648f5e1401654286ffc6987bbb4b25baa1b1b14bc37035e1afe46eeffe3e564f244e339cdfd0e5a242574d248bf4683db SHA512 e778b94c86e09bf3b0bc043fb15ed8725387b875e8631a7e8599aee8da2d8085190effc9681d742fc0d286cc0c20762341f1f24699c8a52e9734611c716530d5
+DIST hipCUB-4.3.0.tar.gz 154097 BLAKE2B 68a46f1416c969e4bf8e245c2aa8aee626f1e8089182ffb8f5090d540efe98606a616499d52b14da3733b3a6f4da690ea1718ea58fb6166351f4b4807f1b8228 SHA512 7c0abcf034d885615a9a4f05e6ca906e99b0ffbe36ae3d4b9d9d79b01d21077dc86be659548b45dad8498b84bec24dc0a5be78040c1ab21ca458d22fa7fae43d
 EBUILD hipCUB-4.0.0-r1.ebuild 1099 BLAKE2B 93fb8305ce51fa26eae6be6d26ef05fa5916c7c7f8975d1694209e25d9bb5d69b55ef45175b65a957b79b32f61de6a76b7661f1cca1e2248dce0ce3b7048e6e5 SHA512 59440f40bc7f8600665c30f6098afd18d9219ad9e18db2a43edf654ad4a3d86241f0e12680721d16d056573d690ceae96f0bcb08b6d251d7963c829c9807fa3b
-MISC metadata.xml 560 BLAKE2B e877a0fed373ba33491bbe6567da11aa41d2efb2e60587c85e1c2256c6cd910a1b3f160496ee54cc62e5326f125a1a5dfdf0c2e8cc7908032e44dbecb53c7018 SHA512 5b0e7106e0721576cb46a92d805a8c318ac28013e34773ad18061cef38fa4d3d675a40ddd3b83119a5d201ac08ed78707f97a6f512ca625d986e98108ec87506
+EBUILD hipCUB-4.3.0.ebuild 2100 BLAKE2B 662199083665c19b5af56354dab656f55e8a814d08bab527e2a54a6dd36ffba6ccc0ee89a350337561263464dfab3fcf673b1f0f37454bf725f1723a520535c9 SHA512 44699b75b4be7ed839971d1de56f72bb04a9bde58d0d5d9526d3ecf58a05e56c32134d36982e34b9e5ff7d6a4e78af76c31f759b78d58ae3a321b5646bf40502
+MISC metadata.xml 625 BLAKE2B 7f927357a005110b37accb6841e4248e22e8080d0e0d6eb28e50e96c84807f663faf2f85dd222e5f5af448211cc05004d371a6d57ac6f17393609e76980bda81 SHA512 7d16cebc8c7df7dcc5d63e02e88e9d16d2321485de688621fd8628b8473d5ae614d63b0578363ee3b47f5e0aa7f45da9a00950b6a09a8cc9c6e3c77ae856c798
diff --git a/sci-libs/hipCUB/files/hipCUB-4.3.0-add-memory-header.patch b/sci-libs/hipCUB/files/hipCUB-4.3.0-add-memory-header.patch
new file mode 100644
index 000000000000..c9991944101a
--- /dev/null
+++ b/sci-libs/hipCUB/files/hipCUB-4.3.0-add-memory-header.patch
@@ -0,0 +1,12 @@
+resolves compilation error: no template named 'shared_ptr' in namespace 'std'
+
+--- orig/benchmark/benchmark_device_radix_sort.cpp	2021-08-26 11:37:12.587196186 +0800
++++ hipCUB-rocm-4.3.0/benchmark/benchmark_device_radix_sort.cpp	2021-08-26 11:37:27.459196285 +0800
+@@ -21,6 +21,7 @@
+ // SOFTWARE.
+ 
+ #include "common_benchmark_header.hpp"
++#include <memory>
+ 
+ // HIP API
+ #include "hipcub/device/device_radix_sort.hpp"
diff --git a/sci-libs/hipCUB/hipCUB-4.3.0.ebuild b/sci-libs/hipCUB/hipCUB-4.3.0.ebuild
new file mode 100644
index 000000000000..0b57014f6d15
--- /dev/null
+++ b/sci-libs/hipCUB/hipCUB-4.3.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Wrapper of rocPRIM or CUB for GPU parallel primitives"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipCUB"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/hipCUB/archive/rocm-${PV}.tar.gz -> hipCUB-${PV}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="benchmark test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/hip:${SLOT}
+	sci-libs/rocPRIM:${SLOT}
+	benchmark? ( dev-cpp/benchmark )"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-cpp/gtest )"
+
+S="${WORKDIR}/hipCUB-rocm-${PV}"
+
+PATCHES="${FILESDIR}/${PN}-4.3.0-add-memory-header.patch"
+
+src_prepare() {
+	sed -e "/PREFIX hipcub/d" \
+		-e "/DESTINATION/s:hipcub/include/:include/:" \
+		-e "/rocm_install_symlink_subdir(hipcub)/d" \
+		-e "/<INSTALL_INTERFACE/s:hipcub/include/:include/hipcub/:" -i hipcub/CMakeLists.txt || die
+
+	sed	-e "s:\${ROCM_INSTALL_LIBDIR}:\${CMAKE_INSTALL_LIBDIR}:" -i cmake/ROCMExportTargetsHeaderOnly.cmake || die
+
+	# disable downloading googletest and googlebenchmark
+	sed  -r -e '/Downloading/{:a;N;/\n *\)$/!ba; d}' -i cmake/Dependencies.cmake || die
+
+	# remove GIT dependency
+	sed  -r -e '/find_package\(Git/{:a;N;/\nendif/!ba; d}' -i cmake/Dependencies.cmake || die
+
+	if use benchmark; then
+		sed -e "/get_filename_component/s,\${BENCHMARK_SOURCE},${PN}_\${BENCHMARK_SOURCE}," \
+			-e "/add_executable/a\  install(TARGETS \${BENCHMARK_TARGET})" -i benchmark/CMakeLists.txt || die
+	fi
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	# Compiler to use
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+		-D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue caused by officialy support programming language "HIP"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addwrite /dev/dri/
+	cmake_src_test
+}
diff --git a/sci-libs/hipCUB/metadata.xml b/sci-libs/hipCUB/metadata.xml
index 427b06185367..5e18b914d070 100644
--- a/sci-libs/hipCUB/metadata.xml
+++ b/sci-libs/hipCUB/metadata.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-  </maintainer>
-  <maintainer type="person">
-    <email>candrews@gentoo.org</email>
-    <name>Craig Andrews</name>
-  </maintainer>
-  <maintainer type="person" proxied="yes">
-    <email>gentoo@holzke.net</email>
-    <name>Wilfried Holzke</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ROCm-Developer-Tools/hipCUB</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>candrews@gentoo.org</email>
+		<name>Craig Andrews</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>gentoo@holzke.net</email>
+		<name>Wilfried Holzke</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ROCm-Developer-Tools/hipCUB</remote-id>
+	</upstream>
+	<use>
+		<flag name="benchmark">Build and install benchmark binaries.</flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-libs/hipFFT/Manifest b/sci-libs/hipFFT/Manifest
new file mode 100644
index 000000000000..c3435c9eb91c
--- /dev/null
+++ b/sci-libs/hipFFT/Manifest
@@ -0,0 +1,7 @@
+AUX hipFFT-4.3.0-add-complex-header.patch 381 BLAKE2B 962865d4dd1a38bbc4e70756d614c92a287029e5bd6d987e8adbabb4b33a83e616cc1156bfc5dc415124d25373e146178a99854972d957039654007d5d3d5122 SHA512 8dfda0eb470005b9ed4701dbf0a1022040ce6bc90f0e04ca16704083074047b5170396257c1aa8c5d0855c055e491249c63516f4f1ba7583d5214f39705433fa
+AUX hipFFT-4.3.0-gentoo-install-locations.patch 1959 BLAKE2B 1f603bc411eda7aa7b999f3eb3c52822b27be51c2101562cd259d68856b019957c512add96f1c28ff0cb8ad58ab1911be3b97ffc9542758abae40f5e2e5b3d19 SHA512 4c358996e41750f938cb4997825aa00adbcda39b90bf0d3fbf180edecff57a1f7bf5d6c6e26c7b60274a1c1316858b911b69bf20e823a064d81fed498b3edf23
+AUX hipFFT-4.3.0-remove-git-dependency.patch 1505 BLAKE2B e98eb5b680ef2b5e45f85af8e93e25723dceebd6c849ca65ca132dab83a0eae7933c67affbf020a604c4773147907d40ccabe6cf2df6c92e213f5cab9a3e4736 SHA512 9d3c048d6f4242499d07d3c45baffc39f1766e3411d1e106ccdbae1325543d7df883531c0d2969b67805dd75bc505a63c3d3818ca5d141bbbcf8984f8d51a418
+DIST hipFFT-rocm-4.3.0.tar.gz 83355 BLAKE2B ee99b4cb685cbb846084d8a7c77982d75cf0d1597f9270260284bb26ae00702a31dd4d5ad9ae1885ab631c390f65c0f584f302be189701ba4f0dd9061b1bba5a SHA512 0d3100b054ff485eae06b13b8c568626b8e3a3286f36012c5a5f9bb4918e03c30c687a2714049bd797f6c3973f1730ad0936f02ad044cde1663c9c5750bbcf40
+DIST rocFFT-4.3.0.tar.gz 840748 BLAKE2B 236a5faa930751d35e501a9a32ecc8b4075448ef21a0ffb0bb7ec04f4ed1cb67b908aa153b5b424e0823d3e306cf375d7c01a77d687220ed79de6d374037e003 SHA512 765d41e4018a04a53e847c03de80eec830d3e8766187fb8cb493624afa2673175347c16e6eeeebd4ad7d88bb866e58f7e572708f22238723c710b98565a0cd3d
+EBUILD hipFFT-4.3.0.ebuild 1885 BLAKE2B fd0653407acbeaaf3276535b64ddbc4ed33bebcf428b5de47561b583077e30da92314cdfa03a9f1ec1d488dbef38cadbb62087cc8181d8567b1df6aa4ae33c8f SHA512 0ebd42f6b2ae1e1719d227b96bc51023e2117751b6bf4e39ed44f46a81967d8fe9946abb4975eb7bcbad656ded7cbf5a1473e3ceb82ddb90b6546c0c2992b7cf
+MISC metadata.xml 726 BLAKE2B 5471621c140d82a51f9226ae8de8600c08651ceb7a6808dd65362db6fc79595e578e7c5cbc628197b0ed37bc803cb7636e545a7b39b3d6791d02a8f804c372a3 SHA512 64ee4d42afdc5a770a7acf808205ada93d3685666158915cee48159dfa20ba0e06c9516c4ab3e1ea5c685631d017ce8f1418f0d8909516704591dcac83eb073c
diff --git a/sci-libs/hipFFT/files/hipFFT-4.3.0-add-complex-header.patch b/sci-libs/hipFFT/files/hipFFT-4.3.0-add-complex-header.patch
new file mode 100644
index 000000000000..200481788b95
--- /dev/null
+++ b/sci-libs/hipFFT/files/hipFFT-4.3.0-add-complex-header.patch
@@ -0,0 +1,11 @@
+diff --color -uprN orig/clients/rider/rider.cpp hipFFT-rocm-4.3.0/clients/rider/rider.cpp
+--- orig/clients/rider/rider.cpp	2021-08-26 15:05:32.267279103 +0800
++++ hipFFT-rocm-4.3.0/clients/rider/rider.cpp	2021-08-26 15:05:48.795279212 +0800
+@@ -22,6 +22,7 @@
+ #include <cstddef>
+ #include <iostream>
+ #include <numeric>
++#include <complex>
+ #include <random>
+ #include <sstream>
+ 
diff --git a/sci-libs/hipFFT/files/hipFFT-4.3.0-gentoo-install-locations.patch b/sci-libs/hipFFT/files/hipFFT-4.3.0-gentoo-install-locations.patch
new file mode 100644
index 000000000000..891774eb5a47
--- /dev/null
+++ b/sci-libs/hipFFT/files/hipFFT-4.3.0-gentoo-install-locations.patch
@@ -0,0 +1,42 @@
+diff --color -uprN orig/CMakeLists.txt hipFFT-rocm-4.3.0/CMakeLists.txt
+--- orig/CMakeLists.txt	2021-08-26 14:38:31.051268348 +0800
++++ hipFFT-rocm-4.3.0/CMakeLists.txt	2021-08-26 14:38:42.655268425 +0800
+@@ -143,7 +143,7 @@ endif( )
+ add_subdirectory( library )
+ 
+ # force library install path to lib (CentOS 7 defaults to lib64)
+-set(CMAKE_INSTALL_LIBDIR "lib" CACHE INTERNAL "Installation directory for libraries" FORCE)
++set(CMAKE_INSTALL_LIBDIR "lib64" CACHE INTERNAL "Installation directory for libraries" FORCE)
+ 
+ # Build clients of the library
+ if( BUILD_CLIENTS )
+diff --color -uprN orig/library/CMakeLists.txt hipFFT-rocm-4.3.0/library/CMakeLists.txt
+--- orig/library/CMakeLists.txt	2021-08-26 14:38:31.051268348 +0800
++++ hipFFT-rocm-4.3.0/library/CMakeLists.txt	2021-08-26 14:39:21.919268686 +0800
+@@ -77,7 +77,7 @@ target_include_directories(hipfft
+                            PUBLIC  $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/library/include>
+                            $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
+                            $<BUILD_INTERFACE:${HIP_INCLUDE_DIRS}>
+-                           $<INSTALL_INTERFACE:include>
++                           $<INSTALL_INTERFACE:include/hipfft>
+ )
+ 
+ if(BUILD_WITH_LIB STREQUAL "CUDA")
+@@ -112,13 +112,13 @@ if( ROCM_FOUND )
+   rocm_install_targets( TARGETS hipfft
+                         INCLUDE
+                           ${CMAKE_SOURCE_DIR}/library/include
+-                          ${CMAKE_BINARY_DIR}/include
+-                        PREFIX hipfft )
++                          ${CMAKE_BINARY_DIR}/include )
++	  #PREFIX hipfft )
+   rocm_export_targets( TARGETS hip::hipfft
+-                       PREFIX hipfft
++	  #PREFIX hipfft
+                        DEPENDS PACKAGE hip
+                        NAMESPACE hip:: )
+-  rocm_install_symlink_subdir( hipfft )
++	       #rocm_install_symlink_subdir( hipfft )
+ 
+ 
+   # During transition to standalone hipFFT repository, don't install
diff --git a/sci-libs/hipFFT/files/hipFFT-4.3.0-remove-git-dependency.patch b/sci-libs/hipFFT/files/hipFFT-4.3.0-remove-git-dependency.patch
new file mode 100644
index 000000000000..563da3085ab9
--- /dev/null
+++ b/sci-libs/hipFFT/files/hipFFT-4.3.0-remove-git-dependency.patch
@@ -0,0 +1,33 @@
+diff --color -uprN orig/cmake/dependencies.cmake hipFFT-rocm-4.3.0/cmake/dependencies.cmake
+--- orig/cmake/dependencies.cmake	2021-08-26 14:48:57.867272506 +0800
++++ hipFFT-rocm-4.3.0/cmake/dependencies.cmake	2021-08-26 14:51:02.571273334 +0800
+@@ -21,9 +21,6 @@
+ #
+ # #############################################################################
+ 
+-# Git
+-find_package(Git REQUIRED)
+-
+ # HIP
+ if(NOT BUILD_WITH_LIB STREQUAL "CUDA")
+   find_package(hip REQUIRED)
+diff --color -uprN orig/CMakeLists.txt hipFFT-rocm-4.3.0/CMakeLists.txt
+--- orig/CMakeLists.txt	2021-08-26 14:48:57.867272506 +0800
++++ hipFFT-rocm-4.3.0/CMakeLists.txt	2021-08-26 14:49:15.247272622 +0800
+@@ -117,16 +117,6 @@ message(STATUS "BUILD_WITH_COMPILER = "
+ include(cmake/dependencies.cmake)
+ 
+ if( BUILD_CLIENTS_TESTS )
+-  if( GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git" )
+-    message(STATUS "rocFFT submodule update")
+-    execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
+-                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+-                    RESULT_VARIABLE GIT_SUBMOD_RESULT)
+-    if( NOT GIT_SUBMOD_RESULT EQUAL "0" )
+-      message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules manually.")
+-    endif( )
+-  endif( )
+-
+   if( NOT EXISTS "${PROJECT_SOURCE_DIR}/rocFFT/CMakeLists.txt" )
+     message(FATAL_ERROR "The rocFFT submodule is not present!  Please update git submodules and try again.")
+   endif( )
diff --git a/sci-libs/hipFFT/hipFFT-4.3.0.ebuild b/sci-libs/hipFFT/hipFFT-4.3.0.ebuild
new file mode 100644
index 000000000000..5f7d3a95f58a
--- /dev/null
+++ b/sci-libs/hipFFT/hipFFT-4.3.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="CU / ROCM agnostic hip FFT implementation"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipFFT"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/hipFFT/archive/refs/tags/rocm-${PV}.tar.gz -> hipFFT-rocm-${PV}.tar.gz
+	test? ( https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz )"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+SLOT="0/$(ver_cut 1-2)"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/hip:${SLOT}
+	sci-libs/rocFFT:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-cpp/gtest
+		dev-libs/boost
+)"
+
+S="${WORKDIR}/hipFFT-rocm-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.3.0-gentoo-install-locations.patch"
+	"${FILESDIR}/${PN}-4.3.0-remove-git-dependency.patch"
+	"${FILESDIR}/${PN}-4.3.0-add-complex-header.patch"
+)
+
+src_prepare() {
+	use test && rmdir rocFFT && ln -s ../rocFFT-rocm-${PV} rocFFT
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_INCLUDEDIR="include/hipfft"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_RIDER=$(usex benchmark ON OFF)
+		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+		-D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue caused by officialy support programming language "HIP"
+	)
+
+	cmake_src_configure
+}
+
+src_test () {
+	addwrite /dev/kfd
+	addpredict /dev/dri
+	cd "${BUILD_DIR}/clients/staging" || die
+	einfo "Running hipfft-test"
+	LD_LIBRARY_PATH=${BUILD_DIR}/library ./hipfft-test || die
+}
+
+src_install() {
+	cmake_src_install
+	if use benchmark; then
+		cd "${BUILD_DIR}/clients/staging" || die
+		dobin hipfft-rider
+	fi
+}
diff --git a/sci-libs/hipFFT/metadata.xml b/sci-libs/hipFFT/metadata.xml
new file mode 100644
index 000000000000..7839d343e80f
--- /dev/null
+++ b/sci-libs/hipFFT/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>gentoo@holzke.net</email>
+    <name>Wilfried Holzke</name>
+  </maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>xgreenlandforwyy@gmail.com</email>
+    <name>Yiyang Wu</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCmSoftwarePlatform/hipFFT</remote-id>
+  </upstream>
+    <use>
+        <flag name="benchmark">Build and install benchmark programs hipfft-rider.</flag>
+    </use>
+</pkgmetadata>
diff --git a/sci-libs/hypre/Manifest b/sci-libs/hypre/Manifest
index 98c3c49c4bf9..d6e2ca21d138 100644
--- a/sci-libs/hypre/Manifest
+++ b/sci-libs/hypre/Manifest
@@ -1,5 +1,5 @@
 DIST hypre-2.20.0.tar.gz 5971556 BLAKE2B 63cef33913f1f4c569c396dd18227ae4346807e659306521e9340789944e22dc70be3b9baec7fb1385f562b53045e5c87fcad604aa242a941199ff9fe0a0c21d SHA512 842868b494960506fa3df4e72abb42084d701ec14305f9b040b9dcb578b4bbdaa8afb079057a7e53ad721b440c72ee804775c3b8319f2d01a2f281920a9cd350
 DIST hypre-2.21.0.tar.gz 6017038 BLAKE2B 500885cbd9f2b79c8740d1031a3dd9e5fd141dccfe2101ceed555cb7cbef77989b6af2c80f9b08e8efd6e2401269415532614d40512f93371397389e0fb15595 SHA512 20f860b0c25190608b50d577e03ab241d8caa1dbf7a7e56484e984710a586b1f4b63c72135488a756f42aa6a58d0a26b0c4e6e1680c3f7faabdf68e2559293b0
 EBUILD hypre-2.20.0.ebuild 2786 BLAKE2B e83539542a2b250cc17700f72a3835978d33e5b9681100c219b23eb45cb65a7e0c5ec704dca793bf75dabc6e68b24604079c57655ffb16c444c693ceb633e241 SHA512 b214006890a03be04184e0c4bbfebd2480fd2d9e586bc6735a1b6af430bba808fedd31f9f98002ae69f0d7ba47f67c3aee264e37e6595f30ec96f7bb8c3a1eab
-EBUILD hypre-2.21.0.ebuild 2772 BLAKE2B 02f3bef55c9fddfee73b06f753d659c428ecc9e79d27667eae0b7c92822b168d1a32aa49ffc1de8d46636adbeaed17c63512e05349e36fb7a560b0dc5c54aebd SHA512 f89b1fe7d8055ab71a44b74ece9d873e3572d17887baad401a97c3e4e292e1be738f20ca64b7f92885ccad6ddaa127715ef1e6208c0c852b03f00b816d12e475
+EBUILD hypre-2.21.0.ebuild 2779 BLAKE2B f71b1e6911f8a6e586c6b8d0a0d7a7a87038c0fa78548f21251f3c702d208f13ebb42a48e0c6447e6ece36eafd2003a7730b14f0f4381deea49736615a8b52c4 SHA512 82912a5d3327850a6ba4bfaa88d2a33fd06e58e2c5e4e264df0f8139847be20361c1520e5e98b1b77e3d678d9ea8d6c9a627214a8a0d931703149063b28b7939
 MISC metadata.xml 616 BLAKE2B e048d1098bac6c90fe41d2971044618675902957e8b2e1acbc6b4a0b1ad045d33d43f7fecea667848e533796ce05cd5735fecbea9b84bd8950f3bf38d84e11fc SHA512 c24906c2f269b820f3d926b805e5debac9d2fa864f15e800da698a93f517f6b6d2c14987d8edac0691627e892d3c2a2b8e58075feb8db2c701200861fdb05195
diff --git a/sci-libs/hypre/hypre-2.21.0.ebuild b/sci-libs/hypre/hypre-2.21.0.ebuild
index ba8ee592057c..dea4da0e5cd7 100644
--- a/sci-libs/hypre/hypre-2.21.0.ebuild
+++ b/sci-libs/hypre/hypre-2.21.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hypre-space/hypre/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples fortran int64 openmp mpi"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 979e0f157f1c..fe565ee10456 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,6 +1,5 @@
-AUX indilib-1.9.1-fix-include.patch 732 BLAKE2B e34651a2b03e71fd5da51432fb9d3eee4523f7b0fce5322a732d462448181c3a0f134261bf66110a9456117bd7fbbf7b2228987b78843033d6f8524b141dcf13 SHA512 e31be023ccc34a4437728b73569c7599b1bd43b9e86f1c886f95884e722cdf1b8a5cb263c6934ddeb172b92cecd122d7cf7e1a59137476dd16ee31e0790cd0bd
-DIST indilib-1.9.1.tar.gz 2322783 BLAKE2B 801071bf9190e4c27b4f3bf9fa2d9a44c4e297f7ee879061636f041d138a02db23525ee411782f3303a0d82bb2fc4d9d6489e2bda18f8e011bfa0d1b33595343 SHA512 d87c341efdaa8109059741738c69b9d6fb4b5dc68c774453eab378aa3784af29e8ed8469dba968a41c584fec1556fdbf0bd65cbb8aa65c2d9e1784d82e7bcc67
 DIST indilib-1.9.2.tar.gz 2335834 BLAKE2B 47d8bde8e3c783cefb23c8a8f865fa46bb9a6ed4ee08618d198680f3036e9ca9a16178b1ec4dab070d0cb3ec8d638847cedb752a2a5a1d5e2dc5ddbd362c0a86 SHA512 0a1ada5b5880553ddbcf794bac952ddce76d3aa46652c48621e284a04a7d3d9ba7492d8874bf30f7e3f614a904a829109eaee9dae53dd5854d72bb1c98740f44
-EBUILD indilib-1.9.1-r1.ebuild 1330 BLAKE2B 43a126b0ef9d3ac40f7a2f3098586956d1df58501c5e4b7d67cb5006752f28b8d7c1ce7521ab51c53d47da54da329e44be020b8ba623a691ac67c4395fe2de78 SHA512 33a020e215980d154276b1382d4559fccc5e2e0ffa7a8924fb780c8d674aafbb07186c5fcc92c2a4189fe734a55680fc209278623c3318a161b8a5a46ec2ec55
-EBUILD indilib-1.9.2.ebuild 1280 BLAKE2B c9d46c8da7a629ff5b5b26a423d74e1eb9bf5ce12187f6f12f31b6b4c1d8910e5674a586fd4f5d521fcff502bb14da963d9eb74f8ee4f69a0ffd7017a12e6224 SHA512 d7d17ac330440fd6753820cf78ebdbcda1e766a62d941438eab0b2f5d3482c5084e5b68fc05f8467f2e18a6e22de4046c637267616cf8cb3b88c7d23493b2136
+DIST indilib-1.9.3.tar.gz 2350168 BLAKE2B 4e61f79a08d32ee829bb420c2f316f9f0168d21d6d2f11905142efd390e989571a3120ea5d123df4af05d0c6c7a4a7323f8c9fc95bc652afef3fd57bc9728c88 SHA512 d0c1b17f75a25e546261cabe644420dca155672d9223eaf48fad7ed5bbc3fcf80784df1ff21c5edded0f80e0c5ef61303892afa597b611dfd3f57a1a113be5f7
+EBUILD indilib-1.9.2.ebuild 1537 BLAKE2B ae5d0101c31c4bd95bb688856b5113cbdfff59d7a494b98f916378c4e0d86c94d729c48386c04857e8806764d7f9684195b134e099b723408ba3d35259266ebf SHA512 df6496a6fad0246217468105f06ee3a4a368810cbcfaa4907481c230ea7bf8182d683d60292522bc61eeefdcdb75a1f3c28611bf331d86e10732db365e0a8468
+EBUILD indilib-1.9.3.ebuild 1541 BLAKE2B 2d043ba9b3fbce0370cc288931f20f116cf61dcdecc04b06a99123ec3eac099376230cef28c650db77c31cfcb31f9a9d12f69e1e9352b34092ad5e194fa0f0c9 SHA512 c520f3d8ef3399a2cb9a32143f7c578a5a0a94294dca0b061c4e1e98e5d6d7cef6afc8ab56b44e965f84ab2b5b9aeb4ef85139eb7947210a3cf1788fca5da399
 MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f
diff --git a/sci-libs/indilib/files/indilib-1.9.1-fix-include.patch b/sci-libs/indilib/files/indilib-1.9.1-fix-include.patch
deleted file mode 100644
index 7e3e24880d43..000000000000
--- a/sci-libs/indilib/files/indilib-1.9.1-fix-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 907b3d81f27593e709af9e3f2cdc6dab05d6d80a Mon Sep 17 00:00:00 2001
-From: Paolo Stivanin <paolostivanin@users.noreply.github.com>
-Date: Tue, 29 Jun 2021 08:52:04 +0200
-Subject: [PATCH] Fix indimacros include path on baseclient.h (#1503)
-
----
- libs/indibase/baseclient.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libs/indibase/baseclient.h b/libs/indibase/baseclient.h
-index 6d5e49b9a..2656d7486 100644
---- a/libs/indibase/baseclient.h
-+++ b/libs/indibase/baseclient.h
-@@ -20,11 +20,11 @@
- 
- #include "indiapi.h"
- #include "indibase.h"
-+#include "indimacros.h"
- 
- #include <string>
- #include <vector>
- 
--#include <indimacros.h>
- #include <memory>
- 
- // #define MAXRBUF 2048 // #PS: defined in indibase.h
diff --git a/sci-libs/indilib/indilib-1.9.2.ebuild b/sci-libs/indilib/indilib-1.9.2.ebuild
index 164b4f030d8c..0f889477df8c 100644
--- a/sci-libs/indilib/indilib-1.9.2.ebuild
+++ b/sci-libs/indilib/indilib-1.9.2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}"
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE="ogg rtlsdr test websocket"
 
 RESTRICT="!test? ( test )"
@@ -53,5 +53,17 @@ src_configure() {
 }
 
 src_test() {
+	local myctestargs=()
+
+	if use ppc || use ppc64 || use sparc ; then
+		# Broken on big endian for quite some time.
+		# Reported upstream: file needs to be replaced w/ a normal library
+		# for b64.
+		# bug #763126
+		myctestargs+=(
+			-E "(test_base64)"
+		)
+	fi
+
 	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
 }
diff --git a/sci-libs/indilib/indilib-1.9.1-r1.ebuild b/sci-libs/indilib/indilib-1.9.3.ebuild
index 15d77f70204d..5291dd21585f 100644
--- a/sci-libs/indilib/indilib-1.9.1-r1.ebuild
+++ b/sci-libs/indilib/indilib-1.9.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake udev
 
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}"
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="ogg rtlsdr test websocket"
 
 RESTRICT="!test? ( test )"
@@ -39,10 +39,6 @@ DEPEND="${RDEPEND}
 	websocket? ( dev-cpp/websocketpp )
 "
 
-PATCHES=(
-	"${FILESDIR}"/indilib-1.9.1-fix-include.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DINDI_BUILD_QT5_CLIENT=OFF
@@ -57,5 +53,17 @@ src_configure() {
 }
 
 src_test() {
+	local myctestargs=()
+
+	if use ppc || use ppc64 || use sparc ; then
+		# Broken on big endian for quite some time.
+		# Reported upstream: file needs to be replaced w/ a normal library
+		# for b64.
+		# bug #763126
+		myctestargs+=(
+			-E "(test_base64)"
+		)
+	fi
+
 	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
 }
diff --git a/sci-libs/keras/Manifest b/sci-libs/keras/Manifest
new file mode 100644
index 000000000000..8bfa2e9d946b
--- /dev/null
+++ b/sci-libs/keras/Manifest
@@ -0,0 +1,6 @@
+AUX keras-2.7.0-0001-bazel-Use-system-protobuf.patch 10785 BLAKE2B 3d9c08a2ed78cfa04dd6c1f76ade37cb487d22f78fa5035ac876f83f813fcc1bd437433750652ce1f49c5a5724ef96fca17f7280ab8ac8c31323faea632e8842 SHA512 052ed0d16847263279b72f204d5356391de319e84b17e0b70df3bb49ac906058182a99de46e3610eaa94c8b5d4f205b97c798827b01bd38b174b4c87b39fd417
+DIST bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip 201360 BLAKE2B 0173a8edb17f344b18e42026e2f8a62a1909d4694ab0be83562b6437a3f1ef38889f069269ddd2308b41062e5f375f791be0d2631a8e52ede668203779813b56 SHA512 2ba1dc316d88947c1d17ec67154c052700e3571b8d03370a9f204cf9fe94a1bd58f93a2c4a3c0b02233ee3250053a4c30a4133b5b38745858c1d04be8c9d973f
+DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c
+DIST keras-2.7.0.tar.gz 2221030 BLAKE2B 1920e2d01ed88599a49c188691999e30e2ade2fceb3e2225f0c972a34bc0690e4edc56405e0f17c869695b99345eac9fb9a22e9c9aa4fd7dd02be37286ffd62c SHA512 31e4b2d2d10509e8b3cb86d08965cb5d1b1dad96dce322ba3c1aed1e0e585241e121c9873aa2f7986c6ac9c01d6c0a15b7a7d970caa288ac8eb95a93263df56f
+EBUILD keras-2.7.0.ebuild 2269 BLAKE2B 575fcc1136e8157a2cf95b89ae1487c1bd1f4cd34f9cea16837c0238838091589135c7cfe443595a1bb90c254998bd3ecc182eb28f5bb2a4144cddc0a5a42e62 SHA512 6854e59c4bb0c67311935adf1ae5d3a69bb46d1a425f46cc130611e8a22a135a3d311a56d47359aa500211f6b2a5f6ec9a03dbb38806c9d6ee35baf9f75a30a8
+MISC metadata.xml 470 BLAKE2B 3246fea02a94eea249d50ea91e2f3297c05e711c9fc27d0a43b859029dfd36dbe8a5bb82157b711f408833ed8bf853031e834a49f8765e861b021bf95dd2797a SHA512 33dbf6cc3ae154844f0eeef7e6c8174b355ceef80d3bfb5edab372b013b5b904597e92fbf965abe2a43374e3e6cc2532d1da4b0a592450911752c4e7570f0054
diff --git a/sci-libs/keras/files/keras-2.7.0-0001-bazel-Use-system-protobuf.patch b/sci-libs/keras/files/keras-2.7.0-0001-bazel-Use-system-protobuf.patch
new file mode 100644
index 000000000000..60736ebb16e9
--- /dev/null
+++ b/sci-libs/keras/files/keras-2.7.0-0001-bazel-Use-system-protobuf.patch
@@ -0,0 +1,316 @@
+From 71f50c026a4b7658596ab4209cc63520710f02b5 Mon Sep 17 00:00:00 2001
+From: Jason Zaman <jason@perfinion.com>
+Date: Sun, 14 Nov 2021 17:59:39 -0800
+Subject: [PATCH] bazel: Use system protobuf
+
+---
+ WORKSPACE                |  38 -------
+ keras/protobuf/BUILD     |   2 +-
+ third_party/BUILD        |   8 +-
+ third_party/protobuf.bzl | 216 +++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 224 insertions(+), 40 deletions(-)
+ create mode 100644 third_party/protobuf.bzl
+
+diff --git a/WORKSPACE b/WORKSPACE
+index 2c03ebba..61282aea 100644
+--- a/WORKSPACE
++++ b/WORKSPACE
+@@ -1,39 +1 @@
+ workspace(name = "org_keras")
+-
+-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+-
+-# Needed by protobuf
+-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+-http_archive(
+-    name = "bazel_skylib",
+-    url = "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.1/bazel-skylib-1.0.1.tar.gz",
+-    sha256 = "f1c8360c01fcf276778d3519394805dc2a71a64274a3a0908bc9edff7b5aebc8",
+-)
+-load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+-bazel_skylib_workspace()
+-
+-# Needed by protobuf
+-http_archive(
+-    name = "six_archive",
+-    build_file = "//third_party:six.BUILD",
+-    sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73",
+-    strip_prefix = "six-1.12.0",
+-    urls = [
+-        "http://mirror.bazel.build/pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz",
+-        "https://pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz",  # 2018-12-10
+-    ],
+-)
+-
+-bind(
+-    name = "six",
+-    actual = "@six_archive//:six",
+-)
+-
+-http_archive(
+-    name = "com_google_protobuf",
+-    sha256 = "1fbf1c2962af287607232b2eddeaec9b4f4a7a6f5934e1a9276e9af76952f7e0",
+-    strip_prefix = "protobuf-3.9.2",
+-    urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.9.2.tar.gz"],
+-)
+-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+-protobuf_deps()
+diff --git a/keras/protobuf/BUILD b/keras/protobuf/BUILD
+index 871d9f6b..9df2b8ce 100644
+--- a/keras/protobuf/BUILD
++++ b/keras/protobuf/BUILD
+@@ -1,7 +1,7 @@
+ # Description:
+ #   Contains Keras protobufs
+ 
+-load("@com_google_protobuf//:protobuf.bzl", "py_proto_library")
++load("//third_party:protobuf.bzl", "py_proto_library")
+ 
+ package(
+     default_visibility = [
+diff --git a/third_party/BUILD b/third_party/BUILD
+index 9be54076..9399232f 100644
+--- a/third_party/BUILD
++++ b/third_party/BUILD
+@@ -1,4 +1,5 @@
+ package(
++    default_visibility = ["//visibility:public"],
+     licenses = ["notice"],  # Apache 2.0
+ )
+ 
+@@ -7,4 +8,9 @@ exports_files([
+     "six.BUILD",
+ ])
+ 
+-package(default_visibility = ["//visibility:public"])
++genrule(
++    name = "protoc",
++    outs = ["protoc.bin"],
++    cmd = "ln -s $$(which protoc) $@",
++    executable = 1,
++)
+diff --git a/third_party/protobuf.bzl b/third_party/protobuf.bzl
+new file mode 100644
+index 00000000..3a7ef0a2
+--- /dev/null
++++ b/third_party/protobuf.bzl
+@@ -0,0 +1,216 @@
++def _GetPath(ctx, path):
++    if ctx.label.workspace_root:
++        return ctx.label.workspace_root + "/" + path
++    else:
++        return path
++
++def _IsNewExternal(ctx):
++    # Bazel 0.4.4 and older have genfiles paths that look like:
++    #   bazel-out/local-fastbuild/genfiles/external/repo/foo
++    # After the exec root rearrangement, they look like:
++    #   ../repo/bazel-out/local-fastbuild/genfiles/foo
++    return ctx.label.workspace_root.startswith("../")
++
++def _GenDir(ctx):
++    if _IsNewExternal(ctx):
++        # We are using the fact that Bazel 0.4.4+ provides repository-relative paths
++        # for ctx.genfiles_dir.
++        return ctx.genfiles_dir.path + (
++            "/" + ctx.attr.includes[0] if ctx.attr.includes and ctx.attr.includes[0] else ""
++        )
++
++    # This means that we're either in the old version OR the new version in the local repo.
++    # Either way, appending the source path to the genfiles dir works.
++    return ctx.var["GENDIR"] + "/" + _SourceDir(ctx)
++
++def _SourceDir(ctx):
++    if not ctx.attr.includes:
++        return ctx.label.workspace_root
++    if not ctx.attr.includes[0]:
++        return _GetPath(ctx, ctx.label.package)
++    if not ctx.label.package:
++        return _GetPath(ctx, ctx.attr.includes[0])
++    return _GetPath(ctx, ctx.label.package + "/" + ctx.attr.includes[0])
++
++def _PyOuts(srcs, use_grpc_plugin = False):
++    ret = [s[:-len(".proto")] + "_pb2.py" for s in srcs]
++    if use_grpc_plugin:
++        ret += [s[:-len(".proto")] + "_pb2_grpc.py" for s in srcs]
++    return ret
++
++def _proto_gen_impl(ctx):
++    """General implementation for generating protos"""
++    srcs = ctx.files.srcs
++    deps = []
++    deps += ctx.files.srcs
++    source_dir = _SourceDir(ctx)
++    gen_dir = _GenDir(ctx)
++    if source_dir:
++        import_flags = ["-I" + source_dir, "-I" + gen_dir]
++    else:
++        import_flags = ["-I."]
++
++    for dep in ctx.attr.deps:
++        import_flags += dep.proto.import_flags
++        deps += dep.proto.deps
++    import_flags = depset(import_flags).to_list()
++    deps = depset(deps).to_list()
++
++    args = []
++    if ctx.attr.gen_cc:
++        args += ["--cpp_out=" + gen_dir]
++    if ctx.attr.gen_py:
++        args += ["--python_out=" + gen_dir]
++
++    inputs = srcs + deps
++    tools = [ctx.executable.protoc]
++    if ctx.executable.plugin:
++        plugin = ctx.executable.plugin
++        lang = ctx.attr.plugin_language
++        if not lang and plugin.basename.startswith("protoc-gen-"):
++            lang = plugin.basename[len("protoc-gen-"):]
++        if not lang:
++            fail("cannot infer the target language of plugin", "plugin_language")
++
++        outdir = gen_dir
++        if ctx.attr.plugin_options:
++            outdir = ",".join(ctx.attr.plugin_options) + ":" + outdir
++        args += ["--plugin=protoc-gen-%s=%s" % (lang, plugin.path)]
++        args += ["--%s_out=%s" % (lang, outdir)]
++        tools.append(plugin)
++
++    if args:
++        ctx.actions.run(
++            inputs = inputs,
++            outputs = ctx.outputs.outs,
++            arguments = args + import_flags + [s.path for s in srcs],
++            executable = ctx.executable.protoc,
++            mnemonic = "ProtoCompile",
++            tools = tools,
++            use_default_shell_env = True,
++        )
++
++    return struct(
++        proto = struct(
++            srcs = srcs,
++            import_flags = import_flags,
++            deps = deps,
++        ),
++    )
++
++proto_gen = rule(
++    attrs = {
++        "srcs": attr.label_list(allow_files = True),
++        "deps": attr.label_list(providers = ["proto"]),
++        "includes": attr.string_list(),
++        "protoc": attr.label(
++            cfg = "host",
++            executable = True,
++            allow_single_file = True,
++            mandatory = True,
++        ),
++        "plugin": attr.label(
++            cfg = "host",
++            allow_files = True,
++            executable = True,
++        ),
++        "plugin_language": attr.string(),
++        "plugin_options": attr.string_list(),
++        "gen_cc": attr.bool(),
++        "gen_py": attr.bool(),
++        "outs": attr.output_list(),
++    },
++    output_to_genfiles = True,
++    implementation = _proto_gen_impl,
++)
++"""Generates codes from Protocol Buffers definitions.
++
++This rule helps you to implement Skylark macros specific to the target
++language. You should prefer more specific `cc_proto_library `,
++`py_proto_library` and others unless you are adding such wrapper macros.
++
++Args:
++  srcs: Protocol Buffers definition files (.proto) to run the protocol compiler
++    against.
++  deps: a list of dependency labels; must be other proto libraries.
++  includes: a list of include paths to .proto files.
++  protoc: the label of the protocol compiler to generate the sources.
++  plugin: the label of the protocol compiler plugin to be passed to the protocol
++    compiler.
++  plugin_language: the language of the generated sources
++  plugin_options: a list of options to be passed to the plugin
++  gen_cc: generates C++ sources in addition to the ones from the plugin.
++  gen_py: generates Python sources in addition to the ones from the plugin.
++  outs: a list of labels of the expected outputs from the protocol compiler.
++"""
++
++def py_proto_library(
++        name,
++        srcs = [],
++        deps = [],
++        py_libs = [],
++        py_extra_srcs = [],
++        include = None,
++        default_runtime = None,
++        protoc = "//third_party:protoc",
++        use_grpc_plugin = False,
++        **kwargs):
++    """Bazel rule to create a Python protobuf library from proto source files
++
++    NOTE: the rule is only an internal workaround to generate protos. The
++    interface may change and the rule may be removed when bazel has introduced
++    the native rule.
++
++    Args:
++      name: the name of the py_proto_library.
++      srcs: the .proto files of the py_proto_library.
++      deps: a list of dependency labels; must be py_proto_library.
++      py_libs: a list of other py_library targets depended by the generated
++          py_library.
++      py_extra_srcs: extra source files that will be added to the output
++          py_library. This attribute is used for internal bootstrapping.
++      include: a string indicating the include path of the .proto files.
++      default_runtime: the implicitly default runtime which will be depended on by
++          the generated py_library target.
++      protoc: the label of the protocol compiler to generate the sources.
++      use_grpc_plugin: a flag to indicate whether to call the Python C++ plugin
++          when processing the proto files.
++      **kwargs: other keyword arguments that are passed to py_library.
++
++    """
++    outs = _PyOuts(srcs, use_grpc_plugin)
++
++    includes = []
++    if include != None:
++        includes = [include]
++
++    grpc_python_plugin = None
++    if use_grpc_plugin:
++        grpc_python_plugin = "//external:grpc_python_plugin"
++        # Note: Generated grpc code depends on Python grpc module. This dependency
++        # is not explicitly listed in py_libs. Instead, host system is assumed to
++        # have grpc installed.
++
++    proto_gen(
++        name = name + "_genproto",
++        srcs = srcs,
++        deps = [s + "_genproto" for s in deps],
++        includes = includes,
++        protoc = protoc,
++        gen_py = 1,
++        outs = outs,
++        visibility = ["//visibility:public"],
++        plugin = grpc_python_plugin,
++        plugin_language = "grpc",
++    )
++
++    if default_runtime and not default_runtime in py_libs + deps:
++        py_libs = py_libs + [default_runtime]
++
++    native.py_library(
++        name = name,
++        srcs = outs + py_extra_srcs,
++        deps = py_libs + deps,
++        imports = includes,
++        **kwargs
++    )
+-- 
+2.32.0
+
diff --git a/sci-libs/keras/keras-2.7.0.ebuild b/sci-libs/keras/keras-2.7.0.ebuild
new file mode 100644
index 000000000000..7997b0f4b4b6
--- /dev/null
+++ b/sci-libs/keras/keras-2.7.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit bazel distutils-r1
+
+DESCRIPTION="Deep Learning for humans"
+HOMEPAGE="https://keras.io/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+bazel_external_uris="
+	https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip -> bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip
+	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
+
+SRC_URI="https://github.com/keras-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${bazel_external_uris}"
+
+RDEPEND="
+	>=dev-libs/protobuf-3.13.0:=
+	dev-python/absl-py[${PYTHON_USEDEP}]
+	dev-python/h5py[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.13.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}]
+	>=sci-libs/keras-preprocessing-1.1.2[${PYTHON_USEDEP}]
+	>=sci-libs/tensorflow-2.7[python,${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.13.0
+	dev-java/java-config
+	>=dev-util/bazel-3.7.2"
+
+# Bazel tests not pytest, also want GPU access
+RESTRICT="test"
+DOCS=( CONTRIBUTING.md README.md )
+PATCHES=(
+	"${FILESDIR}/keras-2.7.0-0001-bazel-Use-system-protobuf.patch"
+)
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	bazel_load_distfiles "${bazel_external_uris}"
+}
+
+src_prepare() {
+	bazel_setup_bazelrc
+	default
+	python_copy_sources
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home)
+
+	do_compile() {
+		ebazel build //keras/tools/pip_package:build_pip_package
+		ebazel shutdown
+
+		local srcdir="${T}/src-${EPYTHON/./_}"
+		mkdir -p "${srcdir}" || die
+		bazel-bin/keras/tools/pip_package/build_pip_package --src "${srcdir}" || die
+	}
+
+	python_foreach_impl run_in_build_dir do_compile
+}
+
+src_install() {
+	do_install() {
+		cd "${T}/src-${EPYTHON/./_}" || die
+		esetup.py install
+		python_optimize
+	}
+	python_foreach_impl do_install
+
+	cd "${S}" || die
+	einstalldocs
+}
diff --git a/sci-libs/keras/metadata.xml b/sci-libs/keras/metadata.xml
new file mode 100644
index 000000000000..b0b89c812a51
--- /dev/null
+++ b/sci-libs/keras/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>perfinion@gentoo.org</email>
+		<name>Jason Zaman</name>
+	</maintainer>
+	<longdescription lang="en">
+		TensorFlow Keras is an implementation of the Keras API that uses TensorFlow as a backend.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">keras-team/keras</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/kissfft/Manifest b/sci-libs/kissfft/Manifest
index d3a1e6e75351..e75abe6a2038 100644
--- a/sci-libs/kissfft/Manifest
+++ b/sci-libs/kissfft/Manifest
@@ -1,4 +1,4 @@
 DIST kissfft-131.1.0.tar.gz 52383 BLAKE2B 74e6d2e7d132a311b31c28a468e13d9772a53f0ea0abed0e0f49d8db9c183fb0646f58fd38df3e797b8577285899daf6b80446b149ce2582bb828410656d96df SHA512 bd715868ce0e93a291a0592fb1f8b960e832fc64efe863755e52b67d5addff9bcb444a1bf2570d1914c52b41dad1023d0d86400f5ea30c9fb84cd6b4f7210708
 EBUILD kissfft-131.1.0.ebuild 1238 BLAKE2B 1900bf48bafd22ae4a7424cdd3d0458e8d9e54e4781bb8991bb8553946c60162d5a38097f1333b4cb1b853c2e6e00c333ba319623786754ca4e7d80667220c8a SHA512 ed05af1985f90456a13a7ec70b79371c5e3181876314a455d84b3609976e76dc7108a8fc51f19ec32f5b7f7cef38706629e9b1cad6e8c857c0bb79919d59fc0c
 EBUILD kissfft-9999.ebuild 1238 BLAKE2B 1900bf48bafd22ae4a7424cdd3d0458e8d9e54e4781bb8991bb8553946c60162d5a38097f1333b4cb1b853c2e6e00c333ba319623786754ca4e7d80667220c8a SHA512 ed05af1985f90456a13a7ec70b79371c5e3181876314a455d84b3609976e76dc7108a8fc51f19ec32f5b7f7cef38706629e9b1cad6e8c857c0bb79919d59fc0c
-MISC metadata.xml 525 BLAKE2B 03097733526299e7d922bcf737fbd8c87960c075254d5ecafa20756279973f674cbe3c2d0bbe92c556a066db1868ad64f76440b14420f8548aaccb3285fcf05c SHA512 ea984b79004d5a354ffdf371de82784f868164a11ce297895dc32e82664bcc0fb6a28f2cf97f35184c743c625304f58a5c692db6f29c9f8dc9dd1d2ba167227e
+MISC metadata.xml 408 BLAKE2B 14d2f480a1f7bf7bdb5bd52ae17e4746bf7413fdf7e73de686dbd1d05371dddf1d079f1d621afd2e28e9aec8c4be73f51964aff0a6b1896c5ca7398a97d2afee SHA512 390bd36cd3c2481e38808cc85cf362a67337240295ed0fdf24b9b4617fd5b93cef607eaa10f76b4dc234eb4f75055e404898f8b1fb773441707952b9512142a7
diff --git a/sci-libs/kissfft/metadata.xml b/sci-libs/kissfft/metadata.xml
index dc040e7c9bf6..06198343b639 100644
--- a/sci-libs/kissfft/metadata.xml
+++ b/sci-libs/kissfft/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>gentoo@aisha.cc</email>
-		<name>Aisha Tammy</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
diff --git a/sci-libs/klu/Manifest b/sci-libs/klu/Manifest
index 55424257a78c..e5c93719cd55 100644
--- a/sci-libs/klu/Manifest
+++ b/sci-libs/klu/Manifest
@@ -1,4 +1,4 @@
 AUX klu-1.3.9-dash_doc.patch 931 BLAKE2B ebd1f339401151fcfe4ab05a23d8818ac288567c8baa4a2e0428399d03f5bf75001dba373fdd820bd3f6d69d45e42d1a36e347a27ed34e7077b7e0231a21f15d SHA512 31f859dd56d429d2399fb7b2065dcd9630e4b30bb84d6f24ba63b5a10d3f1c608b3b6dd148eeb463ea08e09025d5784a8534ae4624654ed332e89856a6d8c8fd
 DIST klu-1.3.9.tar.bz2 635596 BLAKE2B 6c6c84cf1b30e78cbaaee6bebed21c806d1672bee5f7ea061e7ef057ff56fd456e8517ca2ff1018a14ebcbc8f96b9e87989e22d8996817394666e6d8d2d727dd SHA512 b7fd862fe8443596758c27f9c918e367b3b3816340836e74cf8d97a2e755fbe07d133778eea3d054bc70243fa15c2bd71f4fd90c1179879661ba2d624b8f0706
-EBUILD klu-1.3.9-r2.ebuild 831 BLAKE2B 56d7ea60503c349d235c190b2bc7b5af1e3b23aaad6da138a24d3e137433bfb077500ddfe0342e456b521aa6aedfab5a6f72a4951f07226920c123d54b3ade01 SHA512 e2114403e1f6f95f94ddec34e2220a861e2c8d9b3cbada14498e6b46468081b7e84a28806a61234f4f410b4e3d94f0386051cfa4dc3f28a6004a98cca94945f9
+EBUILD klu-1.3.9-r2.ebuild 838 BLAKE2B 52c86c2db768002612e778e6f793dc1a31e51939e4ef2af5081632f775ab5f71dc25d3d75019a4e4807746945dadf85d347cdcc0367b60085eebad96b4268565 SHA512 d5226b0ae72bee2a98b3a70ce5a134f16ce2d91e19ffcaad25bf78eb729c20ffba176da03a95dc39a323811f7d811df4d6c0c3edbde1d2a90ca0ac650dcccdcf
 MISC metadata.xml 461 BLAKE2B 12b2781a0636a67e56330afdaf8a736c490cfa388f786af46eab161523822884f272e829d88105da5220d05f2b37a0da955b20857896420e59fe0decd3fabb16 SHA512 9a12022b1e6205984851551be463f1f499f3c52e1fe008a820693434e26eea243b7ab56252bd0aaea0d748a8eba990fe0f6ad13c405266d09543df57e6f18c1e
diff --git a/sci-libs/klu/klu-1.3.9-r2.ebuild b/sci-libs/klu/klu-1.3.9-r2.ebuild
index 0ddfd86bcec6..f636da0c8519 100644
--- a/sci-libs/klu/klu-1.3.9-r2.ebuild
+++ b/sci-libs/klu/klu-1.3.9-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index ef3cf2e9b285..d7b6d63200ed 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,10 +1,5 @@
 AUX lapack-3.9.0-build-tests.patch 591 BLAKE2B 3db7dad6b798e5e9a4d050b05ef318aebd564d7fca3b3ac12c44f460eb6653693476f016c8a4d6369e4f4e4aa06aa7bf4a1cea38083758e8257f8cfd36c41d9f SHA512 642073d65ab1d5b7beb06e90cd4777ed89f4a76dcd5ec26025fa254ab243c8c09dcd4ca17b8d406e55cdbd302eab36f34a429dc3963a11827209246ebf2251cd
 AUX lapack-3.9.0-deprecated-headers.patch 7489 BLAKE2B c60377475eb9db34f9da1456358c6302fb9584212e74874d2f028fea895a272caa147fee64573d8aebfcfa58af4c6dab3e297b375af6353f5711b437e9a67533 SHA512 eae3c502354bc362612ede131f759f9f814ea80a8cf8597b553ac81d4d7e0910d4c75e56079ca012209f22c1f5a9160ac1f01fe7c7a6ca1238d245e9bc505f00
 DIST lapack-3.10.0.tar.gz 7630775 BLAKE2B fd2f920dd3f69eab471aa8c20d1b8178fb5c6e80337a2ed6948aba3ec639a816f8d368bb59ff6fb513b2f5cda9e61c2a547182f22fbc84a8c34191acefc3406a SHA512 56055000c241bab8f318ebd79249ea012c33be0c4c3eca6a78e247f35ad9e8088f46605a0ba52fd5ad3e7898be3b7bc6c50ceb3af327c4986a266b06fe768cbf
-DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
-DIST lapack-3.9.0.tar.gz 7534567 BLAKE2B 408013a11a72e0262d144adfdf6db28a6efa3bb5446f9ff959bb88fe10459dfa621149ed0144630a55e73e3b5be3c704269a716eb195f6db7b39d345b4db8270 SHA512 424956ad941a60a4b71e0d451ad48db12a692f8a71a90f3ca7f71d6ecc1922f392746ea84df1c47a46577ed2db32e9e47ec44ad248207c5ac7da179becb712ef
-EBUILD lapack-3.10.0.ebuild 3071 BLAKE2B 2fff7ae38387a78711c96d5b2226dd74b4373405bce143e9f41c12293c9de8f817b718d19ffb765d6953c648f42701f8db1d739fe00c508b2c9ab4dbe06fd662 SHA512 e9ad5b847516501ce0800681977df05f8d2d0067b8f8ea2f52a0d8f7484561371e4ffa45f8b3b232254db91695da058efb015c5315f80fa75b6f4671073bfb6e
-EBUILD lapack-3.8.0-r1.ebuild 2892 BLAKE2B 8aa139fdb09e219c539ade5c873dcc2f3d8e919daa4cefef4984484b0288799dbfddea33b74f2d5c88dbc7bab95109e4ad421aa32dde82059571cafb600fbbb0 SHA512 e8c1721460ed64ea9e1366c47fc36782f717d7bf87b3ab2ece988fe79373ec956f9c76cfcc729ddf5c984c3150ba4183ab5220da19f0fd3818a501b3f72c4aa1
-EBUILD lapack-3.8.0.ebuild 2840 BLAKE2B de601370663d749b99a65b28611ac24c73704c6ffa4998a5b430eba3ce70140de0a4ef3350cc564841fefd4d6fd0015602c481bfedc9165ab7e0fd894d46d72c SHA512 899e9d9e8687228ae8bb3f33badb7f2c102a3d1ec618d6236b35ffeaa2fcd6173e0b69bc2b60405cc319b5cf854738aaa6b28258442e7e242ff3ee697d70b1e1
-EBUILD lapack-3.9.0-r1.ebuild 3120 BLAKE2B ecafcba61f6320601aa3891f49f9a9a65eb5a029228d8d46cc0c44e06906f49922f94507c8d44751b701877b19ab42fc48047c6f49b8f827aa6b27cf8749d806 SHA512 49b6125480abf08914ebb1f8df85a1641edfa1d43e6f62a6c8e77ef9a38c40810692c7e02db1066d80611c11c85b7326613f88c1352bc8849846b7ef1d5431ed
+EBUILD lapack-3.10.0.ebuild 3063 BLAKE2B 7f3fe2ba2104f4a04ebecae2e9159f59cb8e0b742920e6bfcbecc84174404064ddee45e7753815eb7dc7e2dbe555c1f7b570422d92e6fed659d7d608785026c7 SHA512 80423a2c878b688f38a4daa11bbc661b64493a550398d7d8a40ce71ee394444f8fe2a6ad99d3b72d1d48980ff13dbe7bcc8580027a45015f134462412382e3de
 MISC metadata.xml 1583 BLAKE2B 8db26f3744a6ee5f88f7ad37e749843eb8b63cd11af4182dd9d6408a854a5b060a651abd5f2f2098252a38b68b34c464a99f9654be9e6cba8f444eff23e4e297 SHA512 d8e8eb140e1a05f297b9e6edcc9aeb48e958baa7741be2a693ea4fca1a6d3f66a60d72c4c61e2dac8b8efd6210daf10ea9350fdbcfbaf801ac6366d0025ad2ca
diff --git a/sci-libs/lapack/lapack-3.10.0.ebuild b/sci-libs/lapack/lapack-3.10.0.ebuild
index 549450e21345..af0b1bcc0c31 100644
--- a/sci-libs/lapack/lapack-3.10.0.ebuild
+++ b/sci-libs/lapack/lapack-3.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 # TODO: static-libs 64bit-index
 IUSE="lapacke deprecated doc eselect-ldso test"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/lapack/lapack-3.8.0-r1.ebuild b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
deleted file mode 100644
index d97667a141d8..000000000000
--- a/sci-libs/lapack/lapack-3.8.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake-utils
-
-DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
-HOMEPAGE="https://www.netlib.org/lapack/"
-SRC_URI="https://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"
-IUSE="lapacke deprecated doc eselect-ldso"
-# TODO: static-libs 64bit-index
-
-RDEPEND="
-	eselect-ldso? ( >=app-eselect/eselect-blas-0.2
-	>=app-eselect/eselect-lapack-0.2 )
-	!app-eselect/eselect-cblas
-	virtual/fortran
-	doc? ( app-doc/blas-docs )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCBLAS=ON
-		-DLAPACKE=$(usex lapacke)
-		-DBUILD_DEPRECATED=$(usex deprecated)
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use eselect-ldso || return
-	# Create private lib directory for eselect::blas (ld.so.conf)
-	dodir /usr/$(get_libdir)/blas/reference
-	dosym ../../libblas.so usr/$(get_libdir)/blas/reference/libblas.so
-	dosym ../../libblas.so.3 usr/$(get_libdir)/blas/reference/libblas.so.3
-	dosym ../../libcblas.so usr/$(get_libdir)/blas/reference/libcblas.so
-	dosym ../../libcblas.so.3 usr/$(get_libdir)/blas/reference/libcblas.so.3
-
-	# Create private lib directory for eselect::lapack (ld.so.conf)
-	dodir /usr/$(get_libdir)/lapack/reference
-	dosym ../../liblapack.so usr/$(get_libdir)/lapack/reference/liblapack.so
-	dosym ../../liblapack.so.3 usr/$(get_libdir)/lapack/reference/liblapack.so.3
-}
-
-pkg_postinst() {
-	use eselect-ldso || return
-
-	local me=reference libdir=$(get_libdir)
-	# check eselect-blas
-	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
-	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_blas} == ${me} || -z ${current_blas} ]]; then
-		eselect blas set ${libdir} ${me}
-		elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
-	else
-		elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
-		elog "To use blas [${me}] implementation, you have to issue (as root):"
-		elog "\t eselect blas set ${libdir} ${me}"
-	fi
-
-	# check eselect-lapack
-	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
-	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_lapack} == ${me} || -z ${current_lapack} ]]; then
-		eselect lapack set ${libdir} ${me}
-		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
-	else
-		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
-		elog "To use lapack [${me}] implementation, you have to issue (as root):"
-		elog "\t eselect lapack set ${libdir} ${me}"
-	fi
-}
-
-pkg_postrm() {
-	use eselect-ldso || return
-
-	eselect blas validate
-	eselect lapack validate
-}
diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild
deleted file mode 100644
index 72b89dba3ea2..000000000000
--- a/sci-libs/lapack/lapack-3.8.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake-utils
-
-DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
-HOMEPAGE="https://www.netlib.org/lapack/"
-SRC_URI="https://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"
-IUSE="lapacke doc eselect-ldso"
-# TODO: static-libs 64bit-index
-
-RDEPEND="
-	eselect-ldso? ( >=app-eselect/eselect-blas-0.2
-	>=app-eselect/eselect-lapack-0.2 )
-	!app-eselect/eselect-cblas
-	virtual/fortran
-	doc? ( app-doc/blas-docs )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCBLAS=ON
-		-DLAPACKE=$(usex lapacke)
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use eselect-ldso || return
-	# Create private lib directory for eselect::blas (ld.so.conf)
-	dodir /usr/$(get_libdir)/blas/reference
-	dosym ../../libblas.so usr/$(get_libdir)/blas/reference/libblas.so
-	dosym ../../libblas.so.3 usr/$(get_libdir)/blas/reference/libblas.so.3
-	dosym ../../libcblas.so usr/$(get_libdir)/blas/reference/libcblas.so
-	dosym ../../libcblas.so.3 usr/$(get_libdir)/blas/reference/libcblas.so.3
-
-	# Create private lib directory for eselect::lapack (ld.so.conf)
-	dodir /usr/$(get_libdir)/lapack/reference
-	dosym ../../liblapack.so usr/$(get_libdir)/lapack/reference/liblapack.so
-	dosym ../../liblapack.so.3 usr/$(get_libdir)/lapack/reference/liblapack.so.3
-}
-
-pkg_postinst() {
-	use eselect-ldso || return
-
-	local me=reference libdir=$(get_libdir)
-	# check eselect-blas
-	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
-	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_blas} == ${me} || -z ${current_blas} ]]; then
-		eselect blas set ${libdir} ${me}
-		elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
-	else
-		elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
-		elog "To use blas [${me}] implementation, you have to issue (as root):"
-		elog "\t eselect blas set ${libdir} ${me}"
-	fi
-
-	# check eselect-lapack
-	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
-	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_lapack} == ${me} || -z ${current_lapack} ]]; then
-		eselect lapack set ${libdir} ${me}
-		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
-	else
-		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
-		elog "To use lapack [${me}] implementation, you have to issue (as root):"
-		elog "\t eselect lapack set ${libdir} ${me}"
-	fi
-}
-
-pkg_postrm() {
-	use eselect-ldso || return
-
-	eselect blas validate
-	eselect lapack validate
-}
diff --git a/sci-libs/lapack/lapack-3.9.0-r1.ebuild b/sci-libs/lapack/lapack-3.9.0-r1.ebuild
deleted file mode 100644
index 06888886084a..000000000000
--- a/sci-libs/lapack/lapack-3.9.0-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
-HOMEPAGE="https://www.netlib.org/lapack/"
-SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${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"
-# TODO: static-libs 64bit-index
-IUSE="lapacke deprecated doc eselect-ldso test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	!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}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build-tests.patch"
-)
-
-src_prepare() {
-	use deprecated && eapply "${FILESDIR}/${P}-deprecated-headers.patch"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCBLAS=ON
-		-DLAPACKE=$(usex lapacke)
-		-DBUILD_DEPRECATED=$(usex deprecated)
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	use eselect-ldso || return
-	# Create private lib directory for eselect::blas (ld.so.conf)
-	dodir /usr/$(get_libdir)/blas/reference
-	dosym ../../libblas.so usr/$(get_libdir)/blas/reference/libblas.so
-	dosym ../../libblas.so.3 usr/$(get_libdir)/blas/reference/libblas.so.3
-	dosym ../../libcblas.so usr/$(get_libdir)/blas/reference/libcblas.so
-	dosym ../../libcblas.so.3 usr/$(get_libdir)/blas/reference/libcblas.so.3
-
-	# Create private lib directory for eselect::lapack (ld.so.conf)
-	dodir /usr/$(get_libdir)/lapack/reference
-	dosym ../../liblapack.so usr/$(get_libdir)/lapack/reference/liblapack.so
-	dosym ../../liblapack.so.3 usr/$(get_libdir)/lapack/reference/liblapack.so.3
-}
-
-pkg_postinst() {
-	use eselect-ldso || return
-
-	local me=reference libdir=$(get_libdir)
-	# check eselect-blas
-	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
-	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_blas} == ${me} || -z ${current_blas} ]]; then
-		eselect blas set ${libdir} ${me}
-		elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
-	else
-		elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
-		elog "To use blas [${me}] implementation, you have to issue (as root):"
-		elog "\t eselect blas set ${libdir} ${me}"
-	fi
-
-	# check eselect-lapack
-	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
-	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_lapack} == ${me} || -z ${current_lapack} ]]; then
-		eselect lapack set ${libdir} ${me}
-		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
-	else
-		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
-		elog "To use lapack [${me}] implementation, you have to issue (as root):"
-		elog "\t eselect lapack set ${libdir} ${me}"
-	fi
-}
-
-pkg_postrm() {
-	use eselect-ldso || return
-
-	eselect blas validate
-	eselect lapack validate
-}
diff --git a/sci-libs/libbufr/Manifest b/sci-libs/libbufr/Manifest
deleted file mode 100644
index cd9fc5d2226e..000000000000
--- a/sci-libs/libbufr/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libbufr-000405-makefile.patch 2365 BLAKE2B 6225f70528471535d6b9466b133cd52968e00da68ad0644b05dff4621f0e239d6addab0047ce1b7ee26b312a6f2d9fc416ac53677664e144207c97d545ccc08f SHA512 1a1fb37c5de730c8158572285f5677c61d4bba28da1b9d0651223d0b37b69034f3f2a003c38dc8a0dc96018b2cc476c612379a1d9b58983c83fe8c3600df6569
-DIST bufrdc_000405.tar.gz 11873311 BLAKE2B e8282fc539b80365420c538afd911aaba698d6a60d15018eae2d4f00e0838c3f665894078b2c0969b4558841187dd6a4a9e620468cebd5b08e171a2c18c85288 SHA512 3355d6bac54ef152f9feb13ae13f3c94f4e01a665a4b9bc7f85f0c98f9aa37411170668ba9adfb6b62c2fe906d0dff67b03a708cdf1acd21a0037e327c7c6169
-EBUILD libbufr-000405.ebuild 4873 BLAKE2B 9c910315627e2761988ce4c74473387afa6ce3e0c526f2a9484ac04df3b587b238a8080d9e396f2fb2f37110d9c3f443030e801d335ff658a05e9379d83baa3a SHA512 7279353bb95e4b17c1f9f54405785a2bdb4ab8a525790479eba30b32a85df0db6dd2d0245cff668b0bef46f0b04e10fbe99b2adc96cb964100b260e6f50ea9e7
-MISC metadata.xml 363 BLAKE2B 2dab9b26967698d13d706be1e09ea46c884acb8c0a88ac8180677d216d6cbc1c7471a26f87f821210f9f4514781fe7bd128f0c71c4b27939f20b31c016248b56 SHA512 5a7ba27b8f7eacc31f5ccb682618adbfb8b5a37ac572164dcad4231b8f57a06ce345d76d7081ffa13875d7b7a9088789ef287796726ba95672dc0227f70fb3b6
diff --git a/sci-libs/libbufr/files/libbufr-000405-makefile.patch b/sci-libs/libbufr/files/libbufr-000405-makefile.patch
deleted file mode 100644
index 08b30ded8d72..000000000000
--- a/sci-libs/libbufr/files/libbufr-000405-makefile.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- Makefile.orig	2016-01-04 13:09:58.661150785 -0800
-+++ Makefile	2016-01-04 13:17:12.707621825 -0800
-@@ -1,7 +1,7 @@
- #                                Makefile for libbufrex
- #
- R64 = R64
--TARGETS = all clean
-+TARGETS = all clean test
- LIBRARY = libbufr$(R64).a
- SHELL=/bin/sh
- SUBDIRS = fortranC bufrdc pbio bufrtables examples
-@@ -11,12 +11,14 @@
- 	( echo "*************************"; \
- 	  echo "*** Make in $$name "; \
- 	  echo "*************************"; \
--	cd $$name ; make ; ) done
-+	$(MAKE) -C $$name LIB=bufr ; ) done
-+
-+test :
- 	./test.sh
- 	tables_tools/check_tables.sh bufrtables
- 
- clean   :
- 	@for name in $(SUBDIRS); do\
--	( echo "*** Clean in $$name ***" ;cd $$name ; make clean ); \
-+	( echo "*** Clean in $$name ***" ;$(MAKE) -C $$name clean ); \
- 	done
- 	rm -f $(LIBRARY)
---- examples/Makefile.in.orig	2016-01-04 13:42:39.790648703 -0800
-+++ examples/Makefile.in	2016-01-04 13:45:02.384967830 -0800
-@@ -16,19 +16,19 @@
- #
- #
- TARGETS  = all clean
--EXECS    = decode_bufr decode_bufr_image bufr_decode_all tdexp tdexp create_bufr
-+EXECS    = decode_bufr decode_bufr_image bufr_decode_all bufr_compress tdexp create_bufr
- #
- #
- all :$(EXECS)
- 
--decode_bufr: decode_bufr.o 
-+decode_bufr: decode_bufr.o
- 	$(FC) $(FFLAGS) -o $@ decode_bufr.o -L$(PLACE) -l$(LIB)$(R64)
- 
--bufr_decode_all: bufr_decode_all.o 
--	$(FC) $(FFLAGS) -o $@ bufr_decode_all.o -L$(PLACE) -l$(LIB)$(R64) 
-+bufr_decode_all: bufr_decode_all.o
-+	$(FC) $(FFLAGS) -o $@ bufr_decode_all.o -L$(PLACE) -l$(LIB)$(R64)
- 
--bufr_compress: bufr_compress.o 
--	$(FC) $(FFLAGS) -o $@ bufr_compress.o -L$(PLACE) -l$(LIB)$(R64) 
-+bufr_compress: bufr_compress.o
-+	$(FC) $(FFLAGS) -o $@ bufr_compress.o -L$(PLACE) -l$(LIB)$(R64)
- 
- bufr2crex   : bufr2crex.o
- 	$(FC) $(FFLAGS) -o $@ bufr2crex.o -L$(PLACE) -l$(LIB)$(R64) -lcrex$(R64)
-@@ -48,4 +48,4 @@
- clean   :
- 	@for name in $(EXECS); do\
- 	(rm -f $$name *.o ); \
--	done 
-+	done
---- bufrtables/Makefile.orig	2016-01-04 14:03:47.292850644 -0800
-+++ bufrtables/Makefile	2016-01-04 14:05:22.242500485 -0800
-@@ -25,11 +25,14 @@
- OBJECTS      = $(OBJECTS.F) $(OBJECTS.c) 
- #
- #
--all:  links 
-+all:  pgms links
- 
- links: 
- 	./clean.sh
- 	./links.sh
-+
-+pgms: bufr2txt_tables bufr_split_tables txt2bufr_tables
-+
- bufr2txt_tables: bufr2txt_tables.f
- 	$(FC) $(FFLAGS) -o bufr2txt_tables bufr2txt_tables.f $(LIBRARY)
- bufr_split_tables: bufr_split_tables.f
diff --git a/sci-libs/libbufr/libbufr-000405.ebuild b/sci-libs/libbufr/libbufr-000405.ebuild
deleted file mode 100644
index 85febe3abf26..000000000000
--- a/sci-libs/libbufr/libbufr-000405.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch fortran-2 toolchain-funcs
-
-MY_P="${PN/lib/}dc_${PV}"
-
-DESCRIPTION="ECMWF BUFR library - includes both C and Fortran example utilities"
-HOMEPAGE="https://software.ecmwf.int/wiki/display/BUFR/BUFRDC+Home"
-SRC_URI="https://software.ecmwf.int/wiki/download/attachments/35752466/${MY_P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-# needs someone to test on these: ~alpha ~hppa ~ia64 ~sparc etc ...
-
-IUSE="debug doc examples"
-
-RDEPEND="
-	virtual/fortran
-	"
-
-DEPEND="sys-apps/findutils"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	case "$(tc-getFC)" in
-		*gfortran)
-			export CNAME="_gfortran"
-			;;
-		*g77)
-			export CNAME="_gnu"
-			;;
-		*pgf90|*pgf77)
-			export CNAME=""
-			;;
-		ifc|ifort)
-			export CNAME="_intel"
-			;;
-	esac
-
-	elog "Note non-GNU compilers are not currently supported on non-x86"
-	elog "architectures.  If you need it, please submit a patch..."
-
-	export target="linux"
-	export A64=""
-	export R64=""
-	case "${ARCH}" in
-		amd64)
-			export R64="R64"
-			export A64="A64"
-			;;
-		ppc64)
-			export target="ppc_G5"
-			;;
-		ppc)
-			export target="ppc"
-			;;
-		*)
-			;;
-	esac
-}
-
-src_prepare() {
-	update_configs
-	epatch "${FILESDIR}"/${P}-makefile.patch
-
-	local config="config/config.$target$CNAME$R64$A64"
-
-	if [[ "${ARCH}" == "ppc" ]] ; then
-		sed -i -e "s|= -mcpu=G4 -mtune=G4|= |" ${config}
-	elif [[ "${ARCH}" == "ppc64" ]] ; then
-		sed -i -e "s|= -mcpu=G5 -mtune=G5|= |" \
-			-e "s|-fdefault-real-8|-fdefault-real-8 -fdefault-double-8|" \
-			${config}
-	elif [[ "${ARCH}" == "amd64" ]] ; then
-		cp ${config}.in ${config}
-		sed -i -e "s|-fdefault-real-8|-fdefault-real-8 -fdefault-double-8|" \
-			${config}
-	else
-		cp ${config}.in ${config} || die "Error updating config!"
-	fi
-
-	sed -i -e "s:DEBUG = -O2:DEBUG = -g:g" ${config}
-	use debug || sed -i -e "s:DEBUG = -g:DEBUG =:g" ${config}
-
-	# add local CFLAGS to build flags
-	sed -i -e "s|\$(DEBUG)|${CFLAGS} \$(DEBUG) -fPIC|" \
-		-e 's|emos|/usr/share/bufrtables|g' ${config}
-
-	# add local LDFLAGS to bins
-	sed -i \
-		-e "s|-o|${LDFLAGS} -fPIC -o|" \
-		examples/Makefile \
-		bufrtables/Makefile
-}
-
-src_compile() {
-	export BUFR_TABLES="${S}"/bufrtables
-	EBUILD_ARCH="${ARCH}"
-	EBUILD_CFLAGS="${CFLAGS}"
-	unset ARCH CFLAGS
-
-	tc-export CC FC AR NM RANLIB
-	export STRIP="/bin/true"
-	TC_FLAGS="CC=$CC FC=$FC AR=$AR RANLIB=$RANLIB"
-	ARFLAGS="rv"
-
-	# emake won't work with this fossil...
-	BUFRFLAGS="ARCH=$target R64=$R64 CNAME=$CNAME"
-	make $TC_FLAGS ARFLAGS="${ARFLAGS}" $BUFRFLAGS || die "make failed"
-
-	generate_files
-
-	ARCH="${EBUILD_ARCH}"
-	CFLAGS="${EBUILD_CFLAGS}"
-}
-
-src_test() {
-	unset ARCH CFLAGS
-	BUFRFLAGS="ARCH=$target R64=$R64 CNAME=$CNAME"
-	make $BUFRFLAGS test || die "make test failed"
-
-	ARCH="${EBUILD_ARCH}"
-	CFLAGS="${EBUILD_CFLAGS}"
-}
-
-src_install() {
-	# install library
-	dolib.a libbufr$R64.a
-
-	dosbin bufrtables/{bufr2txt_tables,bufr_split_tables,txt2bufr_tables}
-	dobin examples/{bufr_decode_all,create_bufr,decode_bufr,decode_bufr_image,tdexp}
-
-	keepdir /usr/share/bufrtables
-	insinto /usr/share/bufrtables
-	doins -r bufrtables/{B,C,D}*.*
-
-	# files generated above
-	doenvd 20${PN}
-
-	dodoc README
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins doc/*.pdf
-	fi
-
-	if use examples ; then
-		newdoc examples/README README.examples
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/{*.F,*.c,Makefile}
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "This is the only GPL'd BUFR decoder library written in C/Fortran"
-	elog "but the build system is an old kluge that pre-dates the discovery"
-	elog "of fire.  File bugs as usual if you have build/runtime problems."
-	elog ""
-	elog "The default BUFR tables are stored in /usr/share/bufrtables, so"
-	elog "add your local tables there if needed.  Only a static lib is"
-	elog "installed currently, as shared lib support is incomplete (feel"
-	elog "free to submit a patch :)"
-	elog ""
-	elog "The installed user-land bufr utilities are just the examples;"
-	elog "the main library is really all there is (and there are no man"
-	elog "pages either).  Install the examples and use the source, Luke..."
-	elog
-}
-
-generate_files() {
-	## Do not remove blank lines from the response file
-	cat <<-EOF > 20${PN}
-	BUFR_TABLES="/usr/share/bufrtables"
-	EOF
-}
-
-update_configs() {
-	find . -type f -name \*.distinct -o -name \*.f -o -name \*.in \
-		 | xargs chmod -x
-	cp options/options_linux options/options_ppc
-	cp options/options_linux options/options_ppc_G5
-	cp pbio/sources.linux pbio/sources.ppc
-	cp pbio/sources.linux pbio/sources.ppc_G5
-	pushd config > /dev/null
-		cp config.ppc_gfortran.in config.ppc_gfortran
-		cp config.ppc_gfortranR64.in config.ppc_gfortranR64
-		cp config.ppc_gfortran_G5.in config.ppc_gfortran_G5
-		cp config.ppc_gfortranR64_G5.in config.ppc_gfortranR64_G5
-	popd > /dev/null
-}
diff --git a/sci-libs/libbufr/metadata.xml b/sci-libs/libbufr/metadata.xml
deleted file mode 100644
index 17252cf7e7b1..000000000000
--- a/sci-libs/libbufr/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		This is the only useable open source BUFR library (from ECMWF) 
-		and comes with a few example tools (some of which are built
-		and installed).
-	</longdescription>
-</pkgmetadata>
diff --git a/sci-libs/libcifpp/Manifest b/sci-libs/libcifpp/Manifest
index ad9cd64ad687..440ea42bb5c6 100644
--- a/sci-libs/libcifpp/Manifest
+++ b/sci-libs/libcifpp/Manifest
@@ -1,4 +1,4 @@
 DIST components-2.0.4.cif.gz 81445161 BLAKE2B 80d538109a716af0273d109151a434e68cc1be16dc3a21653a4b78dd9719c93f59259146a6e980fbab4484a6b41d32064a276566411e23bf56b0a42b6dacf408 SHA512 a154305f1d3ba2df24ca3859b0a7d1a81cae79c927a708a531bee1689b0b65752fd68032d12335afa4b6b2f5969e003365abd49bed729d740c0f3055328f08ad
 DIST libcifpp-2.0.4.tar.gz 960402 BLAKE2B 4650478b187ece13d38c0a5f13c94e6098e3271088a7dd19d72645d52d085304a463387f9d1b1edacbcd03a051b32fbf2384e3287d5ff4835091f2eae2fe2805 SHA512 f4a6b126b376b245d399508e9bc360bcf0451e6bd3cad3127567dd95afb1965c8eb764bb9b0bf26be26695fc5636e509709bdbc9f8c9a00939d049c1634dcae0
-EBUILD libcifpp-2.0.4.ebuild 761 BLAKE2B d619db8fa0d30c8353fe303a22aaad764cd131421053a77bc494ccd73b4e58864c32fcbec5ed1826fc1374db73e7b80c4292721f4c9494e5eacca026552ee9e3 SHA512 1e92802a4f4fe3c65cd89ef917daf0988bbdaed890ba0edbc549ac9350eae394db0a16bb783faf84d55b16b388edc9c1f6fbf9d1acfd83a4b25385d1b2f14f85
+EBUILD libcifpp-2.0.4-r1.ebuild 753 BLAKE2B 7f03e0bbece535a1461bf34900f2188db6b01416b20ae0d02b8a4a138589462fdc1519f069785ce340256d9b3eff0ca21f3618aa0d6aa625a89ae1813b619fd6 SHA512 61f02fd73ccc0e31e52d48bfd34b29cc9cb043db999f9297320acedc2eb41e4714fa4f7deb507314ac20dc28d188b559120a400b487113c6831f787c0d8b1609
 MISC metadata.xml 217 BLAKE2B f8189b02494f180dac078dcd5c275d3c795f20f360f8b172c66065a2d937e396b24b8631bba4cd8567d60285ce89fc77b9539f2233bf33899c820613c48c33ba SHA512 f0c9e5b3d281fecd21b1e23a6f44c94c1c0b3220de46a177d35932111b7f1ab4399061c42833ac1ee9bd0324b139fc8db66e0d2890224d607bd3be38ae469be9
diff --git a/sci-libs/libcifpp/libcifpp-2.0.4.ebuild b/sci-libs/libcifpp/libcifpp-2.0.4-r1.ebuild
index 1cbb3962edf8..3064d4f1e9b0 100644
--- a/sci-libs/libcifpp/libcifpp-2.0.4.ebuild
+++ b/sci-libs/libcifpp/libcifpp-2.0.4-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 inherit cmake
 
 DESCRIPTION="Code to work with mmCIF and PDB files"
@@ -14,15 +15,11 @@ SRC_URI="
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
-
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	>=dev-libs/boost-1.70.0:0=[threads(+)]
-"
-DEPEND=""
-RDEPEND=""
+DEPEND=">=dev-libs/boost-1.70:=[threads(+)]"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	cp "${WORKDIR}"/components-${PV}.cif data/components.cif || die
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 72685ecdcd3b..a379d83033e8 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,5 +1,7 @@
 DIST libqalculate-3.20.1.tar.gz 2107300 BLAKE2B 79314cbe2adb183a17f96947b8ad4fa0bbfea665f7b9afda67785059e9bc0d94599b05cd55999302fc5e1216929b4ed98db4e2a6ae0c6fc74ebdd37dc6dcb72e SHA512 65a723c257c9e2419fc60ca254c23a7a7dd4d9a31beaa9c8fcf41a1e252e5f3be08e1160dcc72a0a407fe3ffd3e73353b141e40019871677a490d8c810c96931
 DIST libqalculate-3.21.0.tar.gz 2117414 BLAKE2B eaf8b886e716a6f8e9631dbda6533906cc7c5ed986233d75b9384aefb4123479914715d37268db5e1d403d1ee1835cde77314abe5380768fce5c266d1c253ca3 SHA512 7ca876ffe359ab2c6c6ae266007f489f9cd26f6650d6ace4e1d80cc660d16294cce601ed81046baca25cc4ec41668498af0a555fddc47c4118241e72af039614
+DIST libqalculate-3.22.0.tar.gz 2150167 BLAKE2B 2023dc00e516f26d93e6acae66acb6211fb4dd234fba7e1e012c29ea224276040e75552b923b275e0cbe3e168ed419849f7f204aac3952a872ad0f1916470358 SHA512 2fc7e9e2edda0dfa221865050068eead29f9fecfef8eb8817bacc7493ed03215c60931b40e69165f565fc0574e370131ebebd9b247fedafc5821aae35b71dac9
 EBUILD libqalculate-3.20.1-r1.ebuild 1609 BLAKE2B bd23938bca6883b4216aeeee4089135397d503cbbbab4fb3b839cb8c10adec7780adc5591f202fc03cd042c598a7a6193d2353652af38a09f68b658723f2b041 SHA512 df46c547e21e416ff03f73571098b474bdba5ea5c797a03b8f0c46f2edbe6163d30c2c6039ede337c538708d46f549ce2f7c97ad2b7e41ae6faa10c13ac32002
-EBUILD libqalculate-3.21.0.ebuild 1615 BLAKE2B 9b9bcfa9320e58705629113ea7dec433dd1e63904f09a687036d5ff41219ef9ac330e3643ce85107fec7b77644145e2f917333fec14ac7a07c705e72c196f1ff SHA512 e177b95d170ca9da253e946c7c1a375a24cacb180436e2cfa8bc3b8a8f35cd7c8c056d48a59577659fdd2a58517bf07983655307def142907f13d6c3890cec11
+EBUILD libqalculate-3.21.0.ebuild 1659 BLAKE2B 1935f1c45853dca19ca328a9dcf2d483978cc7deabd164c9fb07a031d75e2aec7b7797d237c0f807f25399677efb06fb15c5203bd978034d0600eef497c5ca3e SHA512 0e005722cb40663ff315de407df3284f4c45a2342349bea8edbccaef52fc6a86b185e7954a707a857b8eb8a1b386ad46dcc0a68eeacd90098a807d28dd49cb79
+EBUILD libqalculate-3.22.0.ebuild 1779 BLAKE2B e7c473a397155083881de30343ca2324957decd20f0ed03871c89d34733d4b741a14c9a3f057272f2f6e147c27c69ffd5c00439a7f89874f98079cab1164c2b1 SHA512 08333db34e338e746bfb83fe39a5d124073fc7705367dc3f7da197457ebeabef82eedb0d966d31dfffe1ab589ae2f332baa703a03e6aaa19d92237f7583da0e0
 MISC metadata.xml 413 BLAKE2B 40f271cbe3f5ca30aa6ec6320d382faef0864e064ae57599a6da937da85b4de9d57eeec6f8b737698ede76d663149b13247d1edf8b5b291de19ac3d6b5266492 SHA512 053e75b77c4ff628535db22d9763e27c32cee904f0b268d2d507f367c938aff5bdd75a66e3f4c2316dc1d3db579d721564d3a12e139740a3a0d50c36f8d52e94
diff --git a/sci-libs/libqalculate/libqalculate-3.21.0.ebuild b/sci-libs/libqalculate/libqalculate-3.21.0.ebuild
index 65c9f8a2022c..c07e53ae32bb 100644
--- a/sci-libs/libqalculate/libqalculate-3.21.0.ebuild
+++ b/sci-libs/libqalculate/libqalculate-3.21.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+# Bump with sci-calculators/qalculate-gtk!
+
 inherit toolchain-funcs
 
 DESCRIPTION="A modern multi-purpose calculator library"
diff --git a/sci-libs/libqalculate/libqalculate-3.22.0.ebuild b/sci-libs/libqalculate/libqalculate-3.22.0.ebuild
new file mode 100644
index 000000000000..0ffd8ea2aa13
--- /dev/null
+++ b/sci-libs/libqalculate/libqalculate-3.22.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bump with sci-calculators/qalculate-gtk!
+
+inherit toolchain-funcs
+
+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"
+# SONAME changes pretty often on bumps. Check!
+SLOT="0/22"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="curl icu gnuplot readline test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libxml2:2
+	dev-libs/mpfr:0=
+	virtual/libiconv
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:= )
+	readline? ( sys-libs/readline:0= )"
+RDEPEND="${DEPEND}
+	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
+BDEPEND="dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	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() {
+	# Needed for po-defs/Makefile
+	export CXX_FOR_BUILD="$(tc-getBUILD_CXX)"
+	export CXXCPP_FOR_BUILD="$(tc-getBUILD_CXX) -E"
+
+	# bug #792027
+	tc-export CC
+
+	econf \
+		$(use_enable test tests) \
+		$(use_enable test unittests) \
+		$(use_with curl libcurl) \
+		$(use_with gnuplot gnuplot-call) \
+		$(use_with icu) \
+		$(use_with readline)
+}
+
+src_install() {
+	# docs/reference/Makefile.am -> referencedir=
+	emake \
+		DESTDIR="${D}" \
+		referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		install
+
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest
index f737dd679f42..150870eceb9d 100644
--- a/sci-libs/libxc/Manifest
+++ b/sci-libs/libxc/Manifest
@@ -1,7 +1,9 @@
 DIST libxc-5.1.0.tar.gz 42951890 BLAKE2B 32ce8d15547882455e01cbf9d4ee8780b97059d5b710f25b799779a5efe7326c376a53111102f3d5e0853bb89ba1f4dd9c2f219cfb4d3f91a2f6e1100f8fb47a SHA512 615b82290e87a48484f6dbe41cd8f1538ba6201b99fc97be2db64b66232fa4349fe6cebfb51566098db3cabd7aff662bb7ace43a811507bff2e93afd03d56ce4
 DIST libxc-5.1.4.tar.gz 43036222 BLAKE2B 10348ccd2e8e512bf576a03eb19bf714ae4f0e590ae3a7266ae8f46c42ee12ef91e049f0007ce42023e7f13c865fedef6d1ab0fb76195ca47f62a50702741c49 SHA512 ef7f44e773a0a8a9c1a53ddd12301e123f9a4606f22420cf011d579314c1bf3164b82299aca0ef32cb130b380e5e9534d4fcc658c549ac4cb8b6f86d025cfe1e
 DIST libxc-5.1.6.tar.gz 45121466 BLAKE2B 393c85b49b1cc515abd4767a01cc56958585aac74d9913f60c304f102e76c0f3903dab326779ea7e466c19389309b2bcf49a4e0833d8f869a185b6143e1ecf29 SHA512 7e65753ca93c2174e3644f519651c59305b2fc4919de99ca2278c42a359641ced73b5c661c5315fe73b55a69ac4b7568ab1be754fc06b40bdf790881ba3ed2cb
+DIST libxc-5.1.7.tar.gz 46172191 BLAKE2B e18acd864a5de7c93ce5499b79f60db473851ac6df35461bf0f13d16321fd2f68949a21b060aeed9c220a546c9aae614357f9815379356c9c9356555f4acc10a SHA512 ccb535e9d9427bdc9b2d05fae21995c92ae08efb64d51adaae44efc018bd9e5f7807d3a8ab073bb279968284e67bde80bba8a90d95145a484b396784ae072974
 EBUILD libxc-5.1.0.ebuild 752 BLAKE2B 37da5534623ea30c51c80d269d9132de218329f5960abe52d8f2ed5b135cc2eb0b8749f63b89b82fbdeba28bf2c9802747bbbd7006a8ba4262bc17f16b6649d4 SHA512 43452f6781c300ada25e69d2459b4e9f6f80a770b035e5f3737a80161864cfca4cec74c0c9f495749037b735d183a59e0d5e4db9a550a5e0ba80d2500224df13
 EBUILD libxc-5.1.4.ebuild 753 BLAKE2B af1a4fe2041accdb77040a1eb8051bfb0142a214c53bdd8268d7b3bb4a5812e54b32bfeb97f9231159ee5ffcef874e940a7c4a804c7a3c79d82054cc8843d3c2 SHA512 daca4b601869aeb62ac6304cc015a3f53f0c59ad6add0c29a46be4c68422a407860a18b86cb35d5007b21fa683cf9e32a7f6306bcc2f9bc0893cf965dfad9c44
 EBUILD libxc-5.1.6.ebuild 753 BLAKE2B 8a0e13d6553666886cb11c12d3df82b09096e1dc231df71727f22059a3a323a0e7b7de64e8fe10bc41966ad29942231186155ca642e4a4e7ee79851116d97d03 SHA512 85be3aac7311925f8332d9bbabb6801f8d0c41365795d50d259528e473f1b9124a5ffa046e7afa537d69d5c47374d5e4d49cc6ec1133488e903b16abbb41221f
+EBUILD libxc-5.1.7.ebuild 735 BLAKE2B d6228aa9608f9da364a815cd01800fd82e14bc9916c1eb0c21bf6a43579074bc1e3d52da4819973b31de21ed353aec2a2b85502937c4444d8a3b8f4bdd554bb4 SHA512 de17cdc3ee8b24ea57a33d98ae7ada6cdf67847c10d17e561cf6c2c9a45859a020ee7cda759fec38a707495573975df27cc7d659efd143356a71d34e86598ba2
 MISC metadata.xml 1354 BLAKE2B 42f0a7dcce10dd20c3796ba2576097f639062e4854f0e035dc40fa4ca1f7c94841624531334953229c1b3514f8b481fab68d67f0fc215033d7bd1dfed05960f4 SHA512 ba2e5fde19b864b5b77b47dafaaae59e4fa2536c4eeac21fa830fb201c84ff07edd1c89c909eb0d33e1841f4c0ec741dd8d5215e789cb2b87648af32528d7050
diff --git a/sci-libs/libxc/libxc-5.1.7.ebuild b/sci-libs/libxc/libxc-5.1.7.ebuild
new file mode 100644
index 000000000000..47698dd02b85
--- /dev/null
+++ b/sci-libs/libxc/libxc-5.1.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools fortran-2
+
+DESCRIPTION="A library of exchange-correlation functionals for use in DFT"
+HOMEPAGE="https://octopus-code.org/wiki/Libxc"
+SRC_URI="https://gitlab.com/libxc/libxc/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="fortran test"
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable fortran)
+}
+
+src_install() {
+	default
+
+	dodoc ChangeLog.md
+
+	# no static archives
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/lmfit/Manifest b/sci-libs/lmfit/Manifest
index 12d59a5d3ffd..0d4542dd7788 100644
--- a/sci-libs/lmfit/Manifest
+++ b/sci-libs/lmfit/Manifest
@@ -1,4 +1,3 @@
-AUX lmfit-8.2.2-cmake.patch 2752 BLAKE2B 2a0d3cf9a4e206fe346257c62cbfa482fa60562a948d76dc3cb9e8060faca3d0e80bb706b8d9593ca1b4894a659542dff06684bfa9829216f6c07e2dcb9e4618 SHA512 7a20814d311ed768e02bb17e32802c017bb148e3877fecc8ef9a13ace865dfed403cc8fb7811aba12655166e0eafb59e8e60edbb4346b7c56553bb79d4cd608e
 AUX lmfit-9.0-cmake.patch 1599 BLAKE2B e0f4783b64436845a12f8ca0a45f93d4964dba3855adeb73cb466c1bc0b8652610f8fa610e816db33c0f027db0b86233c01358245cd42a2284e718b76c964b18 SHA512 7256873a0620a429c231cdd296a6dcf6dffd4caa2468f7a91ca0d3943488753155aeb32bdc5813e1404c52ca2ea9bdf48b7ecf736e1348a1b36c0fd8d555f0c3
 DIST lmfit-9.0.tar.gz 36686 BLAKE2B 34d77a9101dcea1387df09e58cf8b69e51b1961ba8f1f73ac070abcc4c6ddbf1a1cd1f4bf2568942442f0c4c3815288959259c16e505ad1a91a4db2a2753bed6 SHA512 523d18c75498f5586c55e6dfcab8d1005aaef61d60e8d482814ced4f90bcd14d72c53ee71ed1991651d38845cce67e3da756fab9500431d6f435fa5ad998c2b1
 EBUILD lmfit-9.0-r1.ebuild 504 BLAKE2B 656f6bfbc4f531e727e9234d5c77248f220c3440ea6a154aff5d6a843c3d0bd6bac71e5367b1201d89f3441bf99252fa7ad941a3e829b2186c70fc275b1c7d1b SHA512 8b2a4f817175aba9c8b645a984ea86e7ed76105a7974a5c6ef63147b2fc807570869f734efd780e76ff09a485dc52693e53ed19ae9b6d2f62860551611d07d0a
diff --git a/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch b/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch
deleted file mode 100644
index 482ecebe8294..000000000000
--- a/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 72dae8c23604288331c9a7f03f60ec792a384121 Mon Sep 17 00:00:00 2001
-From: christoph junghans <junghans@votca.org>
-Date: Mon, 22 Oct 2018 21:00:00 -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>
-Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
----
- CMakeLists.txt     | 10 +++++++---
- lib/CMakeLists.txt |  4 ++--
- man/CMakeLists.txt |  4 ++--
- 3 files changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dbb571e..279f06a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,7 +4,7 @@ cmake_policy(SET CMP0048 NEW)
- list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
- include(PreventInSourceBuilds)
- 
--project(lmfit VERSION 8.2.1 LANGUAGES C)
-+project(lmfit VERSION 8.2.2 LANGUAGES C)
- 
- # --- Declare project-wide user flags, and set default values ---
- option(FITTEST "Build with FitTest" OFF)
-@@ -23,12 +23,16 @@ else()
- endif()
- 
- include(CTest)
-+include(GNUInstallDirs)
- 
--set(destination ${CMAKE_INSTALL_PREFIX})
-+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")
-+endif()
- 
- configure_file("lmfit.pc.in" "lmfit.pc" @ONLY)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lmfit.pc"
--    DESTINATION "${destination}/lib/pkgconfig/")
-+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
- 
- add_subdirectory(lib)
- add_subdirectory(demo)
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index a266f4e..e071a3c 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -18,9 +18,9 @@ link_libm(${library_name})
- 
- 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 d4595fd..5505713 100644
---- a/man/CMakeLists.txt
-+++ b/man/CMakeLists.txt
-@@ -15,11 +15,11 @@ function(one_page pname section)
-         )
-     install(
-         FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section}
--        DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man${section}"
-+        DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}"
-         )
-     install(
-         FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.html
--        DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/lmfit/html"
-+	     DESTINATION "${CMAKE_INSTALL_DOCDIR}/html"
-         )
- endfunction()
- 
--- 
-2.20.1
-
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 54dc29580a09..b697a8992b10 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -9,5 +9,5 @@ AUX mkl-static-ilp64-seq.pc 333 BLAKE2B 4c21e956ae5d6ffd8b6e701458a37a74c74a04fc
 AUX mkl-static-lp64-iomp.pc 342 BLAKE2B eddd6bba13426762a47a306469613e2010f5882b5db312f757e94a3f468e95ea7099219cbe78e14d9ddf66b21ff5cb07074ed32f19b21ccd1e78a1f3dbf94ed6 SHA512 2f9550b64adae53a68baa9a6c1faaebb24a2e17cf74f6c50a8c5f149d5da759bf6607261d14e94ac46d8aad2bf32487e41e94f1a5bdda18eefde2c5f23a58294
 AUX mkl-static-lp64-seq.pc 331 BLAKE2B 5c234425fff2462f668fc8dd681a9c3d6d1c4e39f73ec4e5cb984eeeede1f84907ffcba3066b81912b7e8712d2dc154af5703d19d085b0f5a5fa3ab0290f2457 SHA512 b828a7513a491e852c65922159333418be026497d4b0b8b456607463af8b0d71da910e0eb4cd915f5a7eb1d0ff959c87bfc443df352f1f84ce9006530dd0af7f
 DIST mkl-2020.4.304.tar.gz 549319314 BLAKE2B 9ffdb0dc87c9fba1f003961f09cabef7376bd3d10e98085900c863383f0eb1e026f0f804390b2edf4e29d5b0b685af7b74092a7cb5cc871ca656462cec9487e4 SHA512 9c4ff7710484a1c0dd3e6ba7401eb6cb599f771651006b6a570c45b9abf1f43e8e400940d859a656c6892aa81e634c4d74eefe88e8287fdbb19a513f332326b7
-EBUILD mkl-2020.4.304.ebuild 6617 BLAKE2B 29b75f9f3ac32363d1cfe349028e12633f9bb3fdc1d20f13a0269c2dadc0e672349cf9eac99d2980af8e4407b2b254d12d92a18d24c8540b12e7bf0cfd86fc46 SHA512 626cabd6a497e7b53d8f118b1bec44236d5887a6e8a759cd36bfd0b0967fc18249d4a65d95aabfb52b802c73837ac491c9a536b7bb4d474e9b4d754df43f326d
+EBUILD mkl-2020.4.304.ebuild 6674 BLAKE2B abe1ed5d32ba1114aee0aa33c4b0259f1ce6f241dbfc146f344903ea5d815e81b4059a54df0ab2b934b3dd672f1471666565989981ed54bbf15283411e7bd8c1 SHA512 3deaa4858df6b8ddb58755ddcbfd62d11ea98af5b38597cfa916b80cf59b23fe043dd667b9b6c2f1d458545579002f07d375a484e0896aa7f6ef5572021baeae
 MISC metadata.xml 717 BLAKE2B 1e0c641fb3f818df9d2e952257722cf152e6978c6dd60203228031d5b040243b2a556c4b73daf74676b9152333389fe16d70a345c0f8b2d1527a040e0c14bf65 SHA512 c179f78da3f14f7859cc316248664c7beadb6344a5c7083533c5a3d9d564072fac3feebf9a7cb3506f7856c8d231b7b343882f41f6becd2c3a0164d7c08e909c
diff --git a/sci-libs/mkl/mkl-2020.4.304.ebuild b/sci-libs/mkl/mkl-2020.4.304.ebuild
index e90f9cb25172..daf81b2b41ea 100644
--- a/sci-libs/mkl/mkl-2020.4.304.ebuild
+++ b/sci-libs/mkl/mkl-2020.4.304.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
@@ -29,6 +29,8 @@ RDEPEND="
 	app-eselect/eselect-lapack
 	sys-libs/libomp[${MULTILIB_USEDEP}]
 "
+# bug #801460
+BDEPEND="app-arch/xz-utils[extra-filters]"
 
 QA_PREBUILT="*"
 QA_TEXTRELS="*"
diff --git a/sci-libs/netcdf-fortran/Manifest b/sci-libs/netcdf-fortran/Manifest
index 6a8ab14ed1ee..44ebd47adad5 100644
--- a/sci-libs/netcdf-fortran/Manifest
+++ b/sci-libs/netcdf-fortran/Manifest
@@ -1,3 +1,5 @@
 DIST netcdf-fortran-4.4.3.tar.gz 1286951 BLAKE2B 6e68505359328bac4155065419cb9c2fb2df0de875210c0eb9a4e63312b2ec272d63ecfa73b5dcebe7cf75b58a184d1a0ccb2c06c45869d3f4573590d610d9e0 SHA512 94f51b4be889d6a9d6a86e3fcb2639ac58288969160d0f334ed6965e3c9cbacff7289b1fc54ed06e6ec8b845b19f5c409fbdcab432c8edf5c96efde887920924
+DIST netcdf-fortran-4.5.3.tar.gz 1805683 BLAKE2B f32a36a77872e039a0c03a1f1ccdbb00761309dc7d255a1203b0a1971464e75d87f56230f28a5d5928ca3e7e388f52c4622836c2cea3d35b286161b8044e375b SHA512 fe4b2f6f8c44bf4fdeebe3cbd57ee44ccee15a70075428bb68f0d33b70f9291b68b542965634a27fb4be5a59c756d672a3d264f2628391861edb98a244e072b4
 EBUILD netcdf-fortran-4.4.3.ebuild 937 BLAKE2B 2ccb918d39570ade14e367cee764a6e3a9fdd166c87eb7c3124fef20f8c18015b95a8cb16b8e75f918d350594a001103f2306320c5e4afc174332ac22b531f59 SHA512 58f0e5ae08fe063a66847757fa737d856de2d7d213623fda7f3b00546a26841edb760e8534e6905393fe5e8e62fd8dd67c84b583681d316e76a4c93c470101da
+EBUILD netcdf-fortran-4.5.3.ebuild 1136 BLAKE2B 18dbe075b340157b64dae7600f8fe151d2cf370f59c8b129919952a6468e5e674086d7c0d80473699df301c53ede93081117a2485b35549bd0e22947af51c114 SHA512 a76df5cdddf2fc151052321141105656e0b532e4baf293906f9cab184917efe7419fc0e9fb01fb9bd26b42534c37856fc5487d281382c9a0674ab64626adcc0b
 MISC metadata.xml 839 BLAKE2B d1e207fbff3f9156dae38cf50061bcd12c6020597f015d513997c6781a111b21af791ad77536b16f6f4ba8a6caeeb69932f763cd23d3f488d362dfd46ecf3265 SHA512 9e14fb6d6eae551b58eecd88156ce33a47267e8e57dcd024b70ee31993d8026bc4a1e4a42f3d63a9f91a43dca5e80bb435f926692dcf2ec215d1f544826f40f8
diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.5.3.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.5.3.ebuild
new file mode 100644
index 000000000000..c5e5ff3a2d11
--- /dev/null
+++ b/sci-libs/netcdf-fortran/netcdf-fortran-4.5.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_STANDARD="77 90"
+
+inherit autotools fortran-2 flag-o-matic
+
+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/7"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples static-libs"
+
+RDEPEND="sci-libs/netcdf"
+DEPEND="${RDEPEND}
+	dev-lang/cfortran"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# GCC 10 workaround
+	# bug #723274
+	# (As of 4.5.3, configure is meant to check for this flag & use it
+	# but it doesn't seem to be doing that.)
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
+	econf \
+		--disable-valgrind \
+		--with-temp-large="${T}" \
+		--disable-dot \
+		$(use_enable doc doxygen) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use examples && dodoc -r examples
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 3f2a215112a6..9b71ba57406e 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,5 +1,8 @@
 AUX netcdf-4.7.4-big-endian-build.patch 1892 BLAKE2B 9209f042f86e4eb7d3c1359ff8c1c033eab2762aa6bf5b7a8f8e513ac52eddb2039c1728d77a2e038985a8612a04ba5654d27c872f92bcd54dde4237dc427288 SHA512 5d6cf04597897faed7ecdd4c8c182f3d22082569cbb726b25d8e922c853dbe4e7e8105c9470faaed50e254072f9411ebfc9aabc480858a0bd7fd8d77a9a2e87c
 AUX netcdf-4.7.4-big-endian-test.patch 689 BLAKE2B ab28269ee5922816e7ef7834dddec974c98951a41c0025041f9ee67d92c7bfe57887f5ac8d8beb2426e2c095fc06cf4b29046a9b29873b125d681b169c9613b6 SHA512 72575f890615a05a6f1beeebfd3edcd367fe148be017a32847b0a7db96c594e6bb5d01acd865257b25410e0a22699b1beef2c54748ccb09ea5e41009f4e0f9ee
+AUX netcdf-4.8.1-big-endian-build.patch 690 BLAKE2B ee79d940d47b69c7628d325b8a4b002942d7198d0a98b7d64a843056f2b0ac8888c9bd6cf37f74f5788a1b075a309c60a9e80a1e072dd1ff45cf3213ad7ffe4d SHA512 e2dcf92063806e56ec02df8a3b2dea97b67ee58768703db2672188d9837188f7bab68a04da2df78b6130c6d87137f8b9974b91d09eab8cd90dba77aadac6ea5e
 DIST netcdf-4.7.4.tar.gz 19711158 BLAKE2B b49532e6f87b458e7f5654f70ec932d6c8c81272c97ce44df3d27bb61b01d3e005f918b959ce12e42e26f7c12309ab72eeb57a35216d20ab5761837db65741a4 SHA512 15922818fdd71be285eb7dd2fc9be2594fe9af979de3ed316465636c7bbdaec65eb151ca57ef8b703e6a360cdba036b8f9bc193ddff01ff7ce4214c0a66efa79
-EBUILD netcdf-4.7.4.ebuild 1546 BLAKE2B 633f6501e4ad9d9cd64d573a02498e09f5b14b1a267581a8d9cefbdc66a888a4fc1df5891bfec098693fd969ae2de78fd9a5bf72c3d236a576960c9fa0688b29 SHA512 3714f027a2cc8d7e7ef542d7ad966982a300fdb41afdd8dae72650e7908abcbff9af67c316453c288063b9b1e2cbb9faf028bba2b7fc38d62db9e33e84aff065
+DIST netcdf-4.8.1.tar.gz 18957280 BLAKE2B 05fc6cd10cb5cbb11dc077b9a884fbc63c4cb840b241e782702da58ad9831fba065a6f1e97c2be092437735d39658482285850a00618d0582d6e4728d64c4402 SHA512 c97207867abf10d414abf34624268710f5b812c26c38f97e73afe00558b3f07917331fbc7fdb9e70b09813acf15a9a09bae2c432a3266ce10a791b9472f87a42
+EBUILD netcdf-4.7.4.ebuild 1703 BLAKE2B 33294c879140f07bce3943cf77ec41b36045dd9df219d0cf1f3784a683b6392a6c3adb5561c6b2f18048379580fd28c6782bea986a5b5f422c5ec103a7c64b13 SHA512 7d6ea028a446b4f0d8a5cfd8b22c15f582722ae3f6f839c28a42e3a45ed9ed7952ff8c3bd5b43471c02ba237d06707d8cba8399e489eb1cb1849a9fa7f3f39d8
+EBUILD netcdf-4.8.1.ebuild 1743 BLAKE2B 4a07739ecf990238a0061bac64d2a558bae47de233195ed60da1972dc6eaf80d6059ce907f12605b89b84515e6be1d3b766e67b4fff379878b2f378c2491229d SHA512 dc066b599f6953c0f27e90413201e00b271e7f7e211daa6a0ed91ec66c337e815858c469ac47fed77d9e80d71babd8c1f50f2beb377ea75c61f7b0b2702fb83b
 MISC metadata.xml 1065 BLAKE2B 7e661019c6f97a0720a45cc93a59079834135a1994ab9abd90b769dec892c4b0ad60f09b87b6e15ceda6ee99f289a992ca8315a1d168a3eec6d50d09b6de1273 SHA512 fe82704383f8021a861936927fc9a1450257433d6589f1b4bfef3fd0527b912543813ff8d66c6fe33d98cb7a16bcbcb26149df8d809f92fa2e48c6fb83c8455b
diff --git a/sci-libs/netcdf/files/netcdf-4.8.1-big-endian-build.patch b/sci-libs/netcdf/files/netcdf-4.8.1-big-endian-build.patch
new file mode 100644
index 000000000000..afeff7e3fbd0
--- /dev/null
+++ b/sci-libs/netcdf/files/netcdf-4.8.1-big-endian-build.patch
@@ -0,0 +1,24 @@
+Later version for 4.8.1 grabbed from Debian:
+https://sources.debian.org/patches/netcdf/1:4.8.1-1/byteswap.patch/
+
+Earlier version used:
+https://github.com/DennisHeimbigner/netcdf-c/commit/6f86660da86f279cad1f2804cf3242767de27630.patch
+https://github.com/Unidata/netcdf-c/issues/1687
+https://bugs.gentoo.org/772863
+
+Description: Add forward declarations for byteswap8 & byteswap4.
+Author: Dennis Heimbigner
+Bug: https://github.com/Unidata/netcdf-c/issues/1687
+
+--- a/libdispatch/dfilter.c
++++ b/libdispatch/dfilter.c
+@@ -20,6 +20,9 @@
+ #include "hdf5internal.h"
+ #endif
+ 
++static void byteswap8(unsigned char*);
++static void byteswap4(unsigned char*);
++
+ /*
+ Unified filter related code
+ */
diff --git a/sci-libs/netcdf/netcdf-4.7.4.ebuild b/sci-libs/netcdf/netcdf-4.7.4.ebuild
index a537ce445a22..793ea43ad586 100644
--- a/sci-libs/netcdf/netcdf-4.7.4.ebuild
+++ b/sci-libs/netcdf/netcdf-4.7.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake
+inherit cmake flag-o-matic
 
 DESCRIPTION="Scientific library and interface for array oriented data access"
 HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
@@ -49,6 +49,11 @@ src_prepare() {
 src_configure() {
 	use mpi && export CC=mpicc
 
+	# Temporary workaround for test breakage
+	# https://github.com/Unidata/netcdf-c/issues/1983
+	# bug #827042
+	append-flags -fno-strict-aliasing
+
 	local mycmakeargs=(
 		-DENABLE_DAP_REMOTE_TESTS=OFF
 		-DBUILD_UTILITIES=$(usex tools)
diff --git a/sci-libs/netcdf/netcdf-4.8.1.ebuild b/sci-libs/netcdf/netcdf-4.8.1.ebuild
new file mode 100644
index 000000000000..9d62cbfcef3d
--- /dev/null
+++ b/sci-libs/netcdf/netcdf-4.8.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+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"
+S="${WORKDIR}/${PN}-c-${PV}"
+
+LICENSE="UCAR-Unidata"
+SLOT="0/18"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="+dap doc examples hdf +hdf5 mpi szip test tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/libxml2
+	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="virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+REQUIRED_USE="
+	test? ( tools )
+	szip? ( hdf5 )
+	mpi? ( hdf5 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.1-big-endian-build.patch"
+	"${FILESDIR}/${PN}-4.7.4-big-endian-test.patch"
+)
+
+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
+
+	# Temporary workaround for test breakage
+	# https://github.com/Unidata/netcdf-c/issues/1983
+	# bug #827042
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		-DENABLE_DAP_REMOTE_TESTS=OFF
+		-DENABLE_LIBXML2=ON
+		-DBUILD_UTILITIES=$(usex tools)
+		-DENABLE_DAP=$(usex dap)
+		-DENABLE_DOXYGEN=$(usex doc)
+		-DENABLE_EXAMPLES=$(usex examples)
+		-DENABLE_HDF4=$(usex hdf)
+		-DENABLE_NETCDF_4=$(usex hdf5)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# fails parallel tests: bug #621486
+	cmake_src_test -j1
+}
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 34ada6e9fffb..b9db4cc5ad39 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,7 +1,4 @@
-AUX dont-clobber-fflags.patch 1251 BLAKE2B 7451d67e8676be33c2070b9eea767d24d961eff708eec3f6544b68228963166138f844f51dde8d48f723412ce0fcb6d0da427d298c652156da56d34073a1c82c SHA512 d06cd469749c88c69e2bdab01b5c0c67105a756a6d4c3704842335261ad57f6e898ceb73943487396178ae99ccf2ee3e551ae5881996af54e36fb951c6be43dc
-AUX openblas-0.3.10-dont-clobber-fflags.patch 1209 BLAKE2B 8759226f8a2b9371a89434f14e5db6e10b079dec5b260b438811f476ceeded67bcf2a596c7f4892ec2b3388a3437c9cd276592bb01ebb84af69977002e0bbe88 SHA512 6b239e750a6c5baf6dfca58dc8036a1de34efd917839558d2b2ff1d6fab00067dfe953bfb0837d8f19e1f52cf5ab7f92f9e3f65f3963fd3ae9052c0a00d6065d
 AUX openblas-0.3.12-shared-blas-lapack.patch 2008 BLAKE2B 2d3a4a90d8144cbf149b7711b67364176a94287f26448930b5a4fd29fe761fb250e9007c580fb1ffa8148c477e2f4057f9cd8d7aa07efeb85caa842802d358fd SHA512 3f0d4b480549565c838eba6371e0990c162f56a226f9d26e1639e012ae3f39809f8c6badcf8fdfbb1258f45367dbaff9c4c611b8b44bac27d341aea954f0133e
-AUX shared-blas-lapack.patch 5557 BLAKE2B 1e41b18e5a9c12eec9283c835e9b09e4ca89c6512f47a2f158f29c8a8a822d0365ad350177e379bec13f7c7574d8debd55a2f612027ff661c67ac7b226bb2370 SHA512 baa23f0c2bc8b7bc3384d7b8fa20eb5e095f20e1d8859badb55e680ccd435a851da6099b20aa203e46d62096ac93663ea130bea04dabf19432522e53139d393b
 DIST openblas-0.3.18.tar.gz 12619822 BLAKE2B 38a5e7b861eb0063a4494c1cfb6f7f5723741437ecdd5cb1fb42645eb73bceb472b3a8c11eec3d0ba4f676981ac89de4ff1ee0d7ea42d1e234746f34ce8fb6b8 SHA512 df9a14026a61bdc5285636bfd7a52dce244d24fcf4a0c870ef4e58b8b50e412849828ca5aeac2a2435f635e78e60559762e8bae22ea7bc5dff2e865a96d81152
 EBUILD openblas-0.3.18.ebuild 5679 BLAKE2B 08e30894d5c3d7eb488f008388aeae506eb7ee421a9b591b9738d3ba38bb1440dd382d5c7c8e3c79c655cb7c6a2432f954dee0c0d65fc8f93bbb17e165dc920f SHA512 a23a6d112452702b570a8c30a888e70afffe2ae7e24da58ee915ceb4b2cc5d11914fdfc653ab7c225878af8ab6202cca5d03cb1cbd17792a82f5916a8d5fc91c
 MISC metadata.xml 1561 BLAKE2B 5ba7ec66dd8ba7ca8bc29bc0193b48b6a82b4949bb79bab461400040667aa66aac3cfd2ad9c7323798048fd43d18ac96a562d53b68f3f7ae8bf8505ac7a04691 SHA512 05272eb56480ff82b240d0f430df3df03981e24b971dbd37c13d464f4f4b334bac19b54915446a09326a334aa76249bb79a4fa389d26150365f21389992f9a48
diff --git a/sci-libs/openblas/files/dont-clobber-fflags.patch b/sci-libs/openblas/files/dont-clobber-fflags.patch
deleted file mode 100644
index 21bbec4b1b3b..000000000000
--- a/sci-libs/openblas/files/dont-clobber-fflags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 05c96dad9b26cc1f00831661dc55139dcc9d5680 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 11 Jun 2020 18:32:17 -0400
-Subject: [PATCH 1/1] Makefile: don't clobber fortran flags while building
- lapack.
-
-When a user has the FFLAGS environment variable set, it clobbers the
-flags used to compile lapack. This can lead to "rare and hard to
-reproduce crashes" or test failures, as we have observed in Gentoo.
-
-Issue: https://github.com/xianyi/OpenBLAS/issues/2657
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index a22e16ba..2bae565e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -248,7 +248,7 @@ prof_lapack : lapack_prebuild
- lapack_prebuild :
- ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
- 	-@echo "FC          = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc
--	-@echo "FFLAGS      = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
-+	-@echo "override FFLAGS      = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
- 	-@echo "POPTS       = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
- 	-@echo "FFLAGS_NOOPT       = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc
- 	-@echo "PNOOPT      = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc
--- 
-2.26.2
-
diff --git a/sci-libs/openblas/files/openblas-0.3.10-dont-clobber-fflags.patch b/sci-libs/openblas/files/openblas-0.3.10-dont-clobber-fflags.patch
deleted file mode 100644
index 4890b7377ab5..000000000000
--- a/sci-libs/openblas/files/openblas-0.3.10-dont-clobber-fflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Rebased version of previous patch below.
-----
-From 05c96dad9b26cc1f00831661dc55139dcc9d5680 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 11 Jun 2020 18:32:17 -0400
-Subject: [PATCH 1/1] Makefile: don't clobber fortran flags while building
- lapack.
-
-When a user has the FFLAGS environment variable set, it clobbers the
-flags used to compile lapack. This can lead to "rare and hard to
-reproduce crashes" or test failures, as we have observed in Gentoo.
-
-Issue: https://github.com/xianyi/OpenBLAS/issues/2657
-diff --git a/Makefile b/Makefile
-index e113026..dd8b655 100644
---- a/Makefile
-+++ b/Makefile
-@@ -263,7 +263,7 @@ prof_lapack : lapack_prebuild
- lapack_prebuild :
- ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
- 	-@echo "FC          = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc
--	-@echo "FFLAGS      = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
-+	-@echo "override FFLAGS      = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
- 	-@echo "FFLAGS_DRV  = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
- 	-@echo "POPTS       = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
- 	-@echo "FFLAGS_NOOPT       = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc
diff --git a/sci-libs/openblas/files/shared-blas-lapack.patch b/sci-libs/openblas/files/shared-blas-lapack.patch
deleted file mode 100644
index fc77427362c1..000000000000
--- a/sci-libs/openblas/files/shared-blas-lapack.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff --git a/sci-libs/openblas/files/Makefile b/sci-libs/openblas/files/Makefile
-index 20ec74e..87e842f 100644
---- a/interface/Makefile
-+++ b/interface/Makefile
-@@ -2151,3 +2151,132 @@ cblas_zgeadd.$(SUFFIX) cblas_zgeadd.$(PSUFFIX) : zgeadd.c
- 
- cblas_xerbla.$(SUFFIX) cblas_xerbla.$(PSUFFIX) : xerbla.c
- 	$(CC) -c $(CFLAGS) -DCBLAS $< -o $(@F)
-+
-+#############################################################################
-+# Customized shared objects
-+
-+FSBLAS1OBJS    = \
-+		saxpy.$(SUFFIX) sswap.$(SUFFIX) \
-+		scopy.$(SUFFIX) sscal.$(SUFFIX) \
-+		sdot.$(SUFFIX) sdsdot.$(SUFFIX) dsdot.$(SUFFIX) \
-+		sasum.$(SUFFIX) snrm2.$(SUFFIX) \
-+		smax.$(SUFFIX) samax.$(SUFFIX) ismax.$(SUFFIX) isamax.$(SUFFIX) \
-+		smin.$(SUFFIX) samin.$(SUFFIX) ismin.$(SUFFIX) isamin.$(SUFFIX) \
-+		srot.$(SUFFIX) srotg.$(SUFFIX) srotm.$(SUFFIX) srotmg.$(SUFFIX) \
-+		saxpby.$(SUFFIX)
-+
-+FSBLAS2OBJS    = \
-+		sgemv.$(SUFFIX) sger.$(SUFFIX) \
-+		strsv.$(SUFFIX) strmv.$(SUFFIX) ssymv.$(SUFFIX) \
-+		ssyr.$(SUFFIX)  ssyr2.$(SUFFIX) sgbmv.$(SUFFIX) \
-+		ssbmv.$(SUFFIX) sspmv.$(SUFFIX) \
-+		sspr.$(SUFFIX)  sspr2.$(SUFFIX) \
-+		stbsv.$(SUFFIX) stbmv.$(SUFFIX) \
-+		stpsv.$(SUFFIX) stpmv.$(SUFFIX)
-+
-+FSBLAS3OBJS    = \
-+		sgemm.$(SUFFIX) ssymm.$(SUFFIX) strmm.$(SUFFIX) \
-+		strsm.$(SUFFIX) ssyrk.$(SUFFIX) ssyr2k.$(SUFFIX) \
-+		somatcopy.$(SUFFIX) simatcopy.$(SUFFIX)\
-+		sgeadd.$(SUFFIX)
-+
-+
-+FDBLAS1OBJS    = \
-+		daxpy.$(SUFFIX) dswap.$(SUFFIX) \
-+		dcopy.$(SUFFIX) dscal.$(SUFFIX) \
-+		ddot.$(SUFFIX) \
-+		dasum.$(SUFFIX) dnrm2.$(SUFFIX) \
-+		dmax.$(SUFFIX) damax.$(SUFFIX) idmax.$(SUFFIX) idamax.$(SUFFIX) \
-+		dmin.$(SUFFIX) damin.$(SUFFIX) idmin.$(SUFFIX) idamin.$(SUFFIX) \
-+		drot.$(SUFFIX) drotg.$(SUFFIX) drotm.$(SUFFIX) drotmg.$(SUFFIX) \
-+		daxpby.$(SUFFIX)
-+
-+FDBLAS2OBJS    = \
-+		dgemv.$(SUFFIX) dger.$(SUFFIX) \
-+		dtrsv.$(SUFFIX) dtrmv.$(SUFFIX) dsymv.$(SUFFIX) \
-+		dsyr.$(SUFFIX)  dsyr2.$(SUFFIX) dgbmv.$(SUFFIX) \
-+		dsbmv.$(SUFFIX) dspmv.$(SUFFIX) \
-+		dspr.$(SUFFIX)  dspr2.$(SUFFIX) \
-+		dtbsv.$(SUFFIX) dtbmv.$(SUFFIX) \
-+		dtpsv.$(SUFFIX) dtpmv.$(SUFFIX)
-+
-+FDBLAS3OBJS    = \
-+		dgemm.$(SUFFIX) dsymm.$(SUFFIX) dtrmm.$(SUFFIX) \
-+		dtrsm.$(SUFFIX) dsyrk.$(SUFFIX) dsyr2k.$(SUFFIX) \
-+		domatcopy.$(SUFFIX) dimatcopy.$(SUFFIX)\
-+		dgeadd.$(SUFFIX) 
-+
-+FCBLAS1OBJS    = \
-+		caxpy.$(SUFFIX) caxpyc.$(SUFFIX) cswap.$(SUFFIX) \
-+		ccopy.$(SUFFIX) cscal.$(SUFFIX) csscal.$(SUFFIX) \
-+		cdotc.$(SUFFIX)  cdotu.$(SUFFIX) \
-+		scasum.$(SUFFIX) scnrm2.$(SUFFIX) \
-+		scamax.$(SUFFIX) icamax.$(SUFFIX) \
-+		scamin.$(SUFFIX) icamin.$(SUFFIX) \
-+		csrot.$(SUFFIX) crotg.$(SUFFIX) \
-+		caxpby.$(SUFFIX)
-+
-+FCBLAS2OBJS    = \
-+		cgemv.$(SUFFIX) cgeru.$(SUFFIX) cgerc.$(SUFFIX) \
-+		ctrsv.$(SUFFIX) ctrmv.$(SUFFIX) \
-+		csyr2.$(SUFFIX) cgbmv.$(SUFFIX) \
-+		csbmv.$(SUFFIX) \
-+		cspr2.$(SUFFIX) \
-+		ctbsv.$(SUFFIX) ctbmv.$(SUFFIX) \
-+		ctpsv.$(SUFFIX) ctpmv.$(SUFFIX) \
-+		chemv.$(SUFFIX) chbmv.$(SUFFIX) \
-+		cher.$(SUFFIX)  cher2.$(SUFFIX) \
-+		chpmv.$(SUFFIX) chpr.$(SUFFIX)  chpr2.$(SUFFIX)
-+
-+FCBLAS3OBJS    = \
-+		cgemm.$(SUFFIX) csymm.$(SUFFIX) ctrmm.$(SUFFIX) \
-+		ctrsm.$(SUFFIX) csyrk.$(SUFFIX) csyr2k.$(SUFFIX) \
-+	       	chemm.$(SUFFIX) cherk.$(SUFFIX) cher2k.$(SUFFIX) \
-+		comatcopy.$(SUFFIX) cimatcopy.$(SUFFIX)\
-+		cgeadd.$(SUFFIX) 
-+
-+FZBLAS1OBJS    = \
-+		zaxpy.$(SUFFIX) zaxpyc.$(SUFFIX) zswap.$(SUFFIX) \
-+		zcopy.$(SUFFIX) zscal.$(SUFFIX) zdscal.$(SUFFIX) \
-+		zdotc.$(SUFFIX)  zdotu.$(SUFFIX) \
-+		dzasum.$(SUFFIX)  dznrm2.$(SUFFIX) \
-+		dzamax.$(SUFFIX) izamax.$(SUFFIX) \
-+		dzamin.$(SUFFIX) izamin.$(SUFFIX) \
-+		zdrot.$(SUFFIX) zrotg.$(SUFFIX) \
-+		zaxpby.$(SUFFIX)
-+
-+FZBLAS2OBJS    = \
-+		zgemv.$(SUFFIX) zgeru.$(SUFFIX) zgerc.$(SUFFIX) \
-+		ztrsv.$(SUFFIX) ztrmv.$(SUFFIX) \
-+		zsyr2.$(SUFFIX) zgbmv.$(SUFFIX) \
-+		zsbmv.$(SUFFIX) \
-+		zspr2.$(SUFFIX) \
-+		ztbsv.$(SUFFIX) ztbmv.$(SUFFIX) \
-+		ztpsv.$(SUFFIX) ztpmv.$(SUFFIX) \
-+		zhemv.$(SUFFIX) zhbmv.$(SUFFIX) \
-+		zher.$(SUFFIX)  zher2.$(SUFFIX) \
-+		zhpmv.$(SUFFIX) zhpr.$(SUFFIX)  zhpr2.$(SUFFIX)
-+
-+FZBLAS3OBJS    = \
-+		zgemm.$(SUFFIX) zsymm.$(SUFFIX) ztrmm.$(SUFFIX) \
-+		ztrsm.$(SUFFIX) zsyrk.$(SUFFIX) zsyr2k.$(SUFFIX) \
-+	       	zhemm.$(SUFFIX) zherk.$(SUFFIX) zher2k.$(SUFFIX) \
-+		zomatcopy.$(SUFFIX) zimatcopy.$(SUFFIX)\
-+		zgeadd.$(SUFFIX) 
-+
-+shared-blas-lapack: libblas.so.3 libcblas.so.3 liblapack.so.3
-+
-+# The list of prerequisite is created by comparing with NETLIB BLAS public API.
-+# The symbol cblas_xerbla is missing here, but it does not seem to be provided
-+# by libopenblas.so.0 either.
-+libblas.so.3: $(FSBLAS1OBJS) $(FSBLAS2OBJS) $(FSBLAS3OBJS) $(FDBLAS1OBJS) $(FDBLAS2OBJS) $(FDBLAS3OBJS) $(FCBLAS1OBJS) $(FCBLAS2OBJS) $(FCBLAS3OBJS) $(FZBLAS1OBJS) $(FZBLAS2OBJS) $(FZBLAS3OBJS) ../kernel/lsame.o ../kernel/scabs1.o ../kernel/dcabs1.o ../driver/others/xerbla.o
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,libblas.so.3 -L.. -lopenblas $(EXTRALIB)
-+
-+libcblas.so.3: $(CSBLAS1OBJS) $(CSBLAS2OBJS) $(CSBLAS3OBJS) $(CDBLAS1OBJS) $(CDBLAS2OBJS) $(CDBLAS3OBJS) $(CCBLAS1OBJS) $(CCBLAS2OBJS) $(CCBLAS3OBJS) $(CZBLAS1OBJS) $(CZBLAS2OBJS) $(CZBLAS3OBJS) ../kernel/lsame.o ../kernel/scabs1.o ../kernel/dcabs1.o ../driver/others/xerbla.o
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,libcblas.so.3 -L.. -lopenblas $(EXTRALIB)
-+
-+liblapack.so.3: $(SLAPACKOBJS) $(DLAPACKOBJS) $(CLAPACKOBJS) $(ZLAPACKOBJS) ../kernel/lsame.o ../driver/others/xerbla.o
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ ../lapack-netlib/SRC/*.o -Wl,-soname,liblapack.so.3 -L.. -lopenblas $(EXTRALIB)
-+
-+clean::
-+	rm -f libblas.so.3 libcblas.so.3 liblapack.so.3
diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest
index 98e51b02866f..7bb75c9fa71c 100644
--- a/sci-libs/pastix/Manifest
+++ b/sci-libs/pastix/Manifest
@@ -5,6 +5,6 @@ AUX pastix-6.0.3-cmake-spm-project.patch 319 BLAKE2B 11d63d28bb5e843571306321a0c
 AUX pastix-6.0.3-multiple-coeftabMemory.patch 260 BLAKE2B 968d32d2994afca84fcee7bc4b93aa7cf77dda2d66c2617095ee191572fb9c37d631e83954efdb53aba0997b426f85a6529d40a3c8f85f62de684548cc760447 SHA512 2f73d7f2ebbc92b46f13e0bed42ed76fd6831af5706988e5111971adb3ba46d8bca9fd563f40cb8a10fae1a65e180c2f1866b51ab0c4c95ef801c590513301f2
 DIST pastix-6.0.3.tar.gz 1793579 BLAKE2B 9e0ee71c80b2c93c6762c1a824b2e1262fd1a9f406194fb99eeecbfc172cf82f497d23a541b56c44e5487c3c228cab781f47f683ee04c6cdf426da6126750a69 SHA512 5bf8dfa6ed02ee7e236c63e21c80bd45af807b465b21a8c0520b1328e179095f1416f925be9f8b5ec0e8078ca9bc4398bf0d091fdc8e9ea51b9af12a06d9a544
 DIST pastix_5.2.3.tar.bz2 2246903 BLAKE2B b13cb31bbc2aeb122e932b2a934598ec975a55f327483bf1383280976584858426c56982f6980b52f32f04e05c6e6c8de1cf35e378e61a7be9dddb705b1c033a SHA512 69acffac1be8c756886783c2a6307269ab4d14abfc4a77268b3d14995e53b16084c298446812484233d9d52c317490d6ad67788166adf367075e6c8442147b95
-EBUILD pastix-5.2.3.ebuild 3355 BLAKE2B 00b07e37bc87ef19a977084adef2e41c6208eb546f60f0fbe5bcaf2aff295565a06bbdb79aaf9974563a7a0e9bc7964bf926ddeaa8a9fead63a1fa4f5dbbb98f SHA512 90107a7ce7a4e9413ece0e587f7882fd48b91705a99cb14ef3f76afb5212966e884d23b3392f011632b2d59d40954e8f6d6581b4b786a0dba4fc1b0ad8ebb3c0
-EBUILD pastix-6.0.3.ebuild 2380 BLAKE2B ccfe83139d218f6f261f090a66594477eb28e665504d3a143194151a35bc1d89c43fb322446283b3749d61b15ec422e743ed3e6dd8bfdf2422baa6fd5138d945 SHA512 b96368cbb4270e86fdaa793b9ce57490c11f0278af62d30d434f8ccf608bc1a67f8ecd9834618bbec8b55f320bf4ca3908ad50e5c0ac2135d1b11c428b7322e1
+EBUILD pastix-5.2.3.ebuild 3353 BLAKE2B 275c63ffd0d186f827f568bf73fe606fe520109cb364c279cce2da05965fd1f19b4e331d960458fe454f1abfba4879938f9686674ca0922bcdf8e4bcbaff08c4 SHA512 c7521ecd8eb7a080532867dc1913fcbfb06b9395e262e27ed6cdfee35dd439c32d7305d54f60d5fdab78a1dc218be95d3dcd2b8df69ee7e09ad4eaa77af1ab16
+EBUILD pastix-6.0.3.ebuild 2387 BLAKE2B f413e120a0ab1efe348ce72939022d3e0af416d0bb8c8676829e9eb72f27a258bfb3eef246fc07adbe173d22ebbc7acbcafe4c0d6c77a76b6ba3ed2ec4e5baed SHA512 00fdcf36c2318638093f9a2b73144e04df7e24a06fdc30aeb499e79eecc6069d6c601ca26bc95215d94949c31678f5f48648cb6cb0e2b78ef8e7e0c27a5ca647
 MISC metadata.xml 1383 BLAKE2B 0a17508eb75ed0066dbbaad286cb00ddd8491aa5b6047f2f32fde75f5e43277233229d4935d94052000c662e729480aaa02cdcbd4572e4b84075f108b1c61800 SHA512 9cc80da6ccb82311e30288696cce006e858121a8d216ba2860a1c0ae833c8e8076d60cd783283d163528976bfd9af11d114fc95a481b36951b5d7caf3c0fad2c
diff --git a/sci-libs/pastix/pastix-5.2.3.ebuild b/sci-libs/pastix/pastix-5.2.3.ebuild
index 9e3d9459f74b..2b9322818a96 100644
--- a/sci-libs/pastix/pastix-5.2.3.ebuild
+++ b/sci-libs/pastix/pastix-5.2.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/latestfile/${PID}/${PN}_${PV}.
 
 LICENSE="CeCILL-C"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc int64 mpi +smp starpu static-libs"
 
 RDEPEND="
diff --git a/sci-libs/pastix/pastix-6.0.3.ebuild b/sci-libs/pastix/pastix-6.0.3.ebuild
index 7131f14b3a7e..5d9c36f255c1 100644
--- a/sci-libs/pastix/pastix-6.0.3.ebuild
+++ b/sci-libs/pastix/pastix-6.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/file/${PID}/${P}.tar.gz"
 
 LICENSE="CeCILL-C"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cuda examples +fortran int64 metis mpi +python +scotch starpu test"
 
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/scikit-learn/Manifest b/sci-libs/scikit-learn/Manifest
index 41116fbbd1b3..436de6577214 100644
--- a/sci-libs/scikit-learn/Manifest
+++ b/sci-libs/scikit-learn/Manifest
@@ -1,4 +1,4 @@
 AUX scikit-learn-0.24.2-no-O3.patch 2346 BLAKE2B b4186a3e6a242ac964f4970adf227d2c6512141faf89828df60626aef73ab3d3de9fdeaf5fd31e230d196293b45feb11ff599a31b882ef86e1e563ff9209d7e6 SHA512 a6f2b74c424a000675ad838d95c71e459ca392f600875839cc5a740249a5db08e3d7968f87ae587398259d8dbf5ece91fe114f7c59581a32a03f3e9d183f81e8
 DIST scikit-learn-0.24.2.tar.gz 7589697 BLAKE2B a5a32db690e76d6ecfcb12d57a7f84ebcc7e67ecb73258c1d923f9b98a9d87c46aac96918ef7c3d8741f5dbeb46f169c73a7744fb7b92e6ab5cf42101a6bc2f1 SHA512 2159baf63414b9594918b40e1b72af2ab47349335ad4e3afd9756921f786737ed41d6deb333881e8c5c6e1f7ce9cfa10691b966dc2476c48c051621f9049d2ee
 EBUILD scikit-learn-0.24.2.ebuild 1813 BLAKE2B 179cc80ad5984f5179f156ef4114fe1a009d2d6258c758f030e832f191c477b1c1b22758cbbdb51ac95d7ebdc52341f9bba6fde02482dbdccf92c19e82fbf774 SHA512 0877f97ab8bae1392b183fdf26bc7f5036c1b7ddf8c58fab8acf19e6756592aa3c05128e9c34416d11cb2202e7c886b44b5d3929a2bf120d078a52965762dbef
-MISC metadata.xml 737 BLAKE2B cf46edba8cf6484c85d893e19f1f7725bf55b7955a22e1d8980bb8b75db6609fe204b60974e2a970ad438097f7832e8785d622facf76079178218f9571a8660b SHA512 706518caefd6d16b3240a8c5baff3e01f3b13ca3b2cf8f8f4954afb96f0bd42c59c33051ec964ae42e43f2afdf7fd3805ae0f5c305cec3cc6ab859374b3ef7b1
+MISC metadata.xml 614 BLAKE2B b5425c2d022592581647c9b97c0ab22bfc2afe347b2e5ea22f141245238f145322f39406c62318ba1e6af1462b2691267b39976bfde38faaf1d28b1d29c4e015 SHA512 74ac79123848bc385c29fcfdc4a1e780529dda685c1deb5eb722f5d4919ee6ac9d80798d52c4af0be0cc8dbbaea3784963dd97e2b7c1258cc2f5605b0bc8907a
diff --git a/sci-libs/scikit-learn/metadata.xml b/sci-libs/scikit-learn/metadata.xml
index fcf9041b5f81..8700c73ecc29 100644
--- a/sci-libs/scikit-learn/metadata.xml
+++ b/sci-libs/scikit-learn/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>gentoo@aisha.cc</email>
-    <name>Aisha Tammy</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
diff --git a/sci-libs/scikit-optimize/Manifest b/sci-libs/scikit-optimize/Manifest
index 9de9e18accd2..df037829773a 100644
--- a/sci-libs/scikit-optimize/Manifest
+++ b/sci-libs/scikit-optimize/Manifest
@@ -1,3 +1,3 @@
 DIST scikit-optimize-0.8.1.tar.gz 278751 BLAKE2B c53b921ed47a2146510a041e34129918cc1b9118e8ae3614f39cc16c87ba5a749e268b9694ade9d95132ec4fb11777f2ef2ec509b1be59c8864ff7b6edde2250 SHA512 8ffacb62869810e1812bdbd2f9f3fe83cad2be03cd795ae2e9aa4e1143ed613c3901ae06be85aecd63c1e3e5b4805e88331d2d8848cc9953988fddfbe62a0287
 EBUILD scikit-optimize-0.8.1.ebuild 638 BLAKE2B 4739c17ab249c33839b5acfcdf3781fabf6b86347283f0495a7a67f7aa7c281df88b9b6b3868fc1dff66d020b1ab38ee94ec4e096baaa759d04fe7f1b3bf5a50 SHA512 cfb7921239703d6e1abe12e98111a3ee9b98b7a9ffa73cce4d1c25dd0056050c403c1cdc585a4c909260ed94147145e198367a5ba505967b066b920797c1f0d9
-MISC metadata.xml 540 BLAKE2B 3a516b2817f3eefe94a513410eaa2ff5a0bc7c7611a511c2867aa3fe4a5e3fee271bdf8da6451f403181a3152c7de2aca4ba4e2a2ddd29f13c4a6e4ccf13d851 SHA512 790b0262b3142cb016e484f060b53271bce45a35f6f3608693a1dab0b2140e12836c9bf0ab6ebb730ae684b0a446d1af760851cf50ad05b6bb384d5c44b73c68
+MISC metadata.xml 415 BLAKE2B 3bfa58da8f117a7b62399a17e5259dbfb0e74b9b9acd16e4515bcceaafc2928733f047f229c58bc437907cddf3b8a93c9576a9645e0c910129900072bed94aff SHA512 6343c76ca9a28f321c3fd8c94dfbb912f305ce43025ab6d666ed0aa5a496f08f258e1ab4e11c14844baa3c04c63a43c1d79bc8067a0d02a4eccf0e37c0c686f7
diff --git a/sci-libs/scikit-optimize/metadata.xml b/sci-libs/scikit-optimize/metadata.xml
index c8b6fa9a9f30..d554e7c990fa 100644
--- a/sci-libs/scikit-optimize/metadata.xml
+++ b/sci-libs/scikit-optimize/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>gentoo@aisha.cc</email>
-    <name>Aisha Tammy</name>
-  </maintainer>  
   <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index 26bc189c989b..dfdf032b77d3 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -3,8 +3,8 @@ AUX scotch-6.0.4-flex-2.6.3-fix.patch 1623 BLAKE2B 9d86299eb543147ce7e736779b05c
 DIST scotch-v6.1.0.tar.gz 6292006 BLAKE2B 5b76b01c0fa752468a36830a15c190cd78efc851c3b6831eb2d16b7cf34a71d55463b266ffdee4c6addd4e66ca7caf75e63825051e600ee8a32494e5033cabbd SHA512 e6d217a23e39635f8749811a3fc64c8da14d0396a71b4042a4f8f3ce32ff1f0b4ed033ebae90f3785443dae9b35ded68ea512ed1e3e7f9ea9a471a499ae26b89
 DIST scotch-v6.1.1.tar.gz 6363384 BLAKE2B 337c81608fd245dde5b19bb6c79924e0ee80181ce3c935ae37e6248be2511a2f4d70bdda5b9217e5e1ed79fc00269de15755c3b6829579aa190ca6da9c3c2dac SHA512 daa62463f25416764250fe0452ae84bc6a2e485ee62a387418b4686c2ab93a2ca2d5a12cba922857c99a1c9ec67fc82951b0f9563ab97f5f3a6b86bb9da22b0c
 DIST scotch_6.0.4_esmumps.tar.gz 4804966 BLAKE2B 63c058fac9206e70975463b1748eb5ce7cd2ba01d9fcbb28eba8f5914ac49a71fcf87941fafd6047712fa519f3b5523ce199bdf5228a8b094bbb465dd64a1083 SHA512 0fcf639ab1a09451256444005f1a4a739403159e3ab22c34fbcedc481be387cd4c86be6fb029b4b5816220564f64f662434bf7f1d3921ed18be081ae2a7a9ee2
-EBUILD scotch-6.0.4-r2.ebuild 5044 BLAKE2B bac0078d623212ab0e4782023abb24f4f7026af9d80ee69dcde5ee55dc39e5fb1790cedeb19b484f64ac7c1e3fbe010f898b4decaec30d1c7888e3e72612bac5 SHA512 84ab1f209ebfbf2bf6f519b34775e0b8321a2f5b53086ad355f7c3539c3dfa4798aedbc3bd0c647c8214f75e2d11c9618f9bd07c7449333acdd63e2a2285e993
-EBUILD scotch-6.1.0-r1.ebuild 4952 BLAKE2B 9c329b2987e8fdf93a46caaa4b210405f0d64b52543a4814fb873c8bfdfea12675248675c4f35f58852ad93368275b62cd67a9028974622ae51bcf3dbfe6d287 SHA512 4aba8ee18c21c6d80e8affcec831bdb37077854c92f7994010a00cbf609a7fffea939370fd9d05a5d40d0706711d1328601c597bf950ba3276f3481d38271b5d
+EBUILD scotch-6.0.4-r2.ebuild 5042 BLAKE2B 3482237b7fcfaa11a4c1b0845d780059823ad509c823d41f052991b6a8977d6cea0ba1e96e5270a6d983a313300a6cb6e41ce7a94d7bb8316d3c38be521f1e9f SHA512 c376bc48a33a468921001462b116a2de43717d33b18e018e45f04efffcce034ea3c64b1eedae31f5a92e744d41bcff39cfc50ef0ca0f76f1062f814d40eeef46
+EBUILD scotch-6.1.0-r1.ebuild 4951 BLAKE2B 5b30bbfc10c45bd4d78638457bb7efd60695bb397d371f454a7f793cd897f7ec82bcff56fb98bd632db82baf2babc09110b8c38e72f327d7803d7ac7e4336297 SHA512 a6a4dbf66895d0d0e9aea5c5af04ab08148a72fcdb0698d3cd6c7c4a10e1c55089b21557115b7b1728303fb0bc56ed70766fe5659dee713e1e911e000e933112
 EBUILD scotch-6.1.0.ebuild 4942 BLAKE2B abbe129155d654ca4bf9ea5be27a703f44beb31bf2626042f763120ecdf70aad3a145e2dee2068b34038d92d634d29fe189353176eed242f37487aa62cf2f874 SHA512 4364a04ccfd41d423d439072a45be468ce844b916fd2f302e0e4dc7585217ff39ed0e52406fb96016e5b457606175b64c118f9d525629ed506bf11c700548d9e
 EBUILD scotch-6.1.1.ebuild 4956 BLAKE2B 90be76fd85e027e5649cf580e683168dc07010b1e4369a6c642d2b94aeb191b9f9944f416160d19117507dccab39dc643a3bb0db130ec691174adefef1129d33 SHA512 be8ef59bf19d25ccf85f4d5aa705f05f6d226f48e05d7d2b65d3fe52297ee6bbd944130119b781a1109fb1c47dbb2de95490c1c555c1058d9b972b06b9230463
 MISC metadata.xml 1169 BLAKE2B 33a4a76609e0b19a5b6f90556abc534dd36dc8b0c3baa1111197aaa0d8ff0bb29302ac52f67deb6b3f625eaad59fe18a25fb966086c67c53778202fc10d3e06c SHA512 282c23c6725a838a36b1f9a28ae3c96d2854cb988ba2563440d07f45adeb0c6dca642aa41d8ca88165a5d9e5ebeebf350e61b6466bdb785aa5669e7310d4374b
diff --git a/sci-libs/scotch/scotch-6.0.4-r2.ebuild b/sci-libs/scotch/scotch-6.0.4-r2.ebuild
index 11c8a9fc4f8d..aba2e29dcc6b 100644
--- a/sci-libs/scotch/scotch-6.0.4-r2.ebuild
+++ b/sci-libs/scotch/scotch-6.0.4-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/-/_}"
 
 LICENSE="CeCILL-2"
 SLOT="0/${SOVER}"
-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 int64 mpi static-libs test tools threads"
 # bug #532620
 REQUIRED_USE="test? ( threads )"
diff --git a/sci-libs/scotch/scotch-6.1.0-r1.ebuild b/sci-libs/scotch/scotch-6.1.0-r1.ebuild
index 4248caddd1a2..04b11a76de4b 100644
--- a/sci-libs/scotch/scotch-6.1.0-r1.ebuild
+++ b/sci-libs/scotch/scotch-6.1.0-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="CeCILL-2"
 SLOT="0/${SOVER}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc int64 mpi static-libs test tools threads"
 # bug #532620
 REQUIRED_USE="test? ( threads )"
diff --git a/sci-libs/spqr/Manifest b/sci-libs/spqr/Manifest
index 7e8ce129557b..6b4054ab575c 100644
--- a/sci-libs/spqr/Manifest
+++ b/sci-libs/spqr/Manifest
@@ -1,3 +1,3 @@
 DIST spqr-2.0.9.tar.bz2 2161068 BLAKE2B a662983d2543a65ce36a367749db5585308acb56b016f69a35c46a84e9c12a678f57a3cfd459cc2e887fff2819b00f99981efaadb73831f1b4c54cbef5e1c367 SHA512 54b203e0d68b266473b8a2b7b3b3a55476df54a3ebd5748b70faa7bad1d0a5a7387197f0674ba5f9a5d45887daa736117f8d6ffbbc2eb02482b3374a3babf721
-EBUILD spqr-2.0.9-r1.ebuild 1098 BLAKE2B 468c4e9b78732875d04d00f35913e9d189d80b5d9cbd0302e9b38533a7bd8c7c7da295a2000c018f700d69bb110acb1e7619364b98da322cada80afcb7861b74 SHA512 7931f0aabde12776ac9b48f17b804354f1736427396ce707a561ddad5a9d417f9cb024844a954e21ec180e015a61968bba662f5b371a619e22bd38732611e6b7
+EBUILD spqr-2.0.9-r2.ebuild 1104 BLAKE2B b8752d4b6840fc20e031252cdd133f9500af6f962e30189249e076f5f4a8bc886d290c20d002bdae8e53638fb5d5543225ac1546d096375287a9cc7a8ea4b2c1 SHA512 33e72129b9136f4d8848d38a4fc654ce32e4a6832183d19be99f4313e92dcb4983a6601cddc82ebfa7370d76128cd7513336c7e2e76934111121fd28cbcf866c
 MISC metadata.xml 852 BLAKE2B 9480a2097af529f47896d300d8654b791ef1ea3989b97d8aef287dbe5b322167ef7a425016894b14c975205ebdc35cc5a1f187026688e0cbd7497b51657d0181 SHA512 51150e01477f24a382731c273f83aeb8fa646a7f897e4f6e8ffff4d4050fbf9ff589b7036134d9faf4da2c07a16654b01d1923003bc1e30c380b6fc46a3207f9
diff --git a/sci-libs/spqr/spqr-2.0.9-r1.ebuild b/sci-libs/spqr/spqr-2.0.9-r2.ebuild
index cb6da0c33314..ff1a265ca5a0 100644
--- a/sci-libs/spqr/spqr-2.0.9-r1.ebuild
+++ b/sci-libs/spqr/spqr-2.0.9-r2.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 	virtual/lapack
 	>=sci-libs/cholmod-2[lapack,partition?]
 	partition? ( >=sci-libs/metis-5.1.0 )
-	tbb? ( dev-cpp/tbb:= )"
+	tbb? ( <dev-cpp/tbb-2021:= )"
 RDEPEND="${DEPEND}"
 
 src_configure() {
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index 100cf31a2b09..935fb0df2602 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -3,5 +3,5 @@ AUX sundials-5.8.0-fix-license-install-path.patch 874 BLAKE2B 134158ced2c1850aed
 DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f
 DIST sundials-5.8.0.tar.gz 24012815 BLAKE2B f707ad7465218532f3dc4df7627b87933b2bc52be6f1ad290b91ab83a3414ae83bc64503126af8772daa000f58a89855d7ca35fe74fa21bd91180695582442c7 SHA512 d22e699aaddaeef026e91e18dd070d06278c75b6980b36c6fb2e50203ba6445420e4a8e0612a6317dcaa521aeffbdf62ab88737be235ef70cef3a8be02a13dbb
 EBUILD sundials-5.2.0.ebuild 2191 BLAKE2B 522ba0de818acec9ae05b929a032b6ae43389b215d53ff84ef296024fe18c893d60af374d3a1433ca8c46b5e32f0163c4142b1ba5d00ce3ffe76acc7bdf6e3b2 SHA512 4c1b05f3c4bb9160d20bff5e43a1b7d1d05529cacc8676f19056a7865f52081d1c9e07b8c535b7e8b8ad2c163f76622c5063d43003ee365f7cb591dcfdd2a9ef
-EBUILD sundials-5.8.0.ebuild 2771 BLAKE2B 7a8767a6aeddd815229a2899bdd337f2c5c5930a451e3b753c0a503acd0f822305ec98e7011563eb5187c90cc645ccbb1dec03bbcb62c7efdbf5864ff8383c74 SHA512 67026fdd45685a685eb2bf9410de8d2575ad9c34d13f21a98dd665b762f472eecb9c208eef366bb3c58af948a8655feb706bd45f867287bc4976854d8c5776f3
+EBUILD sundials-5.8.0.ebuild 2778 BLAKE2B 2f0bea50ecf318e471278a509a78f059eebd684526c30377e46c72f717f6c1e0b3b876dae842bf310bca1a65e2209216cdb4cc72da89daa36babf65ad6d4bc03 SHA512 5d5365e470f1a4f7338f54f7814cbcbcaf1b3b688c41216947b63ff4049d079a828598d025c8b4f3ea1f5478ee39b40047048626828bc2dda1eb532c7ae2ac2f
 MISC metadata.xml 1131 BLAKE2B f898dfbe0da057432c5c0549d850293224137cb07d234721894752821b638f3002a1d17a06c4258b94fbc2d0e4ce5e9ee2b06c1099c473989de36b62001f2d63 SHA512 f53a7aec4b5ebc0f7737938f811e4c87842a07b03c423715296ad2992e353f661022eb2bb344e33fb03d70af6e4ffdf1908a34bdbafc3ebe9d30fa7f4bd7cad1
diff --git a/sci-libs/sundials/sundials-5.8.0.ebuild b/sci-libs/sundials/sundials-5.8.0.ebuild
index 9d6837a1479e..56a1a89dc03b 100644
--- a/sci-libs/sundials/sundials-5.8.0.ebuild
+++ b/sci-libs/sundials/sundials-5.8.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads"
 REQUIRED_USE="
 	fortran? ( static-libs )
diff --git a/sci-libs/superlu_mt/Manifest b/sci-libs/superlu_mt/Manifest
index 77e0cb9ba6df..3dc7305e282d 100644
--- a/sci-libs/superlu_mt/Manifest
+++ b/sci-libs/superlu_mt/Manifest
@@ -1,4 +1,6 @@
 AUX superlu_mt-3.1-duplicate-symbols.patch 7284 BLAKE2B 6402f745b280c02dfb4b0fadee120c9def38819d01c5e00406f68a812a06f3d86d4ac0ee799e3abe7b081737d2566bfb6ad981f7768ac29b3a2ad0b0bc147ee1 SHA512 b233677071ce175116454614b6289faa80f60ef0dfeee728bc4a1a7603ce8490c93e63ba635d1db231c92a055dee5cdbeff2793a2e138fa688efc18bd72b693f
+AUX superlu_mt-3.1-fix-predefs.patch 606 BLAKE2B e372ddc40a61c09203a439e28becb91e720909f481212b2dda2a9dfe9a924aa218b2c34e066f9d9617a84c7d1cc3658f1bc09d9bd2d8415be47d374d7946d8c6 SHA512 8242236118033bcd9b4fb0562f2820c2d42d72c887d2124cdd9a224e2946266371b3fe3f6717a46b89e2af35ad76facd22dc75e931ece804df2deda7d5926810
 DIST superlu_mt_3.1.tar.gz 1824440 BLAKE2B 6355c624eca13a6ad7fa0e6100b3a548215d93aafc5958b9a0e693b3333006e4b1e98facddf352f62ef1632c8528cb39a85ca15509abf046d32f8d97335749c5 SHA512 41b8d9808f6a9c3f8d9e983ab253b0c5aec486df1cc419d043a201bd950034fa4bdd5465410e1198a2314d072b92cb388fc117165a06f820922f04060c755971
-EBUILD superlu_mt-3.1.ebuild 2593 BLAKE2B 0a92790424e62a3de4bcc3f7dbf061a54b524c38b2a8f342ae4b4e62739d712c26979f796795969b077c1485ae898cddee46748d2e734888135413da56645e84 SHA512 4a2e60dbb4adda66ae2f96ab15ea8d3fa7803baef7137ae90a1008fd9a15fab1198d52c6ce68e9a6811eabb7fbe056add23e0e86c7b8303164e91347ca5a1363
+EBUILD superlu_mt-3.1-r1.ebuild 2612 BLAKE2B d030a830b2ae86401dea2ac65135d8c3412aac933c922698772523d00a2eaa80e65c6c76793506115d1fa6722e7a45c23a363e1767c33ecd538d3f262b27baec SHA512 c1e617c05748626fe998dcd7151a2156e5f1e5d77ad7d2e3574c7126b58c094ee5a739ae04f8010afc556e5f52391bf84240335fa0e1bb32a6a17c09fde04f48
+EBUILD superlu_mt-3.1.ebuild 2560 BLAKE2B 3361cc3649f14163ab64825def63f8c51fc38b90155c0f6ab59b9db301f9e5caa2383701b625d480ecc82d21cb87dc1f75d07a9ca2e1df0355ce0a04eaa0811d SHA512 95a807ed73442f5cf7d11640f1b0d2d808c68745b00d95a962b4f63947e2d272db68d765575a51d81fb36f0581d02fabc0a3396c97d3ee44a751651f19576add
 MISC metadata.xml 1472 BLAKE2B 75500639996e0b9e541913a3e8c65b094f38e79615e8cc07cb99c6b889259458c0cff14414004452fe320034bb7c442efa112b9eab75a853890a0c780b4850b8 SHA512 914c5f3d6e8e00e678db0c266278971a7586f7ddc06441954c6b31c272efb2e45fce7e5d93017fdee3075337a0b01f653d4d1854fc028a8e850f448ba729d969
diff --git a/sci-libs/superlu_mt/files/superlu_mt-3.1-fix-predefs.patch b/sci-libs/superlu_mt/files/superlu_mt-3.1-fix-predefs.patch
new file mode 100644
index 000000000000..95c64675a87b
--- /dev/null
+++ b/sci-libs/superlu_mt/files/superlu_mt-3.1-fix-predefs.patch
@@ -0,0 +1,22 @@
+--- a/INSTALL/Makefile
++++ b/INSTALL/Makefile
+@@ -19,7 +19,7 @@ slamch.o: slamch.c ; $(CC) $(NOOPTS) -c $<
+ dlamch.o: dlamch.c ; $(CC) $(NOOPTS) -c $<
+ superlu_timer.o: superlu_timer.c; $(CC) $(NOOPTS) -c $<
+ 
+-.c.o: ; $(CC) $(CFLAGS) -c $<
++.c.o: ; $(CC) $(PREDEFS) $(CFLAGS) -c $<
+ 
+ clean:
+ 	rm -f *.o test* *.out
+--- a/SRC/Makefile
++++ b/SRC/Makefile
+@@ -130,7 +130,7 @@ await.o: await.c
+ 	$(CC) -c $(NOOPTS) $< $(VERBOSE)
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) $(CDEFS) $(BLASDEF) -c $< $(VERBOSE)
++	$(CC) ${PREDEFS} $(CFLAGS) $(CDEFS) $(BLASDEF) -c $< $(VERBOSE)
+ 
+ clean:	
+ 	rm -f *.o core ../lib/$(SUPERLULIB)
diff --git a/sci-libs/superlu_mt/superlu_mt-3.1-r1.ebuild b/sci-libs/superlu_mt/superlu_mt-3.1-r1.ebuild
new file mode 100644
index 000000000000..a37f5a808568
--- /dev/null
+++ b/sci-libs/superlu_mt/superlu_mt-3.1-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PN=SuperLU_MT
+SOVERSION=$(ver_cut 1)
+
+DESCRIPTION="Multithreaded sparse LU factorization library"
+HOMEPAGE="https://portal.nersc.gov/project/sparse/superlu/"
+SRC_URI="https://portal.nersc.gov/project/sparse/superlu/${PN}_${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${SOVERSION}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples int64 openmp static-libs test threads"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( openmp threads )"
+
+RDEPEND="virtual/blas"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? ( app-shells/tcsh )"
+
+S="${WORKDIR}/${MY_PN}_${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-duplicate-symbols.patch
+	"${FILESDIR}"/${PN}-3.1-fix-predefs.patch
+)
+
+pkg_setup() {
+	if use openmp && ! use threads; then
+		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+			ewarn "OpenMP is not available in your current selected gcc"
+			die "need openmp capable gcc"
+		fi
+		CTHREADS="-D__OPENMP"
+		[[ $(tc-getCC) == *gcc ]] && LDTHREADS="-fopenmp"
+	else
+		CTHREADS="-D__PTHREAD"
+		LDTHREADS="-pthread"
+	fi
+}
+
+src_prepare() {
+	default
+	cat <<-EOF > make.inc
+		CC=$(tc-getCC)
+		LOADER=$(tc-getCC)
+		ARCH=$(tc-getAR)
+		RANLIB=$(tc-getRANLIB)
+		PREDEFS=${CPPFLAGS} -DUSE_VENDOR_BLAS -DPRNTlevel=0 -DDEBUGlevel=0 $(use int64 && echo -D_LONGINT)
+		CDEFS=-DAdd_
+		CFLAGS=${CFLAGS} ${CTHREADS} \$(PIC)
+		BLASLIB=$($(tc-getPKG_CONFIG) --libs blas)
+		MATHLIB=-lm
+		NOOPTS=-O0 \$(PIC)
+		ARCHFLAGS=cr
+		LOADOPTS=${LDFLAGS} ${LDTHREADS}
+		SUPERLULIB=lib${PN}.a
+		TMGLIB=libtmglib.a
+	EOF
+	SONAME=lib${PN}.so.${SOVERSION}
+	sed -e "s|../SRC|${EPREFIX}/usr/include/${PN}|" \
+		-e '/:.*$(SUPERLULIB)/s|../lib/$(SUPERLULIB)||g' \
+		-e 's|../lib/$(SUPERLULIB)|-lsuperlu_mt|g' \
+		-i EXAMPLE/Makefile || die
+}
+
+src_compile() {
+	# shared library
+	emake PIC="-fPIC" \
+		ARCH="echo" \
+		ARCHFLAGS="" \
+		RANLIB="echo" \
+		superlulib
+	$(tc-getCC) ${LDFLAGS} ${LDTHREADS} -shared -Wl,-soname=${SONAME} SRC/*.o \
+				$($(tc-getPKG_CONFIG) --libs blas) -lm -o lib/${SONAME} || die
+	ln -s ${SONAME} lib/libsuperlu_mt.so || die
+
+	use static-libs && rm -f SRC/*.o &&	\
+		emake  PIC="" superlulib
+}
+
+src_test() {
+	emake -j1 tmglib
+	LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" \
+		emake SUPERLULIB="${SONAME}" testing
+}
+
+src_install() {
+	dolib.so lib/*so*
+	use static-libs && dolib.a lib/*.a
+	insinto /usr/include/${PN}
+	doins SRC/*h
+	dodoc README
+	use doc && dodoc DOC/ug.pdf
+	if use examples; then
+		docinto /examples
+		dodoc -r EXAMPLE/* make.inc
+	fi
+}
diff --git a/sci-libs/superlu_mt/superlu_mt-3.1.ebuild b/sci-libs/superlu_mt/superlu_mt-3.1.ebuild
index f631900a16d9..eab8a2ad999d 100644
--- a/sci-libs/superlu_mt/superlu_mt-3.1.ebuild
+++ b/sci-libs/superlu_mt/superlu_mt-3.1.ebuild
@@ -61,8 +61,7 @@ src_prepare() {
 		TMGLIB=libtmglib.a
 	EOF
 	SONAME=lib${PN}.so.${SOVERSION}
-	sed -e 's|../make.inc|make.inc|' \
-		-e "s|../SRC|${EPREFIX}/usr/include/${PN}|" \
+	sed -e "s|../SRC|${EPREFIX}/usr/include/${PN}|" \
 		-e '/:.*$(SUPERLULIB)/s|../lib/$(SUPERLULIB)||g' \
 		-e 's|../lib/$(SUPERLULIB)|-lsuperlu_mt|g' \
 		-i EXAMPLE/Makefile || die
diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest
index 699b206aec8f..6c8c19190c4f 100644
--- a/sci-libs/symengine/Manifest
+++ b/sci-libs/symengine/Manifest
@@ -3,5 +3,5 @@ AUX symengine-0.7.0-cmake-build-type.patch 1234 BLAKE2B b416e9b83db5eb6689bb9e18
 DIST symengine-0.6.0.tar.gz 763481 BLAKE2B 37fe94ad08463b31c7387ab296b201a4dda821ba59dfa548d0c42e70d23958bae24df3f035bd3fffb46cc08cc010d13a25e607a9e0644e9b3c0602fa0eb363b3 SHA512 cc6f0468534e5bcd466a810d44f9884b17858ca6c7151cdcadb3af0f7d8faf0d96697d5887ab65fc9094de80df825f8243dabc54e3f5c387be544880f49b482b
 DIST symengine-0.7.0.tar.gz 802307 BLAKE2B de207f565f179deae37479eec82dfced3d83bfb7e643b4e6969135e10130dd05c888f34aa75c76c238ff1babfd0864f3329c3deee126b84ec33c4937c11dc20c SHA512 fd3198bc4a05ca2b9b8a58039cc21af65b44457f295362a1a9b8dbf9c6e3df5186c0c84b289bc9fe85d9efd5ac1a683f6b7ba9a661fb6d913d6ceefb14ee2348
 EBUILD symengine-0.6.0.ebuild 2205 BLAKE2B 4bbd97357a16e4bbad1fcfdf26034dc51f5bd6718369f709978d0f9a7b399b473ea776ac6562979d29e1accc2f84f897ef8f58d116d0331e4092da5ba0278abb SHA512 403bb10352daad01d3665f06858400dd03875802817e0e1a8a8bf936fbd6a3cdd191ea4523aa056d6f19874125ad9949cea3b950a75c6dca75688848ed107c76
-EBUILD symengine-0.7.0.ebuild 2289 BLAKE2B 3f27fc8f0cf831d92dba0538fb5e1557800cd9e21d158fe0a5087bcefa51016b4b868cf7dc835899d8575acc36b87899705a9cfca5f250106ca5f279c567b0d6 SHA512 87071c8797de9fde57e84d67269ec6c826e4380a1af3a354ef9fd3fc4e376ba2c2bf094e877de35a564c4194c85f410cef4a4a64ff81a8a078e5fd189988c2fb
+EBUILD symengine-0.7.0.ebuild 2296 BLAKE2B 8952fa33f97daa9f6524bb174cac9d34a75d0a156fefafa63fac190eec2dc3796381a0498399d018be1156ba736f0c251d4e4132e39324a56f0f5f46ed13c4fc SHA512 b73f20009778716b1c398fcc9350c295d629d114ac9d527652280b24e729ee24a0bf51f0ee899e0269b4306ea69f825e895e13655f406b47f4fd21d04277fcde
 MISC metadata.xml 1266 BLAKE2B 4aa9d4628e60ad9819cce8afc672e84e10da0393cb424d6c73768d599a748f115ac882d4ca552112b6bcbe418af8828c546b35ff110df4c3c1b9b0290c394401 SHA512 889cabc8e8132166d5c3ff330cc4c05f27f9a75f039b549c2639efa9e89ae181ad8f7eed646a27e8637a07efd930f99f0dafd9b1318d7f1d6a51fdd7418cd264
diff --git a/sci-libs/symengine/symengine-0.7.0.ebuild b/sci-libs/symengine/symengine-0.7.0.ebuild
index 91f658820bdf..da83537b7b5b 100644
--- a/sci-libs/symengine/symengine-0.7.0.ebuild
+++ b/sci-libs/symengine/symengine-0.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sympy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/0.4"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="arb benchmarks boost debug doc ecm flint llvm mpc mpfr openmp test tcmalloc threads"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/tensorflow-estimator/Manifest b/sci-libs/tensorflow-estimator/Manifest
index ff5d23610e66..ffe2694cd5cf 100644
--- a/sci-libs/tensorflow-estimator/Manifest
+++ b/sci-libs/tensorflow-estimator/Manifest
@@ -2,10 +2,8 @@ DIST bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip 72534 BLAK
 DIST bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip 159656 BLAKE2B c2ebed5165907e5452db2e8797253ce17fb39a00d3ca3aab11dec475399821dd529629d710af6f9892b74d0654293bd7989fa2be24caf5836490e8df566c7c18 SHA512 deecf484f5e888db345a57c3b557d6548e4e71fd4c62ea10b4dc9c47be9d303df55c03bb446158675b131064c4eccb401bf217e131e78d629c8fc1836600cb51
 DIST bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip 201360 BLAKE2B 0173a8edb17f344b18e42026e2f8a62a1909d4694ab0be83562b6437a3f1ef38889f069269ddd2308b41062e5f375f791be0d2631a8e52ede668203779813b56 SHA512 2ba1dc316d88947c1d17ec67154c052700e3571b8d03370a9f204cf9fe94a1bd58f93a2c4a3c0b02233ee3250053a4c30a4133b5b38745858c1d04be8c9d973f
 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.tar.gz 660203 BLAKE2B b270536fe976fc718bb6ba558d9d91817b14951c8769365348d2cc13b621e30efe2154aa3040d2c0ea750d4f45b1aadd36d7f98b16bc2d3dcdec89f95ec6246b SHA512 31538614fb96c90228eebbc3edf7d7f7157dab1a9271858d47af2104d9fafab9f3386dc42a45ad46999df54fd757d544dd27fc23ee519596dd0a453a652bed13
 DIST tensorflow-estimator-2.5.0.tar.gz 689339 BLAKE2B 6fb491b047cabed6edf67cccc913de54e4c2337eb052ba833239b72b07facaf33410b8a57a8f95fc0e2c225190d9b26b7955579d77883dbc236519cb784784c3 SHA512 dc49d92f4d2e63770dd901b272d7c62db50bfef7107e38f6525b6a458ad9915d1cbcdc9961c70c6ef88b9a38361f7b6712f6a2d30e240a35aab4bb25ffe17e71
-EBUILD tensorflow-estimator-2.3.0.ebuild 1973 BLAKE2B a617c35114a68d2723be036e073365b5c7ba0a7243831ef4ce72ee049215f1e711adef1ed46be51d67833d5b592947aeadf555a4c648318fc69f1064d70db056 SHA512 812402d47e0bd2eebfd3462161442d9094d418421512bf79109a76c42fa61f12195882ecbc9d29cfa7424b8e50f9f78cf44998bc9d4fe3a209992e6ce60568dc
-EBUILD tensorflow-estimator-2.4.0.ebuild 1973 BLAKE2B a617c35114a68d2723be036e073365b5c7ba0a7243831ef4ce72ee049215f1e711adef1ed46be51d67833d5b592947aeadf555a4c648318fc69f1064d70db056 SHA512 812402d47e0bd2eebfd3462161442d9094d418421512bf79109a76c42fa61f12195882ecbc9d29cfa7424b8e50f9f78cf44998bc9d4fe3a209992e6ce60568dc
+DIST tensorflow-estimator-2.7.0.tar.gz 691956 BLAKE2B 8a6cdc88fadbac6275d1c766c4b183dc7d1d374a1e898651ecdf0802d2f5c5bbc01d437a85826e3ef5dc0700b44c69ff84d8610fdf7ac3150fa4c0541f901707 SHA512 e02ee93baf2e36f2e42dec71bd2e31486dc96a7ff25d813fbbe3aae1d0eb1fccdda2cfcad46a87c6cdcd143c1b88915b95bc158ac3240a36734b725b3f89bda3
 EBUILD tensorflow-estimator-2.5.0.ebuild 2175 BLAKE2B e9e90aee52d27b13f193a2a91f84ff97f641ac23fb948cfb34911212c2db3347f30639ebe537573cbd2b5e6788d843fe70f2c473e6b35889906d1b8fe66d292b SHA512 eacca70003a320d3c7c5a51609a8a62d887fae1eaa5e0405c8fa019549cb004fb0a46db79a646a744e2c589fdd66412c0f44a746387a35158ad0d67b4d013fb1
+EBUILD tensorflow-estimator-2.7.0.ebuild 1864 BLAKE2B 7ae71ffe9d5c2ff6675194b280c7d62a33ea4c1cf63998d3465ef904ea829194b1d6ff7a00675a5a593441953716d10b23f0bbb41282e4014298ae577ee3ea18 SHA512 0042f613b7039030daaa6fee801603410906869320c1b773b7ef1cf18d5db9e71643952ec03ecfe2d6a04b4dad9578b9e576731e829a4e6a8e8593d514c89300
 MISC metadata.xml 581 BLAKE2B f3c4be0d25d3337871d9fc5f0d2e1e420fd68f45c2a7fbabaab0557f2f323661d4dd1ab847778ccc5a06bfe86a6fcf77bc4f65a04baa8ed569fd868ca8a03009 SHA512 41e7c5f2bce2166ed98259fa86fcf92cb3e2e186e7387a1cc75d630313791fc83e297288ce52ad25655292eb14b28a651dec3cb6b3101c75c327f447b15d6293
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.3.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.3.0.ebuild
deleted file mode 100644
index afa7f6232c47..000000000000
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.3.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-MY_PN="estimator"
-MY_PV=${PV/_rc/-rc}
-MY_P=${MY_PN}-${MY_PV}
-
-inherit bazel distutils-r1
-
-DESCRIPTION="High-level TensorFlow API that greatly simplifies machine learning programming"
-HOMEPAGE="https://www.tensorflow.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-bazel_external_uris="
-	https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip
-	https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip
-	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
-
-SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${bazel_external_uris}"
-
-RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	dev-java/java-config
-	>=dev-util/bazel-3"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	bazel_load_distfiles "${bazel_external_uris}"
-}
-
-src_prepare() {
-	bazel_setup_bazelrc
-	default
-	python_copy_sources
-}
-
-src_compile() {
-	export JAVA_HOME=$(java-config --jre-home)
-
-	do_compile() {
-		ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package
-		ebazel shutdown
-
-		local srcdir="${T}/src-${EPYTHON/./_}"
-		mkdir -p "${srcdir}" || die
-		bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die
-	}
-
-	python_foreach_impl run_in_build_dir do_compile
-}
-
-src_install() {
-	do_install() {
-		cd "${T}/src-${EPYTHON/./_}" || die
-		esetup.py install
-		python_optimize
-	}
-	python_foreach_impl do_install
-
-	cd "${S}" || die
-	einstalldocs
-}
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.4.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.7.0.ebuild
index afa7f6232c47..f5176e8c9bc9 100644
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.4.0.ebuild
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.7.0.ebuild
@@ -3,34 +3,36 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 MY_PN="estimator"
 MY_PV=${PV/_rc/-rc}
 MY_P=${MY_PN}-${MY_PV}
 
 inherit bazel distutils-r1
 
-DESCRIPTION="High-level TensorFlow API that greatly simplifies machine learning programming"
+DESCRIPTION="A high-level TensorFlow API that greatly simplifies machine learning programming"
 HOMEPAGE="https://www.tensorflow.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE=""
 
 bazel_external_uris="
-	https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip
-	https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip
+	https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip -> bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip
 	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
 
 SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 	${bazel_external_uris}"
 
-RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
+RDEPEND="
+	sci-libs/tensorflow[python,${PYTHON_USEDEP}]
+	sci-libs/keras[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-arch/unzip
 	dev-java/java-config
-	>=dev-util/bazel-3"
+	>=dev-util/bazel-3.7.2"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 469df2bc027a..1c09121f655c 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -1,11 +1,16 @@
 DIST ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz 100612 BLAKE2B 84f81072d3298dde613b4c1ebabf852c67e04b5882a4ca0ed6f218b42e8fa3ea9598140b0c0009e8d6b62d08902622a6d57ee005ec3ad8a808c9fb21aa53430c SHA512 03a289d8099a5c4a5298cba8f516d2edb41220935d8db750970113ca7513372c78241c2c948d0ffcd60e84686e50ba1d7fd0b46efea6881dd320435eca92a7b9
 DIST OouraFFT-v1.0.tar.gz 110531 BLAKE2B de0e280407e21118e2bc6ca93a7caf3c4a49d0a13eda018b1497f98851af73dda4cef56460dba310336c7ed958e34feef4784ca2575a13287dec2c1ac9a5af6d SHA512 89c6e8fd57abf26351b3efb792008a1bbe62d404a4225dcae8aa666b3782a421be071bdc9760ebb0c95b5336ee5ea517d2fa43ab915045f7cf6fd76e73578079
+DIST XNNPACK-694d2524757f9040e65a02c374e152a462fe57eb.zip 12962048 BLAKE2B b7e2292f65b33a81281a5c1a813a02bf5bae172b640523919384a7b6fae4a583ffdab459179edc84d760a0e3c33779666b48ac68e4af5d1432537a77ef3d895b SHA512 6498d9f0f139c1a017d5986c065b4842bd2a03262518a02113f6a40f40370906a2a3dd4b31e6700b49edac96c9a31fececb146f5063f618ae7a9d73328022c67
 DIST abseil-cpp-6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz 1785034 BLAKE2B 83cee194b416fff3d6ec3f4c02b4210a60ebfcf0316524fe9deb94372bfc34f33075fa59e2e71d8bb17c32f61a6e324072651c2bbf382d3d4a7540657b8a33a8 SHA512 f64fee62863f2103c1991136fd3bc2b71cd28c7ff62138ac991b5a7f81780a05e0e2bdd6a119d02e1d70dd54f989f584093957efaec94f26c9d6c3f4ee37f8ae
+DIST abseil-cpp-997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz 1774075 BLAKE2B 2f082ce0a16df2a323add4b74cdc73443d720a5e1afe02e3eda18239b00bb8ce05488ef17a0a2553af4d92f1f26c6041215b0e914028ff5bc8c869c38cbce4b7 SHA512 bdd80a2278eef121e8837791fdebca06e87bfff4adc438c123e0ce11efc42a8bd461edcbbe18c0eee05be2cd6100f9acf8eab3db58ac73322b5852e6ffe7c85b
 DIST backports.weakref-1.0rc1.tar.gz 7761 BLAKE2B 4cb2554a4b71bb1f8c41a790268511e4b382effc7e0328f74346d086de539a177111de9e2dabac19a44b2a1cdbf59a7425e30eee4caa4bfe66b0ca97f1f460a9 SHA512 f37e9eb0d9060d2e1588a941f623460bd4477d7e180b38b5cd46d9c1db1ee094ae63e4f5eeeb422823bf3d067f46c4124cb124a9e4ddb795bc0bfbc4802ab826
 DIST bazel-skylib-1.0.3.tar.gz 30711 BLAKE2B 86d6db9be4e627f6695329e16e8f9b6c2d0d683142a15f62c6924941405ab1d12292818ebf16642fc8d2664b0f113a35e002210034e80de14726387fcdafd765 SHA512 e28e62214b6c1e6724d26ebbee7c0b436b13e7b054d598788c15f03a56d248378068f5d29fae722a19d4519e2568983011ff50a13577dbc1bd174464ef4a49cc
 DIST bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz 660374 BLAKE2B 549292aa3ad8a6e01c29391a123f3cbc84d1f714ff9c68bfc6c8df07fa0ba3b19c22e61627f227a8a484f6d7d6c59935fd7560c447559ff5e774ddf1437eefe1 SHA512 83531a2646a9f63557eff6fefaf551ee7e9f0ccdb31374d7a17c35b9f9d844b9b405597972fcd31b2b68e9da312511bbfd9c8fbb75222f5924e1d2500cd1c2a6
+DIST bazel-toolchains-dfc67056200b674accd08d8f9a21e328098c07e2.tar.gz 1056209 BLAKE2B 7f47207bc38766a7879874d88c07ed2a2b0ab2dfb3f054f3a24b8e00c464d46f9cd3431d6ef7d8d323e20d33ec05f2a8b3a20b804b45a49c843f0cf6b3f8cb03 SHA512 a5093e3725e020b6fe6242128dea6dec9ae091248b21c1380448059d0e8233d367068d62f41748d65b56e2ecf663d26d46a5cd448c40e282f4c50dfca483baf2
+DIST bazelbuild-platforms-0.0.2.tar.gz 5278 BLAKE2B 0c247bb6efdc30ec2c46fd7e1eeaab6aa20c29d8f9a12e6425530c0e8bd70c4fcafe4b9168c43aa43dc59d55aa27fc975acf15840f6cdb87f0bbda31eac8fb70 SHA512 11119d44627208b04be20f63e486d871866148b52f6d66e7cae3da1fd5daa3ba5b291bad9c5fd40231add8fe770dafb6b71c4b9e0a803317a4f94f7a4be7cad9
 DIST bazelbuild-rules_android-v0.1.1.zip 14654 BLAKE2B 1cfd5af08c6eab9602883f62d85ef1b9eb02383f73dcc31ae84af880c9ba228ae349ac6b017c550286e248347193e2c56eba30c86174432429809447dd940ed2 SHA512 80628a5e2ca9806ab031cd0c2f2999bd67f5621a83e8300a51fe6233373bdaf7c90ff8fa9551c81e60fc904c4d7b24554327ac8ed2ee101e92c4ab9319c53f4a
 DIST bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip 171775 BLAKE2B ec0ece4555d779bc8380937baac517a8adf3b0176c4bfb1324943a91366ad9688f528a4bd69e4587bcc4ad427c71a53016a3e2d32a050d9d4ec99caac4967a8e SHA512 5c5e82f276c1c962fbd9c7ddf21df9aa4291f3285f3fa07cd2c2790475ccba670b0627fc3d6faedd1508eca4d80bdae64a31383f001f04f3031112be81c3e697
+DIST bazelbuild-rules_cc-40548a2974f1aea06215272d9c2b47a14a24e556.tar.gz 129521 BLAKE2B 368feec785ba0f9abb0f02d14a48ba6ff03859be9245465817c30a0174f897a2dcb6ab1503995da0b521858f96ece3b6eafe6e36cc7e2f8feeb7b6b9620a4d22 SHA512 4573fcd097b7d288024931fd5875358bba3f6db8d904b70e191e0c9a3b34280f8aecac600862883b7692f6faf96c5e8c582441f5f5eff086917b3901fbdbb40b
 DIST bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz 464906 BLAKE2B 033d76b8081f4f987e64875ad5c8e7b8f894ec6be58c52ee02c4d31d4480fee02f3f432ea9c4630ad3f5d1163f820aff37f6493da797ec51b148b361ab3c8b25 SHA512 2cd841f4530503ed31fa6425cb749ef29f8a1071b5d55594644303233e58455783cb02402bc23d7104ef036745733087d43075a1fcdab2ac96cd1a9872a6ea4a
 DIST bazelbuild-rules_docker-v0.10.0.tar.gz 549649 BLAKE2B e7a537b21138a5c5d9ce360e46238f57c917d2dbf5dd17887607402227cbe7c5d68aead9db0ecdb74c09eed9dac26eb86e004a9020c251152d15beb48be0e0d7 SHA512 7802107f8520c88646728800637cce54dbcefc54aa4361288a5b46e403e41998bc23e16fbe94f23a2ca52e5c33fc255af65846963c2fd0139ca1195435ce1b03
 DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c
@@ -14,24 +19,35 @@ DIST bazelbuild-rules_python-0.0.1.tar.gz 2302092 BLAKE2B 1db52eebf2461d779f764f
 DIST bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz 140484 BLAKE2B 2526d808a4763fffa16bb035de78993eefe6371a29139b152370081f548d8147868cc95194c06a54f1c5c0cd8b63ffbc59b00686bfaedede2463a448e38c2810 SHA512 e22a85a5dba52cc3474481798264571f6671aace19eecb058b24ac7d586ea7822ed3ae042b4a812671f81d4f9f8915aa2381fa6ac278da7969b976eaf28db636
 DIST cub-1.9.9.zip 619595 BLAKE2B 265b797a906b03da886de88863236c9ab90daa31498ddf848fcaf5e5ee1342614ad9a41618120ca09cc4c0da3e96eeec5e20ca9d7ba3f9860c507f06d15e59e1 SHA512 8c9c0a3f66f8d518ec07f857b5625e006d52f28bade1c1478a0f37420e2f7586dc3ff029d551748a1802bb5544b16fde5388e8d5a45d61eec595201b9db7a30d
 DIST cudnn-frontend-360d6e7164dfb7c802493fd1c0464f0d815b852a.zip 7781836 BLAKE2B 5fe215bf699c6e64ea29e36535965e86489fbb5d953cd5c4eec74c1f30c0f84008e691337962a4b51128d4066bfc72f48d2561c6eb17be89b2a393080cfbdbaa SHA512 4001c11fecf5f34ebac3f792833b37d4aa1456631f8d5110659548e0329d7a338db9c192f72fc0c54d93217f8c349c4a83392f8cd1cdb79034137a25cd73e005
+DIST cudnn-frontend-73210a930333eaf66b42b01693bce7b70719c354.zip 16944576 BLAKE2B abe918fb4a17e9080b40c59a3d66ea520c3034e8f2e31ca8f1114cfbd0f7f41838af49dae592463243d08952e04ceb8bc9708454a62ba02a847b0874e1000a1c SHA512 febb13ca3f93d708594259c2c3b7c11137649d2df346cb47b1501f650b8d9439dddbf33ba706693f5346b0c75d8501ac105805f2ae9ec47988d2bb8840f468ec
 DIST dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz 39637 BLAKE2B 532a3ce3d0e354a73c19433f0210a64ecbf00d9134d06a0ee7462baaff3f2b981524aa630cf250595671d6673105724482c7d69e803179aac247f2020c883bd0 SHA512 3728db5213e887fd946f64ba5dc0c336be9a72a0966ee83f146148749ffc93ddb342e0735df6117d7943874c18f87de5791a28e4a57ea420bb8a4e2a5b7338bc
+DIST eigen-7792b1e909a98703181aecb8810b4b654004c25d.tar.gz 2711240 BLAKE2B 5a0c5647bd786d8dbf2fea1b85cda5f9ab5a5b94cce0c3a4230cf10359d126ec2b5be0ebbc252b265aaa540b6820eea9ba20e8a4ecd187933f2457023bc03160 SHA512 1e5ee840c2cfa9bfc4e72e5bd15716ed4b7f3a0f3e1f52326c5f86b080b2694a56f31830209935bb910d45185abbe716e5e9ade31c722a5f3ec5d1213732bb27
 DIST eigen-f612df273689a19d25b45ca4f8269463207c4fee.tar.gz 2721573 BLAKE2B a6f3fdfd622b11d1dc634518e0c50bac5246c6eb91ad52ba08db6b846a22f74fd151ac0a27d7ea330137cb5a572c41ca6a916796a94919663c46136b634c7ebb SHA512 71ed7b5e1c70a3a3502c9c1901120eebba7a3668f1b13c1e8156ef49e25decc0c2897fd9d729c505530d85842afd3084c615f87e1a43bc7a5f1f12ba34eaed36
+DIST farmhash-0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz 467251 BLAKE2B 74fd0cf3de41a6db0aac74148f795335df58b5a3bdd370b22ae0763aba5a4952dcd0133ed300350636a4678ff54a5c59eedee749dfcef7283e21c181b88f92cb SHA512 7bc14931e488464c1cedbc17551fb90a8cec494d0e0860db9df8efff09000fd8d91e01060dd5c5149b1104ac4ac8bf7eb57e5b156b05ef42636938edad1518f1
 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-1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz 136085334 BLAKE2B 1f2e920c0e146b0d10f394fe7e0a4fa42c1099f998c68bf7b1d2d8bb0882165c1ab18f872db93bace5a835cea53edd0c0fdc2d3e3864031debfdc8db3c5e6713 SHA512 e7d28cfa9eb1a0d8738431767612136d43a639011bafa4dfdd48ae2c75b3b1864ceb237fe9863355649e0f4bc28062077015335d7dcc2b83c886f5fc24cd41a2
+DIST llvm-project-43d6991c2a4cc2ac374e68c029634f2b59ffdfdf.tar.gz 149180712 BLAKE2B ad18ff889ebfc0eda6509b379669e7896fcaf7bcdd0bd50e2664c577df0e079846abdd0bd2504b1e26507fc8176cbf6137763b6f01ad21c01346a43a3b3a937b SHA512 3cf2c8ebcb263cafbc2406d163b67dfbc05c0a433fdf6beaad0dfe9eb1dfc8b79e48082f5ec4258b809408fab92958cc98e0a53b5ea34a7792d526c0db483af3
 DIST llvmorg-10.0.1-openmp-10.0.1.src.tar.xz 955492 BLAKE2B 4197ecfb2e3498a95a2ba5923f2b4bdafbab645ddf2d3f1875d39752d3ab7304fb35bce918d2dc6e40e5ea809545ae0907d6bc0b94a3d68b8d96da48f5a62adc SHA512 5b6f6487feaabd2a18ef2bbb1a5f86bb567e264f9fdf56805cfdd3f65f36f21e7c1392ba5170fafb52a395fc1606b277233beba3df31dc2ab825ef8924e7a05a
 DIST nvidia-nccl-v2.8.3-1.tar.gz 203650 BLAKE2B 2b4995aa04b0b204c7315420b6d130c90baadf78f709b82352701c29116fbf053878e62623b6949ab114051a4df828536764bbe9374ab817af9a56879d7d8f08 SHA512 9a17b570ebda54116b1292899e086724c57c7b8ef03f8c529f760f79294cb710f599c2fddc29ab6bc4b843271af9e824dd1af1e705b98fdcbc201f737490d8f3
 DIST oneDNN-v2.2.tar.gz 9529895 BLAKE2B 63975f8ff4763732b9b45ad96b97053b8b9edd20beec1aaa0bb81e81493e9740e7d0aa04b221e52ccbcd403877a7e4e556b2826640b3cf28149c2af0f449fd41 SHA512 9ff7f6706a176057fdaed3a453639bb3bef7c94b6d275d90401bf310ee7ee11262f3cd2b0b67476d27c90ce91bbbb3ac3765a82c1117649f1832d33a838f7d66
+DIST oneDNN-v2.4.1.tar.gz 5798948 BLAKE2B bedb961f65c0661b56d5e2d34324004f241b3b06fc906424a4297b530e34ca66021217960103f78548b838a046218e3ca8cfdc88adfdafff0766c28d4ec231ed SHA512 5976ef36baca23f242113b8e8d8083c8ab55d7945f295ac75bcd139adcdd731992554002b7c70e2a374d86037a3728dfb23d5613c70278ca2ad35c5449267b5b
 DIST pytorch-cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.zip 3787933 BLAKE2B 169620d461103f271ae927d84af27282189509b2ba2fbed2c09f9ae387b5f392eea635dfdf2d3a23e1fc19b5d467bee3f13d3e473946e42bba4b6a9a2fd60e32 SHA512 6f1c8c931b62990ab0228679efb52207a6e21cb847139c11bf6117051b7315ff87c12ed1373670d006f0bc7e3d390d59f2d28a8250d0bd7df850583ae42afdf2
 DIST pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz 3489028 BLAKE2B aa6b7719eb9871b6cc71318cb4a9c2e2397e665662b7978daecd9e8380304691a78b95118eba5cbbb738c4b490352a847f6ce6b5c4ae29de0543b95ecc557cbb SHA512 ecd2115340fa82a67db7889ce286c3070d5ab9c30b02372b08aac893e90ccebc65c6b3e66aa02a9ae9c57892d2d8c3b77cb836e5fc3b88df2c75d33e574d90d2
 DIST re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz 316237 BLAKE2B 8a975bc3e78b690f70944651c7022c6d946f40b2eb5fe01b2e203141f94b890cf1ad5c72af8e7c6ff3c5242d42af5a8657ed69e3c74d9ac081beb15de6334c0c SHA512 e3e00e92700d08bc55ba0e96148ddf1e00de2d329c1fdac08691ff15976937829f66dbc84af886a4b749ad66ba4ab208d66811e97e33bb9c2d7359735406c450
 DIST ruy-54774a7a2cf85963777289193629d4bd42de4a59.zip 363561 BLAKE2B 81ff61f1a125c99f7bc8c2f4e03909036a759543cf56774dc872db5987ed4ef099b376597acc2f07758c4813933e7b27fe336281bc05da19f284fb085492ade2 SHA512 b15b6e0464f7612276bc8b198341653e3b72b5e166132a5107f825d4c4612e179018f92a16f7a41490d176bb138417b18a6f1b7fc165c4e829d889808cb89276
+DIST ruy-e6c1b8dc8a8b00ee74e7268aac8b18d7260ab1ce.zip 375516 BLAKE2B d026fcb8cf5226fca9153bd5acb848f04382cf759efda334e9bdbc58cb838a54c8e26d85d8c1577cca835b82319a80a61c7be83e6f61e0dab01d8119995a6c2e SHA512 e556764ef8505509cadf6cf28bb172be96b3650b410b1ccc3a34ef4c2bb8f67e911597962dd392c6441e68d329c66a0f0215fa545df01c63912adda1b08b25ce
 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.5.0.tar.gz 55999506 BLAKE2B 0f1f29ed9ff6e5fd3fc0c98419bca636f48085810f934290885b3469c45817b2ce17e9dbd3d93d70b09ec7975088edd0973f147449f527a8f2e23b388e2592ce SHA512 637c63b1bed1c0eb7bb018f1ff7f29f7f0d78e75dac384df4ecb5dfb92bbcb28209e3d3d2204145abddf88e3247d8c31bbb4cea032a73b7122b2ef3eb0d2b947
+DIST tensorflow-2.7.0.tar.gz 57751022 BLAKE2B ae022bffd0609f2bac388510e270e5ec4bf400cbebd074e4580d3a85734b238ad2daf19196246f1bc93a7679383c2527fd27bcbd7da9ddb17189a7998796bdac SHA512 f1e892583c7b3a73d4d39ec65dc135a5b02c789b357d57414ad2b6d05ad9fbfc8ef81918ba6410e314abd6928b76f764e6ef64c0b0c84b58b50796634be03f39
 DIST tensorflow-patches-2.5.0-r3.tar.bz2 6385 BLAKE2B 5cd3a9639884aa67bbd192cb1b06cfedc557b8ad05aca0f4887987c615656620b9294de98b119bf9d6edafd5b56b9d5e6900f95adb06a3a49cfdf342c6195b22 SHA512 8f0d2be9ffed81aba5c85088a79ca56af889e0247516f51657d214d19d39877cfe331e60f63e8c54e2b12acd7a624b181e281534acbd9a103f6eec0aae70fd8a
+DIST tensorflow-patches-2.7.0.tar.bz2 2928 BLAKE2B 4814c3b31d1c6236711c41f62b5653fbca0ff9810c08081aa070eb87c4d6c296cb6ae3c6fd3409b48dd06540098404eb60be7f74e7fdfc55808b694b8bffbbf4 SHA512 20d138d00a1d54a748bf47031ab0d308b13ed1c51ae931bc60141221a0db902d4839040ab21de7b3d87c1d890223fda0c11e18ad61157d6e07bcca9f3f90375c
+DIST tensorflow-runtime-64c92c8013b557087351c91b5423b6046d10f206.tar.gz 15224747 BLAKE2B b6aaaf4f6dd488dbfc49f6f9bd6d7820894b7f205ab76c38288175c70dd9ee656128a0655fc1f7ca1ada33d96193c9bb3569da02d0b591aea9ffbb9cf1f223b8 SHA512 1e66742ccda9778fdf9e0e1e83b0524d6b3e82e7792918ae058c031e81b033bc51cebf49752832aa2f27a53a6a9846256e4e9e9eec7c5285ad2db2cb8995ecfc
 DIST tensorflow-toolchains-v1.1.10.tar.gz 137512 BLAKE2B 774b22a599070564c0f77ed0da79f6a96359b196dd3007370be885b796c236b9a29c01597507a3049f82cf489824c8016740b778cacb2b8cd859500f9ecb1887 SHA512 1daf4684f5b364a89b3cc475cf2d13d0d0622fc14d2b32d7ad8518932538e716782d755cfcedc98d129a3986bc7c38bfc7854c8ad596891e397510b75ae2f93e
+DIST tensorflow-toolchains-v1.2.7.tar.gz 97867 BLAKE2B 2f613366b34b81d044da1407ff6371c6183b14593c719ea82ffc964c310df72282ba102be50a9c65655f9185b4ab59d707fe823608b6e452ebf9afc70589bcd5 SHA512 b70da3594aa0499b4e158258ba29ef30044cb6e354e2608b79274f712976b687b09e28a2576d3d89e6bd8ff41416ee19f2d5505b712ec98488c8b8cb839ede84
 EBUILD tensorflow-2.5.0-r3.ebuild 15612 BLAKE2B dd201acf46d14bff88209e3e824ef85565ec8d5a70087c86a4e086148dd6247f123eadb967be47f995794ab163ad7fb428a876923005ca6a3371081192592b7b SHA512 2cf8b9f9e2ad0a9a6429314285c3adedb4f380d9b8d950b892581851f5bf59d839de42e61ff10413ed572600b0c0c2f250f23add4c84f51a8191bdf3a333b28b
+EBUILD tensorflow-2.7.0.ebuild 15934 BLAKE2B 9014ea213ceb9139c3cad48da4b1bcf64b82b8b8755e82b9f013bda31cce05ff35ce7f9ab3f8db2e7c1c900e17c4da4810d1910896f4b508f9782243f295096f SHA512 457015c937361ad884f7ec81cba91c5e821648a95ad5b89edb23a5455ee01ab13df207811541bdb6a7d0da19903481d1a6512b0728c723aa90af236aca915534
 MISC metadata.xml 501 BLAKE2B 16095ae1e7ff9fdd7efe0bb5184ce1d7e46cb5c8f98a650ec4f69742262c678b9945d35b12ba518f8a9b36cad8cd23483a95aca0141ddbe07e4210cef16d2949 SHA512 d1f08e9360ab7c4ec516787807cc53f795d99dde6287b7024535bae4dae4a0107117548784bb25ac07cee15ad1676d98e9c9d472ec97023dfc3e0bdd72a26d28
diff --git a/sci-libs/tensorflow/tensorflow-2.7.0.ebuild b/sci-libs/tensorflow/tensorflow-2.7.0.ebuild
new file mode 100644
index 000000000000..3cfc701dff2f
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-2.7.0.ebuild
@@ -0,0 +1,411 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{7,8,9} )
+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/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz -> abseil-cpp-997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz
+	https://github.com/bazelbuild/platforms/releases/download/0.0.2/platforms-0.0.2.tar.gz -> bazelbuild-platforms-0.0.2.tar.gz
+	https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz
+	https://github.com/bazelbuild/bazel-toolchains/archive/dfc67056200b674accd08d8f9a21e328098c07e2.tar.gz -> bazel-toolchains-dfc67056200b674accd08d8f9a21e328098c07e2.tar.gz
+	https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip
+	https://github.com/bazelbuild/rules_cc/archive/40548a2974f1aea06215272d9c2b47a14a24e556.tar.gz -> bazelbuild-rules_cc-40548a2974f1aea06215272d9c2b47a14a24e556.tar.gz
+	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/0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz -> farmhash-0d859a811870d10f53a594927d0d0b97573ad06d.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/google/ruy/archive/e6c1b8dc8a8b00ee74e7268aac8b18d7260ab1ce.zip -> ruy-e6c1b8dc8a8b00ee74e7268aac8b18d7260ab1ce.zip
+	https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz
+	https://github.com/llvm/llvm-project/archive/43d6991c2a4cc2ac374e68c029634f2b59ffdfdf.tar.gz -> llvm-project-43d6991c2a4cc2ac374e68c029634f2b59ffdfdf.tar.gz
+	https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz -> llvmorg-10.0.1-openmp-10.0.1.src.tar.xz
+	https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
+	https://github.com/oneapi-src/oneDNN/archive/v2.4.1.tar.gz -> oneDNN-v2.4.1.tar.gz
+	https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz
+	https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.zip -> pytorch-cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.zip
+	https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz
+	https://github.com/tensorflow/toolchains/archive/v1.2.7.tar.gz -> tensorflow-toolchains-v1.2.7.tar.gz
+	https://github.com/tensorflow/runtime/archive/64c92c8013b557087351c91b5423b6046d10f206.tar.gz -> tensorflow-runtime-64c92c8013b557087351c91b5423b6046d10f206.tar.gz
+	https://gitlab.com/libeigen/eigen/-/archive/7792b1e909a98703181aecb8810b4b654004c25d/eigen-7792b1e909a98703181aecb8810b4b654004c25d.tar.gz
+	https://github.com/google/XNNPACK/archive/694d2524757f9040e65a02c374e152a462fe57eb.zip -> XNNPACK-694d2524757f9040e65a02c374e152a462fe57eb.zip
+	cuda? (
+		https://github.com/NVIDIA/cudnn-frontend/archive/73210a930333eaf66b42b01693bce7b70719c354.zip -> cudnn-frontend-73210a930333eaf66b42b01693bce7b70719c354.zip
+		https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip
+		https://github.com/nvidia/nccl/archive/v2.8.3-1.tar.gz -> nvidia-nccl-v2.8.3-1.tar.gz
+	)
+	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-cpp/abseil-cpp
+	dev-db/lmdb
+	dev-db/sqlite
+	dev-libs/double-conversion
+	dev-libs/icu:=
+	>=dev-libs/jsoncpp-1.9.2:=
+	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.24:=
+	net-misc/curl
+	sys-libs/zlib
+	>=sys-apps/hwloc-2:=
+	cuda? (
+		<dev-util/nvidia-cuda-toolkit-11.6_pre:=[profiler]
+		=dev-libs/cudnn-8*
+	)
+	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-visualization/tensorboard-2.7.0[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	python? (
+		dev-python/mock
+		dev-python/setuptools
+	)"
+PDEPEND="python? (
+		>=sci-libs/keras-2.7.0[${PYTHON_USEDEP}]
+		>=sci-libs/tensorflow-estimator-2.7.0[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.8.0
+	dev-java/java-config
+	>=dev-util/bazel-3.7.2
+	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)
+	append-cxxflags -std=c++14 # bug 787938
+	filter-flags '-fvtable-verify=@(std|preinit)'
+	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" tensorflow/workspace0.bzl || 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
+	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
+
+	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 [[ $(cuda-config -s) != *$(gcc-version)* ]]; 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
+		#com_github_googleapis_googleapis
+		local SYSLIBS=(
+			absl_py
+			astor_archive
+			astunparse_archive
+			boringssl
+			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
+			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
+		echo "build --action_env=KERAS_HOME=\"${T}/.keras\"" >> .bazelrc || die
+		echo "build --host_action_env=KERAS_HOME=\"${T}/.keras\"" >> .bazelrc || die
+
+		for cflag in $($(tc-getPKG_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
+	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
+
+	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 l
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
+
+	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 $(tc-getPKG_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/udunits/Manifest b/sci-libs/udunits/Manifest
index 251a798c3d19..e196d33d2100 100644
--- a/sci-libs/udunits/Manifest
+++ b/sci-libs/udunits/Manifest
@@ -1,3 +1,3 @@
 DIST udunits-2.2.28.tar.gz 1224503 BLAKE2B 64d64c609cfbada505c5e163a1e757cd25c09dd75865f255ec8f3bfc26dfafa0f2b9b9997602cb91f80ae81e1fa74bfc0f2d9f3d2d29f880c64e8785e5cbb1a8 SHA512 86146d489e1d472723e059fb15a5dd697a67568ffb5cdba17d191eb304c018bffffea708a73cce50a6c87ad33b387e5ee6653377ae0ebe9986117dfd41e9a5a1
-EBUILD udunits-2.2.28.ebuild 817 BLAKE2B 8838266671693bfad73eb9eb8d5b0f4b218de2a9bc04ba8023119342ec55694585446d524a5fd7f60aaeb4bdfb0044dcf99268dafa06b237bf14b31c50777ca7 SHA512 e20bf66dc5a1ba3160361144b5544e8fbe007bf0238c7c4d23e45ce038c0ec279aac70e237abdd50779e4d9b5790e2c9e14d5d4fb2f19be3d20bb4ff88029178
+EBUILD udunits-2.2.28.ebuild 818 BLAKE2B fb33795834e1249a7708e443f19d0aabcaadd2fa1f56da93e29f844e88e39a916716c414e8b0b3a7843e039bf9de8fc55cb68b85fcb67089fe8caafa7306f73c SHA512 67af5517fb55cbcdd0fc0af7483a5e404f596e202de1559d19edd65b7586506d01a0127853aeb4edf2a0a0b4f3042c7b6f52938059d2af79473920c7f9c44993
 MISC metadata.xml 536 BLAKE2B 89c4b4591b117a63e6d2e627b36d861605fc01693b26b11dd1a931d04beb000ee3e90974d7b4b74fff5435c9b9829d26b551500512139b1083d377214a4116d9 SHA512 7b2e3a330e624496803b31584636c95178e4ff810b075c338173bd2552a6a0c44fcb0304987b03cdae75bb49fde3306a8356b77f9ff8b8b77c2386bb7be512da
diff --git a/sci-libs/udunits/udunits-2.2.28.ebuild b/sci-libs/udunits/udunits-2.2.28.ebuild
index bb2e12de20a3..6282665fc0d4 100644
--- a/sci-libs/udunits/udunits-2.2.28.ebuild
+++ b/sci-libs/udunits/udunits-2.2.28.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/${P}.tar.gz"
 
 LICENSE="UCAR-BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/expat"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 13fd6ab5db3f..57f550be24c1 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -16,6 +16,6 @@ DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d
 DIST VTKLargeData-9.0.3.tar.gz 247523270 BLAKE2B f4011292957454da5d8c9e515bcd0972af4299cef3928098d745be96559a1e0080297871c6e11fdd98498c8786a30a6674bc650368adcbcdbc6260e0938d21a1 SHA512 ebd6cb5f2935b77961dd68d0c0da2ea5ab900cec8c2eb641c785a604c65702e40a3e44d32bf3f2acfce9ec28dd89f41bf29f93a4f89d5b36c713f3743d7125b1
 DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317
 DIST vtkDocHtml-9.0.3.tar.gz 132650096 BLAKE2B 45fc1a6942df3e79e500a552c3b3cda2099b9451191559d471e3a2e785a8c52b2c6273cfd2cc4a3f3f65582e607d9414475f58d243fde96a4f985bed479e53db SHA512 9b5fef43f3c2b92aa1fe6a9ba9458d6677874b09b167654db7f26df6feffdc34ed1a8fb4e59d64b75625063a774af77fe57f275903602a5f7daa74e1a2e71800
-EBUILD vtk-8.2.0-r5.ebuild 10335 BLAKE2B 134757c2f5c2f3097fefdb934e647292a419c5999049d7d5573f9d0b1f5ea3e45930843268f866d08f7b8ab9bf73c74b2c35c9daf5e1939ea62a9a65efbf4e2b SHA512 2b04b6710fe87660d985ef35d0f21844aa5c60dbc4a77452e56ccbd864447cb7ed56ddf804aee230547b3b25ff0603ad80e7dfb7c647054b3438e26ce516513d
-EBUILD vtk-9.0.3-r2.ebuild 14288 BLAKE2B a6404798ca5c03c963cc26cfd073cceef69058e611bc9c53a70fd21e1fa3d2d629921d9dea69e4a8ee66f2ed252d70d0bcece711da5e700fac27cb44f7d73a51 SHA512 7f39154caef160f999ffb7ee633ee376d919ae0cca5da68f29bb465c9614c3d5504a6470aae623aeedfe95a0353fab8d29b05806aedf792ab01edde64a828093
+EBUILD vtk-8.2.0-r6.ebuild 10341 BLAKE2B f8fdb78d1181de56f455869a7e4244ae369c62aa682757628b62926d7bb6ce29efde32b3d0faa9cae2c7a2faa52d893941f8ca93b872e831e7a791aca8cc68ae SHA512 73100a10ab6f9b4d1ddaa7cfbb60d3b9c79b53d96c21b9541769306d540b1292986b1e4804cec07d86e80cbb1fb5fb2f4b4870183f1ca70637836a606ac38d14
+EBUILD vtk-9.0.3-r3.ebuild 14294 BLAKE2B 25b9deafd34226c2e97b5bf59261f97247f3d2c138c64e4fd764ed4cafbe466b46b418240ec816588e4035096e943701d67f7e3243f0605f76d7e6e57f97a6a6 SHA512 70d844fb50a2d2fba1037ff6c0b0a611da04cf5ae3898134936a4e3b50d148bb9893ff0bd14d186ffdff9e6bd1afdd1879df21e623a834a6502edfc3e9170233
 MISC metadata.xml 1405 BLAKE2B 0eadca65bf1cec673770c28b581491053bfd0f0834aee7c063e79fdc8e89ae161f74e97de4bbcdc1f80590284a004ae129f28b948d6efee0bd5d1c2ae1c3b26d SHA512 133b198af799dabfd1f4dad6ba27b27f8a2df728b46b94934ba3cb26c6a51dec8882e905f120ce1e5f55fbf8fda4ee9634c59280f7fd1f7bcd316e64f86aec60
diff --git a/sci-libs/vtk/vtk-8.2.0-r5.ebuild b/sci-libs/vtk/vtk-8.2.0-r6.ebuild
index 20a38a74ce64..6cbd67167e03 100644
--- a/sci-libs/vtk/vtk-8.2.0-r5.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0-r6.ebuild
@@ -105,7 +105,7 @@ RDEPEND="
 		')
 	)
 	R? ( dev-lang/R )
-	tbb? ( dev-cpp/tbb:= )
+	tbb? ( <dev-cpp/tbb-2021:= )
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
 	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
diff --git a/sci-libs/vtk/vtk-9.0.3-r2.ebuild b/sci-libs/vtk/vtk-9.0.3-r3.ebuild
index 4bbb3680acf4..db7df9ecb55d 100644
--- a/sci-libs/vtk/vtk-9.0.3-r2.ebuild
+++ b/sci-libs/vtk/vtk-9.0.3-r3.ebuild
@@ -97,7 +97,7 @@ RDEPEND="
 		virtual/opengl
 		x11-libs/gl2ps
 	)
-	tbb? ( dev-cpp/tbb:= )
+	tbb? ( <dev-cpp/tbb-2021:= )
 	tk? ( dev-lang/tk:= )
 	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 	views? (
author	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
commit	2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree	c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /sci-libs
parent	e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)