gentoo resync : 25.09.2021

22 files changed, 117 insertions, 938 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index e8d1aea0d4ac..fb0d34eae1c1 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index c6bc4c0affc4..03fbe4e650d2 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,3 +1,3 @@
 DIST cartopy-0.18.0.tar.gz 14191937 BLAKE2B bb10791ef2534dad404cc492e378161a4a078813b09d6e2c16d0d465c7dcfbaa7f24d3818cfe0f1f46e7683bdf2e00440640534835ce064492d5321489e355bc SHA512 912d5ab57c96b9e6c51b3ad26f94d77e495eb9c3a8fb8a68bdd957c11b1bc8a3ddc97e76e0d8a5ec9afca9302b01fe5753f4208ec3829df8741ee0ebbaafe30f
-EBUILD cartopy-0.18.0.ebuild 1674 BLAKE2B f50f63ce93119c04e31829f7c54b450e47634e606e222ae7d79cd0c46346b98415c81547513cd02c4b8a205238c72d1f2f2949912072e8102dcbff6617de881a SHA512 97f3346365bacc36d70dd4505da3df0710964a55d9dc3c466207f87c74a59257dc451378e95939d2914dab9525f3e2af1bd61e48817228637c2ccb840abbdf48
+EBUILD cartopy-0.18.0.ebuild 1708 BLAKE2B ba4dccb35ad843290b8ec0cf9433dbb640a1422011589c50e709004388e0b9787771b307789c5787c0b7b98c2081ed7c97dcc4256a52ab882ec42e01ae44adaf SHA512 ed9fb4e0abbab15feb9e4a21a7e4b2c04a4a76bbd0763b9239c4cb4148de894d9f8d048d514f60275388a4ae6e30bdc3d744fca100cdb5838c86f16482eb1c29
 MISC metadata.xml 603 BLAKE2B dc4da38fb25d4785362faa8475edb2d3b44aa99c0ce3f3f21ee3c1812a385a715a0d18ece3d58b63e298f997fdebd4762f8395335042bbac6e6fc2aadefee695 SHA512 3fb87e6057c17a7430519fc5e434847cfe13bdf06fa4aab6ed3b6aefe574a078c8750915c65a9d1ed12cecc8c25353e1218aae69dbe0a9e661b9d7499994dea3
diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild b/sci-libs/cartopy/cartopy-0.18.0.ebuild
index fbbee50514c9..ffeef0d90707 100644
--- a/sci-libs/cartopy/cartopy-0.18.0.ebuild
+++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
 inherit distutils-r1 virtualx
 
 MY_PV=${PV/_beta/b}
diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index 2863a11a1e76..5a1c671ee0aa 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1,5 +1,3 @@
-DIST gmsh-4.6.0-source.tgz 12048076 BLAKE2B 2de1ded477ec675fa7bcb56c1e2a1352f6f6d642b9872dd5c167bafac0e7648cbbce6921b556d59796e035f40bc24e9ce38ccedb690ca54cbeab5f3ab94eeeea SHA512 9d6dde6b1f6b6193eb859cc6425a0161d42ccf449aeb84f43e1dba661b0ccb593821b9371272e06351c4dd26b7b8b6a5c39475c0f5b1332be188551abc88ae45
 DIST gmsh-4.8.4-source.tgz 13838352 BLAKE2B 26c7f68e41d1c339c7d5fd499b2261c2ce79c38648df9f4f3853ba69421d59be36992d8aac1d1ebc1fe872bb828769693c12fd9770878fa3b59c179176105ea4 SHA512 c3880e67af03aa6d00300b5f56fd229ffe37da9af66e8c7c87a3bbf7abcb3a90b4858ec76093ef8f039a70d4da1d5cc7f7c687c05b6642299c95e1a07f9513bf
-EBUILD gmsh-4.6.0.ebuild 1784 BLAKE2B 0cd3d1b0981c3dfd5739e10dc2bbf2e2c40130a09997982105ba331dec9ac1ac669e6e50ec12ecca5233cbe5e4e194af708334ec1e9c549fe2bdec9cec9ddd1a SHA512 aec9980a9dae689db3d6a1adcc44614c718922e624ce473571d00d59836b5a4d36027f7fd1c6a695d4cefe5320d22d6900ceb98c7f86eb1297a9962448616150
 EBUILD gmsh-4.8.4.ebuild 1784 BLAKE2B 0cd3d1b0981c3dfd5739e10dc2bbf2e2c40130a09997982105ba331dec9ac1ac669e6e50ec12ecca5233cbe5e4e194af708334ec1e9c549fe2bdec9cec9ddd1a SHA512 aec9980a9dae689db3d6a1adcc44614c718922e624ce473571d00d59836b5a4d36027f7fd1c6a695d4cefe5320d22d6900ceb98c7f86eb1297a9962448616150
 MISC metadata.xml 738 BLAKE2B 8df642f68bf20aaa8742b4e8c2e469b0af3e9c61f17905604a17f2dade702423927c2d146d68781b056335269a20717cee6502447eb9d30a7bc0684990cd1312 SHA512 5634ec209dad65d0b5845007b9f29aaee6137a6a85a142fde6c8e6d357e4d6acf339cf65c5dc3018305f73c40f653dfc50ed7ff9a321ced62407a98b6a3f710f
diff --git a/sci-libs/gmsh/gmsh-4.6.0.ebuild b/sci-libs/gmsh/gmsh-4.6.0.ebuild
deleted file mode 100644
index df5ea5533a0a..000000000000
--- a/sci-libs/gmsh/gmsh-4.6.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit cmake-utils flag-o-matic fortran-2 python-any-r1 toolchain-funcs
-
-DESCRIPTION="A three-dimensional finite element mesh generator"
-HOMEPAGE="http://www.geuz.org/gmsh/"
-SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz"
-
-LICENSE="GPL-3 free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-## cgns is not compiling ATM, maybe fix cgns lib first
-IUSE="blas cgns examples jpeg med metis mpi netgen opencascade petsc png python X zlib"
-
-REQUIRED_USE="med? ( mpi )"
-
-RDEPEND="
-	virtual/fortran
-	X? ( x11-libs/fltk:1 )
-	blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
-	cgns? ( sci-libs/cgnslib )
-	jpeg? ( virtual/jpeg:0 )
-	med? ( sci-libs/med[mpi] )
-	opencascade? ( sci-libs/opencascade:* )
-	png? ( media-libs/libpng:0 )
-	petsc? ( sci-mathematics/petsc[mpi=] )
-	zlib? ( sys-libs/zlib )
-	mpi? ( virtual/mpi[cxx] )"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	python? ( dev-lang/swig:0 )
-	"
-
-S=${WORKDIR}/${P}-source
-
-pkg_setup() {
-	fortran-2_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=( )
-
-	use blas && \
-		mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
-
-	mycmakeargs+=(
-		-DENABLE_BLAS_LAPACK="$(usex blas)"
-		-DENABLE_CGNS="$(usex cgns)"
-		-DENABLE_FLTK="$(usex X)"
-		-DENABLE_GRAPHICS="$(usex X)"
-		-DENABLE_MED="$(usex med)"
-		-DENABLE_MPI="$(usex mpi)"
-		-DENABLE_METIS="$(usex metis)"
-		-DENABLE_NETGEN="$(usex netgen)"
-		-DENABLE_OCC="$(usex opencascade)"
-		-DENABLE_PETSC="$(usex petsc)"
-		-DENABLE_WRAP_PYTHON="$(usex python)")
-
-	cmake-utils_src_configure mycmakeargs
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r demos tutorial
-	fi
-}
diff --git a/sci-libs/gts/Manifest b/sci-libs/gts/Manifest
index c2f99e82caec..7d8d0c5516c5 100644
--- a/sci-libs/gts/Manifest
+++ b/sci-libs/gts/Manifest
@@ -1,4 +1,4 @@
 AUX gts-20121130-autotools.patch 612 BLAKE2B 1dd5e897db2453d704554918c4473ec60f0371994e05964ac11c561cfda55980ce7fc12611fb3d5588ab346cc4a78f280371b5c0db633ba052dcc0cbf4d12d55 SHA512 dc80e024813c045f3379552f2ad3ed63b048462622149e33ab97c74ab0c75cfb09f928f6ba975b4e94ac201f3d04a4bec1016cce014c134e4baee4480ec38158
 DIST gts-snapshot-121130.tar.gz 880569 BLAKE2B ffd35083122ec40b9ab3c301965e2f40f35f81cbb51947fee01d851f545d5314cdce6c24eee2cbcdf08fe492a63eadb3720535d3f4ed913f3309561d0d382c80 SHA512 84c38dc345830eea75755d9d55235b6d76786a84c3b9c3b7e057437bf395a9f2687596bbf037afd601b9f31a485d425a371ca5e60680265f10cb414400db4142
-EBUILD gts-20121130.ebuild 1165 BLAKE2B a4e74239da63ea033073a8b5a2e5e48e2720e56814e52b7d7ab079c2642b05f1b2fbbce0011be2234ac6545227f5d3ffd183f55ff35daa355da2b329a1e6f821 SHA512 16ed6c9c84c4b9868182418887e46c31f88b091c930a08ce87cf96b90cd7d2151471b4dc36b1b6f967fc6fda7557c22d95bd78683659bbf1d42304dffc256f5f
+EBUILD gts-20121130.ebuild 1171 BLAKE2B 5cbeae94b0f52293a02f943a0c84d79e254dbbacb7454c817f1053567104a45b4f8c4a80b704fcb4622a0df78aa65199d6dd9e3e8787d6405c75414adcbe991b SHA512 25af265360e1e3fbdb6d368a590d50447b3564cacc09abb4796c5290bcd062d4aefabcb07901698329630234e89b34e86ea5f9e0df2392107503a79a7b719534
 MISC metadata.xml 511 BLAKE2B 7d84726e3807de09c17f463a9b03e993592cfdffc9c8a6e6604f4fd8707366302057cd298f294aba2f84f05114587e6b4ac9bc9f70393c2cda2ee5ca2f121c7c SHA512 80ab76a08373dd78b3de544b8cb1c1c185c55cd6bc86baabd932bc6ddaaf6737f2a6add2406d9c40816c6124d6bcfbab203fa33303300f4428d075532610354a
diff --git a/sci-libs/gts/gts-20121130.ebuild b/sci-libs/gts/gts-20121130.ebuild
index 2ce0a8b48a5e..3a6449d4a08d 100644
--- a/sci-libs/gts/gts-20121130.ebuild
+++ b/sci-libs/gts/gts-20121130.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 hppa ~m68k ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="test" # bug #277165
 
diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index f827a7a0e590..e0fb31e55a8a 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -2,5 +2,5 @@ AUX Doxyfile 9282 BLAKE2B 0dcda644c528df5bd495db1785ce0f3213f0ce0c3551205e9c043a
 DIST libgeotiff-1.6.0.tar.gz 537175 BLAKE2B 4b1430c9e80cdd4193f474484b295c151ecb9a654248e08527046f1aa35cfab0be59980edad2cc6ae90c1a7b0e03d46fd203affd5b01c83e0fd4435d5e56b2d3 SHA512 4c59598140d6c435a25aff6520e07a01a0153cac526df3b3e1366d5edc43cd82b15099da79ee8a2fb916e858f5a5d7421cfbf96bb485c91fac9e19c7209b7418
 DIST libgeotiff-1.7.0.tar.gz 541931 BLAKE2B 3c0843f8c86d6bbcedf9d07b45d2d676f1ccfaba7b5e40fa7f8d5f290b39da5cfaebe39567eab9e8add1b99042aad51d5104b81c2c05493d18d022d41e5b106b SHA512 8e294b5db89e88dbd4f7eb9d804be788ff3d14a1a14f721e9805b42cc797500596f0473dd8e5be6c1da01b56bdebc872df2b30470a2d96686f308019de10739a
 EBUILD libgeotiff-1.6.0.ebuild 1263 BLAKE2B 501a0503040baacee952966b1a627e1cbb10d0ac266bf06ea0d57bf56d099e497d3802d96f5f29dd70432f0fd724a23cf5ea94ce00ab0c66b70279ebe85a9a7d SHA512 19963a11645ad5bc7ae9cc4eef2fd484502a5314fcc560a1dd954f09b7ec87522ef3fa03c1005eab8f46245b390cea8e02f8ba732144b7caa43dca3f52799a87
-EBUILD libgeotiff-1.7.0.ebuild 1272 BLAKE2B bb13cc8a4e25df792678d21f26dd79c77474c91e0216d862d1a73010003948cdf4ed97284a8e18ff7c3828ec9ec74f48c252d42654630b666e63ce9e3da7e9b3 SHA512 427ba5c2cbd188cfc5dcebdac4e9f29466cbc95aab30822c988798238305df6d102f0e4b73fc87ffad884df814567d55bfb2b88aba73757e5d162a7a0f824bcb
+EBUILD libgeotiff-1.7.0.ebuild 1270 BLAKE2B 5d024b10502e7c25b37cfdad9eb80bdd3b131b461cc1225c7b052a2b681a2ec6482c7d68674e241c43015368d5e6a8112acaa8c26440582082facd555d40645b SHA512 d75a127677f63589718d1663a769ef2070107d3197da858b28fea50fd32f34317fe759d128a108c44c9979aa179bad4514316de01173f769ebaf7668db0a9d73
 MISC metadata.xml 276 BLAKE2B 51ed91dbe57f48aa4af2c9fa6fc16fa70996a95e31096505ec3e9288f04182aaf09feb0cd3e2e1c45e37dcffc528c788995ee4c89ea73b3c736dd9ec6172788c SHA512 b0a243998a4962647e6e5bbf04f9d92837c969c5a2f44d1c752a032cf3f0308d0ad82dcab968781b8edb88aa49748e27da617e7c3587647d4637db0912a4cb95
diff --git a/sci-libs/libgeotiff/libgeotiff-1.7.0.ebuild b/sci-libs/libgeotiff/libgeotiff-1.7.0.ebuild
index e607c00e7542..b7d0dbdc7a55 100644
--- a/sci-libs/libgeotiff/libgeotiff-1.7.0.ebuild
+++ b/sci-libs/libgeotiff/libgeotiff-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/5"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug doc"
 
 BDEPEND="
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 4da56f705296..3358aab4532e 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -5,5 +5,5 @@ DIST libqalculate-3.20.1.tar.gz 2107300 BLAKE2B 79314cbe2adb183a17f96947b8ad4fa0
 EBUILD libqalculate-3.17.0.ebuild 1424 BLAKE2B dff87b194a2a34a0711c7b0b8f50d7e46f57b90869a2706d8aa7991440b56db8c92e54eb6265dfd4edf5086a058d53be87e3c0d1c553e13b9c2d27682efb707a SHA512 dc38abad377639192c9f276a1cf86847463b1ffe5fc35aef15b4d5d6e68f46af6dd6950f8127b1c091ce649dc5dd8fc6010333532ff493344727dd11e726b469
 EBUILD libqalculate-3.18.0.ebuild 1424 BLAKE2B dff87b194a2a34a0711c7b0b8f50d7e46f57b90869a2706d8aa7991440b56db8c92e54eb6265dfd4edf5086a058d53be87e3c0d1c553e13b9c2d27682efb707a SHA512 dc38abad377639192c9f276a1cf86847463b1ffe5fc35aef15b4d5d6e68f46af6dd6950f8127b1c091ce649dc5dd8fc6010333532ff493344727dd11e726b469
 EBUILD libqalculate-3.19.0.ebuild 1603 BLAKE2B a503ff3c6842ce2c20340e3783eda16ec0071151adedb157402df9c6ef0051afdc36ba03482d3b7edd8543c77c77d254b6fe6745ade186eff54f0be9cb9fa25f SHA512 f417057b5dc28dc540b2ba858e6219484d230e2a5a94416b67bcfb2670f09e144f09a3249f6a104eda529cd2c6a710ab9a0e6f935477f3d8731eb7adf4695790
-EBUILD libqalculate-3.20.1-r1.ebuild 1612 BLAKE2B 458af53c8726b58589ee6b57b19d14f6046802e2f43df1b0dfe31f2dc1a1eabe93499180dd202f2e3d57f031669b96a8e7e79113fac239596903ab3f1399d113 SHA512 62211178fe480611b716fa271744dba82138279970afc87bf218ae303966e329504019cf66eb7cd908c58199aa5ca0b8a09d701492c00128e5cbeb8ed56a74a2
+EBUILD libqalculate-3.20.1-r1.ebuild 1610 BLAKE2B d7471379d9ba406f6b0a90e9e9e5b4f772ba63834fbc6b3d92fd9c6dc730bb53ad7ff0b8ee02c3c3a6deedf1b51b1db6125297fcc08e73ee3cf1704c19f4d655 SHA512 aad5aa2d0896fc1128e74f9480dea552ab5203efbb0cf06a99fd2e5f83748edd13b99d66efba8e5df0509ac957226a08339c2305e34b8677124cf8035812da1a
 MISC metadata.xml 413 BLAKE2B 40f271cbe3f5ca30aa6ec6320d382faef0864e064ae57599a6da937da85b4de9d57eeec6f8b737698ede76d663149b13247d1edf8b5b291de19ac3d6b5266492 SHA512 053e75b77c4ff628535db22d9763e27c32cee904f0b268d2d507f367c938aff5bdd75a66e3f4c2316dc1d3db579d721564d3a12e139740a3a0d50c36f8d52e94
diff --git a/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild b/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild
index b56f3ac2cc45..f87a066dfb22 100644
--- a/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild
+++ b/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl icu gnuplot readline"
 
 DEPEND="
diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest
index 28983c3720c6..1e5f708ebdb5 100644
--- a/sci-libs/shapelib/Manifest
+++ b/sci-libs/shapelib/Manifest
@@ -1,3 +1,3 @@
 DIST shapelib-1.5.0.tar.gz 547686 BLAKE2B 3f962ee701d8cfb86a56aa1c0b2156bc2288a2bc908bb1a8303e491812845241f5281b0b8650befcc53e9dfc408b652a56f5e2fdc5ac7c2ff6eb99170696e437 SHA512 6dbd5fc7929ca403e65017ef58211f351608d9ad08221bf68bde047ceecfd27013ce731f9ae4edcfd040bc3db7fe9054b5d96e46128d2968788bef19532b1721
-EBUILD shapelib-1.5.0.ebuild 730 BLAKE2B 93cc8317306991cd5306eedb1e297f76982bf9c37e32a7513a4d9b03ada9249edf3d8730b1ec7e6525cc6121317baa9f1ea02f0c080391234e8e358d4dc5b7e2 SHA512 f986dcef8a808a318e20258a10ff55fb0fe5cce8dcb5d5162796bfb89570b9b294770a27d45a1e76abcb3bce5163264947b986c0f1760488c140a1b4ae3f8cdc
+EBUILD shapelib-1.5.0.ebuild 737 BLAKE2B 2debfb27c5235cdaa6df689d3e4e96b6d4edd4ead5a87888428498f888c98a65b4a523a02c8df68c19a7aaf09cb81fffe5af7f7c4d9bba2636a4c151c9842b16 SHA512 679ae4eae5a7e84724bd30dc224478e528bfcb18209b0626a59d4126157e1d1c99fb883c60c73dcf0c5fcb3ea5df750a887f5194c4fbca617fc5d9a7f8faab12
 MISC metadata.xml 270 BLAKE2B d671fe6a94e536276e72466a25e98a1e0bc835584f788b10653270c10b976da801bdb6bad177fc69d359c1e588d08101dc4f01792f14f04432ba7b6e234787a7 SHA512 e54914ee9c11010802a2bb5b4c998c82c53e93085d12dd59c6c5ec570de962ec8938e1e1a5ad6640fe8047c3d3eedea8c367881dd07a5648e95863af32e888f9
diff --git a/sci-libs/shapelib/shapelib-1.5.0.ebuild b/sci-libs/shapelib/shapelib-1.5.0.ebuild
index bb0e872ae7d7..263e63001a01 100644
--- a/sci-libs/shapelib/shapelib-1.5.0.ebuild
+++ b/sci-libs/shapelib/shapelib-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://download.osgeo.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 src_prepare() {
diff --git a/sci-libs/shapely/Manifest b/sci-libs/shapely/Manifest
index 1196412cd7e3..63bf3f81c96a 100644
--- a/sci-libs/shapely/Manifest
+++ b/sci-libs/shapely/Manifest
@@ -1,4 +1,4 @@
 AUX shapely-1.7.1-tests-support-geos-3.9.patch 2130 BLAKE2B 2785926f41a8d9486b9591616acf1f9b2dd76c2b009a7a51fefcb664733b304e7fc59b247a87fa36f4b4301132f157a16153f78dc68c2102901c4eea46c020ba SHA512 64c5ecd44ee7b6020e9605825b8af78ba0dfcaa5b0358c8f76af4104869ce027eb059331fa8c488add3ac1e360e41f46346d24e702c54858fe2f9bbef0b929a6
 DIST shapely-1.7.1.tar.gz 293368 BLAKE2B 14d9cb0c2b486a3a20b71c0cde7260ec357287ea020352c0320eea07b91674605bdcd22512b33c5ac5a71b89c3d811946f8dd6d3b90c61398203a4c68f30d067 SHA512 72070437960a8c1cf6504b5f4ccc8ec509f87fb6a90178e291aff14889f5add89f9ed4f7e9a19799ce0835c1aea3f0241eaa6efd4d8ea5b879f2167f7c1de50a
-EBUILD shapely-1.7.1-r1.ebuild 900 BLAKE2B a67d83f78652ccddb4606ed59f1a59757bda9bd86cf6da58e21fdcbd0fd2dea3a4d818f8793db5a2fa6e3a9a47f19a095de803a8ac62fe5cf3c768ec42a230ae SHA512 f41a644b2ed955c072cad70e787a83717ce1e3fca28287467f592db83406e7da967fbd274666286c4d14ee15c961650ed867ace44bd6b668a757d25848c078c7
+EBUILD shapely-1.7.1-r1.ebuild 766 BLAKE2B c22e5964f5c5b6d7b942dad03496705adfe651400357381f07c0032c82da5ac7e6ed8c1db66f308dff3c022f26addb45623920b4d3c28a372df504b74b7b164e SHA512 d8cd42d1644137de5a1af160c067c66d2681b538db456955aebc3495ddbdf9f07d76478f142d66b61a2c5df1f2e7540d462de266e5450c2627f2722a0a834270
 MISC metadata.xml 897 BLAKE2B 1e8c9122f9b88da6698151ad71082ddf7e6a4d7f2a6710a21e6851607afb2e48425e080d6adc40d1d27d18878a894bcc6aaf845d702adc2c83db1c4b7f8be3fd SHA512 e17253f9112e5e5e327ba66f22f2dc5dc8dc763d79870583e7d4b82c76f0429bd6431ba0845f7cb349feaf4dfc5da86492d866aba47cf91926c442c0bbb6eaa5
diff --git a/sci-libs/shapely/shapely-1.7.1-r1.ebuild b/sci-libs/shapely/shapely-1.7.1-r1.ebuild
index 7c75f9f5be29..749e53b1ac3e 100644
--- a/sci-libs/shapely/shapely-1.7.1-r1.ebuild
+++ b/sci-libs/shapely/shapely-1.7.1-r1.ebuild
@@ -3,39 +3,29 @@
 
 EAPI=7
 
-MY_PN="Shapely"
-MY_P="${MY_PN}-${PV}"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Geometric objects, predicates, and operations"
 HOMEPAGE="https://pypi.org/project/Shapely/ https://github.com/Toblerity/Shapely"
 SRC_URI="https://github.com/Toblerity/Shapely/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 
-RDEPEND="
+DEPEND=">=sci-libs/geos-3.9"
+RDEPEND="${DEPEND}
 	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/geos-3.9
 "
-
-BDEPEND="${RDEPEND}
+BDEPEND="${DEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]
 "
 
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}-tests-support-geos-3.9.patch" )
-
-distutils_enable_tests pytest
+PATCHES=(
+	"${FILESDIR}/${P}-tests-support-geos-3.9.patch"
+)
 
+distutils_enable_tests --install pytest
 distutils_enable_sphinx docs dev-python/matplotlib
-
-python_test() {
-	distutils_install_for_testing
-	${EPYTHON} -m pytest tests || die "tests failed under ${EPYTHON}"
-}
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 393a850a043f..96921d2ba696 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -1,11 +1,10 @@
+AUX 0008-patch-ruy-for-gcc-11.patch 1271 BLAKE2B 97c047175a0d9aa003de1dfa8ee8fe9fb88ffdc05e3f021c02260cb2350f1e33d65cb3ad664669213cbf6a28f35f3a1de37cec2159e3490522254b41696389f5 SHA512 80ffc381900e09b23b59477cd85b28e2b3d4a995404e65b79efaecd160f81ab1318656a1f0181ee695a47246002da5ea02095e97e32e24828ac33b2c933b1902
 DIST ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz 100612 BLAKE2B 84f81072d3298dde613b4c1ebabf852c67e04b5882a4ca0ed6f218b42e8fa3ea9598140b0c0009e8d6b62d08902622a6d57ee005ec3ad8a808c9fb21aa53430c SHA512 03a289d8099a5c4a5298cba8f516d2edb41220935d8db750970113ca7513372c78241c2c948d0ffcd60e84686e50ba1d7fd0b46efea6881dd320435eca92a7b9
 DIST OouraFFT-v1.0.tar.gz 110531 BLAKE2B de0e280407e21118e2bc6ca93a7caf3c4a49d0a13eda018b1497f98851af73dda4cef56460dba310336c7ed958e34feef4784ca2575a13287dec2c1ac9a5af6d SHA512 89c6e8fd57abf26351b3efb792008a1bbe62d404a4225dcae8aa666b3782a421be071bdc9760ebb0c95b5336ee5ea517d2fa43ab915045f7cf6fd76e73578079
 DIST abseil-cpp-6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz 1785034 BLAKE2B 83cee194b416fff3d6ec3f4c02b4210a60ebfcf0316524fe9deb94372bfc34f33075fa59e2e71d8bb17c32f61a6e324072651c2bbf382d3d4a7540657b8a33a8 SHA512 f64fee62863f2103c1991136fd3bc2b71cd28c7ff62138ac991b5a7f81780a05e0e2bdd6a119d02e1d70dd54f989f584093957efaec94f26c9d6c3f4ee37f8ae
-DIST abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz 1679879 BLAKE2B ce92197c564ff774db46027c32f97cfd55ff1d77b7cec5424e127d10a3b0a54d9e84537bd643c4eb330ca81959bcc0316b13c013b229df06b7f415864c451e46 SHA512 b429758c37749d3d5c5c220fe0dc00fa0e193b406545484095339b25674c4a3bb7850b76dd1a370ed2006729bcbbbb1b438995b614e149c2290bdb10038c49d1
 DIST backports.weakref-1.0rc1.tar.gz 7761 BLAKE2B 4cb2554a4b71bb1f8c41a790268511e4b382effc7e0328f74346d086de539a177111de9e2dabac19a44b2a1cdbf59a7425e30eee4caa4bfe66b0ca97f1f460a9 SHA512 f37e9eb0d9060d2e1588a941f623460bd4477d7e180b38b5cd46d9c1db1ee094ae63e4f5eeeb422823bf3d067f46c4124cb124a9e4ddb795bc0bfbc4802ab826
 DIST bazel-skylib-1.0.3.tar.gz 30711 BLAKE2B 86d6db9be4e627f6695329e16e8f9b6c2d0d683142a15f62c6924941405ab1d12292818ebf16642fc8d2664b0f113a35e002210034e80de14726387fcdafd765 SHA512 e28e62214b6c1e6724d26ebbee7c0b436b13e7b054d598788c15f03a56d248378068f5d29fae722a19d4519e2568983011ff50a13577dbc1bd174464ef4a49cc
 DIST bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz 660374 BLAKE2B 549292aa3ad8a6e01c29391a123f3cbc84d1f714ff9c68bfc6c8df07fa0ba3b19c22e61627f227a8a484f6d7d6c59935fd7560c447559ff5e774ddf1437eefe1 SHA512 83531a2646a9f63557eff6fefaf551ee7e9f0ccdb31374d7a17c35b9f9d844b9b405597972fcd31b2b68e9da312511bbfd9c8fbb75222f5924e1d2500cd1c2a6
-DIST bazel_skylib-0.9.0.tar.gz 84644 BLAKE2B 40b69a524e632ea00d34b9cf805b882ac4c549dd465ef37f28e54729ff1b614a7610a4895cede4e0c938edba5b19f781f3c0bfdb62bde628ee0af21d6b679546 SHA512 af4bcb641fed05d15f2d0ffe0e3abdfe9c7a5deb9c53064992d6605d224ded1648b1bdfa293e161028913f9f2c178c68cc38bc16028892ca5b0f52b4e645209d
 DIST bazelbuild-rules_android-v0.1.1.zip 14654 BLAKE2B 1cfd5af08c6eab9602883f62d85ef1b9eb02383f73dcc31ae84af880c9ba228ae349ac6b017c550286e248347193e2c56eba30c86174432429809447dd940ed2 SHA512 80628a5e2ca9806ab031cd0c2f2999bd67f5621a83e8300a51fe6233373bdaf7c90ff8fa9551c81e60fc904c4d7b24554327ac8ed2ee101e92c4ab9319c53f4a
 DIST bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip 171775 BLAKE2B ec0ece4555d779bc8380937baac517a8adf3b0176c4bfb1324943a91366ad9688f528a4bd69e4587bcc4ad427c71a53016a3e2d32a050d9d4ec99caac4967a8e SHA512 5c5e82f276c1c962fbd9c7ddf21df9aa4291f3285f3fa07cd2c2790475ccba670b0627fc3d6faedd1508eca4d80bdae64a31383f001f04f3031112be81c3e697
 DIST bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz 464906 BLAKE2B 033d76b8081f4f987e64875ad5c8e7b8f894ec6be58c52ee02c4d31d4480fee02f3f432ea9c4630ad3f5d1163f820aff37f6493da797ec51b148b361ab3c8b25 SHA512 2cd841f4530503ed31fa6425cb749ef29f8a1071b5d55594644303233e58455783cb02402bc23d7104ef036745733087d43075a1fcdab2ac96cd1a9872a6ea4a
@@ -17,33 +16,23 @@ DIST bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz 1404
 DIST cub-1.9.9.zip 619595 BLAKE2B 265b797a906b03da886de88863236c9ab90daa31498ddf848fcaf5e5ee1342614ad9a41618120ca09cc4c0da3e96eeec5e20ca9d7ba3f9860c507f06d15e59e1 SHA512 8c9c0a3f66f8d518ec07f857b5625e006d52f28bade1c1478a0f37420e2f7586dc3ff029d551748a1802bb5544b16fde5388e8d5a45d61eec595201b9db7a30d
 DIST cudnn-frontend-360d6e7164dfb7c802493fd1c0464f0d815b852a.zip 7781836 BLAKE2B 5fe215bf699c6e64ea29e36535965e86489fbb5d953cd5c4eec74c1f30c0f84008e691337962a4b51128d4066bfc72f48d2561c6eb17be89b2a393080cfbdbaa SHA512 4001c11fecf5f34ebac3f792833b37d4aa1456631f8d5110659548e0329d7a338db9c192f72fc0c54d93217f8c349c4a83392f8cd1cdb79034137a25cd73e005
 DIST dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz 39637 BLAKE2B 532a3ce3d0e354a73c19433f0210a64ecbf00d9134d06a0ee7462baaff3f2b981524aa630cf250595671d6673105724482c7d69e803179aac247f2020c883bd0 SHA512 3728db5213e887fd946f64ba5dc0c336be9a72a0966ee83f146148749ffc93ddb342e0735df6117d7943874c18f87de5791a28e4a57ea420bb8a4e2a5b7338bc
-DIST eigen-011e0db31d1bed8b7f73662be6d57d9f30fa457a.tar.gz 2667179 BLAKE2B 8e48418615ca95b27c26725c95f0b21202497284ea439ce1d799f1c86e80bc4fcd5951d9e476c9279e1a902da0b4ad029a73bb59ae8fb216508729803598a566 SHA512 cea21877a0aa1a0c1f0bde32494a3f4ffea6ae859d2562cb28c8aafacf009fc7754a110be1be3aa92f0959b7d7ab607768a579bf25a68972b14e30f613f2f54c
 DIST eigen-f612df273689a19d25b45ca4f8269463207c4fee.tar.gz 2721573 BLAKE2B a6f3fdfd622b11d1dc634518e0c50bac5246c6eb91ad52ba08db6b846a22f74fd151ac0a27d7ea330137cb5a572c41ca6a916796a94919663c46136b634c7ebb SHA512 71ed7b5e1c70a3a3502c9c1901120eebba7a3668f1b13c1e8156ef49e25decc0c2897fd9d729c505530d85842afd3084c615f87e1a43bc7a5f1f12ba34eaed36
 DIST farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz 467122 BLAKE2B 8b9dd426f4b9f732df6c8c09d868d1b1cc006c395b1525c46ea91c75318b723358c8e64bb0d86a73aace2032eded93f0d80cc7c2c77fddd6a39e3402ab4f2cb7 SHA512 7f5110514a8cdc7ce48d33fd94ad67d96a24e42e11b203e4d0986f4190545f051b2a63f8e09f2ac38c3aa4a5c62d9a0e02cd8ce02045037381fb62a99f0dcd00
 DIST gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip 936866 BLAKE2B 0977df121a80de979a9996b58a0a8cad157db8d0862b96f95b3be1157cddbc6b40dff4fc7da4ee78f5986cbfff2a67c173155e849e772ae476398c51f3028311 SHA512 4bf036de43f5e0890f66e0b16cd9a0f52911b160f79c9c50cf403454fa9d6040df225d34e02f424da8bb8c5f7f5c002f88f4d232c61503aa825c907ad8742823
 DIST highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz 138574 BLAKE2B cecd95039fc31545ced38a1949e7cb31d6f34deef7c8923b573aa7a632576d0a9b60fd24fbc8a40b8a840a7d2442ea28382fe842178a77467772ed4ba8a2cfb6 SHA512 d25162ed266a8c9c00e6978fcf642cf924f03c0d196f971d0d6f6a3454ca7dfc82f758eabd038ac08e0a5dacc51eccb9b674f588f64692f37cb7a17150aefe4f
 DIST kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz 44744 BLAKE2B aeea5d23c122417ddb70a44354890242c4fb61c456fba9af79054293a1355939af51a681760ac27be55423f888649fd2826e634422c7e9cb3749a9d7f50ef990 SHA512 30f4fcd351bbcb950a27e2a77ca100ccdfd37deb17a05e7e31c3e8f1c56d7c626ab81bbd7497484e6b512e41f7b1bed714722a194b2218c669b297911101df7b
 DIST llvm-1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz 136085334 BLAKE2B 1f2e920c0e146b0d10f394fe7e0a4fa42c1099f998c68bf7b1d2d8bb0882165c1ab18f872db93bace5a835cea53edd0c0fdc2d3e3864031debfdc8db3c5e6713 SHA512 e7d28cfa9eb1a0d8738431767612136d43a639011bafa4dfdd48ae2c75b3b1864ceb237fe9863355649e0f4bc28062077015335d7dcc2b83c886f5fc24cd41a2
-DIST llvm-f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz 127766458 BLAKE2B 7170f72e131ec672a1d81a8f33284568fc367608d2c5940b435a75cf8596dc71588c942c6d24c47a7e88c391b0c4030df6f18f6d1da15140587c8a9b078cd83c SHA512 6ebee8cece3845875d39678d7fe248c71e7c3463554bf345e03c06985afcdcd2a0052338358764ba366c7ecf72cd97703cb06613aeddec3110cf20c30eb70d25
 DIST llvmorg-10.0.1-openmp-10.0.1.src.tar.xz 955492 BLAKE2B 4197ecfb2e3498a95a2ba5923f2b4bdafbab645ddf2d3f1875d39752d3ab7304fb35bce918d2dc6e40e5ea809545ae0907d6bc0b94a3d68b8d96da48f5a62adc SHA512 5b6f6487feaabd2a18ef2bbb1a5f86bb567e264f9fdf56805cfdd3f65f36f21e7c1392ba5170fafb52a395fc1606b277233beba3df31dc2ab825ef8924e7a05a
-DIST nvidia-nccl-195232556936b39b01cc908296e1650b80d4a3e9.tar.gz 147607 BLAKE2B 4109d195e646d5d492ff0533aea4d95fca59e5fb97aee0261c1b6d1f4615c1e6facb54b14bd4d1fc710b938c0edeca72b528e9e91e57d4bffa3b28af909449f4 SHA512 e45f0e07fdfdfc859f1e5ac05224977af821c99b0d9e11c71e9983612e621f55272a8836049ca61fe26f7663c4f8180102684143403ab46be73fbc8ba15e0c56
 DIST nvidia-nccl-v2.8.3-1.tar.gz 203650 BLAKE2B 2b4995aa04b0b204c7315420b6d130c90baadf78f709b82352701c29116fbf053878e62623b6949ab114051a4df828536764bbe9374ab817af9a56879d7d8f08 SHA512 9a17b570ebda54116b1292899e086724c57c7b8ef03f8c529f760f79294cb710f599c2fddc29ab6bc4b843271af9e824dd1af1e705b98fdcbc201f737490d8f3
 DIST oneDNN-v2.2.tar.gz 9529895 BLAKE2B 63975f8ff4763732b9b45ad96b97053b8b9edd20beec1aaa0bb81e81493e9740e7d0aa04b221e52ccbcd403877a7e4e556b2826640b3cf28149c2af0f449fd41 SHA512 9ff7f6706a176057fdaed3a453639bb3bef7c94b6d275d90401bf310ee7ee11262f3cd2b0b67476d27c90ce91bbbb3ac3765a82c1117649f1832d33a838f7d66
 DIST pytorch-cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.zip 3787933 BLAKE2B 169620d461103f271ae927d84af27282189509b2ba2fbed2c09f9ae387b5f392eea635dfdf2d3a23e1fc19b5d467bee3f13d3e473946e42bba4b6a9a2fd60e32 SHA512 6f1c8c931b62990ab0228679efb52207a6e21cb847139c11bf6117051b7315ff87c12ed1373670d006f0bc7e3d390d59f2d28a8250d0bd7df850583ae42afdf2
-DIST pytorch-cpuinfo-6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip 3787039 BLAKE2B 3a529648d548b7570fd38783e5a3915bf3ad82ab028ee11f70fddaf09b8d64dc58f4d32ed54557b9f3087a8bb13ff4fd78b3597df6b1b5d3c3ef65c03193251a SHA512 8b34e580f19494f92796176db3f14680fd1b7b64458c0ef8e71ff1b3f1cbe12204e901167a585c1e04e95fbeaad5de104abc5edf3ea81a0da1c480a99f6bb94b
 DIST pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz 3489028 BLAKE2B aa6b7719eb9871b6cc71318cb4a9c2e2397e665662b7978daecd9e8380304691a78b95118eba5cbbb738c4b490352a847f6ce6b5c4ae29de0543b95ecc557cbb SHA512 ecd2115340fa82a67db7889ce286c3070d5ab9c30b02372b08aac893e90ccebc65c6b3e66aa02a9ae9c57892d2d8c3b77cb836e5fc3b88df2c75d33e574d90d2
 DIST re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz 316237 BLAKE2B 8a975bc3e78b690f70944651c7022c6d946f40b2eb5fe01b2e203141f94b890cf1ad5c72af8e7c6ff3c5242d42af5a8657ed69e3c74d9ac081beb15de6334c0c SHA512 e3e00e92700d08bc55ba0e96148ddf1e00de2d329c1fdac08691ff15976937829f66dbc84af886a4b749ad66ba4ab208d66811e97e33bb9c2d7359735406c450
 DIST ruy-54774a7a2cf85963777289193629d4bd42de4a59.zip 363561 BLAKE2B 81ff61f1a125c99f7bc8c2f4e03909036a759543cf56774dc872db5987ed4ef099b376597acc2f07758c4813933e7b27fe336281bc05da19f284fb085492ade2 SHA512 b15b6e0464f7612276bc8b198341653e3b72b5e166132a5107f825d4c4612e179018f92a16f7a41490d176bb138417b18a6f1b7fc165c4e829d889808cb89276
-DIST ruy-5bb02fbf90824c2eb6cd7418f766c593106a332b.zip 312653 BLAKE2B 57439930979de125ece2a2dec5e0813873866a167bd5b323b1bda2838def1b96e1925fca52eea9be851d15a99d0b43026be1f0d27cb9aa973b86891a480c3a8f SHA512 ed6bbc89fc44bd27b0bdca744d2c6822d7311045f99abf790c1ee0c9b3cbedbdb2d3f7098c55a6294890865050aaade3e6806c2c769c5827d4ac3eaaf81e5d44
 DIST sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz 2569603 BLAKE2B cd66dc8a0b4ad3ea586a79ef588c8d68e4f05b6ea89e6d8119b5ee338b9046c11a747ca57c2f80a3c90fab119c05e85f5965571c9e522ccb8a312b95804d1a36 SHA512 b819d050bb38246b503f1eb3d6e7d878d0f166f3602ae3c327749b1f6ddc2b1d6ac7f768b1f1d055b98b7b98812e4643a75bcebc9728c7f615d67ca739761b3e
 DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856
-DIST tensorflow-2.4.0.tar.gz 53257138 BLAKE2B 21973f67a7a4cb91baccbd3a4d9c8bce4c7f488ed44e834122b0fa0fc47b22d48276ecd9b580fa839c32a3dacac73bc010f91a27e5568df4dd9986b14b7eeb4f SHA512 4860c148fd931c4dc7c558128e545e2b6384e590a3fbc266a5bfe842a8307f23f1f7e0103bda3a383e7c77edad2bb76dec02da8be400a40956072df19c5d4dbd
 DIST tensorflow-2.5.0.tar.gz 55999506 BLAKE2B 0f1f29ed9ff6e5fd3fc0c98419bca636f48085810f934290885b3469c45817b2ce17e9dbd3d93d70b09ec7975088edd0973f147449f527a8f2e23b388e2592ce SHA512 637c63b1bed1c0eb7bb018f1ff7f29f7f0d78e75dac384df4ecb5dfb92bbcb28209e3d3d2204145abddf88e3247d8c31bbb4cea032a73b7122b2ef3eb0d2b947
-DIST tensorflow-patches-2.4.0.tar.bz2 1842 BLAKE2B ac35a02e3494b0cb6cfcc9212557d5b5480aea41b09d74b918471e688b489bafd2dbc609320abde609a461db1c8d0043fce4053ad9a223bc93fb883176417199 SHA512 39b3ebe710eb3bb5c4575dbbad66ae1bd2a81b803fb9007709154320eaf31cbac213ea5dc6c2e674e685db1cea5ff524f723f3893dfe5f31af32be7756882b28
 DIST tensorflow-patches-2.5.0-r1.tar.bz2 5180 BLAKE2B aafebb5cc4616ad93982e0fd8299f91c22063b96841b920a98a4cb54bcdc0cad51011f943ca62055239a0c21ed69d1f5b985710dcf0c28346b7ba12114583842 SHA512 38acd53136f3f1e061b71624cc5a1cefbdcb1d897b7728bc93462e8f52e998c3d72453ca9c94fa53dd28279cae5c591b7cbe9f61684784ff94c451a641524f31
-DIST tensorflow-patches-2.5.0.tar.bz2 4834 BLAKE2B 3e7331bb290db529e32fe6ba0a9fa2f5729fc510b925bc74532eb1bb15f8ecdaa2655cb16229a696e9716d006057badf26392e8fca2695146dc9a491050cb7c2 SHA512 699d16296c4f04e4de540b2eb91122a245cc02233a2b76021646a57d3228688b44a691308b4f1e9d9dc16929e6d2d692540cdeb3f42d2cad2c101d3008c22a33
 DIST tensorflow-toolchains-v1.1.10.tar.gz 137512 BLAKE2B 774b22a599070564c0f77ed0da79f6a96359b196dd3007370be885b796c236b9a29c01597507a3049f82cf489824c8016740b778cacb2b8cd859500f9ecb1887 SHA512 1daf4684f5b364a89b3cc475cf2d13d0d0622fc14d2b32d7ad8518932538e716782d755cfcedc98d129a3986bc7c38bfc7854c8ad596891e397510b75ae2f93e
-EBUILD tensorflow-2.4.0.ebuild 14658 BLAKE2B dcaed6ed4fcd5c4b476843123b28a5fbff7f5a82745974ef8f003d3631bb594d4685225dfbf0274c27c14464859f22e13b02a489c58a286c520015b96b19e970 SHA512 917f4f972ed833bcabe9adbf3cf36b04ab65d7afc272faebdd409b121616e9759d29ea16d0bb6d9ee5077ecc9250bd93bec6ccf9abe3f1f8d948e4d8588cb0e3
-EBUILD tensorflow-2.5.0-r1.ebuild 15549 BLAKE2B 6ce8046e632899b01048a95b5ad7746fa12d412d0a02f097482ed5792849cec4fd47fe82b0f0efafb16e00e4964de9551d26a5eac7f423f1f51880897b563b88 SHA512 e2cd4679c5e232e39bc81285fc5819901c24990e235faef3a2177de192e7bd483601a8b0bdd9b810c8cb47e7f9987d68aeaa25307344bfb0cf01cdf24bc0457d
-EBUILD tensorflow-2.5.0.ebuild 15547 BLAKE2B 52467e6df18ef6d8e3906a171b73c4b2d696fcd5bd1054b4a91b3074104375c2c35f2af29cc738af075df77e7aa128e9f378df993bfc9dc8be40cad7e87ddd96 SHA512 780580f02f115de8b5f63a4ab0c78acfe30baf69c0f46a908a173db2b7a2c0b32f596e67f25c129e5ddd304e7873dd488a49800296e32a623f2eefea7256f63f
+EBUILD tensorflow-2.5.0-r1.ebuild 15608 BLAKE2B 6719de1a01b17354c17e5648ecf52ce77d296bbeceaafefef4ca4f03651fbfb097629cdf2fc68aa355cdcf3f6dc20d38cbad91ca1e2fd9330761db46fac75c47 SHA512 ae9c082b8c7d251cfdbf15d153b504865c10a1e86087155df158ee187df88f7779c0505c019806b162fbc214b12d7424e58cbff733c55713be3506c986407742
 MISC metadata.xml 501 BLAKE2B 16095ae1e7ff9fdd7efe0bb5184ce1d7e46cb5c8f98a650ec4f69742262c678b9945d35b12ba518f8a9b36cad8cd23483a95aca0141ddbe07e4210cef16d2949 SHA512 d1f08e9360ab7c4ec516787807cc53f795d99dde6287b7024535bae4dae4a0107117548784bb25ac07cee15ad1676d98e9c9d472ec97023dfc3e0bdd72a26d28
diff --git a/sci-libs/tensorflow/files/0008-patch-ruy-for-gcc-11.patch b/sci-libs/tensorflow/files/0008-patch-ruy-for-gcc-11.patch
new file mode 100644
index 000000000000..3bb2cf2e1cbe
--- /dev/null
+++ b/sci-libs/tensorflow/files/0008-patch-ruy-for-gcc-11.patch
@@ -0,0 +1,37 @@
+diff --git a/third_party/ruy/commit-3c93cda.patch b/third_party/ruy/commit-3c93cda.patch
+new file mode 100644
+index 00000000000..e530a842717
+--- /dev/null
++++ b/third_party/ruy/commit-3c93cda.patch
+@@ -0,0 +1,21 @@
++From 3c93cda8211efa01128d48950f0d6ee5233c5b9b Mon Sep 17 00:00:00 2001
++From: stha09 <51720730+stha09@users.noreply.github.com>
++Date: Thu, 6 May 2021 18:31:30 +0200
++Subject: [PATCH] IWYU: include limits for std::numeric_limits (#253)
++
++---
++ ruy/block_map.cc | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/ruy/block_map.cc b/ruy/block_map.cc
++index 6c01e52a02..e04e7aff4a 100644
++--- a/ruy/block_map.cc
+++++ b/ruy/block_map.cc
++@@ -17,6 +17,7 @@ limitations under the License.
++ 
++ #include <algorithm>
++ #include <cstdint>
+++#include <limits>
++ 
++ #ifdef RUY_MAKEBLOCKMAP_DEBUG
++ #include <cstdio>
+diff --git a/third_party/ruy/workspace.bzl b/third_party/ruy/workspace.bzl
+index 50769621770..7e91d640469 100644
+--- a/third_party/ruy/workspace.bzl
++++ b/third_party/ruy/workspace.bzl
+@@ -12,4 +12,5 @@ def repo():
+             "https://github.com/google/ruy/archive/54774a7a2cf85963777289193629d4bd42de4a59.zip",
+         ],
+         build_file = "//third_party/ruy:BUILD",
++        patch_file = "//third_party/ruy:commit-3c93cda.patch"
+     )
diff --git a/sci-libs/tensorflow/tensorflow-2.4.0.ebuild b/sci-libs/tensorflow/tensorflow-2.4.0.ebuild
deleted file mode 100644
index 7e6fd9bc4b8f..000000000000
--- a/sci-libs/tensorflow/tensorflow-2.4.0.ebuild
+++ /dev/null
@@ -1,401 +0,0 @@
-# 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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-${MY_PV}
-
-inherit bazel check-reqs cuda distutils-r1 flag-o-matic prefix toolchain-funcs
-
-DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
-HOMEPAGE="https://www.tensorflow.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda mpi +python xla"
-CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
-for i in $CPU_USE_FLAGS_X86; do
-	IUSE+=" cpu_flags_x86_${i}"
-done
-
-# distfiles that bazel uses for the workspace, will be copied to basel-distdir
-bazel_external_uris="
-	https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz
-	https://gitlab.com/libeigen/eigen/-/archive/011e0db31d1bed8b7f73662be6d57d9f30fa457a/eigen-011e0db31d1bed8b7f73662be6d57d9f30fa457a.tar.gz
-	https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz -> abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz
-	https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz
-	https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip
-	https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz
-	https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip
-	https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz
-	https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz
-	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
-	https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz
-	https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz
-	https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz
-	https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz
-	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
-	https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip
-	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
-	https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz
-	https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz
-	https://github.com/llvm/llvm-project/archive/f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz -> llvm-f402e682d0ef5598eeffc9a21a691b03e602ff58.tar.gz
-	https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
-	https://github.com/google/ruy/archive/5bb02fbf90824c2eb6cd7418f766c593106a332b.zip -> ruy-5bb02fbf90824c2eb6cd7418f766c593106a332b.zip
-	https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz
-	https://github.com/pytorch/cpuinfo/archive/6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip -> pytorch-cpuinfo-6cecd15784fcb6c5c0aa7311c6248879ce2cb8b2.zip
-	cuda? (
-		https://github.com/nvidia/nccl/archive/195232556936b39b01cc908296e1650b80d4a3e9.tar.gz -> nvidia-nccl-195232556936b39b01cc908296e1650b80d4a3e9.tar.gz
-		https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip
-	)
-	python? (
-		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz
-		https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt
-		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
-	)"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
-		${bazel_external_uris}"
-
-RDEPEND="
-	app-arch/snappy
-	dev-db/lmdb
-	dev-db/sqlite
-	dev-libs/double-conversion
-	dev-libs/icu:=
-	>=dev-libs/jsoncpp-1.9.2
-	dev-libs/libpcre
-	dev-libs/nsync
-	dev-libs/openssl:0=
-	>=dev-libs/protobuf-3.13.0:=
-	>=dev-libs/re2-0.2019.06.01:=
-	media-libs/giflib
-	media-libs/libjpeg-turbo
-	media-libs/libpng:0
-	>=net-libs/grpc-1.28:=
-	net-misc/curl
-	sys-libs/zlib
-	>=sys-apps/hwloc-2
-	cuda? (
-		|| (
-			( =dev-util/nvidia-cuda-toolkit-11.1*[profiler] =dev-libs/cudnn-8* )
-		)
-	)
-	mpi? ( virtual/mpi )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/flatbuffers-1.12.0:=
-		dev-python/absl-py[${PYTHON_USEDEP}]
-		>=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
-		dev-python/astunparse[${PYTHON_USEDEP}]
-		dev-python/dill[${PYTHON_USEDEP}]
-		dev-python/flatbuffers[${PYTHON_USEDEP}]
-		>=dev-python/gast-0.3.3[${PYTHON_USEDEP}]
-		dev-python/h5py[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-		>=dev-python/google-pasta-0.1.8[${PYTHON_USEDEP}]
-		>=dev-python/opt-einsum-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/protobuf-python-3.13.0[${PYTHON_USEDEP}]
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		dev-python/termcolor[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		>=dev-python/grpcio-1.28[${PYTHON_USEDEP}]
-		>=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}]
-		>=net-libs/google-cloud-cpp-0.10.0
-		>=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}]
-		>=sci-libs/keras-preprocessing-1.1.2[${PYTHON_USEDEP}]
-		>=sci-visualization/tensorboard-2.4.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	python? (
-		dev-python/mock
-		dev-python/setuptools
-	)"
-PDEPEND="python? (
-		>=sci-libs/tensorflow-estimator-2.4.0[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	app-arch/unzip
-	>=dev-libs/protobuf-3.8.0
-	dev-java/java-config
-	=dev-util/bazel-3*
-	virtual/pkgconfig
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-9.1[profiler]
-	)
-	!python? ( dev-lang/python )
-	python? (
-		dev-python/cython
-		dev-python/mock
-		>=dev-python/grpcio-tools-1.28
-	)"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
-CHECKREQS_MEMORY="5G"
-CHECKREQS_DISK_BUILD="10G"
-
-get-cpu-flags() {
-	local i f=()
-	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
-	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
-		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
-	done
-	use cpu_flags_x86_fma3 && f+=( -mfma )
-	echo "${f[*]}"
-}
-
-pkg_setup() {
-	ewarn "TensorFlow 2.0 is a major release that contains some incompatibilities"
-	ewarn "with TensorFlow 1.x. For more information about migrating to TF2.0 see:"
-	ewarn "https://www.tensorflow.org/guide/migrate"
-
-	local num_pythons_enabled
-	num_pythons_enabled=0
-	count_impls() {
-		num_pythons_enabled=$((${num_pythons_enabled} + 1))
-	}
-	use python && python_foreach_impl count_impls
-
-	# 10G to build C/C++ libs, 5G per python impl
-	CHECKREQS_DISK_BUILD="$((10 + 6 * ${num_pythons_enabled}))G"
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	# Only unpack the main distfile
-	unpack "${P}.tar.gz"
-	unpack tensorflow-patches-${PVR}.tar.bz2
-	bazel_load_distfiles "${bazel_external_uris}"
-}
-
-src_prepare() {
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	append-flags $(get-cpu-flags)
-	bazel_setup_bazelrc
-
-	eapply "${WORKDIR}"/patches/*.patch
-
-	# Relax version checks in setup.py
-	sed -i "/^    '/s/==/>=/g" tensorflow/tools/pip_package/setup.py || die
-	sed -i "/config_googleapis/d" WORKSPACE || die
-
-	# Prefixify hard-coded command locations
-	hprefixify -w /host_compiler_prefix/ third_party/gpus/cuda_configure.bzl
-
-	default
-	use python && python_copy_sources
-
-	use cuda && cuda_add_sandbox
-}
-
-src_configure() {
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	do_configure() {
-		export CC_OPT_FLAGS=" "
-		export TF_ENABLE_XLA=$(usex xla 1 0)
-		export TF_NEED_OPENCL_SYCL=0
-		export TF_NEED_OPENCL=0
-		export TF_NEED_COMPUTECPP=0
-		export TF_NEED_ROCM=0
-		export TF_NEED_MPI=$(usex mpi 1 0)
-		export TF_SET_ANDROID_WORKSPACE=0
-
-		if use python; then
-			export PYTHON_BIN_PATH="${PYTHON}"
-			export PYTHON_LIB_PATH="$(python_get_sitedir)"
-		else
-			export PYTHON_BIN_PATH="$(which python)"
-			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
-		fi
-
-		export TF_NEED_CUDA=$(usex cuda 1 0)
-		export TF_DOWNLOAD_CLANG=0
-		export TF_CUDA_CLANG=0
-		export TF_NEED_TENSORRT=0
-		if use cuda; then
-			export TF_CUDA_PATHS="${EPREFIX}/opt/cuda"
-			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
-			export TF_CUDA_VERSION="$(cuda_toolkit_version)"
-			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
-			einfo "Setting CUDA version: $TF_CUDA_VERSION"
-			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
-
-			if [[ $(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
-		local SYSLIBS=(
-			absl_py
-			astor_archive
-			astunparse_archive
-			boringssl
-			com_github_googleapis_googleapis
-			com_github_googlecloudplatform_google_cloud_cpp
-			com_github_grpc_grpc
-			com_google_protobuf
-			curl
-			cython
-			dill_archive
-			double_conversion
-			enum34_archive
-			flatbuffers
-			functools32_archive
-			gast_archive
-			gif
-			hwloc
-			icu
-			jsoncpp_git
-			libjpeg_turbo
-			lmdb
-			nasm
-			nsync
-			opt_einsum_archive
-			org_sqlite
-			pasta
-			pcre
-			png
-			pybind11
-			six_archive
-			snappy
-			tblib_archive
-			termcolor_archive
-			typing_extensions_archive
-			wrapt
-			zlib
-		)
-
-		export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
-		export TF_IGNORE_MAX_BAZEL_VERSION=1
-
-		# This is not autoconf
-		./configure || die
-
-		echo 'build --config=noaws --config=nohdfs' >> .bazelrc || die
-		echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die
-
-		for cflag in $($(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
-
-	if use python; then
-		python_setup
-		BUILD_DIR="${S}-${EPYTHON/./_}"
-		cd "${BUILD_DIR}"
-	fi
-
-	# fail early if any deps are missing
-	ebazel build -k --nobuild \
-		//tensorflow:libtensorflow_framework.so \
-		//tensorflow:libtensorflow.so \
-		//tensorflow:libtensorflow_cc.so \
-		$(usex python '//tensorflow/tools/pip_package:build_pip_package' '')
-
-	ebazel build \
-		//tensorflow:libtensorflow_framework.so \
-		//tensorflow:libtensorflow.so
-	ebazel build //tensorflow:libtensorflow_cc.so
-
-	do_compile() {
-		ebazel build //tensorflow/tools/pip_package:build_pip_package
-	}
-	BUILD_DIR="${S}"
-	cd "${BUILD_DIR}"
-	use python && python_foreach_impl run_in_build_dir do_compile
-	ebazel shutdown
-}
-
-src_install() {
-	local i j
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	do_install() {
-		einfo "Installing ${EPYTHON} files"
-		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
-		mkdir -p "${srcdir}" || die
-		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
-		cd "${srcdir}" || die
-		esetup.py install
-
-		# libtensorflow_framework.so is in /usr/lib already
-		rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die
-		rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die
-		python_optimize
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir do_install
-
-		# Symlink to python-exec scripts
-		for i in "${ED}"/usr/lib/python-exec/*/*; do
-			n="${i##*/}"
-			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
-		done
-
-		python_setup
-		local BUILD_DIR="${S}-${EPYTHON/./_}"
-		cd "${BUILD_DIR}" || die
-	fi
-
-	einfo "Installing headers"
-	ebazel build //tensorflow:install_headers
-	ebazel shutdown
-	insinto /usr/include/${PN}/
-	doins -r bazel-bin/tensorflow/include/*
-
-	einfo "Installing libs"
-	# Generate $(tc-getPKG_CONFIG) file
-	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc ${PN}_cc.pc
-
-	for l in libtensorflow{,_framework,_cc}.so; do
-		dolib.so bazel-bin/tensorflow/${l}
-		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1)
-		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3)
-	done
-
-	einstalldocs
-}
diff --git a/sci-libs/tensorflow/tensorflow-2.5.0-r1.ebuild b/sci-libs/tensorflow/tensorflow-2.5.0-r1.ebuild
index 1a9cf3d0793b..5f4f341f0cbb 100644
--- a/sci-libs/tensorflow/tensorflow-2.5.0-r1.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.5.0-r1.ebuild
@@ -87,10 +87,8 @@ RDEPEND="
 	sys-libs/zlib
 	>=sys-apps/hwloc-2
 	cuda? (
-		|| (
-			( =dev-util/nvidia-cuda-toolkit-11.1*[profiler] =dev-libs/cudnn-8* )
-			( =dev-util/nvidia-cuda-toolkit-11.2*[profiler] =dev-libs/cudnn-8* )
-		)
+		=dev-util/nvidia-cuda-toolkit-11*[profiler]
+		=dev-libs/cudnn-8*
 	)
 	mpi? ( virtual/mpi )
 	python? (
@@ -145,6 +143,9 @@ 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"
@@ -187,6 +188,8 @@ 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
@@ -356,7 +359,7 @@ src_compile() {
 }
 
 src_install() {
-	local i j
+	local i l
 	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
 	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
 
diff --git a/sci-libs/tensorflow/tensorflow-2.5.0.ebuild b/sci-libs/tensorflow/tensorflow-2.5.0.ebuild
deleted file mode 100644
index 3e640b929a91..000000000000
--- a/sci-libs/tensorflow/tensorflow-2.5.0.ebuild
+++ /dev/null
@@ -1,410 +0,0 @@
-# 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} )
-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.28:=
-	net-misc/curl
-	sys-libs/zlib
-	>=sys-apps/hwloc-2
-	cuda? (
-		|| (
-			( =dev-util/nvidia-cuda-toolkit-11.1*[profiler] =dev-libs/cudnn-8* )
-			( =dev-util/nvidia-cuda-toolkit-11.2*[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}"
-
-DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
-CHECKREQS_MEMORY="5G"
-CHECKREQS_DISK_BUILD="10G"
-
-get-cpu-flags() {
-	local i f=()
-	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
-	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
-		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
-	done
-	use cpu_flags_x86_fma3 && f+=( -mfma )
-	echo "${f[*]}"
-}
-
-pkg_setup() {
-	ewarn "TensorFlow 2.0 is a major release that contains some incompatibilities"
-	ewarn "with TensorFlow 1.x. For more information about migrating to TF2.0 see:"
-	ewarn "https://www.tensorflow.org/guide/migrate"
-
-	local num_pythons_enabled
-	num_pythons_enabled=0
-	count_impls() {
-		num_pythons_enabled=$((${num_pythons_enabled} + 1))
-	}
-	use python && python_foreach_impl count_impls
-
-	# 10G to build C/C++ libs, 5G per python impl
-	CHECKREQS_DISK_BUILD="$((10 + 6 * ${num_pythons_enabled}))G"
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	# Only unpack the main distfile
-	unpack "${P}.tar.gz"
-	unpack tensorflow-patches-${PVR}.tar.bz2
-	bazel_load_distfiles "${bazel_external_uris}"
-}
-
-src_prepare() {
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	append-flags $(get-cpu-flags)
-	bazel_setup_bazelrc
-
-	eapply "${WORKDIR}"/patches/*.patch
-
-	# Relax version checks in setup.py
-	sed -i "/^    '/s/==/>=/g" tensorflow/tools/pip_package/setup.py || die
-	sed -i "/config_googleapis/d" 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 j
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
-
-	do_install() {
-		einfo "Installing ${EPYTHON} files"
-		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
-		mkdir -p "${srcdir}" || die
-		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
-		cd "${srcdir}" || die
-		esetup.py install
-
-		# libtensorflow_framework.so is in /usr/lib already
-		rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die
-		rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die
-		python_optimize
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir do_install
-
-		# Symlink to python-exec scripts
-		for i in "${ED}"/usr/lib/python-exec/*/*; do
-			n="${i##*/}"
-			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
-		done
-
-		python_setup
-		local BUILD_DIR="${S}-${EPYTHON/./_}"
-		cd "${BUILD_DIR}" || die
-	fi
-
-	einfo "Installing headers"
-	ebazel build //tensorflow:install_headers
-	ebazel shutdown
-	insinto /usr/include/${PN}/
-	doins -r bazel-bin/tensorflow/include/*
-
-	einfo "Installing libs"
-	# Generate $(tc-getPKG_CONFIG) file
-	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc ${PN}_cc.pc
-
-	for l in libtensorflow{,_framework,_cc}.so; do
-		dolib.so bazel-bin/tensorflow/${l}
-		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1)
-		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3)
-	done
-
-	einstalldocs
-}
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index fe0a2ee3f4bc..d584ca0c0a20 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -1,10 +1,12 @@
 DIST votca-tools-1.5.1.tar.gz 129629 BLAKE2B ab68b38241d2c065939cf0b2e08603eaaccf613454bb64056c3d3d03472501e2079408ce856fbcc7243d51d035acec0b52c9767e2d687234296c7858f1a46fa4 SHA512 c8fe4baee0f4586dbe1a9f5b7c33b7d6b16ef0ebc35b50febfdcb049b09cd150dec3a5e9b98b43430db66f866dd01c1776f6777f01d227246c9d7b7ca879ea72
 DIST votca-tools-1.6.4.tar.gz 109929 BLAKE2B 8bc55fcd0a021002f11d412440a369a169c3c62ae5978781010de0a05502e43ed1ccbe5066e3d46ac8ef6fd0c1471baca70d35f6468ccbfd480dc0fa6f2b5047 SHA512 7a334071086e755960a3bd938c1baa1979c4cc9cd8f865af00540fa45365bf1c3153ffb8a5a5948618c47ebafcda9ecc62850d44ea06b7f35ac4587bd423439a
 DIST votca-tools-2021.1.tar.gz 115082 BLAKE2B 994105769e9718fc4f6832fb88a958d0a769660a21d9de36d52e9f1ce3cf9f66d26cb138f300de8285117fb87890a7ace4fc5be5dfa1ec41b82ceff9bd680728 SHA512 9770f1e96b489413577e41858e659f11c0adc79070ae1058102c2ad2a771c3222fcdffd8646bae75b5d05450a7fa3b49eee7fce1ae16718dd809ff729b3dd25e
+DIST votca-tools-2021.2.tar.gz 115115 BLAKE2B 9ce16d96b6da7ee9cf9be60a69536555d21eebdad2260100bf35a0c4fe0a5b8cb76c2a3b54476fd843f5428ec5fb3fd33ae79b9fd6b27a90530637c550f06712 SHA512 84e756df4c6e355e149fd105835cfb0fd03935c824e2f7e4149ad92ed6fa81d5a43a7dd6aa532b5ee6e4a79794a94db08f8533e9f0cf99afa604c5ad9f7cb133
 DIST votca-tools-2021.tar.gz 114974 BLAKE2B 9f707a901b83f0d8a6c7e5c9b43b135c7539cf4f1fa44a4ed1a5c8f2f7066e1241515fc025ea436f2e52e6bf4aefb7c9a15575e8a588845dda7fbb6717f50b7e SHA512 5ddcbe49b1898713fa292655efbb2a1c081a7f98c9bae3ef37b273e0db49eecb3800b865221883d610802923132d57d5847cc35ddb008de4eb180f4c30db3dbf
 EBUILD votca-tools-1.5.1.ebuild 1087 BLAKE2B 00c2358c8c4e36c34dcf359cbfb8cf9962ca5cdf413fa78b7c86fafc6333a4c4ed01892e18a91a2d0bb8b0bb7f3b1c527510eb207cb7ddd87e557b8489b13f0d SHA512 b3ca29f58b0c65642985506cf3f32c6850483ba7e8e0763cc9194957523931e9a6f51c3a441ffcd550f154bb6ac6f234a244c16bb431ab29feb93c242bb0cc53
 EBUILD votca-tools-1.6.4.ebuild 749 BLAKE2B d5cd0bec7f6d8e375e1786d1c44c006276a9be8912498ae5b5f169bf9d44b097725915d44c1a2d55bd7f287182e597ad1eb4d35796544a971c47871c2109f106 SHA512 1f372e97bcd60d296aa9cc464ba23690ab9d8bed56ac6831f126bee24f3be33d1bf3cc1a5dcd2a90695dd38bc032022de1663e4f014a18068fb7bdf75c822d68
 EBUILD votca-tools-2021.1.ebuild 855 BLAKE2B f635ba0f513812a88ca1945ba50da22213102c6c79a92a7b4cfd0069f70d72058c1ad51586c9e3385013369e3f6c71b7c78a8d97ac3e5c9c3a37d76428db0ee2 SHA512 068dc366b9b2a6858a5ce27cfcc7d949a361992f834b7621fc71d80a30ece2c5e05b9e127a506b88fb295befafb25c38661e3cdc936cfc9b5c9f881177aac4e4
+EBUILD votca-tools-2021.2.ebuild 855 BLAKE2B f635ba0f513812a88ca1945ba50da22213102c6c79a92a7b4cfd0069f70d72058c1ad51586c9e3385013369e3f6c71b7c78a8d97ac3e5c9c3a37d76428db0ee2 SHA512 068dc366b9b2a6858a5ce27cfcc7d949a361992f834b7621fc71d80a30ece2c5e05b9e127a506b88fb295befafb25c38661e3cdc936cfc9b5c9f881177aac4e4
 EBUILD votca-tools-2021.ebuild 792 BLAKE2B f185fed01b8cac544c15627419534edb811e9a2d3f8d418d4487396db7c566f4f171f2fdfe41ee650a0ede653ac0b2bb43f7a17e79d404ec6d15d07314b433b0 SHA512 cdd7bd917b6d5dfe476d46e22d4d821b709513116b73c41a71f5f9c1a5e2b0dace7f381788f3f0baf22c3dd945904203ef433ea67d32a23eea98ce408355bb97
 EBUILD votca-tools-9999.ebuild 855 BLAKE2B f635ba0f513812a88ca1945ba50da22213102c6c79a92a7b4cfd0069f70d72058c1ad51586c9e3385013369e3f6c71b7c78a8d97ac3e5c9c3a37d76428db0ee2 SHA512 068dc366b9b2a6858a5ce27cfcc7d949a361992f834b7621fc71d80a30ece2c5e05b9e127a506b88fb295befafb25c38661e3cdc936cfc9b5c9f881177aac4e4
 MISC metadata.xml 456 BLAKE2B 872b69b5cc95376bf9a28d0c1a16ae7fa52b3b0c356ffef0f70f69ed95da623a335edf4e7917da06880747c469dce762ba5534e3c5854264d8b6895f530b33a5 SHA512 741e6734a956099207e96de6d1fce8db9601d0d3582130a2c45b6a7cb7b140ef56a300483b392d556d303aafbd39833e4f4dff7fd4d6605d39eb8d9a88c8b6aa
diff --git a/sci-libs/votca-tools/votca-tools-2021.2.ebuild b/sci-libs/votca-tools/votca-tools-2021.2.ebuild
new file mode 100644
index 000000000000..184243331d2d
--- /dev/null
+++ b/sci-libs/votca-tools/votca-tools-2021.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux"
+	S="${WORKDIR}/${P#votca-}"
+fi
+
+DESCRIPTION="Votca tools library"
+HOMEPAGE="https://www.votca.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-cpp/eigen-3.3
+	dev-libs/boost:=
+	dev-libs/expat
+	sci-libs/fftw:3.0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DOCS=( NOTICE README.rst CHANGELOG.rst )
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_RC_FILES=OFF
+		-DENABLE_TESTING=$(usex test)
+		-DCMAKE_DISABLE_FIND_PACKAGE_MKL=ON
+	)
+	cmake_src_configure
+}