gentoo resync : 22.12.2021

55 files changed, 1670 insertions, 1845 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 25d02eb8f1e8..fb7b9b8c41ea 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/bliss/Manifest b/sci-libs/bliss/Manifest
index a2c5a4c60d83..2f4f163c0dc9 100644
--- a/sci-libs/bliss/Manifest
+++ b/sci-libs/bliss/Manifest
@@ -3,6 +3,9 @@ AUX bliss-0.73-clang.patch 457 BLAKE2B 2875a16231e17d6cb8079fc67ad74df69b126d626
 AUX bliss-0.73-error.patch 14317 BLAKE2B b053cf310604c57fb4a51d3c9dee8f780b7ad55d8c2b955cb033ac342f64d50aa18c064604f68206c8fce8c08f89bdb0faeb48701c8255beff1034326f93e261 SHA512 d4adcd652016d4b62e4b366cdbd5bd60f1dbaf89619e1d8d4dad6092a3dbb4e27e12aa13c1fc1f12481f144696b2e1392ecbc67dab0485959450d39013613a14
 AUX bliss-0.73-rehn.patch 1669 BLAKE2B 6e109c0bc59c0000603dd59467b989a572f502aa352a4b09cec85a608f90163175cb4babcfbc8495a246e8a3406186feeda366131c3c637a9aab93d9c698d36e SHA512 ae70ebcd3d9ef2f744e951dfb9cc2b48bee741ee7ead557a0fdfdacbd1895b015bb9a8da986fa36b084d4c92f7a28adad1df14c0814847d84c46f73cb69123b7
 AUX bliss-0.73.1.in 1482 BLAKE2B 740fc9aa59ab9ea7819a1785aa3f0609774f0b89b08ffe3276b002f0f55eb5332ffda4952a54aa91f621ec533e1cf08b734a9686ca727e528a311d209401782c SHA512 7eb1d08f9c40358ef986d8fe31d42eb90dc57879cb399f45dcf5df85eecdc6fd86208f1bf06c21a6875e5a3fb5a634d818edd75ce2ccd855910feeb22b714f4b
+AUX bliss-0.77-install.patch 822 BLAKE2B df619f62b9de4d7bcf988c47b938586a4d5f2c648fd6ec3f04fd7dde44d63b8d0724a936cb6c139d04a4d8d854eb114899c4c15eacf7ccbce3192d3bcf33ddd5 SHA512 d3c441569e15dbf5530129c4d0db75f996ced82c94b92d9a44202a31fa49d24c660c983f19d8b6b845018926b54d80d6ab07bfad04e9ac3a1d9559c155b38cdd
 DIST bliss-0.73.zip 94108 BLAKE2B 836184b31fa28db3328c21e7563366a93cf1645b02b96e185838e3c2513393b1d0a54783ca14c6d7f1a1d5055800bc3d7acde3c584e61e66c9ab93936824353b SHA512 30f505945c577d8bcb265a349f5bc9d4dcd96555fa3add285199cdd95ea2710f04409008ff06432daffab62c132e884845eae7f823191407906202862509e05d
+DIST bliss-0.77.zip 117888 BLAKE2B ce4b2fa568c5520fe41748bf59a493af1c33ec9cc0732aca5e5ba657ca726e118e26763355778e3def5716d62e7d3aceceb592ef67e5e148c250d3ffffab67d7 SHA512 d210f137e614bca7cf0d88851d0c62292bf479b687bca6a25d9e42661825f882a4ff8c74c96a965bd9d4f246a1bda6b90cef64894914e6f7b17db6bf4a8f4b17
 EBUILD bliss-0.73-r2.ebuild 1072 BLAKE2B 33e191a48064d3a02b3626f004e2a803d998dfa21d0e1fd699d71b70756f85e1d7d43a0f4425bab89820b24657f5fee0f2fd703bcf782ead4c9fd281444cdb60 SHA512 5c059e2681445fc77f9828c508ef832d0072410c984c9962b391501744c70df8b9e4ce8c31d820071aa4279d1a45c781463a7322add743d955235bcffd0a42a0
+EBUILD bliss-0.77.ebuild 645 BLAKE2B 672e86c58b1d1bad051788077ba66d7aae3d203e60cd8b232c9d7283739ade856aafb164f9c4e4f48ddc9e7faa7f5df1ac3233832d62d96db6b7bf9f3a600fa7 SHA512 e0ce37cbe0e80144a74a5efd67d42151c018648d79adeb8271c1adae3b25abc60d56afe0a81373bbbcd8cde636e5479c8eda7f8206e23dcc2cbc6a2b15885bd1
 MISC metadata.xml 258 BLAKE2B 860964b9257d6437e63725fa62b938b40a4b80018b8bcfa3386f53c1c6c1f5821ae70c7e88646036c5f4994ea6db89dee0242f61d1d360f139a419c54786ffd8 SHA512 74b70b0b8db56c49badc858fa51b04c9839a10381bb8d13480509467f9729df1c7bc199b06398c872e10d29d6d8bea8e7b10ded491f7f1c149c7a9193d6cfa9b
diff --git a/sci-libs/bliss/bliss-0.77.ebuild b/sci-libs/bliss/bliss-0.77.ebuild
new file mode 100644
index 000000000000..88a4d042c220
--- /dev/null
+++ b/sci-libs/bliss/bliss-0.77.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+SRC_URI="https://users.aalto.fi/~tjunttil/${PN}/downloads/${P}.zip"
+DESCRIPTION="Compute Automorphism Groups and Canonical Labelings of Graphs"
+HOMEPAGE="https://users.aalto.fi/~tjunttil/bliss/index.html"
+
+LICENSE="LGPL-3"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="gmp"
+
+RDEPEND="gmp? ( dev-libs/gmp:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+PATCHES=( "${FILESDIR}/${PN}-0.77-install.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_GMP="$(usex gmp)"
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/bliss/files/bliss-0.77-install.patch b/sci-libs/bliss/files/bliss-0.77-install.patch
new file mode 100644
index 000000000000..caab14aa40f6
--- /dev/null
+++ b/sci-libs/bliss/files/bliss-0.77-install.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 01ed093..cfdb0a6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,3 +62,27 @@ if(USE_GMP)
+   target_link_libraries(bliss-executable ${GMP_LIBRARIES})
+ endif(USE_GMP)
+ set_target_properties(bliss-executable PROPERTIES OUTPUT_NAME bliss)
++
++include(GNUInstallDirs)
++
++set(
++  BLISS_HEADERS
++  src/bliss_C.h
++  src/uintseqhash.hh
++  src/abstractgraph.hh
++  src/stats.hh
++  src/digraph.hh
++  src/defs.hh
++  src/heap.hh
++  src/graph.hh
++  src/partition.hh
++  src/kqueue.hh
++  src/utils.hh
++  src/orbit.hh
++  src/timer.hh
++  src/bignum.hh
++)
++
++install(TARGETS bliss-executable RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++install(TARGETS bliss LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(FILES ${BLISS_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bliss)
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index c78b302cf7a1..ae8531cee599 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -1,6 +1,6 @@
 AUX dealii-9.1.1-no-ld-flags.patch 1044 BLAKE2B fed995fbd5563bfee6b4dd232d5d9aaecd8f0d206f06679b5d79022420c83ac2752414417499ac9181c25ddc594e492bf8d6b6af19fdfd1f047e7e089193de5d SHA512 15346b31f4ac5df3b1a3a3dcb215d4bd49e3e67480c86d4c78dbd5d27ae33f6cfa8b03fdc561e38090a2c22ae8ba71d13cd9b1bbdda3eedefd498f5cedfd0a09
 DIST dealii-9.3.1-offline_documentation.tar.gz 342389060 BLAKE2B 71b47816dd22f490168f91c667308ecf10d5733bb4e4d6f7f214dfa729f47e6f44bf32382167f2f6c864038d04c994cab7ef91ae647b4188c53995c5c2904bf3 SHA512 7ab70b7821924a4383f2d46bcb44e702858206a8444870d3e2282d726b2c1cf3009f615888206312aed34eae9595ff19664da422e33c47720cce5c5fd37c1e18
 DIST dealii-9.3.1.tar.gz 24459280 BLAKE2B c7f1d461017da24efd6f3247217fd1b889e0cbf2ac62c3fd305e03aed90d5ba82b58ceb84d34a84608b833b734e12abc77a63693aaa6eed767b4f5f157233ba0 SHA512 c3ba3e16fa4792bb4f3e85163e67b08271c84faff72c49b858a955851401adf2499e278790803061a61c4024964f6da3f0ef7b09c0370d8d0b5af16b7c3bdaef
-EBUILD dealii-9.3.1-r1.ebuild 5427 BLAKE2B b31fee6ba46141d188049a9afdf2ad5d0b2669c920508f339993cff86a1c46bc42e8b87186660588fb15046a12cb8865196f242b56245b9036cb1968dc64aebd SHA512 6c3843e330b044cac3db878dc64ae28af1d268ae5c7bfa9b1bfb321ad630c63ae94cebf3fbbd9bae382f8de9b86eb7bdfde16f418947c8008baf1eaaae8e894c
-EBUILD dealii-9999.ebuild 5381 BLAKE2B e62b374b535c2d0811dab0815a89c6dba7a9cf5e53d78dc57819f9ea64116886ef1d91a8cf5f5d742afe9f58907a61a40e3bf36fa783e8d249017c5f503c6c44 SHA512 c2ca23e70f8c6286b4157bdabcbc5b19c123c65f87c41298ab96f7299910fb14ad4cf6937b6eede901bffb0e356bdaa3898ac696f86cc5928d768c911682fa3c
+EBUILD dealii-9.3.1-r3.ebuild 5439 BLAKE2B fb0184863504e4a490b5d170d2eef59951846a84b5ea3d002939096a6b7d5bbb7832a36771e06ca1790fca9528d6b4a4b1b723e0185d91270c6367d8ab35a429 SHA512 65bdbce63d914189a6fbefbc149f811f6416d194769aa49f58b74fe2bb2f8b9b7499348334fecfec6a3e0f5e76861203d5eb00890c0de3153a3fdf8f82118ad7
+EBUILD dealii-9999.ebuild 5410 BLAKE2B f43901b5bba82076a93039f408ec7829eab104c6b1e1efd09beb583037532364ea00fe65501abfeb8db96adc6c24ecb6c2875fa65220538091527384024f20b3 SHA512 165db04bca48076e6e52641fe8300f83a75bc30f54031bce366027bd93c93d97826eb51462b141c800190f1003800520e4f03c91ad268c25d6ee74ed178219ad
 MISC metadata.xml 2440 BLAKE2B 60d4ffa5f20f88642507203f63dfbbe347ce6399cff96bf7728b929b59fc8d30e8046b7c002d48e59cfac1df73fe8f78b7fd58780673b645cf6549cb56580f39 SHA512 da2925396422db90cc0770faaad06e4bead71a34ef32416e4ab507e0c67d79b75824d1f95d24f9f0c46e2b8ea577229f2fbae6aff163090e058d2df6269b2c87
diff --git a/sci-libs/dealii/dealii-9.3.1-r1.ebuild b/sci-libs/dealii/dealii-9.3.1-r3.ebuild
index d04780a09d95..c52bce06b69d 100644
--- a/sci-libs/dealii/dealii-9.3.1-r1.ebuild
+++ b/sci-libs/dealii/dealii-9.3.1-r3.ebuild
@@ -45,14 +45,14 @@ REQUIRED_USE="
 # accessible. Just fix the version for the time being.
 CAS_VERSION=7.5.3
 
-RDEPEND="dev-libs/boost:=
+RDEPEND="<dev-libs/boost-1.77.0:=
 	app-arch/bzip2
 	sys-libs/zlib
 	dev-cpp/tbb:=
 	adolc? ( sci-libs/adolc )
 	arpack? ( sci-libs/arpack[mpi=] )
 	assimp? ( media-libs/assimp )
-	cuda? ( dev-util/nvidia-cuda-sdk )
+	cuda? ( dev-util/nvidia-cuda-toolkit )
 	ginkgo? ( sci-libs/ginkgo )
 	gmsh? ( sci-libs/gmsh )
 	gsl? ( sci-libs/gsl:= )
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 3b0443a7d4cc..4717fd8600ce 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -46,6 +46,7 @@ REQUIRED_USE="
 CAS_VERSION=7.5.3
 
 RDEPEND="dev-libs/boost:=
+	!~dev-libs/boost-1.77.0
 	app-arch/bzip2
 	sys-libs/zlib
 	dev-cpp/cpp-taskflow
@@ -53,7 +54,7 @@ RDEPEND="dev-libs/boost:=
 	adolc? ( sci-libs/adolc )
 	arpack? ( sci-libs/arpack[mpi=] )
 	assimp? ( media-libs/assimp )
-	cuda? ( dev-util/nvidia-cuda-sdk )
+	cuda? ( dev-util/nvidia-cuda-toolkit )
 	ginkgo? ( sci-libs/ginkgo )
 	gmsh? ( sci-libs/gmsh )
 	gsl? ( sci-libs/gsl:= )
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index a60f9fe023e7..717c23e71fc2 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,6 +1,6 @@
 DIST fftw-3.3.10.tar.gz 4144100 BLAKE2B 3663872bd95a01d2c79af185f53918e1d1a9c91c620082402772c07f25b9b77d4920a78dc686fac6b51aa961b8d62b7e2cef3f3031e096bed40ced80b59b29d5 SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40
 DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf
-EBUILD fftw-3.3.10.ebuild 4012 BLAKE2B 4acc326f3ea2c3d68018aada983a6df9a82a60e8deaf2072b1c0649c4b6a673f3f9a96bfa2747d092de9c99199de4aed38bd07ce46bb8d9b5818cc4feed3ca29 SHA512 861ba96a2f2952dfc72b92db0647719f48443f11e7fbf39ebfe699acc231da40fcb325d29642b535811aa5bc3eb227afdb6eab64e547b85c23859e8807f5e844
+EBUILD fftw-3.3.10.ebuild 4004 BLAKE2B bf41d60c5071ba5fd180ca9ee2dc4ba08ac7b07f777cac2e3ca677496bbcd709b3727ce37f242a942f6b14ebd321f8ed731e38e97f0e921909370318f0ffead8 SHA512 b34096cf27385c8f87b8fb2bcac797ab4bf579392e913186215baddaa88240b2aa7c3ed2d9c1ba403b73511938d3b8246110b59fff617b15402bf48968280057
 EBUILD fftw-3.3.9.ebuild 4145 BLAKE2B 0dd89a7a96ecb4209b9e45b11300b8b66b92c9123ae02965c243c6b07ed624e1ae836a9e673d331bc753a6b2309e93d8aa058b3a0d3f28d03aac8a6d52e19814 SHA512 4e668945d603046a785674dad1968bdb2b9d8369a5fd6c69af553cb02656ebc1237b3e96f287123df8a1ccd0612645db8610911b404a880af61493f8ac15375d
 EBUILD fftw-9999.ebuild 4012 BLAKE2B 4acc326f3ea2c3d68018aada983a6df9a82a60e8deaf2072b1c0649c4b6a673f3f9a96bfa2747d092de9c99199de4aed38bd07ce46bb8d9b5818cc4feed3ca29 SHA512 861ba96a2f2952dfc72b92db0647719f48443f11e7fbf39ebfe699acc231da40fcb325d29642b535811aa5bc3eb227afdb6eab64e547b85c23859e8807f5e844
 MISC metadata.xml 960 BLAKE2B f9bd9e8190241bb5c757b521fc7c0d9adb608d3f616f4bd32c7fdba895a464e49c6eb3080d849c70ece5993f2999eaa22b08033954b60c33834ea1af8b646df7 SHA512 21ffca8724d5e4a73d9545bd1a73dad15d1341cc15a5340172315d1ace97cf5fda30973685890b7b18255feeb67f80317fde1b9d951c4f114b1d5e45a1587a7c
diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
index f3fa7dd693b0..edbb485453c1 100644
--- a/sci-libs/fftw/fftw-3.3.10.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index a743d64b04fc..088e24358394 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -4,18 +4,8 @@ AUX gdal-3.2.1-libdir.patch 20206 BLAKE2B 1b8c737246b25e8ea56855ec8cd41dc8bcc3ee
 AUX gdal-3.3.0-configure-geos-disable.patch 6509 BLAKE2B 1a22658e0f0bb83dc409c82d9b25dc8d6ae5ee7c5551c500ede654884071c48862c0392ef2b129c40546fed1af9ba7cb756a0fa4e05709481a851be8d87d2df1 SHA512 5da36ea9ced5826ddc748141ad098c2c2151a9ea68c561105eb41530c76cf6a9094a4683310949931cfac58c91511f6219240d7c18f0348e1e0841683c384c55
 AUX gdal-3.3.0-libdir.patch 19617 BLAKE2B c0fd86a2d79155ee17a8ae69ae59876b76d9a4a35c79b896d838edcd497f17bf35ddfd3ab6de8e792a87ae8c012a91b1d2f0351d47e89f7d7fcf88a72647d38a SHA512 ee74ee86b8249abfbbce6e114f3a5f1c79a30a86aeb45761ca8637ebcae0e0df4c4961b292fdd1f49865da6445a8afaf161d80c28849dde6adf72cc3ed092852
 AUX gdal-3.3.2-poppler-21.10.0.patch 1226 BLAKE2B 7475f40216fcf14417c5bb916b5508935e518e4428c8134099109b85af966935a83f807039ac2617f0a437ff1594ded0d403d447ceacdf53e77f74973bf866f1 SHA512 760f6ba7746496b2f72562ff3dad6067f67d1a612ecb713c1b9526dc335f4ecdcd97d406e8e6f395ad10b5a66a1febbe12579a52aab3d4518807999def361de4
-DIST gdal-3.2.1.tar.gz 18953600 BLAKE2B b47994849bcf6bc2b2f53daabb85ef99cdc9ce2a06134bc591652bf7e5304d503701d2b07cae520ca71ad6238dd0b073d2034743e59b072fc5eb50c13bc143e6 SHA512 152dd97464a8242ea1da7a3a215b1d3326bab5aa4b0884fcab6880da460577c80075f87ea7b9513d796e899e98b40701c0b6a63f1e5275607905480ec547e688
-DIST gdal-3.2.2.tar.gz 18959415 BLAKE2B 001347ee12c72fe4d9cfa27adb427624f80e5b16eeca01510166e3d74c36eb00da72c27d8582ccda124151143561c29b8e59dc3dd800c474b77991417b33acd1 SHA512 d7ff8773d3f1cb894fce89f56a3d4355769f1113eefb1367a3a543ced750e2c42618a4a1deef3a338ddd4d33b7332ae962b2d793f8c0b97e31ed4b84cb2df2d5
-DIST gdal-3.2.3.tar.gz 18970990 BLAKE2B 9f2ac15b7e9d2df0393d15734030ec4777579aa01fcf2700958228b24fd50d574f3bd438c03e767549614a699c362b31f38cbb0f32ceb8056c9b55fab11ecfec SHA512 985a058a53f676f7d49a96d1a48d4f93c5da8548012bf81345afde03d8044022b210484290bca70c3d7a1ef3b0087d9e17c636b5badd1e0816c1f59b1bf21ee8
-DIST gdal-3.3.0.tar.gz 19572446 BLAKE2B afc7ce3c2191fb7607fdf3a01e7ed3e83c601fa063019015f666e0c550e4e42129b8782568f20f97422308f95b4e5c3dbd2311d562b7ec0830635e47e7c931b4 SHA512 39505c07aaf4dac587a189a979462101a7acba41e8732031540ebad02e089820658943ebb48c20f4ea56548363033b2db2f03f41c8a91ff5c5997a19b5eb999e
-DIST gdal-3.3.1.tar.gz 19582883 BLAKE2B 328ba9f3c6a2ecca8583648e5f22469d3fbabf8d8676262a15c6debe718be8329ad3899cbe5397dff2896bc9c2500b60834c6a44cd0f5b670828d86838611f0d SHA512 0eb89502f1cebd5dd899fb8f20571952462c45aba6cee1d62ccc820b2fed5202f6c7e7096bd4ca6c0cfcc2de623f00295097a7e33da6ffa5624dcb8a7a0dc682
-DIST gdal-3.3.2.tar.gz 19593819 BLAKE2B ab0919468482d080be9317f7d766ac8b7bd7a534a490a93ee29cab9ea5c68bef3827a256a6d13455d5ee8f4e6cf71a8a42fb173d1543282b04dea59c9378cf22 SHA512 ceacd101f770fecad12fec7fea5ba63c2a6d96413bdaa7f460798704fce1ff7a4f20b0b4a0785c195131aa8ee25990239a9e2da6844010b8f0c575f584d9b4a8
 DIST gdal-3.3.3.tar.gz 19600111 BLAKE2B 2d4558062b35016372d6964884296878fdcef0afa83fb03b10cd902ce101ec52f551d48014d95b391d19b8db13d7ca1d639575b39e9421780f4212bef02dd51f SHA512 c49e4555e598e4182e6419758c31df08d46b8b061480f08be09d61e840057529bd833338eaa8c1ecfe1c6a0cc8cd6a073bf15fa6cdae003e4475485cf3851145
-EBUILD gdal-3.2.1-r1.ebuild 7498 BLAKE2B 9b79a2d74a5bfec4c52c655ab1dc1778add39a315855b6507f3d11ae43056c5530735cc56dc23b65f24fd591291f446f56ad78932691356637832194013b8204 SHA512 aa7ec568bd7c061cfc0e37030912b5ac2e4121ecb331953f03bd58c135d10dcc7bf24ecaa0a77c4597a1813e1feb0ed589657eab22363d04ca15bd0009921612
-EBUILD gdal-3.2.2.ebuild 7723 BLAKE2B 1223e7a57447dc0e948abe14863417b3dc4fbd3154b8e6b34e1eb9fa1a0adc3f2e5cd26e60f0333a19a456907f270baeab5b5c971d47b3be63626c55fa1122dd SHA512 502b3419bd6b3046733036cbe23d5b6aa277c32539c2a8819cb6b6b8a907cffa91eff81cdb75dfe7dfb5465871be4b49db8c7e631520689677c351933bf2b606
-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-r1.ebuild 7740 BLAKE2B 88824a6b876311d97275f10dbf1f49acf14bd9714a93c3055dbcba56d98c695dd48bec11cf177d551483fdfa6cc71f75f42c5a010966afa9863f3b50a79c21ea SHA512 715ccb891b4768f51dcd9549d0e9fd96730eb81b2dc4dac0c61076d8efc1187b67b4b24cdc44eada6c957d4fe91aae77f9763185ef204011ff07cd61a46f987e
-EBUILD gdal-3.3.3.ebuild 7857 BLAKE2B 707a6bcf1a50271a6ee8b9e31d34640f75d74bcb9b78978ac77501c9b7bf8a71d56e64da23be5d64c2a3e9fd2de67fb6a8999a18812a9afc4e80362fb511f08e SHA512 2d5d5547ec9c08a92c766c47169ff3157f5cc107b6585a6cd3cb28938fa831267040ba8abe31f49f41d93613ac0c19a17e0dc7ba6ba0b441ee1d5e573b3617fd
+DIST gdal-3.4.0.tar.gz 20008930 BLAKE2B b4dad7226d2cfee3bdcab9782d2d35355501c1dd830d247099f6a8030311b86e7620e90f7bba675bf49dc47d166ab586fabe45ba02d9d7e9a73829194da6b360 SHA512 e363258172cff9647804be11f28ebec1614ddfbfc6eed72d44700c23aea674267e413099555d25e784d567ea915b5fb9092ff74b98d890dfcb8aae56b0575eb6
+EBUILD gdal-3.3.3.ebuild 7852 BLAKE2B 03a04b87e0099452c748d0400a4c21a9369a04f01948b298a39dd9a938c3b2264e00827b3cf0ca7d7719f35a90974c493fcc5a99efb111789c684249c58dcafd SHA512 28738878e2f1cb78f5ab1a25553e445563a4b17e555bf87808de1ff0d373b6b309ad561d6514e1b9b02f5391bb19c7f0519c31d490d4465f8eccef0f1cbc0945
+EBUILD gdal-3.4.0.ebuild 8033 BLAKE2B cf27f9b230f4fba647892383bd51112a9ba072424a834189569027faea7852476fc2f627837759d99c126d6307deacdf951ddaa2d88dcaf120ef4c8455ef2424 SHA512 9633034b855d9b640de491fc1e9c7d64eb149114787dcebfa76fec083b2772ba45e59cfb87154f35e4ce6544607fff515decc4bd4ce574c237f2ade914498361
 MISC metadata.xml 1623 BLAKE2B af7c9d5cc3c16ffef6fa9ef5dd5cf54ffcd34229d1e82b90e310f9eeccf5a5b4fa2119112b5427b520ce6e964e368aef7313edb3837940bed4b960ced7714fc3 SHA512 ed206877adac0b8b190e0edfb04f48c435d698fd523a14d54a14638b908c9e9452b1a2d394046093f5aa86cb48c611790f56ae511807855eb80bfcd4cc1d425c
diff --git a/sci-libs/gdal/gdal-3.2.1-r1.ebuild b/sci-libs/gdal/gdal-3.2.1-r1.ebuild
deleted file mode 100644
index 7bed137263c6..000000000000
--- a/sci-libs/gdal/gdal-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_OPTIONAL=1
-inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module toolchain-funcs
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="https://gdal.org/"
-SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0/3.2"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="armadillo +aux-xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
-
-REQUIRED_USE="
-	mdb? ( java )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	java? (
-		dev-java/ant-core
-		dev-lang/swig:0
-		>=virtual/jdk-1.7:*
-	)
-	perl? ( dev-lang/swig:0 )
-	python? (
-		dev-lang/swig:0
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	dev-libs/expat
-	dev-libs/json-c:=
-	dev-libs/libpcre
-	dev-libs/libxml2:2
-	dev-libs/openssl:=
-	media-libs/tiff
-	>=sci-libs/libgeotiff-1.5.1-r1:=
-	>=sci-libs/proj-6.0.0:=
-	sys-libs/zlib[minizip(+)]
-	armadillo? ( sci-libs/armadillo:=[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio:= )
-	geos? ( >=sci-libs/geos-3.8.0 )
-	gif? ( media-libs/giflib:= )
-	gml? ( >=dev-libs/xerces-c-3.1 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lzma? ( || (
-		app-arch/xz-utils
-		app-arch/lzma
-	) )
-	mdb? ( dev-java/jackcess:1 )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	ogdi? ( sci-libs/ogdi )
-	opencl? ( virtual/opencl )
-	oracle? ( dev-db/oracle-instantclient:= )
-	pdf? ( app-text/poppler:= )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	spatialite? ( dev-db/spatialite )
-	sqlite? ( dev-db/sqlite:3 )
-	webp? ( media-libs/libwebp:= )
-	xls? ( dev-libs/freexl )
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}
-	java? ( >=virtual/jre-1.7:* )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.3-soname.patch"
-	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
-	"${FILESDIR}/${PN}-3.2.1-libdir.patch"
-)
-
-src_prepare() {
-	default
-
-	# Drop a --prefix hack in the upstream build system
-	# We don't want the line at all, so let's just drop it rather than
-	# trying to put in the right libdir value.
-	# bug #696106
-	sed -e '/\$ADD_PREFIX\/lib/d' \
-		-i configure.ac || die
-
-	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.ac || die
-
-	sed -e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	# SWIG: Use of the include path to find the input file is deprecated and will not work with ccache.
-	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
-		-i swig/python/GNUmakefile || die "sed python makefile failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		# charls - not packaged in Gentoo ebuild repository
-		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-		# bsb - legal issues
-		# ingres - same story as oracle oci
-		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
-		# podofo - we use poppler instead they are exclusive for each other
-		# tiff is a hard dep
-		--includedir="${EPREFIX}"/usr/include/${PN}
-		--disable-lto
-		--disable-static
-		--disable-driver-bsb
-		--disable-driver-mrf
-		--disable-pdf-plugin
-		--enable-shared
-		--enable-driver-grib
-		--with-bash-completion="$(get_bashcompdir)"
-		--with-cpp14
-		--with-crypto
-		--with-cryptopp=no
-		--with-expat
-		--with-geotiff
-		--with-gnm
-		--with-hide-internal-symbols
-		--with-libjson-c="${EPREFIX}"/usr
-		--with-libtiff
-		--with-libtool
-		--with-libz="${EPREFIX}"/usr
-		--without-charls
-		--without-dods-root
-		--without-ecw
-		--without-epsilon
-		--without-fgdb
-		--without-fme
-		--without-gta
-		--without-grass
-		--without-hdf4
-		--without-idb
-		--without-ingres
-		--without-jasper
-		--without-jp2lura
-		--without-jp2mrsid
-		--without-kakadu
-		--without-kea
-		--without-libkml
-		--without-mongocxx
-		--without-mrsid
-		--without-mrsid_lidar
-		--without-msg
-		--without-rasdaman
-		--without-rasterlite2
-		--without-pcraster
-		--without-pdfium
-		--without-perl
-		--without-podofo
-		--without-python
-		--without-qhull
-		--without-sfcgal
-		--without-sosi
-		--without-teigha
-		$(use_enable debug)
-		$(use_with armadillo)
-		$(use_with aux-xml pam)
-		$(use_with curl)
-		$(use_with fits cfitsio)
-		$(use_with geos)
-		$(use_with gif)
-		$(use_with gml xerces)
-		$(use_with hdf5)
-		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
-		$(use_with jpeg)
-		$(use_with jpeg2k openjpeg)
-		$(use_with lzma liblzma)
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
-		$(use_with netcdf)
-		$(use_with oracle oci)
-		$(use_with odbc)
-		$(use_with ogdi ogdi "${EPREFIX}"/usr)
-		$(use_with opencl)
-		$(use_with pdf poppler)
-		$(use_with png)
-		$(use_with postgres pg)
-		$(use_with spatialite)
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-		$(use_with threads)
-		$(use_with webp)
-		$(use_with xls freexl)
-		$(use_with zstd)
-	)
-
-	tc-export AR RANLIB
-
-	if use java; then
-		myconf+=(
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-lib=dlopen
-			$(use_with mdb)
-		)
-	else
-		myconf+=( --without-java --without-mdb )
-	fi
-
-	if use sqlite; then
-		append-libs -lsqlite3
-	fi
-
-	# bug #632660
-	if use ogdi; then
-		append-cflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
-		append-cxxflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -e "s: -rdynamic : :" \
-			-i GDALmake.opt || die "sed LIBS failed"
-	fi
-}
-
-src_compile() {
-	if use perl; then
-		rm "${S}"/swig/perl/*_wrap.cpp || die
-		emake -C "${S}"/swig/perl generate
-	fi
-
-	# gdal-config needed before generating Python bindings
-	default
-
-	if use java; then
-		pushd "${S}"/swig/java > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-
-	if use perl; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null || die
-	fi
-
-	if use python; then
-		rm -f "${S}"/swig/python/*_wrap.cpp || die
-		emake -C "${S}"/swig/python generate
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-
-	use doc && emake docs
-}
-
-src_install() {
-	local DOCS=( NEWS )
-	use doc && local HTML_DOCS=( html/. )
-
-	default
-
-	use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
-
-	if use perl; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		myinst=( DESTDIR="${D}" )
-		perl-module_src_install
-		popd > /dev/null || die
-		perl_delete_localpod
-	fi
-
-	if use python; then
-		# Don't clash with gdal's docs
-		unset DOCS HTML_DOCS
-
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		newdoc swig/python/README.rst README-python.rst
-
-		insinto /usr/share/${PN}/samples
-		doins -r swig/python/samples/.
-	fi
-
-	doman "${S}"/man/man*/*
-	find "${ED}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sci-libs/gdal/gdal-3.2.2.ebuild b/sci-libs/gdal/gdal-3.2.2.ebuild
deleted file mode 100644
index b2536db351b4..000000000000
--- a/sci-libs/gdal/gdal-3.2.2.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_OPTIONAL=1
-inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module toolchain-funcs
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="https://gdal.org/"
-SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0/3.2"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="armadillo +aux-xml curl 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"
-
-REQUIRED_USE="
-	mdb? ( java )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	java? (
-		dev-java/ant-core
-		dev-lang/swig:0
-		>=virtual/jdk-1.7:*
-	)
-	perl? ( dev-lang/swig:0 )
-	python? (
-		dev-lang/swig:0
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	dev-libs/expat
-	dev-libs/json-c:=
-	dev-libs/libpcre
-	dev-libs/libxml2:2
-	dev-libs/openssl:=
-	media-libs/tiff
-	>=sci-libs/libgeotiff-1.5.1-r1:=
-	>=sci-libs/proj-6.0.0:=
-	sys-libs/zlib[minizip(+)]
-	armadillo? ( sci-libs/armadillo:=[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio:= )
-	geos? ( >=sci-libs/geos-3.8.0 )
-	gif? ( media-libs/giflib:= )
-	gml? ( >=dev-libs/xerces-c-3.1 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lzma? ( || (
-		app-arch/xz-utils
-		app-arch/lzma
-	) )
-	mdb? ( dev-java/jackcess:1 )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	ogdi? ( sci-libs/ogdi )
-	opencl? ( virtual/opencl )
-	oracle? ( dev-db/oracle-instantclient:= )
-	pdf? ( app-text/poppler:= )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	spatialite? ( dev-db/spatialite )
-	sqlite? ( dev-db/sqlite:3 )
-	webp? ( media-libs/libwebp:= )
-	xls? ( dev-libs/freexl )
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}
-	java? ( >=virtual/jre-1.7:* )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.3-soname.patch"
-	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
-	"${FILESDIR}/${PN}-3.2.1-libdir.patch"
-)
-
-src_prepare() {
-	default
-
-	# Drop a --prefix hack in the upstream build system
-	# We don't want the line at all, so let's just drop it rather than
-	# trying to put in the right libdir value.
-	# bug #696106
-	sed -e '/\$ADD_PREFIX\/lib/d' \
-		-i configure.ac || die
-
-	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.ac || die
-
-	sed -e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	# SWIG: Use of the include path to find the input file is deprecated and will not work with ccache.
-	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
-		-i swig/python/GNUmakefile || die "sed python makefile failed"
-
-	# autoconf 2.70+
-	# bug #775209
-	config_rpath_update .
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		# charls - not packaged in Gentoo ebuild repository
-		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-		# bsb - legal issues
-		# ingres - same story as oracle oci
-		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
-		# podofo - we use poppler instead they are exclusive for each other
-		# tiff is a hard dep
-		--includedir="${EPREFIX}"/usr/include/${PN}
-		--disable-lto
-		--disable-static
-		--disable-driver-bsb
-		--disable-driver-mrf
-		--disable-pdf-plugin
-		--enable-shared
-		--enable-driver-grib
-		--with-bash-completion="$(get_bashcompdir)"
-		--with-cpp14
-		--with-crypto
-		--with-cryptopp=no
-		--with-expat
-		--with-geotiff
-		--with-gnm
-		--with-hide-internal-symbols
-		--with-libjson-c="${EPREFIX}"/usr
-		--with-libtiff
-		--with-libtool
-		--with-libz="${EPREFIX}"/usr
-		--without-charls
-		--without-dods-root
-		--without-ecw
-		--without-epsilon
-		--without-fgdb
-		--without-fme
-		--without-gta
-		--without-grass
-		--without-hdf4
-		--without-idb
-		--without-ingres
-		--without-jasper
-		--without-jp2lura
-		--without-jp2mrsid
-		--without-kakadu
-		--without-kea
-		--without-libkml
-		--without-mongocxx
-		--without-mrsid
-		--without-mrsid_lidar
-		--without-msg
-		--without-rasdaman
-		--without-rasterlite2
-		--without-pcraster
-		--without-pdfium
-		--without-perl
-		--without-podofo
-		--without-python
-		--without-qhull
-		--without-sfcgal
-		--without-sosi
-		--without-teigha
-		$(use_enable debug)
-		$(use_with armadillo)
-		$(use_with aux-xml pam)
-		$(use_with curl)
-		$(use_with cpu_flags_x86_avx avx)
-		$(use_with cpu_flags_x86_sse sse)
-		$(use_with cpu_flags_x86_ssse3 ssse3)
-		$(use_with fits cfitsio)
-		$(use_with geos)
-		$(use_with gif)
-		$(use_with gml xerces)
-		$(use_with hdf5)
-		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
-		$(use_with jpeg)
-		$(use_with jpeg2k openjpeg)
-		$(use_with lzma liblzma)
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
-		$(use_with netcdf)
-		$(use_with oracle oci)
-		$(use_with odbc)
-		$(use_with ogdi ogdi "${EPREFIX}"/usr)
-		$(use_with opencl)
-		$(use_with pdf poppler)
-		$(use_with png)
-		$(use_with postgres pg)
-		$(use_with spatialite)
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-		$(use_with threads)
-		$(use_with webp)
-		$(use_with xls freexl)
-		$(use_with zstd)
-	)
-
-	tc-export AR RANLIB
-
-	if use java; then
-		myconf+=(
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-lib=dlopen
-			$(use_with mdb)
-		)
-	else
-		myconf+=( --without-java --without-mdb )
-	fi
-
-	if use sqlite; then
-		append-libs -lsqlite3
-	fi
-
-	# bug #632660
-	if use ogdi; then
-		append-cflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
-		append-cxxflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -e "s: -rdynamic : :" \
-			-i GDALmake.opt || die "sed LIBS failed"
-	fi
-}
-
-src_compile() {
-	if use perl; then
-		rm "${S}"/swig/perl/*_wrap.cpp || die
-		emake -C "${S}"/swig/perl generate
-	fi
-
-	# gdal-config needed before generating Python bindings
-	default
-
-	if use java; then
-		pushd "${S}"/swig/java > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-
-	if use perl; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null || die
-	fi
-
-	if use python; then
-		rm -f "${S}"/swig/python/*_wrap.cpp || die
-		emake -C "${S}"/swig/python generate
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-
-	use doc && emake docs
-}
-
-src_install() {
-	local DOCS=( NEWS )
-	use doc && local HTML_DOCS=( html/. )
-
-	default
-
-	use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
-
-	if use perl; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		myinst=( DESTDIR="${D}" )
-		perl-module_src_install
-		popd > /dev/null || die
-		perl_delete_localpod
-	fi
-
-	if use python; then
-		# Don't clash with gdal's docs
-		unset DOCS HTML_DOCS
-
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		newdoc swig/python/README.rst README-python.rst
-
-		insinto /usr/share/${PN}/samples
-		doins -r swig/python/samples/.
-	fi
-
-	doman "${S}"/man/man*/*
-	find "${ED}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sci-libs/gdal/gdal-3.2.3.ebuild b/sci-libs/gdal/gdal-3.2.3.ebuild
deleted file mode 100644
index 8f640dc7591f..000000000000
--- a/sci-libs/gdal/gdal-3.2.3.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_OPTIONAL=1
-inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module toolchain-funcs
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="https://gdal.org/"
-SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0/3.2"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="armadillo +aux-xml curl 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"
-
-REQUIRED_USE="
-	mdb? ( java )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	java? (
-		dev-java/ant-core
-		dev-lang/swig:0
-		>=virtual/jdk-1.8:*
-	)
-	perl? ( dev-lang/swig:0 )
-	python? (
-		dev-lang/swig:0
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	dev-libs/expat
-	dev-libs/json-c:=
-	dev-libs/libpcre
-	dev-libs/libxml2:2
-	dev-libs/openssl:=
-	media-libs/tiff
-	>=sci-libs/libgeotiff-1.5.1-r1:=
-	>=sci-libs/proj-6.0.0:=
-	sys-libs/zlib[minizip(+)]
-	armadillo? ( sci-libs/armadillo:=[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio:= )
-	geos? ( >=sci-libs/geos-3.8.0 )
-	gif? ( media-libs/giflib:= )
-	gml? ( >=dev-libs/xerces-c-3.1 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lzma? ( || (
-		app-arch/xz-utils
-		app-arch/lzma
-	) )
-	mdb? ( dev-java/jackcess:1 )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	ogdi? ( sci-libs/ogdi )
-	opencl? ( virtual/opencl )
-	oracle? ( dev-db/oracle-instantclient:= )
-	pdf? ( app-text/poppler:= )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	spatialite? ( dev-db/spatialite )
-	sqlite? ( dev-db/sqlite:3 )
-	webp? ( media-libs/libwebp:= )
-	xls? ( dev-libs/freexl )
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.3-soname.patch"
-	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
-	"${FILESDIR}/${PN}-3.2.1-libdir.patch"
-)
-
-src_prepare() {
-	default
-
-	# Drop a --prefix hack in the upstream build system
-	# We don't want the line at all, so let's just drop it rather than
-	# trying to put in the right libdir value.
-	# bug #696106
-	sed -e '/\$ADD_PREFIX\/lib/d' \
-		-i configure.ac || die
-
-	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.ac || die
-
-	sed -e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	# SWIG: Use of the include path to find the input file is deprecated and will not work with ccache.
-	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
-		-i swig/python/GNUmakefile || die "sed python makefile failed"
-
-	# autoconf 2.70+
-	# bug #775209
-	config_rpath_update .
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		# charls - not packaged in Gentoo ebuild repository
-		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-		# bsb - legal issues
-		# ingres - same story as oracle oci
-		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
-		# podofo - we use poppler instead they are exclusive for each other
-		# tiff is a hard dep
-		--includedir="${EPREFIX}"/usr/include/${PN}
-		--disable-lto
-		--disable-static
-		--disable-driver-bsb
-		--disable-driver-mrf
-		--disable-pdf-plugin
-		--enable-shared
-		--enable-driver-grib
-		--with-bash-completion="$(get_bashcompdir)"
-		--with-cpp14
-		--with-crypto
-		--with-cryptopp=no
-		--with-expat
-		--with-geotiff
-		--with-gnm
-		--with-hide-internal-symbols
-		--with-libjson-c="${EPREFIX}"/usr
-		--with-libtiff
-		--with-libtool
-		--with-libz="${EPREFIX}"/usr
-		--without-charls
-		--without-dods-root
-		--without-ecw
-		--without-epsilon
-		--without-fgdb
-		--without-fme
-		--without-gta
-		--without-grass
-		--without-hdf4
-		--without-idb
-		--without-ingres
-		--without-jasper
-		--without-jp2lura
-		--without-jp2mrsid
-		--without-kakadu
-		--without-kea
-		--without-libkml
-		--without-mongocxx
-		--without-mrsid
-		--without-mrsid_lidar
-		--without-msg
-		--without-rasdaman
-		--without-rasterlite2
-		--without-pcraster
-		--without-pdfium
-		--without-perl
-		--without-podofo
-		--without-python
-		--without-qhull
-		--without-sfcgal
-		--without-sosi
-		--without-teigha
-		$(use_enable debug)
-		$(use_with armadillo)
-		$(use_with aux-xml pam)
-		$(use_with curl)
-		$(use_with cpu_flags_x86_avx avx)
-		$(use_with cpu_flags_x86_sse sse)
-		$(use_with cpu_flags_x86_ssse3 ssse3)
-		$(use_with fits cfitsio)
-		$(use_with geos)
-		$(use_with gif)
-		$(use_with gml xerces)
-		$(use_with hdf5)
-		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
-		$(use_with jpeg)
-		$(use_with jpeg2k openjpeg)
-		$(use_with lzma liblzma)
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
-		$(use_with netcdf)
-		$(use_with oracle oci)
-		$(use_with odbc)
-		$(use_with ogdi ogdi "${EPREFIX}"/usr)
-		$(use_with opencl)
-		$(use_with pdf poppler)
-		$(use_with png)
-		$(use_with postgres pg)
-		$(use_with spatialite)
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-		$(use_with threads)
-		$(use_with webp)
-		$(use_with xls freexl)
-		$(use_with zstd)
-	)
-
-	tc-export AR RANLIB
-
-	if use java; then
-		myconf+=(
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-lib=dlopen
-			$(use_with mdb)
-		)
-	else
-		myconf+=( --without-java --without-mdb )
-	fi
-
-	if use sqlite; then
-		append-libs -lsqlite3
-	fi
-
-	# bug #632660
-	if use ogdi; then
-		append-cflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
-		append-cxxflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -e "s: -rdynamic : :" \
-			-i GDALmake.opt || die "sed LIBS failed"
-	fi
-}
-
-src_compile() {
-	if use perl; then
-		rm "${S}"/swig/perl/*_wrap.cpp || die
-		emake -C "${S}"/swig/perl generate
-	fi
-
-	# gdal-config needed before generating Python bindings
-	default
-
-	if use java; then
-		pushd "${S}"/swig/java > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-
-	if use perl; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null || die
-	fi
-
-	if use python; then
-		rm -f "${S}"/swig/python/*_wrap.cpp || die
-		emake -C "${S}"/swig/python generate
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-
-	use doc && emake docs
-}
-
-src_install() {
-	local DOCS=( NEWS )
-	use doc && local HTML_DOCS=( html/. )
-
-	default
-
-	use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
-
-	if use perl; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		myinst=( DESTDIR="${D}" )
-		perl-module_src_install
-		popd > /dev/null || die
-		perl_delete_localpod
-	fi
-
-	if use python; then
-		# Don't clash with gdal's docs
-		unset DOCS HTML_DOCS
-
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		newdoc swig/python/README.rst README-python.rst
-
-		insinto /usr/share/${PN}/samples
-		doins -r swig/python/samples/.
-	fi
-
-	doman "${S}"/man/man*/*
-	find "${ED}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sci-libs/gdal/gdal-3.3.0.ebuild b/sci-libs/gdal/gdal-3.3.0.ebuild
deleted file mode 100644
index dbe6b4590fce..000000000000
--- a/sci-libs/gdal/gdal-3.3.0.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_OPTIONAL=1
-inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module toolchain-funcs
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="https://gdal.org/"
-SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0/3.3"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~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"
-
-REQUIRED_USE="
-	mdb? ( java )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	java? (
-		dev-java/ant-core
-		dev-lang/swig:0
-		>=virtual/jdk-1.8:*
-	)
-	perl? ( dev-lang/swig:0 )
-	python? (
-		dev-lang/swig:0
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	dev-libs/expat
-	dev-libs/json-c:=
-	dev-libs/libpcre
-	dev-libs/libxml2:2
-	dev-libs/openssl:=
-	media-libs/tiff
-	>=sci-libs/libgeotiff-1.5.1-r1:=
-	>=sci-libs/proj-6.0.0:=
-	sys-libs/zlib[minizip(+)]
-	armadillo? ( sci-libs/armadillo:=[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio:= )
-	geos? ( >=sci-libs/geos-3.8.0 )
-	gif? ( media-libs/giflib:= )
-	gml? ( >=dev-libs/xerces-c-3.1 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lzma? ( || (
-		app-arch/xz-utils
-		app-arch/lzma
-	) )
-	mdb? ( dev-java/jackcess:1 )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	ogdi? ( sci-libs/ogdi )
-	opencl? ( virtual/opencl )
-	oracle? ( dev-db/oracle-instantclient:= )
-	pdf? ( app-text/poppler:= )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	spatialite? ( dev-db/spatialite )
-	sqlite? ( dev-db/sqlite:3 )
-	webp? ( media-libs/libwebp:= )
-	xls? ( dev-libs/freexl )
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.3-soname.patch"
-	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
-	"${FILESDIR}/${PN}-3.3.0-libdir.patch"
-	"${FILESDIR}/${PN}-3.3.0-configure-geos-disable.patch"
-)
-
-src_prepare() {
-	default
-
-	# Drop a --prefix hack in the upstream build system
-	# We don't want the line at all, so let's just drop it rather than
-	# trying to put in the right libdir value.
-	# bug #696106
-	sed -e '/\$ADD_PREFIX\/lib/d' \
-		-i configure.ac || die
-
-	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.ac || die
-
-	sed -e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	# SWIG: Use of the include path to find the input file is deprecated and will not work with ccache.
-	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
-		-i swig/python/GNUmakefile || die "sed python makefile failed"
-
-	# autoconf 2.70+
-	# bug #775209
-	config_rpath_update .
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		# charls - not packaged in Gentoo ebuild repository
-		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-		# bsb - legal issues
-		# ingres - same story as oracle oci
-		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
-		# podofo - we use poppler instead they are exclusive for each other
-		# tiff is a hard dep
-		--includedir="${EPREFIX}"/usr/include/${PN}
-		--disable-lto
-		--disable-static
-		--disable-driver-bsb
-		--disable-driver-mrf
-		--disable-pdf-plugin
-		--enable-shared
-		--enable-driver-grib
-		--with-bash-completion="$(get_bashcompdir)"
-		--with-cpp14
-		--with-crypto
-		--with-cryptopp=no
-		--with-expat
-		--with-geotiff
-		--with-gnm
-		--with-hide-internal-symbols
-		--with-libjson-c="${EPREFIX}"/usr
-		--with-libtiff
-		--with-libtool
-		--with-libz="${EPREFIX}"/usr
-		--without-charls
-		--without-dods-root
-		--without-ecw
-		--without-fgdb
-		--without-fme
-		--without-gta
-		--without-grass
-		--without-hdf4
-		--without-idb
-		--without-ingres
-		--without-jasper
-		--without-jp2lura
-		--without-jp2mrsid
-		--without-kakadu
-		--without-kea
-		--without-libkml
-		--without-mongocxx
-		--without-mrsid
-		--without-mrsid_lidar
-		--without-msg
-		--without-rasdaman
-		--without-rasterlite2
-		--without-pcraster
-		--without-pdfium
-		--without-perl
-		--without-podofo
-		--without-python
-		--without-qhull
-		--without-sfcgal
-		--without-sosi
-		--without-teigha
-		$(use_enable debug)
-		$(use_with armadillo)
-		$(use_with aux-xml pam)
-		$(use_with curl)
-		$(use_with cpu_flags_x86_avx avx)
-		$(use_with cpu_flags_x86_sse sse)
-		$(use_with cpu_flags_x86_ssse3 ssse3)
-		$(use_with fits cfitsio)
-		$(use_with geos)
-		$(use_with gif)
-		$(use_with gml xerces)
-		$(use_with hdf5)
-		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
-		$(use_with jpeg)
-		$(use_with jpeg2k openjpeg)
-		$(use_with lzma liblzma)
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
-		$(use_with netcdf)
-		$(use_with oracle oci)
-		$(use_with odbc)
-		$(use_with ogdi ogdi "${EPREFIX}"/usr)
-		$(use_with opencl)
-		$(use_with pdf poppler)
-		$(use_with png)
-		$(use_with postgres pg)
-		$(use_with spatialite)
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-		$(use_with threads)
-		$(use_with webp)
-		$(use_with xls freexl)
-		$(use_with zstd)
-	)
-
-	tc-export AR RANLIB
-
-	if use java; then
-		myconf+=(
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-lib=dlopen
-			$(use_with mdb)
-		)
-	else
-		myconf+=( --without-java --without-mdb )
-	fi
-
-	if use sqlite; then
-		append-libs -lsqlite3
-	fi
-
-	# bug #632660
-	if use ogdi; then
-		append-cflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
-		append-cxxflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -e "s: -rdynamic : :" \
-			-i GDALmake.opt || die "sed LIBS failed"
-	fi
-}
-
-src_compile() {
-	if use perl; then
-		rm "${S}"/swig/perl/*_wrap.cpp || die
-		emake -C "${S}"/swig/perl generate
-	fi
-
-	# gdal-config needed before generating Python bindings
-	default
-
-	if use java; then
-		pushd "${S}"/swig/java > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-
-	if use perl; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null || die
-	fi
-
-	if use python; then
-		rm -f "${S}"/swig/python/*_wrap.cpp || die
-		emake -C "${S}"/swig/python generate
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-
-	use doc && emake docs
-}
-
-src_install() {
-	local DOCS=( NEWS )
-	use doc && local HTML_DOCS=( html/. )
-
-	default
-
-	use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
-
-	if use perl; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		myinst=( DESTDIR="${D}" )
-		perl-module_src_install
-		popd > /dev/null || die
-		perl_delete_localpod
-	fi
-
-	if use python; then
-		# Don't clash with gdal's docs
-		unset DOCS HTML_DOCS
-
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		newdoc swig/python/README.rst README-python.rst
-	fi
-
-	doman "${S}"/man/man*/*
-	find "${ED}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sci-libs/gdal/gdal-3.3.1.ebuild b/sci-libs/gdal/gdal-3.3.1.ebuild
deleted file mode 100644
index 6f1591907673..000000000000
--- a/sci-libs/gdal/gdal-3.3.1.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_OPTIONAL=1
-inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module toolchain-funcs
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="https://gdal.org/"
-SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0/3.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"
-
-REQUIRED_USE="
-	mdb? ( java )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	java? (
-		dev-java/ant-core
-		dev-lang/swig:0
-		>=virtual/jdk-1.8:*
-	)
-	perl? ( dev-lang/swig:0 )
-	python? (
-		dev-lang/swig:0
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	dev-libs/expat
-	dev-libs/json-c:=
-	dev-libs/libpcre
-	dev-libs/libxml2:2
-	dev-libs/openssl:=
-	media-libs/tiff
-	>=sci-libs/libgeotiff-1.5.1-r1:=
-	>=sci-libs/proj-6.0.0:=
-	sys-libs/zlib[minizip(+)]
-	armadillo? ( sci-libs/armadillo:=[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio:= )
-	geos? ( >=sci-libs/geos-3.8.0 )
-	gif? ( media-libs/giflib:= )
-	gml? ( >=dev-libs/xerces-c-3.1 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lzma? ( || (
-		app-arch/xz-utils
-		app-arch/lzma
-	) )
-	mdb? ( dev-java/jackcess:1 )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	ogdi? ( sci-libs/ogdi )
-	opencl? ( virtual/opencl )
-	oracle? ( dev-db/oracle-instantclient:= )
-	pdf? ( app-text/poppler:= )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	spatialite? ( dev-db/spatialite )
-	sqlite? ( dev-db/sqlite:3 )
-	webp? ( media-libs/libwebp:= )
-	xls? ( dev-libs/freexl )
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.3-soname.patch"
-	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
-	"${FILESDIR}/${PN}-3.3.0-libdir.patch"
-)
-
-src_prepare() {
-	default
-
-	# Drop a --prefix hack in the upstream build system
-	# We don't want the line at all, so let's just drop it rather than
-	# trying to put in the right libdir value.
-	# bug #696106
-	sed -e '/\$ADD_PREFIX\/lib/d' \
-		-i configure.ac || die
-
-	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.ac || die
-
-	sed -e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	# SWIG: Use of the include path to find the input file is deprecated and will not work with ccache.
-	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
-		-i swig/python/GNUmakefile || die "sed python makefile failed"
-
-	# autoconf 2.70+
-	# bug #775209
-	config_rpath_update .
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		# charls - not packaged in Gentoo ebuild repository
-		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-		# bsb - legal issues
-		# ingres - same story as oracle oci
-		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
-		# podofo - we use poppler instead they are exclusive for each other
-		# tiff is a hard dep
-		--includedir="${EPREFIX}"/usr/include/${PN}
-		--disable-lto
-		--disable-static
-		--disable-driver-bsb
-		--disable-driver-mrf
-		--disable-pdf-plugin
-		--enable-shared
-		--enable-driver-grib
-		--with-bash-completion="$(get_bashcompdir)"
-		--with-cpp14
-		--with-crypto
-		--with-cryptopp=no
-		--with-expat
-		--with-geotiff
-		--with-gnm
-		--with-hide-internal-symbols
-		--with-libjson-c="${EPREFIX}"/usr
-		--with-libtiff
-		--with-libtool
-		--with-libz="${EPREFIX}"/usr
-		--without-charls
-		--without-dods-root
-		--without-ecw
-		--without-fgdb
-		--without-fme
-		--without-gta
-		--without-grass
-		--without-hdf4
-		--without-idb
-		--without-ingres
-		--without-jasper
-		--without-jp2lura
-		--without-jp2mrsid
-		--without-kakadu
-		--without-kea
-		--without-libkml
-		--without-mongocxx
-		--without-mrsid
-		--without-mrsid_lidar
-		--without-msg
-		--without-rasdaman
-		--without-rasterlite2
-		--without-pcraster
-		--without-pdfium
-		--without-perl
-		--without-podofo
-		--without-python
-		--without-qhull
-		--without-sfcgal
-		--without-sosi
-		--without-teigha
-		$(use_enable debug)
-		$(use_with armadillo)
-		$(use_with aux-xml pam)
-		$(use_with curl)
-		$(use_with cpu_flags_x86_avx avx)
-		$(use_with cpu_flags_x86_sse sse)
-		$(use_with cpu_flags_x86_ssse3 ssse3)
-		$(use_with fits cfitsio)
-		$(use_with geos)
-		$(use_with gif)
-		$(use_with gml xerces)
-		$(use_with hdf5)
-		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
-		$(use_with jpeg)
-		$(use_with jpeg2k openjpeg)
-		$(use_with lzma liblzma)
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
-		$(use_with netcdf)
-		$(use_with oracle oci)
-		$(use_with odbc)
-		$(use_with ogdi ogdi "${EPREFIX}"/usr)
-		$(use_with opencl)
-		$(use_with pdf poppler)
-		$(use_with png)
-		$(use_with postgres pg)
-		$(use_with spatialite)
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-		$(use_with threads)
-		$(use_with webp)
-		$(use_with xls freexl)
-		$(use_with zstd)
-	)
-
-	tc-export AR RANLIB
-
-	if use java; then
-		myconf+=(
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-lib=dlopen
-			$(use_with mdb)
-		)
-	else
-		myconf+=( --without-java --without-mdb )
-	fi
-
-	if use sqlite; then
-		append-libs -lsqlite3
-	fi
-
-	# bug #632660
-	if use ogdi; then
-		append-cflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
-		append-cxxflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -e "s: -rdynamic : :" \
-			-i GDALmake.opt || die "sed LIBS failed"
-	fi
-}
-
-src_compile() {
-	if use perl; then
-		rm "${S}"/swig/perl/*_wrap.cpp || die
-		emake -C "${S}"/swig/perl generate
-	fi
-
-	# gdal-config needed before generating Python bindings
-	default
-
-	if use java; then
-		pushd "${S}"/swig/java > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-
-	if use perl; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null || die
-	fi
-
-	if use python; then
-		rm -f "${S}"/swig/python/*_wrap.cpp || die
-		emake -C "${S}"/swig/python generate
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-
-	use doc && emake docs
-}
-
-src_install() {
-	local DOCS=( NEWS )
-	use doc && local HTML_DOCS=( html/. )
-
-	default
-
-	use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
-
-	if use perl; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		myinst=( DESTDIR="${D}" )
-		perl-module_src_install
-		popd > /dev/null || die
-		perl_delete_localpod
-	fi
-
-	if use python; then
-		# Don't clash with gdal's docs
-		unset DOCS HTML_DOCS
-
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		newdoc swig/python/README.rst README-python.rst
-	fi
-
-	doman "${S}"/man/man*/*
-	find "${ED}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sci-libs/gdal/gdal-3.3.3.ebuild b/sci-libs/gdal/gdal-3.3.3.ebuild
index 9ca88526b958..0759a1e57028 100644
--- a/sci-libs/gdal/gdal-3.3.3.ebuild
+++ b/sci-libs/gdal/gdal-3.3.3.ebuild
@@ -14,7 +14,7 @@ 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"
+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="
diff --git a/sci-libs/gdal/gdal-3.3.2-r1.ebuild b/sci-libs/gdal/gdal-3.4.0.ebuild
index cf27723d766d..55cb5824be6f 100644
--- a/sci-libs/gdal/gdal-3.3.2-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.4.0.ebuild
@@ -12,9 +12,10 @@ DESCRIPTION="Translator library for raster geospatial data formats (includes OGR
 HOMEPAGE="https://gdal.org/"
 SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
-SLOT="0/3.3"
+# subslot is libgdal.so.<SONAME>
+SLOT="0/30"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
+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="
@@ -90,7 +91,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.2.3-soname.patch"
 	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
 	"${FILESDIR}/${PN}-3.3.0-libdir.patch"
-	"${FILESDIR}/${P}-poppler-21.10.0.patch"
 )
 
 src_prepare() {
@@ -145,10 +145,11 @@ src_configure() {
 		--with-geotiff
 		--with-gnm
 		--with-hide-internal-symbols
-		--with-libjson-c="${EPREFIX}"/usr
+		--with-libjson-c="${ESYSROOT}"/usr
 		--with-libtiff
 		--with-libtool
-		--with-libz="${EPREFIX}"/usr
+		--with-libz="${ESYSROOT}"/usr
+		--without-blosc
 		--without-charls
 		--without-dods-root
 		--without-ecw
@@ -162,15 +163,20 @@ src_configure() {
 		--without-jasper
 		--without-jp2lura
 		--without-jp2mrsid
+		# libjxl yet packaged.
+		--without-jxl
 		--without-kakadu
 		--without-kea
 		--without-libkml
+		--without-lz4
 		--without-mongocxx
 		--without-mrsid
 		--without-mrsid_lidar
 		--without-msg
 		--without-rasdaman
 		--without-rasterlite2
+		# Revisit when OpenEXR 3 / ilmmath migration is more complete in tree
+		--without-exr
 		--without-pcraster
 		--without-pdfium
 		--without-perl
@@ -279,11 +285,13 @@ src_compile() {
 }
 
 src_install() {
-	local DOCS=( NEWS )
 	use doc && local HTML_DOCS=( html/. )
 
 	default
 
+	# Respect libdir in pkgconfig file
+	sed -i -e "s:\${exec_prefix}/lib:\${exec_prefix}/$(get_libdir):" "${ED}"/usr/$(get_libdir)/pkgconfig/gdal.pc || die
+
 	use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
 
 	if use perl; then
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index e2e2bf1446ef..0ef77ce983b8 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -3,7 +3,7 @@ DIST geos-3.10.1.tar.bz2 6714713 BLAKE2B 932a24a7431bbd14b7412957a028a42b3877247
 DIST geos-3.8.1.tar.bz2 2505407 BLAKE2B 43053ea9e29d190f41c37d5d382b689ef477e0256cfd5705f4f2f316cac21a1674660bcf0900c51db72909c41d46be7a41d297958de48e108ae6d6bd1ca9d247 SHA512 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056
 DIST geos-3.9.0-r1.tar.bz2 4710957 BLAKE2B dab0f4e0bfb1bd244c2faf5ee6149b65d142eea78e87490025f90b672eee0d25d4ba9bc4c3b223e78ea0c9d34625b4750c7ba03852e5ea9540ad5c479d84b995 SHA512 1081f2aa20e671450953f7bb53b17c703804a1c9f4987c9da0987ff24339af5811b2c8b79c8e438d04ca38e4d06164dc5a4206f266f7efc19af3f9d9ea8f71f8
 DIST geos-3.9.1-r1.tar.bz2 4761372 BLAKE2B af1597d9372b18a2f280d82941949518cd8edb9296e9647aa3949c9e10fdd1b6ef500298471ec469d711ab0569eabd8fc3fb0a8f7e9bd48f91150cfdcaea65a8 SHA512 7ea131685cd110ec5e0cb7c214b52b75397371e75f011e1410b6770b6a48ca492a02337d86a7be35c852ef94604fe9d6f49634c79d4946df611aaa4f5cbaee28
-EBUILD geos-3.10.0.ebuild 893 BLAKE2B 8521c67729471eeb9c0107f5ede61c36395ab976e9523f0f2b7add37b7aaf4d28d6535a09d3f86e98ec82d3381e8e352c68d37efef9004f5aea1908acf32e67f SHA512 07de91bb433290d77299758ad62f18bc656f371612dc6ed85854e2133ec19571203e4e40ce789cad25cba210b0a6409eef8b1d783e05bd4703a7baa0ec0bb5c0
+EBUILD geos-3.10.0.ebuild 887 BLAKE2B 3653d5849387cd8890c49f497fa263961320af636ccf723ac9ec2ce77dc29dd184aa2cc954d28836d6458ba2471096d351bfa1873a62fd8dd1326e170470e186 SHA512 298d9191f68705e2bdff66b74876277e97ba218d0611a6c03e5de00afe4e59a6819712a9817a6fcc419e8a867aaeb8678ebe261bf352c90a93bf14020f67bb1b
 EBUILD geos-3.10.1.ebuild 893 BLAKE2B ca41569fd2015ee64f20642b53f1c4958ef050189124e2090503e44603e61290cad942f202d170379ddd10576be3f7df49b321bd6277c3bda7d88d2267fc300c SHA512 944a4341ad44c0156e5cdcc3f81c21073230ff56dd7ed5d3acd6049f0c5663a64000c092f8aa2a7ccb355f311a7df8d73f5f3b411469379c79858b40be2a713e
 EBUILD geos-3.8.1.ebuild 1102 BLAKE2B 6b6a901ab393f6501c8ecbd6195e57c76bf7165b79d892049535212d16d3961a1abf82154e897a7172768551a44396e33cc95ec500949863024ffb06185bada0 SHA512 deb6a39dc4cdf5529243b89be65fdaba5cd85905860575cab33202d9c52e511b677e0e72c280867939cd081d4a6787959def3798689913ef15afc988774641fe
 EBUILD geos-3.9.0-r2.ebuild 1073 BLAKE2B dfddcb6c942568397a90094ae3d16a91758fe9610bb8310e0f53d9c33780e163f9f4dcedd1c6739d48c286eaa3534e1bc563b9a4450fb0e65d5cd923acc8ae1f SHA512 89667cccb1b67be07c423813c404e22762c319a8b1e777d1d15a9ae0b6753f499967324c454165f730602288d97822ce6bdd6b3fda6b8077866e88ad6bdca0fc
diff --git a/sci-libs/geos/geos-3.10.0.ebuild b/sci-libs/geos/geos-3.10.0.ebuild
index 28033433e149..d8b421cf2560 100644
--- a/sci-libs/geos/geos-3.10.0.ebuild
+++ b/sci-libs/geos/geos-3.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sci-libs/ginkgo/Manifest b/sci-libs/ginkgo/Manifest
index 7f2a0cbb134a..42c1ff7e8037 100644
--- a/sci-libs/ginkgo/Manifest
+++ b/sci-libs/ginkgo/Manifest
@@ -1,3 +1,3 @@
 DIST ginkgo-1.4.0.tar.gz 2574052 BLAKE2B 99677d9d75831991cac40312095d32c44bef18cd05b120d80fdb9e64ea6dc15796c09b26f35dc8230db6b55c7be4dd76efd6d1cd8ca13c83e1f3087550db0dca SHA512 9bfcb2c415c7a1a70cf8e49f20adf62d02cab83bb23b6fcecfeaeeb322b2d4e1ad8d8fa6582735073753f9a05eac8688b9bd1ff1d4203957c1a80702d117e807
-EBUILD ginkgo-1.4.0-r1.ebuild 1152 BLAKE2B b2c9edd8c6d5dbd8739551ef759d23a67ece68dbf254cbe47480a25623beed6b3f7a7789a3f36793d2abb2638cb2a60c27e4290598e2c8769990d68631230172 SHA512 dd0c93e1abc6370f123e53a94cd5d7d69c85fecd1e38bba8faff7830e57b952f6deaebe7a353628cbd136eb7419d7c14d92abbf378a9d4856df67345a6d11b27
-MISC metadata.xml 810 BLAKE2B cbd39cc2d575e746113ca67913c0fa1ec128e977dc4eac25919a7e695ba8fd1ea45c053d5465a4623fb42a773b668ac0b88af84c5482e642f376e87f400fc02e SHA512 60fc9ae98d8b15ecb6f94d3abadc99e7687877a4f4947bf4c0774d42d5f7a6e4d75518f24cb7ad20ff0e81788dfda5085173cd558df717309ca5830ddb7bd382
+EBUILD ginkgo-1.4.0-r3.ebuild 1243 BLAKE2B d668fc49470c799eb92d5dc58a89aeecccb8cc414005b487236fdceb87136ea530901f1a2c3c010edb8d19223a77f0c3b0b2d308065d56911aa044e9e1db1487 SHA512 ee366aa6e69985cd0e9a618bd8b99c0245724f2c8f9bd166ef722a943272250fe0d17a202537bd2712a2137f1412d6a070bf5942116f7dace39701626cf3b758
+MISC metadata.xml 888 BLAKE2B 31ec7f013eac6db60b8f4a1ae447000719a59cc6733daca5579c774360e40aa9daafbc652e8f6cc994fee088bc4ccfaeec72dff2fad99e0aa44c2f115371c19b SHA512 6e7f04db8def94eba57a6cd7eda7f47aceaa1c8b1475bcd35e6c34d540117fe848af545ddb9c93d0a12d4088fe8f33d26a7e300e14814b6b414751edb56b42f4
diff --git a/sci-libs/ginkgo/ginkgo-1.4.0-r1.ebuild b/sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild
index 84dae4aa427a..5092a73a706d 100644
--- a/sci-libs/ginkgo/ginkgo-1.4.0-r1.ebuild
+++ b/sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Numerical linear algebra software package"
 HOMEPAGE="https://ginkgo-project.github.io/"
@@ -18,10 +18,11 @@ fi
 
 LICENSE="BSD-with-attribution"
 SLOT="0"
-IUSE="+openmp cuda"
+IUSE="cuda hwloc +openmp"
 
 RDEPEND="
-	cuda? ( dev-util/nvidia-cuda-sdk )
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+	hwloc? ( sys-apps/hwloc:= )
 "
 DEPEND="${RDEPEND}"
 
@@ -42,14 +43,14 @@ src_prepare() {
 }
 
 src_configure() {
-
 	local mycmakeargs=(
 		-DGINKGO_DEVEL_TOOLS=OFF
 		-DGINKGO_BUILD_TESTS=OFF
 		-DGINKGO_BUILD_BENCHMARKS=OFF
 		-DGINKGO_BUILD_REFERENCE=ON
-		-DGINKGO_BUILD_OMP=$(usex openmp)
 		-DGINKGO_BUILD_CUDA=$(usex cuda)
+		-DGINKGO_BUILD_HWLOC=$(usex hwloc)
+		-DGINKGO_BUILD_OMP=$(usex openmp)
 	)
 	cmake_src_configure
 }
diff --git a/sci-libs/ginkgo/metadata.xml b/sci-libs/ginkgo/metadata.xml
index 604252f3caf9..56c6a1d71fc6 100644
--- a/sci-libs/ginkgo/metadata.xml
+++ b/sci-libs/ginkgo/metadata.xml
@@ -16,6 +16,7 @@
 	</longdescription>
 	<use>
 		<flag name="cuda">Add support for cuda assimp (<pkg>dev-util/nvidia-cuda-sdk</pkg>)</flag>
+		<flag name="hwloc">Add support for hwloc (<pkg>sys-apps/hwloc</pkg>)</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">ginkgo-project/ginkgo</remote-id>
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index f1bcc5c08fb9..0650692a4bac 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -5,7 +5,9 @@ AUX hdf-4.2.13-linux-tirpc.patch 972 BLAKE2B a95350ef2364e3ff08aa79d12e458853beb
 AUX hdf-4.2.15-enable-fortran-shared.patch 1271 BLAKE2B bdeb5214a92618b0587472db79d6bef7677cf51ceeb77d9b8593fc374547ee4f63eb7e614c621043670236151731fcdcaac2f3e1fc18b4f577cceca24e38aa37 SHA512 daa6bf33cf5b0f9445c1e96c67907463f2a3813d2d6528a0fd19a57db98253794c3d147e736c3568766e87d01ff41a492ecd18fcef3d85af2adb77315d770be8
 AUX hdf-4.2.15-fix-rpch-location.patch 550 BLAKE2B a88448fa6f454fcac9567b05270f637d144dae5c88d4a88d19a5cc3897f7e20c61e36678dee730ee80bece1c05cd69514f87658e6a691826dce233cdbe9ff49e SHA512 77855e3e7562412fa18e102385264af42605d462690bbe4fbc867268c1cd1837eb012546294b433c4de8e98ddfdeb58c2a5480a7418252563579d6ee26808f88
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
+DIST hdf-4.2.15-arch-patches-1.tar.bz2 7187 BLAKE2B 461e3d7c5e3603fb909d59d6fb23b59f64ef6a6c4e58fe85ddf906a8f27918ac25d3928f5c705290d9d778e1ed07b009bd0602409c05d13a06905d58f2a2cfff SHA512 616c39d06fb6f479a7bed88a89828530ac32018dae827259b76d6e177e5b50378722b60532533a02ae534dddc445f4e360e7a19a28e2cf9728549e5ee27c3e67
 DIST hdf-4.2.15.tar.bz2 3647900 BLAKE2B b1d60ee880563bf64ae6eae4c66f86afe55f4c512f06c84c154de30034fa7a65cfa2b9bd68fbf8a055bb42b57215455ac8967f2a73ec88b361750aa07e0da5e6 SHA512 7d4037800ef8950ed74f225355ef5458444bed26fc189fbbd2ce7d36009998013ac1f6ba5d4e60834acf8f6f73550357238745acc35e162679919400a48191e9
 EBUILD hdf-4.2.13-r1.ebuild 1945 BLAKE2B dcb348ffbc90a69e6230b6ea72625e9f7c11f2ca1c7dfe015a5bdfb60b0e7b702296fa55da8b57118168b45be8f86ad33f71b14f9e155312928d04d9d987dddf SHA512 6b547d1d5f46318ec1c5c01393cf759efeeea6409c4ff5e1fe8e341958e656ae9cd6baaa8e39ace87be83f35f18c28e8663117880eac7db3fdbbe154c9642cbd
+EBUILD hdf-4.2.15-r1.ebuild 2150 BLAKE2B 2768f3fddfa0263e2219f0d1a81233ceb138f50a1d66a01fc6a7811b28ea948dbaffdffc993cb418690b885eae02f921db250cd92d811abdec4eaf6d87baf2d6 SHA512 d420f0da3bf58169c16c13fb5f2682b7258a6571183b5701f3839e5f9903ea38dc5b1ce8c31f90375b701fc718fbf0415309fde4f73e7728083cb9b9aa083d7b
 EBUILD hdf-4.2.15.ebuild 1831 BLAKE2B 8d5f55e659c146b95440d564f7cc302ed08cde2284046bf940e7002fb4fc584a7482a1222fab3bd388d66cdb9b57369700c419d4fc5bba738888c5bd6536d0cd SHA512 4476149b967d343324d3cbb2c3fa04542632f348ba8df9977711ef0b5d4da264209a8b2073de7be5bdf9174262fa7311426c2156f0caef85617777322fc4819d
 MISC metadata.xml 860 BLAKE2B 1eb04b174ac26dabb6191f30549b69e408ae6ecc7b166199662413dc918e24617d54bf3f5ee52a010bdcd763b8ec96d2d53d028a4aa8fa4f64d5758f0a6bb2c6 SHA512 e815da5354aa39a8391cbf15eaed3376aac4774a836c843dda81c0933123648f2f5b1208164740a701a9db8f1721ba4e31bf5d1d8c331635dcfe0d5dd9f6dbf8
diff --git a/sci-libs/hdf/hdf-4.2.15-r1.ebuild b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
new file mode 100644
index 000000000000..047eb57a8562
--- /dev/null
+++ b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 toolchain-funcs autotools flag-o-matic
+
+DESCRIPTION="General purpose library and format for storing scientific data"
+HOMEPAGE="https://www.hdfgroup.org/hdf4.html"
+SRC_URI="https://support.hdfgroup.org/ftp/HDF/releases/${PN^^}${PV}/src/${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-4.2.15-arch-patches-1.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${PN}-4.2.15-arch-patches-1.tar.bz2"
+
+LICENSE="NCSA-HDF"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~riscv x86 ~amd64-linux ~x86-linux"
+IUSE="examples fortran szip static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( szip )"
+
+RDEPEND="net-libs/libtirpc:=
+	sys-libs/zlib
+	virtual/jpeg:0
+	szip? ( virtual/szip )"
+DEPEND="${RDEPEND}
+	test? ( virtual/szip )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.15-enable-fortran-shared.patch
+	"${FILESDIR}"/${PN}-4.2.15-fix-rpch-location.patch
+
+	# May need to extend these for more arches in future.
+	# bug #664856
+	"${WORKDIR}"/${PN}-4.2.15-arch-patches/
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
+	eautoreconf
+}
+
+src_configure() {
+	[[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
+	# GCC 10 workaround
+	# bug #723014
+	append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
+	econf \
+		--enable-shared \
+		--enable-production=gentoo \
+		--disable-netcdf \
+		$(use_enable fortran) \
+		$(use_enable static-libs static) \
+		$(use_with szip szlib) \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
+
+	cd "${ED}/usr" || die
+	if use examples; then
+		mv  share/hdf4_examples share/doc/${PF}/examples || die
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -r share/hdf4_examples || die
+	fi
+
+	mv bin/ncgen{,-hdf} || die
+	mv bin/ncdump{,-hdf} || die
+	mv share/man/man1/ncgen{,-hdf}.1 || die
+	mv share/man/man1/ncdump{,-hdf}.1 || die
+}
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index fe565ee10456..d408d02ee5b7 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,5 +1,5 @@
 DIST indilib-1.9.2.tar.gz 2335834 BLAKE2B 47d8bde8e3c783cefb23c8a8f865fa46bb9a6ed4ee08618d198680f3036e9ca9a16178b1ec4dab070d0cb3ec8d638847cedb752a2a5a1d5e2dc5ddbd362c0a86 SHA512 0a1ada5b5880553ddbcf794bac952ddce76d3aa46652c48621e284a04a7d3d9ba7492d8874bf30f7e3f614a904a829109eaee9dae53dd5854d72bb1c98740f44
 DIST indilib-1.9.3.tar.gz 2350168 BLAKE2B 4e61f79a08d32ee829bb420c2f316f9f0168d21d6d2f11905142efd390e989571a3120ea5d123df4af05d0c6c7a4a7323f8c9fc95bc652afef3fd57bc9728c88 SHA512 d0c1b17f75a25e546261cabe644420dca155672d9223eaf48fad7ed5bbc3fcf80784df1ff21c5edded0f80e0c5ef61303892afa597b611dfd3f57a1a113be5f7
 EBUILD indilib-1.9.2.ebuild 1537 BLAKE2B ae5d0101c31c4bd95bb688856b5113cbdfff59d7a494b98f916378c4e0d86c94d729c48386c04857e8806764d7f9684195b134e099b723408ba3d35259266ebf SHA512 df6496a6fad0246217468105f06ee3a4a368810cbcfaa4907481c230ea7bf8182d683d60292522bc61eeefdcdb75a1f3c28611bf331d86e10732db365e0a8468
-EBUILD indilib-1.9.3.ebuild 1541 BLAKE2B 2d043ba9b3fbce0370cc288931f20f116cf61dcdecc04b06a99123ec3eac099376230cef28c650db77c31cfcb31f9a9d12f69e1e9352b34092ad5e194fa0f0c9 SHA512 c520f3d8ef3399a2cb9a32143f7c578a5a0a94294dca0b061c4e1e98e5d6d7cef6afc8ab56b44e965f84ab2b5b9aeb4ef85139eb7947210a3cf1788fca5da399
+EBUILD indilib-1.9.3.ebuild 1539 BLAKE2B 78c71fee455cabb943ab34fcb7133846e5b1b5a86f18e83f96634a5481325d28d2670f3b4485544d3833628676179a1130d423ab2729983b734c563f0b35b350 SHA512 6d0a232f6bca61a1d17c0da572849d144f31017f471e6108a04741cc1e1b912c138c3575e6227456ebf2c976a78f4ff714fa09b350cfd3284c41add725a7e27d
 MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f
diff --git a/sci-libs/indilib/indilib-1.9.3.ebuild b/sci-libs/indilib/indilib-1.9.3.ebuild
index 5291dd21585f..52c24844aa14 100644
--- a/sci-libs/indilib/indilib-1.9.3.ebuild
+++ b/sci-libs/indilib/indilib-1.9.3.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}"
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~riscv ~x86"
 IUSE="ogg rtlsdr test websocket"
 
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index d7b6d63200ed..04106f49edb8 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,5 +1,4 @@
 AUX lapack-3.9.0-build-tests.patch 591 BLAKE2B 3db7dad6b798e5e9a4d050b05ef318aebd564d7fca3b3ac12c44f460eb6653693476f016c8a4d6369e4f4e4aa06aa7bf4a1cea38083758e8257f8cfd36c41d9f SHA512 642073d65ab1d5b7beb06e90cd4777ed89f4a76dcd5ec26025fa254ab243c8c09dcd4ca17b8d406e55cdbd302eab36f34a429dc3963a11827209246ebf2251cd
-AUX lapack-3.9.0-deprecated-headers.patch 7489 BLAKE2B c60377475eb9db34f9da1456358c6302fb9584212e74874d2f028fea895a272caa147fee64573d8aebfcfa58af4c6dab3e297b375af6353f5711b437e9a67533 SHA512 eae3c502354bc362612ede131f759f9f814ea80a8cf8597b553ac81d4d7e0910d4c75e56079ca012209f22c1f5a9160ac1f01fe7c7a6ca1238d245e9bc505f00
 DIST lapack-3.10.0.tar.gz 7630775 BLAKE2B fd2f920dd3f69eab471aa8c20d1b8178fb5c6e80337a2ed6948aba3ec639a816f8d368bb59ff6fb513b2f5cda9e61c2a547182f22fbc84a8c34191acefc3406a SHA512 56055000c241bab8f318ebd79249ea012c33be0c4c3eca6a78e247f35ad9e8088f46605a0ba52fd5ad3e7898be3b7bc6c50ceb3af327c4986a266b06fe768cbf
 EBUILD lapack-3.10.0.ebuild 3063 BLAKE2B 7f3fe2ba2104f4a04ebecae2e9159f59cb8e0b742920e6bfcbecc84174404064ddee45e7753815eb7dc7e2dbe555c1f7b570422d92e6fed659d7d608785026c7 SHA512 80423a2c878b688f38a4daa11bbc661b64493a550398d7d8a40ce71ee394444f8fe2a6ad99d3b72d1d48980ff13dbe7bcc8580027a45015f134462412382e3de
 MISC metadata.xml 1583 BLAKE2B 8db26f3744a6ee5f88f7ad37e749843eb8b63cd11af4182dd9d6408a854a5b060a651abd5f2f2098252a38b68b34c464a99f9654be9e6cba8f444eff23e4e297 SHA512 d8e8eb140e1a05f297b9e6edcc9aeb48e958baa7741be2a693ea4fca1a6d3f66a60d72c4c61e2dac8b8efd6210daf10ea9350fdbcfbaf801ac6366d0025ad2ca
diff --git a/sci-libs/lapack/files/lapack-3.9.0-deprecated-headers.patch b/sci-libs/lapack/files/lapack-3.9.0-deprecated-headers.patch
deleted file mode 100644
index 9b3fd93789ec..000000000000
--- a/sci-libs/lapack/files/lapack-3.9.0-deprecated-headers.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-https://sources.debian.org/patches/lapack/3.9.0-3/missing-lapacke-prototypes.patch/
-https://github.com/Reference-LAPACK/lapack/issues/365
-
-From 87536aa3c8bb0af00f66088fb6ac05d87509e011 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@debian.org>
-Date: Sat, 23 Nov 2019 12:22:20 +0100
-Subject: [PATCH] Restore missing prototypes for deprecated LAPACK functions
-
-Some LAPACK functions prototypes were inadvertedly dropped in 3.9.0. As a
-consequence, LAPACKE has several unresolved symbols.
-
-Closes #365
----
- LAPACKE/include/lapack.h | 100 +++++++++++++++++++++++++++++++++++++++
- 1 file changed, 100 insertions(+)
-
-diff --git a/LAPACKE/include/lapack.h b/LAPACKE/include/lapack.h
-index 3f425325f..5c131d844 100644
---- a/LAPACKE/include/lapack.h
-+++ b/LAPACKE/include/lapack.h
-@@ -1842,6 +1842,28 @@ void LAPACK_zgeqlf(
-     lapack_complex_double* work, lapack_int const* lwork,
-     lapack_int* info );
- 
-+#define LAPACK_sgeqpf LAPACK_GLOBAL(sgeqpf,SGEQPF)
-+void LAPACK_sgeqpf( lapack_int* m, lapack_int* n, float* a, lapack_int* lda,
-+                    lapack_int* jpvt, float* tau, float* work,
-+                    lapack_int *info );
-+
-+#define LAPACK_dgeqpf LAPACK_GLOBAL(dgeqpf,DGEQPF)
-+void LAPACK_dgeqpf( lapack_int* m, lapack_int* n, double* a, lapack_int* lda,
-+                    lapack_int* jpvt, double* tau, double* work,
-+                    lapack_int *info );
-+
-+#define LAPACK_cgeqpf LAPACK_GLOBAL(cgeqpf,CGEQPF)
-+void LAPACK_cgeqpf( lapack_int* m, lapack_int* n, lapack_complex_float* a,
-+                    lapack_int* lda, lapack_int* jpvt,
-+                    lapack_complex_float* tau, lapack_complex_float* work,
-+                    float* rwork, lapack_int *info );
-+
-+#define LAPACK_zgeqpf LAPACK_GLOBAL(zgeqpf,ZGEQPF)
-+void LAPACK_zgeqpf( lapack_int* m, lapack_int* n, lapack_complex_double* a,
-+                    lapack_int* lda, lapack_int* jpvt,
-+                    lapack_complex_double* tau, lapack_complex_double* work,
-+                    double* rwork, lapack_int *info );
-+
- #define LAPACK_cgeqp3 LAPACK_GLOBAL(cgeqp3,CGEQP3)
- void LAPACK_cgeqp3(
-     lapack_int const* m, lapack_int const* n,
-@@ -3617,6 +3639,47 @@ void LAPACK_zggrqf(
-     lapack_complex_double* work, lapack_int const* lwork,
-     lapack_int* info );
- 
-+#define LAPACK_sggsvd LAPACK_GLOBAL(sggsvd,SGGSVD)
-+lapack_int LAPACKE_sggsvd( int matrix_layout, char jobu, char jobv, char jobq,
-+                           lapack_int m, lapack_int n, lapack_int p,
-+                           lapack_int* k, lapack_int* l, float* a,
-+                           lapack_int lda, float* b, lapack_int ldb,
-+                           float* alpha, float* beta, float* u, lapack_int ldu,
-+                           float* v, lapack_int ldv, float* q, lapack_int ldq,
-+                           lapack_int* iwork );
-+
-+#define LAPACK_dggsvd LAPACK_GLOBAL(dggsvd,DGGSVD)
-+lapack_int LAPACKE_dggsvd( int matrix_layout, char jobu, char jobv, char jobq,
-+                           lapack_int m, lapack_int n, lapack_int p,
-+                           lapack_int* k, lapack_int* l, double* a,
-+                           lapack_int lda, double* b, lapack_int ldb,
-+                           double* alpha, double* beta, double* u,
-+                           lapack_int ldu, double* v, lapack_int ldv, double* q,
-+                           lapack_int ldq, lapack_int* iwork );
-+
-+#define LAPACK_cggsvd LAPACK_GLOBAL(cggsvd,CGGSVD)
-+lapack_int LAPACKE_cggsvd( int matrix_layout, char jobu, char jobv, char jobq,
-+                           lapack_int m, lapack_int n, lapack_int p,
-+                           lapack_int* k, lapack_int* l,
-+                           lapack_complex_float* a, lapack_int lda,
-+                           lapack_complex_float* b, lapack_int ldb,
-+                           float* alpha, float* beta, lapack_complex_float* u,
-+                           lapack_int ldu, lapack_complex_float* v,
-+                           lapack_int ldv, lapack_complex_float* q,
-+                           lapack_int ldq, lapack_int* iwork );
-+
-+#define LAPACK_zggsvd LAPACK_GLOBAL(zggsvd,ZGGSVD)
-+lapack_int LAPACKE_zggsvd( int matrix_layout, char jobu, char jobv, char jobq,
-+                           lapack_int m, lapack_int n, lapack_int p,
-+                           lapack_int* k, lapack_int* l,
-+                           lapack_complex_double* a, lapack_int lda,
-+                           lapack_complex_double* b, lapack_int ldb,
-+                           double* alpha, double* beta,
-+                           lapack_complex_double* u, lapack_int ldu,
-+                           lapack_complex_double* v, lapack_int ldv,
-+                           lapack_complex_double* q, lapack_int ldq,
-+                           lapack_int* iwork );
-+
- #define LAPACK_cggsvd3 LAPACK_GLOBAL(cggsvd3,CGGSVD3)
- void LAPACK_cggsvd3(
-     char const* jobu, char const* jobv, char const* jobq,
-@@ -3679,6 +3742,43 @@ void LAPACK_zggsvd3(
-     lapack_int* iwork,
-     lapack_int* info );
- 
-+#define LAPACK_sggsvp LAPACK_GLOBAL(sggsvp,SGGSVP)
-+lapack_int LAPACKE_sggsvp( int matrix_layout, char jobu, char jobv, char jobq,
-+                           lapack_int m, lapack_int p, lapack_int n, float* a,
-+                           lapack_int lda, float* b, lapack_int ldb, float tola,
-+                           float tolb, lapack_int* k, lapack_int* l, float* u,
-+                           lapack_int ldu, float* v, lapack_int ldv, float* q,
-+                           lapack_int ldq );
-+
-+#define LAPACK_dggsvp LAPACK_GLOBAL(dggsvp,DGGSVP)
-+lapack_int LAPACKE_dggsvp( int matrix_layout, char jobu, char jobv, char jobq,
-+                           lapack_int m, lapack_int p, lapack_int n, double* a,
-+                           lapack_int lda, double* b, lapack_int ldb,
-+                           double tola, double tolb, lapack_int* k,
-+                           lapack_int* l, double* u, lapack_int ldu, double* v,
-+                           lapack_int ldv, double* q, lapack_int ldq );
-+
-+#define LAPACK_cggsvp LAPACK_GLOBAL(cggsvp,CGGSVP)
-+lapack_int LAPACKE_cggsvp( int matrix_layout, char jobu, char jobv, char jobq,
-+                           lapack_int m, lapack_int p, lapack_int n,
-+                           lapack_complex_float* a, lapack_int lda,
-+                           lapack_complex_float* b, lapack_int ldb, float tola,
-+                           float tolb, lapack_int* k, lapack_int* l,
-+                           lapack_complex_float* u, lapack_int ldu,
-+                           lapack_complex_float* v, lapack_int ldv,
-+                           lapack_complex_float* q, lapack_int ldq );
-+
-+#define LAPACK_zggsvp LAPACK_GLOBAL(zggsvp,ZGGSVP)
-+lapack_int LAPACKE_zggsvp( int matrix_layout, char jobu, char jobv, char jobq,
-+                           lapack_int m, lapack_int p, lapack_int n,
-+                           lapack_complex_double* a, lapack_int lda,
-+                           lapack_complex_double* b, lapack_int ldb,
-+                           double tola, double tolb, lapack_int* k,
-+                           lapack_int* l, lapack_complex_double* u,
-+                           lapack_int ldu, lapack_complex_double* v,
-+                           lapack_int ldv, lapack_complex_double* q,
-+                           lapack_int ldq );
-+
- #define LAPACK_cggsvp3 LAPACK_GLOBAL(cggsvp3,CGGSVP3)
- void LAPACK_cggsvp3(
-     char const* jobu, char const* jobv, char const* jobq,
diff --git a/sci-libs/libcifpp/Manifest b/sci-libs/libcifpp/Manifest
index 440ea42bb5c6..821f036a3ef9 100644
--- a/sci-libs/libcifpp/Manifest
+++ b/sci-libs/libcifpp/Manifest
@@ -1,4 +1,7 @@
 DIST components-2.0.4.cif.gz 81445161 BLAKE2B 80d538109a716af0273d109151a434e68cc1be16dc3a21653a4b78dd9719c93f59259146a6e980fbab4484a6b41d32064a276566411e23bf56b0a42b6dacf408 SHA512 a154305f1d3ba2df24ca3859b0a7d1a81cae79c927a708a531bee1689b0b65752fd68032d12335afa4b6b2f5969e003365abd49bed729d740c0f3055328f08ad
+DIST components-3.0.0.cif.gz 82114845 BLAKE2B 9934110efb9848e8b71e75173bf9c8cfeec1daeef45648296dbcc41641308b9c4e6ff2ef16d86b44ebdb0a200fe6f2a8f13dadac1cce4d8ea2a2961927bf4c94 SHA512 625478378d236ec46130d83545c1b0fbdfb5e9cada3834ac14d4b052e9e460e73523e4438b3356a78d64f569e12cd4c13439b5de56462a10d5c11d0de09d52b8
 DIST libcifpp-2.0.4.tar.gz 960402 BLAKE2B 4650478b187ece13d38c0a5f13c94e6098e3271088a7dd19d72645d52d085304a463387f9d1b1edacbcd03a051b32fbf2384e3287d5ff4835091f2eae2fe2805 SHA512 f4a6b126b376b245d399508e9bc360bcf0451e6bd3cad3127567dd95afb1965c8eb764bb9b0bf26be26695fc5636e509709bdbc9f8c9a00939d049c1634dcae0
+DIST libcifpp-3.0.0.tar.gz 950896 BLAKE2B 8aad3ebea5cc82c2615b6dc6a8a50654375dd9f58ff6c27306bf1415d9658f29f196c5ea9bf0e4f913400b3eba48f19bc11dd97c84b59cf2df94f87afb06d5b7 SHA512 507abed829e4d5194eb22fe73d261295a9814577d7bc53743731e7a1ccb032f763f4bfa0e1b23665d52fabbfa38baca20e6373c14db029705427b6fa773df976
 EBUILD libcifpp-2.0.4-r1.ebuild 753 BLAKE2B 7f03e0bbece535a1461bf34900f2188db6b01416b20ae0d02b8a4a138589462fdc1519f069785ce340256d9b3eff0ca21f3618aa0d6aa625a89ae1813b619fd6 SHA512 61f02fd73ccc0e31e52d48bfd34b29cc9cb043db999f9297320acedc2eb41e4714fa4f7deb507314ac20dc28d188b559120a400b487113c6831f787c0d8b1609
+EBUILD libcifpp-3.0.0.ebuild 752 BLAKE2B 7a0f0ba3cd7e5c4eb345e0b5ab2d9a26f21d2cfb589a013093d646130802f05f8018367f30dcbc62df048e1e2df5bc51150e38854ff594ca6ba7833cd04979fc SHA512 7dab3d21fc99c8e9471289696cd0da08c32463a0390f223594bc01a79355f72b04cbfd162e01a37fcfce10996eb3eabb8e72a85277df098da40d2d24e32fce42
 MISC metadata.xml 217 BLAKE2B f8189b02494f180dac078dcd5c275d3c795f20f360f8b172c66065a2d937e396b24b8631bba4cd8567d60285ce89fc77b9539f2233bf33899c820613c48c33ba SHA512 f0c9e5b3d281fecd21b1e23a6f44c94c1c0b3220de46a177d35932111b7f1ab4399061c42833ac1ee9bd0324b139fc8db66e0d2890224d607bd3be38ae469be9
diff --git a/sci-libs/libcifpp/libcifpp-3.0.0.ebuild b/sci-libs/libcifpp/libcifpp-3.0.0.ebuild
new file mode 100644
index 000000000000..b2fd2f6f962e
--- /dev/null
+++ b/sci-libs/libcifpp/libcifpp-3.0.0.ebuild
@@ -0,0 +1,31 @@
+# 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 )"
+
+DEPEND=">=dev-libs/boost-1.70:=[threads(+)]"
+RDEPEND="${DEPEND}"
+
+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 ecdbbeb4ea50..f8a02dc7a848 100644
--- a/sci-libs/liborigin/Manifest
+++ b/sci-libs/liborigin/Manifest
@@ -1,5 +1,8 @@
 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
+AUX liborigin-3.0.1_p20210828-buildsystem.patch 2399 BLAKE2B 18f07680ade0fefa0c171776b6c8dbb1f36f07444cb0a1722901267b34715b2ca7a7f99a401e8fa3eea18b9160ee16cb7f456de5a3ff3d4c83a5fd52dcee3da3 SHA512 65da6f055f1766cd126eb53065e586e43057b0127500ba75035ab5e8ec31a2fec4910bf84aab8b389fba473c9a94b4500297bc4c0826b40323579ad1b707d171
 DIST liborigin-3.0.1.tar.gz 156842 BLAKE2B 2c88d0419c4c7be1ff6d3aaba1f794fe67174e02e591878c754a32d9b2789bd8594d39f4786d9ac04884b443b528086617a9e1fdbca8815089c8ebb400dd321c SHA512 c3fde3549bce462ea38b961885d6c835aac53db64375645db1d3636eb78396b3353c5bcc9ea3313dac3ffb436de35677ecec6fddb2fcf1eb37eaf6a78e2a31f8
+DIST liborigin-3.0.1_p20210828.tar.gz 156437 BLAKE2B 48713d8854ccd7f46b1aca72bf7b7739af588f08aea32e1d27ff4416ca4fa96a942b19e37fb151f5e7afbd5133d870c305a608e639c620672e683fe805d4f5d1 SHA512 0c9866bef16844102be6ae6e150c927420ca07e6ee50342e9fbd4312f9cd3c476c8d730464b010076f31d7fdcc16bd1133de9ace3a6e5b9b321a231ddab00458
 EBUILD liborigin-3.0.1.ebuild 1174 BLAKE2B 12d27c9ef6740b63b7ad115d3c3cbc685fbc208987eb127f45195543618cd3c26d903c73fd1d2f6600e4304b8f71a27314a1b6927cabb64af7433518f8c3298b SHA512 dfc54d056c43d4b8c5c7be4f1c26a59c6b7890ed44da3d154af4d3e4ea9c59704c74d905e8f4a7f95fd04c461f1e3bae00de5e220b1503f2dc02d147c2cddc0c
+EBUILD liborigin-3.0.1_p20210828-r1.ebuild 1261 BLAKE2B e6866804dc11d372b0d60f2b06f7a399ba4df59034013122c747bd3ea9c22bf6ffb21541ea9de34c2cd22d490166943f2104792985ddc8df5c8382e074989a4d SHA512 fcd595e5f173a915743ce0bb9423a1b9efaeca49081488b227c4277007dc11caef3ef2c8fde9368e0ffc9a23b59b3e94ee8805f4c3866d836ba0e74e0c8c3db5
 MISC metadata.xml 468 BLAKE2B 22310aca9009a66cdbb320d062e2658beeaa39de6d5b09070e48a7eb03848df03dea83e254c78fb60f1dd067b66f2f6d8085253172cc8e70617e68f88bfaf0ca SHA512 7cee5f9738b23031f760e9090bf6368f06070b7600f1ffdd829e987ad862b03d2147045b26550933583ea797825d1ac5674bd1e4426fc734e16c7251cc27f397
diff --git a/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch b/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch
new file mode 100644
index 000000000000..150ae4e21be1
--- /dev/null
+++ b/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch
@@ -0,0 +1,70 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a8e5914..a1a129c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,7 +41,6 @@ set (devel-headers
+ 	OriginObj.h
+ 	OriginFile.h
+ 	OriginParser.h
+-	tree.hh
+ 	)
+ 
+ # allow for installation of individual targets
+@@ -59,12 +58,8 @@ else()
+     message("File parsing will NOT be logged. Define GENERATE_CODE_FOR_LOG to activate logging.")
+ endif ()
+ 
+-# Static library
+-add_library (origin_static STATIC $<TARGET_OBJECTS:origin>)
+-
+-set_target_properties(origin_static PROPERTIES OUTPUT_NAME "origin" )
+-
+ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" )
++  include(GNUInstallDirs)
+ 
+   # Shared library
+   add_library( origin_shared SHARED $<TARGET_OBJECTS:origin>)
+@@ -74,15 +69,16 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" )
+ 	SOVERSION ${PROJECT_VERSION_MAJOR}
+     )
+   # Generate a pkg-config file matching this config
+-  configure_file( "liborigin.pc.in" "$liborigin.pc" @ONLY )
++  configure_file( "liborigin.pc.in" "liborigin.pc" @ONLY )
+ 
++  if(ENABLE_TOOLS)
+   # command line util
+   add_executable(opj2dat opj2dat.cpp)
+-  target_link_libraries (opj2dat origin_static)
++  target_link_libraries (opj2dat origin_shared)
++  endif ()
+   
+-  include(GNUInstallDirs)
+   # install libraries
+-  install( TARGETS origin_shared origin_static
++  install( TARGETS origin_shared
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+@@ -92,7 +88,9 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" )
+   # install pkg-config file
+   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+   #
++  if(ENABLE_TOOLS)
+   install(TARGETS opj2dat DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
++  endif ()
+   # documentation
+   install(FILES COPYING FORMAT README
+     DESTINATION ${CMAKE_INSTALL_DOCDIR}
+diff --git a/liborigin.pc.in b/liborigin.pc.in
+index b6f7c90..55f82fa 100644
+--- a/liborigin.pc.in
++++ b/liborigin.pc.in
+@@ -5,7 +5,7 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+ 
+ Name: liborigin
+ Description: Library for reading OriginLab files
+-Version: @LIBORIGIN_VERSION_MAJOR@.@LIBORIGIN_VERSION_MINOR@.@LIBORIGIN_VERSION_BUGFIX@
++Version: @liborigin_VERSION_MAJOR@.@liborigin_VERSION_MINOR@.@liborigin_VERSION_PATCH@
+ 
+ Requires:
+ Libs: -L${libdir} -lorigin
diff --git a/sci-libs/liborigin/liborigin-3.0.1_p20210828-r1.ebuild b/sci-libs/liborigin/liborigin-3.0.1_p20210828-r1.ebuild
new file mode 100644
index 000000000000..9b2c2bb6e60f
--- /dev/null
+++ b/sci-libs/liborigin/liborigin-3.0.1_p20210828-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+COMMIT="970b90ada051dfa2e80929cde91d052bf28be674"
+
+DESCRIPTION="Library for reading OriginLab OPJ project files"
+HOMEPAGE="https://sourceforge.net/projects/liborigin/ https://github.com/SciDAVis/liborigin/"
+SRC_URI="https://github.com/SciDAVis/liborigin/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc tools"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-cpp/tree
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# add missing header
+	"${FILESDIR}/${PN}-3.0.1-missing-header.patch"
+	# downstream
+	"${FILESDIR}/${P}-buildsystem.patch" # ENABLE_TOOLS, shared link, doc paths
+)
+
+src_prepare() {
+	cmake_src_prepare
+	rm tree.hh || die "failed to remove bundled tree.hh"
+
+	sed -e "/install.*html/s/liborigin/${PF}/" \
+		-i CMakeLists.txt || die "failed to fix htmldoc install path"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGENERATE_CODE_FOR_LOG=$(usex debug)
+		$(cmake_use_find_package doc Doxygen)
+		-DENABLE_TOOLS=$(usex tools)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index a379d83033e8..42c7ceeeb0bb 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,7 +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
 DIST libqalculate-3.22.0.tar.gz 2150167 BLAKE2B 2023dc00e516f26d93e6acae66acb6211fb4dd234fba7e1e012c29ea224276040e75552b923b275e0cbe3e168ed419849f7f204aac3952a872ad0f1916470358 SHA512 2fc7e9e2edda0dfa221865050068eead29f9fecfef8eb8817bacc7493ed03215c60931b40e69165f565fc0574e370131ebebd9b247fedafc5821aae35b71dac9
-EBUILD libqalculate-3.20.1-r1.ebuild 1609 BLAKE2B bd23938bca6883b4216aeeee4089135397d503cbbbab4fb3b839cb8c10adec7780adc5591f202fc03cd042c598a7a6193d2353652af38a09f68b658723f2b041 SHA512 df46c547e21e416ff03f73571098b474bdba5ea5c797a03b8f0c46f2edbe6163d30c2c6039ede337c538708d46f549ce2f7c97ad2b7e41ae6faa10c13ac32002
-EBUILD libqalculate-3.21.0.ebuild 1659 BLAKE2B 1935f1c45853dca19ca328a9dcf2d483978cc7deabd164c9fb07a031d75e2aec7b7797d237c0f807f25399677efb06fb15c5203bd978034d0600eef497c5ca3e SHA512 0e005722cb40663ff315de407df3284f4c45a2342349bea8edbccaef52fc6a86b185e7954a707a857b8eb8a1b386ad46dcc0a68eeacd90098a807d28dd49cb79
+EBUILD libqalculate-3.21.0.ebuild 1654 BLAKE2B c5b306253cf8573552a4317a2472933b38356c174d47e609f4cdb8c44345563c385844c634153c884c16d6e67f8c069d9f3f4e7af751b65f02eec38c6d58391b SHA512 3ef1a0e55ccf8b9457c3a5bd1d40d34196f201faad18e7085b1af42c8ef27f4b9fd8d2f83ae5cdc2ce698f696b200bc85e23f2b575f42d26af78ace024504cd6
 EBUILD libqalculate-3.22.0.ebuild 1779 BLAKE2B e7c473a397155083881de30343ca2324957decd20f0ed03871c89d34733d4b741a14c9a3f057272f2f6e147c27c69ffd5c00439a7f89874f98079cab1164c2b1 SHA512 08333db34e338e746bfb83fe39a5d124073fc7705367dc3f7da197457ebeabef82eedb0d966d31dfffe1ab589ae2f332baa703a03e6aaa19d92237f7583da0e0
 MISC metadata.xml 413 BLAKE2B 40f271cbe3f5ca30aa6ec6320d382faef0864e064ae57599a6da937da85b4de9d57eeec6f8b737698ede76d663149b13247d1edf8b5b291de19ac3d6b5266492 SHA512 053e75b77c4ff628535db22d9763e27c32cee904f0b268d2d507f367c938aff5bdd75a66e3f4c2316dc1d3db579d721564d3a12e139740a3a0d50c36f8d52e94
diff --git a/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild b/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild
deleted file mode 100644
index a233c76663bd..000000000000
--- a/sci-libs/libqalculate/libqalculate-3.20.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/libqalculate/libqalculate-3.21.0.ebuild b/sci-libs/libqalculate/libqalculate-3.21.0.ebuild
index c07e53ae32bb..ce8152e82e7b 100644
--- a/sci-libs/libqalculate/libqalculate-3.21.0.ebuild
+++ b/sci-libs/libqalculate/libqalculate-3.21.0.ebuild
@@ -13,7 +13,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/lrslib/Manifest b/sci-libs/lrslib/Manifest
index fb6f27fd1c09..c74d002c9f66 100644
--- a/sci-libs/lrslib/Manifest
+++ b/sci-libs/lrslib/Manifest
@@ -1,6 +1,6 @@
 AUX lrslib-071b-makefile-cflags.patch 7312 BLAKE2B 1866059b3dfe59221f9448a9025186fce190a547b2ba5c01fc872e8ea4cac497c21c7bcc3dfceea70df7ae7b7d39dec6115e1945b497f9987ef2baa4783bad75 SHA512 460cd8ac278e02c2580581ecfc79d208b18fda77b55a4709076b31579a4533810d5d157c96c96375ed021c373d67d7bd0e3cad3758e0d09d47c3e239b479a888
 AUX lrslib-071b-makefile-ldflags.patch 11708 BLAKE2B 669a6194a3c7ae966bfa0660671a59fa16be6dc5770e0743a27274a6bd2e42f7bd5caa59476ab4bb9d128f2f48ad7d704cd85301f0507235d7f1d711f257f9f1 SHA512 c863e8c30df9b2cd608453430c6a484c94cbd9200ada9161c9a2a8e7994ffaffad125b874318ebd74b4c66e57347f7687db85b461abc75f47b7ebba8b0db2537
 DIST lrslib-071b.tar.gz 466789 BLAKE2B 57a8abd9d203b1cdc62d6848afa77aa6912d9d720a0dedfbe72ca602ad8ba36d13160f7da7d719e3fa140ba2cb6432d20590ae9ea9b1f66bc2e24c393d9fe1bd SHA512 feafc5726e66c977e917f0b59ae950cdb98dbd84639885b487930aab2a89a7f067a3f39c381acc3eae7206b91255e1befa5551488d8816afc0f8054d801eb539
-EBUILD lrslib-071b-r1.ebuild 1349 BLAKE2B 41f7bc2fb58761ab49d6ab888142e9272b16ff3dbe291f2ed64dcb0bef1514e967706b080b559eea4ebc322716048346fbebae5d1cce8a960f39373d26187e5b SHA512 1b93a3e7b399519d1ccc30e141002e5c9049dd509cbe489558063dfee40925aa76457c63e7a40943897d2685657949edb0c15a68a619a65c74acc52e42237584
+EBUILD lrslib-071b-r1.ebuild 1348 BLAKE2B bdd532532da7cf0d817e7360f04d7e6b28876aa712de70021acc35a2624cf40b9f7f8d3134600c739d1e3af6e50bd096223dfcab45072e07955231459f353700 SHA512 bc6f63cfe4d1d3d9c0232b08a6e240c31745b6a296afd03fb8492f17a3e67d9077d36a2bb09eba1175c22d3c5175f1252651424b1630e63a183344bcb943f333
 EBUILD lrslib-071b.ebuild 1328 BLAKE2B 2583df67a90104c442f382c1a7b3baab92ad7294dd36552fb1fc0fc7c5eee575a1f3d221faf8efea8c6ff35efb7495ae7b72d56aafe1f8821758b2ebe62a61d8 SHA512 f0cf668e6181fcab7887afd6bdfd7757bb2d6dba4c94c980bf132128b070ecdf9aa12e2d1342bd8baf66040e5ff0ef8a18ac9e2999335ec7530e3397b8aed194
 MISC metadata.xml 770 BLAKE2B 79a7016f0c9de246e2873db9026c26f360432b238fd8d380d75830ae7560d56743981f053fef60a2516befef7d9aa6947cb0a3cdb9de077bd6a65a8faa4879d7 SHA512 007d258279f5d48fdc108176f4230958c683cbfaca08a9f16c194b5bccd3d622a6049e7aea0ee7fec65643a0959f948371d0b228501acf9ebbe58ecabf904171
diff --git a/sci-libs/lrslib/lrslib-071b-r1.ebuild b/sci-libs/lrslib/lrslib-071b-r1.ebuild
index b252998413f4..9b601be1fbd0 100644
--- a/sci-libs/lrslib/lrslib-071b-r1.ebuild
+++ b/sci-libs/lrslib/lrslib-071b-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/${P}.tar.gz"
 # COPYING is GPL-2, but e.g. lrslib.h says "or ... any later version."
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="gmp mpi"
 
 BDEPEND=""
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index b9db4cc5ad39..f1732456f095 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,4 +1,6 @@
 AUX openblas-0.3.12-shared-blas-lapack.patch 2008 BLAKE2B 2d3a4a90d8144cbf149b7711b67364176a94287f26448930b5a4fd29fe761fb250e9007c580fb1ffa8148c477e2f4057f9cd8d7aa07efeb85caa842802d358fd SHA512 3f0d4b480549565c838eba6371e0990c162f56a226f9d26e1639e012ae3f39809f8c6badcf8fdfbb1258f45367dbaff9c4c611b8b44bac27d341aea954f0133e
 DIST openblas-0.3.18.tar.gz 12619822 BLAKE2B 38a5e7b861eb0063a4494c1cfb6f7f5723741437ecdd5cb1fb42645eb73bceb472b3a8c11eec3d0ba4f676981ac89de4ff1ee0d7ea42d1e234746f34ce8fb6b8 SHA512 df9a14026a61bdc5285636bfd7a52dce244d24fcf4a0c870ef4e58b8b50e412849828ca5aeac2a2435f635e78e60559762e8bae22ea7bc5dff2e865a96d81152
+DIST openblas-0.3.19.tar.gz 12706050 BLAKE2B c29aa27faaf18e3330087f8d2ebed733f53878266d6865239dfbb1624a113f3cabc988bbfcc18a0aa5d971697bc68bb267795ef24e2d8e0e8d50f802cb817b57 SHA512 1fcbcfefb7744894b0b0c83c6071b342086ca311dc67f5c2745812d61dcc9d31ef7dd5e1215dfb2731ae7197d497dbdf8f8b26a432eb07d41a7db0983eb86a33
 EBUILD openblas-0.3.18.ebuild 5679 BLAKE2B 08e30894d5c3d7eb488f008388aeae506eb7ee421a9b591b9738d3ba38bb1440dd382d5c7c8e3c79c655cb7c6a2432f954dee0c0d65fc8f93bbb17e165dc920f SHA512 a23a6d112452702b570a8c30a888e70afffe2ae7e24da58ee915ceb4b2cc5d11914fdfc653ab7c225878af8ab6202cca5d03cb1cbd17792a82f5916a8d5fc91c
+EBUILD openblas-0.3.19.ebuild 5680 BLAKE2B 1da504eb60a8e08526c85a4ceb15bbfad4f0518cefc9bd33471c7dabe4b913d789f1f5aa7507b50b92004fb21f99862234466089ba4d6ebb7dfbdc15b2e8ac93 SHA512 2372e6dc6be860fbc7c46d00a089083722d83dfa1af07626474b76ed775731bc46e558b6cd81ace9b9a5bf516f8007cd73261c0254e907299892a2bb54760f27
 MISC metadata.xml 1561 BLAKE2B 5ba7ec66dd8ba7ca8bc29bc0193b48b6a82b4949bb79bab461400040667aa66aac3cfd2ad9c7323798048fd43d18ac96a562d53b68f3f7ae8bf8505ac7a04691 SHA512 05272eb56480ff82b240d0f430df3df03981e24b971dbd37c13d464f4f4b334bac19b54915446a09326a334aa76249bb79a4fa389d26150365f21389992f9a48
diff --git a/sci-libs/openblas/openblas-0.3.19.ebuild b/sci-libs/openblas/openblas-0.3.19.ebuild
new file mode 100644
index 000000000000..7d76564474ca
--- /dev/null
+++ b/sci-libs/openblas/openblas-0.3.19.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic fortran-2 toolchain-funcs
+
+DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
+HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
+SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/OpenBLAS-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="dynamic eselect-ldso index-64bit openmp pthread relapack test"
+REQUIRED_USE="?? ( openmp pthread )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	eselect-ldso? (
+		>=app-eselect/eselect-blas-0.2
+		>=app-eselect/eselect-lapack-0.2
+	)
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.12-shared-blas-lapack.patch"
+)
+
+pkg_pretend() {
+	elog "This software has a massive number of options that"
+	elog "are configurable and it is *impossible* for all of"
+	elog "those to fit inside any manageable ebuild."
+	elog "The Gentoo provided package has enough to build"
+	elog "a fully optimized library for your targeted CPU."
+	elog "You can set the CPU target using the environment"
+	elog "variable - OPENBLAS_TARGET or it will be detected"
+	elog "automatically from the target toolchain (supports"
+	elog "cross compilation toolchains)."
+	elog "You can control the maximum number of threads"
+	elog "using OPENBLAS_NTHREAD, default=64 and number of "
+	elog "parallel calls to allow before further calls wait"
+	elog "using OPENBLAS_NPARALLEL, default=8."
+}
+
+pkg_setup() {
+	fortran-2_pkg_setup
+
+	# List of most configurable options - Makefile.rule
+
+	# https://github.com/xianyi/OpenBLAS/pull/2663
+	tc-export CC FC LD AR AS RANLIB
+
+	# HOSTCC is used for scripting
+	export HOSTCC=$(tc-getBUILD_CC)
+
+	# threading options
+	use openmp && tc-check-openmp
+	USE_THREAD=0
+	if use openmp; then
+		USE_THREAD=1; USE_OPENMP=1;
+	elif use pthread; then
+		USE_THREAD=1; USE_OPENMP=0;
+	fi
+	export USE_THREAD USE_OPENMP
+
+	# We need to filter these while building the library, and not just
+	# while building the test suite. Will hopefully get fixed upstream:
+	# https://github.com/xianyi/OpenBLAS/issues/2657
+	use test && filter-flags "-fbounds-check" "-fcheck=bounds" "-fcheck=all"
+
+	# disable submake with -j and default optimization flags
+	# in Makefile.system
+	# Makefile.rule says to not modify COMMON_OPT/FCOMMON_OPT...
+	export MAKE_NB_JOBS=-1 \
+	       COMMON_OPT=" " \
+	       FCOMMON_OPT=" "
+
+	# Target CPU ARCH options
+	# generally detected automatically from cross toolchain
+	use dynamic && \
+		export DYNAMIC_ARCH=1 \
+		       NO_AFFINITY=1 \
+		       TARGET=GENERIC
+
+	export NUM_PARALLEL=${OPENBLAS_NPARALLEL:-8} \
+	       NUM_THREADS=${OPENBLAS_NTHREAD:-64}
+
+	# setting OPENBLAS_TARGET to override auto detection
+	# in case the toolchain is not enough to detect
+	# https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt
+	if ! use dynamic && [[ ! -z "${OPENBLAS_TARGET}" ]] ; then
+		export TARGET="${OPENBLAS_TARGET}"
+	fi
+
+	export NO_STATIC=1
+
+	BUILD_RELAPACK=1
+	if ! use relapack; then
+		BUILD_RELAPACK=0
+	fi
+
+	export PREFIX="${EPREFIX}/usr" BUILD_RELAPACK
+}
+
+src_prepare() {
+	default
+
+	# Disable tests by default
+	sed -e "/^all ::/s/tests //" -i Makefile || die
+
+	# if 64bit-index is needed, create second library
+	# with LIBPREFIX=libopenblas64
+	if use index-64bit; then
+		cp -aL "${S}" "${S}-index-64bit" || die
+	fi
+}
+
+src_compile() {
+	default
+	cd interface || die
+	emake shared-blas-lapack
+
+	if use index-64bit; then
+		emake -C"${S}-index-64bit" \
+		      INTERFACE64=1 \
+		      LIBPREFIX=libopenblas64
+	fi
+}
+
+src_test() {
+	emake tests
+}
+
+src_install() {
+	emake install DESTDIR="${D}" \
+	              OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
+	              OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir)
+
+	dodoc GotoBLAS_*.txt *.md Changelog.txt
+
+	if use index-64bit; then
+		dolib.so "${S}-index-64bit"/libopenblas64*.so*
+	fi
+
+	if use eselect-ldso; then
+		insinto /usr/$(get_libdir)/blas/openblas/
+		doins interface/libblas.so.3
+		dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so
+		doins interface/libcblas.so.3
+		dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so
+
+		insinto /usr/$(get_libdir)/lapack/openblas/
+		doins interface/liblapack.so.3
+		dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
+		doins interface/liblapacke.so.3
+		dosym liblapacke.so.3 usr/$(get_libdir)/lapack/openblas/liblapacke.so
+	fi
+}
+
+pkg_postinst() {
+	use eselect-ldso || return
+	local libdir=$(get_libdir) me="openblas"
+
+	# check blas
+	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
+	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
+		eselect blas set ${libdir} ${me}
+		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+	else
+		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+		elog "To use blas [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect blas set ${libdir} ${me}"
+	fi
+
+	# check lapack
+	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
+	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
+		eselect lapack set ${libdir} ${me}
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+	else
+		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+		elog "To use lapack [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect lapack set ${libdir} ${me}"
+	fi
+}
+
+pkg_postrm() {
+	if use eselect-ldso; then
+		eselect blas validate
+		eselect lapack validate
+	fi
+}
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index c1fe5fe55c87..808ba0db08b2 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -11,5 +11,5 @@ EBUILD proj-7.2.1.ebuild 1215 BLAKE2B 26a84ff93fefa9b88ab8017fa58da6ec89f037beb7
 EBUILD proj-8.0.1.ebuild 1431 BLAKE2B 17e47bd41495796fb1d2c4017fc5ffd074e04dc35acc0e8884aadb157247b91bb4a5efb076fd3c96c3310c4066571afbf385ab73a0b0ee596d22017bfd42ce4d SHA512 fd310ac894ddaac7298bfba6c0308ff6ec496e264b25f584d1024f31ed140af2f25025731779b811b0be7cc3fe26183f17de8fe9ba088a889f57a3e66f66a9a6
 EBUILD proj-8.1.0-r1.ebuild 1498 BLAKE2B fbbdb247cd29bf471e0ba6e2a5fe6b7e171c31e626ba2718e05ed2154643719d239cf4e2e20539134c45c31cfebff26b5bea98d88ce707a61fa30e4cefd08eed SHA512 d3578c54ee71ab99f6994df2aebdbe8b7f33284160ff14a684f7582a6fc9b1008a4ba77a6e04a3ab54c5648d93ae2d243c434bfeda26068d8cc39aab12d0996b
 EBUILD proj-8.1.1.ebuild 1298 BLAKE2B 2880810174ab266045211695a1af20a32289675766f0557eeef14d63a153c1dd3748ff0fb458b5965928507e6182d8e6a7ce077a236e315b9b4dbbafd0fd49cc SHA512 d0bc55182ee6c3f83fd5d1c97a53d80d864eeabdc018862cfbaa18db7bec2eef75b24965120cdbacf4c3ab9ebc8a05868c86fc4cfad152622c16f50bfd9963b4
-EBUILD proj-8.2.0.ebuild 1431 BLAKE2B 556d17bd63e6ea0254e5658b53c8d4d32151f7e85cddcfcf5ff6870e4676210fa3a25b1fdb8e83b75a0a2a54efd3f95833f0cdd20711273b7a9c0e8003e74954 SHA512 fe7ba90d5f4bad18adafd133ebaab2a6bb2707ebe7e08fb1b7196e0fb1695458f81367e8d90271e661ca8e5ee6cee7bc08e9306d4277f364c8d0e35cf27a3cc8
+EBUILD proj-8.2.0.ebuild 1426 BLAKE2B be7f95d899ddc8d10bdfdd682cb73fba9949c21feef1e657637aa840add94dd5161fc57cad6bd7775d15d9b20b8b9d6bfbb2c06eb7a4ceed82b3f8e979f96509 SHA512 fa971dc5e7ba297e46c3116105759c0f6acd5d16387519d4eed477ddaefeb1a84af3b0fdf26518c9c411e2290d4646e41ddf7708c56e7e9e3347086d587d3830
 MISC metadata.xml 450 BLAKE2B a29666b3ab3d0e39d3d2ab247f250cd4f9a716ee1f01563e8d6739f507b96f553187999c6fcd501a0f8e9a564f7e5fe3a54c29dd985d1f91873da8252840ebf7 SHA512 c319fbe8249838dc881424641a19abc639d4a74d585e434be1a27802eb9fa88711a1c631ba92abd333d7baaa739b1c98faebe7c20ce7c1a4639d38b9dbe40381
diff --git a/sci-libs/proj/proj-8.2.0.ebuild b/sci-libs/proj/proj-8.2.0.ebuild
index 55d9a6ddfb5e..6824f59ebbf5 100644
--- a/sci-libs/proj/proj-8.2.0.ebuild
+++ b/sci-libs/proj/proj-8.2.0.ebuild
@@ -20,7 +20,7 @@ LICENSE="MIT"
 # going to correspond...
 # It's far less confusing to just increment it again here (so N+1)
 SLOT="0/24"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="curl test +tiff"
 
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/scikit-image/Manifest b/sci-libs/scikit-image/Manifest
index 84c35afc0cea..e86613ecabe7 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
+EBUILD scikit-image-0.17.2-r1.ebuild 1187 BLAKE2B cfe9fdb911ede840f3fd4876aeef4281d840ebef24fa9adb88baf6440ebb3dc35a1f10b6c0b6d262ec698df28587103ad1f34cf5ffb387099027531e114bc161 SHA512 9a89cf779e7e244da72abad09c49183fb0038528fe1a80ab1f5a8e3a4442590e7d5cd74c7c350cc0dee64b1b06100269d8dcaec05b8add707698307d70f218f6
 MISC metadata.xml 695 BLAKE2B 11487b964bde2ce1a39a8680bc3cc62045c4a7e2e17844de830d5f0e043660c431cd002a2a0fc19acb4c0262289ee280195475dd1f8b35f6a51ce0df369871f8 SHA512 fca83587d443373fc7219911900105676bdba5a7ced07ac00a9ab5cbe361d8ca1175b02b04fa53cdbde6f198a986b21f989baf32139cd76b7d1b2b78034d3142
diff --git a/sci-libs/scikit-image/scikit-image-0.17.2.ebuild b/sci-libs/scikit-image/scikit-image-0.17.2-r1.ebuild
index da23a5193568..762e9a629aac 100644
--- a/sci-libs/scikit-image/scikit-image-0.17.2.ebuild
+++ b/sci-libs/scikit-image/scikit-image-0.17.2-r1.ebuild
@@ -14,19 +14,16 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="
-	dev-python/imageio[${PYTHON_USEDEP}]
+RDEPEND="dev-python/imageio[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/networkx[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pywavelets[${PYTHON_USEDEP}]
 	dev-python/scipy[sparse,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
+	dev-python/tifffile[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 
 DOCS=( CONTRIBUTORS.txt RELEASE.txt )
 
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index dfdf032b77d3..e9f178e4cb2c 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -4,7 +4,7 @@ DIST scotch-v6.1.0.tar.gz 6292006 BLAKE2B 5b76b01c0fa752468a36830a15c190cd78efc8
 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 5042 BLAKE2B 3482237b7fcfaa11a4c1b0845d780059823ad509c823d41f052991b6a8977d6cea0ba1e96e5270a6d983a313300a6cb6e41ce7a94d7bb8316d3c38be521f1e9f SHA512 c376bc48a33a468921001462b116a2de43717d33b18e018e45f04efffcce034ea3c64b1eedae31f5a92e744d41bcff39cfc50ef0ca0f76f1062f814d40eeef46
-EBUILD scotch-6.1.0-r1.ebuild 4951 BLAKE2B 5b30bbfc10c45bd4d78638457bb7efd60695bb397d371f454a7f793cd897f7ec82bcff56fb98bd632db82baf2babc09110b8c38e72f327d7803d7ac7e4336297 SHA512 a6a4dbf66895d0d0e9aea5c5af04ab08148a72fcdb0698d3cd6c7c4a10e1c55089b21557115b7b1728303fb0bc56ed70766fe5659dee713e1e911e000e933112
+EBUILD scotch-6.1.0-r1.ebuild 4949 BLAKE2B f9ad61cc69a0ff7334f44148d405fff85491b71ee8e954a64eea476ef9744dc39870d994120e0b584999795227c35423a44215e399fee27574469c137a57bfd6 SHA512 9f7210c730b4f67062c8fd13643772240159c0b79b277940aaaf8f7d64783dc24361975b45cd5c95bedc3ca600841985fe32f234dcb2b81369b16729aefd055a
 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.0-r1.ebuild b/sci-libs/scotch/scotch-6.1.0-r1.ebuild
index 04b11a76de4b..952cc6463c3f 100644
--- a/sci-libs/scotch/scotch-6.1.0-r1.ebuild
+++ b/sci-libs/scotch/scotch-6.1.0-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="CeCILL-2"
 SLOT="0/${SOVER}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc int64 mpi static-libs test tools threads"
 # bug #532620
 REQUIRED_USE="test? ( threads )"
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index 935fb0df2602..afb5b6d03aa9 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 2778 BLAKE2B 2f0bea50ecf318e471278a509a78f059eebd684526c30377e46c72f717f6c1e0b3b876dae842bf310bca1a65e2209216cdb4cc72da89daa36babf65ad6d4bc03 SHA512 5d5365e470f1a4f7338f54f7814cbcbcaf1b3b688c41216947b63ff4049d079a828598d025c8b4f3ea1f5478ee39b40047048626828bc2dda1eb532c7ae2ac2f
+EBUILD sundials-5.8.0.ebuild 2777 BLAKE2B 5bc6e47e4dc53fe64453b27e682f9b4abd56c72b4cfb840706e995894156deef3069dcc62a3e3ba2a653270f0bdb91ad07feb0670336864bfddb60a82049f1a7 SHA512 47ce09f541247c8892310d547506529a94e8b3b56a90d829c1ce93b69401370206ca3567a2286150588c1b5bfbf97b3849d6bb33b137102f306e02e2028697a3
 MISC metadata.xml 1131 BLAKE2B f898dfbe0da057432c5c0549d850293224137cb07d234721894752821b638f3002a1d17a06c4258b94fbc2d0e4ce5e9ee2b06c1099c473989de36b62001f2d63 SHA512 f53a7aec4b5ebc0f7737938f811e4c87842a07b03c423715296ad2992e353f661022eb2bb344e33fb03d70af6e4ffdf1908a34bdbafc3ebe9d30fa7f4bd7cad1
diff --git a/sci-libs/sundials/sundials-5.8.0.ebuild b/sci-libs/sundials/sundials-5.8.0.ebuild
index 56a1a89dc03b..623a8cee16ed 100644
--- a/sci-libs/sundials/sundials-5.8.0.ebuild
+++ b/sci-libs/sundials/sundials-5.8.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads"
 REQUIRED_USE="
 	fortran? ( static-libs )
diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest
index 6c8c19190c4f..f0a2d10a735a 100644
--- a/sci-libs/symengine/Manifest
+++ b/sci-libs/symengine/Manifest
@@ -2,6 +2,8 @@ AUX symengine-0.7.0-boost-1.77.patch 607 BLAKE2B 8f9c6103369e83413667dc65fcacea8
 AUX symengine-0.7.0-cmake-build-type.patch 1234 BLAKE2B b416e9b83db5eb6689bb9e18682d8f36f6ec13a4fe368004d2c3f961945cb0d1ec94081cb2c99bb16656439214cfd127a21cad2844a4752cd5c2fa6f40f3a3dc SHA512 d5e09a9603fab4caa9d9b091a0636be5ab8eddea6cb5b37b184ff7a65ac9707536f1a71e1893e0b5f795efb33396ae653d2745487aa863f7a239c63e42d22032
 DIST symengine-0.6.0.tar.gz 763481 BLAKE2B 37fe94ad08463b31c7387ab296b201a4dda821ba59dfa548d0c42e70d23958bae24df3f035bd3fffb46cc08cc010d13a25e607a9e0644e9b3c0602fa0eb363b3 SHA512 cc6f0468534e5bcd466a810d44f9884b17858ca6c7151cdcadb3af0f7d8faf0d96697d5887ab65fc9094de80df825f8243dabc54e3f5c387be544880f49b482b
 DIST symengine-0.7.0.tar.gz 802307 BLAKE2B de207f565f179deae37479eec82dfced3d83bfb7e643b4e6969135e10130dd05c888f34aa75c76c238ff1babfd0864f3329c3deee126b84ec33c4937c11dc20c SHA512 fd3198bc4a05ca2b9b8a58039cc21af65b44457f295362a1a9b8dbf9c6e3df5186c0c84b289bc9fe85d9efd5ac1a683f6b7ba9a661fb6d913d6ceefb14ee2348
+DIST symengine-0.8.1.tar.gz 733007 BLAKE2B b218674bd4cc1eb5b5ebf7ec9d69093d3ab0d25c5fd302430457189ff56f44cb56640fab380a7415fdc241e9c7e3e1a4199ec8063a54b9358b35f0ab8076f05a SHA512 b83b354a722c589cf262fbfad902b277a7232ae2b949ff97f4ad8f654c44965f15eae7d78e87045a42dd6ee5f6f6f67af0a2c4def8899db430fc17e3360696a9
 EBUILD symengine-0.6.0.ebuild 2205 BLAKE2B 4bbd97357a16e4bbad1fcfdf26034dc51f5bd6718369f709978d0f9a7b399b473ea776ac6562979d29e1accc2f84f897ef8f58d116d0331e4092da5ba0278abb SHA512 403bb10352daad01d3665f06858400dd03875802817e0e1a8a8bf936fbd6a3cdd191ea4523aa056d6f19874125ad9949cea3b950a75c6dca75688848ed107c76
 EBUILD symengine-0.7.0.ebuild 2296 BLAKE2B 8952fa33f97daa9f6524bb174cac9d34a75d0a156fefafa63fac190eec2dc3796381a0498399d018be1156ba736f0c251d4e4132e39324a56f0f5f46ed13c4fc SHA512 b73f20009778716b1c398fcc9350c295d629d114ac9d527652280b24e729ee24a0bf51f0ee899e0269b4306ea69f825e895e13655f406b47f4fd21d04277fcde
+EBUILD symengine-0.8.1.ebuild 2254 BLAKE2B 69350175403c94844ade07e8eee8479a691a2fb3239159dfc4ca421639271063f0e307680a5c1c17723a8af7141be479ea6164d7f599e380787d3230664a7231 SHA512 b7c85253e6aef1210bc7aed2b7ba16ddc704d97a7f0c28d3e2dbb43401a29a38f55520861e4348ac161d7b02441e96634956771e438f33dc406375f535559f1a
 MISC metadata.xml 1266 BLAKE2B 4aa9d4628e60ad9819cce8afc672e84e10da0393cb424d6c73768d599a748f115ac882d4ca552112b6bcbe418af8828c546b35ff110df4c3c1b9b0290c394401 SHA512 889cabc8e8132166d5c3ff330cc4c05f27f9a75f039b549c2639efa9e89ae181ad8f7eed646a27e8637a07efd930f99f0dafd9b1318d7f1d6a51fdd7418cd264
diff --git a/sci-libs/symengine/symengine-0.8.1.ebuild b/sci-libs/symengine/symengine-0.8.1.ebuild
new file mode 100644
index 000000000000..6bfea75fb875
--- /dev/null
+++ b/sci-libs/symengine/symengine-0.8.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic toolchain-funcs
+
+DESCRIPTION="Fast symbolic manipulation library, written in C++"
+HOMEPAGE="https://github.com/sympy/symengine"
+SRC_URI="https://github.com/sympy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/0.4"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="arb benchmarks boost debug doc ecm flint llvm mpc mpfr openmp test tcmalloc threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/gmp:=
+	sys-libs/binutils-libs:=
+	arb? ( sci-mathematics/arb:= )
+	boost? ( dev-libs/boost:= )
+	ecm? ( sci-mathematics/gmp-ecm )
+	flint? ( sci-mathematics/flint:= )
+	mpc? ( dev-libs/mpc:= )
+	tcmalloc? ( dev-util/google-perftools )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[dot] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.0-cmake-build-type.patch"
+)
+
+pkg_pretend() {
+	use openmp && [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "s|DESTINATION doc| DESTINATION share/doc/${PF}/html|" \
+		-e "s|/lib|/$(get_libdir)|g" \
+		-e "s|lib/|$(get_libdir)/|g" \
+		-e "/DESTINATION/s|lib|$(get_libdir)|g" \
+		-i CMakeLists.txt symengine/CMakeLists.txt \
+		symengine/utilities/teuchos/CMakeLists.txt || die
+}
+
+src_configure() {
+	# not in portage yet: piranha
+	local int_class
+
+	if use arb || use flint; then
+		int_class=flint
+	elif use mpfr; then
+		int_class=gmpxx
+	elif use boost; then
+		int_class=boostmp
+	else
+		int_class=gmp
+	fi
+
+	local mycmakeargs=(
+		-DINTEGER_CLASS="${int_class}"
+		-DBUILD_BENCHMARKS="$(usex benchmarks)"
+		-DBUILD_DOXYGEN="$(usex doc)"
+		-DBUILD_TESTS="$(usex test)"
+		-DWITH_ARB="$(usex arb)"
+		-DWITH_BFD="$(usex debug)"
+		-DWITH_SYMENGINE_ASSERT="$(usex debug)"
+		-DWITH_SYMENGINE_THREAD_SAFE="$(usex threads)"
+		-DWITH_FLINT="$(usex flint)"
+		-DWITH_OPENMP="$(usex openmp)"
+		-DWITH_MPFR="$(usex mpfr)"
+		-DWITH_MPC="$(usex mpc)"
+		-DWITH_LLVM="$(usex llvm)"
+		-DWITH_PTHREAD="$(usex threads)"
+		-DWITH_TCMALLOC="$(usex tcmalloc)"
+		-DWITH_ECM="$(usex ecm)"
+	)
+	use arb && mycmakeargs+=( -DARB_INCLUDE_DIR="${EPREFIX}/usr/include" )
+
+	test-flag-CXX -std=c++11 && append-cxxflags -std=c++11
+	cmake_src_configure
+}
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 1c09121f655c..21d532193ef8 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -44,10 +44,12 @@ DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932
 DIST tensorflow-2.5.0.tar.gz 55999506 BLAKE2B 0f1f29ed9ff6e5fd3fc0c98419bca636f48085810f934290885b3469c45817b2ce17e9dbd3d93d70b09ec7975088edd0973f147449f527a8f2e23b388e2592ce SHA512 637c63b1bed1c0eb7bb018f1ff7f29f7f0d78e75dac384df4ecb5dfb92bbcb28209e3d3d2204145abddf88e3247d8c31bbb4cea032a73b7122b2ef3eb0d2b947
 DIST tensorflow-2.7.0.tar.gz 57751022 BLAKE2B ae022bffd0609f2bac388510e270e5ec4bf400cbebd074e4580d3a85734b238ad2daf19196246f1bc93a7679383c2527fd27bcbd7da9ddb17189a7998796bdac SHA512 f1e892583c7b3a73d4d39ec65dc135a5b02c789b357d57414ad2b6d05ad9fbfc8ef81918ba6410e314abd6928b76f764e6ef64c0b0c84b58b50796634be03f39
 DIST tensorflow-patches-2.5.0-r3.tar.bz2 6385 BLAKE2B 5cd3a9639884aa67bbd192cb1b06cfedc557b8ad05aca0f4887987c615656620b9294de98b119bf9d6edafd5b56b9d5e6900f95adb06a3a49cfdf342c6195b22 SHA512 8f0d2be9ffed81aba5c85088a79ca56af889e0247516f51657d214d19d39877cfe331e60f63e8c54e2b12acd7a624b181e281534acbd9a103f6eec0aae70fd8a
+DIST tensorflow-patches-2.7.0-r1.tar.bz2 6777 BLAKE2B 2705d527810b40878b250d07a90126cac66edd907aee0d97d5785235ad67b6fa0ce6e9e56ec02174a6f5c8216e42ab6d8e752e27c9e444e82d16eefcd4b6b7d2 SHA512 d0f3fb95fdfb308b0b1aa1fb4101515e7b2b7e68c569027b612470aed82fc64ca233388e9b7ed92d7d26e3da7577d4cb4f96c34ea3707a36e50eade3d9b7eeb6
 DIST tensorflow-patches-2.7.0.tar.bz2 2928 BLAKE2B 4814c3b31d1c6236711c41f62b5653fbca0ff9810c08081aa070eb87c4d6c296cb6ae3c6fd3409b48dd06540098404eb60be7f74e7fdfc55808b694b8bffbbf4 SHA512 20d138d00a1d54a748bf47031ab0d308b13ed1c51ae931bc60141221a0db902d4839040ab21de7b3d87c1d890223fda0c11e18ad61157d6e07bcca9f3f90375c
 DIST tensorflow-runtime-64c92c8013b557087351c91b5423b6046d10f206.tar.gz 15224747 BLAKE2B b6aaaf4f6dd488dbfc49f6f9bd6d7820894b7f205ab76c38288175c70dd9ee656128a0655fc1f7ca1ada33d96193c9bb3569da02d0b591aea9ffbb9cf1f223b8 SHA512 1e66742ccda9778fdf9e0e1e83b0524d6b3e82e7792918ae058c031e81b033bc51cebf49752832aa2f27a53a6a9846256e4e9e9eec7c5285ad2db2cb8995ecfc
 DIST tensorflow-toolchains-v1.1.10.tar.gz 137512 BLAKE2B 774b22a599070564c0f77ed0da79f6a96359b196dd3007370be885b796c236b9a29c01597507a3049f82cf489824c8016740b778cacb2b8cd859500f9ecb1887 SHA512 1daf4684f5b364a89b3cc475cf2d13d0d0622fc14d2b32d7ad8518932538e716782d755cfcedc98d129a3986bc7c38bfc7854c8ad596891e397510b75ae2f93e
 DIST tensorflow-toolchains-v1.2.7.tar.gz 97867 BLAKE2B 2f613366b34b81d044da1407ff6371c6183b14593c719ea82ffc964c310df72282ba102be50a9c65655f9185b4ab59d707fe823608b6e452ebf9afc70589bcd5 SHA512 b70da3594aa0499b4e158258ba29ef30044cb6e354e2608b79274f712976b687b09e28a2576d3d89e6bd8ff41416ee19f2d5505b712ec98488c8b8cb839ede84
-EBUILD tensorflow-2.5.0-r3.ebuild 15612 BLAKE2B dd201acf46d14bff88209e3e824ef85565ec8d5a70087c86a4e086148dd6247f123eadb967be47f995794ab163ad7fb428a876923005ca6a3371081192592b7b SHA512 2cf8b9f9e2ad0a9a6429314285c3adedb4f380d9b8d950b892581851f5bf59d839de42e61ff10413ed572600b0c0c2f250f23add4c84f51a8191bdf3a333b28b
+EBUILD tensorflow-2.5.0-r3.ebuild 15558 BLAKE2B 8766664141227fc2b0ad04c3061fbca8eda2e52f036e1333b2005510aabcd5d2ccb449556bb53259cb7169cb40bf608222590495f580f4e1e9258f769a5833a0 SHA512 65d239aaa14a18d9147a0830e6f2f86246a026b070830cb93959dc5b76c984486ba5bae032733069365edc6df9102285b98a7d3b0eb29d28d819e05bb6e0e076
+EBUILD tensorflow-2.7.0-r1.ebuild 15831 BLAKE2B 88c8ce81b169e496c3686dc1668f8a505187b1ce54099218a60b03e25de80fc51fd77b7b41e3ac7b67ac066ae447e2e4d5f1a2f701cd5435f2d01719d7c508f4 SHA512 48c670dbadbafa4fe3145b304f667fe5a4973c9e2db77689e4ce507f934111788592d48ef486dc1202179973340f0d8170dcfdb4eef39da111b3e53078e66c49
 EBUILD tensorflow-2.7.0.ebuild 15934 BLAKE2B 9014ea213ceb9139c3cad48da4b1bcf64b82b8b8755e82b9f013bda31cce05ff35ce7f9ab3f8db2e7c1c900e17c4da4810d1910896f4b508f9782243f295096f SHA512 457015c937361ad884f7ec81cba91c5e821648a95ad5b89edb23a5455ee01ab13df207811541bdb6a7d0da19903481d1a6512b0728c723aa90af236aca915534
 MISC metadata.xml 501 BLAKE2B 16095ae1e7ff9fdd7efe0bb5184ce1d7e46cb5c8f98a650ec4f69742262c678b9945d35b12ba518f8a9b36cad8cd23483a95aca0141ddbe07e4210cef16d2949 SHA512 d1f08e9360ab7c4ec516787807cc53f795d99dde6287b7024535bae4dae4a0107117548784bb25ac07cee15ad1676d98e9c9d472ec97023dfc3e0bdd72a26d28
diff --git a/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild b/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild
index 3202fbd88400..e3c79720e512 100644
--- a/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild
@@ -87,10 +87,7 @@ RDEPEND="
 	sys-libs/zlib
 	>=sys-apps/hwloc-2:=
 	cuda? (
-		|| (
-			=dev-util/nvidia-cuda-toolkit-10*[profiler]
-			=dev-util/nvidia-cuda-toolkit-11.4*[profiler]
-		)
+		<dev-util/nvidia-cuda-toolkit-11.6_pre:=[profiler]
 		=dev-libs/cudnn-8*
 	)
 	mpi? ( virtual/mpi )
diff --git a/sci-libs/tensorflow/tensorflow-2.7.0-r1.ebuild b/sci-libs/tensorflow/tensorflow-2.7.0-r1.ebuild
new file mode 100644
index 000000000000..b49cf755b63f
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-2.7.0-r1.ebuild
@@ -0,0 +1,412 @@
+# 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} )
+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/"
+
+RESTRICT="test" # Tests need GPU access
+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/bazelbuild/platforms/releases/download/0.0.2/platforms-0.0.2.tar.gz -> bazelbuild-platforms-0.0.2.tar.gz
+	https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz
+	https://github.com/bazelbuild/bazel-toolchains/archive/dfc67056200b674accd08d8f9a21e328098c07e2.tar.gz -> bazel-toolchains-dfc67056200b674accd08d8f9a21e328098c07e2.tar.gz
+	https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip
+	https://github.com/bazelbuild/rules_cc/archive/40548a2974f1aea06215272d9c2b47a14a24e556.tar.gz -> bazelbuild-rules_cc-40548a2974f1aea06215272d9c2b47a14a24e556.tar.gz
+	https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz
+	https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz
+	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
+	https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz
+	https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz
+	https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz
+	https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz
+	https://github.com/google/farmhash/archive/0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz -> farmhash-0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz
+	https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip
+	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
+	https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz
+	https://github.com/google/ruy/archive/e6c1b8dc8a8b00ee74e7268aac8b18d7260ab1ce.zip -> ruy-e6c1b8dc8a8b00ee74e7268aac8b18d7260ab1ce.zip
+	https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz
+	https://github.com/llvm/llvm-project/archive/43d6991c2a4cc2ac374e68c029634f2b59ffdfdf.tar.gz -> llvm-project-43d6991c2a4cc2ac374e68c029634f2b59ffdfdf.tar.gz
+	https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz -> llvmorg-10.0.1-openmp-10.0.1.src.tar.xz
+	https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
+	https://github.com/oneapi-src/oneDNN/archive/v2.4.1.tar.gz -> oneDNN-v2.4.1.tar.gz
+	https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz
+	https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.zip -> pytorch-cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.zip
+	https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz
+	https://github.com/tensorflow/toolchains/archive/v1.2.7.tar.gz -> tensorflow-toolchains-v1.2.7.tar.gz
+	https://github.com/tensorflow/runtime/archive/64c92c8013b557087351c91b5423b6046d10f206.tar.gz -> tensorflow-runtime-64c92c8013b557087351c91b5423b6046d10f206.tar.gz
+	https://gitlab.com/libeigen/eigen/-/archive/7792b1e909a98703181aecb8810b4b654004c25d/eigen-7792b1e909a98703181aecb8810b4b654004c25d.tar.gz
+	https://github.com/google/XNNPACK/archive/694d2524757f9040e65a02c374e152a462fe57eb.zip -> XNNPACK-694d2524757f9040e65a02c374e152a462fe57eb.zip
+	cuda? (
+		https://github.com/NVIDIA/cudnn-frontend/archive/73210a930333eaf66b42b01693bce7b70719c354.zip -> cudnn-frontend-73210a930333eaf66b42b01693bce7b70719c354.zip
+		https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip
+		https://github.com/nvidia/nccl/archive/v2.8.3-1.tar.gz -> nvidia-nccl-v2.8.3-1.tar.gz
+	)
+	python? (
+		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz
+		https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt
+		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
+	)"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
+		${bazel_external_uris}"
+
+RDEPEND="
+	app-arch/snappy
+	dev-cpp/abseil-cpp:=
+	dev-db/lmdb
+	dev-db/sqlite
+	dev-libs/double-conversion
+	dev-libs/icu:=
+	>=dev-libs/jsoncpp-1.9.2:=
+	dev-libs/nsync
+	dev-libs/openssl:0=
+	>=dev-libs/protobuf-3.13.0:=
+	>=dev-libs/re2-0.2019.06.01:=
+	media-libs/giflib
+	media-libs/libjpeg-turbo
+	media-libs/libpng:0
+	>=net-libs/grpc-1.24:=
+	net-misc/curl
+	sys-libs/zlib
+	>=sys-apps/hwloc-2:=
+	cuda? (
+		<dev-util/nvidia-cuda-toolkit-11.6_pre:=[profiler]
+		=dev-libs/cudnn-8*
+	)
+	mpi? ( virtual/mpi )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/flatbuffers-1.12.0:=
+		dev-python/absl-py[${PYTHON_USEDEP}]
+		>=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
+		dev-python/astunparse[${PYTHON_USEDEP}]
+		dev-python/dill[${PYTHON_USEDEP}]
+		dev-python/flatbuffers[${PYTHON_USEDEP}]
+		>=dev-python/gast-0.3.3[${PYTHON_USEDEP}]
+		dev-python/h5py[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+		>=dev-python/google-pasta-0.1.8[${PYTHON_USEDEP}]
+		>=dev-python/opt-einsum-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.13.0[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		>=dev-python/grpcio-1.28[${PYTHON_USEDEP}]
+		>=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}]
+		>=net-libs/google-cloud-cpp-0.10.0
+		>=sci-visualization/tensorboard-2.7.0[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	python? (
+		dev-python/mock
+		dev-python/setuptools
+	)"
+PDEPEND="python? (
+		>=sci-libs/keras-2.7.0[${PYTHON_USEDEP}]
+		>=sci-libs/tensorflow-estimator-2.7.0[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.8.0
+	dev-java/java-config
+	>=dev-util/bazel-3.7.2
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-9.1[profiler]
+	)
+	!python? ( dev-lang/python )
+	python? (
+		dev-python/cython
+		dev-python/mock
+		>=dev-python/grpcio-tools-1.28
+	)"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
+CHECKREQS_MEMORY="5G"
+CHECKREQS_DISK_BUILD="10G"
+
+get-cpu-flags() {
+	local i f=()
+	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
+	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
+		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
+	done
+	use cpu_flags_x86_fma3 && f+=( -mfma )
+	echo "${f[*]}"
+}
+
+pkg_setup() {
+	ewarn "TensorFlow 2.0 is a major release that contains some incompatibilities"
+	ewarn "with TensorFlow 1.x. For more information about migrating to TF2.0 see:"
+	ewarn "https://www.tensorflow.org/guide/migrate"
+
+	local num_pythons_enabled
+	num_pythons_enabled=0
+	count_impls() {
+		num_pythons_enabled=$((${num_pythons_enabled} + 1))
+	}
+	use python && python_foreach_impl count_impls
+
+	# 10G to build C/C++ libs, 5G per python impl
+	CHECKREQS_DISK_BUILD="$((10 + 6 * ${num_pythons_enabled}))G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack "${P}.tar.gz"
+	unpack tensorflow-patches-${PVR}.tar.bz2
+	bazel_load_distfiles "${bazel_external_uris}"
+}
+
+src_prepare() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	append-flags $(get-cpu-flags)
+	append-cxxflags -std=c++17
+	export BUILD_CXXFLAGS+=" -std=c++17"
+	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_absl
+			com_google_protobuf
+			curl
+			cython
+			dill_archive
+			double_conversion
+			enum34_archive
+			flatbuffers
+			functools32_archive
+			gast_archive
+			gif
+			hwloc
+			icu
+			jsoncpp_git
+			libjpeg_turbo
+			lmdb
+			nasm
+			nsync
+			opt_einsum_archive
+			org_sqlite
+			pasta
+			png
+			pybind11
+			six_archive
+			snappy
+			tblib_archive
+			termcolor_archive
+			typing_extensions_archive
+			wrapt
+			zlib
+		)
+
+		export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
+		export TF_IGNORE_MAX_BAZEL_VERSION=1
+
+		# This is not autoconf
+		./configure || die
+
+		echo 'build --config=noaws --config=nohdfs' >> .bazelrc || die
+		echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die
+		echo "build --action_env=KERAS_HOME=\"${T}/.keras\"" >> .bazelrc || die
+		echo "build --host_action_env=KERAS_HOME=\"${T}/.keras\"" >> .bazelrc || die
+
+		for cflag in $($(tc-getPKG_CONFIG) jsoncpp --cflags)
+		do
+			echo "build --copt=\"${cflag}\"" >> .bazelrc || die
+			echo "build --host_copt=\"${cflag}\"" >> .bazelrc || die
+		done
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_configure
+	else
+		do_configure
+	fi
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
+
+	if use python; then
+		python_setup
+		BUILD_DIR="${S}-${EPYTHON/./_}"
+		cd "${BUILD_DIR}"
+	fi
+
+	# fail early if any deps are missing
+	ebazel build -k --nobuild \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so \
+		//tensorflow:libtensorflow_cc.so \
+		$(usex python '//tensorflow/tools/pip_package:build_pip_package' '')
+
+	ebazel build \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so
+	ebazel build //tensorflow:libtensorflow_cc.so
+
+	do_compile() {
+		ebazel build //tensorflow/tools/pip_package:build_pip_package
+	}
+	BUILD_DIR="${S}"
+	cd "${BUILD_DIR}"
+	use python && python_foreach_impl run_in_build_dir do_compile
+	ebazel shutdown
+}
+
+src_install() {
+	local i l
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
+
+	do_install() {
+		einfo "Installing ${EPYTHON} files"
+		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
+		mkdir -p "${srcdir}" || die
+		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
+		cd "${srcdir}" || die
+		esetup.py install
+
+		# libtensorflow_framework.so is in /usr/lib already
+		rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die
+		rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die
+		python_optimize
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir do_install
+
+		# Symlink to python-exec scripts
+		for i in "${ED}"/usr/lib/python-exec/*/*; do
+			n="${i##*/}"
+			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
+		done
+
+		python_setup
+		local BUILD_DIR="${S}-${EPYTHON/./_}"
+		cd "${BUILD_DIR}" || die
+	fi
+
+	einfo "Installing headers"
+	ebazel build //tensorflow:install_headers
+	ebazel shutdown
+	insinto /usr/include/${PN}/
+	doins -r bazel-bin/tensorflow/include/*
+
+	einfo "Installing libs"
+	# Generate $(tc-getPKG_CONFIG) file
+	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc ${PN}_cc.pc
+
+	for l in libtensorflow{,_framework,_cc}.so; do
+		dolib.so bazel-bin/tensorflow/${l}
+		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1)
+		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3)
+	done
+
+	einstalldocs
+}
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 57f550be24c1..b9f22caab02c 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -10,12 +10,19 @@ AUX vtk-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch 1529
 AUX vtk-9.0.1-limits-include-gcc11.patch 2654 BLAKE2B 69eae5782234e46c2a38dbc3bf3d01082518314c62742996b953a6b17ceca9d85ca9a83a907c6820210bc0ff406640476dcafc1a533d90071e1c0517a06cc938 SHA512 ef16b3dea49f29d537bfbef26e62f91e59056288eac5c0c41191fee6c2181336dcceaa27b84a541c442d986b8ce1cdf3a9effdedcab1e1a1e242efad34954d00
 DIST VTK-8.2.0.tar.gz 35511819 BLAKE2B 908ed9377d75da6d0bd84de0078ba90a1e9396fcc906ca2981102e2c79d9d3ba4b1297f98682cd2802c7c04f9dbec32ee70740e645c44180befd765f7cda34a6 SHA512 521bd4dabedbc24b0e80a314a34ecd7554b04af28a7973245e3a9cf99a09b995d1b8ac42305c8e53369f226a0a6da3cdb29105ba2c90b46492736ef717760286
 DIST VTK-9.0.3.tar.gz 34684378 BLAKE2B 6862ab2df95bbefe9d3970757af6521cfa874476f6ee8e64c4e6e279f2e0cbb8a8299bc3b0b8bb9b7254d01a169644e7927b67b11b2ce934ddc87bce0a9e4c26 SHA512 00528011f9206444d09fc6cea05c46930745bb70ea02be6244ab3eb510ae82af772157c025157b1761dc4c6a9ab538b57f814c03a708f30aa3598a421fdc6ae2
+DIST VTK-9.1.0.tar.gz 47871165 BLAKE2B 68cebc0879737a519b53e73f198356208b047c301d38ee2d62b9a14539cdb9aa76bd7174baa29592c7b1cfd1cc9700d01e98519a207d67a232d16ad37295ac31 SHA512 b2c4be8795fa082e0776e6ffdb9a3fd88dbb235841a8369a34ebe26cf4c5fcb1610fcca987be314510629da3edc74ee76c0ce2cc88d5ef4b099ac550ac892b0a
 DIST VTKData-8.2.0.tar.gz 304287875 BLAKE2B 0292d84be40e11203326dcb1bf45f4a6ad2a785968130d4868a230f1cfbdcb600d0c03d4dae3519e2737dc7a964f29c51500c91b3da4291069608dd80a2bce45 SHA512 517d0f6dfdb0c61f59df933f06d3a28c8a48ea684aaff311456213fe493e2a20128886144325fc4edfa376b2d375a2dae6c60ad6e3d5d2f4a7b0ac1d8545c87b
 DIST VTKData-9.0.3.tar.gz 413854066 BLAKE2B 84c2fa0ae5df8567cc06022262fe3ea1202c553168757c94aa4a0a258360deccdf349d474c2f6585fc2054ee8e0468df4c80ec835cecf6b2391efa639f479eaa SHA512 28ab2ecb32860d820f736e9ceb4345bcd03471f0a35b90f8c9ccbe05454f7a95a4de3c99bae2f4b9db87a27ef8fe50159cd283f5e921f4e6e69b06a50a0570c6
+DIST VTKData-9.1.0.tar.gz 590185633 BLAKE2B 7451d57bc507571afa8a8f9ba541010e1924849759f228318b6390aabb07a68341b84b38b82cd504844194544c569b040c9fad1858e6e35e172e4e18000d338e SHA512 134a8dd2b029d3a4959b601987e68a0caa5d050532655b6786b5b67dfc77d3639628b2b957511f8998e63864c247c501a11a6aed248c762f13e860d878778e1a
+DIST VTKDataFiles-9.1.0.tar.gz 605163184 BLAKE2B 968e2fed1e17bb57da4f8dd38e17e128779e50dfce81fc31c6ef75a2f3fe46675dd77ab7343b609998b8ddd3927e256d1ea4117c2719ad76f61db435b5f1c34f SHA512 f56ebd087753e2d2805e2f5954197de4e9933ec90648956780525d83149277a7bca42ce376c4355a53fca71ec78510fed155955af71b70e1b26de27851252e36
 DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d26599b48208b4104f41eaa90f99483689cd928cb00e3a7def396d65db2f03c9294d132854a27af74f66eb118c8319c4ce SHA512 8a7ea3d5870b1e4ccb31c77b4c270d00208349da1b2938e957210db3ec1449b678c66edc2faee1d4514aca6d725f642abc91e10ab0c151f6743cad1c53485588
 DIST VTKLargeData-9.0.3.tar.gz 247523270 BLAKE2B f4011292957454da5d8c9e515bcd0972af4299cef3928098d745be96559a1e0080297871c6e11fdd98498c8786a30a6674bc650368adcbcdbc6260e0938d21a1 SHA512 ebd6cb5f2935b77961dd68d0c0da2ea5ab900cec8c2eb641c785a604c65702e40a3e44d32bf3f2acfce9ec28dd89f41bf29f93a4f89d5b36c713f3743d7125b1
+DIST VTKLargeData-9.1.0.tar.gz 247517666 BLAKE2B 1b47829ad51f246ff26c8b6d16c9fa431e53ca33fec99e8aa78ee156a82e4b3351e32ee36674d9d345f346efad085ae1e2d3186a144911d2210a31a259e69f1f SHA512 0760dfd4e92bbfec10fec9d783f548a8ca5464b1a1744dfa575d4ed4592756335dbfcf28249d2da964aa6b41933ff1ac98458e4a32484ee4bb91b5e7cfaa78c9
+DIST VTKLargeDataFiles-9.1.0.tar.gz 247504557 BLAKE2B a05892347a1a5cf5cb0df3f1c1d94efcdb68c28bcd0391617602565fddc4277ac44accec6f1b3ae2822a860f3d5f5642a56e36171b5d81bef137561182051d08 SHA512 10abc287256c7ec5fb7114f4054eda5cde1b75a8d2bbe70375fb96d31b7c4164be936489ce2fc9b5c33225f494d9b7f5f7bed648828661b17d6f66acb70eeddc
 DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317
 DIST vtkDocHtml-9.0.3.tar.gz 132650096 BLAKE2B 45fc1a6942df3e79e500a552c3b3cda2099b9451191559d471e3a2e785a8c52b2c6273cfd2cc4a3f3f65582e607d9414475f58d243fde96a4f985bed479e53db SHA512 9b5fef43f3c2b92aa1fe6a9ba9458d6677874b09b167654db7f26df6feffdc34ed1a8fb4e59d64b75625063a774af77fe57f275903602a5f7daa74e1a2e71800
+DIST vtkDocHtml-9.1.0.tar.gz 152767166 BLAKE2B 9163b6b1bf55810a310ca8bc211e067827b1f9907efd2a378363d8e6296d4bf07b25371b66c00cab3576fb06f0cb63fdf2ffea044033e2c42e9087819a3736ba SHA512 036daba5eb6503b5eb3e9323a4ab3ea0f27c09d8fef411dd2ed154c24d5a37d9f19d57db07576c8af404bfdb7178e95b137a3c27bfedb3f9cb72c04f717da80a
 EBUILD vtk-8.2.0-r6.ebuild 10341 BLAKE2B f8fdb78d1181de56f455869a7e4244ae369c62aa682757628b62926d7bb6ce29efde32b3d0faa9cae2c7a2faa52d893941f8ca93b872e831e7a791aca8cc68ae SHA512 73100a10ab6f9b4d1ddaa7cfbb60d3b9c79b53d96c21b9541769306d540b1292986b1e4804cec07d86e80cbb1fb5fb2f4b4870183f1ca70637836a606ac38d14
 EBUILD vtk-9.0.3-r3.ebuild 14294 BLAKE2B 25b9deafd34226c2e97b5bf59261f97247f3d2c138c64e4fd764ed4cafbe466b46b418240ec816588e4035096e943701d67f7e3243f0605f76d7e6e57f97a6a6 SHA512 70d844fb50a2d2fba1037ff6c0b0a611da04cf5ae3898134936a4e3b50d148bb9893ff0bd14d186ffdff9e6bd1afdd1879df21e623a834a6502edfc3e9170233
+EBUILD vtk-9.1.0.ebuild 16274 BLAKE2B 9239ae77537e00220fb84988be25c84baa55876fdd61e0d065111a841b2a80defc1c29a5e5af53600796fd9360be27d7fd0892ddfaa2363fcbe1f867cace40d2 SHA512 637b6e2511ee74416e61aaba1cb4283adb3d2ccf95f4ba461b8d9f0fc612fb429efa83cc1b7804d3ff2ece8d52bde866eb849c4ca7c74958630f22d167f84bf1
 MISC metadata.xml 1405 BLAKE2B 0eadca65bf1cec673770c28b581491053bfd0f0834aee7c063e79fdc8e89ae161f74e97de4bbcdc1f80590284a004ae129f28b948d6efee0bd5d1c2ae1c3b26d SHA512 133b198af799dabfd1f4dad6ba27b27f8a2df728b46b94934ba3cb26c6a51dec8882e905f120ce1e5f55fbf8fda4ee9634c59280f7fd1f7bcd316e64f86aec60
diff --git a/sci-libs/vtk/vtk-9.1.0.ebuild b/sci-libs/vtk/vtk-9.1.0.ebuild
new file mode 100644
index 000000000000..0cc9587af0cf
--- /dev/null
+++ b/sci-libs/vtk/vtk-9.1.0.ebuild
@@ -0,0 +1,596 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO:
+# - add USE flag for remote modules? Those modules can be downloaded
+#	properly before building.
+# - replace usex by usev once we bump to EAPI 8
+
+PYTHON_COMPAT=( python3_{8..10} )
+WEBAPP_OPTIONAL=yes
+WEBAPP_MANUAL_SLOT=yes
+
+inherit check-reqs cmake cuda java-pkg-opt-2 python-single-r1 toolchain-funcs virtualx webapp
+
+# Short package version
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="The Visualization Toolkit"
+HOMEPAGE="https://www.vtk.org/"
+SRC_URI="
+	https://www.vtk.org/files/release/${MY_PV}/VTK-${PV}.tar.gz
+	https://www.vtk.org/files/release/${MY_PV}/VTKData-${PV}.tar.gz
+	https://www.vtk.org/files/release/${MY_PV}/VTKDataFiles-${PV}.tar.gz
+	doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${PV}.tar.gz )
+	examples? (
+		https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz
+		https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz
+	)
+	test? (
+		https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz
+		https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${PV}.tar.gz
+	)
+"
+S="${WORKDIR}/VTK-${PV}"
+
+LICENSE="BSD LGPL-2"
+SLOT="0/${MY_PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+# TODO: Like to simplifiy these. Mostly the flags related to Groups, plus
+# maybe some flags related to Kits and a few other needed flags.
+IUSE="all-modules +boost cuda debug doc examples +ffmpeg +gdal imaging java
+	mpi mysql odbc openmp postgres python qt5 +rendering tbb test +threads
+	tk video_cards_nvidia views web"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	all-modules? ( boost ffmpeg gdal imaging mysql odbc postgres qt5 rendering views )
+	cuda? ( video_cards_nvidia )
+	java? ( rendering )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( rendering )
+	tk? ( rendering python )
+	web? ( python )
+"
+
+RDEPEND="
+	app-arch/lz4:=
+	app-arch/xz-utils
+	dev-db/sqlite:3
+	dev-libs/double-conversion:=
+	dev-libs/expat
+	dev-libs/icu:=
+	dev-libs/jsoncpp:=
+	dev-libs/libxml2:2
+	dev-libs/pugixml
+	media-libs/freetype
+	media-libs/libogg
+	media-libs/libpng:=
+	media-libs/libtheora
+	media-libs/tiff
+	<sci-libs/hdf5-1.12:=[mpi=]
+	sci-libs/netcdf:=[mpi=]
+	sys-libs/zlib
+	virtual/jpeg
+	all-modules? ( sci-geosciences/liblas[gdal] )
+	boost? ( dev-libs/boost:=[mpi?] )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	ffmpeg? ( media-video/ffmpeg:= )
+	gdal? ( sci-libs/gdal:= )
+	java? ( >=virtual/jdk-1.8:* )
+	mpi? (
+		media-libs/glew:=
+		sys-cluster/openmpi[cxx,romio]
+		virtual/opengl
+	)
+	mysql? ( dev-db/mariadb-connector-c )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtopengl:5
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtsql:5
+		dev-qt/qtwidgets:5
+	)
+	rendering? (
+		media-libs/freeglut
+		media-libs/glew:=
+		media-libs/libsdl2
+		sci-libs/proj:=
+		virtual/opengl
+		x11-libs/gl2ps
+		x11-libs/libXcursor
+	)
+	tbb? ( <dev-cpp/tbb-2021.4.0:= )
+	tk? ( dev-lang/tk:= )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+	views? (
+		x11-libs/libICE
+		x11-libs/libXext
+	)
+	web? ( ${WEBAPP_DEPEND} )
+	$(python_gen_cond_dep '
+		python? (
+			boost? ( dev-libs/boost:=[mpi?,python?,${PYTHON_USEDEP}] )
+			gdal? ( sci-libs/gdal:=[python?,${PYTHON_USEDEP}] )
+			mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
+		)
+	')
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-cpp/eigen
+	<dev-libs/pegtl-3
+	dev-libs/utfcpp
+"
+BDEPEND="
+	virtual/pkgconfig
+	mpi? ( app-admin/chrpath )
+	test? (
+		media-libs/glew
+		virtual/opengl
+		x11-libs/libXcursor
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch
+	"${FILESDIR}"/${PN}-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
+)
+
+DOCS=( CONTRIBUTING.md README.md )
+
+# based on default settings
+CHECKREQS_DISK_BUILD="4G"
+# we want the EAPI 8 default
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp
+
+	if [[ $(tc-is-gcc) && $(gcc-majorversion) = 11 ]] && use cuda ; then
+		# FIXME: better use eerror?
+		ewarn "GCC 11 is know to fail building with CUDA support in some cases."
+		ewarn "See bug #820593"
+	fi
+
+	if use examples || use doc; then
+		CHECKREQS_DISK_BUILD="7G"
+	fi
+
+	if use examples && use doc; then
+		CHECKREQS_DISK_BUILD="10G"
+	fi
+
+	if use cuda; then
+		# NOTE: This should actually equal to (number of build jobs)*7G,
+		# as any of the cuda compile tasks can take up 7G!
+		# 10.2 GiB install directory, 6.4 GiB build directory with max. USE flags
+		CHECKREQS_MEMORY="7G"
+		CHECKREQS_DISK_BUILD="14G"
+	fi
+
+	check-reqs_pkg_setup
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp
+
+	if [[ $(tc-is-gcc) && $(gcc-majorversion) = 11 ]] && use cuda ; then
+		# FIXME: better use eerror?
+		ewarn "GCC 11 is know to fail building with CUDA support in some cases."
+		ewarn "See bug #820593"
+	fi
+
+	if use examples || use doc; then
+		CHECKREQS_DISK_BUILD="7G"
+	fi
+
+	if use examples && use doc; then
+			CHECKREQS_DISK_BUILD="10G"
+	fi
+
+	if use cuda; then
+		CHECKREQS_MEMORY="7G"
+		CHECKREQS_DISK_BUILD="14G"
+	fi
+
+	check-reqs_pkg_setup
+
+	use java && java-pkg-opt-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+	use web && webapp_pkg_setup
+}
+
+src_prepare() {
+	# If we have system libraries available use these and delete
+	# the respecting files in ${S}/ThirdParty to save some space.
+	# Note: The following libraries are marked as internal by kitware
+	#	and can currently not unbundled:
+	#	diy2, exodusII, fides, h5part, kissfft, loguru, verdict, vpic,
+	#	vtkm, xdmf{2,3}, zfp
+	# Note: libharu is omitted: vtk needs an updated version (2.4.0)
+	# Note: fmt is ommited, >=libfmt-8.1.0 needed
+	# Note: cgns is ommited, >=cgnslib-4.1 needed
+	# Note: no valid mpi4py target found with system library
+	# TODO: cgns (4.1), cli11 (::guru), exprtk, ioss, libfmt (8.1.0)
+	local -a DROPS=( doubleconversion eigen expat freetype hdf5 jpeg jsoncpp
+		libxml2 lz4 lzma netcdf ogg pegtl png pugixml sqlite theora tiff utf8
+		zlib )
+	use rendering && DROPS+=( gl2ps glew libproj )
+
+	local x
+	for x in ${DROPS[@]}; do
+		ebegin "Dropping bundled ${x}"
+		rm -r ThirdParty/${x}/vtk${x} || die
+		eend $?
+	done
+	unset x
+
+	if use doc; then
+		einfo "Removing .md5 files from documents."
+		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
+		sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
+			-i Utilities/Doxygen/CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+
+	if use cuda; then
+		cuda_add_sandbox -w
+		cuda_src_prepare
+	fi
+
+	if use test; then
+		ebegin "Copying data files to ${BUILD_DIR}"
+		mkdir -p "${BUILD_DIR}/ExternalData" || die
+		pushd "${BUILD_DIR}/ExternalData" >/dev/null || die
+		ln -sf ../../VTK-${PV}/.ExternalData/README.rst . || die
+		ln -sf ../../VTK-${PV}/.ExternalData/SHA512 . || die
+		popd >/dev/null || die
+		eend "$?"
+	fi
+}
+
+src_configure() {
+# TODO: check these and consider to use them
+#	VTK_BUILD_SCALED_SOA_ARRAYS
+#	VTK_DISPATCH_{AOS,SOA,TYPED}_ARRAYS
+
+	local mycmakeargs=(
+		-DVTK_ANDROID_BUILD=OFF
+		-DVTK_IOS_BUILD=OFF
+
+		-DVTK_BUILD_ALL_MODULES=$(usex all-modules ON OFF)
+		# we use the pre-built documentation and install these with USE=doc
+		-DVTK_BUILD_DOCUMENTATION=OFF
+		-DVTK_BUILD_EXAMPLES=$(usex examples ON OFF)
+
+		-DVTK_ENABLE_KITS=ON
+		# defaults to ON: USE flag for this?
+		-DVTK_ENABLE_REMOTE_MODULES=OFF
+
+		-DVTK_GROUP_ENABLE_Imaging=$(usex imaging "YES" "DONT_WANT")
+		-DVTK_GROUP_ENABLE_Qt=$(usex qt5 "YES" "DONT_WANT")
+		-DVTK_GROUP_ENABLE_Rendering=$(usex rendering "YES" "DONT_WANT")
+		-DVTK_GROUP_ENABLE_StandAlone="YES"
+		-DVTK_GROUP_ENABLE_Views=$(usex views "YES" "DONT_WANT")
+		-DVTK_GROUP_ENABLE_Web=$(usex web "YES" "DONT_WANT")
+
+		-DVTK_INSTALL_SDK=ON
+
+		-DVTK_MODULE_ENABLE_VTK_vtkm="WANT"
+		-DVTK_MODULE_ENABLE_VTK_IOGeoJSON="WANT"
+		-DVTK_MODULE_ENABLE_VTK_IOOggTheora="WANT"
+
+		# TODO: update one cgnslib-4.1.1 is packaged
+		-DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF
+		# not packaged in Gentoo
+		-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF
+		# TODO: update once libfmt-8.1.0 has been packaged
+		-DVTK_MODULE_USE_EXTERNAL_VTK_fmt=OFF
+		# not pacakged in Gentoo
+		-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF
+
+		-DVTK_RELOCATABLE_INSTALL=ON
+
+		-DVTK_SMP_ENABLE_OPENMP=$(usex openmp ON OFF)
+		-DVTK_SMP_ENABLE_STDTHREAD=$(usex threads ON OFF)
+		-DVTK_SMP_ENABLE_TBB=$(usex tbb ON OFF)
+
+		-DVTK_USE_CUDA=$(usex cuda ON OFF)
+		# use system libraries where possible
+		-DVTK_USE_EXTERNAL=ON
+		-DVTK_USE_MPI=$(usex mpi ON OFF)
+		-DVTK_USE_TK=$(usex tk ON OFF)
+		-DVTK_USE_X=ON
+
+		-DVTK_WRAP_JAVA=$(usex java ON OFF)
+		-DVTK_WRAP_PYTHON=$(usex python ON OFF)
+	)
+
+	if use all-modules; then
+		mycmakeargs+=(
+			-DVTK_ENABLE_OSPRAY=OFF
+			# TODO: some of these are tied to the VTK_ENABLE_REMOTE_MODULES
+			# option. Check whether we can download them clean and enable
+			# them.
+			-DVTK_MODULE_ENABLE_VTK_DomainsMicroscopy="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_fides="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOADIOS2="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOFides="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOOpenVDB="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOPDAL="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingOpenVR="DONT_WANT"
+
+			# available in ::guru, so avoid  detection if installed
+			-DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF
+		)
+	fi
+
+	# TODO: consider removing USE flags and enable by default
+	if use boost; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_InfovisBoost="WANT"
+			-DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms="WANT"
+		)
+	fi
+
+	# TODO: checks this on updates of nvidia-cuda-toolkit and update
+	# the list of available arches if necessary, i.e. add new arches
+	# once they are released at the end of the list before all.
+	# See https://en.wikipedia.org/wiki/CUDA#GPUs_supported
+	if use cuda; then
+		local cuda_arch=
+		case ${VTK_CUDA_ARCH:-native} in
+			# we ignore fermi arch, because current nvidia-cuda-toolkit-11*
+			# no longer supports it
+			kepler|maxwell|pascal|volta|turing|ampere|all)
+				cuda_arch=${VTK_CUDA_ARCH}
+				;;
+			native)
+				ewarn "If auto detection fails for you, please try and export the"
+				ewarn "VTK_CUDA_ARCH environment variable to one of the common arch"
+				ewarn "names: kepler, maxwell, pascal, volta, turing, ampere or all."
+				cuda_arch=native
+				;;
+			*)
+				eerror "Please properly set the VTK_CUDA_ARCH environment variable to"
+				eerror "one of: kepler, maxwell, pascal, volta, turing, ampere, all"
+				die "Invalid CUDA architecture given: '${VTK_CUDA_ARCH}'!"
+				;;
+		esac
+		ewarn "Using CUDA architecture '${cuda_arch}'"
+
+		mycmakeargs+=( -DVTKm_CUDA_Architecture=${cuda_arch} )
+	fi
+
+	if use debug; then
+		mycmakeargs+=(
+			-DVTK_DEBUG_LEAKS=ON
+			-DVTK_DEBUG_MODULE=ON
+			-DVTK_DEBUG_MODLE_ALL=ON
+			-DVTK_ENABLE_SANITIZER=ON
+			-DVTK_EXTRA_COMPILER_WARNINGS=ON
+			-DVTK_WARN_ON_DISPATCH_FAILURE=ON
+		)
+		if use rendering; then
+			mycmakeargs+=( -DVTK_OPENGL_ENABLE_STREAM_ANNOTATIONS=ON )
+		fi
+	fi
+
+	if use examples || use test; then
+		mycmakeargs+=( -DVTK_USE_LARGE_DATA=ON )
+	fi
+
+	# TODO: consider removing the USE flag and enable by default
+	if use ffmpeg; then
+		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOFFMPEG="WANT" )
+	fi
+
+	# TODO: consider removing the USE flag and enable by default
+	if use gdal; then
+		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GeovisGDAL="WANT" )
+	fi
+
+	if ! use java && ! use python; then
+		# defaults to ON
+		mycmakeargs+=( -DVTK_ENABLE_WRAPPING=OFF )
+	fi
+
+	if use java; then
+		mycmakeargs+=(
+			-DCMAKE_INSTALL_JARDIR="share/${PN}"
+			-DVTK_ENABLE_WRAPPING=ON
+		)
+	fi
+
+	if use mpi; then
+		mycmakeargs+=(
+			-DVTK_GROUP_ENABLE_MPI="YES"
+			-DVTK_MODULE_ENABLE_VTK_IOH5part="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOParallel="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOParallelXML="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ParallelMPI="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingParallel="WANT"
+			-DVTK_MODULE_ENABLE_VTK_h5part="WANT"
+			-DVTKm_ENABLE_MPI=ON
+		)
+		if use python; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py="WANT" )
+		fi
+	fi
+
+	if use mysql; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_IOMySQL="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOSQL="WANT"
+		)
+	fi
+
+	if use odbc; then
+		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOODBC="WANT" )
+	fi
+
+	if use postgres; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_IOPostgreSQL="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOSQL="WANT"
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DVTK_ENABLE_WRAPPING=ON
+			-DPython3_EXECUTABLE="${PYTHON}"
+			-DVTK_PYTHON_SITE_PACKAGES_SUFFIX="lib/${EPYTHON}/site-packages"
+		)
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT" )
+		if use mysql || use postgres; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="WANT" )
+		fi
+		if use rendering; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingQt="WANT" )
+		fi
+		if use views; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsQt="WANT" )
+		fi
+	fi
+
+	if use rendering || use test || use web || use all-modules; then
+		# needs patched version
+		mycmakeargs+=( -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF )
+	fi
+
+	if use rendering; then
+		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOExportGL2PS="WANT" )
+	fi
+
+	if use test; then
+		ewarn "Testing requires VTK_FORBID_DOWNLOADS=OFF by upstream."
+		ewarn "Care has been taken to pre-download all required files."
+		ewarn "In case you find missing files, please inform me."
+		mycmakeargs+=(
+			-DVTK_BUILD_TESTING=ON
+			-DVTK_FORBID_DOWNLOADS=OFF
+
+			-DVTK_MODULE_ENABLE_VTK_octree="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ViewsCore="WANT"
+
+			# available in ::guru, so avoid  detection if installed
+			-DVTK_MODULE_USE_EXTERNAL_VTK_cli11=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DVTK_BUILD_TESTING=OFF
+			-DVTK_FORBID_DOWNLOADS=ON
+		)
+	fi
+
+	# FIXME: upstream provides 4 threading models, as of 9.1.0. These are
+	# sequential, stdthread, openmp and tbb. AFAICS all of them can be
+	# enabled at the same time. Sequential and Stdthread are enabled by
+	# default. The default selected type for the build is sequential.
+	# Assuming sequential < stdpthread < openmp < tbb wrt speed, although
+	# this is dependent on the actual scenario where threading is used.
+	if use tbb; then
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" )
+	elif use openmp; then
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="OpenMP" )
+	elif use threads; then
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="STDThread" )
+	else
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" )
+	fi
+
+	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+	if use mpi; then
+		export CC=mpicc
+		export CXX=mpicxx
+		export FC=mpif90
+		export F90=mpif90
+		export F77=mpif77
+	fi
+
+	cmake_src_configure
+}
+
+# FIXME: avoid nonfatal?
+# see https://github.com/gentoo/gentoo/pull/22878#discussion_r747204043
+src_test() {
+#	nonfatal virtx cmake_src_test
+	virtx cmake_src_test
+}
+
+src_install() {
+	use web && webapp_src_preinst
+
+	# Stop web page images from being compressed
+	if use doc; then
+		HTML_DOCS=( "${WORKDIR}/html/." )
+	fi
+
+	cmake_src_install
+
+	use java && java-pkg_regjar "${ED}"/usr/share/${PN}/${PN}.jar
+
+	# install examples
+	if use examples; then
+		einfo "Installing examples"
+		mv -v {E,e}xamples || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+
+		einfo "Installing datafiles"
+		insinto /usr/share/${PN}/data
+		doins -r "${S}/.ExternalData"
+	fi
+
+	# with MPI runpath's are not deleted properly
+	if use mpi; then
+		chrpath -d "${ED}"/usr/$(get_libdir)/*.so.${PV} || die
+	fi
+
+	use python && python_optimize
+
+	# environment
+#	cat >> "${T}"/40${PN} <<- EOF || die
+#		VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
+#		VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}
+#		VTKHOME=${EPREFIX}/usr
+#		EOF
+#	doenvd "${T}"/40${PN}
+
+	use web && webapp_src_install
+
+	# Temporary!
+	# Avoid collision with paraview.
+	# bug #793221
+	rm -rf "${ED}"/usr/share/vtkm-1.5/VTKm{LICENSE.txt,README.md} || die
+}
+
+# webapp.eclass exports these but we want it optional #534036
+pkg_postinst() {
+	use web && webapp_pkg_postinst
+
+	if use examples; then
+		einfo "You can get more and updated examples at"
+		einfo "https://kitware.github.io/vtk-examples/site/"
+	fi
+}
+
+pkg_prerm() {
+	use web && webapp_pkg_prerm
+}