gentoo resync : 20.10.2021

59 files changed, 1245 insertions, 654 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 37056209ff63..fd7d8d4658f7 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index f72e695b32e7..eee94cfa80da 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,5 +1,7 @@
 DIST armadillo-10.2.0.tar.xz 6042348 BLAKE2B e85f24ca7137c3a8c8fc53db15b382f2e4d468673c99e036ef9b4a4436be47d24a37664dfa88ff9effa08a4c868bd212d03c204dda09cd26038a0f8ccbf61375 SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd
 DIST armadillo-10.3.0.tar.xz 6214388 BLAKE2B 212d543e8d1845c974cf11302a944a151f63c7f301046910da6b2f27684080df520e5be10f8490a1cc27071ec84b1a91a2431e33960b561c56b291575bb003e8 SHA512 99877ff6581d3effea282d1c4e258883618f4107d84cfe85ed877afc62ba445793e760693c0c6c2113a1822881160cb10adb90087e97b4e31d3a1e64344a6353
+DIST armadillo-10.7.1.tar.xz 6258792 BLAKE2B cc820638dd7b571b5654e14bb82ced3586cb2950b1fb5aebf6bdd9439151353c4750296aaa4d15144ade6ed13e52743ac41e3cf34b824809931c3c031804bddf SHA512 b9be6a38165a4d23a61715a3c3f970dcb9b813bebd51b7372a4e8349ab2c351cd5c74f662d860911b30b2b816f2eb1255768fab1497ec087a63a07f56f74327f
 EBUILD armadillo-10.2.0-r1.ebuild 3485 BLAKE2B 1fe0375dd7c2e12d9698301d64506dab980fc772e45113375cdd1b8de4760545c8530f1b9ae83b53aa25d9b85e8127e046c7e5cc77e4d485383eb4bb4bf5e8e1 SHA512 09bcd99b2d3cca9519cf6e7236f9eef292995aacde116f71539d3e54c016f74e0f3584079bcbfd44bd30820ed6b9cb76433fe19a5a82c5673db0015950ae8650
 EBUILD armadillo-10.3.0-r1.ebuild 3495 BLAKE2B e22dcf3555f066406eb908e430b39a96640b5774adf2265d8b52d6e9af1d605a26db8c5d448a9559fabbbcdc77ad37bd832d55e90f926a4abfad50d8a5a68ebf SHA512 573eeaed666e2270bf56954945359dd57825c389e715480cd1f93d83cb88a5841d2957bfe77727cc88b5e6b93a452304c7d8712a293f5f4cb04cab93991686ec
+EBUILD armadillo-10.7.1.ebuild 3495 BLAKE2B e22dcf3555f066406eb908e430b39a96640b5774adf2265d8b52d6e9af1d605a26db8c5d448a9559fabbbcdc77ad37bd832d55e90f926a4abfad50d8a5a68ebf SHA512 573eeaed666e2270bf56954945359dd57825c389e715480cd1f93d83cb88a5841d2957bfe77727cc88b5e6b93a452304c7d8712a293f5f4cb04cab93991686ec
 MISC metadata.xml 1456 BLAKE2B 52019d7f250025250936fe57ef43e3f1d999eb3eb88949606f6c14e33b99615d3cf33e1073215b805259f2118f571052d40558ee60bddff524475b721b040a37 SHA512 be4692d066e500becba90262b74f17dc97d3c32248bf91aee1ffe2321a0611968855e8806da51f61b5f7e1e32efb541895b29630a302f756ea338aa62cf819c0
diff --git a/sci-libs/armadillo/armadillo-10.7.1.ebuild b/sci-libs/armadillo/armadillo-10.7.1.ebuild
new file mode 100644
index 000000000000..d85588ffb610
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-10.7.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake toolchain-funcs multilib
+
+DESCRIPTION="Streamlined C++ linear algebra library"
+HOMEPAGE="http://arma.sourceforge.net/"
+SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="arpack blas doc examples hdf5 lapack mkl superlu test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( lapack )"
+
+#	atlas? ( sci-libs/atlas[lapack] )
+
+RDEPEND="
+	dev-libs/boost
+	arpack? ( sci-libs/arpack )
+	blas? ( virtual/blas )
+	lapack? ( virtual/lapack )
+	superlu? ( >=sci-libs/superlu-5.2 )
+"
+
+DEPEND="${RDEPEND}
+	arpack? ( virtual/pkgconfig )
+	blas? ( virtual/pkgconfig )
+	hdf5? ( sci-libs/hdf5 )
+	lapack? ( virtual/pkgconfig )
+	mkl? ( sci-libs/mkl )
+"
+PDEPEND="${RDEPEND}
+	hdf5? ( sci-libs/hdf5 )
+	mkl? ( sci-libs/mkl )
+"
+
+src_prepare() {
+	# avoid the automagic cmake macros...
+	sed -i -e 's/^ *include(ARMA_Find/# No automagic include(ARMA_Find/g' CMakeLists.txt || die
+
+	# ... except for mkl, since without a license it's hard to figure out what to do there
+	if use mkl; then
+		sed -i -e 's/^# No automagic include(ARMA_FindMKL)/include(ARMA_FindMKL)/g' CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+	if use arpack; then
+		mycmakeargs+=(
+			-DARPACK_FOUND=ON
+			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
+		)
+	else
+		mycmakeargs+=(
+			-DARPACK_FOUND=OFF
+		)
+	fi
+#	if use atlas; then
+#		local c=atlas-cblas l=atlas-clapack
+#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
+#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
+#		mycmakeargs+=(
+#			-DCBLAS_FOUND=ON
+#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
+#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
+#			-DCLAPACK_FOUND=ON
+#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
+#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
+#		)
+#	fi
+	if use blas; then
+		mycmakeargs+=(
+			-DBLAS_FOUND=ON
+			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+		)
+	else
+		mycmakeargs+=(
+			-DBLAS_FOUND=OFF
+		)
+	fi
+	if use hdf5; then
+		mycmakeargs+=(
+			-DDETECT_HDF5=ON
+			-DHDF5_LIBRARIES="-lhdf5"
+			-DHDF5_INCLUDE_DIRS=/usr/include
+		)
+	else
+		mycmakeargs+=(
+			-DDETECT_HDF5=OFF
+		)
+	fi
+	if use lapack; then
+		mycmakeargs+=(
+			-DLAPACK_FOUND=ON
+			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
+		)
+	else
+		mycmakeargs+=(
+			-DLAPACK_FOUND=OFF
+		)
+	fi
+	if use superlu; then
+		mycmakeargs+=(
+			-DSuperLU_FOUND=ON
+			-DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
+			-DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
+		)
+	else
+		mycmakeargs+=(
+			-DSuperLU_FOUND=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	pushd examples > /dev/null
+	emake \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
+		LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
+	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
+	emake clean
+	popd > /dev/null
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc README.md
+	use doc && dodoc *pdf *html
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index d51b4daac2ad..313c0ef35af1 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -2,5 +2,5 @@ AUX avogadrolibs-1.91.0_pre20180406-bundled-genxrdpattern.patch 1644 BLAKE2B 3b2
 AUX avogadrolibs-1.93.0-fix_AvogadroLibsConfig.patch 695 BLAKE2B 40feb1bfe132fe5ddbef435b4d611a55650c0348c943f0796a87fc0761c99c4aebcbc54fb4d29e545c66384ad7352067f3ff5549e9e26bdd2cfe602974f56425 SHA512 7e5198bb3b6c7e83372bd6b54d3f50347ff8519fd24adcb0c59fdc50593be1c08cc2b1d7d12dc530de10c80bfaacad17679a6b1b90ded82947fe94d6dfa51f56
 DIST avogadrolibs-1.93.0.tar.gz 2735862 BLAKE2B b5d696f23aeeab27358ee390a30b2cf146e7119185a0d2e8d71b34d2744e534cd8b50b36d12928b5aa723118db470272b6428514593d64770d172c4bde730cf6 SHA512 1af220e5614cbd96656679c2879cb7f7c46acd135b4e6f2e5f8d0ba98601ce004e78f019a0a71c643f005451309bd194eb73eb9f66707685e5855b47e95f7eae
 DIST linux64-genXrdPattern-avogadrolibs-1.93.0 7480152 BLAKE2B dca8285c41aadfaa20c72f337e0f02db8ee07ce30c11ae84bf3aa7bd0b2220273d33f484d63f761d41a8946c6a0b77a0fb27906c480bcae01ae49b1531ae5cbb SHA512 538bde12e1e52600a21640d5907f43fcc853c6f3c111880f39eb238093e3d1358ccdfa1f45e944ec8b8e5ee3c2dff269cefe5334db5d73300e6ca327c95520b8
-EBUILD avogadrolibs-1.93.0.ebuild 2422 BLAKE2B 911019bbe695b030064bd0c23159402d22ddfae058f3a7bcbc87427b76616b125ae283ab0ed35afe16d915957f7468974afc74b8dfb8c4ff3bbb976987ea918e SHA512 a360095e50bee771e34c4be736a1afd5ccf6ad4687a8f0294093a18a095cf2bea6ec4443b79bae2e75ae3edcbeb77439af54d3d0d1a32930554727b7d62acdfc
+EBUILD avogadrolibs-1.93.0.ebuild 2647 BLAKE2B df0837f311d0acca43d12920c6d9e34df7e225a59f9ed959ac92c70764a483174693529ea49644fa3355ff30f816b7225dd406a780cb7fef22436e6333e3b1fd SHA512 93453289e331bfd812b3a199df45657ee4815ae137c09a0eece04790bc53b2aafbb39af43b9982ac385dd4833f154925c4146c5dcb29c10d3bba5360235748a6
 MISC metadata.xml 580 BLAKE2B 6947845054474e20335743a41d96511981b4eb0bf9ae1c4ab23cb20fc2ead0dff6055c406ae96604312fe348d636f4b9557e98b051ddcf33ba13e9d68df01045 SHA512 81e34367a52b6d1ce417ce086d11e72e071ca7193862bfac1b6c7e4160716e50aaf40a157f3e05dfd0a18a00388fe39a254332c548e101c478d93aa8b38b8e4c
diff --git a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
index a2872894639d..4db9d9a0c2b9 100644
--- a/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
+++ b/sci-libs/avogadrolibs/avogadrolibs-1.93.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -62,6 +62,11 @@ src_unpack() {
 }
 
 src_configure() {
+	# Seems to be what upstream are using too. Apply the old hdf5lib workaround.
+	# https://github.com/OpenChemistry/avogadrolibs/commit/32e3dd8ce9f48f74e3960dc9afcc614496d87c7f
+	# bug #810505
+	append-cppflags -DH5_USE_110_API
+
 	# -DBUILD_STATIC_PLUGINS=$(usex static-plugins)
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 03fbe4e650d2..bcf168ef5d0d 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,3 +1,5 @@
 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.19.0.ebuild b/sci-libs/cartopy/cartopy-0.19.0.ebuild
new file mode 100644
index 000000000000..613c5da6a598
--- /dev/null
+++ b/sci-libs/cartopy/cartopy-0.19.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+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/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	sci-libs/geos
+	<sci-libs/proj-8
+"
+
+distutils_enable_tests pytest
+
+DEPEND+="test? (
+		dev-python/filelock[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/flufl-lock[$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
+	rm "${S}"/lib/cartopy/tests/mpl/test_gridliner.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/cln/Manifest b/sci-libs/cln/Manifest
index 217a90f62e28..0f2105c08dd6 100644
--- a/sci-libs/cln/Manifest
+++ b/sci-libs/cln/Manifest
@@ -1,3 +1,3 @@
 DIST cln-1.3.6.tar.bz2 1330815 BLAKE2B 89ddd0079ac746b262dac01ae0fc1ceb250956c530883d93430e62866e09fdd964c4f96edb21260f9aa40f739450996e1bf21503a30cc02fffaba08a1bd45264 SHA512 a32a1449c5f0edac1444e58f500ef1a72ffab8dad65125082eff0995cc9855b45f38b89c7f754e3d4487756a8cd3f7db1e534865b8d0384fd28246f444ed7d14
-EBUILD cln-1.3.6.ebuild 1215 BLAKE2B ac20e7073ee6094ab8ffc70cc8ccff9ec3d01ea3b64d3fab27aa41d3fc43bfc0fff6f762f34d74feffba78d074dcc13f6f8328ac15985c97471f88a8dc8273de SHA512 c3b4ed1486a26a9d3f42b3f515c6e32aaad4c9bbe11f1ce1890e4f4884f7e70f60de1c54fb371dc00105ece0855e6daf6c33400cce008a4bdc03503716810647
+EBUILD cln-1.3.6.ebuild 1222 BLAKE2B f9d9d50713197cd6e907cda50beb4e913839d2ea7a60f76b3fdef93ab90e2c87cfa3bbe7420e93c7bf6b808175bbc666fd75dff7e6164562680c8ad6c43c83fc SHA512 ccfb34f06148cb1f5d42094077e2213bc30c0cb6d1907537dba17a7d57d800d7e63b1518173940bcd11a24ac4e53be8ffcca120f82a5eff1cc36a11ddddb639b
 MISC metadata.xml 703 BLAKE2B 8385b6d49e14fc8cd29e014a40029040b1d05932d2d6fcb934b324b3c7e6c020d098251e165dda96d960c6b1e624cdbbc7017503054d648f471459cc3c3d53a2 SHA512 cd4540af0eb5dac571c76af2083e3c550b9878b79ca78d2c3fbb4f1133b350431612c0b41caf9b7a26f4208de919c8484c88970e771191eea9c94ae11b237384
diff --git a/sci-libs/cln/cln-1.3.6.ebuild b/sci-libs/cln/cln-1.3.6.ebuild
index 88ac5650e971..bb01f5560a4b 100644
--- a/sci-libs/cln/cln-1.3.6.ebuild
+++ b/sci-libs/cln/cln-1.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.ginac.de/CLN/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="dev-libs/gmp:0="
diff --git a/sci-libs/cxsparse/Manifest b/sci-libs/cxsparse/Manifest
index 84ee8ff99876..123e56027cf3 100644
--- a/sci-libs/cxsparse/Manifest
+++ b/sci-libs/cxsparse/Manifest
@@ -1,4 +1,4 @@
 AUX cxsparse-3.2.0-header.patch 531 BLAKE2B 7b8738c26a48aa01541db4978cc195f093da3e5d81536ff5819334ac847cd5d5a0e7ea5d2b1891183015ff449d98ba96ad360c4097369a70adab72a5419c471f SHA512 2340a350af044bcded3a592fde76ee885c02a3047772a02d91bfa0b43e7b6a04d7102893ba8d3e2394435fa6194d767812a3896359581c4d789890d2d35a78e0
 DIST cxsparse-3.2.0.tar.bz2 2080196 BLAKE2B 9b89469c45e518077c4348ad3efd8d89d248e4c039057c0286ee44b493ab595075894d01530cbfbe845b91ef5e43cfbfdd102721cfeefe943a1cb4bc5f171843 SHA512 9931dac5b319b61a39ccb5f34309acb4240602b5f55d029c790ed0b7319a373cb925c4b83994526af4bc5b19b88c723f04581068d1fc80960a290c9d6d1e1aef
-EBUILD cxsparse-3.2.0.ebuild 753 BLAKE2B 1aef0b6e6b6db2116ccfa566909299b0893add76ca93eb333e1e0482949dec774b378aa1edb5336069d909e1332334526e5603491195aabf7a5ceb36ed1277b9 SHA512 cb676f18256b067b035322b0a5f019e613f7b0824d363b25299c2ae4b3ee0a5b9fc5655faff56a3a4f8aba2c43dbc4e8c5ffade537e02b14557e1f64e4cbba80
+EBUILD cxsparse-3.2.0.ebuild 760 BLAKE2B 3be49112e69ffcbf2cf8baecc1c6d3a80bf612309f95d2602ad958358ddfcd6c08f4d5b84860942419dbe80925b460fec8c0233f50e3b1e6199d07401b533ddb SHA512 42bf362643a01cb8b7b4543efc9e9137a2c1c576b1c9c9f9a2931cee914a40a1a9a723ae7ebc1af5fd3a2f9d062a6c7c297c8dd81843b5915bf6e5b2d1d8a188
 MISC metadata.xml 450 BLAKE2B 06f645dd4abefdc2442fd56a7b4ba79ad4251e39e58938b53f848c68736e7cad82f7d1ca268106034e66ceb900dcd1fb91ba110a19ee08eca5409e19e37e104a SHA512 ba5b18e97e038f65590e260a0a5fbf3e933736a316b2ad764e07d2b6acb0bc2a010cfdd7f132e303f3abef5f853f9f62cd8653d5114e6e7dd159b0aff05a37f5
diff --git a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild b/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
index fa44cb7a77cd..f52f3c13d2d4 100644
--- a/sci-libs/cxsparse/cxsparse-3.2.0.ebuild
+++ b/sci-libs/cxsparse/cxsparse-3.2.0.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"
 
 RDEPEND=">=sci-libs/suitesparseconfig-5.4.0[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 5cff134ac254..7015bdf45ff7 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -15,5 +15,5 @@ EBUILD gdal-3.2.2.ebuild 7723 BLAKE2B 1223e7a57447dc0e948abe14863417b3dc4fbd3154
 EBUILD gdal-3.2.3.ebuild 7728 BLAKE2B 781ae5b6c49720232778e17c4f8e814961d4d14d3694cef31f19ab2d2b775fe376459aadc5e2dbb0bafda3ab31e99d667ee2805401ca28af03cdc610c477ad59 SHA512 d615affabf2762783d899264863297b5bae4e10956bdbb297f4aa0102298babbae0ab9400c0cecae1fd017f36787ce29b70d357e8ee3d6b471216291fb60a904
 EBUILD gdal-3.3.0.ebuild 7695 BLAKE2B 5e8638c7baa7d50e7e87d9a845712171151bfd1d2a5a1cc4bb3e004f7ab58a50916ed4d88db363dff71058317ed81d14b552de685e091e7b198e645126190b33 SHA512 618f06c7f1ef77c55f0309d55ed7f93ce77daf36faccf4f6ab19559c4e2536c3d21ad31b063358efe8aa3ba4079e7dbccbb26adbe6f7908f6ba0d33e8588cb09
 EBUILD gdal-3.3.1.ebuild 7639 BLAKE2B 652fd54f5831da35e2c1c72e2a4f426aa35e3f0ff229c86206f3b46837819c58906bb9430505ce43ef84bdd9574ce8ae51f8c17e03eb0608bc4777fd8dce5996 SHA512 50d16549833be758b5e25bb689ed9f4d45d52dbf8b581fd323f2c50f0e228552e8fffdc6440c9b78102cc567e448f2a63c60a56a706737e3b2b8ac2039fd9a90
-EBUILD gdal-3.3.2.ebuild 7689 BLAKE2B 84fd125cdf4a06cded33ec93147816e0a5aebc2a85a84f7a4c577d1e9a501475fe5a78fd0f5ed212907bf751b7f479f8073a277a5ab4746886a5e3dea87d986d SHA512 298ccb2e24c1823d692f0f03c30e5856f62246bec9c22a70547a53e3a14f337066489c7e8b9ad89f084c2503cdc8905638b9e166012ee74dc24091bf46211208
-MISC metadata.xml 1496 BLAKE2B c1a8afb6d3d7d4626fd7dad8e35f2628187b68aa2e4948515fd3f2a4e6e4f230a7476bb95b62dfce6f2e1897b77a1045c0eaf441d12d5f1056d5d7ad180e6f58 SHA512 f57bc301b23541e356b7c2336779e654e76b12bc727bb17051c392823d794d7bca028d8a330f55b779a011e8161cccdf96b041b7970b51d5dcdd541518b4a966
+EBUILD gdal-3.3.2-r1.ebuild 7742 BLAKE2B 13f29567e52ef6d8e8d5b82a3675739fb0284e4d65984d15be7865280892f9e0ead777dba9f687b0e7fd25d10bd4e6c3fe7a7895283a5df629ef64341affafe2 SHA512 d414f487b9490249d7feb54bc0fae8e471f5eb7036535c248124f2d88c716127459e4c8ed7af2b70e54f38c5462f8b81c6569f67fc7a1f19693e65119b5a01b5
+MISC metadata.xml 1623 BLAKE2B af7c9d5cc3c16ffef6fa9ef5dd5cf54ffcd34229d1e82b90e310f9eeccf5a5b4fa2119112b5427b520ce6e964e368aef7313edb3837940bed4b960ced7714fc3 SHA512 ed206877adac0b8b190e0edfb04f48c435d698fd523a14d54a14638b908c9e9452b1a2d394046093f5aa86cb48c611790f56ae511807855eb80bfcd4cc1d425c
diff --git a/sci-libs/gdal/gdal-3.3.2.ebuild b/sci-libs/gdal/gdal-3.3.2-r1.ebuild
index 216917c266d1..75f85938c60c 100644
--- a/sci-libs/gdal/gdal-3.3.2.ebuild
+++ b/sci-libs/gdal/gdal-3.3.2-r1.ebuild
@@ -14,8 +14,8 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/3.3"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 REQUIRED_USE="
 	mdb? ( java )
@@ -53,6 +53,7 @@ DEPEND="
 	geos? ( >=sci-libs/geos-3.8.0 )
 	gif? ( media-libs/giflib:= )
 	gml? ( >=dev-libs/xerces-c-3.1 )
+	heif? ( media-libs/libheif:= )
 	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
 	jpeg? ( virtual/jpeg:0= )
 	jpeg2k? ( media-libs/openjpeg:2= )
@@ -190,6 +191,7 @@ src_configure() {
 		$(use_with geos)
 		$(use_with gif)
 		$(use_with gml xerces)
+		$(use_with heif)
 		$(use_with hdf5)
 		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
 		$(use_with jpeg)
diff --git a/sci-libs/gdal/metadata.xml b/sci-libs/gdal/metadata.xml
index f505485ec713..ba24c3b77d31 100644
--- a/sci-libs/gdal/metadata.xml
+++ b/sci-libs/gdal/metadata.xml
@@ -19,6 +19,7 @@
 		<flag name="fits">Enable support for NASA's <pkg>sci-libs/cfitsio</pkg> library</flag>
 		<flag name="geos">Add support for geometry engine (<pkg>sci-libs/geos</pkg>)</flag>
 		<flag name="gml">Enable support for <pkg>dev-libs/xerces-c</pkg> C++ API</flag>
+		<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag>
 		<flag name="mdb">Enable support for Microsoft Access database</flag>
 		<flag name="ogdi">Enable support for the open geographic datastore interface (<pkg>sci-libs/ogdi</pkg>)</flag>
 		<flag name="opencl">Enable OpenCL support</flag>
diff --git a/sci-libs/h5hut/Manifest b/sci-libs/h5hut/Manifest
index 6c9d460379f7..86795017b301 100644
--- a/sci-libs/h5hut/Manifest
+++ b/sci-libs/h5hut/Manifest
@@ -1,5 +1,5 @@
 AUX h5hut-1.99.13-autotools.patch 2809 BLAKE2B de8b47ec4dd418cd3c6e5c7670c11fb913c40d92a6ad9dbd75125443e5e827fecb4d21b5551f69355c5da6acb2159a095f448c2e063ac5014138de3321b830f8 SHA512 05200ef8073c1c39e322015e9d4b9764c470336f704c8f86e056d1936de669f256c64baf94307d84f4574d1204f914abffa9b134942e354f474c51dc0b78c05c
 AUX h5hut-1.99.13-mpio.patch 574 BLAKE2B 063729a01cd992fab481871210e0f6c63f2b93cd8f41e7ee11d84e2572e46945b1934a52514376700c4f4e25b142279591698f53067b9398f1290113be5e3399 SHA512 9335f2d84c4353123e1c1af5f82a729322cacd6f0bfa95ccbe042b76693f035c5b2860d788d31063299e3705addd6160b4b985be88beba341bee56a397387919
 DIST H5hut-1.99.13.tar.gz 3029357 BLAKE2B 555d1f89ff60fbd72763026643ae76d5f68bb9d76bfd2fb29d846e3c777184db3be1bae98763ae683e72566e2624678118eea0da8d0bc1e57b84fd0b4777abe7 SHA512 c2590795c45ecf5e642308f5b36c4e573fdcbb6e985f5867c13fd9e1f0ddd9b48fbc423ad0165b8f047256e42a1eb54d508c9322a593bcfad3a2769547d2887a
-EBUILD h5hut-1.99.13.ebuild 726 BLAKE2B 6e19142b2f82e849dae6259b10ac59c379047c8e65862403fc36c7ef871a4af891fc4a3d626d3ebceba2ed7f6399b366e0f9ebb10cdb04d71626735adb803962 SHA512 1c89b5d2554f5aa1e0365d1591fcf76632fd965a0db6ca580b1be26f23761f617530fb01d554bcdf27c259858bc02e9cd263a189bf5beebec9b678bc42fa255b
+EBUILD h5hut-1.99.13-r1.ebuild 790 BLAKE2B 09575e246784c9824cf00cc85660544a9c6edfe280677bdaae9531491a793e0af2e2dfdfc146dd90417a32d1c7c60dfbea4af05d2c469db8625b7428446dd558 SHA512 5541f0e4b059dfb8e77b0aface99028545b5e89459784186de315fd3b4866c9021ece71f6df28ba83ca1168a6aa8aa9eb23c95f8e24064d02edb528085a469f5
 MISC metadata.xml 368 BLAKE2B 41a4fdcd35d6ab16960378ea85a83bd575875f47efd542967a0385dc259237dc774d0af238546b1a68f105e5181d4d96e441ef6e8a25d0e7c9ba40a0634a7c2f SHA512 728a27ced9c287be3b8647603d958330416cb601eb28c974d1b6ed95a8b611141ff272792cb2a098d931f9743f7a9cade84369017c982fd1a3bbdeeb69c1a02d
diff --git a/sci-libs/h5hut/h5hut-1.99.13.ebuild b/sci-libs/h5hut/h5hut-1.99.13-r1.ebuild
index 5eca8e34f1dc..8401f6468846 100644
--- a/sci-libs/h5hut/h5hut-1.99.13.ebuild
+++ b/sci-libs/h5hut/h5hut-1.99.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,9 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+# < dep on hdf5 because of bug #809221
+# Needs a proper fix.
 DEPEND="
 	virtual/mpi
-	sci-libs/hdf5[mpi]
+	<sci-libs/hdf5-1.12[mpi]
 	"
 RDEPEND="${DEPEND}"
 
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 0f4a7f6a7ab2..e39490452c26 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -6,6 +6,6 @@ DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2a
 DIST hdf5-1.12.1.tar.bz2 9724309 BLAKE2B cc75ba497188b33972218d02a7601acad1a0443bdb934ecd1641ef5996076fe120e3b72dba3a99d99f919fb4e478d1e531414448de9a7b97a0afde58a4c7c23f SHA512 158a067ee284ccb9e2c4db12e9d37cf187d90d9ef1bed7a6303e2c3a2fd216d7b13a46c5f46018b097511281c4246156b6f917633ca88872f10f0ad04be285fd
 EBUILD hdf5-1.10.5-r1.ebuild 2883 BLAKE2B ddfc519217494eb2f3a2cd2a37f70d9e2005cd049299fbaf2386414db0eac65a2655b39fba85231896cd2f2ef42fd15d57273b77fa53e0d492a889fc6db51fbe SHA512 007a97a089002e330569913ce42afd92b63d659b9d9f4fabe85170d7633950da025cfc55273f564faf1aec52d3ad4c704825cc501bd441d522f65238ff44ad88
 EBUILD hdf5-1.10.5.ebuild 2712 BLAKE2B 56dc60e54a2e3758b32eba9977bb96e67bcdec38670579e985733ecede749f638370bee98959986a76e841c8adf4a92740fae6b8c8ed36e5e0ba2814a2f82537 SHA512 ebf92105b2d149f1947dd0d95b2ef5da85b4d57a51eeb4e5c8d9535e706b06e6c46910ee8671f1d44021636cec71070755aa7d7e62db4f9e1fb39d7e0d7d4fbd
-EBUILD hdf5-1.12.1-r1.ebuild 3158 BLAKE2B 7017b7915fe0b3d489ff261ef54ab8e01cf33a0709a7105272607e84b3347ab469605e3629f874e3f96667c1adce0891901213156ad8e4b8169193787d250941 SHA512 33072c3b6efd4c9d83167961e7a038e0c218be8c1ca66d497751b4b3e8b204422d49223092ef4019db8e2c57f6c0f46db72cdc71398163b46136775317ed89d9
+EBUILD hdf5-1.12.1-r1.ebuild 3379 BLAKE2B c8071ed6c8443f0aa06848eab9d8e5719de69216b200ea588f82e33e7e8dd71c6260e2bf5c1e45cc261e48518a65252b3e7d3a57313be5102f22febe50923d9d SHA512 34c4ec92af1a43f6b8978ebf38360c8372559ee204d9b737560671122879c3818e040f374c735366a45756dd7298d32414b90d07dfb90338209e283275a50a54
 EBUILD hdf5-1.12.1.ebuild 3061 BLAKE2B a21c786534715cbfdb57208a021c6f48ff89417db20490673bb86c362b7065280f810135a6b60ca20d6cbb6a7bcc6f332f64cada97ca8fe25a52bf9e868f905a SHA512 0f809656f7088844eaeca31695877919cf3aae466bf93e1b3c9bd72474712415dca62f39bc51c6e2265c2f64427a5c1274fbb18092d614ee32c0f29d6068c0c9
 MISC metadata.xml 935 BLAKE2B b9195ac707556cdb2ee2c4d032fabd88aad674ad4fa52a60fbeb31c47ae51b9511bb097d4271d19b05d1dbc3b59b3cafb3b7d407bd9b8095bfd449fa8728ab6a SHA512 57c4694ea2c024c7babdf34474a61b92165b6c322fa11ec7fefdf16d66b44f91f66d63eeb355311b121fbeec8da810e393e3e785a4c434ff658c7b4bd7baf22b
diff --git a/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild b/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
index 9a0d092cd1fa..a445755a1291 100644
--- a/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
@@ -67,6 +67,10 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
+		# Workaround needed to allow build with USE=fortran when an older
+		# version is installed. See bug #808633 and
+		# https://github.com/HDFGroup/hdf5/issues/1027 upstream.
+		-DCMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE=ON
 		-DBUILD_STATIC_LIBS=OFF
 		-DFETCHCONTENT_FULLY_DISCONNECTED=ON
 		-DHDF5_BUILD_EXAMPLES=OFF
diff --git a/sci-libs/htslib/Manifest b/sci-libs/htslib/Manifest
index 7c854624e360..475aad140a52 100644
--- a/sci-libs/htslib/Manifest
+++ b/sci-libs/htslib/Manifest
@@ -1,5 +1,3 @@
-DIST htslib-1.10.2.tar.bz2 1306320 BLAKE2B f877bd9c160921f498f4160f687094a1a369732bc9f61cd94a3c9ca311fa9f865505a205e38e0d348a1010b627f1ef07b590cd7e69c945df1d804133b17b2fd1 SHA512 3ecb83b0abccf731cd42b889e352e10dd922524f6e78bcafb04f8c6c71457b0dc1f5f22690b36f03cce7d97a6a905db286243ef4858138068dcac368e4ae1075
 DIST htslib-1.13.tar.bz2 4226834 BLAKE2B ae1f64e564f0f7bea80ea9d276b5d5b2b04fa3c8bd58f2c68966225b4324962f34d8a26b74267ab90dc530dfced1b9c01702d25918fd7a7c74e13913f00d5007 SHA512 16a3d61c115b71406bc4411a0c1176909166b52c4f7bb11614e398df4defaec4d09763413053e4d0d5916921c866d20019096d8fed866e77f9f1cafbd1e95b16
-EBUILD htslib-1.10.2.ebuild 1041 BLAKE2B 12d35fa9397f441d9e1ee444abca8c56cf87bf16aa2b82b0d6d0bad6ec27546dccdb4b540eaca322f5208eb7c0a6b9f6de5cfa8762641d73a3f40fd8bee5ea47 SHA512 99c54c20f1f01fc243bc7cb25325265e1d959fdc23a3d2db4c2cef29fb9f74cc423835a25d9f5fa1b5af027413caeb6ee8fff2f517ae2dbe8119b80c504b87d9
 EBUILD htslib-1.13.ebuild 1052 BLAKE2B 1d219220299500bce4aaf8927bde67beba02afda02319527cae8f3aa7ccce131a21c0b27e9eaa0ade634d99d910915108abd48385a9686a95795b74733f3c0ce SHA512 3d5bc8e165e27b5a5f1e0d87c7802e65c2de55bc7754cb13d5bcd5f2c211de37ecd81e8ebfa0377158eea196449d9b71858c08372ab73f30614e6e787af47005
 MISC metadata.xml 350 BLAKE2B 6512256a4c692625cb824d90fc8b85942f88db717fd265548b97a5b535158fc65e1f2e74df4ebd3c2a259dfd3a4244a13493fc410b1663b8054b29a14995787d SHA512 926efc676b0619ae901253f2207c8ba948ebe3db560377a55edecd9cd58cd2ec806bcdff875e9c5c9a170921c44818271e8ddd691fe1a84ed651f7aca75265ec
diff --git a/sci-libs/htslib/htslib-1.10.2.ebuild b/sci-libs/htslib/htslib-1.10.2.ebuild
deleted file mode 100644
index 67a341be70e3..000000000000
--- a/sci-libs/htslib/htslib-1.10.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="C library for high-throughput sequencing data formats"
-HOMEPAGE="http://www.htslib.org/"
-SRC_URI="mirror://sourceforge/samtools/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bzip2 curl +lzma"
-
-RDEPEND="
-	bzip2? ( app-arch/bzip2:= )
-	curl? ( net-misc/curl )
-	lzma? ( app-arch/xz-utils:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# upstream injects LDFLAGS into the .pc file,
-	# which is a big nono for QA
-	sed -e '/^\(static_l\|Libs.private\|Requires.private\)/d' \
-		-i htslib.pc.in || die
-}
-
-src_configure() {
-	econf \
-		--disable-gcs \
-		--disable-plugins \
-		--disable-s3 \
-		$(use_enable bzip2 bz2) \
-		$(use_enable curl libcurl) \
-		$(use_enable lzma)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	# doesn't use libtool, can't disable static libraries
-	find "${ED}" -name '*.a' -delete || die
-}
diff --git a/sci-libs/libcifpp/Manifest b/sci-libs/libcifpp/Manifest
index 42716af35f6e..bbaa77be9906 100644
--- a/sci-libs/libcifpp/Manifest
+++ b/sci-libs/libcifpp/Manifest
@@ -1,7 +1,10 @@
 DIST components-1.1.1.cif.gz 80378687 BLAKE2B 0776d79f733762ad19177bc93a5587e90966a7862f84174ede23a5875ae4633b519168b24b1c02d7afb30f9049d48434921a70c097a7e8238a5745f1676dcc78 SHA512 fc68513b37871677beb60855e82ed5831e10b08340697a97bbc7113d4c898b8e8382d097d36793346e34b97f0b5def5312fe7eb81ab4f120ad3908ee8d6d1aa3
 DIST components-2.0.0.cif.gz 80878869 BLAKE2B 183c1227f403466fa543575243176d84e72bf224a70500876c77a52f0c8e1af80e99ed8cd8b428c7adc822e7006501a0cfc414e60a2896b1f53b98a116e3e4d8 SHA512 b1212155b8d6c593593013b1b39b9c711e85c1bf9b68d412dda25720ab94d82ace4445f47f832a66901d0ed5773e2d2cc5dde7a9170b9294c506edd6843d6d66
+DIST components-2.0.3.cif.gz 81156388 BLAKE2B 00a70db993a5cea859e9839fa7e76bbe59f7e8568bf4d69c7550fd8b5afbb85c8efc577c3a2d58e1c472ce5658fc9ece874d827ce20d4214377576bab6bf8577 SHA512 2a686161a39383efe0a21da600b51dad125262f04a51c74ab780df06425b657cc487c82e9816ad129997ad1f81c008e60bcb9a23095fa479c7dff2fb3d6df6aa
 DIST libcifpp-1.1.1.tar.gz 978553 BLAKE2B 750cf80bac769a3db86b3be03924402da0254e69206a15222a5dfaa23a7eadcac1f57eb054f2fc783c287bfed86dab0a75d2994b031cc3cd3c2431a26e250d17 SHA512 e74419dada21ea12423c404c34eeb0b410fdb0b26827cd4451375329668909879b6d4795451c6f7c2b2ffc8d282dfcff2f1800630a3487111404335be4cb338f
 DIST libcifpp-2.0.0.tar.gz 996947 BLAKE2B 58568f18b17d79d8f3e2487035b505d814e0343bb56a2b18665651a3788b54d5330309c3c27b6f4636ab5e9bf3f85ebdb1a4fc8ed67adc7941559c481135f873 SHA512 8ca3f0445dad758f7fd63a0039fbe3267420d2b51036cd67a38d925b498c8ac580b86a9900317c63b4705a4a9fc9c3ef1036d40fd3f20f8eff2d6e6e5da7b735
-EBUILD libcifpp-1.1.1.ebuild 797 BLAKE2B 7b1a06a06e05a7f909c5a08e829436ecb3460c1ae82f0c0ca7606a98e91e763ca1f476da5f09bf5982249566843be97533a752ae4b382f148b89a9215ade36db SHA512 6fafc36be05ec5f8a2bc6bbb06af5d43b4a043129a2410e459cce6d09948ee845a3f06415e5517595b7ef47d40a96a6f0aeda39030be2800da7604107868b843
+DIST libcifpp-2.0.3.tar.gz 959697 BLAKE2B 40f04926ec307260ab9d552aa3fa646cd776b48e84c1bf2ca64769b8726f647cd0f3f81da80a2d94b4cd0b26e438106db5626319a245c769a56f42ab32273d03 SHA512 7d0ebf70be1a1debe22a0dc2404b78c766d1d263ed556c47a9b77da510f1a8112d0a5ff61706f697245916534900e2791ef2b927b439cbecda6558c84c133a0e
+EBUILD libcifpp-1.1.1.ebuild 802 BLAKE2B b1687027d5241d1f0736c149f9325a3b82cac8223c16f7e387be3fe16aa809b25bf84b3a743ba448405e79ac57f808c9545230fc24714c649963b3d26ed48e4a SHA512 f42b7e7eb47150320358e2cbe916cd25aee36ddb96a784771dbaf678f6fd5417e492e6d5496af1bfc96364b503b587371efdc69ef9b0b8d08be68113f88b20d0
 EBUILD libcifpp-2.0.0.ebuild 797 BLAKE2B 7b1a06a06e05a7f909c5a08e829436ecb3460c1ae82f0c0ca7606a98e91e763ca1f476da5f09bf5982249566843be97533a752ae4b382f148b89a9215ade36db SHA512 6fafc36be05ec5f8a2bc6bbb06af5d43b4a043129a2410e459cce6d09948ee845a3f06415e5517595b7ef47d40a96a6f0aeda39030be2800da7604107868b843
+EBUILD libcifpp-2.0.3.ebuild 761 BLAKE2B d619db8fa0d30c8353fe303a22aaad764cd131421053a77bc494ccd73b4e58864c32fcbec5ed1826fc1374db73e7b80c4292721f4c9494e5eacca026552ee9e3 SHA512 1e92802a4f4fe3c65cd89ef917daf0988bbdaed890ba0edbc549ac9350eae394db0a16bb783faf84d55b16b388edc9c1f6fbf9d1acfd83a4b25385d1b2f14f85
 MISC metadata.xml 217 BLAKE2B f8189b02494f180dac078dcd5c275d3c795f20f360f8b172c66065a2d937e396b24b8631bba4cd8567d60285ce89fc77b9539f2233bf33899c820613c48c33ba SHA512 f0c9e5b3d281fecd21b1e23a6f44c94c1c0b3220de46a177d35932111b7f1ab4399061c42833ac1ee9bd0324b139fc8db66e0d2890224d607bd3be38ae469be9
diff --git a/sci-libs/libcifpp/libcifpp-1.1.1.ebuild b/sci-libs/libcifpp/libcifpp-1.1.1.ebuild
index 1f190d58f576..33da8b38c37f 100644
--- a/sci-libs/libcifpp/libcifpp-1.1.1.ebuild
+++ b/sci-libs/libcifpp/libcifpp-1.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/libcifpp/libcifpp-2.0.3.ebuild b/sci-libs/libcifpp/libcifpp-2.0.3.ebuild
new file mode 100644
index 000000000000..1cbb3962edf8
--- /dev/null
+++ b/sci-libs/libcifpp/libcifpp-2.0.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="Code to work with mmCIF and PDB files"
+HOMEPAGE="https://github.com/PDB-REDO/libcifpp"
+SRC_URI="
+	https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif.gz -> components-${PV}.cif.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-libs/boost-1.70.0:0=[threads(+)]
+"
+DEPEND=""
+RDEPEND=""
+
+src_configure() {
+	cp "${WORKDIR}"/components-${PV}.cif data/components.cif || die
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DCIFPP_BUILD_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/liborigin/Manifest b/sci-libs/liborigin/Manifest
index 00d5f25ab385..ecdbbeb4ea50 100644
--- a/sci-libs/liborigin/Manifest
+++ b/sci-libs/liborigin/Manifest
@@ -1,7 +1,3 @@
-AUX liborigin-3.0.0-buildsystem.patch 5563 BLAKE2B c9905687284e0a81b504d765ff237bc89c0023816c7ac1a8636971ff43db62d894b3add5d5d3427966ff627125fbd524240d2fa3f9da716c221d87dc83eb44d0 SHA512 2d63a85c22f86a30b11414712c0d7b4871332e83c81a1995cb8efb8cfd717ab15747ab70f178808b8191379bc49b1f0219f87f0112c97e51d044d1f454fd6e75
-AUX liborigin-3.0.0-missing-header.patch 978 BLAKE2B 717a5bc981d5695688a5ae588c87da7501fa97e76fc8df4a71da57021d75a8e33c8696ea9ef606854a8943431debc0fcb998913f4d09ddd7833e6c7029ad83b0 SHA512 d515977558b0938a0d0453a6c1e4c9c506a7cafeeac39cc881d748ca3d8ff0e6153f8552b2efd5f2c0e478bf8b2075fc225bfc1d0b9f4542c3b6848918e88203
-AUX liborigin-3.0.0-no-exit-calls.patch 2452 BLAKE2B d635890d02f2605d52b869e09522bbb2aae9062eee9403c0f6e9639620229f983dc1031301d926617b63dbfa8cb0c163988119cf17b82db1786425499efe56bf SHA512 db491659f27168c2a4ce27517abcf5464fdc75ca9356500dde7a22987f5a766015e843c1b0c0b4f3d9bbf74c53d7b840a9aab64090173c2433e1176eefc816ec
-AUX liborigin-3.0.0-no-standard-streams.patch 7649 BLAKE2B 2f9c933d2d6ee65477ac0e23ad317d3b569bfe4eb37876c954501b93cf17be67cd1f3070724762a30c9bc1f9687880a5f5da8513e3cce4e2ae365ec1401c9123 SHA512 31f64c5a9c7156d19f2109be2768e4bae24b0547416da372b4c7dac24fbe6a026c3767372f778823f053af1bd4a2b85160457ebb101f06c22e2add4e15bb1d04
 AUX liborigin-3.0.1-buildsystem.patch 1479 BLAKE2B 3a199d9c15031a692ce6c1148e13db0fae713105e872fad3da1354263869d4363362e37ce40e0b62f635c2d2ec51514dcff0f02acc1484ffaf07a741d73bb2e6 SHA512 f9e6c3fabf45b422482349fc113a7e86846ef78550b91779dd5108b7dd04a8b0cad3aab7f24b6cee209a4c540ed2cac5e676cf01586056d1fa20965e98e054c9
 AUX liborigin-3.0.1-missing-header.patch 624 BLAKE2B 22444e21cfd17a7e32531cad8715cb7de9fbc7ead88de560ffdd62da9321e3666d1107da07cd0cf2aea6799241a34a3b8b567de577ba6120c60f0dc9b0eb021f SHA512 598988e0da6bc26dd845b86ca5251f5f88221f74b68487e500afa91979340807cd278e8365d5039d9720c56ee37f3e65305328bfa8346689dad5c338e0004120
 DIST liborigin-3.0.1.tar.gz 156842 BLAKE2B 2c88d0419c4c7be1ff6d3aaba1f794fe67174e02e591878c754a32d9b2789bd8594d39f4786d9ac04884b443b528086617a9e1fdbca8815089c8ebb400dd321c SHA512 c3fde3549bce462ea38b961885d6c835aac53db64375645db1d3636eb78396b3353c5bcc9ea3313dac3ffb436de35677ecec6fddb2fcf1eb37eaf6a78e2a31f8
diff --git a/sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch b/sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch
deleted file mode 100644
index d8444dedafed..000000000000
--- a/sci-libs/liborigin/files/liborigin-3.0.0-buildsystem.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From a751f00ebba9fa226860ed4e2c1ae5fa35622e89 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 20 May 2020 22:33:08 +0200
-Subject: [PATCH 1/4] Don't install bundled tree.hh
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 17c613b..a6b4b8a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,7 +25,6 @@ set (devel-headers
- 	OriginObj.h
- 	OriginFile.h
- 	OriginParser.h
--	tree.hh
- 	)
- 
- # LIB_SUFFIX can either be defined at cmake command line: cmake -DLIB_SUFFIX:STRING=64 ...
--- 
-2.26.2
-
-
-From 0b4fa1ce0946bc293d798484c609c6a7ac5ab50a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 20 May 2020 22:35:02 +0200
-Subject: [PATCH 2/4] No static target, compile opj2dat against the shared lib
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a6b4b8a..6f2d87b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,22 +52,16 @@ set_target_properties(origin PROPERTIES
- 	VERSION ${LIBORIGIN_VERSION_MAJOR}.${LIBORIGIN_VERSION_MINOR}.${LIBORIGIN_VERSION_BUGFIX}
- 	SOVERSION ${LIBORIGIN_VERSION_MAJOR} )
- 
--# static library
--add_library (origin-static STATIC ${sources})
--set_target_properties(origin-static PROPERTIES OUTPUT_NAME "origin" POSITION_INDEPENDENT_CODE ON)
--
- # inform on log setting
- if (DEFINED GENERATE_CODE_FOR_LOG)
-     message("File parsing will be logged.")
-     target_compile_definitions(origin PRIVATE GENERATE_CODE_FOR_LOG=${GENERATE_CODE_FOR_LOG})
--    target_compile_definitions(origin-static PRIVATE GENERATE_CODE_FOR_LOG=${GENERATE_CODE_FOR_LOG})
- else()
-     message("File parsing will NOT be logged. Define GENERATE_CODE_FOR_LOG to activate logging.")
- endif ()
- 
- # install libraries
- install(TARGETS origin DESTINATION lib${LIB_SUFFIX} OPTIONAL)
--install(TARGETS origin-static DESTINATION lib${LIB_SUFFIX} OPTIONAL)
- 
- # install headers
- install(FILES ${devel-headers} DESTINATION include/liborigin)
-@@ -77,7 +71,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION lib${LIB_SUFF
- 
- # command line util
- add_executable(opj2dat opj2dat.cpp)
--target_link_libraries (opj2dat origin-static)
-+target_link_libraries (opj2dat origin)
- 
- install(TARGETS opj2dat DESTINATION bin OPTIONAL)
- 
--- 
-2.26.2
-
-
-From 5f4c497408a6f144e581dd17fb3e49963e8b6b2b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 20 May 2020 22:43:52 +0200
-Subject: [PATCH 3/4] Don't install README COPYING etc., distro package does
- that
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6f2d87b..4fc16e0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,7 +76,6 @@ target_link_libraries (opj2dat origin)
- install(TARGETS opj2dat DESTINATION bin OPTIONAL)
- 
- # documentation
--install(FILES COPYING FORMAT README DESTINATION share/doc/liborigin OPTIONAL)
- configure_file(doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
- find_package(Doxygen)
- if(DOXYGEN_FOUND)
--- 
-2.26.2
-
-
-From bb554d88b78e7575c04cf3e79098f35b776c3878 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 20 May 2020 22:47:22 +0200
-Subject: [PATCH 4/4] Drop 'OPTIONAL' from install targets, add ENABLE_TOOLS
- option
-
-I've never seen an optional install of library.
-ENABLE_TOOLS takes care of the binary.
-Doxygen is already optional.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4fc16e0..1759eee 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,6 +9,8 @@ set(LIBORIGIN_VERSION_MAJOR 3)
- set(LIBORIGIN_VERSION_MINOR 0)
- set(LIBORIGIN_VERSION_BUGFIX 0)
- 
-+option(ENABLE_TOOLS "Install opj2dat command line util" ON)
-+
- # compile-time configuration variables to be linked in
- configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
-@@ -61,7 +63,7 @@ else()
- endif ()
- 
- # install libraries
--install(TARGETS origin DESTINATION lib${LIB_SUFFIX} OPTIONAL)
-+install(TARGETS origin DESTINATION lib${LIB_SUFFIX})
- 
- # install headers
- install(FILES ${devel-headers} DESTINATION include/liborigin)
-@@ -70,10 +72,12 @@ install(FILES ${devel-headers} DESTINATION include/liborigin)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
- 
- # command line util
--add_executable(opj2dat opj2dat.cpp)
--target_link_libraries (opj2dat origin)
-+if(ENABLE_TOOLS)
-+    add_executable(opj2dat opj2dat.cpp)
-+    target_link_libraries (opj2dat origin)
- 
--install(TARGETS opj2dat DESTINATION bin OPTIONAL)
-+    install(TARGETS opj2dat DESTINATION bin)
-+endif()
- 
- # documentation
- configure_file(doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-@@ -82,5 +86,5 @@ if(DOXYGEN_FOUND)
- 	add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
- 		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- 	set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/html)
--	install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/liborigin OPTIONAL)
-+	install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/liborigin)
- endif(DOXYGEN_FOUND)
--- 
-2.26.2
-
diff --git a/sci-libs/liborigin/files/liborigin-3.0.0-missing-header.patch b/sci-libs/liborigin/files/liborigin-3.0.0-missing-header.patch
deleted file mode 100644
index 162dd93c3c5e..000000000000
--- a/sci-libs/liborigin/files/liborigin-3.0.0-missing-header.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 78da3c4456cef15c91b5e5fcc1e82ca2364ea654 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 20 May 2020 22:28:21 +0200
-Subject: [PATCH] Add missing header
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- OriginAnyParser.cpp | 1 +
- opj2dat.cpp         | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
-index 07a619e..c90f6e4 100644
---- a/OriginAnyParser.cpp
-+++ b/OriginAnyParser.cpp
-@@ -22,6 +22,7 @@
- #include "OriginAnyParser.h"
- #include <sstream>
- #include <cinttypes>
-+#include <iostream>
- 
- /* define a macro to get an int (or uint) from a istringstream in binary mode */
- #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-diff --git a/opj2dat.cpp b/opj2dat.cpp
-index 230ac84..67b0815 100644
---- a/opj2dat.cpp
-+++ b/opj2dat.cpp
-@@ -31,6 +31,7 @@
- #include <cmath>
- #include <fstream>
- #include <sstream>
-+#include <iostream>
- #include <string>
- 
- using namespace std;
--- 
-2.26.2
-
diff --git a/sci-libs/liborigin/files/liborigin-3.0.0-no-exit-calls.patch b/sci-libs/liborigin/files/liborigin-3.0.0-no-exit-calls.patch
deleted file mode 100644
index 44b56a296fde..000000000000
--- a/sci-libs/liborigin/files/liborigin-3.0.0-no-exit-calls.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From a8b25b489b48086e2616df98688969f89e63fa69 Mon Sep 17 00:00:00 2001
-From: Miquel Garriga <gbmiquel@gmail.com>
-Date: Fri, 23 Nov 2018 00:15:04 +0100
-Subject: [PATCH] Remove exit() calls
-
----
- OriginFile.cpp | 15 ++++++++++-----
- OriginFile.h   |  2 +-
- opj2dat.cpp    |  2 ++
- 3 files changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/OriginFile.cpp b/OriginFile.cpp
-index f6c41b4..bcdcccb 100644
---- a/OriginFile.cpp
-+++ b/OriginFile.cpp
-@@ -33,14 +33,15 @@
- #include <string>
- 
- OriginFile::OriginFile(const string& fileName)
--:	fileVersion(0)
-+:	fileVersion(0), ioError(0)
- {
- 	ifstream file(fileName.c_str(), ios_base::binary);
- 
- 	if (!file.is_open())
- 	{
--		cerr <<  "Could not open " << fileName.c_str() << "!" << endl;
--		exit(EXIT_FAILURE);
-+		cerr << endl << "liborigin: " << strerror(errno) << ": " << fileName.c_str() << endl;
-+		ioError = errno;
-+		return;
- 	}
- 
- #ifdef GENERATE_CODE_FOR_LOG
-@@ -48,8 +49,9 @@ OriginFile::OriginFile(const string& fileName)
- 	logfile = fopen("./opjfile.log", "w");
- 	if (logfile == nullptr)
- 	{
--		cerr <<  "Could not open opjfile.log !" << endl;
--		exit(EXIT_FAILURE);
-+		cerr << endl <<  "liborigin: " << strerror(errno) << ": opjfile.log" << endl;
-+		ioError = errno;
-+		return;
- 	}
- #endif // GENERATE_CODE_FOR_LOG
- 
-@@ -152,10 +154,13 @@ OriginFile::OriginFile(const string& fileName)
- 	fclose(logfile);
- #endif // GENERATE_CODE_FOR_LOG
- 	parser.reset(createOriginAnyParser(fileName));
-+	ioError=0;
- }
- 
- bool OriginFile::parse()
- {
-+	if (ioError != 0)
-+		return false;
- 	parser->buildVersion = buildVersion;
- 	parser->fileVersion = fileVersion;
- 	return parser->parse();
-diff --git a/OriginFile.h b/OriginFile.h
-index 80b6ff2..3a49395 100644
---- a/OriginFile.h
-+++ b/OriginFile.h
-@@ -70,7 +70,7 @@ public:
- 	string resultsLogString() const;													//!< get Results Log
- 
- private:
--	unsigned int fileVersion, buildVersion;
-+	unsigned int fileVersion, buildVersion, ioError;
- 	unique_ptr<OriginParser> parser;
- };
- 
-diff --git a/opj2dat.cpp b/opj2dat.cpp
-index ff53309..230ac84 100644
---- a/opj2dat.cpp
-+++ b/opj2dat.cpp
-@@ -54,6 +54,8 @@ int main(int argc, char *argv[]) {
- 	OriginFile opj(inputfile);
- 	int status = opj.parse();
- 	cout << "Parsing status = " << status << endl;
-+	if (! status)
-+		return -1;
- 	cout << "OPJ PROJECT \"" << inputfile.c_str() << "\" VERSION = " <<  opj.version() << endl;
- 
- 	cout << "number of datasets     = " << opj.datasetCount() << endl;
--- 
-2.26.2
-
diff --git a/sci-libs/liborigin/files/liborigin-3.0.0-no-standard-streams.patch b/sci-libs/liborigin/files/liborigin-3.0.0-no-standard-streams.patch
deleted file mode 100644
index 227ce7b14d5e..000000000000
--- a/sci-libs/liborigin/files/liborigin-3.0.0-no-standard-streams.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From 6cb6d9b328195e11c1f168f6e4b915b522c7089f Mon Sep 17 00:00:00 2001
-From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
-Date: Wed, 15 May 2019 23:16:09 +0200
-Subject: [PATCH 1/3] do not output to standard streams (cout,
- cerr) by default
-
-it might be better to hide all such usage behind #ifdefs,
-since the streams might not belong to the shared library
-
-provided by Ivan Krylov (Ropj)
----
- OriginAnyParser.cpp | 11 +++++------
- OriginAnyParser.h   |  2 +-
- OriginFile.cpp      |  2 --
- 3 files changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
-index d45026b..ff7b8f7 100644
---- a/OriginAnyParser.cpp
-+++ b/OriginAnyParser.cpp
-@@ -756,7 +756,7 @@ void OriginAnyParser::readProjectTree() {
- 
- 	// log info on project tree
- #ifdef GENERATE_CODE_FOR_LOG
--	outputProjectTree();
-+	outputProjectTree(cout);
- #endif // GENERATE_CODE_FOR_LOG
- 
- 	return;
-@@ -2835,7 +2835,6 @@ void OriginAnyParser::getColorMap(ColorMap& cmap, const string& cmapdata, unsign
- 	// check we have enough data to fill the map
- 	unsigned int minDataSize = cmoffset + 0x114 + (colorMapSize+2)*0x38;
- 	if (minDataSize > cmapdatasz) {
--		cerr << "WARNING: Too few data while getting ColorMap. Needed: at least " << minDataSize << " bytes. Have: " << cmapdatasz << " bytes." << endl;
- 		LOG_PRINT(logfile, "WARNING: Too few data while getting ColorMap. Needed: at least %d bytes. Have: %d bytes.\n", minDataSize, cmapdatasz)
- 		return;
- 	}
-@@ -2988,15 +2987,15 @@ void OriginAnyParser::getProjectFolderProperties(tree<ProjectNode>::iterator cur
- 	(*current_folder).modificationDate = doubleToPosixTime(modificationDate);
- }
- 
--void OriginAnyParser::outputProjectTree() {
-+void OriginAnyParser::outputProjectTree(std::ostream & out) {
- 	size_t windowsCount = spreadSheets.size()+matrixes.size()+excels.size()+graphs.size()+notes.size();
- 
--	cout << "Project has " << windowsCount << " windows." << endl;
--	cout << "Origin project Tree" << endl;
-+	out << "Project has " << windowsCount << " windows." << endl;
-+	out << "Origin project Tree" << endl;
- 
- 	char cdsz[21];
- 	for (tree<ProjectNode>::iterator it = projectTree.begin(projectTree.begin()); it != projectTree.end(projectTree.begin()); ++it) {
- 		strftime(cdsz, sizeof(cdsz), "%F %T", gmtime(&(*it).creationDate));
--		cout <<  string(projectTree.depth(it) - 1, ' ') <<  (*it).name.c_str() << "\t" << cdsz << endl;
-+		out <<  string(projectTree.depth(it) - 1, ' ') <<  (*it).name.c_str() << "\t" << cdsz << endl;
- 	}
- }
-diff --git a/OriginAnyParser.h b/OriginAnyParser.h
-index ed62bbb..bd7c1ae 100644
---- a/OriginAnyParser.h
-+++ b/OriginAnyParser.h
-@@ -68,7 +68,7 @@ protected:
- 	void getZcolorsMap(ColorMap&, const string&, unsigned int);
- 	void getProjectLeafProperties(tree<ProjectNode>::iterator, const string&, unsigned int);
- 	void getProjectFolderProperties(tree<ProjectNode>::iterator, const string&, unsigned int);
--	void outputProjectTree();
-+	void outputProjectTree(std::ostream &);
- 
- 	inline time_t doubleToPosixTime(double jdt)
- 	{
-diff --git a/OriginFile.cpp b/OriginFile.cpp
-index 5ac8e22..dba050f 100644
---- a/OriginFile.cpp
-+++ b/OriginFile.cpp
-@@ -39,7 +39,6 @@ OriginFile::OriginFile(const string& fileName)
- 
- 	if (!file.is_open())
- 	{
--		cerr << endl << "liborigin: " << strerror(errno) << ": " << fileName.c_str() << endl;
- 		ioError = errno;
- 		return;
- 	}
-@@ -49,7 +48,6 @@ OriginFile::OriginFile(const string& fileName)
- 	logfile = fopen("./opjfile.log", "w");
- 	if (logfile == nullptr)
- 	{
--		cerr << endl <<  "liborigin: " << strerror(errno) << ": opjfile.log" << endl;
- 		ioError = errno;
- 		return;
- 	}
--- 
-2.26.2
-
-
-From 588bbc357cd34b9d353470ed6c0632b6f00805f5 Mon Sep 17 00:00:00 2001
-From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
-Date: Wed, 15 May 2019 23:28:46 +0200
-Subject: [PATCH 2/3] fix bugs found by UBSan
-
- - check values before casting to enum Attach
- - default-initialize sensitive struct elements
-
-provided by Ivan Krylov (Ropj)
----
- OriginAnyParser.cpp | 1 +
- OriginObj.h         | 5 ++++-
- README              | 3 +++
- 3 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
-index ff7b8f7..9f9731c 100644
---- a/OriginAnyParser.cpp
-+++ b/OriginAnyParser.cpp
-@@ -1543,6 +1543,7 @@ void OriginAnyParser::getAnnotationProperties(const string& anhd, unsigned int a
- 		GET_SHORT(stmp, r.bottom)
- 
- 		unsigned char attach = anhd[0x28];
-+		if (attach >= (unsigned char)Attach::End_) attach = Attach::Frame;
- 		unsigned char border = anhd[0x29];
- 
- 		Color color = getColor(anhd.substr(0x33,4));
-diff --git a/OriginObj.h b/OriginObj.h
-index 3a9f719..aeeeb6b 100644
---- a/OriginObj.h
-+++ b/OriginObj.h
-@@ -67,7 +67,7 @@ namespace Origin
- 	enum DayOfWeekFormat {DAY_DDD = 0, DAY_DDDD = 1, DAY_LETTER = 2};
- 
- 	enum NumericDisplayType {DefaultDecimalDigits = 0, DecimalPlaces = 1, SignificantDigits = 2};
--	enum Attach {Frame = 0, Page = 1, Scale = 2};
-+	enum Attach {Frame = 0, Page = 1, Scale = 2, End_};
- 	enum BorderType {BlackLine = 0, Shadow = 1, DarkMarble = 2, WhiteOut = 3, BlackOut = 4, None = -1};
- 	enum FillPattern {NoFill = 0, BDiagDense = 1, BDiagMedium = 2, BDiagSparse = 3, FDiagDense = 4, FDiagMedium = 5, FDiagSparse = 6,
- 		DiagCrossDense = 7, DiagCrossMedium = 8, DiagCrossSparse = 9, HorizontalDense = 10, HorizontalMedium = 11, HorizontalSparse = 12,
-@@ -345,6 +345,7 @@ namespace Origin
- 		,	width(8)
- 		,	index(_index)
- 		,	view(DataView)
-+		,	colorMap()
- 		{coordinates.push_back(10.0);coordinates.push_back(10.0);coordinates.push_back(1.0);coordinates.push_back(1.0);};
- 	};
- 
-@@ -895,9 +896,11 @@ namespace Origin
- 		GraphLayer()
- 		:	backgroundColor({Color::Regular, {Color::White}})
- 		,	borderType(BlackLine)
-+		,	xAxis(), yAxis(), zAxis()
- 		,	histogramBin(0.5)
- 		,	histogramBegin(0.0)
- 		,	histogramEnd(10.0)
-+		,	colorMap()
- 		,	xAngle(0)
- 		,	yAngle(0)
- 		,	zAngle(0)
-diff --git a/README b/README
-index 1dd56ef..598eacc 100644
---- a/README
-+++ b/README
-@@ -7,6 +7,9 @@ It is based on the code at
- 	http://sourceforge.net/projects/liborigin
- 	http://soft.proindependent.com/liborigin2
- 
-+Additionally, some fixes were applied to silence UBSan warnings caused by
-+uninitialised POD struct members.
-+
- AUTHORS:  Knut Franke, Miquel Garriga, Stefan Gerlach, Alex Kargovsky, Russell Standish, Ion Vasilief
- 
- DEPENDENCIES: tree.hh (included) http://tree.phi-sci.com/
--- 
-2.26.2
-
-
-From 88b4de31e1860b8b5de6e3eea4a32e92f2e58c71 Mon Sep 17 00:00:00 2001
-From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
-Date: Wed, 15 May 2019 23:32:50 +0200
-Subject: [PATCH 3/3] readProjectTree: provide root node to append
- to
-
-append_child() is not supposed to work on an empty tree,
-and I couldn't find any initialization before its use.
-All inserted nodes seemed to end up below tree_node::feet
-(or something) and were not cleaned up by the destructor.
-
-Using insert() to create a dummy node for others to be
-children of fixes the leak.
-
-provided by Ivan Krylov (Ropj)
----
- OriginAnyParser.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
-index 9f9731c..4a79423 100644
---- a/OriginAnyParser.cpp
-+++ b/OriginAnyParser.cpp
-@@ -743,7 +743,10 @@ void OriginAnyParser::readProjectTree() {
- 	string pte_pre2 = readObjectAsString(pte_pre2_size);
- 
- 	// root element and children
--	unsigned int rootfolder = readFolderTree(projectTree.begin(), pte_depth);
-+	unsigned int rootfolder = readFolderTree(
-+		projectTree.insert(projectTree.begin(), ProjectNode("", ProjectNode::Folder)),
-+		pte_depth
-+	);
- 	if (rootfolder > 0) {
- 		LOG_PRINT(logfile, "Number of files at root: %d\n", rootfolder)
- 	}
--- 
-2.26.2
-
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 2dc5dd6a88d3..72685ecdcd3b 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,3 +1,5 @@
 DIST libqalculate-3.20.1.tar.gz 2107300 BLAKE2B 79314cbe2adb183a17f96947b8ad4fa0bbfea665f7b9afda67785059e9bc0d94599b05cd55999302fc5e1216929b4ed98db4e2a6ae0c6fc74ebdd37dc6dcb72e SHA512 65a723c257c9e2419fc60ca254c23a7a7dd4d9a31beaa9c8fcf41a1e252e5f3be08e1160dcc72a0a407fe3ffd3e73353b141e40019871677a490d8c810c96931
+DIST libqalculate-3.21.0.tar.gz 2117414 BLAKE2B eaf8b886e716a6f8e9631dbda6533906cc7c5ed986233d75b9384aefb4123479914715d37268db5e1d403d1ee1835cde77314abe5380768fce5c266d1c253ca3 SHA512 7ca876ffe359ab2c6c6ae266007f489f9cd26f6650d6ace4e1d80cc660d16294cce601ed81046baca25cc4ec41668498af0a555fddc47c4118241e72af039614
 EBUILD libqalculate-3.20.1-r1.ebuild 1609 BLAKE2B bd23938bca6883b4216aeeee4089135397d503cbbbab4fb3b839cb8c10adec7780adc5591f202fc03cd042c598a7a6193d2353652af38a09f68b658723f2b041 SHA512 df46c547e21e416ff03f73571098b474bdba5ea5c797a03b8f0c46f2edbe6163d30c2c6039ede337c538708d46f549ce2f7c97ad2b7e41ae6faa10c13ac32002
+EBUILD libqalculate-3.21.0.ebuild 1615 BLAKE2B 9b9bcfa9320e58705629113ea7dec433dd1e63904f09a687036d5ff41219ef9ac330e3643ce85107fec7b77644145e2f917333fec14ac7a07c705e72c196f1ff SHA512 e177b95d170ca9da253e946c7c1a375a24cacb180436e2cfa8bc3b8a8f35cd7c8c056d48a59577659fdd2a58517bf07983655307def142907f13d6c3890cec11
 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
new file mode 100644
index 000000000000..65c9f8a2022c
--- /dev/null
+++ b/sci-libs/libqalculate/libqalculate-3.21.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+SLOT="0/22"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="curl icu gnuplot readline"
+
+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 \
+		--disable-static \
+		$(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/metis/Manifest b/sci-libs/metis/Manifest
index c9127f95af43..e2445ff6844a 100644
--- a/sci-libs/metis/Manifest
+++ b/sci-libs/metis/Manifest
@@ -1,4 +1,3 @@
-AUX metis-5.1.0-datatype.patch 388 BLAKE2B 038a62dd53d383c9c8f62067bf2f93a13f269f386ec898f2831df34a493379ce2c982d5bb97cad9f9571eab2e1d49d5cc58fa1f608ce6def9125c098913ec8c1 SHA512 0b7b10b0d0c958573668f847c2765435a1d9da22fe063430f75fb6ea005ce687d1eaa06879f3c494ea96b6877c1a94df5aa9e538bf02832af3a765cd7687a843
 AUX metis-5.1.0-multilib.patch 579 BLAKE2B 3e9edf7809a43026bfc7a320b1ff37f2e00a04dbdbcb8c3acb62016d8c41b4e68301ab3053fa1fb0fcb2a6bf3b48818175fdbf4b4fe2a23c0b4cb814d512f092 SHA512 5aa179b6de17ac24eb25ddc9377b5adea7b794405ba332de23096daac9231ab5c603268a24ad9219b3a9c598b9cdad33082f31a2cdc957b784d09d92e50f4941
 AUX metis-5.1.0-remove-GKlib-O3.patch 267 BLAKE2B ef39556238377c12a311685ca96188f8b4c3db1398b55941d273592ff40cad49d3ec5c7606177edacad25af4684d9ae65dacaa9a7ca9ad957d326b874b87f3cf SHA512 8b4f4eb0753063e64533e0101b9e78bf2a711e6b2d080607ab06025ad681788225abe7555db28edee00a98ba41badc41341bb3cec2bd654fc738d63d78867968
 AUX metis-5.1.0-shared-GKlib.patch 590 BLAKE2B 63a10fd00f21cff949660c598fa4519432559965c72f31c35d2a726dbbdfb9d2591c99e92c9520c2021e8ce0c485aa9834445e9f5dfe388f93106e49eee562af SHA512 3157e364f56661c7bc896016b2cda83658f2b00fe7c936e732e80e366ccf6421a1ab6f95d5a74fdb790f4ec8789d048aab9d68b0ccf1eb03f94621f78adb1a3a
diff --git a/sci-libs/metis/files/metis-5.1.0-datatype.patch b/sci-libs/metis/files/metis-5.1.0-datatype.patch
deleted file mode 100644
index cbca8904ff73..000000000000
--- a/sci-libs/metis/files/metis-5.1.0-datatype.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/include/metis.h
-+++ b/include/metis.h
-@@ -30,7 +30,7 @@
-  GCC does provides these definitions in stdint.h, but it may require some
-  modifications on other architectures.
- --------------------------------------------------------------------------*/
--#define IDXTYPEWIDTH 32
-+#define IDXTYPEWIDTH 64
- 
- 
- /*--------------------------------------------------------------------------
-
diff --git a/sci-libs/netcdf-cxx/Manifest b/sci-libs/netcdf-cxx/Manifest
index 10982eb9d120..1ad0c1e582c7 100644
--- a/sci-libs/netcdf-cxx/Manifest
+++ b/sci-libs/netcdf-cxx/Manifest
@@ -4,5 +4,5 @@ DIST netcdf-cxx-4.3.0.tar.gz 985897 BLAKE2B 89cfd85764ff8fc730c7cb4187df21a4245c
 DIST netcdf-cxx-4.3.1.tar.gz 607679 BLAKE2B 68677ba72e66d351bf6d33a2584a3a1edd9da98b41ed66e3f51f8d3d358bfd84bad3e2e06403edf76d26b2c76807ae40859995d8817725e531a27680d04f2501 SHA512 404711eb80d5e78968c0f6cbdcb08855a2778d7fd94e7ee94bdc9d1cd72848ac3327613c6437a7634349f26bc463b950092a2999abb34ddab0a47ad185547d22
 EBUILD netcdf-cxx-4.2-r301.ebuild 601 BLAKE2B 1f34dc4d3e47669081a647df6da7474f5e1f37d3a67287ddf9470b6b2b729588b4dcb4acd753b0a1750cf69f1283b8d774a553e029c429a36576a42280b7a6bc SHA512 16973d6fab5e25df249f6b737e10834acd1424d2c197bd0c96deb56f388d015e8545f77c3f273c9c076a74137a2b6cfad3ab0cafc0f8052213a2347ce0d15805
 EBUILD netcdf-cxx-4.3.0.ebuild 645 BLAKE2B 92c277b2e7407e5a1bad17ee753899dadb922cea93e88a89c7938d8314c1434a267d2e2e032475260f508658462e0b9cf6233352d18e2ccb32ce6ea4b2220652 SHA512 ba13805248e038ee1932ca78c8abd99fcf3ccf6ce8cd8882fb1174f7edbb3a7286c45b3dbe396ee9971a61a39c80b9ecfa2297331a0833e71db7397bb5e0ed85
-EBUILD netcdf-cxx-4.3.1.ebuild 755 BLAKE2B fb497c0ffc15f795d2685819b5f6b93c1098502070e483d6de3482497ed4cd66275f7de323a8ec7a5a2e3cb81b44c24e06e327cfc4505ebe501dbecd4797bb66 SHA512 551957e18d605656d4e00cd31a7ec8437572c7041726340667d23981a60f4bce0031d9674e8dd5a848584916be0ff7ef44e15ff7d508043295943d995a235436
+EBUILD netcdf-cxx-4.3.1.ebuild 753 BLAKE2B cc55b7c87f0f19a021fe90c3cbeeb8602d509691b3c2d7c1c88a525df215a4471ae8be26f4cf0c73f561f77fe77bedce118a47054caaae26c8bc5564bc6e408e SHA512 55020de4aacde4db532e654d875d1d29cb3e7d915819929b46f267ed9d289f6d86d111bcc5f8270fd5151b281ca71196ce704c0cf9d72332ce437c6429a082eb
 MISC metadata.xml 839 BLAKE2B 2cda1c652d7d7e83ebb67f70db48dc7b9a11908813739a646cb5798dd232f8eff5754c10adb0fbd206be6280fd599aacd6f63181b658623d55e17d6e73b0f4f0 SHA512 7e8f0b88ef5ad2cba94369ad26f2b27a648831b6433e05d127e4bc72ccfe6afc5eba7695f5c3cabc426a9913e599ce9b0455a087f9d606471cd351c8be5190d6
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
index 11abdd911ef6..47e1c0f9bb27 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/Unidata/netcdf-cxx4/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="UCAR-Unidata"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 # 6 out of 9 fail, reported upstream
 RESTRICT="test"
diff --git a/sci-libs/openlibm/Manifest b/sci-libs/openlibm/Manifest
index e82964812ba7..d8be3f557999 100644
--- a/sci-libs/openlibm/Manifest
+++ b/sci-libs/openlibm/Manifest
@@ -1,3 +1,5 @@
 DIST openlibm-0.7.5.tar.gz 366889 BLAKE2B cd892965122237783cc288e57c965ae56d26fdcce93d89dd764ba659d292ade20baa754af303f04b831902f62f95388e2e7e11c050a0712a235bbc5793f2a9c4 SHA512 fe5797f49e9f9ac70485c53c6096ac273c33c7b44fbb694788717f0e427fe9a8e121939c4c1334f2d20f2fe1f440d952cc20cbdd49717996a2fb9a1045b05799
+DIST openlibm-0.8.0.tar.gz 367130 BLAKE2B e516fee18203040b8f3cdffab10c4ca22df638551b420ec7e679ff373221973a013c93520b29395c61c8ef0f0f6c87516c1d4a9885c3bbb5e8cae8900efee6ea SHA512 336dfac1fd4ab6ce256aa0129a211c3556eac46d2e775e5cec9626dc5bbcb4d5e65c86617d72e531694e8c8e6320a0fabc76600a02b0ac9f1d652774d0a94440
 EBUILD openlibm-0.7.5.ebuild 820 BLAKE2B de0436b2b7598936c32951ad3063a4eea11d4f34f16abb30c675d387948cd44eb832c25b7ae6004bba879061d56fd97684761a06eb47619c7d408b0f1384a7d4 SHA512 3d96a505d1f15647ab229e5ef1f1e60f1b1ff9cdb063af2bc20e07b6eee49d76ac2e61939f2f948e311fef034af7c42c75b465110ef748dd770aefcc343d3862
+EBUILD openlibm-0.8.0.ebuild 820 BLAKE2B b9442e382ea27ff82c360496b3030565292a7a81c156227b61b9cfc5ae2cb8d234349cb358040f3ca9067645b47ffafab3c17491a86a8534667031589cf2af1b SHA512 ba0d04a55d5d7a7192b4e70415c7cfac24c47d0ccba41815bb242d2b0b2b4fdceddbf3b8e343c6717f7ecf743c2204bde5d342677fc85a534bb59893779de986
 MISC metadata.xml 771 BLAKE2B 2b74181a48c3fa5fd2376d864856e06cb8b970c438514c4b1b52ac3d188f8d626b00d72cc4e4fbbe63ab9247a6c20caf3c192e23a910398c6f84ed143029b7ba SHA512 f837da2378363560ac051fad9247b0f9a0769bb49a9b34c4f8f4d2f507609cb9c90536c93059928724340a7d1a299f7a75b75df1aea34dff217317a196f99df8
diff --git a/sci-libs/openlibm/openlibm-0.8.0.ebuild b/sci-libs/openlibm/openlibm-0.8.0.ebuild
new file mode 100644
index 000000000000..ba45cbd625fb
--- /dev/null
+++ b/sci-libs/openlibm/openlibm-0.8.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="High quality system independent, open source libm"
+HOMEPAGE="https://github.com/JuliaLang/openlibm"
+SRC_URI="https://github.com/JuliaMath/openlibm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+"
+# See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm
+SLOT="0/4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+src_prepare() {
+	default
+	sed -e "/^OLM_LIBS :=/s/^/#/" \
+		-e "/install: /s/install-static//" \
+	-i Makefile || die
+}
+
+src_configure() {
+	tc-export CC CXX FC AR LD
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+		libdir="${EPREFIX}/usr/$(get_libdir)" install
+	dodoc README.md
+}
diff --git a/sci-libs/qrupdate/Manifest b/sci-libs/qrupdate/Manifest
index 3d5c0eef92c2..88bec559659c 100644
--- a/sci-libs/qrupdate/Manifest
+++ b/sci-libs/qrupdate/Manifest
@@ -1,5 +1,5 @@
 AUX qrupdate-1.1.1-Makefiles.patch 2134 BLAKE2B 36e3a94684bcbf7c6738f7af5a990102a56ee5250255c809b2f59bd4c1e96dd48476c9814fb8d33f914dbef5e4d3b70c455e015bd4fd323cd8c7ab6693a63216 SHA512 66b86960f90bce81839ef85a27ad0815b3f8417a0fd44b8027a02bce536aa6db4c250c665566d269150b504afdfb2fbad44b3344497947a193f961c33e63db8e
 AUX qrupdate-1.1.2-install.patch 1210 BLAKE2B 311a21fd3c99b875aca96d9bbb2c0432abb1867a47d58c32d33a423c91bc8460460bacf99fea97230fd3456830fef93c80539a6aca4315d73d949f61a7a0bf97 SHA512 3f53b1b0bbf04415a5f14f18f28a8264725296b4dcdc28c4d3e13852a4f12f3f2466df7ba58233b1e7279ec9d8075b0dd01fcf2d00bc9c13cf5d21f40f98f0f4
 DIST qrupdate-1.1.2.tar.gz 49734 BLAKE2B e5bf9fb39f6c97ee4b4084e664f929d95bee407f9f11ea4dc6da2bdb06d1694eddc1f2f52e5f673f22d097d11addb293b6dc0fd7c30d09acc84dd050fd1d72e9 SHA512 cc4e466ea91958e15c66be82b0c4c8ad813fbe4643f21259a9cb3ca8e0a411dd764bb2397ece848a7045f322d30316801d1540c4ebf7912030bef6995b44917c
-EBUILD qrupdate-1.1.2-r2.ebuild 1268 BLAKE2B f60dc8f1cb4dc70fce8fd55dd8825823df377d50c7c620a357eac063ae10a8bcb0c5d45ad908d353ca55ac596119624133595b7dd4cafd427bc72bec77d421fc SHA512 78f771cbe7a2a74f3039646377307bd95136044df5609e20c2fc4af2cf0b975e52a98eb635a94c46d2752bb1d04425288de5c3fc68094dcd76f6994f35bf80d2
+EBUILD qrupdate-1.1.2-r2.ebuild 1275 BLAKE2B 2cc0f8e743cd79dc738c31304011b9fc90db2ec862db2f24b4c0b9cb0950ae84bfc16615bec5778fa32cd29bc08dfb54d11d9f88047ee57ed6106204aa74b54d SHA512 933ff8a25f181d9b327b3d2af7eaf9e83f6c6665f32dff3a03d3cbd2472b3a37bc4f4fc0d56db417218a65342b059d35b770b70ba8d45128c876f27be3a9ece5
 MISC metadata.xml 332 BLAKE2B dda33ed8f8a63591e183723ca80d1550d104a4996cba185dbef3bbd2f57e287b1f0c1776296e324e3648f39378cc8fd17225cdb04962c99adda59bb0024f09e7 SHA512 5f787098bc13a29f7905d07e27464a966766fdd65e19ee07fa2ea96517b38da6cb77187fb4b60ed40c81a962a405ad4dcd472f114c7849c5aee730c405062f2e
diff --git a/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
index 9d471abf2886..6ff21cac1a8a 100644
--- a/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
+++ b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos"
 
 RDEPEND="virtual/lapack"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/rocRAND/Manifest b/sci-libs/rocRAND/Manifest
index 87f2d912da12..0f49fb480678 100644
--- a/sci-libs/rocRAND/Manifest
+++ b/sci-libs/rocRAND/Manifest
@@ -1,3 +1,5 @@
 DIST rocRAND-4.0.0.tar.gz 3105585 BLAKE2B 0466d88c286290a9cd179fac61209051f7db5323457ccad9c5f0b579439662e1fe2b8951f85101c7c31bd058bc1448e839a19dc9a3a2d4ca42eb4e0b2baf4eb4 SHA512 c02bc32a9cf7660739ecf7ef99262fb14efa2c76afb3476105eedc4264dec987351ebd461c13c9e0aef9e640b42960b2a63295479664b83924cf0d5c34a157e8
+DIST rocRAND-4.3.0.tar.gz 3107367 BLAKE2B 23cfac271c1cd4e4edcfd315aa775d4d62e6a50ffa3b9a3372d4ae427a02def52486e88b3f4f89daaa539f2653cf76c8d44afec70d8d916268bc9f27534bda4c SHA512 3eefeb55014a8ee681e1cee73e0e092bd29a81767e772e712f8f871e94380a772a433e93a59276b0cd5a364fc4e482186771809d67ebdab24b2e3020173f5e18
 EBUILD rocRAND-4.0.0-r1.ebuild 1063 BLAKE2B 69823e3904b62ed811a7ea68c28b95c09e1059134e17fd62f006352e5870d2e3e9e111fbf8a1647cba517135ac46dcb829cabd98c91344bbfc1e38d7b996420a SHA512 06b4732ae433bc0996bd07fda884c7a302a4f33f92bde4b0c73eb684c8d793c3c9a0252e9961874e0fb4ab456ef584da7c47a98651fb704adf72f02e202b8c63
-MISC metadata.xml 601 BLAKE2B 3ffcac5814fe9bb976bee3669a9956e58a923a9055b11dddddff760b66220ad654a7f56305641e4d35c6635f45cd71d5c75c72f72d03293c3c73c84b5154c337 SHA512 5188fcf9add9b0640200e2042b51ed100673abc751557375a13eb438633b96888139b6130ca67364d1008fc93a7f15cc071071b9e309428544a1573f7c2fb5b7
+EBUILD rocRAND-4.3.0.ebuild 1725 BLAKE2B a4f72473430dc7b9f52421ad974aa95f2fba68665536da5a60b976896d98ca0d0e88623c7569f75531f08315b7e57951f6d715b3044db4b07020cc974152ae76 SHA512 60bc0b7e0d19d8c929c9f2874d4ad2200361d48e4acfa53d68969c7752eb0116df81a5fb4cc2a5ae10923ee23757874e0d6a8d86576006c7565d5199780f9486
+MISC metadata.xml 698 BLAKE2B fd85075e1414d7756cb16ed17f79cfc8302db5319df3a0862d7ce9006277c33a392e1a37aa7f2b2bcb80fbae4589240dd43751eebdeb5688a90a868299c3ecad SHA512 645a284a2c3b0f95df57110a04d5f131f28e3d673ba12eb5b3f3d5e7ee30e3099a022187b86ed458d5b4d6bed1451bd3dfe620debe0e8c480aee35f57bc878eb
diff --git a/sci-libs/rocRAND/metadata.xml b/sci-libs/rocRAND/metadata.xml
index d9a40bdc1ec3..dfea5b6e3584 100644
--- a/sci-libs/rocRAND/metadata.xml
+++ b/sci-libs/rocRAND/metadata.xml
@@ -16,4 +16,7 @@
   <upstream>
     <remote-id type="github">ROCmSoftwarePlatform/rocRAND</remote-id>
   </upstream>
+    <use>
+        <flag name="benchmark">Build and install benchmark programs.</flag>
+    </use>
 </pkgmetadata>
diff --git a/sci-libs/rocRAND/rocRAND-4.3.0.ebuild b/sci-libs/rocRAND/rocRAND-4.3.0.ebuild
new file mode 100644
index 000000000000..926f784a0249
--- /dev/null
+++ b/sci-libs/rocRAND/rocRAND-4.3.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Generate pseudo-random and quasi-random numbers"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocRAND"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocRAND/archive/rocm-${PV}.tar.gz -> rocRAND-${PV}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="benchmark test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/hip:${SLOT}"
+DEPEND="${RDEPEND}
+>=dev-util/rocm-cmake-${PV}"
+BDEPEND="test? ( dev-cpp/gtest )"
+
+S="${WORKDIR}/rocRAND-rocm-${PV}"
+
+src_prepare() {
+	sed -r -e "s:(hip|roc)rand/lib:\${CMAKE_INSTALL_LIBDIR}:" \
+		-e "s:(hip|roc)rand/include:include/\1rand:" \
+		-e "/INSTALL_RPATH/d" -i library/CMakeLists.txt || die
+
+	# remove GIT dependency
+	sed -e "/find_package(Git/,+4d" -i cmake/Dependencies.cmake || die
+
+	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)
+		-DCMAKE_SKIP_RPATH=TRUE
+		${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
+	# do not rerun cmake and the build process in src_install
+	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
+}
+
+src_test() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addwrite /dev/dri/
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}"/benchmark
+		dobin benchmark_rocrand_*
+	fi
+}
diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest
index c4b70a6382cc..bd17fb733d1d 100644
--- a/sci-libs/rocSPARSE/Manifest
+++ b/sci-libs/rocSPARSE/Manifest
@@ -26,5 +26,6 @@ DIST rocSPARSE_shipsec1.tar.gz 22175245 BLAKE2B f1d34482b8c3d3ee48033097d7d6f9b6
 DIST rocSPARSE_sme3Dc.tar.gz 42483568 BLAKE2B f0d16b58f6ea28e67727637697a812a0b10d524c73aeb82f702411b9ebaea3670780e762ed0701aae80c6829e950233f74555523ef2d6c5740b007c7a65c03d4 SHA512 c5a0be2db919a45310a73ea1dd96d0d30168135f887a8c5c3d7ca11e2c3d12ea7d1331be20968d0135bd18da4ef2b043db68eeb7567b6f0f8daf782b87083c3a
 DIST rocSPARSE_webbase-1M.tar.gz 11360460 BLAKE2B 01b1d06adb5fb32fa402ed888d25a7e52a34779b078fc2e21c60e688d03579bb4ca8694f5ee4a824f7859952d55590a1fd9449dc80d6fe894d7b662b918882d4 SHA512 6401a965b8f6dd5392879956fde3c94f77fe1801a4a43428c03b6d639031575c647eab47b1babe53f4ecc2c3b8fc183e8339536b78dcd0d94ce62bfedd87c161
 EBUILD rocSPARSE-4.0.0-r1.ebuild 1166 BLAKE2B fc45fdaaf8d5f20afcc0d477eac01d30100a3ac3355ddae786ee934f46ef55b4f6ac3b284875fc905f75452cbfbb655ad4cfb9f916905e1a6091e8b97a14f141 SHA512 221e3aea6c45e7d7a6edc3b96db32ed9d2deb040f1f4cafa9cbb139a146aa7500d4619e6e8db39683fed9c0bc34053dc8ede22525340457c1774f6ea90297a98
+EBUILD rocSPARSE-4.3.0-r1.ebuild 5002 BLAKE2B 61c889cc81ceccc5b628bddef68c5a5df2d789bb6c30a2445ee47d7e4271c8e8a3363fbc523b35c9df9d66dd15292a490f4332ff3f5b296d4eb42a1b0c5468ec SHA512 f7447eed601b528a132a406df80056f760ff09fc67c7b32bc453527b5429df1bb1f42ddd34ab647e04aadf44760d4916de0d6087bd8a9efc09d32858eaafc8b1
 EBUILD rocSPARSE-4.3.0.ebuild 4557 BLAKE2B 0ca53de6d519bc369b25ba573c6aacc5adf7a554bad514698a719c4794af236909cc4be8650bf84327ed6965d7e86ca9a96fd31240c06a1e49723f7b303001e5 SHA512 f746cda86084c8e6ccfc7ff9635332440663ffec3082ddb78052204f5210110a81edc0fb19d6616166bea1962d20c746e0ee92160468aa670433bfd1d567ba9f
 MISC metadata.xml 695 BLAKE2B db1c67ff216cd9c9a972c9b388f85f6e762e0a7bddffca1336219ce6ebe39f6a841da4c8c78084d91f48a5bb6a26ad0047a2a1a60915da5110b3a41977f3b641 SHA512 2f246ec382d78e414a00aedcd7a2c871ccf5b74d25d160a0f7d6012feb51c6c12861b5152cac32d3e46d0d1acea7e8b10f42f4b501abb9d778cd3c886331f59c
diff --git a/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r1.ebuild b/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..a196780e222e
--- /dev/null
+++ b/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit cmake python-any-r1 toolchain-funcs
+
+DESCRIPTION="Basic Linear Algebra Subroutines for sparse computation"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSPARSE"
+
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-${PV}.tar.gz -> rocSPARSE-${PV}.tar.gz
+test? (
+https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> ${PN}_amazon0312.tar.gz
+https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> ${PN}_Chebyshev4.tar.gz
+https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> ${PN}_sme3Dc.tar.gz
+https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> ${PN}_webbase-1M.tar.gz
+https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> ${PN}_rma10.tar.gz
+https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> ${PN}_bibd_22_8.tar.gz
+https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> ${PN}_mac_econ_fwd500.tar.gz
+https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> ${PN}_mc2depi.tar.gz
+https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> ${PN}_scircuit.tar.gz
+https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> ${PN}_ASIC_320k.tar.gz
+https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> ${PN}_bmwcra_1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> ${PN}_nos1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> ${PN}_nos2.tar.gz
+https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> ${PN}_nos3.tar.gz
+https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> ${PN}_nos4.tar.gz
+https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> ${PN}_nos5.tar.gz
+https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> ${PN}_nos6.tar.gz
+https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> ${PN}_nos7.tar.gz
+https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> ${PN}_shipsec1.tar.gz
+https://sparse.tamu.edu/MM/Cote/mplate.tar.gz -> ${PN}_mplate.tar.gz
+https://sparse.tamu.edu/MM/Bai/qc2534.tar.gz -> ${PN}_qc2534.tar.gz
+https://sparse.tamu.edu/MM/Chevron/Chevron2.tar.gz -> ${PN}_Chevron2.tar.gz
+https://sparse.tamu.edu/MM/Chevron/Chevron3.tar.gz -> ${PN}_Chevron3.tar.gz
+https://sparse.tamu.edu/MM/Chevron/Chevron4.tar.gz -> ${PN}_Chevron4.tar.gz
+)"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-util/hip:${SLOT}
+	sci-libs/rocPRIM:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND="test? (
+	dev-cpp/gtest
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+)
+benchmark? ( app-admin/chrpath )
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/rocSPARSE-rocm-${PV}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.3.0-remove-matrices-unpacking.patch" )
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	eapply_user
+	sed -e "s/PREFIX rocsparse//" \
+		-e "/<INSTALL_INTERFACE/s,include,include/rocsparse," \
+		-e "/rocm_install_symlink_subdir(rocsparse)/d" \
+		-e "s:rocsparse/include:include/rocsparse:" \
+		-i "${S}/library/CMakeLists.txt" || die
+
+	# remove GIT dependency
+	sed -e "/find_package(Git/d" -i cmake/Dependencies.cmake || die
+
+	# use python interpreter specifyied by python-any-r1
+	sed -e "/COMMAND ..\/common\/rocsparse_gentest.py/s,COMMAND ,COMMAND ${EPYTHON} ," -i clients/tests/CMakeLists.txt || die
+
+	# Test need download data from https://sparse.tamu.edu (or other mirror site), check MD5, unpack and convert them into csr format
+	# This process is handled default by ${S}/cmake/ClientMatrices.cmake, but should be the responsibility of portage.
+	if use test; then
+		mkdir -p "${BUILD_DIR}"/matrices
+		# compile and use the mtx2csr converter. Do not use any optimization flags, because it causes error!
+		ebegin "$(tc-getCXX) deps/convert.cpp -o deps/convert"
+		$(tc-getCXX) deps/convert.cpp -o deps/convert
+		eend $?
+		find "${WORKDIR}" -maxdepth 2 -regextype egrep -regex ".*/(.*)/\1\.mtx" -print0 |
+			while IFS= read -r -d '' mtxfile; do
+				destination=${BUILD_DIR}/matrices/$(basename -s '.mtx' ${mtxfile}).csr
+				ebegin "Converting ${mtxfile} to ${destination}"
+				deps/convert ${mtxfile} ${destination}
+				eend $?
+			done
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device to omit a sandbox violation
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	# Compiler to use
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DCMAKE_INSTALL_INCLUDEDIR="include/rocsparse"
+		-DCMAKE_SKIP_RPATH="ON"
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCHMARKS=$(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
+	addwrite /dev/dri/
+	cd "${BUILD_DIR}/clients/staging" || die
+	./rocsparse-test || die
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		local rocsparse_bench="${BUILD_DIR}/clients/staging/rocsparse-bench"
+		chrpath -d "${rocsparse_bench}" || die
+		dobin "${rocsparse_bench}"
+	fi
+}
diff --git a/sci-libs/scikit-image/Manifest b/sci-libs/scikit-image/Manifest
index 87543aa52f5e..84c35afc0cea 100644
--- a/sci-libs/scikit-image/Manifest
+++ b/sci-libs/scikit-image/Manifest
@@ -1,3 +1,3 @@
 DIST scikit-image-0.17.2.tar.gz 29818001 BLAKE2B 360c5f8c23b8441d145029c09a3b1d1407d4103463497c63274583e6c03d1fc57baa3e6c53909cfaa5daba54d5909fc106e84dc7036f0240ad8de93804ef9f65 SHA512 3ca2511f03d533ac7f1850d72de396dc5493831bce6200f30d426c3f47eff9b25ec9b69e141100dc56e03f2310aab255f92ff4aff8bc7b80d15d669cbe2ebb5e
 EBUILD scikit-image-0.17.2.ebuild 1184 BLAKE2B fc412848b0397707b368c09d216fe01b6ee3cebb05abbd94876b7fa067ba0ad447559c77dd39eebfc2ca2dd2bdf31ac1cf279c526a805d08eb92d2ead3e60714 SHA512 786c8e96bbdad4fcc09b42064304f5a13a8e1b5f1e464d3baed112ef70023ff0c8b3d0bd2b83e4100f660c6be3da6b8bb350c572f3c4ec2f390784a7cbc2a123
-MISC metadata.xml 628 BLAKE2B db6987cd4f2243c855d486cd86cecda507cbc8b31551a867067548369d8c754a2a11116560492c32db22356c82f6ef91fe8a288d5158084656770e2f498c072e SHA512 5b0a10f5af538045f5e8c8c3093783f74b4700aa9d50c2a088f42fa85b2e5704dd9473235695ab0484666dc6a080f99ffdffc6a6b78e98b19ba9fecf7e707829
+MISC metadata.xml 695 BLAKE2B 11487b964bde2ce1a39a8680bc3cc62045c4a7e2e17844de830d5f0e043660c431cd002a2a0fc19acb4c0262289ee280195475dd1f8b35f6a51ce0df369871f8 SHA512 fca83587d443373fc7219911900105676bdba5a7ced07ac00a9ab5cbe361d8ca1175b02b04fa53cdbde6f198a986b21f989baf32139cd76b7d1b2b78034d3142
diff --git a/sci-libs/scikit-image/metadata.xml b/sci-libs/scikit-image/metadata.xml
index aaf8e423ee6c..132691d57cb8 100644
--- a/sci-libs/scikit-image/metadata.xml
+++ b/sci-libs/scikit-image/metadata.xml
@@ -13,5 +13,6 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">scikit-image</remote-id>
+    <remote-id type="github">scikit-image/scikit-image</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index 913aa0340ed7..2b463f13fbce 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -1,8 +1,10 @@
 AUX scotch-6.0.4-as-needed.patch 6168 BLAKE2B 5b008f9035379d91cd8ffde6d64a22b021fd5070a106592abefac78a0522282fbd0dd7f8b439b0452c0d15c57891c9d4eb4415120ea95788fe74e149e6069fc3 SHA512 cd58425866a1726f776318e3792e72d7250686f033ceeda57f0f007fdb4c5e1c2bc3c9346630e39f16023f2a3d70cd106b357c21e5406a1c44b49a316655d8dd
 AUX scotch-6.0.4-flex-2.6.3-fix.patch 1623 BLAKE2B 9d86299eb543147ce7e736779b05c3b8113c12b54fbaf46a2b99a6cef2b670fc1b448d059858f954f37acf72c7c268acf1793de89f193d02f8b61d3f5d4ca1e5 SHA512 1a2a5a363e1dd59e1cced76928da15132cd1c8af57d6d0ad0eec04e02d029c6ae275e202e8c87bc65ff0188f41e379865829b5b61e4f1e44a885d48c4462b09e
 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 5045 BLAKE2B 6e67c4623fd0d718d9f4b83fe5e4c36ebb296e5a746a356257fd853bd499df2bdfa7019d2da597867926bedd1dd4ecf8e899eb5dc69696b95bc9d0d2ba817a88 SHA512 2cda8cd3fac970a8fb637f49a6fe8def310e6af30a3491021a0d3662c704020f52a7cdbfd36106444b955a0c46d85edf9ace500477da0c31ecb0122faee28edc
 EBUILD scotch-6.1.0-r1.ebuild 4954 BLAKE2B 6f3067d0ffa3e230bdcdf6748dac63153f4978f4b018527efb7fa92eaf3fbd361bcc257d36559936a2c5be25c2591eb26fb1a266b1b1208c4a722f0ce126712b SHA512 ca7f02520153c68aafbcb687fd85a548ed5aa6df44b5c086063a6507152737b58b2b1c987676526882524f6d120939c88b4c16d193a8819049b1e5f76bef8e80
 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.1.1.ebuild b/sci-libs/scotch/scotch-6.1.1.ebuild
new file mode 100644
index 000000000000..659fc047fa82
--- /dev/null
+++ b/sci-libs/scotch/scotch-6.1.1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic multilib
+
+SOVER=$(ver_cut 1)
+
+DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
+HOMEPAGE="https://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/ https://gitlab.inria.fr/scotch/scotch"
+SRC_URI="https://gitlab.inria.fr/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+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"
+IUSE="doc int64 mpi static-libs test tools threads"
+# bug #532620
+REQUIRED_USE="test? ( threads )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-libs/zlib
+	mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+static_to_shared() {
+	local libstatic=${1}; shift
+	local libname=$(basename ${libstatic%.a})
+	local soname=${libname}$(get_libname ${SOVER})
+	local libdir=$(dirname ${libstatic})
+
+	einfo "Making ${soname} from ${libstatic}"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
+			-Wl,-all_load -Wl,${libstatic} \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+	else
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-shared -Wl,-soname=${soname} \
+			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+		VERS_COMP=${PV//.}
+		[[ "${#VERS_COMP}" -gt 1 ]] && \
+			ln -s ${soname} ${libdir}/${libname}$(get_libname ${SOVER})
+		ln -s ${soname} ${libdir}/${libname}$(get_libname)
+	fi
+}
+
+src_prepare() {
+	default
+	use int64 && append-cflags -DIDXSIZE64
+	if use threads; then
+		append-cflags "-DSCOTCH_PTHREAD_NUMBER=$(nproc)"
+	else
+		append-cflags "-DSCOTCH_PTHREAD_NUMBER=1"
+		sed -i \
+			-e 's/ -DSCOTCH_PTHREAD//' \
+			src/Make.inc/Makefile.inc.i686_pc_linux3 || die
+	fi
+
+	# Be careful with replacing here, bug #577272
+	sed -e "s/= gcc$/= $(tc-getCC)/" \
+		-e "s/-O3/${CFLAGS} -pthread/" \
+		-e "s/= ar$/= $(tc-getAR)/" \
+		-e "s/= ranlib$/= $(tc-getRANLIB)/" \
+		-e "s/= ranlib$/= $(tc-getRANLIB)/" \
+		-e "/^LDFLAGS/ s/$/ ${LDFLAGS}/" \
+		src/Make.inc/Makefile.inc.i686_pc_linux3 > src/Makefile.inc || die
+}
+
+src_compile() {
+	emake -C src CLIBFLAGS=-fPIC scotch esmumps
+	static_to_shared lib/libscotcherr.a
+	static_to_shared lib/libscotcherrexit.a
+	static_to_shared lib/libscotch.a -Llib -lz -lm -lrt -lpthread -lscotcherr
+	static_to_shared lib/libesmumps.a -Llib -lscotch
+	static_to_shared lib/libscotchmetis.a -Llib -lscotch
+
+	if use mpi; then
+		emake -C src CLIBFLAGS=-fPIC ptscotch ptesmumps
+		export LINK=mpicc
+		static_to_shared lib/libptscotcherr.a
+		static_to_shared lib/libptscotcherrexit.a
+		static_to_shared lib/libptscotch.a -Llib -lscotch -lptscotcherr -lz -lm -lrt
+		static_to_shared lib/libptesmumps.a -Llib -lscotch -lptscotch
+		static_to_shared lib/libptscotchparmetis.a -Llib -lscotch -lptscotch
+	fi
+	if use static-libs; then
+		emake -C src clean
+		emake -C src
+		use mpi && emake -C src ptscotch
+	fi
+}
+
+src_test() {
+	tc-export FC
+	LD_LIBRARY_PATH="${S}/lib" emake -C src check
+}
+
+src_install() {
+	dolib.so lib/lib*$(get_libname)*
+	use static-libs && dolib.a lib/*.a
+
+	#install metis headers into a subdir
+	#to allow usage of real metis and scotch
+	#in the same code
+	insinto /usr/include/scotch/metis
+	doins include/*metis*
+	rm include/*metis*
+	insinto /usr/include/scotch
+	doins include/*
+
+	cat <<-EOF > scotchmetis.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: scotchmetis
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch
+		Private: -lm -lz -lrt
+		Cflags: -I\${includedir}/scotch/metis
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins scotchmetis.pc
+
+	# not sure it is actually a full replacement of metis
+	#alternatives_for metis scotch 0 \
+	#	/usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc
+
+	if use mpi; then
+		cat <<-EOF > ptscotchparmetis.pc
+			prefix=${EPREFIX}/usr
+			libdir=\${prefix}/$(get_libdir)
+			includedir=\${prefix}/include
+			Name: ptscotchparmetis
+			Description: ${DESCRIPTION}
+			Version: ${PV}
+			URL: ${HOMEPAGE}
+			Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch
+			Private: -lm -lz -lrt
+			Cflags: -I\${includedir}/scotch/metis
+			Requires: scotchmetis
+		EOF
+			insinto /usr/$(get_libdir)/pkgconfig
+			doins ptscotchparmetis.pc
+			# not sure it is actually a full replacement of parmetis
+			#alternatives_for metis-mpi ptscotch 0 \
+			#	/usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc
+	fi
+
+	dodoc README.txt
+
+	if use tools; then
+		local b m
+		pushd bin > /dev/null || die
+		for b in *; do
+			newbin ${b} scotch_${b}
+		done
+		popd > /dev/null || die
+
+		pushd man/man1 > /dev/null || die
+		for m in *.1; do
+			newman ${m} scotch_${m}
+		done
+		popd > /dev/null || die
+	fi
+
+	use doc && dodoc doc/*.pdf
+}
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index 36bf5e279c61..100cf31a2b09 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 2712 BLAKE2B 1ee3ce42085318b74dfc64299c6323c81fa18a57adb809994e732dbd445f7342832ab761eba74e16b748b3280cfc9e626a0f4525c3be407302702742ef5d0098 SHA512 1a7ce334cacdddd40ffeb0f73be4b9f5aec8b16663ed4c7d5cedd201c4f145d0d5e978df86f80866db2701bb8140a70c7d1ba7a12cdfe437453160fcb6edf0db
-MISC metadata.xml 1060 BLAKE2B 279da603d6a362703f8142772042d94eca792aa1690988f1fa8efc16d7e125cb70408f11ba26bdabf2e3e121f2a71e09dc7d467f82475eee6dc72696ccf74316 SHA512 6bc695f162e38e409f71185a4ce57a6b87c456aee1c63c62135ed89293c5affeefb9dd87d2e6e8296f6c5c4385cfbf3a914cacc5570d340915617cc52ce8a82f
+EBUILD sundials-5.8.0.ebuild 2771 BLAKE2B 7a8767a6aeddd815229a2899bdd337f2c5c5930a451e3b753c0a503acd0f822305ec98e7011563eb5187c90cc645ccbb1dec03bbcb62c7efdbf5864ff8383c74 SHA512 67026fdd45685a685eb2bf9410de8d2575ad9c34d13f21a98dd665b762f472eecb9c208eef366bb3c58af948a8655feb706bd45f867287bc4976854d8c5776f3
+MISC metadata.xml 1131 BLAKE2B f898dfbe0da057432c5c0549d850293224137cb07d234721894752821b638f3002a1d17a06c4258b94fbc2d0e4ce5e9ee2b06c1099c473989de36b62001f2d63 SHA512 f53a7aec4b5ebc0f7737938f811e4c87842a07b03c423715296ad2992e353f661022eb2bb344e33fb03d70af6e4ffdf1908a34bdbafc3ebe9d30fa7f4bd7cad1
diff --git a/sci-libs/sundials/metadata.xml b/sci-libs/sundials/metadata.xml
index ad709aab336f..7e8359df0301 100644
--- a/sci-libs/sundials/metadata.xml
+++ b/sci-libs/sundials/metadata.xml
@@ -16,6 +16,7 @@
   </longdescription>
   <use>
     <flag name="hypre">Build with <pkg>sci-libs/hypre</pkg> conditioners</flag>
+    <flag name="int64">Use index size of 64 rather than 32 bits</flag>
     <flag name="sparse">Enable support for <pkg>sci-libs/klu</pkg> sparse solver</flag>
     <flag name="superlumt">Build with <pkg>sci-libs/superlu_mt</pkg></flag>
   </use>
diff --git a/sci-libs/sundials/sundials-5.8.0.ebuild b/sci-libs/sundials/sundials-5.8.0.ebuild
index 894e7ef201cf..9d6837a1479e 100644
--- a/sci-libs/sundials/sundials-5.8.0.ebuild
+++ b/sci-libs/sundials/sundials-5.8.0.ebuild
@@ -11,13 +11,13 @@ FORTRAN_STANDARD="77 90 2003"
 inherit cmake flag-o-matic fortran-2 toolchain-funcs
 
 DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
+HOMEPAGE="https://computing.llnl.gov/projects/sundials"
 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"
-IUSE="doc examples fortran hypre lapack mpi openmp sparse +static-libs superlumt threads"
+IUSE="doc examples fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads"
 REQUIRED_USE="
 	fortran? ( static-libs )
 	hypre? ( mpi )
@@ -31,7 +31,7 @@ RDEPEND="
 		virtual/mpi[fortran?]
 	)
 	sparse? ( sci-libs/klu )
-	superlumt? ( sci-libs/superlu_mt:= )
+	superlumt? ( sci-libs/superlu_mt:=[int64=] )
 "
 DEPEND="${RDEPEND}"
 
@@ -69,6 +69,7 @@ src_configure() {
 		-DENABLE_SUPERLUMT=$(usex superlumt)
 		-DEXAMPLES_INSTALL=ON
 		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+		-DSUNDIALS_INDEX_SIZE="$(usex int64 64 32)"
 		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
 		-DSUPERLUMT_LIBRARY="-lsuperlu_mt"
 		-DUSE_GENERIC_MATH=ON
diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index c7169c772a3d..34d49bfcf0af 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -6,5 +6,5 @@ DIST superlu_4.3.tar.gz 2876631 BLAKE2B 0a563e6730394f8e69fe13f1418f9f046bd37c84
 DIST superlu_5.2.2.tar.gz 2481538 BLAKE2B db9d6437c8012f1aeeb3313212298a77e4ef04405c6ec853ceeef8b80426ea80d8b9fc30a0ca2dd7288131a0e21c43e17cafafaa7fb615d6d825b54f4beb84a2 SHA512 091928a3df3433b337ebdacdb28de341d6d29d655965de6ffd656a6de18cf11171555bfd3af73082af62b1cead6835b4c11e4ba524a32db7f7d28db47c9d490c
 EBUILD superlu-4.3-r2.ebuild 1641 BLAKE2B b11715c747a425f2a7e04568a994ca9973c228b2f811423d7e502659ce6bcc723899645aaf883ed9ef9b3a696645d0263c92ba7ea988efc3a32d297498ac5f37 SHA512 0d667b80c3f443786fe0e8b6fb93c20617b0ac8a2c1393204bd1a0fb1d9a3b6612fc47af48a089e2e99daf728441e3fca07b0cc4404b249d761e188f678f5d76
 EBUILD superlu-5.2.2.ebuild 1176 BLAKE2B 652712da2a495689e09e6aa3a0ee2c57d98f576d4c043d88c93c8aed7b380e278ed9ebbe60c3653191090ebc78cf23a4139844df7cf4b15a27cfad463dc98170 SHA512 c0a3a7aede1ad66ba964f32c5d5e5235df9119cb261cb6a48c68872cb0b5425665cf9beac930a7823bda7fc999a904a673faf905b59feafaa3e5bc3b532a61a3
-EBUILD superlu-5.3.0.ebuild 1204 BLAKE2B ac0a603cb9c00ddc690b9c04536c0c19a9bc16909b327636e5025a024c827e0a3e18aff4189ac0d6e03d999cbd1ef75858b092ca4b6cd10096cf92ed175dc1bf SHA512 b8842e9eb21c387914afc6206277cd3648c206aa63b9822f26aca52da3affe68a2ac87e4460ad9168902729c847a28e541ac83921738ccf3143afddd6a2dbd41
+EBUILD superlu-5.3.0.ebuild 1209 BLAKE2B 929faf5db2ee3704daa313a89e0101cb41a49cd3ed4c8eb9993a56b241aa4bd82d6f85fdd8f947ceb35e3d4fbea31a6d579e2e28554b1587a991f3dac248c25d SHA512 f3cd7dccef3044baf01fbe371ffa3914971c2296d14030d1abe35d09992af8d865c9c8f35d7abed0cc7dc8512211f70943a1a10942923b6f41fd139364bd98f8
 MISC metadata.xml 1405 BLAKE2B 37c946ec0b73a5bdbd2b856cf571475ed8e85e220f200bde8028278dafb8ace158c21d42c9a4a2e7c3373ac4c5bdd4e39cef7947113d99baea5bd86992912dd0 SHA512 6e07a544afc19f7704a7babf09441a223b24f7772bbf856e06889ffac2ac09f20ef9e8a03003407e0ce372db42850cd075560c4b006082f4fcc569786bf868ad
diff --git a/sci-libs/superlu/superlu-5.3.0.ebuild b/sci-libs/superlu/superlu-5.3.0.ebuild
index e9e68e0bab56..063ffceaf18f 100644
--- a/sci-libs/superlu/superlu-5.3.0.ebuild
+++ b/sci-libs/superlu/superlu-5.3.0.ebuild
@@ -8,7 +8,7 @@ FORTRAN_STANDARD=77
 inherit cmake fortran-2
 
 DESCRIPTION="Sparse LU factorization library"
-HOMEPAGE="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
+HOMEPAGE="https://portal.nersc.gov/project/sparse/superlu/"
 SRC_URI="https://github.com/xiaoyeli/superlu/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-libs/superlu_mt/Manifest b/sci-libs/superlu_mt/Manifest
index 32039b52c573..77e0cb9ba6df 100644
--- a/sci-libs/superlu_mt/Manifest
+++ b/sci-libs/superlu_mt/Manifest
@@ -1,4 +1,4 @@
 AUX superlu_mt-3.1-duplicate-symbols.patch 7284 BLAKE2B 6402f745b280c02dfb4b0fadee120c9def38819d01c5e00406f68a812a06f3d86d4ac0ee799e3abe7b081737d2566bfb6ad981f7768ac29b3a2ad0b0bc147ee1 SHA512 b233677071ce175116454614b6289faa80f60ef0dfeee728bc4a1a7603ce8490c93e63ba635d1db231c92a055dee5cdbeff2793a2e138fa688efc18bd72b693f
 DIST superlu_mt_3.1.tar.gz 1824440 BLAKE2B 6355c624eca13a6ad7fa0e6100b3a548215d93aafc5958b9a0e693b3333006e4b1e98facddf352f62ef1632c8528cb39a85ca15509abf046d32f8d97335749c5 SHA512 41b8d9808f6a9c3f8d9e983ab253b0c5aec486df1cc419d043a201bd950034fa4bdd5465410e1198a2314d072b92cb388fc117165a06f820922f04060c755971
-EBUILD superlu_mt-3.1.ebuild 2599 BLAKE2B 4eff4966f84ca878bb35a520cecc489d9ce35e3c42b32e144f7755a9ff967b2c8de729a5132a1a2ef2b200524a7c7ae50e7ed5c78f2babdf74793d69ac6c6509 SHA512 ce01e3cb4363856ef16473ab6a46fd8df956d2145958bb858928fbbee6a0224079ba047bfd76b5ede06f2e0dc69df1304898d7290572989817c97fecc9c838c8
+EBUILD superlu_mt-3.1.ebuild 2593 BLAKE2B 0a92790424e62a3de4bcc3f7dbf061a54b524c38b2a8f342ae4b4e62739d712c26979f796795969b077c1485ae898cddee46748d2e734888135413da56645e84 SHA512 4a2e60dbb4adda66ae2f96ab15ea8d3fa7803baef7137ae90a1008fd9a15fab1198d52c6ce68e9a6811eabb7fbe056add23e0e86c7b8303164e91347ca5a1363
 MISC metadata.xml 1472 BLAKE2B 75500639996e0b9e541913a3e8c65b094f38e79615e8cc07cb99c6b889259458c0cff14414004452fe320034bb7c442efa112b9eab75a853890a0c780b4850b8 SHA512 914c5f3d6e8e00e678db0c266278971a7586f7ddc06441954c6b31c272efb2e45fce7e5d93017fdee3075337a0b01f653d4d1854fc028a8e850f448ba729d969
diff --git a/sci-libs/superlu_mt/superlu_mt-3.1.ebuild b/sci-libs/superlu_mt/superlu_mt-3.1.ebuild
index 54397230e5cb..f631900a16d9 100644
--- a/sci-libs/superlu_mt/superlu_mt-3.1.ebuild
+++ b/sci-libs/superlu_mt/superlu_mt-3.1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit toolchain-funcs versionator
+inherit toolchain-funcs
 
-MYPN=SuperLU_MT
-SOVERSION=$(get_major_version)
+MY_PN=SuperLU_MT
+SOVERSION=$(ver_cut 1)
 
 DESCRIPTION="Multithreaded sparse LU factorization library"
-HOMEPAGE="http://crd.lbl.gov/~xiaoye/SuperLU/"
-SRC_URI="http://crd.lbl.gov/~xiaoye/SuperLU/${PN}_${PV}.tar.gz"
+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}"
@@ -20,13 +20,13 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( openmp threads )"
 
 RDEPEND="virtual/blas"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
 	test? ( app-shells/tcsh )"
 
-S="${WORKDIR}/${MYPN}_${PV}"
+S="${WORKDIR}/${MY_PN}_${PV}"
 
-PATCHES=( "${FILESDIR}"/${P}-duplicate-symbols.patch )
+PATCHES=( "${FILESDIR}"/${PN}-3.1-duplicate-symbols.patch )
 
 pkg_setup() {
 	if use openmp && ! use threads; then
@@ -71,10 +71,10 @@ src_prepare() {
 src_compile() {
 	# shared library
 	emake PIC="-fPIC" \
-		  ARCH="echo" \
-		  ARCHFLAGS="" \
-		  RANLIB="echo" \
-		  superlulib
+		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
@@ -97,7 +97,7 @@ src_install() {
 	dodoc README
 	use doc && dodoc DOC/ug.pdf
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r EXAMPLE/* make.inc
+		docinto /examples
+		dodoc -r EXAMPLE/* make.inc
 	fi
 }
diff --git a/sci-libs/szip/Manifest b/sci-libs/szip/Manifest
index 3443ba9bcf76..668a837459f7 100644
--- a/sci-libs/szip/Manifest
+++ b/sci-libs/szip/Manifest
@@ -1,5 +1,3 @@
 DIST szip-2.1.1.tar.gz 415774 BLAKE2B e0f8d1f6528801c422a4db0f0cad43dd2c17f913dfff85962f4b4d448176903bcb385f631d32c5328cfb114527220baa9fb7d560364f700a61d4930ce799a7a4 SHA512 ada6406efb096cd8a2daf8f9217fe9111a96dcae87e29d1c31f58ddd2ad2aa7bac03f23c7205dc9360f3b62d259461759330c7189ef0c2fe559704b1ea9d40dd
-DIST szip-2.1.tar.gz 383219 BLAKE2B 84e10763bcec885a423d64c2c3cff0632d7a6a39c8cd177cf607f549cb4cd02a4ca03362464c2c4ec4539c80149493329427f529f5d6daea4a35b91af6fa1538 SHA512 bb7e0af6dfaaaaa85013ef52e6901d5b7b6159795338d285c2e843bd2879230a6397fb072662fdfeda5690981db4e9af94782c057bf993f92516d92a8934cb75
-EBUILD szip-2.1-r2.ebuild 721 BLAKE2B 158b84da0268e40008349a0c99448b28ede89802cbafebea5d85f3aa055f614ec7417cc0a0f4d93b16678e93c37dd25bd7463f79d2d0123008a72b76a4ecfcbf SHA512 25e9de35c1298ff24cb3476084102cad0bfd1effe2c79f24b147846eeb5906222325ef719d125de41b15d6db007ea962a018472840b0f7446ec6eae0f39f5ec1
-EBUILD szip-2.1.1.ebuild 729 BLAKE2B 3edd5c408bc7d78b26a9295aa5c0d0eb46ecfad6dd445aabd53aa3602c3023da67fecdef5615f7939a28bd97df0046e196d97894341170b908185bcefc05f19f SHA512 db8e2adad3a5afd925662b8025492dce8ae347d00858b65e7225b5079e8c427e93a5439a79b8e7f4aad523cf09bbeaebc1d9d0b1f70d4f7a38c55d10288038e7
+EBUILD szip-2.1.1.ebuild 728 BLAKE2B f01d55e6d6f2c18d182394a397d315586ef4db534a7125cbab0c042fe325f3cb4b48eb7d650180d65adf8e9ba2d2a842ca368bafeeecf5fd687f8bee77f23e38 SHA512 f3b1ab6f6af202649ff7dbb49c96d19338891575afb393b7a1f8b0341120aef5899050cebb3945957c6f4afab39cfb49d2e5517d622af82d20bdcb8cf558490c
 MISC metadata.xml 766 BLAKE2B bd0e35e752baadb4deefad410c7e1d554cd412744af4a91acbeae68c04491b248d51f8169b81e529dfcc76b33ff8c2534f4b2dfadbda747309d3537de6ce5df2 SHA512 69ffab49952e563f8697a906f810ef7f8ae96bff70287b0f0a1f4c2b01212e6a3ba4fd89068948648979e53fd6efe1cc3c80e18584c54fdb6a8dc61cee21e14e
diff --git a/sci-libs/szip/szip-2.1-r2.ebuild b/sci-libs/szip/szip-2.1-r2.ebuild
deleted file mode 100644
index 7d7d1addd355..000000000000
--- a/sci-libs/szip/szip-2.1-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Extended-Rice lossless compression algorithm implementation"
-HOMEPAGE="https://www.hdfgroup.org/doc_resource/SZIP/"
-SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/src/${P}.tar.gz"
-
-LICENSE="szip"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="!sci-libs/libaec[szip]"
-DEPEND=""
-
-DOCS=( RELEASE.txt HISTORY.txt examples/example.c )
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/sci-libs/szip/szip-2.1.1.ebuild b/sci-libs/szip/szip-2.1.1.ebuild
index c40a4a6bb077..ebfb026a668f 100644
--- a/sci-libs/szip/szip-2.1.1.ebuild
+++ b/sci-libs/szip/szip-2.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://support.hdfgroup.org/ftp/lib-external/${PN}/${PV}/src/${P}.tar.
 
 LICENSE="szip"
 SLOT="0/2"
-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="static-libs"
 
 RDEPEND="!sci-libs/libaec[szip]"
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 96921d2ba696..ad0886bd773a 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -33,6 +33,8 @@ DIST sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz 2569603 BLAKE2B
 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-patches-2.5.0-r1.tar.bz2 5180 BLAKE2B aafebb5cc4616ad93982e0fd8299f91c22063b96841b920a98a4cb54bcdc0cad51011f943ca62055239a0c21ed69d1f5b985710dcf0c28346b7ba12114583842 SHA512 38acd53136f3f1e061b71624cc5a1cefbdcb1d897b7728bc93462e8f52e998c3d72453ca9c94fa53dd28279cae5c591b7cbe9f61684784ff94c451a641524f31
+DIST tensorflow-patches-2.5.0-r2.tar.bz2 5538 BLAKE2B df289d77a79bb2143ebe26685f3c8f2efe64819a2fd6bd9866bc05638d2c19e822ddb90df3f342f1fc27827b3799531ad4ed280f9cc5291e75b1c2042a61603f SHA512 4f5ecb4efb56e735ee79dd07e0e8737f535da4e9ba8f63f769d548813e5aa7017e03cd1bd0d661e1958fa2916df7c7f25a7c0d141dbfe9716586ca82c021169f
 DIST tensorflow-toolchains-v1.1.10.tar.gz 137512 BLAKE2B 774b22a599070564c0f77ed0da79f6a96359b196dd3007370be885b796c236b9a29c01597507a3049f82cf489824c8016740b778cacb2b8cd859500f9ecb1887 SHA512 1daf4684f5b364a89b3cc475cf2d13d0d0622fc14d2b32d7ad8518932538e716782d755cfcedc98d129a3986bc7c38bfc7854c8ad596891e397510b75ae2f93e
 EBUILD tensorflow-2.5.0-r1.ebuild 15608 BLAKE2B 6719de1a01b17354c17e5648ecf52ce77d296bbeceaafefef4ca4f03651fbfb097629cdf2fc68aa355cdcf3f6dc20d38cbad91ca1e2fd9330761db46fac75c47 SHA512 ae9c082b8c7d251cfdbf15d153b504865c10a1e86087155df158ee187df88f7779c0505c019806b162fbc214b12d7424e58cbff733c55713be3506c986407742
+EBUILD tensorflow-2.5.0-r2.ebuild 15607 BLAKE2B 75450401229fda615b38dab3d3cbd56d18114a13fcf0b58c1b6b45cd319048a1efad85bdd0263cff5f197ebde1aecf06b6a7e8cf3eb9695dbbefa7b2f4d93279 SHA512 b34bf5612e9ba415e3d3211912eb0ab011709ce507a0754defdda51985cbe9af86189f664f509f7e4035c99b506b3c12492e729ad95250975acc8a7273b0344a
 MISC metadata.xml 501 BLAKE2B 16095ae1e7ff9fdd7efe0bb5184ce1d7e46cb5c8f98a650ec4f69742262c678b9945d35b12ba518f8a9b36cad8cd23483a95aca0141ddbe07e4210cef16d2949 SHA512 d1f08e9360ab7c4ec516787807cc53f795d99dde6287b7024535bae4dae4a0107117548784bb25ac07cee15ad1676d98e9c9d472ec97023dfc3e0bdd72a26d28
diff --git a/sci-libs/tensorflow/tensorflow-2.5.0-r2.ebuild b/sci-libs/tensorflow/tensorflow-2.5.0-r2.ebuild
new file mode 100644
index 000000000000..3bfe94d961f9
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-2.5.0-r2.ebuild
@@ -0,0 +1,413 @@
+# 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/6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz -> abseil-cpp-6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.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/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.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/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip
+	https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz
+	https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz
+	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
+	https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz
+	https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz
+	https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz
+	https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz
+	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
+	https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip
+	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
+	https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz
+	https://github.com/google/ruy/archive/54774a7a2cf85963777289193629d4bd42de4a59.zip -> ruy-54774a7a2cf85963777289193629d4bd42de4a59.zip
+	https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz
+	https://github.com/llvm/llvm-project/archive/1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz -> llvm-1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.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.2.tar.gz -> oneDNN-v2.2.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.1.10.tar.gz -> tensorflow-toolchains-v1.1.10.tar.gz
+	https://gitlab.com/libeigen/eigen/-/archive/f612df273689a19d25b45ca4f8269463207c4fee/eigen-f612df273689a19d25b45ca4f8269463207c4fee.tar.gz
+	cuda? (
+		https://github.com/NVIDIA/cudnn-frontend/archive/360d6e7164dfb7c802493fd1c0464f0d815b852a.zip -> cudnn-frontend-360d6e7164dfb7c802493fd1c0464f0d815b852a.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-db/lmdb
+	dev-db/sqlite
+	dev-libs/double-conversion
+	dev-libs/icu:=
+	>=dev-libs/jsoncpp-1.9.2
+	dev-libs/libpcre
+	dev-libs/nsync
+	dev-libs/openssl:0=
+	>=dev-libs/protobuf-3.13.0:=
+	>=dev-libs/re2-0.2019.06.01:=
+	media-libs/giflib
+	media-libs/libjpeg-turbo
+	media-libs/libpng:0
+	<net-libs/grpc-1.39:=
+	net-misc/curl
+	sys-libs/zlib
+	>=sys-apps/hwloc-2
+	cuda? (
+		=dev-util/nvidia-cuda-toolkit-11*[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-libs/keras-applications-1.0.8[${PYTHON_USEDEP}]
+		>=sci-libs/keras-preprocessing-1.1.2[${PYTHON_USEDEP}]
+		>=sci-visualization/tensorboard-2.5.0[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	python? (
+		dev-python/mock
+		dev-python/setuptools
+	)"
+PDEPEND="python? (
+		>=sci-libs/tensorflow-estimator-2.5.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}"
+
+PATCHES=(
+	"${FILESDIR}/0008-patch-ruy-for-gcc-11.patch"
+)
+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
+			pcre
+			png
+			pybind11
+			six_archive
+			snappy
+			tblib_archive
+			termcolor_archive
+			typing_extensions_archive
+			wrapt
+			zlib
+		)
+
+		export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
+		export TF_IGNORE_MAX_BAZEL_VERSION=1
+
+		# This is not autoconf
+		./configure || die
+
+		echo 'build --config=noaws --config=nohdfs' >> .bazelrc || die
+		echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die
+		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
+}