gentoo resync : 30.10.2021

28 files changed, 360 insertions, 38 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 321b0bd0e50c..20af337e9c0c 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index a160556499a5..a78bc6da7168 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -3,7 +3,7 @@ DIST dealii-9.3.0-offline_documentation.tar.gz 342390250 BLAKE2B 5ed1e5d5f7cd6a4
 DIST dealii-9.3.0.tar.gz 24458373 BLAKE2B 27cdaee4e7ec9c170e11c5ba9bff8fd654bb2a9452df3402d5639268a6fe31565faa38d240810a0323b7253f2ed665c25fa0948c56b9924f1836531f2414bc92 SHA512 d558b5dda1067f7d995bc5f265614e3bc5e70190d24c1c61047af1ddc52fa007013c51901b9b8eacfbe8b360dffcb22aca87e0019ee09581b928e00c39198c98
 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.0-r1.ebuild 5321 BLAKE2B eca44c7fcfd31077a67291a6f295d2416a82c8176950d14cc975edbe9ff64fb55d8eb0697d30f774e34b4d5a8d259408d775f153b0c5c284373f286a5e50137d SHA512 e1b1a0e3acbf3502dd1cd8c1cb72ea35ce75ec63cf6efdabbe260cdedf9605d5a12dcee9a88c5c203369604438f09d7beaf73b89edb562ea5441ef2f8bd6b1bb
-EBUILD dealii-9.3.1.ebuild 5321 BLAKE2B b66f4d31cd9e8b659839659eb25479e149c08b107ec05fd2ba1eab27c3ada02e0a57b50b3ee6bbb8f98c38cf3a702c39696ffcc6b29c51d33d0e39c97c1d3edb SHA512 73c7b9bd5115ff36121f159ab04f3ab58945fd89d77bc1292430e97849ce5587e2424545f3d08f2f66d2cad8c387a5ef629761f57c3b719e50abf68044d3d8e1
-EBUILD dealii-9999.ebuild 5372 BLAKE2B 10d4601b948476fca4070ac7d209a882726310e2327e125c8f1ec8b3fa032c0e9bc450d04c7a280bece4b39fab2d9fed720425af8f256f09320f719cdafabfd0 SHA512 c7b270207385c998ce82c6fea458c07ec933e9c29e11de2dceb92be6b2953fd39e59ae23e413300969bf5dc6a0f9f91a4eb0eb3de6918f976daa266c38d653c3
+EBUILD dealii-9.3.0-r2.ebuild 5325 BLAKE2B 2ccdf092e3872661328bee434776862e44483fbd747d7d44d652d91a29e0dd3a809813f1dde5cbff5bb80a7b9c58d1561a7b173152175ecf721e105a026736c8 SHA512 330c7d209a2b0050591de9256cc69c583a7a46ae45d8fe68846ca355ded2f1289147cb2a60e9b2eda338cbe46a541f615491bc611e775d3c516c0f45bb4482dd
+EBUILD dealii-9.3.1-r1.ebuild 5422 BLAKE2B 895d7b04be25b9d4d712cae74c52bf48af0481eef22eda28c650e141cc95e9e1157a504dac995af5b3a70aecb95c64f4bccbef3fd3e6a9db7a5359f1471c1da8 SHA512 ba94cce899ee5bc2a76509e582b7f402097a0db57fce5d125830e13253bf34bd52fee0e3110dd09dc27165b686c45f5bb036ec82606a33655463458f010022ed
+EBUILD dealii-9999.ebuild 5376 BLAKE2B 5628c124d9c39b6fdf9ca74097fc56c710241fcbe92b450380cc16c11d4374b287074afde2cf368766e63775de8c1f5591ee00b784144dc0caad90dcf5f05a85 SHA512 3cc0cacdd17236d8d23243d72824d81b5272bed8c29554c35209ea5a33e67387e1bc6bf3c86ef2fc71bc4ba3c36f9ccdb995e3bf0ee58c84295c691f04c4987d
 MISC metadata.xml 2440 BLAKE2B 60d4ffa5f20f88642507203f63dfbbe347ce6399cff96bf7728b929b59fc8d30e8046b7c002d48e59cfac1df73fe8f78b7fd58780673b645cf6549cb56580f39 SHA512 da2925396422db90cc0770faaad06e4bead71a34ef32416e4ab507e0c67d79b75824d1f95d24f9f0c46e2b8ea577229f2fbae6aff163090e058d2df6269b2c87
diff --git a/sci-libs/dealii/dealii-9.3.0-r1.ebuild b/sci-libs/dealii/dealii-9.3.0-r2.ebuild
index 81010cd4fd98..883959073dba 100644
--- a/sci-libs/dealii/dealii-9.3.0-r1.ebuild
+++ b/sci-libs/dealii/dealii-9.3.0-r2.ebuild
@@ -45,10 +45,10 @@ REQUIRED_USE="
 # accessible. Just fix the version for the time being.
 CAS_VERSION=7.5.1
 
-RDEPEND="dev-libs/boost
+RDEPEND="dev-libs/boost:=
 	app-arch/bzip2
 	sys-libs/zlib
-	dev-cpp/tbb
+	dev-cpp/tbb:=
 	adolc? ( sci-libs/adolc )
 	arpack? ( sci-libs/arpack[mpi=] )
 	assimp? ( media-libs/assimp )
diff --git a/sci-libs/dealii/dealii-9.3.1.ebuild b/sci-libs/dealii/dealii-9.3.1-r1.ebuild
index 7e56f6af0e23..ef012f290e0f 100644
--- a/sci-libs/dealii/dealii-9.3.1.ebuild
+++ b/sci-libs/dealii/dealii-9.3.1-r1.ebuild
@@ -8,7 +8,7 @@ EAPI=7
 # any of these modules:
 CMAKE_REMOVE_MODULES_LIST=""
 
-inherit cmake multilib
+inherit cmake flag-o-matic multilib
 
 DESCRIPTION="Solving partial differential equations with the finite element method"
 HOMEPAGE="https://www.dealii.org/"
@@ -45,10 +45,10 @@ REQUIRED_USE="
 # accessible. Just fix the version for the time being.
 CAS_VERSION=7.5.2
 
-RDEPEND="dev-libs/boost
+RDEPEND="dev-libs/boost:=
 	app-arch/bzip2
 	sys-libs/zlib
-	dev-cpp/tbb
+	dev-cpp/tbb:=
 	adolc? ( sci-libs/adolc )
 	arpack? ( sci-libs/arpack[mpi=] )
 	assimp? ( media-libs/assimp )
@@ -138,10 +138,13 @@ src_configure() {
 	# variables if a "higher" variant is set
 	if use cpu_flags_x86_avx512f; then
 		mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes )
+		append-cxxflags "-mavx512f"
 	elif use cpu_flags_x86_avx; then
 		mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes )
+		append-cxxflags "-mavx2"
 	elif use cpu_flags_x86_avx; then
 		mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes )
+		append-cxxflags "-msse2"
 	fi
 
 	cmake_src_configure
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 9688a1d91718..f1bc0ba2589b 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -45,11 +45,11 @@ REQUIRED_USE="
 # accessible. Just fix the version for the time being.
 CAS_VERSION=7.5.2
 
-RDEPEND="dev-libs/boost
+RDEPEND="dev-libs/boost:=
 	app-arch/bzip2
 	sys-libs/zlib
 	dev-cpp/cpp-taskflow
-	dev-cpp/tbb
+	dev-cpp/tbb:=
 	adolc? ( sci-libs/adolc )
 	arpack? ( sci-libs/arpack[mpi=] )
 	assimp? ( media-libs/assimp )
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 7015bdf45ff7..a743d64b04fc 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -10,10 +10,12 @@ DIST gdal-3.2.3.tar.gz 18970990 BLAKE2B 9f2ac15b7e9d2df0393d15734030ec4777579aa0
 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 7742 BLAKE2B 13f29567e52ef6d8e8d5b82a3675739fb0284e4d65984d15be7865280892f9e0ead777dba9f687b0e7fd25d10bd4e6c3fe7a7895283a5df629ef64341affafe2 SHA512 d414f487b9490249d7feb54bc0fae8e471f5eb7036535c248124f2d88c716127459e4c8ed7af2b70e54f38c5462f8b81c6569f67fc7a1f19693e65119b5a01b5
+EBUILD gdal-3.3.2-r1.ebuild 7740 BLAKE2B 88824a6b876311d97275f10dbf1f49acf14bd9714a93c3055dbcba56d98c695dd48bec11cf177d551483fdfa6cc71f75f42c5a010966afa9863f3b50a79c21ea SHA512 715ccb891b4768f51dcd9549d0e9fd96730eb81b2dc4dac0c61076d8efc1187b67b4b24cdc44eada6c957d4fe91aae77f9763185ef204011ff07cd61a46f987e
+EBUILD gdal-3.3.3.ebuild 7857 BLAKE2B 707a6bcf1a50271a6ee8b9e31d34640f75d74bcb9b78978ac77501c9b7bf8a71d56e64da23be5d64c2a3e9fd2de67fb6a8999a18812a9afc4e80362fb511f08e SHA512 2d5d5547ec9c08a92c766c47169ff3157f5cc107b6585a6cd3cb28938fa831267040ba8abe31f49f41d93613ac0c19a17e0dc7ba6ba0b441ee1d5e573b3617fd
 MISC metadata.xml 1623 BLAKE2B af7c9d5cc3c16ffef6fa9ef5dd5cf54ffcd34229d1e82b90e310f9eeccf5a5b4fa2119112b5427b520ce6e964e368aef7313edb3837940bed4b960ced7714fc3 SHA512 ed206877adac0b8b190e0edfb04f48c435d698fd523a14d54a14638b908c9e9452b1a2d394046093f5aa86cb48c611790f56ae511807855eb80bfcd4cc1d425c
diff --git a/sci-libs/gdal/gdal-3.3.2-r1.ebuild b/sci-libs/gdal/gdal-3.3.2-r1.ebuild
index 75f85938c60c..cf27723d766d 100644
--- a/sci-libs/gdal/gdal-3.3.2-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.3.2-r1.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.3.ebuild b/sci-libs/gdal/gdal-3.3.3.ebuild
new file mode 100644
index 000000000000..9ca88526b958
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.3.3.ebuild
@@ -0,0 +1,317 @@
+# 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,10} )
+DISTUTILS_OPTIONAL=1
+inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module toolchain-funcs
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="https://gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0/3.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 heif java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
+
+REQUIRED_USE="
+	mdb? ( java )
+	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 )
+	heif? ( media-libs/libheif:= )
+	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 heif)
+		$(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
+
+	# 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
+		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/hdf/Manifest b/sci-libs/hdf/Manifest
index 1b50955e9149..2d41414b1797 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -7,5 +7,5 @@ AUX hdf-4.2.15-fix-rpch-location.patch 550 BLAKE2B a88448fa6f454fcac9567b05270f6
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
 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.ebuild 1833 BLAKE2B 9c3235fb05bd4bf02938a7000c66e8346761c08afb7a8c2284fe9bea0cd21bc9fcdb280289140396b80c25d0e7637792655ba3ffad747cc2f66e10afcf1879c5 SHA512 a3274d47ffd795ec9404f07ad22d523da649c43717bf2b2285ad12a41a8c6f5df19c08114a928fc95b559870e61ce38e0ae1571f999b804d9fe37edeaa0d0cbd
+EBUILD hdf-4.2.15.ebuild 1832 BLAKE2B 0641a2a8870276cf444890137c4a4ae77ea53c7a8f3d0e283bb9d0c24dc933cdc7372e64fa2ec05ed309f8ec52cf4ad4c3fe4b249b3776f075cf91156402bdc9 SHA512 5259a93234c421c59c36e0406907a33ec08531a0df303949d9401d37004996cbda5bbc1a091827dcf44f4fc75cf755f602e8b246c6a9e480fd320260cc049614
 MISC metadata.xml 860 BLAKE2B 1eb04b174ac26dabb6191f30549b69e408ae6ecc7b166199662413dc918e24617d54bf3f5ee52a010bdcd763b8ec96d2d53d028a4aa8fa4f64d5758f0a6bb2c6 SHA512 e815da5354aa39a8391cbf15eaed3376aac4774a836c843dda81c0933123648f2f5b1208164740a701a9db8f1721ba4e31bf5d1d8c331635dcfe0d5dd9f6dbf8
diff --git a/sci-libs/hdf/hdf-4.2.15.ebuild b/sci-libs/hdf/hdf-4.2.15.ebuild
index 21cf98fc16d1..d21c07c43c49 100644
--- a/sci-libs/hdf/hdf-4.2.15.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://support.hdfgroup.org/ftp/HDF/releases/${PN^^}${PV}/src/${P}.tar
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ia64 ~ppc -riscv -sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ia64 ~ppc -riscv -sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( szip )"
diff --git a/sci-libs/oce/Manifest b/sci-libs/oce/Manifest
index 1809d77bf0a1..c7c63f4923ca 100644
--- a/sci-libs/oce/Manifest
+++ b/sci-libs/oce/Manifest
@@ -1,4 +1,4 @@
 AUX oce-0.18.3-test-fix.patch 1273 BLAKE2B 40c3fec8e3d5b703c39a2eee32d663e6dc7c6a1bad6a9885608679cb86f8047d6a50e1f625beac50dca045393f0d0290b5ca9d56a7498ba869a4af5028eb1fa0 SHA512 822bee12ee259801a3a242d3877fa3c6dd07043f65857d635a4790cdfd936be4016d1441e4dd3b8e7ff1cd1d187d1ab8fc7634e39376e91d06d8666d38632689
 DIST OCE-0.18.3.tar.gz 24633768 BLAKE2B c1923fb6310ea30318251fedac371655a575bf4dfcc4c38e7c748d316416e08c33a3f27bd5db7f5b437265cf2f518651d69a6920f9f487dc7e0065a6406c653f SHA512 6fdeb6ca4ce25361379872ccc465799d4a43407974c4f626b32df695e582b9e553cce17af6a6a7ff46ebed9b813d910ad23eb308a5356dabb9b9bbd4f42a8636
-EBUILD oce-0.18.3-r2.ebuild 1756 BLAKE2B c652c9ad2154f7a557fd2ae146ad8c51de321320f70265ad3d381a3117f4ca60bbfeab7e8c2cac70764e9c063d85f3a9665aeb73cf1374a51b0beb3d24be3d16 SHA512 f8c070dc752b86715fc5d61291136b5c14aa7c9436ed074e6a9566431b198edaf4656ddfc346db04f0c28a0baabad2e8e01a0c29997013ec6a12ba9c245e4eab
+EBUILD oce-0.18.3-r3.ebuild 1758 BLAKE2B a2ec91b24e37866a9b681e0194bbb4fbb0dcf2bdac98d243772c34dcfae6e3e108d8da8ef7a6fec3e5b7f468bee5a0deca004f23d2784bdb86b43c3474c10d75 SHA512 e576d60eca832600f558cf4d4eb545adee3dc15660bd6657e3ff58f7749046509a524322ce67dc635380002bf7599f4bcb5f3e09961bd30b18eca1f76e25c6a8
 MISC metadata.xml 931 BLAKE2B b508f3d0376a4c950d64ed10df42edddbef8254a2aa13327117a336f878db389f2bba19a60f6cf5d64a6ad0a5196fa0c3b36a8daad725afb20e7c4fd4278e40d SHA512 a5ea8b62877b4f86fcbdf211743ad6da55950b1d23a1a33c70fe2e32dd4e27a838006aeae05b997dc2b78ed5dbaa99ff1e2fa2dfef62e3f4463e30f964febb99
diff --git a/sci-libs/oce/oce-0.18.3-r2.ebuild b/sci-libs/oce/oce-0.18.3-r3.ebuild
index d9c1053179f8..532ed8f8dd54 100644
--- a/sci-libs/oce/oce-0.18.3-r2.ebuild
+++ b/sci-libs/oce/oce-0.18.3-r3.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	x11-libs/libXmu
 	freeimage? ( media-libs/freeimage )
 	gl2ps? ( x11-libs/gl2ps )
-	tbb? ( dev-cpp/tbb )
+	tbb? ( dev-cpp/tbb:= )
 	vtk? ( =sci-libs/vtk-8*[boost,imaging,qt5,python,rendering,views] )"
 RDEPEND="${DEPEND}"
 
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 0e863b216583..ce67d9e87096 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -16,8 +16,8 @@ DIST opencascade-7.4.0.tar.gz 49210449 BLAKE2B c92afe7551e9a066ad0940dcf49278b55
 DIST opencascade-7.5.1.tar.gz 47807222 BLAKE2B b5ef30ea7c373250db3e0863f3c7fde84256b37957a482f10a462a4c4ed1a21cffbbeb10e9fc140325022d7582efbd292ed6d1016d14cb67ccf5c84d14060d5a SHA512 ebb937254ac165041ef7e1a80df8f9d2ac1d518f01b3d4b0fd6d203fe0d80bd474b85a462cccc1c74a513bd257c0b0ab7002632573f38bf72170363c7e42ed2f
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
-EBUILD opencascade-7.4.0-r4.ebuild 3957 BLAKE2B 4118554fff8ff80f64ce581dd5f233211d4a77d4366ada96ae646e819ad03adebfa8561ff9c4b9f9fcfed6cc2bad65fe6db0373d434768fcf5cc8a1808fe34e6 SHA512 a7783c641793480726433be75fd5c7260d9f62e32347aa1ee4e68b97adc5e18d829984f05e84e42c120a1c027c0ad15ee73e646c708466e0eeb2a9440b9726ac
-EBUILD opencascade-7.5.1-r1.ebuild 4852 BLAKE2B b5738e865f13b49d8a1916c9cb04bd6a6208956f53134ad9513c7a2bfa8428738bf6645a4b6d0fc0c9a9928735ce51feb740bc3138090acc08fa24bcde283403 SHA512 94b96dbc86489e1647d0e1dad5398eb81151039ea2b0124a5b2947397a3a21dde936d1a8fedb798800f54b38fc47b272922ffc5089c3983939e57db3bff36684
-EBUILD opencascade-7.5.2.ebuild 4630 BLAKE2B 81587b947cf6bbeb94b1dd0f76dfea82c1df8b385d5b04787c4868b202a6727e53ce3a473d78c71fc623f92d3a61d1f3709f42cd9ba614e16810e3db08600eb8 SHA512 4c1d11556bf65df8e2e2b1dada54547ff60a010e82268c05c31c58388ddd7b1a861b310029f49537a906ecbdebe70e674d4bc127699573a1bb2f63d9bebe24b1
-EBUILD opencascade-7.5.3.ebuild 4630 BLAKE2B 2e612b48bcd63e0b22e53c190e3dbc42986a23a99e8608aadff1e03a9b11f41076b6a8257c4713f1a0fe043f4ff2b3bfbf712f7358280030a24728a02fb34fd1 SHA512 dedc75b9ac633f7b3fa8fd957eb5c447f2a24fa3ef98fa2dc3d3df21fc66dad2e8bc5bd16e6ace0fdd23fdf886bf1981439f98dd7b6ce278644e326311a3fe32
+EBUILD opencascade-7.4.0-r5.ebuild 3959 BLAKE2B eb0a182ce66c63bd9aa2f57a57275c0e16c1ce4e56777932d7cf7bb6c6f380503e4549f57e4a61e91c4beb0ddf671b6a490a6e7e32cdfb62826be5fbde3d603f SHA512 a83bb2e24376c50b85c355c5d70662c3bb998098af46c9d54a21629da9bb2b2466190cf68955a3f2fc89c9eec504e49760fdc3041a39ca8a7413799e50f4bc22
+EBUILD opencascade-7.5.1-r2.ebuild 4854 BLAKE2B 940352ef80b231890575c29bfdada659b1f46bf360b5ba55558dbee66a12ba6afe9ffff63108fb1fe53c4204621ae3b7165510dd72f7e03b96866395e7d08012 SHA512 8b91d5180b6ea0a100f58274fa7eca2fcc993f1d95d9181030f79eb351db7af6a9abce358815030045354cc59e3a8134cbad3c518ec70b7288271823fdfaa651
+EBUILD opencascade-7.5.2-r1.ebuild 4632 BLAKE2B 486b02a0e64d50749afeef18765b0b66559375f40a38fc6cf93c50beaba5066ed89e7ccfe81e80d06137d248c8d07eb7cb090524b2cb202cb902f2f489ccf0ec SHA512 a551f79d098c305413507c133f7f0009bf9e94c17569341e33f17409456c692eaaecedb34faabcc9c06d0cdb28861514f1f0a2a64b0d835c1ce8fee26115c030
+EBUILD opencascade-7.5.3-r2.ebuild 4632 BLAKE2B 057fe72bfdb34b9fc03965d5ebb9eabd26c7896e3d3133dcb40f4d44a60fb85a2689d20c00bd20a628160fabe9f9a59ba9c819bcd709ba6c1cc0da8c868485a3 SHA512 13ad94752dc5dab5da155efd3ce8495c3154cb5497af5a010b06609740311ce1a6b9257b6eb4adbf14b8188f03b99ac33930310d9717b645a6f2ade2c04fa2f4
 MISC metadata.xml 1075 BLAKE2B ef2b520d3b17f3c74e652d5b8621da87e0e0fce1cd57f3ed9beca402cd41dab95e79e2535103d3dea94cd3a0a8fe7d2983c1243ee3c8727b7d8a2324ae303bd4 SHA512 39cf59672725d33e4c1eae993e1d7612014a3f96285b522601cda9b7757ab5a90d5195c0472e5a6cb5c4d1f7b96e74baab7476e2488dd7cf9f0c85c23a1e466d
diff --git a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild b/sci-libs/opencascade/opencascade-7.4.0-r5.ebuild
index 7a53a10d3509..b6dbf4121d02 100644
--- a/sci-libs/opencascade/opencascade-7.4.0-r4.ebuild
+++ b/sci-libs/opencascade/opencascade-7.4.0-r5.ebuild
@@ -50,7 +50,7 @@ RDEPEND="
 		dev-qt/qtwidgets:5
 		dev-qt/qtxml:5
 	)
-	tbb? ( dev-cpp/tbb )
+	tbb? ( dev-cpp/tbb:= )
 	vtk? (
 		>=sci-libs/vtk-8.1.0[rendering]
 		<sci-libs/vtk-9
diff --git a/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild b/sci-libs/opencascade/opencascade-7.5.1-r2.ebuild
index 666120a0cd97..375cc0a8d77a 100644
--- a/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.1-r2.ebuild
@@ -52,7 +52,7 @@ RDEPEND="
 	ffmpeg? ( media-video/ffmpeg )
 	freeimage? ( media-libs/freeimage )
 	json? ( dev-libs/rapidjson )
-	tbb? ( dev-cpp/tbb )
+	tbb? ( dev-cpp/tbb:= )
 	vtk? ( >=sci-libs/vtk-8.1.0[rendering] )
 "
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/opencascade/opencascade-7.5.2.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r1.ebuild
index 59a4a6c42c77..b05376833bca 100644
--- a/sci-libs/opencascade/opencascade-7.5.2.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 	)
 	ffmpeg? ( media-video/ffmpeg:= )
 	freeimage? ( media-libs/freeimage )
-	tbb? ( dev-cpp/tbb )
+	tbb? ( dev-cpp/tbb:= )
 	vtk? ( sci-libs/vtk:=[rendering] )
 "
 DEPEND="
diff --git a/sci-libs/opencascade/opencascade-7.5.3.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r2.ebuild
index 23b32a161225..14258f13db45 100644
--- a/sci-libs/opencascade/opencascade-7.5.3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r2.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 	)
 	ffmpeg? ( media-video/ffmpeg:= )
 	freeimage? ( media-libs/freeimage )
-	tbb? ( dev-cpp/tbb )
+	tbb? ( dev-cpp/tbb:= )
 	vtk? ( sci-libs/vtk:=[rendering] )
 "
 DEPEND="
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index f99e0d2ea18b..26bc189c989b 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 5044 BLAKE2B bac0078d623212ab0e4782023abb24f4f7026af9d80ee69dcde5ee55dc39e5fb1790cedeb19b484f64ac7c1e3fbe010f898b4decaec30d1c7888e3e72612bac5 SHA512 84ab1f209ebfbf2bf6f519b34775e0b8321a2f5b53086ad355f7c3539c3dfa4798aedbc3bd0c647c8214f75e2d11c9618f9bd07c7449333acdd63e2a2285e993
-EBUILD scotch-6.1.0-r1.ebuild 4954 BLAKE2B 6f3067d0ffa3e230bdcdf6748dac63153f4978f4b018527efb7fa92eaf3fbd361bcc257d36559936a2c5be25c2591eb26fb1a266b1b1208c4a722f0ce126712b SHA512 ca7f02520153c68aafbcb687fd85a548ed5aa6df44b5c086063a6507152737b58b2b1c987676526882524f6d120939c88b4c16d193a8819049b1e5f76bef8e80
+EBUILD scotch-6.1.0-r1.ebuild 4952 BLAKE2B 9c329b2987e8fdf93a46caaa4b210405f0d64b52543a4814fb873c8bfdfea12675248675c4f35f58852ad93368275b62cd67a9028974622ae51bcf3dbfe6d287 SHA512 4aba8ee18c21c6d80e8affcec831bdb37077854c92f7994010a00cbf609a7fffea939370fd9d05a5d40d0706711d1328601c597bf950ba3276f3481d38271b5d
 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 ff3058c464b6..4248caddd1a2 100644
--- a/sci-libs/scotch/scotch-6.1.0-r1.ebuild
+++ b/sci-libs/scotch/scotch-6.1.0-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="CeCILL-2"
 SLOT="0/${SOVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc int64 mpi static-libs test tools threads"
 # bug #532620
 REQUIRED_USE="test? ( threads )"
diff --git a/sci-libs/spqr/Manifest b/sci-libs/spqr/Manifest
index ad4ce52479d1..d98930180b40 100644
--- a/sci-libs/spqr/Manifest
+++ b/sci-libs/spqr/Manifest
@@ -1,3 +1,3 @@
 DIST spqr-2.0.9.tar.bz2 2161068 BLAKE2B a662983d2543a65ce36a367749db5585308acb56b016f69a35c46a84e9c12a678f57a3cfd459cc2e887fff2819b00f99981efaadb73831f1b4c54cbef5e1c367 SHA512 54b203e0d68b266473b8a2b7b3b3a55476df54a3ebd5748b70faa7bad1d0a5a7387197f0674ba5f9a5d45887daa736117f8d6ffbbc2eb02482b3374a3babf721
-EBUILD spqr-2.0.9.ebuild 1090 BLAKE2B 38dec7e90adc96d97283381e0cd9343e722e3545033a4ab6b9afdd5e4ed56185cc0eaebc2aec3be40a0ba146644261274033df252a91624c38c087ce8bb067c5 SHA512 30ba9fd4fec6917b5ab6f5765d7d7c8044dfd7a2d8a976971df4a5419b3db4a6088a87afbec735c73e99e7d3d7e42d267a44933fb45dd3241fc778e766651be9
+EBUILD spqr-2.0.9-r1.ebuild 1092 BLAKE2B db5e69e862e58e3a98f6208b9d7ff8c21d8825f380339fc616894009d403e6838f14d21cdcca50cfcea27d1b049fc305c9ccc715f925171b256ce0d41f459916 SHA512 52e1ad122fb1350a0bb8517c2465c451070c1e0a22cc3701abb09523ec2ebe287a960b377fdc29202bdea696df06d1464638b0a2767fd5f5bbb9425f1a8e9042
 MISC metadata.xml 852 BLAKE2B 9480a2097af529f47896d300d8654b791ef1ea3989b97d8aef287dbe5b322167ef7a425016894b14c975205ebdc35cc5a1f187026688e0cbd7497b51657d0181 SHA512 51150e01477f24a382731c273f83aeb8fa646a7f897e4f6e8ffff4d4050fbf9ff589b7036134d9faf4da2c07a16654b01d1923003bc1e30c380b6fc46a3207f9
diff --git a/sci-libs/spqr/spqr-2.0.9.ebuild b/sci-libs/spqr/spqr-2.0.9-r1.ebuild
index f8b22bfa58b4..b586d18ed69c 100644
--- a/sci-libs/spqr/spqr-2.0.9.ebuild
+++ b/sci-libs/spqr/spqr-2.0.9-r1.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 	virtual/lapack
 	>=sci-libs/cholmod-2[lapack,partition?]
 	partition? ( >=sci-libs/metis-5.1.0 )
-	tbb? ( dev-cpp/tbb )"
+	tbb? ( dev-cpp/tbb:= )"
 RDEPEND="${DEPEND}"
 
 src_configure() {
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 622fe319a7eb..de47f4450d26 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -33,5 +33,5 @@ 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-patches-2.5.0-r3.tar.bz2 6385 BLAKE2B 5cd3a9639884aa67bbd192cb1b06cfedc557b8ad05aca0f4887987c615656620b9294de98b119bf9d6edafd5b56b9d5e6900f95adb06a3a49cfdf342c6195b22 SHA512 8f0d2be9ffed81aba5c85088a79ca56af889e0247516f51657d214d19d39877cfe331e60f63e8c54e2b12acd7a624b181e281534acbd9a103f6eec0aae70fd8a
 DIST tensorflow-toolchains-v1.1.10.tar.gz 137512 BLAKE2B 774b22a599070564c0f77ed0da79f6a96359b196dd3007370be885b796c236b9a29c01597507a3049f82cf489824c8016740b778cacb2b8cd859500f9ecb1887 SHA512 1daf4684f5b364a89b3cc475cf2d13d0d0622fc14d2b32d7ad8518932538e716782d755cfcedc98d129a3986bc7c38bfc7854c8ad596891e397510b75ae2f93e
-EBUILD tensorflow-2.5.0-r3.ebuild 15609 BLAKE2B 7de8607494601c61a8cd5403f08147ec9ed6fa32907f986318ba15e47da72b374922e72a3289beba89ac3bd913c9569932f466a9b7f4eb3133ae43f97a0d04c5 SHA512 8e524f76447e22f94c6737b00602878c28162afa98f95bf4b291df0a16de97ef4a51836fcd6c23a23897b824d17d25c186f187d7de37004501376e91790d2a02
+EBUILD tensorflow-2.5.0-r3.ebuild 15611 BLAKE2B 21084cfcd23ea41447dd37b34a012eb16f0ad335c8b54ce9c68ce25b78556acd487a6d0e0efd9eff5c93270213e0a85c09fa57016da023f7ded03d3e9f016e3b SHA512 67dc8bbfaed5e1d19da48793defdbdac4f24449d7d9335783fdf27ffec556718736575328399d2c74ddef704fe4acb2d133c1bb7c3491185210690f322b5e58b
 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 ee65934a9f4b..40be4de728c0 100644
--- a/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild
@@ -85,7 +85,7 @@ RDEPEND="
 	<net-libs/grpc-1.39:=
 	net-misc/curl
 	sys-libs/zlib
-	>=sys-apps/hwloc-2
+	>=sys-apps/hwloc-2:=
 	cuda? (
 		|| (
 			=dev-util/nvidia-cuda-toolkit-10*[profiler]
diff --git a/sci-libs/trilinos/Manifest b/sci-libs/trilinos/Manifest
index a682f21050f4..69e76ebe9fbf 100644
--- a/sci-libs/trilinos/Manifest
+++ b/sci-libs/trilinos/Manifest
@@ -1,4 +1,4 @@
 DIST trilinos-13.0.0-patches-r0.tar.xz 7672 BLAKE2B 6412f1226549086ef2fca3c4d8bba3c5541489879f4fa37c3598a7271128e3232fa1cc56a51d44fb88d679458a79a082c3984085ddbe4bc0884b0cb45ba683c0 SHA512 91372fe0f47a1f5d4dbc1856e2cfb9d4f1eb8cc0de941013a7a6e791730c9e10decdcd4ca39b36bae836ac66040bee70af187b4a056d46b0da0fe72e8c5943fc
 DIST trilinos-13.0.1.tar.gz 157950374 BLAKE2B 79f337b02a0fe9ddf7b55334e035946204b3bb469b92fff4063896a378c82d9c5f04c0bf0e9ddd21603ecf9d84a91860606482b545916f16029a11d2b6c64aa0 SHA512 22241a9ad8b6b6ab9117aba254f65195fc0c8e1b52eacb16e763c999086b6da6b0c180d8864fbe421704e0fe0c433d37512099755d54e60f13ed525dc6c0fd57
-EBUILD trilinos-13.0.1.ebuild 6461 BLAKE2B d82b9cd918fb3a43c5112d840e817d8f8ae67a29a504b9a771c027830df3ad8891dfdefcf4dd0ab20110460fc3f6a29212d9bae0c5eb9a08e74d71371f97afc3 SHA512 705a0e3975384c78bd28c3608d98fc19fbe68ab5fd71952558b3703cd93d91a665b5a0c1e3d5293db95b593d99bc6eeb9674902447f3ed37cc6404933fc8f698
+EBUILD trilinos-13.0.1-r1.ebuild 6467 BLAKE2B 3f28139f1b9dd05dbd49f4130a0926c7810e87b01d21c10ca6d0b24419c9e577b1dfa562cd79ed0620594140940e9640732ad85246becb0303d3b6ee493b21a5 SHA512 6fe413563fd9e19f19cfc936cfbcd2dae12a0ca0a5dde6a8bb0824ca758bbf5a8c20fdf9eea53d52fb0b2aadf0aa0a7e9e67573d9f7766f930e12949bd58130e
 MISC metadata.xml 2779 BLAKE2B 4212ae278c7c11c7e09211265d1bf199f0334497f27ae33f16801b04933d00e671d5ff6f4da9e5386a8c30eb489865825babd77fb9b88c1b364e4d10d8fb00db SHA512 8698269f9dd5bdae7e45b5df49ff2d1422d2ffb89b16d1f9f162a1e58b4e5cce68ff3e11385e0731816ec14033efe72abd867f7251fa46678ff139e957b75e22
diff --git a/sci-libs/trilinos/trilinos-13.0.1.ebuild b/sci-libs/trilinos/trilinos-13.0.1-r1.ebuild
index 462a25dc6efd..26a268958be3 100644
--- a/sci-libs/trilinos/trilinos-13.0.1.ebuild
+++ b/sci-libs/trilinos/trilinos-13.0.1-r1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	virtual/mpi
 	adolc? ( sci-libs/adolc )
 	arprec? ( sci-libs/arprec )
-	boost? ( dev-libs/boost )
+	boost? ( dev-libs/boost:= )
 	clp? ( sci-libs/coinor-clp )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
 	eigen? ( dev-cpp/eigen:3 )
@@ -41,7 +41,7 @@ RDEPEND="
 	gtest? ( dev-cpp/gtest )
 	hdf5? ( sci-libs/hdf5[mpi] )
 	hypre? ( sci-libs/hypre )
-	hwloc? ( sys-apps/hwloc )
+	hwloc? ( sys-apps/hwloc:= )
 	matio? ( sci-libs/matio )
 	mkl? ( sci-libs/mkl )
 	metis? ( sci-libs/metis )
@@ -54,7 +54,7 @@ RDEPEND="
 	sparse? ( sci-libs/cxsparse sci-libs/umfpack )
 	superlu? ( sci-libs/superlu )
 	taucs? ( sci-libs/taucs )
-	tbb? ( dev-cpp/tbb )
+	tbb? ( dev-cpp/tbb:= )
 	tvmet? ( dev-libs/tvmet )
 	yaml? ( dev-cpp/yaml-cpp )
 	zlib? ( sys-libs/zlib )
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index d20fd229d042..13fd6ab5db3f 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -16,6 +16,6 @@ DIST VTKLargeData-8.2.0.tar.gz 247522878 BLAKE2B 68dc90548604fbbb8419f2b400aea5d
 DIST VTKLargeData-9.0.3.tar.gz 247523270 BLAKE2B f4011292957454da5d8c9e515bcd0972af4299cef3928098d745be96559a1e0080297871c6e11fdd98498c8786a30a6674bc650368adcbcdbc6260e0938d21a1 SHA512 ebd6cb5f2935b77961dd68d0c0da2ea5ab900cec8c2eb641c785a604c65702e40a3e44d32bf3f2acfce9ec28dd89f41bf29f93a4f89d5b36c713f3743d7125b1
 DIST vtkDocHtml-8.2.0.tar.gz 132516675 BLAKE2B 8651a3793f3326dee36c5ae8a280b00943067f973115697f34770eefd42b5534a7d7e439e7745b32c5fa83daf5a5292b854792d18951af236d0aa77c3aa2b564 SHA512 45e198bde82948d1d8e47a8bdb64a2792c2bfdfc0d939ffe40ded79092d7ac5f497008c00c805baa09d27eabb419cdf0787eee1caf2ac44c5e8759ecf709a317
 DIST vtkDocHtml-9.0.3.tar.gz 132650096 BLAKE2B 45fc1a6942df3e79e500a552c3b3cda2099b9451191559d471e3a2e785a8c52b2c6273cfd2cc4a3f3f65582e607d9414475f58d243fde96a4f985bed479e53db SHA512 9b5fef43f3c2b92aa1fe6a9ba9458d6677874b09b167654db7f26df6feffdc34ed1a8fb4e59d64b75625063a774af77fe57f275903602a5f7daa74e1a2e71800
-EBUILD vtk-8.2.0-r4.ebuild 10333 BLAKE2B 834bac0a4f2a2ebb770a67b62dab0240c45588ddebf5939e4e0557441750c8a83cb76ecee02a3841673e2749ffd628ea8e611f9327c214c01a95eeb5dd23fd75 SHA512 26c1bf583d835717950cd0f5842eb358ed31728484c906b9122e5cb72b72f0255f73f6a52974d098eebe2af6af9a72aa4b369148cf47d1ca994ebd6dfcd3f68a
-EBUILD vtk-9.0.3-r1.ebuild 14286 BLAKE2B 8d2dc5f383e5fa0c7e23d5fd47882d553eb34781d483b2d48b163d233f3d0b80a9be124fcfdf033e615f220cdfa5274bcece578dd6c2c1ae9e2a19de8991492c SHA512 2e71f92245c81b3994b4af26f8400e51bb88132d961795de8bc5a2becfea053c3e4a586eb7837fbd53b9e9651abd95ba5daa4d34e34ec6aa19aa7a6bd560c9bf
+EBUILD vtk-8.2.0-r5.ebuild 10335 BLAKE2B 134757c2f5c2f3097fefdb934e647292a419c5999049d7d5573f9d0b1f5ea3e45930843268f866d08f7b8ab9bf73c74b2c35c9daf5e1939ea62a9a65efbf4e2b SHA512 2b04b6710fe87660d985ef35d0f21844aa5c60dbc4a77452e56ccbd864447cb7ed56ddf804aee230547b3b25ff0603ad80e7dfb7c647054b3438e26ce516513d
+EBUILD vtk-9.0.3-r2.ebuild 14288 BLAKE2B a6404798ca5c03c963cc26cfd073cceef69058e611bc9c53a70fd21e1fa3d2d629921d9dea69e4a8ee66f2ed252d70d0bcece711da5e700fac27cb44f7d73a51 SHA512 7f39154caef160f999ffb7ee633ee376d919ae0cca5da68f29bb465c9614c3d5504a6470aae623aeedfe95a0353fab8d29b05806aedf792ab01edde64a828093
 MISC metadata.xml 1405 BLAKE2B 0eadca65bf1cec673770c28b581491053bfd0f0834aee7c063e79fdc8e89ae161f74e97de4bbcdc1f80590284a004ae129f28b948d6efee0bd5d1c2ae1c3b26d SHA512 133b198af799dabfd1f4dad6ba27b27f8a2df728b46b94934ba3cb26c6a51dec8882e905f120ce1e5f55fbf8fda4ee9634c59280f7fd1f7bcd316e64f86aec60
diff --git a/sci-libs/vtk/vtk-8.2.0-r4.ebuild b/sci-libs/vtk/vtk-8.2.0-r5.ebuild
index 2cfd6476f0a5..20a38a74ce64 100644
--- a/sci-libs/vtk/vtk-8.2.0-r4.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0-r5.ebuild
@@ -105,7 +105,7 @@ RDEPEND="
 		')
 	)
 	R? ( dev-lang/R )
-	tbb? ( dev-cpp/tbb )
+	tbb? ( dev-cpp/tbb:= )
 	tcl? ( dev-lang/tcl:0= )
 	tk? ( dev-lang/tk:0= )
 	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
diff --git a/sci-libs/vtk/vtk-9.0.3-r1.ebuild b/sci-libs/vtk/vtk-9.0.3-r2.ebuild
index 169b983aea29..4bbb3680acf4 100644
--- a/sci-libs/vtk/vtk-9.0.3-r1.ebuild
+++ b/sci-libs/vtk/vtk-9.0.3-r2.ebuild
@@ -97,7 +97,7 @@ RDEPEND="
 		virtual/opengl
 		x11-libs/gl2ps
 	)
-	tbb? ( dev-cpp/tbb )
+	tbb? ( dev-cpp/tbb:= )
 	tk? ( dev-lang/tk:= )
 	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 	views? (