gentoo resync : 12.05.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
committer: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
commit: 752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree: 330d16e6362a49cbed8875a777fe641a43376cd3 /sci-libs
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
81 files changed, 1685 insertions, 346 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 57b30f28caa6..48ed8c5827bf 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index bfc5130e43ff..1e8d68580574 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,5 +1,5 @@
 AUX cantera-2.5.1_env.patch 4600 BLAKE2B ed131f2b3d061102f197d50105176332fd07424ddff81b0af05bdc2eb3e514bcb17da85e285d80dd717d685a10a8eaa0a08769171cbb2df5103d2283519ef311 SHA512 92083e331a1ddd712d21602e50960cf0251ca688a90121f67c35b21b79851c7baa6d9373a67bec1beade53d44e6dfe2e0faf7385305d2c8cfdee2d9698b21c67
 DIST cantera-2.5.1.tar.gz 2492422 BLAKE2B b48c5d12fc2b69d309759afd20b55dc2533c23ccba840109cf7a85c4ebb8306eb48d9f007914184a9d409f7bf296814fe09e6e62a29cf8384edd954fdff2af4e SHA512 8cd65f6b86b3009f22ec243cb7cb833e26919c4925fd15fba8fb98aad2180d8c0fe7550e13efeb7cce55abab06d9400230d59c9c43b4d3be6b0575b1164a56bc
 EBUILD cantera-2.5.1-r1.ebuild 3436 BLAKE2B d961413b7a6ccf67f13d8d91d067264af2ddab2b5c351abdb8d41c85a2d013f9ca44ec8a34ddabf71cd9fd06e7a97664f081f03264871a2be811e1b70758656a SHA512 692d7df06f6f659465672f379d10ccab4f9f4f8b574b69636e992d3a8664d6087a7bdd73222ed6f5cdcfe86b000a99f8b1b7c36a79f9078b3beb1f81389caab4
-EBUILD cantera-2.5.1-r3.ebuild 3418 BLAKE2B 83bc9f934a458554491aeb5183fe345bb3a6083fe81afc12e71d43ad7245f082f89634df949055d3d23d09358d9088961973283eabe36a2aa37db27c1f4adba7 SHA512 e9df64a4f6d0f9c9b2223396e1cdbeb3ee6ecc97f5503bb53406971a5538b2c3d90b62096234e38c35ae4a279f299fb048d504e3be9549a8794d804661148906
+EBUILD cantera-2.5.1-r3.ebuild 3417 BLAKE2B 9a74774ef3980c8007d952b0eab82522eeaf717d78e9af49022e20f494b3c43b773cd958d9ba381daa4eaff21d1917fe4a0e95640d3cacc85c787c99ccfe1f59 SHA512 167c28e81c8f0f7fa8abb5bb916e8b4c84d5a20083ce00b79de21fef781d3d0bae1bb321ee80f0edf5f91a55fb2881a9cbbeff260cafb944e09621c8a73f49ca
 MISC metadata.xml 842 BLAKE2B 85e2a5268aa13a8a92e9f04212c3bcd66252a77c88dd2ddb7d81a34f486754c7faa352998484d4362b16a2bdccb85325337c13cc272a434be463a037eab846a1 SHA512 a9edb0347dc3b1510d3d2b767e7a0e96cd1d6cc50dd4e5c2830d29438dd25a0bdfa41994dbb43bbb7dc70ba3537f783b2d0a143723908dd91d434e1edb11a704
diff --git a/sci-libs/cantera/cantera-2.5.1-r3.ebuild b/sci-libs/cantera/cantera-2.5.1-r3.ebuild
index 0af208ddd56f..dad4dddb283b 100644
--- a/sci-libs/cantera/cantera-2.5.1-r3.ebuild
+++ b/sci-libs/cantera/cantera-2.5.1-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+cti fortran lapack +python test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index b5e48688c2e8..b4691cbc22b5 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,6 +1,8 @@
 AUX ceres-solver-2.0.0-system-mathjax.patch 325 BLAKE2B a649088517ec1bef7d5a6144de57657daeff2b5a1a0b053c0bfa81d8af7143ad5d829571be947d8853bd6d1fe39adc63b4f14a4075004775151fa649747911c6 SHA512 e16646210fddb350f5cc43665afaa88d2ffe53c817dab778c0e2534c1a0001242865a547e8a308621a9068555e7e20a57e83b0447ff5d32688ed5fb3f5694d29
 DIST ceres-solver-1.14.0.tar.gz 5450130 BLAKE2B cfcfe07cecb267528081dfc6deb5283bc5a04b79d4595e45365960895b84a6dca2a3024b046868f06709fc81e8514730cbc409ab01cb0cbee488b5bad5b9f7cc SHA512 a2af9918d2730709361ec971431a2b22e6ca3ca440081be87fa52729ec43702020b021837bfe5a42a58db1ab89ea6aada11f2d1888da66bef614ec1f27ab30c6
 DIST ceres-solver-2.0.0.tar.gz 11225245 BLAKE2B 1761908747d460f6a84cb519b4bbb49fec7e1e36cc616b438c45ace57d10bd3bb4d0cb2795e07d5096e0b9453511c185ffdd3872e317aa8095daeb86933643b0 SHA512 843b19389f4d628b2b8b8538655cb330e092ffcc960c6896c6e3065b3a34e330c81e993b7abcd754e575742e2104087efde3526945c92f7df3f6b700984e49f9
+DIST ceres-solver-2.1.0.tar.gz 3802187 BLAKE2B d8ff780cf9b9de2541c15a2b95bde07a2d1c8e60bab3a8a4b13134b99da699da452467afe3310b9f70c3c2a6bd033ea3c4bd3c401153899e9c70867fae30c633 SHA512 db777c4a4b85a9972628c714413fe9ca1a92cc6c8b14d80401842a02c4d7e7df4e9d236775e231e8337e47f21e47cd82c1a0fbcfeffbd9b654e46a66262996f2
 EBUILD ceres-solver-1.14.0.ebuild 2390 BLAKE2B 6aa1716982173734e1f95f2ba76b18ae27854811c35d95f8b2812fd6ff7ff1b74adb7c4f674e4834b5ee65e1a5a159d9cd656d28a9fbdda6192da84060150e8c SHA512 1e8da4d8abbfe6705841a453a9db6e5d672c40efff438afe32085b7ad43b7801970184d1869726ce9ec28b32e6c076f84a7fa622417b88bcd9f7072602bd235a
 EBUILD ceres-solver-2.0.0.ebuild 2523 BLAKE2B 612e60be06848882934d58436bb24e1724da33d5ab37e8cd4a84368d7d98b5bff771118ca0074953630c48ea16614e29d712c2241d045129504b92578c45693f SHA512 78e483b58fb4c50415d493c73bfcf7f985f529be1a6af42fdff80b2f1d1d5a4d97d172486adb6200dcca5a6f2097bcf4d790e4e3b65c708689b22e9df96cf94d
+EBUILD ceres-solver-2.1.0.ebuild 2514 BLAKE2B 061072dda3c15e4805fb89894f3ba646e585c207985a2bfcc807a3bf9a981a75cc08a8b8c10e366fff8ac20f5e1b60d60b535179661c162b2c09c531c7878e79 SHA512 a2a2bd7026b2bace2841347d1aa211a2b4e56c6e9a21c85f208a9db34944d43bebeb2fa576a177f9fb26d069d4a16e19c2e0fd3f8e67a12e363cd0c58ce57286
 MISC metadata.xml 1452 BLAKE2B d754f2990a415da369d9e41a0a1b6f7634b3bb51629d8169d74fd9122030b1ceebfc4a69cdc015ba7a4ef2565f6c36ec218fd5df4c5a45c25fe8802c5c17fc3c SHA512 ebe2f54e01d3a1230e2ed3ca59502571b0d596349126e9b69d06787f85465d66a989b7a430b22c62d5176bb197151e3c59c22b22fb55d87dd3daa53a6a420cbd
diff --git a/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild b/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
new file mode 100644
index 000000000000..92fefb044a1a
--- /dev/null
+++ b/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DOCS_BUILDER="sphinx"
+DOCS_DEPEND="dev-python/sphinx_rtd_theme"
+DOCS_DIR="docs/source"
+inherit cmake-multilib python-any-r1 docs toolchain-funcs
+
+DESCRIPTION="Nonlinear least-squares minimizer"
+HOMEPAGE="http://ceres-solver.org/"
+SRC_URI="http://ceres-solver.org/${P}.tar.gz"
+
+LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxsparse examples gflags lapack openmp +schur sparse test"
+
+REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	>=dev-cpp/eigen-3.3.4:3
+	lapack? ( virtual/pkgconfig )
+	doc? ( dev-libs/mathjax )
+"
+RDEPEND="
+	dev-cpp/glog[gflags?,${MULTILIB_USEDEP}]
+	cxsparse? ( sci-libs/cxsparse )
+	lapack? ( virtual/lapack )
+	sparse? (
+		sci-libs/amd
+		sci-libs/camd
+		sci-libs/ccolamd
+		sci-libs/cholmod[metis(+)]
+		sci-libs/colamd
+		sci-libs/spqr
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md VERSION )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.0-system-mathjax.patch"
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
+			ewarn "OpenMP is not available in your current selected gcc"
+			die "need openmp capable gcc"
+		fi
+	fi
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# search paths work for prefix
+	sed -e "s:/usr:${EPREFIX}/usr:g" \
+		-i cmake/*.cmake || die
+
+	# remove Werror
+	sed -e 's/-Werror=(all|extra)//g' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	# CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF CXX11=OFF
+	local mycmakeargs=(
+		-DBUILD_BENCHMARKS=OFF
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_TESTING=$(usex test)
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DGFLAGS=$(usex gflags)
+		-DLAPACK=$(usex lapack)
+		-DSCHUR_SPECIALIZATIONS=$(usex schur)
+		-DCXSPARSE=$(usex cxsparse)
+		-DSUITESPARSE=$(usex sparse)
+		-DEigen3_DIR=/usr/$(get_libdir)/cmake/eigen3
+		-DCERES_THREADING_MODEL=$(usex openmp OPENMP CXX_THREADS)
+	)
+
+	use doc && mycmakeargs+=(
+		-DCERES_DOCS_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+	)
+	use sparse || use cxsparse || mycmakeargs+=( -DEIGENSPARSE=ON )
+
+	cmake-multilib_src_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples data
+	fi
+}
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index 35d3f7e2f9a3..59077f0defaf 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -8,4 +8,4 @@ DIST dealii-9.3.3.tar.gz 24462944 BLAKE2B 581a8c618fab96127ac95fe9ba5ea5410eb6f9
 EBUILD dealii-9.3.1-r4.ebuild 5153 BLAKE2B aba353f97cf2b1da9bdae7f7bd4ffc1e06c5d11c0a964aadf1869d61c6fda6e5c73270497de48433b909cee319ec6fae30660a845a2ab9f1ed267080314a280b SHA512 c65f30d2ac590dbac3f6bccdd87f7867a8d046d107fa873704124d2e614b0686cb1aef6db5f9e582d1899f33ff4f2ac76378b07d071bd5369ba3cce52204a3eb
 EBUILD dealii-9.3.3.ebuild 5152 BLAKE2B 1bc52cea2484c5c0a4754be201f8a43bf5bc3fb2f30fcf0ca1a1ff60bedc74835ffe25555f2523545b7f3badb1f03e0f8a75bc9f442ceeff81df1f755e08da6c SHA512 b14a28d3d3b5e3ec7cfe2ba785ae75dc7eefac99d8743952f58ce3ec0bc2d0f0a9e773b616047f7704b0a0e49eef94fbd19786d8c1ff8d46e60ed25679d5bbf8
 EBUILD dealii-9999.ebuild 5157 BLAKE2B c975c52517a60db0c3ba27577f8f33220a8f5366443c0061164b9ad9e6ffdabb66a5df24197dd811d93426050ae2a6318e0acfd46bea1a35cce779065c2a13d6 SHA512 7723a4e89ddcd2701cda2f935cd7b84f2c23d5baacc679abbcc2a6296c1b449c2c7c0462fabc0aa4d2df00dfadd07b18e0250decc9616d8643d11d3d104688fd
-MISC metadata.xml 2440 BLAKE2B 60d4ffa5f20f88642507203f63dfbbe347ce6399cff96bf7728b929b59fc8d30e8046b7c002d48e59cfac1df73fe8f78b7fd58780673b645cf6549cb56580f39 SHA512 da2925396422db90cc0770faaad06e4bead71a34ef32416e4ab507e0c67d79b75824d1f95d24f9f0c46e2b8ea577229f2fbae6aff163090e058d2df6269b2c87
+MISC metadata.xml 2441 BLAKE2B 21afc338e112d389480c41a91bdaa5b29e57a532803df8df98f93c7b8327a1cf293c92a04d87852f5abff176a8aa7aa84d0647e31876b7162504005bdd07d191 SHA512 cfcafe9b4c9ff48d1d4631db2cce79248d04ee8de71684a9b8201ee9367d294095dbddc200b9cbd16026d4200afe386455708eaa6dbd747e8177a16d2c3ec897
diff --git a/sci-libs/dealii/metadata.xml b/sci-libs/dealii/metadata.xml
index e863c0a535ef..8b4433d57a7d 100644
--- a/sci-libs/dealii/metadata.xml
+++ b/sci-libs/dealii/metadata.xml
@@ -21,7 +21,7 @@ to the complex data structures and algorithms required.
 		<flag name="debug">
 Build an additional debug library with extra debug codepaths, like asserts
 and extra output. If you want to get meaningful backtraces see
-&lt;http://www.gentoo.org/proj/en/qa/backtraces.xml&gt;</flag>
+&lt;https://www.gentoo.org/proj/en/qa/backtraces.xml&gt;</flag>
 		<flag name="gmsh">Add support for gmsh (<pkg>sci-libs/gmsh</pkg>)</flag>
 		<flag name="metis">Add support for metis (<pkg>sci-libs/metis</pkg>)</flag>
 		<flag name="muparser">Add support for muparser (<pkg>dev-cpp/muParser</pkg>)</flag>
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index b7f48396a58d..0aa1292c7452 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -5,7 +5,8 @@ AUX gdal-3.4.1-poppler-22.01.0-c++17.patch 759 BLAKE2B bfb9cfc97fb56a18eda0f0d20
 AUX gdal-3.4.1-poppler-22.03.0.patch 2056 BLAKE2B 119a71daf7d53ee405041b8e7c2bd33e1672aac1883ebdd967a0252cbdc809dea2b993ad630a6c206cb68afe081354c2a56b94b6f9e76a868858aa1de34964cb SHA512 07511f9490a5385271210b140c07096232611a0604618e30cd97e8e737b4d81deaf536438296ad0307cf0f59a5fc7448ed36e3fda6e6faad6a49daac05fb2c54
 DIST gdal-3.4.1.tar.xz 13257288 BLAKE2B 3b01e8345579c9d46fb3d4ff240f5b97cf13eb4b580ecc93044e0ca3d99e2d19fa2a2a52a2342b3158d67525a1de18a9ba77a2033ad891f73fee682b2c10cade SHA512 a66362996f255cb75116693b4ee398337ec8b9699b5cd7fed90105f72832faa20750b77ebbc3e8d59ab72a23b35c4e4e78513cc803bd93e1b7846711ccfb5bff
 DIST gdal-3.4.2.tar.xz 13273280 BLAKE2B b40e2978d0841386b52de1ad08cec862c52aab8c015aecd58983bb8c5bbf8d86ca8e4ef5d2bbae39f421b3c78eecd0df1b3cd83d6bf25b1469563b4f9f37d8ca SHA512 7b7e2800b2c23ffe6b7739fbf77748e3be2db9e34b061753da5e175f6ad6ed7f9f91856d3838f071a17a6afab96c258d37a15502e254d2008310d3061031af73
+DIST gdal-3.4.3.tar.xz 13275504 BLAKE2B 5b1cc2be9c2af7a326dc532d547b1e7d2f9c4af32d8f16998f09332a88a53305243313711cc24fe5d028b8edc131ebccda6daf08b5c67d9a2c55fd4e04fe9cee SHA512 2b97e44b9bd84eb43b4c4894b7b6e748522b2f5e8b6cbecc8247fe5ea862795dd44ba2b52934a83688a949805cee4eef9f1aa66360fb831fea3eae956ab0bef3
 EBUILD gdal-3.4.1.ebuild 8131 BLAKE2B 49f36d5018cf65bfc92369d4d7e7f8eecfa823fb6ec88069fa7ae605d5c0a57643ddcc690fc5cfd830d45023a75baf6007da7f510174cfe8a4b67ef661a87b37 SHA512 f462eb9247d7f0c9b281e95d7ae69808811fb619973ea785de5061c84b5aaf2b42222b61425e49ac6b614573ec49da72ba35426694731445313f814888240aa5
-EBUILD gdal-3.4.2-r1.ebuild 8166 BLAKE2B 5d8db98d2976f5a5010dba2ca66ceb3496205c4931fe703eec668dae02c80ac40048e7e88c33a47697810e152fbae655429acc1d58adbca7c1d4dc9b506f4ffe SHA512 5b983e33bea3f05b4c84055872a6267202f279eedcae5873cfa28f901da6f1e860fc71f0984a7e01eb0e2f5ef0656b9339a0b155dddbb6798e72787209295300
-EBUILD gdal-3.4.2.ebuild 8133 BLAKE2B d9f24a278b01eaf11c1b58bc8aa9c01335c4e3ec3ac4fa2317d7745dd98d5eb01965686262045b82ec0d770d63ef2d455b6c5459a1b24c491c039889df40509e SHA512 0042eed7df18d29c4209eeeb9cd58afaeb6b5b2feac5f4a1cab1420f6c757357e2f54809fb27d594dcc765f2c3faed571b19233ec847538afd8b6b20e036783a
+EBUILD gdal-3.4.2-r2.ebuild 8171 BLAKE2B dcb8f1836bd8f40c9c6c78a178e7cbe3bd38934345d2d0dc6a7f4e6057ae4e06b9d7a50f8d3c9e5a74013e2ae6068ea9bbc7c38bfa297731136a9662f946f561 SHA512 d47d70febcbaa9b9e3df4a3eb9d1ecf43f006629e1afec4ef1b399fd9a8fb3664d9a99b7af291ac941137b373e86e4c59cfe6eac5620508f251af658bddf242a
+EBUILD gdal-3.4.3-r1.ebuild 8125 BLAKE2B e6c3df82d9d1ccd60d57405d17ccb93ffa31353c1738e6adc67cac1faafe01c3da4650d2f4f0ad413c08c7d1bc8cf20e649978a9ac8d500873aa3c0b171d996c SHA512 0e1f00f7607d9b3b7cc6d64ac7e7c7619a6b4eb9c86a5ce102c087703ba36a8c15016fbcc1f196073126b22d2aa6f201a7ece1cd509244d95060946c34b43c1f
 MISC metadata.xml 1623 BLAKE2B af7c9d5cc3c16ffef6fa9ef5dd5cf54ffcd34229d1e82b90e310f9eeccf5a5b4fa2119112b5427b520ce6e964e368aef7313edb3837940bed4b960ced7714fc3 SHA512 ed206877adac0b8b190e0edfb04f48c435d698fd523a14d54a14638b908c9e9452b1a2d394046093f5aa86cb48c611790f56ae511807855eb80bfcd4cc1d425c
diff --git a/sci-libs/gdal/gdal-3.4.2.ebuild b/sci-libs/gdal/gdal-3.4.2-r2.ebuild
index 97c8af9a4910..be552b0417c5 100644
--- a/sci-libs/gdal/gdal-3.4.2.ebuild
+++ b/sci-libs/gdal/gdal-3.4.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="BSD Info-ZIP MIT"
 SLOT="0/30" # subslot is libgdal.so.<SONAME>
-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="
@@ -41,7 +41,7 @@ BDEPEND="
 DEPEND="
 	dev-libs/expat
 	dev-libs/json-c:=
-	dev-libs/libpcre
+	dev-libs/libpcre2
 	dev-libs/libxml2:2
 	dev-libs/openssl:=
 	media-libs/tiff
@@ -56,7 +56,7 @@ DEPEND="
 	gml? ( >=dev-libs/xerces-c-3.1 )
 	heif? ( media-libs/libheif:= )
 	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
-	jpeg? ( virtual/jpeg:0= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	jpeg2k? ( media-libs/openjpeg:2= )
 	lzma? ( || (
 		app-arch/xz-utils
@@ -149,6 +149,7 @@ src_configure() {
 		--with-libtiff
 		--with-libtool
 		--with-libz="${ESYSROOT}"/usr
+		--with-pcre2
 		--without-blosc
 		--without-charls
 		--without-dods-root
@@ -177,6 +178,7 @@ src_configure() {
 		--without-rasterlite2
 		# Revisit when OpenEXR 3 / ilmmath migration is more complete in tree
 		--without-exr
+		--without-pcre
 		--without-pcraster
 		--without-pdfium
 		--without-perl
@@ -295,7 +297,7 @@ src_install() {
 	if use java; then
 		# bug #752399
 		java-pkg_dojar "${S}"/swig/java/gdal.jar
-		dolib.so "${S}"/swig/java/.libs/libgdalalljni.so.*
+		dolib.so "${S}"/swig/java/.libs/libgdalalljni.so*
 	fi
 
 	if use perl; then
diff --git a/sci-libs/gdal/gdal-3.4.2-r1.ebuild b/sci-libs/gdal/gdal-3.4.3-r1.ebuild
index 5a96f300c4d6..0542e701d8c1 100644
--- a/sci-libs/gdal/gdal-3.4.2-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.4.3-r1.ebuild
@@ -56,7 +56,7 @@ DEPEND="
 	gml? ( >=dev-libs/xerces-c-3.1 )
 	heif? ( media-libs/libheif:= )
 	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
-	jpeg? ( virtual/jpeg:0= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	jpeg2k? ( media-libs/openjpeg:2= )
 	lzma? ( || (
 		app-arch/xz-utils
@@ -89,7 +89,6 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.3-soname.patch"
-	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
 	"${FILESDIR}/${PN}-3.3.0-libdir.patch"
 )
 
@@ -297,7 +296,7 @@ src_install() {
 	if use java; then
 		# bug #752399
 		java-pkg_dojar "${S}"/swig/java/gdal.jar
-		dolib.so "${S}"/swig/java/.libs/libgdalalljni.so.*
+		dolib.so "${S}"/swig/java/.libs/libgdalalljni.so*
 	fi
 
 	if use perl; then
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index cd6f30cef5fe..19a50be1547e 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,13 +1,5 @@
 DIST geos-3.10.0.tar.bz2 6799370 BLAKE2B dd1490318fccda8ccaf5152f8521ab98ef5e4b143e12e861d02124421985a8b2c966bca6f966aa167fb60f703d25c132b8c7ee4d61e382a449bce5eb40d4cb89 SHA512 12657c6649bfbf6efa3232a054969c6229bb23fc16a7c72d6ca5fdb662e0d08e14bbcaa6944a17de8972b6c236608d94c870ead0b04fada2d2af3d42c238058e
-DIST geos-3.10.1.tar.bz2 6714713 BLAKE2B 932a24a7431bbd14b7412957a028a42b3877247931e529ee9b17f61dcecf4445a0aedf6a6f3e703793a9c3b33f0a4bbfd21f10bed34f6dfd3de7d301096f24c2 SHA512 1ba3af5e07bad40bae584b24ed7750a96f2974b974fbc7ccbaaa756fa6d98ed2ef6c0346e122c9c140307164084c436708bdaec86c0469f665cb1a19d0bdd0c9
 DIST geos-3.10.2.tar.bz2 6714655 BLAKE2B 1bc4f29a28b2b49faa9e1ea2aba7359d6dcb124136e0a2d2069508f7b95fae09e59ecb0acf3742d9261444055e85471cf45baba6e278c8b3501e91eacf3bb886 SHA512 390381711ccf56b862c2736cf6329200822f121de1c49df52b8b85cabea8c7787b199df2196acacc2e5c677ff3ebe042d93d70e89deadbc19d754499edb65126
-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 887 BLAKE2B 3653d5849387cd8890c49f497fa263961320af636ccf723ac9ec2ce77dc29dd184aa2cc954d28836d6458ba2471096d351bfa1873a62fd8dd1326e170470e186 SHA512 298d9191f68705e2bdff66b74876277e97ba218d0611a6c03e5de00afe4e59a6819712a9817a6fcc419e8a867aaeb8678ebe261bf352c90a93bf14020f67bb1b
-EBUILD geos-3.10.1.ebuild 893 BLAKE2B ca41569fd2015ee64f20642b53f1c4958ef050189124e2090503e44603e61290cad942f202d170379ddd10576be3f7df49b321bd6277c3bda7d88d2267fc300c SHA512 944a4341ad44c0156e5cdcc3f81c21073230ff56dd7ed5d3acd6049f0c5663a64000c092f8aa2a7ccb355f311a7df8d73f5f3b411469379c79858b40be2a713e
-EBUILD geos-3.10.2.ebuild 893 BLAKE2B 20af12160ea12a32324828746f75bbdaac92fd3960cb4bf9b70cd274c2792f528a08c25718f6e0a525469d68c83c138a7e3e75940fb058c2f27fce626c89ebe4 SHA512 c9bdf099bb1d2ed00227a1553238e3a8afd02445cb05b1634594d988dc0a932db5925dca5b114288d35436303395721757dcb276481b90dfa531f8a66470eff5
-EBUILD geos-3.8.1.ebuild 1102 BLAKE2B 6b6a901ab393f6501c8ecbd6195e57c76bf7165b79d892049535212d16d3961a1abf82154e897a7172768551a44396e33cc95ec500949863024ffb06185bada0 SHA512 deb6a39dc4cdf5529243b89be65fdaba5cd85905860575cab33202d9c52e511b677e0e72c280867939cd081d4a6787959def3798689913ef15afc988774641fe
-EBUILD geos-3.9.0-r2.ebuild 1073 BLAKE2B dfddcb6c942568397a90094ae3d16a91758fe9610bb8310e0f53d9c33780e163f9f4dcedd1c6739d48c286eaa3534e1bc563b9a4450fb0e65d5cd923acc8ae1f SHA512 89667cccb1b67be07c423813c404e22762c319a8b1e777d1d15a9ae0b6753f499967324c454165f730602288d97822ce6bdd6b3fda6b8077866e88ad6bdca0fc
-EBUILD geos-3.9.1.ebuild 1080 BLAKE2B 48c77ba041160de43d2205a14ad00f7f60d648350e989985ff5b22e0f3634c863ce15b7a631689ba3267c93030705f8216d09c04574d486ebbf14c7f638ba130 SHA512 de0981ff9381b5fca93fa304fe7c16ea02491878ce6e34a7642412d028c34c10315c346ba6c7fbea572f2d3338e52278c7a318746aff55c1435dbb4fa49239b9
+EBUILD geos-3.10.2.ebuild 888 BLAKE2B 0d4032484b9f7b978ede5881ff5c2b088b03141e953d7c570da8dbd1ab46cf02ab016f61724e0d2fb6666dabaf1dbc0d2146fe882ac7b6324c5905c6652f2e8d SHA512 50c4dc2607998f0f7ff21710a891d630a52175f679be31f390687c3294b790c166870ecb8dc62e8f10194665d0169776517ebab295c688a82e3ccd94e364d783
 MISC metadata.xml 990 BLAKE2B 7ad10fb1fcd8f933626c7a4d943070e147e6ff7776c4c57960cb42433c102036fdd724fd7288ea40aafe99c3255490fe304bfc4932e0c866349a38703c3990eb SHA512 1a2e4778017e909088675a9fc4e27e5b4e4aee4ec82708dd9ad9e3abfc8ce44f68bc19e70ab9de7543caf8379b151c40a2cdbe5e3a599216b201ef2fae8d4452
diff --git a/sci-libs/geos/geos-3.10.1.ebuild b/sci-libs/geos/geos-3.10.1.ebuild
deleted file mode 100644
index 4eac2dd43805..000000000000
--- a/sci-libs/geos/geos-3.10.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="https://trac.osgeo.org/geos/"
-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"
-IUSE="doc"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCUMENTATION=$(usex doc)
-
-		# bug #709368
-		$(usex arm '-DDISABLE_GEOS_INLINE=ON' '')
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_src_compile docs
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc ; then
-		HTML_DOCS=( "${BUILD_DIR}"/doc/doxygen_docs/html/. )
-		einstalldocs
-	fi
-}
diff --git a/sci-libs/geos/geos-3.10.2.ebuild b/sci-libs/geos/geos-3.10.2.ebuild
index 4e86081335ae..88688b2e75e1 100644
--- a/sci-libs/geos/geos-3.10.2.ebuild
+++ b/sci-libs/geos/geos-3.10.2.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/geos/geos-3.8.1.ebuild b/sci-libs/geos/geos-3.8.1.ebuild
deleted file mode 100644
index e6f8a36be5da..000000000000
--- a/sci-libs/geos/geos-3.8.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="https://trac.osgeo.org/geos/"
-SRC_URI="http://download.osgeo.org/geos/${PN}-${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc ruby static-libs"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	ruby? ( dev-lang/swig:0 )
-"
-RDEPEND="
-	ruby? ( dev-lang/ruby:* )
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	echo "#!${EPREFIX}/bin/bash" > py-compile
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-python
-		$(use_enable ruby)
-		$(use_enable static-libs static)
-	)
-	use arm && myeconfargs+=( --disable-inline ) # bug 709368
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	use doc && emake -C doc doxygen-html
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/doxygen_docs/html/. )
-	default
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/sci-libs/geos/geos-3.9.0-r2.ebuild b/sci-libs/geos/geos-3.9.0-r2.ebuild
deleted file mode 100644
index d3601008f05c..000000000000
--- a/sci-libs/geos/geos-3.9.0-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="https://trac.osgeo.org/geos/"
-
-# Arrow can be removed at next version bump. Upstream mistakenly
-# released rc1 as 3.9.0. So, we need(ed) a new Manifest entry to get the
-# real 3.9.0
-SRC_URI="https://download.osgeo.org/geos/${PN}-${PV}.tar.bz2 -> ${PN}-${PV}-r1.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc static-libs"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-RESTRICT="test"
-
-src_configure() {
-	local myeconfargs=(	$(use_enable static-libs static) )
-	use arm && myeconfargs+=( --disable-inline ) # bug 709368
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	use doc && emake -C doc doxygen-html
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/doxygen_docs/html/. )
-	default
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/sci-libs/geos/geos-3.9.1.ebuild b/sci-libs/geos/geos-3.9.1.ebuild
deleted file mode 100644
index 0f0e8c246b16..000000000000
--- a/sci-libs/geos/geos-3.9.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="https://trac.osgeo.org/geos/"
-
-# Arrow can be removed at next version bump. Upstream mistakenly
-# released rc1 as 3.9.0. So, we need(ed) a new Manifest entry to get the
-# real 3.9.0
-SRC_URI="https://download.osgeo.org/geos/${PN}-${PV}.tar.bz2 -> ${PN}-${PV}-r1.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"
-IUSE="doc static-libs"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-RESTRICT="test"
-
-src_configure() {
-	local myeconfargs=(	$(use_enable static-libs static) )
-	use arm && myeconfargs+=( --disable-inline ) # bug 709368
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	use doc && emake -C doc doxygen-html
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/doxygen_docs/html/. )
-	default
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 032ed8f00a66..ff7643efa35f 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1,6 +1,6 @@
 DIST gsl-2.7-cblas.patch.bz2 12073 BLAKE2B 71f2bdafdb1f42ca5c3515f8e39266242185218495705018d88e523be9bc776b39749156500cdc5746a16e481e9cfe2b79660e250eb1a70f3b18819d16fe11c5 SHA512 5b9b2a798079610d7d4981b83672cc978ed44b66aaf6e671794685f10bd4069764bb358870019dc0eec1e251639cde12aaa3598cae0e2fc050ea39c79435fe2f
 DIST gsl-2.7.1.tar.gz 7509209 BLAKE2B dd216c2fdb536e57b6e29613e46e1a05183fd18c47434039caac68fefffc0390cfe2f21eb117347d4bbdf9004de837ef2db02c17c01eaea4b615e3e45a4fd90f SHA512 3300a748b63b583374701d5ae2a9db7349d0de51061a9f98e7c145b2f7de9710b3ad58b3318d0be2a9a287ace4cc5735bb9348cdf48075b98c1f6cc1029df131
 DIST gsl-2.7.tar.gz 7508761 BLAKE2B a9da4df40ea57374880026a0586f2f218dbb0c9154cc661b3e7f5cd414311b95300e60faa2d7f4d3c6cdae5cfdf77cb8052075b56f51564aec2649cc4ad5f7f9 SHA512 a14ac5400acaf4884620430dbeb6f0b28eafe946923b792ab0eccc2a2abc9113d8ce342f4b1e5396f05247649f7d6f953944a8e6bdbf9ee1adb9e67b7c3df2b5
-EBUILD gsl-2.7.1-r1.ebuild 1484 BLAKE2B cd1a050b3ea21867b7c4a6363901787d3a717852e26b3593ae7aaef75fde7ade8b182473bd173c37e7c6753b636e36814bba9b6ea4c710520ff56a1abec6d3dc SHA512 0935d990d1fc14d26476761a2ee383dab0cd58ebfeefb7a54ef917b0e08008d5766d1d99f201161766b8555f2864771d1f222d19120ed44b602b33d08410d2e3
+EBUILD gsl-2.7.1-r1.ebuild 1491 BLAKE2B 72c9d8a3173334ba9e28903c5c66c759756a617c0ef110066f26e9768fb3be35f0d9dbcee6a2c58bfd552a45313949f7a50adaf699a2e3da4260d56ebfabbee9 SHA512 0e0831a79856483a8b43358f16a1521840f80b2a799dd391b8426044d09642318b1e90a1457ccc3aae6ad332f9874deea11724285f9de6cd24eb06d227074e37
 EBUILD gsl-2.7.ebuild 1456 BLAKE2B b5fb1ef6587526b39804ce175d0f67a7917a0f48a90ff3585577b51ba7547b026e3518801fb66f43cff5c8228142189e65cfe5e1bf0ef7cdb3c166b9532b5231 SHA512 14e1f9ee0d3d7b3e9942082b143971426352011c27ff4cfdeb9e63294c68598e38b2ff8074f4431909b1d06603b8120288a4504981732c6e8beb2fb0e597dcf3
 MISC metadata.xml 1191 BLAKE2B 856a9a1b3195a76a6c1fffe65dbb94b90a135ce4290c33d772efca43be04f29db7efee5083ee997660c5831aa75773993423645a28e82072b3ceb877135d6810 SHA512 9cb110e5202df7ca123da18ffd0ac60d1d9d5577a29dacff001b24b0c0eae4f96851273d72956dd7b0b94c9fabd392ea13ae6aae54e801d118032d215ede59b2
diff --git a/sci-libs/gsl/gsl-2.7.1-r1.ebuild b/sci-libs/gsl/gsl-2.7.1-r1.ebuild
index 2533db1b2bf1..7c8a0d0550f5 100644
--- a/sci-libs/gsl/gsl-2.7.1-r1.ebuild
+++ b/sci-libs/gsl/gsl-2.7.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 LICENSE="GPL-3"
 # Usually 0/${PV} but check
 SLOT="0/27"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external +deprecated static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index e39490452c26..fca66049cd37 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1,11 +1,14 @@
 AUX hdf5-1.12.1-cmake_installdirs.patch 4313 BLAKE2B 78b894a3535c71dbd673e2061e09e1a57d57c1d65418ac87e51669e7cf8a77f023aac076686e978b89903fb0aa74f0511f779ceb149ab783e5624ec24bf5c6a6 SHA512 4a8fce1e3a5ae9d8cdca4fa377011fb7333de0b233e79c6eeed9a24154925eb8dededfe8cff4e28a7cedeb2fbfe194df1a5f18629d56de47b4ba3097824e6b7d
+AUX hdf5-1.12.2-cmake_installdirs.patch 7289 BLAKE2B 7a8846200194c93f014e1862165d153e3dc21df87f08458c827356051cb4e1ffc90df4f176063356347eea881153f48c791cf51fa209ec3b5ca883edc13c06b1 SHA512 3c0933d64207ddead06cd575d40d919402a94a5317f14da1a5ee3b06c88ac65b108754d698715618b87104d8d471eaa6131310b0077202eac0ed221b3da18c5b
 AUX hdf5-1.8.13-no-messing-ldpath.patch 1141 BLAKE2B d7d186e4c00acb9fd3d44beb1d8c3c4da0c373f88b3fdf21e1f89b169b747d49572239385228687cfc10380bdceb9ca6d1ac0d5f5154cb7a328f8a2d509fb28d SHA512 e43021ceb83909ab06ba378363c192aa0f1b34cc7c2b121f5000e215516dbdea1b825a53ac4023073bf4870a5c3452c22f5535391d95af45ad63a309e1ffa5a4
 AUX hdf5-1.8.9-mpicxx.patch 494 BLAKE2B 148d87af064e2ba28c918c8db39ece0782a179803e4c38c5cd5eaba81a673bb8aa3699a48e80a7ae2d4579ac0261cc21d5509e46661ada9a69f444a58eb45ecd SHA512 8b4c39e40591860652547ea8ff205230da7d67488233e911cbcb3416eab561f2529c65bc5e7c9c812bf4298812346f47f9209e5f69f7e8f66ad587306a5b477b
 AUX hdf5-1.8.9-static_libgfortran.patch 429 BLAKE2B 9e1c544a453c09b3498a7d9d3e8090c928571776934c4dd6b426cbdb2783ed8f47185d6ee0c73ede6b4f14e27459ef5e1412112e9d897daa2dc57f1ad5fb0b24 SHA512 af97c54469a90bf3b0e8ec1218d4ca95822ac0cbc7120114979fc467fe3114743c74f4d4e16f0c10b1cd82d40880ef482f6fd34e1effc7c621b981ad466204f9
 DIST hdf5-1.10.5.tar.bz2 8706317 BLAKE2B ac326be8fe4ccc4b0153f15bc7d65aa8f1adc2ae279d3980f57ed46722b754d3f36ecf1d6273c75e80ed1afd4bbf10c6b1c5d9408e1f83a4b2e397e7902a7d3c SHA512 769e43b8672e26fe24ed68da0228c010d3d9bc950ca09f0bc60707911a2f26f2f8415c8abc8ec06e07667148d8cdb3b0c7b3e7860d9b19739629c5dfd5ce73d4
 DIST hdf5-1.12.1.tar.bz2 9724309 BLAKE2B cc75ba497188b33972218d02a7601acad1a0443bdb934ecd1641ef5996076fe120e3b72dba3a99d99f919fb4e478d1e531414448de9a7b97a0afde58a4c7c23f SHA512 158a067ee284ccb9e2c4db12e9d37cf187d90d9ef1bed7a6303e2c3a2fd216d7b13a46c5f46018b097511281c4246156b6f917633ca88872f10f0ad04be285fd
-EBUILD hdf5-1.10.5-r1.ebuild 2883 BLAKE2B ddfc519217494eb2f3a2cd2a37f70d9e2005cd049299fbaf2386414db0eac65a2655b39fba85231896cd2f2ef42fd15d57273b77fa53e0d492a889fc6db51fbe SHA512 007a97a089002e330569913ce42afd92b63d659b9d9f4fabe85170d7633950da025cfc55273f564faf1aec52d3ad4c704825cc501bd441d522f65238ff44ad88
-EBUILD hdf5-1.10.5.ebuild 2712 BLAKE2B 56dc60e54a2e3758b32eba9977bb96e67bcdec38670579e985733ecede749f638370bee98959986a76e841c8adf4a92740fae6b8c8ed36e5e0ba2814a2f82537 SHA512 ebf92105b2d149f1947dd0d95b2ef5da85b4d57a51eeb4e5c8d9535e706b06e6c46910ee8671f1d44021636cec71070755aa7d7e62db4f9e1fb39d7e0d7d4fbd
-EBUILD hdf5-1.12.1-r1.ebuild 3379 BLAKE2B c8071ed6c8443f0aa06848eab9d8e5719de69216b200ea588f82e33e7e8dd71c6260e2bf5c1e45cc261e48518a65252b3e7d3a57313be5102f22febe50923d9d SHA512 34c4ec92af1a43f6b8978ebf38360c8372559ee204d9b737560671122879c3818e040f374c735366a45756dd7298d32414b90d07dfb90338209e283275a50a54
-EBUILD hdf5-1.12.1.ebuild 3061 BLAKE2B a21c786534715cbfdb57208a021c6f48ff89417db20490673bb86c362b7065280f810135a6b60ca20d6cbb6a7bcc6f332f64cada97ca8fe25a52bf9e868f905a SHA512 0f809656f7088844eaeca31695877919cf3aae466bf93e1b3c9bd72474712415dca62f39bc51c6e2265c2f64427a5c1274fbb18092d614ee32c0f29d6068c0c9
+DIST hdf5-1.12.2.tar.bz2 10494264 BLAKE2B 99ca5b57f6f54fa044c909f0773de62b218c1f0ec3c011f88f3c227536dd719e77ddbe42d562b1214e8843e41d8fc56db499d7f122876fdd36ef31b235229cb7 SHA512 cbb4663570de76b11adb6bf62cfdb754371d31eeab04691479a5764a45207a9c1309665ab80f51c63a4b9b87354f9cbe6835cef506a9fd554d142c6d2bec21e5
+EBUILD hdf5-1.10.5-r1.ebuild 2940 BLAKE2B 45e4cf6004cb70667829844ddf37f2c4f96d6b5c92a8eb9b3c757ea47e6d9f98e28f906c7d2c6a33efd95328bc0b6358d640da36c82fc5408bbb968c38b95115 SHA512 04ac047f56128f41f4cdc8b07caa0d656f31d34200961a1ee525583263dc338abff7860158f9549ddf31bf0563ed963fbd5dff4ee212d85443aff599e5d2c25a
+EBUILD hdf5-1.10.5.ebuild 2770 BLAKE2B 33a671a87978ba04e1b43cbc048093f12d6303841353124a0ba405fec1d32fdc2cb15ed627b968fc5c3feeba151e78525adf77be3f420993d02f793cf094b96d SHA512 3bb860418e226967b1a2b50ecbbeb6ca793790a7915d6cb6f9ea201816cbc555b455596e200fc2504084597ccbe4d1ae1f91cbc64d68c7a39d2eeae998194304
+EBUILD hdf5-1.12.1-r1.ebuild 3468 BLAKE2B da5ba395f8971076a6a3186332f94446dadc7be2817fbb488c612bf4f1b283fc927ea33b7eff23dfbe5b43c1c27a85d72d72ddd4fb617e37a79416fede96bd1b SHA512 96c6c2f95e13a7841f6a9fa63e838ad218819bd0c854c8994a382c15e2f3fff1ae11f099cd613c4b41efa726b1616ead0cf9c4a0d6aedf6d0c7b2d8ca0d8f7ea
+EBUILD hdf5-1.12.1.ebuild 3144 BLAKE2B 2bd023c0ade920fc795f4434260318095a34b200ddb6a458a6ee7d647fac79d4e31029f93a0d2aafede8682e515a9f9c9db46b5a976f07cd83d5086f77538079 SHA512 10ce8493fd3fa421d8c71267e7c57adaac490244742ed93166ce634f5b956b392efb3b86814c17ad8bfba3347c4e3be54b5688b8eec3af848f1d13c341bb8bcc
+EBUILD hdf5-1.12.2-r1.ebuild 3168 BLAKE2B cf26e034088a10e89f8130fc76e7f52395b5ad61e69b946afe53946d44d9c35c87452d39dd501e54c928e645482cf6543eae8d0d4c787d17843130aad10e4cf1 SHA512 b4a1b842d6adf407b9b9b86be1da8dcea61a0c26d9c8107a0331242b36ef5e2bbf3c1d8078f2ff6be2cbff56f1402c025961aa0be739dac5565eb2cc54e3cefb
 MISC metadata.xml 935 BLAKE2B b9195ac707556cdb2ee2c4d032fabd88aad674ad4fa52a60fbeb31c47ae51b9511bb097d4271d19b05d1dbc3b59b3cafb3b7d407bd9b8095bfd449fa8728ab6a SHA512 57c4694ea2c024c7babdf34474a61b92165b6c322fa11ec7fefdf16d66b44f91f66d63eeb355311b121fbeec8da810e393e3e785a4c434ff658c7b4bd7baf22b
diff --git a/sci-libs/hdf5/files/hdf5-1.12.2-cmake_installdirs.patch b/sci-libs/hdf5/files/hdf5-1.12.2-cmake_installdirs.patch
new file mode 100644
index 000000000000..6ea7520c0f13
--- /dev/null
+++ b/sci-libs/hdf5/files/hdf5-1.12.2-cmake_installdirs.patch
@@ -0,0 +1,164 @@
+https://github.com/HDFGroup/hdf5/pull/1716
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,6 +46,13 @@ if (CMAKE_VERSION VERSION_LESS "3.14.0")
+   endif()
+ endif ()
+ 
++include (GNUInstallDirs)
++set (HDF5_INSTALL_BIN_DIR "${CMAKE_INSTALL_FULL_BINDIR}")
++set (HDF5_INSTALL_DATA_DIR "${CMAKE_INSTALL_FULL_DATADIR}")
++set (HDF5_INSTALL_DOC_DIR "${CMAKE_INSTALL_FULL_DOCDIR}")
++set (HDF5_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
++set (HDF5_INSTALL_LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
++
+ #-----------------------------------------------------------------------------
+ # Instructions for use : Sub-Project Build
+ #
+--- a/c++/src/CMakeLists.txt
++++ b/c++/src/CMakeLists.txt
+@@ -173,8 +173,8 @@ endif ()
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_CPP_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+ 
+--- a/doxygen/CMakeLists.txt
++++ b/doxygen/CMakeLists.txt
+@@ -36,7 +36,7 @@ if (DOXYGEN_FOUND)
+ 
+   install (
+       DIRECTORY ${HDF5_BINARY_DIR}/hdf5lib_docs/html
+-      DESTINATION ${HDF5_INSTALL_DATA_DIR}
++      DESTINATION ${HDF5_INSTALL_DOC_DIR}
+       COMPONENT Documents
+   )
+ 
+--- a/fortran/src/CMakeLists.txt
++++ b/fortran/src/CMakeLists.txt
+@@ -537,8 +537,8 @@ endif ()
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_F90_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+ 
+--- a/hl/c++/src/CMakeLists.txt
++++ b/hl/c++/src/CMakeLists.txt
+@@ -91,8 +91,8 @@ endif ()
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_HL_CPP_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+ 
+--- a/hl/fortran/src/CMakeLists.txt
++++ b/hl/fortran/src/CMakeLists.txt
+@@ -324,8 +324,8 @@ endif ()
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_HL_F90_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+ 
+--- a/hl/src/CMakeLists.txt
++++ b/hl/src/CMakeLists.txt
+@@ -123,8 +123,8 @@ endif ()
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_HL_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+ 
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1288,8 +1288,8 @@ endif ()
+ #-----------------------------------------------------------------------------
+ set (_PKG_CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+ set (_PKG_CONFIG_EXEC_PREFIX \${prefix})
+-set (_PKG_CONFIG_LIBDIR \${exec_prefix}/lib)
+-set (_PKG_CONFIG_INCLUDEDIR \${prefix}/include)
++set (_PKG_CONFIG_LIBDIR \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
++set (_PKG_CONFIG_INCLUDEDIR \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+ set (_PKG_CONFIG_LIBNAME "${HDF5_LIB_CORENAME}")
+ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}")
+ 
+--- a/CMakeInstallation.cmake
++++ b/CMakeInstallation.cmake
+@@ -31,7 +31,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
+   if (HDF5_EXPORTED_TARGETS)
+     install (
+         EXPORT ${HDF5_EXPORTED_TARGETS}
+-        DESTINATION ${HDF5_INSTALL_CMAKE_DIR}
++        DESTINATION ${HDF5_INSTALL_LIB_DIR}/cmake
+         FILE ${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-targets.cmake
+         NAMESPACE ${HDF_PACKAGE_NAMESPACE}
+         COMPONENT configinstall
+@@ -67,12 +67,12 @@ set (HDF5_VERSION_MINOR  ${HDF5_PACKAGE_VERSION_MINOR})
+ # Configure the hdf5-config.cmake file for the build directory
+ #-----------------------------------------------------------------------------
+ set (INCLUDE_INSTALL_DIR ${HDF5_INSTALL_INCLUDE_DIR})
+-set (SHARE_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/${HDF5_INSTALL_CMAKE_DIR}" )
++set (SHARE_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/${HDF5_INSTALL_LIB_DIR}/cmake" )
+ set (CURRENT_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}" )
+ configure_package_config_file (
+     ${HDF_RESOURCES_DIR}/hdf5-config.cmake.in
+     "${HDF5_BINARY_DIR}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake"
+-    INSTALL_DESTINATION "${HDF5_INSTALL_CMAKE_DIR}"
++    INSTALL_DESTINATION "${HDF5_INSTALL_LIB_DIR}/cmake"
+     PATH_VARS INCLUDE_INSTALL_DIR SHARE_INSTALL_DIR CURRENT_BUILD_DIR
+     INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}"
+ )
+@@ -81,19 +81,19 @@ configure_package_config_file (
+ # Configure the hdf5-config.cmake file for the install directory
+ #-----------------------------------------------------------------------------
+ set (INCLUDE_INSTALL_DIR ${HDF5_INSTALL_INCLUDE_DIR})
+-set (SHARE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${HDF5_INSTALL_CMAKE_DIR}" )
++set (SHARE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${HDF5_INSTALL_LIB_DIR}/cmake" )
+ set (CURRENT_BUILD_DIR "${CMAKE_INSTALL_PREFIX}" )
+ configure_package_config_file (
+     ${HDF_RESOURCES_DIR}/hdf5-config.cmake.in
+     "${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake"
+-    INSTALL_DESTINATION "${HDF5_INSTALL_CMAKE_DIR}"
++    INSTALL_DESTINATION "${HDF5_INSTALL_LIB_DIR}/cmake"
+     PATH_VARS INCLUDE_INSTALL_DIR SHARE_INSTALL_DIR CURRENT_BUILD_DIR
+ )
+ 
+ if (NOT HDF5_EXTERNALLY_CONFIGURED)
+   install (
+       FILES ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake
+-      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}
++      DESTINATION ${HDF5_INSTALL_LIB_DIR}/cmake
+       COMPONENT configinstall
+   )
+ endif ()
+@@ -109,7 +109,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
+   )
+   install (
+       FILES ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake
+-      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}
++      DESTINATION ${HDF5_INSTALL_LIB_DIR}/cmake
+       COMPONENT configinstall
+   )
+ endif ()
diff --git a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
index b7aac2788497..aa45759413ec 100644
--- a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 FORTRAN_NEEDED="fortran"
 
-inherit autotools fortran-2 flag-o-matic toolchain-funcs multilib prefix
+inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix
 
 MY_P="${PN}-${PV/_p/-patch}"
 MAJOR_P="${PN}-$(ver_cut 1-2)"
@@ -16,7 +16,7 @@ SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
-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="cxx debug examples fortran +hl mpi szip threads unsupported zlib"
 
 REQUIRED_USE="
@@ -83,6 +83,7 @@ src_prepare() {
 }
 
 src_configure() {
+	use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620
 	local myconf=(
 		--disable-static
 		--enable-deprecated-symbols
diff --git a/sci-libs/hdf5/hdf5-1.10.5.ebuild b/sci-libs/hdf5/hdf5-1.10.5.ebuild
index f33f957fdad7..1b6770c23e14 100644
--- a/sci-libs/hdf5/hdf5-1.10.5.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit autotools fortran-2 flag-o-matic toolchain-funcs multilib prefix
+inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix
 
 MY_P=${PN}-${PV/_p/-patch}
 MAJOR_P=${PN}-$(ver_cut 1-2)
@@ -78,6 +78,7 @@ src_prepare() {
 }
 
 src_configure() {
+	use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620
 	econf \
 		--disable-static \
 		--enable-deprecated-symbols \
diff --git a/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild b/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
index a445755a1291..32a8891c8155 100644
--- a/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.12.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 FORTRAN_NEEDED="fortran"
 
-inherit cmake flag-o-matic fortran-2
+inherit cmake flag-o-matic fortran-2 toolchain-funcs
 
 MY_P="${PN}-${PV/_p/-patch}"
 MAJOR_P="${PN}-$(ver_cut 1-2)"
@@ -16,7 +16,7 @@ SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
-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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cxx debug doc examples fortran +hl mpi ros3 szip test threads unsupported zlib"
 
 REQUIRED_USE="
@@ -66,6 +66,7 @@ pkg_setup() {
 }
 
 src_configure() {
+	use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620
 	local mycmakeargs=(
 		# Workaround needed to allow build with USE=fortran when an older
 		# version is installed. See bug #808633 and
diff --git a/sci-libs/hdf5/hdf5-1.12.1.ebuild b/sci-libs/hdf5/hdf5-1.12.1.ebuild
index c5ef043111b3..8248d6614f5a 100644
--- a/sci-libs/hdf5/hdf5-1.12.1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.12.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 FORTRAN_NEEDED="fortran"
 
-inherit cmake flag-o-matic fortran-2
+inherit cmake flag-o-matic fortran-2 toolchain-funcs
 
 MY_P="${PN}-${PV/_p/-patch}"
 MAJOR_P="${PN}-$(ver_cut 1-2)"
@@ -62,6 +62,7 @@ pkg_setup() {
 }
 
 src_configure() {
+	use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620
 	local mycmakeargs=(
 		-DBUILD_STATIC_LIBS=OFF
 		-DFETCHCONTENT_FULLY_DISCONNECTED=ON
diff --git a/sci-libs/hdf5/hdf5-1.12.2-r1.ebuild b/sci-libs/hdf5/hdf5-1.12.2-r1.ebuild
new file mode 100644
index 000000000000..d5390cee5762
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.12.2-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED="fortran"
+
+inherit cmake flag-o-matic fortran-2 toolchain-funcs
+
+MY_P="${PN}-${PV/_p/-patch}"
+MAJOR_P="${PN}-$(ver_cut 1-2)"
+
+DESCRIPTION="General purpose library and file format for storing scientific data"
+HOMEPAGE="https://www.hdfgroup.org/HDF5/"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
+
+LICENSE="NCSA-HDF"
+SLOT="0/${PV%%_p*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx debug doc examples fortran +hl mpi szip test threads unsupported zlib"
+
+REQUIRED_USE="
+	!unsupported? (
+		mpi? ( !cxx !threads )
+		threads? ( !cxx !fortran !hl )
+	)"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	mpi? ( virtual/mpi[romio] )
+	szip? ( virtual/szip )
+	zlib? ( sys-libs/zlib:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? (
+	app-doc/doxygen
+	virtual/latex-base
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.2-cmake_installdirs.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+
+	if use mpi; then
+		if has_version 'sci-libs/hdf5[-mpi]'; then
+			ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail."
+			ewarn "Try to uninstall the current hdf5 prior to enabling mpi support."
+		fi
+		export CC="mpicc"
+		use fortran && export FC="mpif90"
+		append-libs -lmpi
+	elif has_version 'sci-libs/hdf5[mpi]'; then
+		ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail."
+		ewarn "Try to uninstall the current hdf5 prior to disabling mpi support."
+	fi
+}
+
+src_configure() {
+	use sparc && tc-is-gcc && append-flags -fno-tree-ccp # bug 686620
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=OFF
+		-DONLY_SHARED_LIBS=ON
+		-DFETCHCONTENT_FULLY_DISCONNECTED=ON
+		-DHDF5_BUILD_EXAMPLES=OFF
+		-DALLOW_UNSUPPORTED=$(usex unsupported)
+		-DBUILD_TESTING=$(usex test)
+		-DHDF5_BUILD_CPP_LIB=$(usex cxx)
+		-DHDF5_BUILD_DOC=$(usex doc)
+		-DHDF5_BUILD_FORTRAN=$(usex fortran)
+		-DHDF5_BUILD_HL_LIB=$(usex hl)
+		-DHDF5_ENABLE_CODESTACK=$(usex debug)
+		-DHDF5_ENABLE_PARALLEL=$(usex mpi)
+		-DHDF5_ENABLE_SZIP_ENCODING=$(usex szip)
+		-DHDF5_ENABLE_SZIP_SUPPORT=$(usex szip)
+		-DHDF5_ENABLE_THREADSAFE=$(usex threads)
+		-DHDF5_ENABLE_Z_LIB_SUPPORT=$(usex zlib)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# TODO: generate functioning example runners from their respective
+	# .in files - as of version 1.12.1 upstream only has it implemented
+	# for autoconf.
+	if use examples; then
+		# These are all useless outside the source tree
+		rm -f {examples,c++/examples,fortran/examples}/{Makefile*,CMake*}
+		rm -f hl/{examples,c++/examples,fortran/examples}/{Makefile*,CMake*}
+
+		dodoc -r examples
+		if use cxx; then
+			docinto c++
+			dodoc -r c++/examples
+		fi
+		if use fortran; then
+			docinto fortran
+			dodoc -r fortran/examples
+		fi
+		if use hl; then
+			docinto hl
+			dodoc -r hl/examples
+			if use cxx; then
+				docinto hl/c++
+				dodoc -r hl/c++/examples
+			fi
+			if use fortran; then
+				docinto hl/fortran
+				dodoc -r hl/fortran/examples
+			fi
+		fi
+	fi
+}
diff --git a/sci-libs/hipBLAS/Manifest b/sci-libs/hipBLAS/Manifest
index 188e2b76fa0d..d7dd34857a9a 100644
--- a/sci-libs/hipBLAS/Manifest
+++ b/sci-libs/hipBLAS/Manifest
@@ -1,3 +1,3 @@
 DIST hipBLAS-4.3.0.tar.gz 428016 BLAKE2B 5a86f7a59aaed9cd6219779546135080f4c583a010f47b902f25545046c50451cd48e570b58c9c3721d735f3ab54295d5eddc61fecc01236e960e37fc87761c8 SHA512 128ee56d6db3d19c83b20fbc315eae8de6ee52aae6c2c5727351bab76c14d9131318cd49a6bcc724f5ec73485783058618bca4dddf96b05cd2f3a772c04f469f
-EBUILD hipBLAS-4.3.0.ebuild 1228 BLAKE2B 355932b9971cf1fae37396989f40657877ab6b01ce4d57ad9fc18017fb01d495ade4c4c444eba6d5567529eeebe534a0930220a828dc6c81aa34c83eb0c2df0e SHA512 bd8d554d4bea3860849622b7c0ee29eb8f6d17d75f01957b07cecead00341fecd5bfcaeafb13062e0e7e45c0a2e552c4ae344197896cc7b9bae032c4db04b2e0
+EBUILD hipBLAS-4.3.0.ebuild 1229 BLAKE2B 2fcb641fbe83945020a84546e240b5b14094985d1afe40c144feebc9423ccbed344f01535a04aaaae53bbabcf97abf68315b2eb90df9b050d8b9e59728828d0b SHA512 f62e7b19d28d908863646492e6732563674fbcf07eb7eae68f32e7316085130b522d7c0665a0eee2074cb9fd08b4adeb166245066bc876693c0d52666dc2b6c4
 MISC metadata.xml 453 BLAKE2B 4c1e76cbc277e93a92a95cda405973cc72863882ab9a6729a07976e7815119e985688387c14fc5017fd6e85aaa64eaa72b900375c7f7428eb6bbb2569c5ecaa6 SHA512 0e42066a5ac8720d1b561bcf23269013d9cceff52a9ddd6a6e0af58c7d2628c335bb290e0dc6c262a0542e286f54fd07cb487dd908343fac5cfca07410df6e56
diff --git a/sci-libs/hipBLAS/hipBLAS-4.3.0.ebuild b/sci-libs/hipBLAS/hipBLAS-4.3.0.ebuild
index b9ec322edf25..35e198ef1a51 100644
--- a/sci-libs/hipBLAS/hipBLAS-4.3.0.ebuild
+++ b/sci-libs/hipBLAS/hipBLAS-4.3.0.ebuild
@@ -15,7 +15,7 @@ SLOT="0/$(ver_cut 1-2)"
 RDEPEND="dev-util/hip:${SLOT}
 	sci-libs/rocBLAS:${SLOT}
 	sci-libs/rocSOLVER:${SLOT}"
-DEPEND="${RDPEND}"
+DEPEND="${RDEPEND}"
 BDEPEND=""
 
 S="${WORKDIR}/hipBLAS-rocm-${PV}"
diff --git a/sci-libs/hipCUB/Manifest b/sci-libs/hipCUB/Manifest
index 053911d0ddf3..1667787d0e08 100644
--- a/sci-libs/hipCUB/Manifest
+++ b/sci-libs/hipCUB/Manifest
@@ -1,6 +1,8 @@
 AUX hipCUB-4.3.0-add-memory-header.patch 421 BLAKE2B cd05a027dbf75098fd199783c0abc2c37627e5b55b92f1b4ffb828995fbdb7ebf46f3f1d66a87c37eb35ddd16bd472541537d1ea250474c541bd01b10bd386c5 SHA512 7865f3942b7b157095c477da8790bf9632a630aa3456cde3b1a7b267e62db720a257e1c0e0501b88f8a0b187aa8ec520c4e7693e97af72358a6ff518be1f10a3
 DIST hipCUB-4.0.0.tar.gz 137513 BLAKE2B b7ef4d53037fba04771162ae8993def648f5e1401654286ffc6987bbb4b25baa1b1b14bc37035e1afe46eeffe3e564f244e339cdfd0e5a242574d248bf4683db SHA512 e778b94c86e09bf3b0bc043fb15ed8725387b875e8631a7e8599aee8da2d8085190effc9681d742fc0d286cc0c20762341f1f24699c8a52e9734611c716530d5
 DIST hipCUB-4.3.0.tar.gz 154097 BLAKE2B 68a46f1416c969e4bf8e245c2aa8aee626f1e8089182ffb8f5090d540efe98606a616499d52b14da3733b3a6f4da690ea1718ea58fb6166351f4b4807f1b8228 SHA512 7c0abcf034d885615a9a4f05e6ca906e99b0ffbe36ae3d4b9d9d79b01d21077dc86be659548b45dad8498b84bec24dc0a5be78040c1ab21ca458d22fa7fae43d
+DIST hipCUB-5.0.2.tar.gz 243032 BLAKE2B 68256c0868bd23dbd78075ab286fc0738dc90f330a7e99186803e7920b3366f5608986dd9e3f4c5a045f9ec3f2461a66ab5b708d5d1d3fc748d042dd929a7993 SHA512 ae4d55fcf513eb5dd1316e335a0de30f6098eba70e877b41905bc59f3fb500ad9a46a28de77b74b914a15ffc38ad5c5f4dbdf36139505c26b94c43ffa5c90e01
 EBUILD hipCUB-4.0.0-r1.ebuild 1099 BLAKE2B 93fb8305ce51fa26eae6be6d26ef05fa5916c7c7f8975d1694209e25d9bb5d69b55ef45175b65a957b79b32f61de6a76b7661f1cca1e2248dce0ce3b7048e6e5 SHA512 59440f40bc7f8600665c30f6098afd18d9219ad9e18db2a43edf654ad4a3d86241f0e12680721d16d056573d690ceae96f0bcb08b6d251d7963c829c9807fa3b
-EBUILD hipCUB-4.3.0.ebuild 2100 BLAKE2B 662199083665c19b5af56354dab656f55e8a814d08bab527e2a54a6dd36ffba6ccc0ee89a350337561263464dfab3fcf673b1f0f37454bf725f1723a520535c9 SHA512 44699b75b4be7ed839971d1de56f72bb04a9bde58d0d5d9526d3ecf58a05e56c32134d36982e34b9e5ff7d6a4e78af76c31f759b78d58ae3a321b5646bf40502
+EBUILD hipCUB-4.3.0-r1.ebuild 2092 BLAKE2B b5c4dcaa01e66cb04e946492048ccb2f412f50c6e244b8d9493dd539feec633dd2365de878e33a8e99e9d2970d639b424f7f0cb7b7aca9df256504564fd7b2e3 SHA512 b0a9f49b805fc4863732fd208cff95a2421ab332f623eb3d8dd6312bf273e663f36ba37fa196a0ac9506f13cf55dabd0757480408bf8c63c0b2cf0b75a56165e
+EBUILD hipCUB-5.0.2.ebuild 1980 BLAKE2B ecc6d6ad49c835b120300c112895a661d9a123ac9bedfe293ed435e9960c1324b44875a667406bfabf8c1c4586740c5748eac189f2c5b9cbe7cd45842f99576f SHA512 e3e5ef45778e10426693c0bf9c01183ad58f49ec0cace2a065af848e29ffe67685c9abb5cc900b185bd03af092d1f0a7697b503beee6d5cd627838b169f8f2c8
 MISC metadata.xml 625 BLAKE2B 7f927357a005110b37accb6841e4248e22e8080d0e0d6eb28e50e96c84807f663faf2f85dd222e5f5af448211cc05004d371a6d57ac6f17393609e76980bda81 SHA512 7d16cebc8c7df7dcc5d63e02e88e9d16d2321485de688621fd8628b8473d5ae614d63b0578363ee3b47f5e0aa7f45da9a00950b6a09a8cc9c6e3c77ae856c798
diff --git a/sci-libs/hipCUB/hipCUB-4.3.0.ebuild b/sci-libs/hipCUB/hipCUB-4.3.0-r1.ebuild
index 0b57014f6d15..65b61c2352cc 100644
--- a/sci-libs/hipCUB/hipCUB-4.3.0.ebuild
+++ b/sci-libs/hipCUB/hipCUB-4.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SLOT="0/$(ver_cut 1-2)"
 IUSE="benchmark test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-util/hip:${SLOT}
+RDEPEND="dev-util/hip
 	sci-libs/rocPRIM:${SLOT}
 	benchmark? ( dev-cpp/benchmark )"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/hipCUB/hipCUB-5.0.2.ebuild b/sci-libs/hipCUB/hipCUB-5.0.2.ebuild
new file mode 100644
index 000000000000..176c254b3384
--- /dev/null
+++ b/sci-libs/hipCUB/hipCUB-5.0.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Wrapper of rocPRIM or CUB for GPU parallel primitives"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipCUB"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/hipCUB/archive/rocm-${PV}.tar.gz -> hipCUB-${PV}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="benchmark test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocPRIM:${SLOT}
+	benchmark? ( dev-cpp/benchmark )
+	test? ( dev-cpp/gtest )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/hipCUB-rocm-${PV}"
+
+PATCHES="${FILESDIR}/${PN}-4.3.0-add-memory-header.patch"
+
+src_prepare() {
+	sed -e "/PREFIX hipcub/d" \
+		-e "/DESTINATION/s:hipcub/include/:include/:" \
+		-e "/rocm_install_symlink_subdir(hipcub)/d" \
+		-e "/<INSTALL_INTERFACE/s:hipcub/include/:include/hipcub/:" -i hipcub/CMakeLists.txt || die
+
+	sed	-e "s:\${ROCM_INSTALL_LIBDIR}:\${CMAKE_INSTALL_LIBDIR}:" -i cmake/ROCMExportTargetsHeaderOnly.cmake || die
+
+	# disable downloading googletest and googlebenchmark
+	sed  -r -e '/Downloading/{:a;N;/\n *\)$/!ba; d}' -i cmake/Dependencies.cmake || die
+
+	# remove GIT dependency
+	sed  -r -e '/find_package\(Git/{:a;N;/\nendif/!ba; d}' -i cmake/Dependencies.cmake || die
+
+	if use benchmark; then
+		sed -e "/get_filename_component/s,\${BENCHMARK_SOURCE},${PN}_\${BENCHMARK_SOURCE}," \
+			-e "/add_executable/a\  install(TARGETS \${BENCHMARK_TARGET})" -i benchmark/CMakeLists.txt || die
+	fi
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	# Compiler to use
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addwrite /dev/dri/
+	MAKEOPTS="-j1" cmake_src_test
+}
diff --git a/sci-libs/hipSPARSE/Manifest b/sci-libs/hipSPARSE/Manifest
index d35663b75e2b..7270530756e5 100644
--- a/sci-libs/hipSPARSE/Manifest
+++ b/sci-libs/hipSPARSE/Manifest
@@ -1,6 +1,8 @@
 AUX hipSPARSE-4.3.0-remove-matrices-unpacking.patch 3479 BLAKE2B 35974954ad3f2f9c41153f616d870fac18b92034af4993e53c10138db9d8262846e5cb25fabc3fb963a2db4d788ae37ed68719c8b95ab2254c75f43aa3a17f4e SHA512 b495cd0fb1d147ed2d80f2621650a562923737b9409b598ac6aaefa679b2f9aa5285991caee9919e35b3ebdd75b1cfcb583f2c8baa2c018eae334e8522562a33
+AUX hipSPARSE-5.0.2-remove-matrices-unpacking.patch 3940 BLAKE2B e3815659b32856206bc3291d09f59514e59dc06c3c33454c24afb68955d6a55411c71535693325be06bdb097e7cedc558ec2b8fa6a2d3886d774d79e038557ad SHA512 39db7d6fe0a085ef5a92f6ec1613376ffd9152d8d31a78f0864c971e7b61d4dfbda2e170940c82dae286d024333621722b249d5bd601399e76e68e8029fc7e81
 DIST hipSPARSE-4.0.tar.gz 271756 BLAKE2B d774632c145a842c5dd97df6e0c1c3b3fc6986a5d3e000564b3b9b4f8a9c72bc01b360baf93a82f8a70a85b8ee1833f4e767a48021d3869391000551ed00e614 SHA512 78c9501e6f9f8b0727d2f2207814048f8c784b2b06797559d6f639244cb1439e9218a46c582a6b337b15791519f0bcb9e0f42c17bff00c096c797c96cc7660ae
 DIST hipSPARSE-4.3.tar.gz 349357 BLAKE2B e0da23ba8f39af276842eb9bc45232a0dbe7f40197215397bf2d6ae454061626aedb698701703a03a60487dff2b427d54fa3e0fd36db69fcccf9868d0e5a5097 SHA512 b7302ae4205d5c0e8fd8017e345f7677e55a6ea82741a85f77b2af3f669d63013e12435201f9e0ca4b31d3c4af2cb1630775bf101a69338be2df621d68504d60
+DIST hipSPARSE-5.0.tar.gz 440916 BLAKE2B 4011dda3d22b373848735bab0570421fed786bd4d9cff992d3eaaf70b84c00334cec6a8fe3bdd2b9cd5241d837522b778b3462064426195db68930af89c21984 SHA512 567c6b05844143834efbb6f5b7a97ec93f349b97ec6bea55e780cb2480cf80aafbbf15b06f83af3d73ff8ab44c51cbe26ada27b4b398b67dc428c1959c3e7222
 DIST rocSPARSE_ASIC_320k.tar.gz 11301444 BLAKE2B a00cc4a3ededab3fb56339319e34e936645ddce2dee3c630153b37e337384c207b0a2829227fb7f4c2db1fe33383e97410ab7ad459d391c025f5410843d51cf2 SHA512 1db3af391c30a371c1ac0087436e266721474273a39d5b2b6d56408d950dcbbee004750e4dce4e3dbc4cb512f38f6d945676d7f29b62c52fd5a7fed0fe789e03
 DIST rocSPARSE_Chebyshev4.tar.gz 50165660 BLAKE2B f1a95554c8f38937f501488fabfd406b773eb980d7463cadac0de162529ac2f834c655cadd2b65f4c42a8487bc2d67c749601ae33bd789051f9e4d1e157196a0 SHA512 fdec4947a4af923d28b4be8d23690fd6d356c58f8344a5dcdd2e3fa61769d83e47a84d65316b527e6e82d9f988de2675a852367d406e44b44d784137a90b95c0
 DIST rocSPARSE_amazon0312.tar.gz 11303646 BLAKE2B 388947a29380253bb5eecb22d3a3b6f3378711044b3fe98d6d2517cd27330f11b3d12fdb96320a2889e139224f1a6a5ad1c455ff8e91a262aa2aadbe16301330 SHA512 aed2d62581763742d9c7faf3dcaf1eaa983caa1e2e7ad4abebe97c5e7c2aec9942e0e32291092b348b60052c92b130e721ec19ed59bda22e1b233ef72ac7d2ff
@@ -21,5 +23,6 @@ DIST rocSPARSE_shipsec1.tar.gz 22175245 BLAKE2B f1d34482b8c3d3ee48033097d7d6f9b6
 DIST rocSPARSE_sme3Dc.tar.gz 42483568 BLAKE2B f0d16b58f6ea28e67727637697a812a0b10d524c73aeb82f702411b9ebaea3670780e762ed0701aae80c6829e950233f74555523ef2d6c5740b007c7a65c03d4 SHA512 c5a0be2db919a45310a73ea1dd96d0d30168135f887a8c5c3d7ca11e2c3d12ea7d1331be20968d0135bd18da4ef2b043db68eeb7567b6f0f8daf782b87083c3a
 DIST rocSPARSE_webbase-1M.tar.gz 11360460 BLAKE2B 01b1d06adb5fb32fa402ed888d25a7e52a34779b078fc2e21c60e688d03579bb4ca8694f5ee4a824f7859952d55590a1fd9449dc80d6fe894d7b662b918882d4 SHA512 6401a965b8f6dd5392879956fde3c94f77fe1801a4a43428c03b6d639031575c647eab47b1babe53f4ecc2c3b8fc183e8339536b78dcd0d94ce62bfedd87c161
 EBUILD hipSPARSE-4.0.0-r2.ebuild 1140 BLAKE2B 9344f8e3678a855fca42b5c14fae5d0973ed3f8922836182d9327d1724e92feca6072933df181228ef95cc4993fc8a7797ebf31fac8a5a95eabe8f3de9165ac5 SHA512 e682f1acb67c282c638fd7594b0268a3dc7a33b71fe667f8bd38fc90449660367f94d1964037c0fbe3dd162e5c8a5a4aa941ec72a7353c2f629ed9f07ca06d6b
-EBUILD hipSPARSE-4.3.0.ebuild 3808 BLAKE2B f16ae26042c485af49a0ceac85ee86a53e8fbfd9cb23b0727212121b2a66fe4fc3f8366aa1ac4b9c2a69fe56ccf2e6b9413ce43e607a607e3a0c960beca7c3f3 SHA512 2da3cb53dce48dc95191704f0ed265d130cd3b16f5c7513718149afbfabba57b32b8eec5a390ffe71fe5c49d680955ed7bb792b21533611fbbb680b6b17c19e5
+EBUILD hipSPARSE-4.3.0-r2.ebuild 3707 BLAKE2B f62868a9d57aa7add43e8717c7478cfce82f7562794f0fd8aeffdd7dc1f740402f502d0c349dd7906eb42e5a479503ad020f7fb46b81afdd71c2949a58c04203 SHA512 10ea8f3b765150c72f3bf9d327db6e5c1c1adbadbf3ad9e0c7b7f4ef12a6013a7a040aa5352e11166d2544cec5cba44a5b4d9b3f919f33d0979541512342bc1d
+EBUILD hipSPARSE-5.0.2.ebuild 3707 BLAKE2B d888276f197b9e27d4d0ac5f7952382100fdeb089659c7e0312cfd604ab4e801b31096df762403b15dadc1838f3ea1107269351edb03e8cff709c36760f10b86 SHA512 633d5273e0854067db2b1892c0355630ff7d7d14b0f005989182362f1086612b30b1262ad5233ec2c5713c878044c14ccbd7ccd08ebbfabfb8b08b01367b598f
 MISC metadata.xml 603 BLAKE2B 21c5f53de40b5582b8541e1cef239a4a2eff2eaaaa966a4168439417cd6f80ea00dbd48636bea73aedbaaf580950803768f02ab5f0cca0f76d433d80a80026e1 SHA512 4ff1ebefa7203326a5c2feed7c0deffa10f17383bb4a05fdf3057d8ab1d6f8427a45126ec17aa88e02a93e9114e79f6d89cd4564e72faebf970b7f63814d701a
diff --git a/sci-libs/hipSPARSE/files/hipSPARSE-5.0.2-remove-matrices-unpacking.patch b/sci-libs/hipSPARSE/files/hipSPARSE-5.0.2-remove-matrices-unpacking.patch
new file mode 100644
index 000000000000..021e10b7ab2c
--- /dev/null
+++ b/sci-libs/hipSPARSE/files/hipSPARSE-5.0.2-remove-matrices-unpacking.patch
@@ -0,0 +1,126 @@
+Adopted from 4.3.0 patch to remove downloads during test.
+
+Ultimately the to be downloaded matrices should be in DISTFILES.
+
+Index: hipSPARSE-rocm-5.0.2/clients/tests/CMakeLists.txt
+===================================================================
+--- hipSPARSE-rocm-5.0.2.orig/clients/tests/CMakeLists.txt
++++ hipSPARSE-rocm-5.0.2/clients/tests/CMakeLists.txt
+@@ -23,117 +23,6 @@
+ 
+ find_package(GTest REQUIRED)
+ 
+-# Download some test matrices
+-set(TEST_MATRICES
+-  SNAP/amazon0312
+-  Muite/Chebyshev4
+-  FEMLAB/sme3Dc
+-  Williams/webbase-1M
+-  Bova/rma10
+-  JGD_BIBD/bibd_22_8
+-  Williams/mac_econ_fwd500
+-  Williams/mc2depi
+-  Hamm/scircuit
+-  Sandia/ASIC_320k
+-  GHS_psdef/bmwcra_1
+-  HB/nos1
+-  HB/nos2
+-  HB/nos3
+-  HB/nos4
+-  HB/nos5
+-  HB/nos6
+-  HB/nos7
+-  DNVS/shipsec1
+-)
+-
+-set(TEST_MD5HASH
+-  f567e5f5029d052e3004bc69bb3f13f5
+-  e39879103dafab21f4cf942e0fe42a85
+-  a95eee14d980a9cfbbaf5df4a3c64713
+-  2d4c239daad6f12d66a1e6a2af44cbdb
+-  a899a0c48b9a58d081c52ffd88a84955
+-  455d5b699ea10232bbab5bc002219ae6
+-  f1b0e56fbb75d1d6862874e3d7d33060
+-  8c8633eada6455c1784269b213c85ea6
+-  3e62f7ea83914f7e20019aefb2a5176f
+-  fcfaf8a25c8f49b8d29f138f3c65c08f
+-  8a3cf5448a4fe73dcbdb5a16b326715f
+-  b203f7605cb1f20f83280061068f7ec7
+-  b0f812ffcc9469f0bf9be701205522c4
+-  f185514062a0eeabe86d2909275fe1dc
+-  04b781415202db404733ca0c159acbef
+-  c98e35f1cfd1ee8177f37bdae155a6e7
+-  c39375226aa5c495293003a5f637598f
+-  9a6481268847e6cf0d70671f2ff1ddcd
+-  73372e7d6a0848f8b19d64a924fab73e
+-)
+-
+-if(NOT TARGET hipsparse)
+-  set(CONVERT_SOURCE ${CMAKE_SOURCE_DIR}/../deps/convert.cpp)
+-else()
+-  set(CONVERT_SOURCE ${CMAKE_SOURCE_DIR}/deps/convert.cpp)
+-endif()
+-
+-if(BUILD_ADDRESS_SANITIZER)
+-  execute_process(COMMAND ${CMAKE_CXX_COMPILER} ${CONVERT_SOURCE} -O3 -fsanitize=address -shared-libasan -o ${PROJECT_BINARY_DIR}/mtx2csr.exe)
+-else()
+-  execute_process(COMMAND ${CMAKE_CXX_COMPILER} ${CONVERT_SOURCE} -O3 -o ${PROJECT_BINARY_DIR}/mtx2csr.exe)
+-endif()
+-
+-list(LENGTH TEST_MATRICES len)
+-math(EXPR len1 "${len} - 1")
+-
+-foreach(i RANGE 0 ${len1})
+-  list(GET TEST_MATRICES ${i} m)
+-  list(GET TEST_MD5HASH ${i} md5)
+-
+-  string(REPLACE "/" ";" sep_m ${m})
+-  list(GET sep_m 0 dir)
+-  list(GET sep_m 1 mat)
+-
+-  # Download test matrices if not already downloaded
+-  set(CMAKE_MATRICES_DIR ${PROJECT_BINARY_DIR}/matrices)
+-  if(NOT EXISTS "${CMAKE_MATRICES_DIR}/${mat}.bin")
+-    message("-- Downloading and extracting test matrix ${m}.tar.gz")
+-    file(DOWNLOAD https://sparse.tamu.edu/MM/${m}.tar.gz ${CMAKE_MATRICES_DIR}/${mat}.tar.gz
+-        INACTIVITY_TIMEOUT 3
+-        STATUS DL)
+-
+-    list(GET DL 0 stat)
+-    list(GET DL 1 msg)
+-
+-    if(NOT stat EQUAL 0)
+-      message("-- Timeout has been reached, trying mirror ...")
+-      # Try again using ufl links
+-      file(DOWNLOAD https://www.cise.ufl.edu/research/sparse/MM/${m}.tar.gz ${CMAKE_MATRICES_DIR}/${mat}.tar.gz
+-          INACTIVITY_TIMEOUT 3
+-          STATUS DL)
+-
+-      list(GET DL 0 stat)
+-      list(GET DL 1 msg)
+-
+-      if(NOT stat EQUAL 0)
+-        message(FATAL_ERROR "${msg}")
+-      endif()
+-    endif()
+-
+-    # Check MD5 hash before continuing
+-    file(MD5 ${CMAKE_MATRICES_DIR}/${mat}.tar.gz hash)
+-
+-    # Compare hash
+-    if(NOT hash STREQUAL md5)
+-      message(FATAL_ERROR "${mat}.tar.gz is corrupted")
+-    endif()
+-    execute_process(COMMAND tar xf ${mat}.tar.gz WORKING_DIRECTORY ${CMAKE_MATRICES_DIR})
+-    
+-    file(RENAME ${CMAKE_MATRICES_DIR}/${mat}/${mat}.mtx ${CMAKE_MATRICES_DIR}/${mat}.mtx)
+-    execute_process(COMMAND ${PROJECT_BINARY_DIR}/mtx2csr.exe ${mat}.mtx ${mat}.bin WORKING_DIRECTORY ${CMAKE_MATRICES_DIR})
+-    # TODO: add 'COMMAND_ERROR_IS_FATAL ANY' once cmake supported version is 3.19
+-    file(REMOVE_RECURSE ${CMAKE_MATRICES_DIR}/${mat}.tar.gz ${CMAKE_MATRICES_DIR}/${mat} ${CMAKE_MATRICES_DIR}/${mat}.mtx)
+-	
+-  endif()
+-endforeach()
+-
+ set(HIPSPARSE_TEST_SOURCES
+   hipsparse_gtest_main.cpp
+   test_axpyi.cpp
diff --git a/sci-libs/hipSPARSE/hipSPARSE-4.3.0.ebuild b/sci-libs/hipSPARSE/hipSPARSE-4.3.0-r2.ebuild
index 99acf36c8593..9498143b5003 100644
--- a/sci-libs/hipSPARSE/hipSPARSE-4.3.0.ebuild
+++ b/sci-libs/hipSPARSE/hipSPARSE-4.3.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="ROCm SPARSE marshalling library"
 HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipSPARSE"
@@ -38,11 +38,12 @@ IUSE="test"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-util/rocminfo:${SLOT}
-		dev-util/hip:${SLOT}
+RDEPEND="dev-util/rocminfo
+		dev-util/hip
 		sci-libs/rocSPARSE:${SLOT}"
 DEPEND="${RDEPEND}"
-BDEPEND="dev-util/rocm-cmake:${SLOT}
+BDEPEND="dev-util/rocm-cmake
+	>=dev-util/cmake-3.22
 	test? ( dev-cpp/gtest )"
 
 S="${WORKDIR}/hipSPARSE-rocm-${PV}"
@@ -69,7 +70,7 @@ src_prepare() {
 				destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).bin
 				ebegin "Converting ${mtxfile} to ${destination}"
 				deps/convert ${mtxfile} ${destination}
-				eend
+				eend $?
 			done
 	fi
 	eapply_user
@@ -91,7 +92,6 @@ src_configure() {
 		-DCMAKE_SKIP_RPATH="ON"
 		-DCMAKE_INSTALL_INCLUDEDIR=include/hipsparse
 		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
-		-D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue caused by officialy support programming language "HIP"
 	)
 
 	cmake_src_configure
diff --git a/sci-libs/hipSPARSE/hipSPARSE-5.0.2.ebuild b/sci-libs/hipSPARSE/hipSPARSE-5.0.2.ebuild
new file mode 100644
index 000000000000..7ce5fdc224c8
--- /dev/null
+++ b/sci-libs/hipSPARSE/hipSPARSE-5.0.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="ROCm SPARSE marshalling library"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipSPARSE"
+# share some test datasets with rocSPARSE
+SRC_URI="https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-${PV}.tar.gz -> hipSPARSE-$(ver_cut 1-2).tar.gz
+test? (
+https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> rocSPARSE_amazon0312.tar.gz
+https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> rocSPARSE_Chebyshev4.tar.gz
+https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> rocSPARSE_sme3Dc.tar.gz
+https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> rocSPARSE_webbase-1M.tar.gz
+https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> rocSPARSE_rma10.tar.gz
+https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> rocSPARSE_bibd_22_8.tar.gz
+https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> rocSPARSE_mac_econ_fwd500.tar.gz
+https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> rocSPARSE_mc2depi.tar.gz
+https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> rocSPARSE_scircuit.tar.gz
+https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> rocSPARSE_ASIC_320k.tar.gz
+https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> rocSPARSE_bmwcra_1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> rocSPARSE_nos1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> rocSPARSE_nos2.tar.gz
+https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> rocSPARSE_nos3.tar.gz
+https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> rocSPARSE_nos4.tar.gz
+https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> rocSPARSE_nos5.tar.gz
+https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> rocSPARSE_nos6.tar.gz
+https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> rocSPARSE_nos7.tar.gz
+https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> rocSPARSE_shipsec1.tar.gz
+)"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"/$(ver_cut 1-2)
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/rocminfo
+		dev-util/hip
+		sci-libs/rocSPARSE:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/rocm-cmake
+	>=dev-util/cmake-3.22
+	test? ( dev-cpp/gtest )"
+
+S="${WORKDIR}/hipSPARSE-rocm-${PV}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.0.2-remove-matrices-unpacking.patch" )
+
+src_prepare() {
+	sed -e "s/PREFIX hipsparse//" \
+		-e "/<INSTALL_INTERFACE/s,include,include/hipsparse," \
+		-e "s:rocm_install_symlink_subdir(hipsparse):#rocm_install_symlink_subdir(hipsparse):" \
+		-i library/CMakeLists.txt || die
+
+	# remove GIT dependency
+	sed -e "/find_package(Git/d" -i cmake/Dependencies.cmake || die
+
+	if use test; then
+		mkdir -p "${BUILD_DIR}"/clients/matrices
+		# compile and use the mtx2bin converter. Do not use any optimization flags!
+		ebegin "$(tc-getCXX) deps/convert.cpp -o deps/convert"
+		$(tc-getCXX) deps/convert.cpp -o deps/convert
+		eend $?
+		find "${WORKDIR}" -maxdepth 2 -regextype egrep -regex ".*/(.*)/\1\.mtx" -print0 |
+			while IFS= read -r -d '' mtxfile; do
+				destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).bin
+				ebegin "Converting ${mtxfile} to ${destination}"
+				deps/convert ${mtxfile} ${destination}
+				eend $?
+			done
+	fi
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	# Compiler to use
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DHIP_RUNTIME="ROCclr"
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DCMAKE_SKIP_RPATH="ON"
+		-DCMAKE_INSTALL_INCLUDEDIR=include/hipsparse
+		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	addwrite /dev/kfd
+	addwrite /dev/dri/
+	cd "${BUILD_DIR}/clients/staging" || die
+	./hipsparse-test || die
+}
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 16b8d70fdbb8..bca2c622f3e0 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -4,5 +4,5 @@ DIST indilib-1.9.4.tar.gz 2370816 BLAKE2B 4df98abfaecdfe226d889e063928d3d5a09f91
 DIST indilib-1.9.5.1.tar.gz 2420537 BLAKE2B 1be0f19a92cfb9d36ba88fc51adf55f5c39743efc4da352d1f11f4eb9e8a82c0624d29de1032a0b2a0a96babb13b33e225ef453ef92d091c695cc0a62642900c SHA512 80e764eff9ce40754bd1ba3dc8a49714aeccb3fc2d2e623f50dff25d7bcef9f9744b48fa052c60a94105677479a1629cc80f452002e1e00fc9f6549c1809df65
 EBUILD indilib-1.9.2.ebuild 1537 BLAKE2B ae5d0101c31c4bd95bb688856b5113cbdfff59d7a494b98f916378c4e0d86c94d729c48386c04857e8806764d7f9684195b134e099b723408ba3d35259266ebf SHA512 df6496a6fad0246217468105f06ee3a4a368810cbcfaa4907481c230ea7bf8182d683d60292522bc61eeefdcdb75a1f3c28611bf331d86e10732db365e0a8468
 EBUILD indilib-1.9.4.ebuild 1596 BLAKE2B 1a9be2d46147a85a30c01c96d12325e45a3713e1a7e212937564826222d2244052cdbc440cde002ee930d3c494c36f6aa7a2c1ef41df674293d562363e900882 SHA512 b3a896bc74c205043377901bb660f9852fa348e9637df0c3175c6174ea35d8cca6c817c325491473518b3a751ff11fe7f804df4765132f09466129b055bbd3f2
-EBUILD indilib-1.9.5.1.ebuild 1541 BLAKE2B 2eb032352d2c0de268a872be07553bbc1189b35f6da14eb019aa3b3b501b351b1cbe97ab8e3b72e80039464dd3e0705adb3bd9de037b2eaf1ef7dca4d1955c0f SHA512 f9c8bc335a4289332adbfc83c5aa7a1beb8830895210d470cb0af3d0f67ea07aed8c3fe8674294906d6faac0996c653f5e5937190dbd2a14249ca4e43ac9ed27
+EBUILD indilib-1.9.5.1.ebuild 1538 BLAKE2B 726604e729b18065d8ee12a1411a7eae118311bad40e8c87d2c8d32ce157ce16432665c605ddd8b552f89e09f6915264f382c2812eab186d8e548bd3cc8c5181 SHA512 d3f8de3e30d5a5f8bf7bed35bd84f5e5ce9bb32a589f1c5bbe33f5876f5ddadf326c65196932173b67e02dce88c2adf4a394d84886069166bfd76cca4e50c8f4
 MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f
diff --git a/sci-libs/indilib/indilib-1.9.5.1.ebuild b/sci-libs/indilib/indilib-1.9.5.1.ebuild
index b6d000763a3b..79e0a912fc19 100644
--- a/sci-libs/indilib/indilib-1.9.5.1.ebuild
+++ b/sci-libs/indilib/indilib-1.9.5.1.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/ipopt/Manifest b/sci-libs/ipopt/Manifest
index 7d1e3ab11ade..db5add955e48 100644
--- a/sci-libs/ipopt/Manifest
+++ b/sci-libs/ipopt/Manifest
@@ -1,5 +1,5 @@
 DIST Ipopt-3.12.12.tgz 4530034 BLAKE2B 8a8e24e4e5d8ad5bc1fcfa2de525e1e39c88a4c6dd77b51c0549249f517b3d6a1279e355a7cb606ebd8e606551031b653b78cd4d1cb51dd369e051ffa010011f SHA512 c543695feaa39a69b01e0025ebcd8a8772deb369ea1072f17da4ba34c1b522d322959067f3a6cfc40446e00c2e6dd2d6704a55623aba5d61dff44333727368cb
 DIST ipopt-3.14.4.tar.gz 1843885 BLAKE2B 83f6a983db282ced6e52237ff326c860a92df2c92dbd53db7581110d3003fd7b557a68453c74e48d780832d2c9c55d9eb4ea54e68f504c161952fce6bb81caaf SHA512 a27a08ae24c94da96efcfa236034cec79d79111d7dc9c028d808b412d5abb21495a0011f075a87db65b91ba69e191653552e7f99fe8da88c3b580d971eac3652
 EBUILD ipopt-3.12.12.ebuild 2070 BLAKE2B 5499b8e25acd936d2e032e34f729715da09208ac6b162a029506c1fb514c3209df8a81b955adb4e6b6d30caf86de85667adfb73a801862241cf2427560596ad8 SHA512 a25e572863c12af79e1a22801bb71a0eaedd153bf6ef0d17e6d737716ac26c19a93397400eef46f3718ddfe5253ad92dda0696dda34a96648cfce847a4a1e8d5
-EBUILD ipopt-3.14.4.ebuild 1734 BLAKE2B 25133ba41dab04662c53ed268e4e8392307e1a0012f168f65ee64fe75c70c7f8ad37065ffc5dcbccfc5d1dfa44ddaa542321fd181e98de4b5aaa47e65e95fd3b SHA512 e9fcd4f104fc8df872c0eae55bb6b4b748728136dc35745d00ebe1bc71f97c2d13d2a3b77981afc2e6d305fd34b0a7d6d613c4c600a53242630ec97f7e580015
+EBUILD ipopt-3.14.4.ebuild 1739 BLAKE2B 34423fb9e7f814e03ddbefc5b4a69008f6de833e6826d98c21e8dd3ca89d018707f1cbf6d8eeb290a645cd6fcfc695990879e41f05eb4d563ab50075e627e4cb SHA512 defe9e435be58fd9b266bed01938dcfe54c8737b3e7a041b58eca30ca43a90638b014e4e3400a37434a7f4a4742dc5c140e62b7006b19a11bc24d50626e5735d
 MISC metadata.xml 967 BLAKE2B 8a3fc8addf0130148ddca1bcfb4732e1bf60b52d5de28e2ee6ce9b8e4352358424b39aa585ba177592b4a5744bf2f52e16ab393e2a80617333a48e385eb55a2d SHA512 aa538e824ce3cc926f28554dc268f6d109bebd382b35bb2db8aee75fa82cc81bf9171ace022aaf441602bf8b150fa7bf80ad04e4563d2c3b83e25d80d8780574
diff --git a/sci-libs/ipopt/ipopt-3.14.4.ebuild b/sci-libs/ipopt/ipopt-3.14.4.ebuild
index 6a2bac46ff03..44a78114fdfa 100644
--- a/sci-libs/ipopt/ipopt-3.14.4.ebuild
+++ b/sci-libs/ipopt/ipopt-3.14.4.ebuild
@@ -44,7 +44,7 @@ src_configure() {
 	)
 
 	if use lapack; then
-		myeconfargs+=( --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" )
+		myeconfargs+=( --with-lapack="$($(tc-getPKG_CONFIG) --libs blas lapack)" )
 	else
 		myeconfargs+=( --without-lapack )
 	fi
diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index cf08fed50c63..55eed7878dda 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -2,7 +2,7 @@ AUX libsigrok-0.5.2-check-0.15.patch 917 BLAKE2B 39d042e99dc5a71fa79def033f7a306
 AUX libsigrok-0.5.2-ruby-swig-docs.patch 3085 BLAKE2B 865f38a8230762f58620c06b91dda8bfda405057c6733ef8dc27dbc7094817709ce03a3db1904e4c4ce3ecbdc82da6d16c5719a3f93410a84f07cd4c4018a9ea SHA512 aa3fd492f736c0fe7af1c2ba4e41307731589cef78c480426113dcbae8abbf0ecc07bdc5e1b251103d5aa813f120c5ff7f76dd6d5e577ca8f2b9f29eac008025
 AUX libsigrok-0.5.2-swig-4.patch 1484 BLAKE2B 94c9bbde14f3175252677dedd50a7f3ff17bcc734382d93fbe3c65c71989dc72d0568535343bcb7764053075a2bac9c9f2d4e480d582a5371ac0d4a12bcab4a2 SHA512 34e568351624aeada4c3894be8a60cc0111be7c20ebe8e5395a1f81b2fc453a6a8228f575b95faad5140162a9d4fc5fc570546f42673f7275cb3910c73ffc8de
 DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092
-EBUILD libsigrok-0.5.2-r2.ebuild 3912 BLAKE2B 402bef147d2b91b20934d43fdee761f07ae73c6973f06f6c37097beacc172cdc236bab38f7647fd25424a96364a7f8cdd0f847929bb70929e8724769cc1b15b1 SHA512 a80e0d58c2262204f879f38cdaa97e4cb862bbe1b3801f31bb675e69376f871cfafee3720ec56457c5340bd7f6b7c06e1e7511acfda4f970d52eeac305d3ae99
-EBUILD libsigrok-0.5.2-r3.ebuild 4057 BLAKE2B a43f9b774de8cb3c6df5198b7f155d40a3c149396bfaa5346625c302f99ada5ae69440e5dfd29f11f1f8c3ac04b014920f8c7aa8dcc4a3370da078d00f9a1605 SHA512 ba85487744ada2c18c51ee97c9139eb62f9c93fdac05f1651864b3f1ac1ac7cbcfc0e57302b2f90ed04fc40fce0bc8cfa3b7687d1ecb7cefec70514d3ec49681
-EBUILD libsigrok-9999.ebuild 3931 BLAKE2B 498c6b13b08da5cb4eb54a3e1853555fd7b8741a48a6810f1436883c07aa5700ce5812d03397fa2cc803d3388f3a59584a4e8028d764f9e7c35081c5306b8529 SHA512 dc586a2ebc8cf5bef64e5458d0330573f5f5d3070aed60e1da0d3fd4fef5dae0a15d99a63b5a782ad7b6cddbb61fdfd21d36e02dedba089747d44535609e0b6f
+EBUILD libsigrok-0.5.2-r2.ebuild 3910 BLAKE2B d09247d9500282261fa2b62e4b9ee6f5505973f6b836893f166871b8d67fd3a90c89542c882f3367a38f50bac6a064d727cf26a32555fe54b53165481b752973 SHA512 e5f9c8451451788b05c15353a4b1136b423fc6ab576ea55e7c720c25c6b96391c49a3bb4240ef96322b212a49f37dcd0495df646a8648a06d18c4f25ed3617ab
+EBUILD libsigrok-0.5.2-r3.ebuild 4055 BLAKE2B 63c6571becc1bb712e13038a2872628453890aacd48c9db415f7c3e6f2e5a4e787a189bab9c6c753561cce817b1a1cd2bd7d07077e9f9e0eb00bcb18bfae2ca1 SHA512 8d71b9445e7d0beee9953c92cf0a3730b753d986906f52f601f39d8e0ffc22fbdeeb1293cdd6571803ba9b6214b26d0f6fb4cc900c4f3f2a64f6689439972e01
+EBUILD libsigrok-9999.ebuild 3929 BLAKE2B ee6a027e09ea5cd2b4cb4a9a2d8bfcc22ef07925e4c9379651480e0fd5623800568f1953c016df7ed2c67ff8a047a8818f4cf190c6820b724938fbb5546cd38d SHA512 a32a12a04a81f8eddd3250cba69af665f2946ae00b45aa5aeb814a48212bae9d218924ca6517674781d007c3b68646c859689b37dc0af6cb38849a46cbc1c334
 MISC metadata.xml 886 BLAKE2B cb7cece1f79a4affb612e55f147eb93895a805e43aed6bbabfed2e3b925b0714d64651c00294da2742f8c09ce9984a58888b89025d73712400c8bd026296b2cb SHA512 79c9697b3fe6954108cb60ae79c06cee280ef6d73bcd9e35ab148750a4fa55c8e5118c21cdb4e3ae009d4c160a26c98132448476ef90ac6d7a19a79138c3b2f6
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
index 441a3bc48621..353b751959c9 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 USE_RUBY="ruby26 ruby25"
 RUBY_OPTIONAL="yes"
 
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
index 8c206cfc5d79..8ea5f166972b 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 USE_RUBY="ruby26 ruby25"
 RUBY_OPTIONAL="yes"
 
diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild
index 126dd3c3d52f..c8561dcffd11 100644
--- a/sci-libs/libsigrok/libsigrok-9999.ebuild
+++ b/sci-libs/libsigrok/libsigrok-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 USE_RUBY="ruby26 ruby25"
 RUBY_OPTIONAL="yes"
 
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index aac42b2558db..930e192e293b 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,5 +1,7 @@
+AUX linux-gpib-modules-4.3.4-kernel-5.17.patch 853 BLAKE2B 501282329fdf34d2bb0ccbed9f8bb865711d505ba2a444d659fc97deffae27d179cad522239efd4c63767705e45881c6fb6e1d2f6815085204215bbcbd89606b SHA512 275c693b35885f4913345de26ca17c88deecd3e8513e73787342808fb4ed021dbfc88e6233b5f04cd6b892e43a601a24de27fd656ba6085b3027acbe96c7bc55
 DIST linux-gpib-4.3.3.tar.gz 1381420 BLAKE2B 0ee8c4d740272a55be03f07bd49c9a93d0ec4808465c9b0abc4ede2ee9ef4bcb8a48fb8c98617d007c8b7af970eae185de65094a8814b05cb81bfc983bf9df3e SHA512 91b2c345dc82778b757122dc41ae74138831223a73057ddf9f04d10b8f6a059760e17134378df46a1ecb13c42bec1383aced0f2446f803af425391193a77066e
 DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B 3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832 SHA512 397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
 EBUILD linux-gpib-modules-4.3.3-r1.ebuild 1345 BLAKE2B 5c52c4e59e407c34a390783ffdd4c32bb3119f8d4fbf5fabe33cd724029a0549081feab3e0f194607bafe40556359b7025f61d6c3e74b3381907427887c0d72f SHA512 ed908311a79d77acb579a93536978f07a059de92a2d77dbb9c664f95c7429d74f4c84eefe33de5622c6925a668c9b23cdd36a526b36376f0aa205b7d9b6ddd0c
+EBUILD linux-gpib-modules-4.3.4-r1.ebuild 1334 BLAKE2B 592bf2c852575e7da96bd8a5ba2af12be7443287930c73f09cc8627071da1f9c88e7bd9f90bb3093a3c83030a88d37daef19da0fd2975585d55530c38f7badcb SHA512 d21bfe260d126a3e846da56d183ed21e6f84a406f3b547c9a6b997f22d689b609da4abc07f23b71d9861fd7698ad5b94e043517b181952fa4663da2e41605992
 EBUILD linux-gpib-modules-4.3.4.ebuild 1345 BLAKE2B 5c52c4e59e407c34a390783ffdd4c32bb3119f8d4fbf5fabe33cd724029a0549081feab3e0f194607bafe40556359b7025f61d6c3e74b3381907427887c0d72f SHA512 ed908311a79d77acb579a93536978f07a059de92a2d77dbb9c664f95c7429d74f4c84eefe33de5622c6925a668c9b23cdd36a526b36376f0aa205b7d9b6ddd0c
 MISC metadata.xml 481 BLAKE2B 5ee2924d1131f188c19c84bbfa8a3e2c6093387d15db5a0bc86ea14d4b0c0f36924df7525fb26f0b6660efe1a75f20e19afbd71270386795bd6af82bc5cd38f8 SHA512 dd41ed66cff7ad48e4a107f512e1121fb630f6487ef7872aeab219ff39d6cdb4b5dc14fa19c1b7931697c555702c2bd8bb8ec553b060c11581f02d8a46f76ef4
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-5.17.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-5.17.patch
new file mode 100644
index 000000000000..894c33466627
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-5.17.patch
@@ -0,0 +1,24 @@
+diff --git a/drivers/gpib/eastwood/fluke_gpib.c b/drivers/gpib/eastwood/fluke_gpib.c
+index daebaaa..7edece1 100644
+--- a/drivers/gpib/eastwood/fluke_gpib.c
++++ b/drivers/gpib/eastwood/fluke_gpib.c
+@@ -910,7 +910,6 @@ static int fluke_config_dma(gpib_board_t *board, int output)
+ 	config.src_maxburst = 1;
+ 	config.dst_maxburst = 1;
+ 	config.device_fc = true;
+-	config.slave_id = 0;
+ 	
+ 	if(output)
+ 	{
+diff --git a/drivers/gpib/fmh_gpib/fmh_gpib.c b/drivers/gpib/fmh_gpib/fmh_gpib.c
+index c4ef7d2..d245278 100644
+--- a/drivers/gpib/fmh_gpib/fmh_gpib.c
++++ b/drivers/gpib/fmh_gpib/fmh_gpib.c
+@@ -926,7 +926,6 @@ static int fmh_gpib_config_dma(gpib_board_t *board, int output)
+ 	fmh_gpib_private_t *e_priv = board->private_data;
+ 	struct dma_slave_config config;
+ 	config.device_fc = true;
+-	config.slave_id = 0;
+ 	
+ 	if(e_priv->dma_burst_length < 1)
+ 	{
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
new file mode 100644
index 000000000000..3c48db034bcd
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info linux-mod
+
+DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="https://linux-gpib.sourceforge.io/"
+SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz"
+S="${WORKDIR}/linux-gpib-kernel-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+COMMONDEPEND=""
+RDEPEND="${COMMONDEPEND}
+	acct-group/gpib
+"
+DEPEND="${COMMONDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	# https://sourceforge.net/p/linux-gpib/code/1998/
+	"${FILESDIR}/${P}-kernel-5.17.patch"
+)
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	if kernel_is -lt 2 6 8; then
+		die "Kernel versions older than 2.6.8 are not supported."
+	fi
+}
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz"
+}
+
+src_configure() {
+	set_arch_to_kernel
+
+	my_gpib_makeopts=''
+	use debug && my_gpib_makeopts+='GPIB-DEBUG=1 '
+
+	my_gpib_makeopts+="LINUX_SRCDIR=${KERNEL_DIR} "
+}
+
+src_compile() {
+	set_arch_to_kernel
+	emake \
+		${my_gpib_makeopts}
+}
+
+src_install() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${ED}" \
+		INSTALL_MOD_PATH="${ED}" \
+		DEPMOD="/bin/true" \
+		docdir="${ED}/usr/share/doc/${PF}/html" \
+		${my_gpib_makeopts} \
+		install
+
+	dodoc ChangeLog AUTHORS README* NEWS
+}
diff --git a/sci-libs/matio/Manifest b/sci-libs/matio/Manifest
index 23e0025a05e3..fa226ab0194e 100644
--- a/sci-libs/matio/Manifest
+++ b/sci-libs/matio/Manifest
@@ -1,3 +1,3 @@
-DIST matio-1.5.21.tar.gz 10110430 BLAKE2B 1c43d44e69b28eacd9cc672a393df6a55c4ea0e06334eace9058b45bb0bd1582d43cafd30ad121bad33ad29dda52d5259be8c38f6cbacdb05a47da3644dfb984 SHA512 b00bcad807e6a7e10afa656eb77a0e3e9fb08d9cecc3e94ba41ef91ce60367d6686e6d387a874bbb83eb2f895d4a97caac554a70e7f5f6f5cb750052702d411c
-EBUILD matio-1.5.21.ebuild 966 BLAKE2B 7bfd290e52e38a2805caad4580b1c5400c2c7ab9df3081347e82a5e055337808a408a16f7395b88d2c7a00cdbeb7cdfaa639bc29ef6b3140c3e74aaafb2ae7c7 SHA512 047f6456e2954383b004cabdf8c4e20684188714fc65e266ca4c9cdcc4375273db6d5e1ee059660a6059752e3d48c5c035d73f0fa6c28debd272c1fe5ae28834
+DIST matio-1.5.23.tar.gz 10115808 BLAKE2B a461cd8a0057db2bf1bc0249f4e9c3a0b901bc19fc274c7b9c38d3376b86d556bcfd997a32d5eb7d03b911f7a265c35ee337d98daccea5549d4e16d16f67932b SHA512 e125278dcb25695affb7c576d0e2a86c0eff4225aa866b81536c9e4d7b2aea2c554f5389e96d534a8b559f5554b6cbecff4b44fe8915173cd64b2da6d1dc2629
+EBUILD matio-1.5.23.ebuild 966 BLAKE2B a5d19cc26992f7292105e67d07d47eae89449f6202e13279e04796d00c977067bec67b296d018d0be5d04f5004278937e109357f92fdec235c8c4c9ba5f54a7b SHA512 8a0ac3e53103dfbb92aa6943d7e22d8cb3e4d3eccb6b546142ee542ec34232605a2b1b32c0651d33cab2b283722a4bdee4388913f3bd5bfdd68e2c1a7a6458a5
 MISC metadata.xml 592 BLAKE2B 6fb9edff2d2cbffba34f27aac65913ed31702859fab70256703fe98e0ae401c6cf231c24fad9eb8c8360328537426d53b6b54f33d09858dfee8c6df92cc970e2 SHA512 472d03538b14257250546bb0ae71a2dca3faf86fff5c4d94684de3e57ef0f2ffdf569e8e79e537917aab3d25e65f611bf505ae64a5a1a71915b4ed977878521a
diff --git a/sci-libs/matio/matio-1.5.21.ebuild b/sci-libs/matio/matio-1.5.23.ebuild
index adb63f7b65e3..50ba1730381e 100644
--- a/sci-libs/matio/matio-1.5.21.ebuild
+++ b/sci-libs/matio/matio-1.5.23.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Library for reading and writing matlab files"
 HOMEPAGE="https://sourceforge.net/projects/matio/"
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index 844a0990dde9..00e12bda4510 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -1,4 +1,4 @@
 AUX mpir-2.7.2-ABI-multilib.patch 3830 BLAKE2B e1f39b6f8d21546680cda9f82307af4601ba3e3cb16f5b9039fcf43a8d9ff28261bc2f4ff204f03d794254c4edc906b9babd0a51ee70cf0f5a6d89a3a245fbe3 SHA512 d55ef6f1b3a41755623a64d8873317887c4e5b630d52a5bd8d139e70bb746817899e3983f4f1178e7b1efc21ac0864debaa752e70369b5e071b4012e6cc965eb
 DIST mpir-3.0.0.tar.bz2 2572041 BLAKE2B f564944dd76586ca6e50c39f1199468b905a3db7bbb8b2ee6cf3dcdfb00757d7eefc57e010d5cfc3d6db7ba2676e36f7980365e85c87827b4901ec4e80349915 SHA512 c735105db8b86db739fd915bf16064e6bc82d0565ad8858059e4e93f62c9d72d9a1c02a5ca9859b184346a8dc64fa714d4d61404cff1e405dc548cbd54d0a88e
-EBUILD mpir-3.0.0-r1.ebuild 1798 BLAKE2B 0af285eb415d2f5e8543b285d291847eb839d7226556eb318eff346b5baaa389f1c9fc735e00f17d459cca84b43fc9cc82bd0b0726fc25e46defc5b2aed5e0ed SHA512 42ceeace02ca4438759cf89c8b1a9719dcfd769486171f44d228b0741012e0deeafadcb8594278c7c64aab328b922de1f9ed5c25008d09cf1108848627eb37e6
+EBUILD mpir-3.0.0-r1.ebuild 1805 BLAKE2B 58f10750c4403c3659c6cedf5fecfc49d950f63c6d4c4993603583c2c42cca6eb975629b818882a008e844ac9eb82f54b4866b747daba3eda95a780434a7becc SHA512 67c452ce1cc88926833d1b28e4ea0805b8bbc85fe0981898e2004ad8d379eec5921a4ba57fea0cc29f816ae8cd02e143474d93b0795d80cb5e5c4aebeac9b65c
 MISC metadata.xml 793 BLAKE2B ea8420472a58d5971fe2766e0a19097f99fdceb59d01961ac6494906b1f279376c86101cb697c26eda2bde3dcf94d14a150e3c9f17f9f337234093c09fd20417 SHA512 8f6a6b2eeab02fd00e8182a69c01f77065d9dc20b2582124f7d58f0b4d8debd9ea1d94581ed52e9cf0b1b2948c984a11f86c385bf55d1e8f559a65d8c8330be0
diff --git a/sci-libs/mpir/mpir-3.0.0-r1.ebuild b/sci-libs/mpir/mpir-3.0.0-r1.ebuild
index eab814932b38..3c3622524aac 100644
--- a/sci-libs/mpir/mpir-3.0.0-r1.ebuild
+++ b/sci-libs/mpir/mpir-3.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.mpir.org/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+cxx cpudetection"
 
 BDEPEND="
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 957c09140cc9..5f2e7be4a217 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -4,5 +4,5 @@ AUX netcdf-4.8.1-big-endian-build.patch 690 BLAKE2B ee79d940d47b69c7628d325b8a4b
 DIST netcdf-4.7.4.tar.gz 19711158 BLAKE2B b49532e6f87b458e7f5654f70ec932d6c8c81272c97ce44df3d27bb61b01d3e005f918b959ce12e42e26f7c12309ab72eeb57a35216d20ab5761837db65741a4 SHA512 15922818fdd71be285eb7dd2fc9be2594fe9af979de3ed316465636c7bbdaec65eb151ca57ef8b703e6a360cdba036b8f9bc193ddff01ff7ce4214c0a66efa79
 DIST netcdf-4.8.1.tar.gz 18957280 BLAKE2B 05fc6cd10cb5cbb11dc077b9a884fbc63c4cb840b241e782702da58ad9831fba065a6f1e97c2be092437735d39658482285850a00618d0582d6e4728d64c4402 SHA512 c97207867abf10d414abf34624268710f5b812c26c38f97e73afe00558b3f07917331fbc7fdb9e70b09813acf15a9a09bae2c432a3266ce10a791b9472f87a42
 EBUILD netcdf-4.7.4.ebuild 1703 BLAKE2B 33294c879140f07bce3943cf77ec41b36045dd9df219d0cf1f3784a683b6392a6c3adb5561c6b2f18048379580fd28c6782bea986a5b5f422c5ec103a7c64b13 SHA512 7d6ea028a446b4f0d8a5cfd8b22c15f582722ae3f6f839c28a42e3a45ed9ed7952ff8c3bd5b43471c02ba237d06707d8cba8399e489eb1cb1849a9fa7f3f39d8
-EBUILD netcdf-4.8.1-r1.ebuild 1812 BLAKE2B ac9f188172be4add4eda8cf4a6c3e574e4eaab98e7e2bef1155ac1aa2f1eaa5180d69bc90920be68629118a3fc2cf0d17f14e92f43744b7d9a6e156a2dc30ff0 SHA512 0a33c8512857ceae5436827d33d87cc1a8e0efdc34bfc758bb0f52143771a9479aebee2bdfc5df3c67e273bb72f0d2c5e47105c716483f2a69b3033125722bda
+EBUILD netcdf-4.8.1-r1.ebuild 1810 BLAKE2B e73bab3d4748a0e509f5f6bfeae90ac10250744e3cff0bd588b9337a340c177c97cbb424f7880a5285026b997ec378631933979cfe9b4694d41e4244aabf9bb4 SHA512 aae2f847567d803b175ce97a529763f4e1c74e7a5b65fd85ec235b2451ce02c7afabaac2a90bb4904f8068f822ffac5329fefd5108d396788d36bda6968380c3
 MISC metadata.xml 1065 BLAKE2B 7e661019c6f97a0720a45cc93a59079834135a1994ab9abd90b769dec892c4b0ad60f09b87b6e15ceda6ee99f289a992ca8315a1d168a3eec6d50d09b6de1273 SHA512 fe82704383f8021a861936927fc9a1450257433d6589f1b4bfef3fd0527b912543813ff8d66c6fe33d98cb7a16bcbcb26149df8d809f92fa2e48c6fb83c8455b
diff --git a/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild b/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild
index bc4be534b016..15e3852ccee4 100644
--- a/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild
+++ b/sci-libs/netcdf/netcdf-4.8.1-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-c-${PV}"
 LICENSE="UCAR-Unidata"
 # SONAME of libnetcdf.so
 SLOT="0/19"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 -riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 -riscv x86 ~amd64-linux ~x86-linux"
 IUSE="+dap doc examples hdf +hdf5 mpi szip test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 78931319de43..b2968054a629 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,8 +1,9 @@
 AUX openblas-0.3.12-shared-blas-lapack.patch 2008 BLAKE2B 2d3a4a90d8144cbf149b7711b67364176a94287f26448930b5a4fd29fe761fb250e9007c580fb1ffa8148c477e2f4057f9cd8d7aa07efeb85caa842802d358fd SHA512 3f0d4b480549565c838eba6371e0990c162f56a226f9d26e1639e012ae3f39809f8c6badcf8fdfbb1258f45367dbaff9c4c611b8b44bac27d341aea954f0133e
+AUX openblas-0.3.20-fix-riscv.patch 4366 BLAKE2B bc1fb4c9e5445e208c6bc5ba9ffd7da6ed482c5e5f6e37de32bfff20fe777a1ba542dbb66db25429a3434ee5341bdf21ca999477d195c5663c69c0d711ab067f SHA512 b24555203b5514f1ceb13b69c671a8004def1f60746474b5677ffdfad2b8c556d574bc121ecfadf4c585ad21f6874bee3438676cf19a841828e70128d8df5ebe
 DIST openblas-0.3.18.tar.gz 12619822 BLAKE2B 38a5e7b861eb0063a4494c1cfb6f7f5723741437ecdd5cb1fb42645eb73bceb472b3a8c11eec3d0ba4f676981ac89de4ff1ee0d7ea42d1e234746f34ce8fb6b8 SHA512 df9a14026a61bdc5285636bfd7a52dce244d24fcf4a0c870ef4e58b8b50e412849828ca5aeac2a2435f635e78e60559762e8bae22ea7bc5dff2e865a96d81152
 DIST openblas-0.3.19.tar.gz 12706050 BLAKE2B c29aa27faaf18e3330087f8d2ebed733f53878266d6865239dfbb1624a113f3cabc988bbfcc18a0aa5d971697bc68bb267795ef24e2d8e0e8d50f802cb817b57 SHA512 1fcbcfefb7744894b0b0c83c6071b342086ca311dc67f5c2745812d61dcc9d31ef7dd5e1215dfb2731ae7197d497dbdf8f8b26a432eb07d41a7db0983eb86a33
 DIST openblas-0.3.20.tar.gz 12742441 BLAKE2B 9ae808e2a7da39e28dbe26c7feb5da3c70275f3b48bd68455c22e3b16fc1f2d10b9d84c9593acff2c837fc1514f21f2bbc0e87708075c5fe13514d0d47cf0b5a SHA512 0742d40b74b11b781021280fd627fa5798e6856b49f2ba1111a5927aac1a7823bcb8162187555f4cf3a4dd7eadf5b1f2a4685c0b5e189847b2869166d1bc7391
 EBUILD openblas-0.3.18.ebuild 5681 BLAKE2B 49f6b69e5f76fd8139792c985587ab8ff9745a443c2cb2917b94d8ccdc808f1e96064ad2c022a6a38f174777ea40c4abe6c30584721278687806ab19535a44f0 SHA512 49a892293df5d3b521d9a6d385c646be61a20f748f373c32e5ddf9645a6d2d73cd8b726c80d776bc1ab98b3bbef64294013aa0e3b855fee57dcadc305fffdc4f
 EBUILD openblas-0.3.19.ebuild 5681 BLAKE2B 49f6b69e5f76fd8139792c985587ab8ff9745a443c2cb2917b94d8ccdc808f1e96064ad2c022a6a38f174777ea40c4abe6c30584721278687806ab19535a44f0 SHA512 49a892293df5d3b521d9a6d385c646be61a20f748f373c32e5ddf9645a6d2d73cd8b726c80d776bc1ab98b3bbef64294013aa0e3b855fee57dcadc305fffdc4f
-EBUILD openblas-0.3.20.ebuild 5682 BLAKE2B ccd383a2fdb457654d638d2efce4bdc65df9e8ea9c4b3a387cc10b8b9655ba51916975e1fa05e1279efaa2dbe8bcb8ce95cd1bf9c9e8374f7476e26cf7ed0f9a SHA512 10f9d830e3b930882f86078d3ea1c3431c160e7c11a10080300c6e3155a6cde6a3a07fcec22e297970e439ef96303768ab3b13bdafb4bb4230918b74f986f237
+EBUILD openblas-0.3.20.ebuild 5733 BLAKE2B 5ec06e96b7a7d2ac7d8cf695380373cc72f041467e3db7af95b89d5102370175e6751b0b78177c80885c453e31b0e1bcc54d6f58c62a2aeb682001c7dc8be433 SHA512 94e07466dcc89cdae7010bf8c643773d80e4393fd106e1dacdae05d907deebd24f877fe9dfb77601a8b32b1b83105031ebea123107010f1d0db32d110e545c5e
 MISC metadata.xml 1561 BLAKE2B 5ba7ec66dd8ba7ca8bc29bc0193b48b6a82b4949bb79bab461400040667aa66aac3cfd2ad9c7323798048fd43d18ac96a562d53b68f3f7ae8bf8505ac7a04691 SHA512 05272eb56480ff82b240d0f430df3df03981e24b971dbd37c13d464f4f4b334bac19b54915446a09326a334aa76249bb79a4fa389d26150365f21389992f9a48
diff --git a/sci-libs/openblas/files/openblas-0.3.20-fix-riscv.patch b/sci-libs/openblas/files/openblas-0.3.20-fix-riscv.patch
new file mode 100644
index 000000000000..9a14180cb85d
--- /dev/null
+++ b/sci-libs/openblas/files/openblas-0.3.20-fix-riscv.patch
@@ -0,0 +1,116 @@
+Bug: https://bugs.gentoo.org/837806
+From https://github.com/xianyi/OpenBLAS/pull/3613
+
+From 3fc52ebcfb80e01f753938fd314ca07b2c085767 Mon Sep 17 00:00:00 2001
+From: Han Gao <gaohan@uniontech.com>
+Date: Wed, 27 Apr 2022 01:34:55 +0800
+Subject: [PATCH 1/2] Fix other arch build in detect.
+
+When CORE is empty, use -march=loongson3a. Fix it.
+
+Signed-off-by: Han Gao <gaohan@uniontech.com>
+---
+ Makefile.system | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.system b/Makefile.system
+index ac60eae5b6..1104893b55 100644
+--- a/Makefile.system
++++ b/Makefile.system
+@@ -847,7 +847,7 @@ CCOMMON_OPT += -mabi=32
+ BINARY_DEFINED = 1
+ endif
+ 
+-ifeq ($(CORE), $(filter $(CORE),LOONGSON3R3 LOONGSON3R4))
++ifneq (, $(filter $(CORE),LOONGSON3R3 LOONGSON3R4))
+ CCOMMON_OPT += -march=loongson3a
+ FCOMMON_OPT += -march=loongson3a
+ endif
+
+From 8123324c99ba69ce23b4028468313663001a76c6 Mon Sep 17 00:00:00 2001
+From: Han Gao <gaohan@uniontech.com>
+Date: Wed, 27 Apr 2022 02:29:43 +0800
+Subject: [PATCH 2/2] Fix riscv64 arch detect
+
+Signed-off-by: Han Gao <gaohan@uniontech.com>
+---
+ cpuid_riscv64.c | 18 +++++++++---------
+ getarch.c       |  4 ++--
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/cpuid_riscv64.c b/cpuid_riscv64.c
+index 0eb50e0018..2aa4217816 100644
+--- a/cpuid_riscv64.c
++++ b/cpuid_riscv64.c
+@@ -1,5 +1,5 @@
+ /*****************************************************************************
+-Copyright (c) 2011-2014, The OpenBLAS Project
++Copyright (c) 2011-2022, The OpenBLAS Project
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+@@ -13,9 +13,9 @@ modification, are permitted provided that the following conditions are
+       notice, this list of conditions and the following disclaimer in
+       the documentation and/or other materials provided with the
+       distribution.
+-   3. Neither the name of the OpenBLAS project nor the names of 
+-      its contributors may be used to endorse or promote products 
+-      derived from this software without specific prior written 
++   3. Neither the name of the OpenBLAS project nor the names of
++      its contributors may be used to endorse or promote products
++      derived from this software without specific prior written
+       permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+@@ -70,16 +70,16 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ /* or implied, of The University of Texas at Austin.                 */
+ /*********************************************************************/
+ 
+-#define CPU_UNKNOWN     0
+-#define CPU_C910V       1
++#define CPU_GENERIC   0
++#define CPU_C910V     1
+ 
+ static char *cpuname[] = {
+-  "UNKOWN",
++  "RISCV64_GENERIC",
+   "C910V"
+ };
+ 
+ int detect(void){
+-    return CPU_UNKNOWN;
++  return CPU_GENERIC;
+ }
+ 
+ char *get_corename(void){
+@@ -98,7 +98,7 @@ void get_subdirname(void){
+ }
+ 
+ void get_cpuconfig(void){
+-  printf("#define UNKNOWN\n");
++  printf("#define %s\n", cpuname[detect()]);
+   printf("#define L1_DATA_SIZE 65536\n");
+   printf("#define L1_DATA_LINESIZE 32\n");
+   printf("#define L2_SIZE 512488\n");
+diff --git a/getarch.c b/getarch.c
+index 4af986fb3b..f4590769d9 100644
+--- a/getarch.c
++++ b/getarch.c
+@@ -1731,7 +1731,7 @@ int main(int argc, char *argv[]){
+ #ifdef FORCE
+     printf("CORE=%s\n", CORENAME);
+ #else
+-#if defined(INTEL_AMD) || defined(POWER) || defined(__mips__) || defined(__arm__) || defined(__aarch64__) || defined(ZARCH) || defined(sparc) || defined(__loongarch__)
++#if defined(INTEL_AMD) || defined(POWER) || defined(__mips__) || defined(__arm__) || defined(__aarch64__) || defined(ZARCH) || defined(sparc) || defined(__loongarch__) || defined(__riscv)
+     printf("CORE=%s\n", get_corename());
+ #endif
+ #endif
+@@ -1879,7 +1879,7 @@ printf("ELF_VERSION=2\n");
+ #ifdef FORCE
+     printf("#define CHAR_CORENAME \"%s\"\n", CORENAME);
+ #else
+-#if defined(INTEL_AMD) || defined(POWER) || defined(__mips__) || defined(__arm__) || defined(__aarch64__) || defined(ZARCH) || defined(sparc) || defined(__loongarch__)
++#if defined(INTEL_AMD) || defined(POWER) || defined(__mips__) || defined(__arm__) || defined(__aarch64__) || defined(ZARCH) || defined(sparc) || defined(__loongarch__) || defined(__riscv)
+     printf("#define CHAR_CORENAME \"%s\"\n", get_corename());
+ #endif
+ #endif
diff --git a/sci-libs/openblas/openblas-0.3.20.ebuild b/sci-libs/openblas/openblas-0.3.20.ebuild
index ed4ad9b91ed7..5d2349e6998f 100644
--- a/sci-libs/openblas/openblas-0.3.20.ebuild
+++ b/sci-libs/openblas/openblas-0.3.20.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/OpenBLAS-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="dynamic eselect-ldso index-64bit openmp pthread relapack test"
 REQUIRED_USE="?? ( openmp pthread )"
 RESTRICT="!test? ( test )"
@@ -27,6 +27,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.3.12-shared-blas-lapack.patch"
+	"${FILESDIR}/${PN}-0.3.20-fix-riscv.patch"
 )
 
 pkg_pretend() {
diff --git a/sci-libs/pdal/Manifest b/sci-libs/pdal/Manifest
index b5f77ab7a9b1..bbcb1717ea04 100644
--- a/sci-libs/pdal/Manifest
+++ b/sci-libs/pdal/Manifest
@@ -2,5 +2,7 @@ AUX pdal-2.3.0-fix_cmake_install_location.patch 677 BLAKE2B b89c4908a316fb15ad34
 AUX pdal-2.3.0-fix_tests_for_proj811.patch 3402 BLAKE2B 59c6a8b208d0ae2afd46c13452c1b0a20e650ab15cb20efe3ac7f2b234db4de19b8a2e7f1dbac317743b8464cf6443f0feec0b46bffc3b2f728ef1ba78fb8b4d SHA512 ff5fcbf194a06e504f59cbe25cc070182de4c4d5d707173b02abe9c3dfb25f2a6cf1dbacefcf999f6a7165772e84bb435794d681bed66712cfa3dbaa4ee95984
 AUX pdal-2.3.0-upgrade_cmake_min.patch 2605 BLAKE2B 972bfd638ccc22b1773a8d26a76fd63c439de7526ebd49dd9a25ccb755abfc417e789f756efebbcc426444cd4c4db0293594f061e5e5d4050e6b15c7469f5353 SHA512 0c3a3fe9f8b3b43ca4b93fbedc601002ed79d9e474aa1a7a7b1ff33d2f73e3beee753330bf3017c65734b63362a95dacc4421bd38b8212f19a5682e94a43f21d
 DIST PDAL-2.3.0-src.tar.gz 110530128 BLAKE2B 435997e7ae7fe84ff77d8546e68ce6d32e54a221b5a4bbea45543554355506d7900f65ebb47a4f5333d0f3a44192ffe548178b6b3e8b3b7575d3c104618e288b SHA512 9de87de7370175e76b95d3ec08667eb28b90a63eed8133f144427ff931e575d1f37aa13496f12054577539ee552458475dd054bcbdedfabe52eb0e32c4483d05
-EBUILD pdal-2.3.0.ebuild 1305 BLAKE2B f2f29fcda43121027c034414716cc497e27c85c9d3e19bb048ecef17ab94bbf94070b14efac383a6f6504a4b78c22f17c88235c41cdce1078fef74bdd5d9befa SHA512 12937578161941ac2b10b3d761bb2f3fda758aaf87a7f260dc84200ac56a935fad09ab6cecf43d2b75d2581f88e7e6e8998a3a6d5e9bdba41d6cd163e6d9dbef
+DIST PDAL-2.4.0-src.tar.gz 113449697 BLAKE2B 8f774555d32ad4f0afe6dd850e6dcaf33b58c02934207ee2224230af762a7d3062a48909e267abf790a97a1d11788bb7543971c99239e5ae742d7945db09bda5 SHA512 655fadd2b435ed1cb801ba542028bcc15156da9266eedde93b2210dbadbc50d36b0b6a151062113f2adfb68a2938e2b867438a5a94952a7b3e46f59a53b47623
+EBUILD pdal-2.3.0.ebuild 1304 BLAKE2B 50efb235915daa819c295c3fbfe5182b2c6a167eefb34ce1f377c6747c61808f38f0e3e905407908493f9c032e96482f918871af613d33bd5a6380dee174a709 SHA512 6a487aec84d2d521215aa21443da56bf79eae058db67501baf281d913f2df6e3ac902373503e7d0a168b1b0c7bf3854dfacd4f8394c3565d6094a427f381d238
+EBUILD pdal-2.4.0-r1.ebuild 1149 BLAKE2B 963d7f66999dad32d633bc00c161a17c3b4ab609de94e9150e4976891d4f029d815b42c25169bf95789525ac236d6ad360e3b3d129bfded9044b931ea9c200c0 SHA512 05741614f3ac94fed4084798cb52b1784adb882dbfcd23c68e78734e503fd432d63bc071e6cfda4393d89d14d416b3ff73fd27e12d0a8f52810441d61ece15e4
 MISC metadata.xml 799 BLAKE2B 44fff88edc36553687a49ecf5113b1f7f3c8d092e82ef4e45f0d96cf53cc619647f45b3d3439a5b98bf43a8965e1b80582e7b074489dcd69f6f3aad9e5c7f59a SHA512 da405bacd840b714fe274fa5ca658f7a51b0078054058dcce46f690b33e641579981739de9511f4a876ff0f88aec5c2dbaa59e4db035eb9a85bdd8e9725bc7c2
diff --git a/sci-libs/pdal/pdal-2.3.0.ebuild b/sci-libs/pdal/pdal-2.3.0.ebuild
index 949b5ab43e8b..e201138eb587 100644
--- a/sci-libs/pdal/pdal-2.3.0.ebuild
+++ b/sci-libs/pdal/pdal-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/PDAL/PDAL/releases/download/${PV}/PDAL-${PV}-src.tar
 
 LICENSE="BSD"
 SLOT="0/13"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="postgres test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/pdal/pdal-2.4.0-r1.ebuild b/sci-libs/pdal/pdal-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..9bd82c4dc76e
--- /dev/null
+++ b/sci-libs/pdal/pdal-2.4.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A C++ library for translating and manipulating point cloud data"
+HOMEPAGE="https://pdal.io/"
+SRC_URI="https://github.com/PDAL/PDAL/releases/download/${PV}/PDAL-${PV}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/14"
+KEYWORDS="~amd64 ~x86"
+IUSE="postgres test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	net-misc/curl
+	app-arch/zstd:=
+	dev-libs/libxml2
+	dev-libs/openssl:=
+	sci-libs/gdal:=
+	sci-libs/libgeotiff:=
+	sys-libs/libunwind:=
+	sys-libs/zlib
+	postgres? ( dev-db/postgresql:*[xml] )
+"
+DEPEND="
+	test? ( sci-libs/gdal[geos,jpeg,png] )
+	${RDEPEND}
+"
+
+S="${WORKDIR}/PDAL-${PV}-src"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PLUGIN_PGPOINTCLOUD="$(usex postgres)"
+		-DWITH_COMPLETION=ON
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		--exclude-regex '(pgpointcloudtest|pdal_io_bpf_base_test|pdal_io_bpf_zlib_test|pdal_filters_overlay_test|pdal_filters_stats_test|pdal_app_plugin_test|pdal_merge_test)'
+		--output-on-failure
+	)
+
+	cmake_src_test
+}
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 535e00165abf..bd6b09b255c6 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,14 +1,11 @@
 DIST proj-7.2.1.tar.gz 5714666 BLAKE2B 9379ef758b1221b9487f162a27e7afa737e668ad7a13fc7adbd8e1e2c1c4699263d5d3105d03781b423f284205de3c79fc68850b9fba6aa05f1dc553b77b0842 SHA512 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324
-DIST proj-8.2.0.tar.gz 5880399 BLAKE2B be8be2f1e6b661600479aefa1cd49dfea70085abd37f66a6768cb6cca31c42fcfa43b6d10aca7ac10a5096aba8b8cc1a2a6c744ae767225c38e31b4c69cf7d40 SHA512 e7bcd959deeeb9130325a7bf63a8a0b8de2c55ba573065ca5ea32cf83c2c2643648760cfbe1c3bd1d2a2e74f65ceae4d9d525a537678386260fc2862b3927f5e
 DIST proj-8.2.1.tar.gz 5882136 BLAKE2B c4d80ee1bb1287e2539c9b5c5a5c6305fe8d2fc83526fd29507802b94351f51b016184c07a5e8c1bbf820252a6dfa5b4d55376e5d5566774e3e5e3154857dfa1 SHA512 c6164771fd492be5aa91d8dd2f2794a19b47431078f148356aa70dee96a4589ec5decbab9d8dd756a7bcb322ad94935750c22e0e7fb16e21c8f59ca474e7137e
 DIST proj-9.0.0.tar.gz 5242155 BLAKE2B dd0a2234d0a8dddc1303c4dbc73bf1d13be0248f712c20dfb67f4003ace2504f96498f769214198f62ba3bbddea00e25a9745fe23d265d8b911ea9170288c24f SHA512 ae1e65f03fba1e922a61f843b64cf4fde0ff015ef8c18bde0a10cb3e732c4d1b27d2c6b0179e8456338c552a760de22abf16e887fc92118288ffa394a9c6a000
-DIST proj-data-1.7.tar.gz 585899744 BLAKE2B 4d5c81ed64a1ee20b8bd7abf0426ced747e9050d8d7548815365d35884dd3952252a716df9d38986e4bb2e450436df206ce7b51dca77ee35a681e4028b11a54f SHA512 03865e972cc5898b3995582e5a5b8d129609b89ef9a077fa775aaf0b2f4a6002605cd657443840d83ffd5f56233d7d248e3442f7d0efdddfd0f90f2959831310
 DIST proj-data-1.8.tar.gz 586765549 BLAKE2B a54287fa81e2055737c1956bf7f10246ccdd8d9af49fe7e8a01a6f2206c234d2827c4268d901d49bbbfff4caace220aa1867f0088442e4849f9d3cd57f4ca72d SHA512 884425c3bc09a39cb1b611264ccaa17940f4779f4e0d6023306f6b82622cdd0a2e5970a79018d499d323640acb72560789ef127ff4e0c712fa3679e5cfeb34bc
 DIST proj-data-1.9.tar.gz 589748963 BLAKE2B 53f9fa442d074127df11cf11f1be426438a334fb28fc47f4513acf985bb8c9f52678ba1e297baacf576b2082ce0371abb63747958c1fc233538efdf0d9fade57 SHA512 25607137a32c65e906d3f4e64f5e6b0fd5882faf0c4bf458116c582e6438df38cc36e9b6e67498b7d63dceb863f31b3890f04bdb19a1287e6d902a7193221711
 DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
 EBUILD proj-7.2.1.ebuild 1215 BLAKE2B 26a84ff93fefa9b88ab8017fa58da6ec89f037beb788bb11e3302bcf38ae578a846416ef23094b9a32ca8be447ee4e3a0d865f66db7c97cb30499930c48237b0 SHA512 b854fcbb1879b5bc161a06f853a5705c32705539bc0a3572d8b9df38cb7707e201e075e148e48534768dbacd550ebfa3ab836dbb387fa15e630e86e740e87a33
-EBUILD proj-8.2.0.ebuild 1426 BLAKE2B be7f95d899ddc8d10bdfdd682cb73fba9949c21feef1e657637aa840add94dd5161fc57cad6bd7775d15d9b20b8b9d6bfbb2c06eb7a4ceed82b3f8e979f96509 SHA512 fa971dc5e7ba297e46c3116105759c0f6acd5d16387519d4eed477ddaefeb1a84af3b0fdf26518c9c411e2290d4646e41ddf7708c56e7e9e3347086d587d3830
 EBUILD proj-8.2.1.ebuild 1486 BLAKE2B 67bf1c6d3f0852c39c89c70b8c63f104ac2b395b5f5a11263955d60c12cb23d0426e009958af46228e5fc614e89daf432425f2ae44aa35d85509c049388c779b SHA512 318b2d8b027cf84c53246ac8c1c181d30deae0f93db8c3d589691809abaaa8a0d36786f2c9848c2ee3a3e7bb1e6f18da44a8ffcc29cf65c48b20d39010a4080f
 EBUILD proj-9.0.0.ebuild 1512 BLAKE2B 6a8e2546269eab8e2a18caf3ef0521d959497e3998376e027240a847bf22c4e882c888ee02f519f761aa8b57c650a659a765f9bd68e934f9f7c5f4b2caedc3ba SHA512 a2619ffc5229ca6b51f0f73e5449f73cc9860363fdf066734af8ee66211e9067e258de9bda21c4025a55e86e5ecd73a6e4aabc086b08683c74e5f60ae1f9c6e3
 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
deleted file mode 100644
index 6824f59ebbf5..000000000000
--- a/sci-libs/proj/proj-8.2.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-PROJ_DATA="proj-data-1.7.tar.gz"
-DESCRIPTION="PROJ coordinate transformation software"
-HOMEPAGE="https://proj.org/"
-SRC_URI="
-	https://download.osgeo.org/proj/${P}.tar.gz
-	https://download.osgeo.org/proj/${PROJ_DATA}
-"
-
-LICENSE="MIT"
-# SONAME in 8.1.1 is actually 23 (in 8.1.0, was 22)
-# ... and now 8.2.0 is back to 22 again.
-# Please increment to 25 on the next SONAME bump, even if it's not
-# 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"
-IUSE="curl test +tiff"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	curl? ( net-misc/curl )
-	tiff? ( media-libs/tiff )"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd "${S}"/data || die
-	mv README README.DATA || die
-
-	unpack ${PROJ_DATA}
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOCDIR="${EPREFIX}"/usr/share/${PF}
-		-DBUILD_TESTING=$(usex test)
-		-DENABLE_CURL=$(usex curl)
-		-DBUILD_PROJSYNC=$(usex curl)
-		-DENABLE_TIFF=$(usex tiff)
-	)
-
-	use test && mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	cd data || die
-	dodoc README.DATA
-
-	find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/sci-libs/rocPRIM/Manifest b/sci-libs/rocPRIM/Manifest
index 646086ebe0b8..0a8e55bd3d35 100644
--- a/sci-libs/rocPRIM/Manifest
+++ b/sci-libs/rocPRIM/Manifest
@@ -1,5 +1,7 @@
 DIST rocPRIM-4.0.0.tar.gz 285576 BLAKE2B 44f3542068dee48c0f2bb475f4d3fd74592fe27f4ca00a7b754014deaaa7187c4363d4b2e7fe13ff771b48d2885b848b9632ef71ce85e80e0946e4e5f13495d8 SHA512 c37fce4f16788d82379459af69b9f47f2bccb3b0e655e7314a23936cc99a474afb0092f240bd950341f1b02ce93d03abce0df7ce62ffcb5d577171ce870dd1d2
 DIST rocPRIM-4.3.0.tar.gz 290071 BLAKE2B f69ada9859ef9238d4f8c50bc2b10d131c986dbd8982cc0c7f8614cd51746080aba3b3e7b0ef3e1d5006c179a823f4fcb8ce03cc0a4c88fad3cb46947c7b7fb6 SHA512 9925f832637d19360bf1624dd7a6ef931fb740ee725e35c3159a09a3c569af6f61e3337124c8e0561e60c8595d0d533a4402b91345056ff8d276c6e1dd491036
+DIST rocPRIM-5.0.2.tar.gz 364102 BLAKE2B 4e56f37c8ed02a4c4dadfab25e1e840c85c90b6f656858ad15dfa0f8de38b8f130d49a49461dfa09d3f07389e57b2a9cdefe5958b6faa80a639f98d276ca3e66 SHA512 d4d14203d721f7f62f35b2af91c261366f150a24fc21dc5a508743ee5a6246a6a3ad437db03f3ddaad5799cc2ba6d7b8d1e37a8e038eb4156d7962313e36f520
 EBUILD rocPRIM-4.0.0-r1.ebuild 1264 BLAKE2B eb3c16d117287c9a7c13b761b10af63e79b6f83d079f469319878c033bf690fed40ce0e73d29d06c2511fbc6e9a7cb87452d9019bb50e55a3a24b5b94dbe323f SHA512 69f4fb57bb026e85eebae3655a7f3f7f0ebc0155e6e503df93043cdceec8b1d5ec3a4bba4e217ea64def8be19314ddd7b4352ee6d4c8a003f9c447d25db3163a
-EBUILD rocPRIM-4.3.0-r1.ebuild 2060 BLAKE2B e85478525571c5b95f69db2419fbf151e68a41c09fb804480ca230ad2b562e4df5caf97b70c202f89cd11996819a4732614a3022cb6a46664e5cf289ff2ebc1b SHA512 e0e7c62a5db2ebd3055415fd5800d2c97fc2a7c6af465c138181722e4c983a53f1e313b94a2ff3f6fda04fbd5195c88c127693e356d16d3cd52752c42ef75dac
+EBUILD rocPRIM-4.3.0-r2.ebuild 2044 BLAKE2B fccd3a591b642e211f209d67bd3713feacf99f362ae9ae77de6b0976c5e31bddf0073b4e2973ef6482a97118ea488fd8866d17fc82c4ea0abe1d599c6daa8c64 SHA512 f5b24193b281e60da19eba8d29dafede7dfa18e2a02606cfa0800a04fbe8a6d5ecd5b4b2f619d677e84e4e302b9a3a0e3a3f38d02ef59777461f6585c0a53ad3
+EBUILD rocPRIM-5.0.2.ebuild 2059 BLAKE2B 171352aa4fb5897ce6624d8812357d9bb1a929e4062ecb8da46e6bad0427ab9c0fe36978d7ca6b2e2c205d0c34e5ecc25988d8fcbee8574a758f398b4c6c78aa SHA512 785d96ff01213edcc08674a610dcf4cf799c80badb2345bc63c2bc7cbff0e6aa639f71466caf8213c0b2f014adeb91e92881c26e18b408a559e59a08b3f6bb3e
 MISC metadata.xml 698 BLAKE2B 41839a7a92ff73302c0f0dd8be65cd33882a71cdc0dc481a78198e148597c6345bac8870181d73097cbdc55cf65cc5b45de3ab43a9bf851d2312340bfa63a36e SHA512 379960d8a0d1375f37e27fa7f6ec9dc4d0b05bbfb2bd0f99e224abdd72d36c3a979e59c9551469d686e14770317138f7b9c3ce4b5ed8116f04b5bd0be6ea976e
diff --git a/sci-libs/rocPRIM/rocPRIM-4.3.0-r1.ebuild b/sci-libs/rocPRIM/rocPRIM-4.3.0-r2.ebuild
index 0e7bba7b2a7c..eba4e1317b94 100644
--- a/sci-libs/rocPRIM/rocPRIM-4.3.0-r1.ebuild
+++ b/sci-libs/rocPRIM/rocPRIM-4.3.0-r2.ebuild
@@ -14,9 +14,9 @@ KEYWORDS="~amd64"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="benchmark test"
 
-RDEPEND="dev-util/hip:${SLOT}
+RDEPEND="dev-util/hip
 	benchmark? ( dev-cpp/benchmark )"
-BDEPEND="dev-util/rocm-cmake:${SLOT}
+BDEPEND="dev-util/rocm-cmake
 	>=dev-util/cmake-3.22
 	test? ( dev-cpp/gtest )"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/rocPRIM/rocPRIM-5.0.2.ebuild b/sci-libs/rocPRIM/rocPRIM-5.0.2.ebuild
new file mode 100644
index 000000000000..e14d3d1eae50
--- /dev/null
+++ b/sci-libs/rocPRIM/rocPRIM-5.0.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="HIP parallel primitives for developing performant GPU-accelerated code on ROCm"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocPRIM"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocPRIM/archive/rocm-${PV}.tar.gz -> rocPRIM-${PV}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="benchmark test"
+
+RDEPEND="dev-util/hip
+	benchmark? ( dev-cpp/benchmark )
+	test? ( dev-cpp/gtest )"
+BDEPEND="dev-util/rocm-cmake
+	>=dev-util/cmake-3.22"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/rocPRIM-rocm-${PV}"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	# "hcc" is depcreated, new platform ist "rocclr"
+	sed -e "/HIP_PLATFORM STREQUAL/s,hcc,rocclr," -i cmake/VerifyCompiler.cmake || die
+
+	# Install according to FHS
+	sed -e "/PREFIX rocprim/d" \
+		-e "/INSTALL_INTERFACE/s,rocprim/include,include/rocprim," \
+		-e "/DESTINATION/s,rocprim/include,include," \
+		-e "/rocm_install_symlink_subdir(rocprim)/d" \
+		-i rocprim/CMakeLists.txt || die
+
+	# disable downloading googletest and googlebenchmark
+	sed  -r -e '/Downloading/{:a;N;/\n *\)$/!ba; d}' -i cmake/Dependencies.cmake || die
+
+	# remove GIT dependency
+	sed  -r -e '/find_package\(Git/{:a;N;/\nendif/!ba; d}' -i cmake/Dependencies.cmake || die
+
+	# install benchmark files
+	if use benchmark; then
+		sed -e "/get_filename_component/s,\${BENCHMARK_SOURCE},${PN}_\${BENCHMARK_SOURCE}," \
+			-e "/add_executable/a\  install(TARGETS \${BENCHMARK_TARGET})" -i benchmark/CMakeLists.txt || die
+	fi
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	# Compiler to use
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addwrite /dev/dri/
+	MAKEOPTS="-j1" cmake_src_test
+}
diff --git a/sci-libs/rocRAND/Manifest b/sci-libs/rocRAND/Manifest
index 0f49fb480678..f218c1c8dd79 100644
--- a/sci-libs/rocRAND/Manifest
+++ b/sci-libs/rocRAND/Manifest
@@ -1,5 +1,7 @@
 DIST rocRAND-4.0.0.tar.gz 3105585 BLAKE2B 0466d88c286290a9cd179fac61209051f7db5323457ccad9c5f0b579439662e1fe2b8951f85101c7c31bd058bc1448e839a19dc9a3a2d4ca42eb4e0b2baf4eb4 SHA512 c02bc32a9cf7660739ecf7ef99262fb14efa2c76afb3476105eedc4264dec987351ebd461c13c9e0aef9e640b42960b2a63295479664b83924cf0d5c34a157e8
 DIST rocRAND-4.3.0.tar.gz 3107367 BLAKE2B 23cfac271c1cd4e4edcfd315aa775d4d62e6a50ffa3b9a3372d4ae427a02def52486e88b3f4f89daaa539f2653cf76c8d44afec70d8d916268bc9f27534bda4c SHA512 3eefeb55014a8ee681e1cee73e0e092bd29a81767e772e712f8f871e94380a772a433e93a59276b0cd5a364fc4e482186771809d67ebdab24b2e3020173f5e18
+DIST rocRAND-5.0.2.tar.gz 11765778 BLAKE2B f93c3530fba2b416c5ef3d227ebe65f3ee36607e6b4e1d0584c410768b9d71f86c40468bfad0935afb8ca13c7c87b20ee23f1ea89bdedcb6b3149fd932cbdbe6 SHA512 c19beb0eef8dcf4e090e53cb544f21adb61f8c9cb463c74da1c9767b1d75539bb3e296e7b8a70dee517817d181abd8c713e22770a1a4f66363150a879cbb3e48
 EBUILD rocRAND-4.0.0-r1.ebuild 1063 BLAKE2B 69823e3904b62ed811a7ea68c28b95c09e1059134e17fd62f006352e5870d2e3e9e111fbf8a1647cba517135ac46dcb829cabd98c91344bbfc1e38d7b996420a SHA512 06b4732ae433bc0996bd07fda884c7a302a4f33f92bde4b0c73eb684c8d793c3c9a0252e9961874e0fb4ab456ef584da7c47a98651fb704adf72f02e202b8c63
-EBUILD rocRAND-4.3.0.ebuild 1725 BLAKE2B a4f72473430dc7b9f52421ad974aa95f2fba68665536da5a60b976896d98ca0d0e88623c7569f75531f08315b7e57951f6d715b3044db4b07020cc974152ae76 SHA512 60bc0b7e0d19d8c929c9f2874d4ad2200361d48e4acfa53d68969c7752eb0116df81a5fb4cc2a5ae10923ee23757874e0d6a8d86576006c7565d5199780f9486
+EBUILD rocRAND-4.3.0-r1.ebuild 1717 BLAKE2B 4f62a363f30aab00ad433c7b9283119b7d8a26c462560902cc082a83a3f9d567b961faa98e4d52ad4fe70aafbf382e5d7cc7099aeb344e0c00b42e68fef7f328 SHA512 1af77ddb6a6a9e4c654c135ebba11f14a4ff33d556f2bce7a244a6b9eb0ceedae7daf39c3cb472d114d5e954074e0b3428822c5b699786ff8c121d0efa8a9e22
+EBUILD rocRAND-5.0.2.ebuild 1671 BLAKE2B d807b36b9c2bc47271e83292b9fddc25ff7f92c56e320ae6b0c7852b2554c6a2d09e41142d183d103e09aa962ef3a5d6ee845f88bcf83e07bfd29b681c79c646 SHA512 8f523e9494c5b4f98462cb70bcbe9d8270fbb96fe0033ac5c842236893274ce272610820aeb85aa5cee5d18186a7d4d2ee0333f00f0289aaacbb76d3987a1ba4
 MISC metadata.xml 698 BLAKE2B fd85075e1414d7756cb16ed17f79cfc8302db5319df3a0862d7ce9006277c33a392e1a37aa7f2b2bcb80fbae4589240dd43751eebdeb5688a90a868299c3ecad SHA512 645a284a2c3b0f95df57110a04d5f131f28e3d673ba12eb5b3f3d5e7ee30e3099a022187b86ed458d5b4d6bed1451bd3dfe620debe0e8c480aee35f57bc878eb
diff --git a/sci-libs/rocRAND/rocRAND-4.3.0.ebuild b/sci-libs/rocRAND/rocRAND-4.3.0-r1.ebuild
index 926f784a0249..074ee2912a97 100644
--- a/sci-libs/rocRAND/rocRAND-4.3.0.ebuild
+++ b/sci-libs/rocRAND/rocRAND-4.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SLOT="0/$(ver_cut 1-2)"
 IUSE="benchmark test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-util/hip:${SLOT}"
+RDEPEND="dev-util/hip"
 DEPEND="${RDEPEND}
 >=dev-util/rocm-cmake-${PV}"
 BDEPEND="test? ( dev-cpp/gtest )"
diff --git a/sci-libs/rocRAND/rocRAND-5.0.2.ebuild b/sci-libs/rocRAND/rocRAND-5.0.2.ebuild
new file mode 100644
index 000000000000..aa2a6bdbd3ec
--- /dev/null
+++ b/sci-libs/rocRAND/rocRAND-5.0.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Generate pseudo-random and quasi-random numbers"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocRAND"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocRAND/archive/rocm-${PV}.tar.gz -> rocRAND-${PV}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="benchmark test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/hip"
+DEPEND="${RDEPEND}
+dev-util/rocm-cmake
+test? ( dev-cpp/gtest )"
+BDEPEND="dev-util/rocm-cmake
+>=dev-util/cmake-3.22"
+
+S="${WORKDIR}/rocRAND-rocm-${PV}"
+
+src_prepare() {
+	sed -r -e "s:(hip|roc)rand/lib:\${CMAKE_INSTALL_LIBDIR}:" \
+		-e "s:(hip|roc)rand/include:include/\1rand:" \
+		-e "/INSTALL_RPATH/d" -i library/CMakeLists.txt || die
+
+	# remove GIT dependency
+	sed -e "/find_package(Git/,+4d" -i cmake/Dependencies.cmake || die
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	# Compiler to use
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+		-DCMAKE_SKIP_RPATH=TRUE
+		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+	)
+
+	cmake_src_configure
+	# do not rerun cmake and the build process in src_install
+	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
+}
+
+src_test() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addwrite /dev/dri/
+	LD_LIBRARY_PATH="${BUILD_DIR}/library" cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}"/benchmark
+		dobin benchmark_rocrand_*
+	fi
+}
diff --git a/sci-libs/rocSOLVER/Manifest b/sci-libs/rocSOLVER/Manifest
index d73f88e8e7ad..e4cf7c7b6974 100644
--- a/sci-libs/rocSOLVER/Manifest
+++ b/sci-libs/rocSOLVER/Manifest
@@ -1,5 +1,8 @@
 AUX rocSOLVER-4.2.0-add-stdint-header.patch 475 BLAKE2B 268a1813d4e26dbaaa2360d0a187ce2a1448da075ae5f98a4a829c979411ab7e0c06f150ddcb445c9b295268a1e9f1770adbe7e68a1c3f84edde3c3477a57610 SHA512 ede56f9579e655ddd098ca9006612537f8ed61dc585274afe6b2b0bdee875431b62e0c6da6bc01e2cabeeb5244a91bb1e00b442bb549c075a286eefd8d9edc09
 AUX rocSOLVER-4.3.0-link-blas.patch 604 BLAKE2B 863c1807d281e219b429a58c9e9e582a346e72be6004fb3f5a818479ae02b4efd896873f7c689084eefc50c331d8734c5dbf2dcb9e9756a54ce092e5ace22da5 SHA512 413692c2a7e40cb3bb169eef078fc4caa0ebaba760f535fb27afafcc49713fae26c9ca5c82793c54d4e07ccafe43a0d7d65b7e76d0207bdd20a5581bd71216d9
+AUX rocSOLVER-5.0.2-libfmt8.patch 7493 BLAKE2B 0327f78dd94f0102a5c4aabf13cab2ec6adaec3efee82acdb24d223b56a58bece34b505b9fdb2964ffa6f3f574730c2e74110e12e198fe26bc682ea294038749 SHA512 124dd445e188475777e3dee017f7380675594717b1e58458397780dc5c32ee8221935234954554510bd169af10a3bdb4fef0674bf93030081c5c12c1f3061a13
 DIST rocSOLVER-4.3.0.tar.gz 454249 BLAKE2B 727ae416d85c5a19983257d2a0b01836013c1d69cddf3334b2c1b808b96b401db938b46b7ecf1e7faf26ff555374d1d3abed74abbe7be47110a36b44019469ee SHA512 2910e1cfad4d17a2877e2ae572d80179b84903c632652571c01bd12856c92c22e073ea1005ed9aac04244b4c502a7e0c18d96445e57658ae8eb5b320bada549b
-EBUILD rocSOLVER-4.3.0.ebuild 1932 BLAKE2B fd43a3ab1cfb130e3c0374c84a73bf3ebfa5cc15a9c71e7bc9bdd4d1d8bc637e73441a33d14a9116177c44750a92e4edb9242434194cc7a4532cd05d498f8891 SHA512 11aa4a4584cf1eb16951b8b2ffb645db7f12bf0bced58a0ce80543fb094a7a5e0feb2c486125f6b9e835e50c5318802c9cde3e2e3ee84a8ee60ead315543f181
+DIST rocSOLVER-5.0.2.tar.gz 530085 BLAKE2B f3c3594b5ee2703424da289cc0c520a589da28f9d3f4c04d81cace35a4f77f3ca79ff9a1e7139d83d7a2ae1907083aded99b5d9fbe216d81b225dc1b9fc4105b SHA512 ab349044aba0c1b6b7d0019d15f2bdf068805d2da73790f424ae90835f2d7dd4137d0a641d8edbf98fcb190989f0d0fa57dfc448a376a19e21fd62940046b3a1
+EBUILD rocSOLVER-4.3.0-r1.ebuild 1924 BLAKE2B 4d9f6af3842357336ef725b2185d329352a6f2a27bf6743b4389d21f7fc3271e41bd2f557a511004352218b2976731198ee28724a236277a64026bd44070d29a SHA512 e3ed8a7da1454a3f0f2822bbd921521a37401c84adf337f8b1379bf0fa7dc75a3947410c040ac0fcbe16684aec67bf9a5c4e3edd059e85e6e431cf99fb6e66b8
+EBUILD rocSOLVER-5.0.2.ebuild 1951 BLAKE2B 5411b70631cdfbf0415697c9731dd3756f92bbbb0d9dcd8e59d833825cf5a5ea7b7754eb5de5751b9be6012aaafb9cd01d2ebaac12bf4de4a51b8b1e17dcef18 SHA512 2448e3df2d168f569229031699217507bc6f040d285af6ddf0c88b518c134f76ee5f2799baf73ba1646c3d104d915dafca4e045b48359de3ea2bcbe3b968d5a5
 MISC metadata.xml 662 BLAKE2B 6dc116ac630fbd30c5f6c18d716bcd12bc994bfa0b2aea4eacf65e31507c24bb1eeed55942ee8e0b5bed8e361d28950d433c13136771673308dbf96906e270c9 SHA512 cc5cc6401303169dd423234615b748b38a58191b058befe0f40e8b8996fe50b3554b99a14f2f63c3596227aab43558f23c64ddce88172157366cc78d4aeefb56
diff --git a/sci-libs/rocSOLVER/files/rocSOLVER-5.0.2-libfmt8.patch b/sci-libs/rocSOLVER/files/rocSOLVER-5.0.2-libfmt8.patch
new file mode 100644
index 000000000000..3f2c0553689b
--- /dev/null
+++ b/sci-libs/rocSOLVER/files/rocSOLVER-5.0.2-libfmt8.patch
@@ -0,0 +1,173 @@
+Backported from upstream to fix dev-cpp/libfmt-8 compatibility
+
+remove changes of CHANGELOG.md from original git commit
+
+From 2bbfb8976f6e4d667499c77e41a6433850063e88 Mon Sep 17 00:00:00 2001
+From: Cory Bloor <Cordell.Bloor@amd.com>
+Date: Tue, 8 Feb 2022 23:53:57 -0700
+Subject: [PATCH] Fix compatibility with fmt v8.1 (#371)
+
+* Make rocsolver_logvalue fmt specializations const
+
+This allows for compile-time format string processing in fmt v8.0.
+
+* Fix compatibility with fmt v7.1
+
+* Update CHANGELOG.md
+---
+ CHANGELOG.md                               |  2 ++
+ library/src/include/rocsolver_logvalue.hpp | 38 +++++++++++++---------
+ 2 files changed, 25 insertions(+), 15 deletions(-)
+
+diff --git a/library/src/include/rocsolver_logvalue.hpp b/library/src/include/rocsolver_logvalue.hpp
+index 199f8d57d..9b3791031 100644
+--- a/library/src/include/rocsolver_logvalue.hpp
++++ b/library/src/include/rocsolver_logvalue.hpp
+@@ -1,5 +1,5 @@
+ /* ************************************************************************
+- * Copyright (c) 2021 Advanced Micro Devices, Inc.
++ * Copyright (c) 2021-2022 Advanced Micro Devices, Inc.
+  * ************************************************************************ */
+ 
+ #pragma once
+@@ -8,6 +8,14 @@
+ 
+ #include "rocsolver_datatype2string.hpp"
+ 
++/* The format function for user-defined types cannot be const before fmt v8.0
++   but must be const in fmt v8.1 if the type is used in a tuple. */
++#if FMT_VERSION < 80000
++#define ROCSOLVER_FMT_CONST
++#else
++#define ROCSOLVER_FMT_CONST const
++#endif
++
+ /***************************************************************************
+  * Wrapper for types passed to logger, so we can more easily adjust the
+  * default way of printing built-in types without doing it globally. (e.g.
+@@ -37,7 +45,7 @@ template <typename T>
+ struct formatter<rocsolver_logvalue<T>> : formatter<T>
+ {
+     template <typename FormatCtx>
+-    auto format(rocsolver_logvalue<T> wrapper, FormatCtx& ctx)
++    auto format(rocsolver_logvalue<T> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
+     {
+         return formatter<T>::format(wrapper.value, ctx);
+     }
+@@ -49,7 +57,7 @@ template <>
+ struct formatter<rocsolver_logvalue<bool>> : formatter<char>
+ {
+     template <typename FormatCtx>
+-    auto format(rocsolver_logvalue<bool> wrapper, FormatCtx& ctx)
++    auto format(rocsolver_logvalue<bool> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
+     {
+         return formatter<char>::format(wrapper.value ? '1' : '0', ctx);
+     }
+@@ -58,7 +66,7 @@ template <>
+ struct formatter<rocsolver_logvalue<rocblas_operation>> : formatter<char>
+ {
+     template <typename FormatCtx>
+-    auto format(rocsolver_logvalue<rocblas_operation> wrapper, FormatCtx& ctx)
++    auto format(rocsolver_logvalue<rocblas_operation> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
+     {
+         return formatter<char>::format(rocblas2char_operation(wrapper.value), ctx);
+     }
+@@ -67,7 +75,7 @@ template <>
+ struct formatter<rocsolver_logvalue<rocblas_fill>> : formatter<char>
+ {
+     template <typename FormatCtx>
+-    auto format(rocsolver_logvalue<rocblas_fill> wrapper, FormatCtx& ctx)
++    auto format(rocsolver_logvalue<rocblas_fill> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
+     {
+         return formatter<char>::format(rocblas2char_fill(wrapper.value), ctx);
+     }
+@@ -76,7 +84,7 @@ template <>
+ struct formatter<rocsolver_logvalue<rocblas_diagonal>> : formatter<char>
+ {
+     template <typename FormatCtx>
+-    auto format(rocsolver_logvalue<rocblas_diagonal> wrapper, FormatCtx& ctx)
++    auto format(rocsolver_logvalue<rocblas_diagonal> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
+     {
+         return formatter<char>::format(rocblas2char_diagonal(wrapper.value), ctx);
+     }
+@@ -85,7 +93,7 @@ template <>
+ struct formatter<rocsolver_logvalue<rocblas_side>> : formatter<char>
+ {
+     template <typename FormatCtx>
+-    auto format(rocsolver_logvalue<rocblas_side> wrapper, FormatCtx& ctx)
++    auto format(rocsolver_logvalue<rocblas_side> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
+     {
+         return formatter<char>::format(rocblas2char_side(wrapper.value), ctx);
+     }
+@@ -94,7 +102,7 @@ template <>
+ struct formatter<rocsolver_logvalue<rocblas_direct>> : formatter<char>
+ {
+     template <typename FormatCtx>
+-    auto format(rocsolver_logvalue<rocblas_direct> wrapper, FormatCtx& ctx)
++    auto format(rocsolver_logvalue<rocblas_direct> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
+     {
+         return formatter<char>::format(rocblas2char_direct(wrapper.value), ctx);
+     }
+@@ -104,7 +112,7 @@ template <>
+ struct formatter<rocsolver_logvalue<rocblas_storev>> : formatter<char>
+ {
+     template <typename FormatCtx>
+-    auto format(rocsolver_logvalue<rocblas_storev> wrapper, FormatCtx& ctx)
++    auto format(rocsolver_logvalue<rocblas_storev> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
+     {
+         return formatter<char>::format(rocblas2char_storev(wrapper.value), ctx);
+     }
+@@ -113,7 +121,7 @@ template <>
+ struct formatter<rocsolver_logvalue<rocblas_workmode>> : formatter<char>
+ {
+     template <typename FormatCtx>
+-    auto format(rocsolver_logvalue<rocblas_workmode> wrapper, FormatCtx& ctx)
++    auto format(rocsolver_logvalue<rocblas_workmode> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
+     {
+         return formatter<char>::format(rocblas2char_workmode(wrapper.value), ctx);
+     }
+@@ -122,7 +130,7 @@ template <>
+ struct formatter<rocsolver_logvalue<rocblas_svect>> : formatter<char>
+ {
+     template <typename FormatCtx>
+-    auto format(rocsolver_logvalue<rocblas_svect> wrapper, FormatCtx& ctx)
++    auto format(rocsolver_logvalue<rocblas_svect> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
+     {
+         return formatter<char>::format(rocblas2char_svect(wrapper.value), ctx);
+     }
+@@ -131,7 +139,7 @@ template <>
+ struct formatter<rocsolver_logvalue<rocblas_evect>> : formatter<char>
+ {
+     template <typename FormatCtx>
+-    auto format(rocsolver_logvalue<rocblas_evect> wrapper, FormatCtx& ctx)
++    auto format(rocsolver_logvalue<rocblas_evect> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
+     {
+         return formatter<char>::format(rocblas2char_evect(wrapper.value), ctx);
+     }
+@@ -140,7 +148,7 @@ template <>
+ struct formatter<rocsolver_logvalue<rocblas_eform>> : formatter<char>
+ {
+     template <typename FormatCtx>
+-    auto format(rocsolver_logvalue<rocblas_eform> wrapper, FormatCtx& ctx)
++    auto format(rocsolver_logvalue<rocblas_eform> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
+     {
+         return formatter<char>::format(rocblas2char_eform(wrapper.value), ctx);
+     }
+@@ -149,7 +157,7 @@ template <>
+ struct formatter<rocsolver_logvalue<rocblas_datatype>> : formatter<string_view>
+ {
+     template <typename FormatCtx>
+-    auto format(rocsolver_logvalue<rocblas_datatype> wrapper, FormatCtx& ctx)
++    auto format(rocsolver_logvalue<rocblas_datatype> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
+     {
+         return formatter<string_view>::format(rocblas2string_datatype(wrapper.value), ctx);
+     }
+@@ -158,7 +166,7 @@ template <>
+ struct formatter<rocsolver_logvalue<rocblas_initialization>> : formatter<string_view>
+ {
+     template <typename FormatCtx>
+-    auto format(rocsolver_logvalue<rocblas_initialization> wrapper, FormatCtx& ctx)
++    auto format(rocsolver_logvalue<rocblas_initialization> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
+     {
+         return formatter<string_view>::format(rocblas2string_initialization(wrapper.value), ctx);
+     }
diff --git a/sci-libs/rocSOLVER/rocSOLVER-4.3.0.ebuild b/sci-libs/rocSOLVER/rocSOLVER-4.3.0-r1.ebuild
index c017b7ad31a0..6287d7b096d5 100644
--- a/sci-libs/rocSOLVER/rocSOLVER-4.3.0.ebuild
+++ b/sci-libs/rocSOLVER/rocSOLVER-4.3.0-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0/$(ver_cut 1-2)"
 
 IUSE="test benchmark"
 
-RDEPEND="dev-util/hip:${SLOT}
+RDEPEND="dev-util/hip
 	sci-libs/rocBLAS:${SLOT}
 	benchmark? ( virtual/blas )"
 DEPEND="${RDEPEND}"
diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.0.2.ebuild b/sci-libs/rocSOLVER/rocSOLVER-5.0.2.ebuild
new file mode 100644
index 000000000000..3a09969c0867
--- /dev/null
+++ b/sci-libs/rocSOLVER/rocSOLVER-5.0.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Implementation of a subset of LAPACK functionality on the ROCm platform"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSOLVER"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocSOLVER/archive/rocm-${PV}.tar.gz -> rocSOLVER-${PV}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+
+IUSE="test benchmark"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocBLAS:${SLOT}
+	>=dev-libs/libfmt-8
+	benchmark? ( virtual/blas )"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-cpp/gtest
+	>=dev-util/cmake-3.22
+	virtual/blas )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-add-stdint-header.patch"
+	"${FILESDIR}/${P}-libfmt8.patch"
+)
+
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${PN}-rocm-${PV}
+
+src_prepare() {
+	sed -e "s: PREFIX rocsolver:# PREFIX rocsolver:" -i library/src/CMakeLists.txt
+	sed -e "s:\$<INSTALL_INTERFACE\:include>:\$<INSTALL_INTERFACE\:include/rocsolver>:" -i library/src/CMakeLists.txt
+	sed -e "s:rocm_install_symlink_subdir( rocsolver ):#rocm_install_symlink_subdir( rocsolver ):" -i library/src/CMakeLists.txt
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-Wno-dev
+		-DCMAKE_SKIP_RPATH=ON
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/rocsolver"
+		-DBUILD_CLIENTS_SAMPLES=NO
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
+		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+	)
+
+	CXX="hipcc" cmake_src_configure
+}
+
+src_test() {
+	addwrite /dev/kfd
+	addwrite /dev/dri/
+	cd "${BUILD_DIR}/clients/staging" || die
+	LD_LIBRARY_PATH="${BUILD_DIR}/library/src" ./rocsolver-test || die
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}" || die
+		dobin clients/staging/rocsolver-bench
+	fi
+}
diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest
index 80428255e333..f14ced4683ec 100644
--- a/sci-libs/rocSPARSE/Manifest
+++ b/sci-libs/rocSPARSE/Manifest
@@ -1,6 +1,9 @@
 AUX rocSPARSE-4.3.0-remove-matrices-unpacking.patch 933 BLAKE2B 03e9ded8e313352dcdb181351fb4decc1c1e6d7e2e8019b7624c0d3273182f1ba7b296fdfa862e8be8d13d023561a8febb5b982e4a8b16dc8fc1af3f508d2196 SHA512 1b63b4e2b930b4cde29c41ec9f2a5c6f5f4b8291ba7aa6a5a714a2fbfd2b7978c5cd6b3f4a5f5c63da6765e0696efadc54942096a0a985f1d3cc668477c44969
+AUX rocSPARSE-5.0.2-enable-gfx1031.patch 645 BLAKE2B 4e20882057d1f8687f47831cc8945b787606b6f6d1d676ba5e5e12d8ff61e1c22711da57b50d988d44b2962c6001d270ebe2ffcb751901a6eb64635e553a7cd9 SHA512 24fbfed3cafdf00c7e13d25136427b30c573191e32830431f7185fd9a2f537c110f83f4e6f8603f3c17381d316f13c3b626eeaa9331f9035e7bc9b34d0c7c70e
+AUX rocSPARSE-5.0.2-remove-matrices-unpacking.patch 1205 BLAKE2B 0d903453692025f6f239c8b5d2f11dd6f9dfe5c09a63395898920326e0dbd6aeff37fdf2dde8e89ea1cbdc60252ab87b7ef020b56a726853d2f7261addcf00c8 SHA512 52ec3913f89f7886d6b8fb9ef54ca313c64e4c9d374507a0d89a8c7cf846e8f8f6b8a4ad266b23015869a79d2eaadb75c5540ca53e40163cb0fbdc2b1819e645
 DIST rocSPARSE-4.0.0.tar.gz 587761 BLAKE2B 25f9f0183c06b574505fe6e9011b32ea4fbe48c0a1883b8991baf45b8a2238312f352e614c0069531c986e548453b6e7b7a77f883dffea82ed41df488964b55d SHA512 4a4acf24a789ea58b53a8d06ea528a6aed8eabac21a7a3cd73011e9b31d03dceb488cc72f29c5513205f2b538d24e9dbaccda1a932bcc466cd04a65606a77b3b
 DIST rocSPARSE-4.3.0.tar.gz 809183 BLAKE2B 06a83d98572927f0f2c65f4f36194394b66a02a5ce9d3e21da04c53e9ad97809daffe02a35691aa52466f7dfb4d4a8c645b87e1e4da579de7f91323df3a41d59 SHA512 e3ee5a15d36c3002ee60aabd94c7f47b0cb9f0b5a33cefa9061df9f04b1fcc3c1503e4f01e2f36c07477179c6753827b505e9b512e8b5bfca00f76e3efd99c1d
+DIST rocSPARSE-5.0.2.tar.gz 855762 BLAKE2B dc1e84157f1eecd6bedd6620147e4f88341b94cb0f1507a6264af40c891541ef3e81a8a429b3160dac1606a855a566abbff98e458f581f5f60de31d5751682ef SHA512 4f985c0784246616dd1b3e4fd669033296e45b1f8faa1ab25143e2f085b9bf6556a495de23e9463c2ae45d6038c1cff01d18930c9762d53975e15d4d2d5d4d0a
 DIST rocSPARSE_ASIC_320k.tar.gz 11301444 BLAKE2B a00cc4a3ededab3fb56339319e34e936645ddce2dee3c630153b37e337384c207b0a2829227fb7f4c2db1fe33383e97410ab7ad459d391c025f5410843d51cf2 SHA512 1db3af391c30a371c1ac0087436e266721474273a39d5b2b6d56408d950dcbbee004750e4dce4e3dbc4cb512f38f6d945676d7f29b62c52fd5a7fed0fe789e03
 DIST rocSPARSE_Chebyshev4.tar.gz 50165660 BLAKE2B f1a95554c8f38937f501488fabfd406b773eb980d7463cadac0de162529ac2f834c655cadd2b65f4c42a8487bc2d67c749601ae33bd789051f9e4d1e157196a0 SHA512 fdec4947a4af923d28b4be8d23690fd6d356c58f8344a5dcdd2e3fa61769d83e47a84d65316b527e6e82d9f988de2675a852367d406e44b44d784137a90b95c0
 DIST rocSPARSE_Chevron2.tar.gz 3210636 BLAKE2B 919bc19931cbcb32c09e6b623c9d3890400895dfd65e83845d351a8e3dd8b30ef43374c3c0ca3ee9708c81b5fb8886f1a4adbea6086495f08f9498f19a2279d5 SHA512 22b71deddec4f1af5b239d4065089230cf70e521102803a77ab3f16b34a0d69534817e54d81dfa7f8d1f299932c0f0424237baeb3d8289bcfffa4b902b00e256
@@ -26,5 +29,6 @@ DIST rocSPARSE_shipsec1.tar.gz 22175245 BLAKE2B f1d34482b8c3d3ee48033097d7d6f9b6
 DIST rocSPARSE_sme3Dc.tar.gz 42483568 BLAKE2B f0d16b58f6ea28e67727637697a812a0b10d524c73aeb82f702411b9ebaea3670780e762ed0701aae80c6829e950233f74555523ef2d6c5740b007c7a65c03d4 SHA512 c5a0be2db919a45310a73ea1dd96d0d30168135f887a8c5c3d7ca11e2c3d12ea7d1331be20968d0135bd18da4ef2b043db68eeb7567b6f0f8daf782b87083c3a
 DIST rocSPARSE_webbase-1M.tar.gz 11360460 BLAKE2B 01b1d06adb5fb32fa402ed888d25a7e52a34779b078fc2e21c60e688d03579bb4ca8694f5ee4a824f7859952d55590a1fd9449dc80d6fe894d7b662b918882d4 SHA512 6401a965b8f6dd5392879956fde3c94f77fe1801a4a43428c03b6d639031575c647eab47b1babe53f4ecc2c3b8fc183e8339536b78dcd0d94ce62bfedd87c161
 EBUILD rocSPARSE-4.0.0-r1.ebuild 1166 BLAKE2B fc45fdaaf8d5f20afcc0d477eac01d30100a3ac3355ddae786ee934f46ef55b4f6ac3b284875fc905f75452cbfbb655ad4cfb9f916905e1a6091e8b97a14f141 SHA512 221e3aea6c45e7d7a6edc3b96db32ed9d2deb040f1f4cafa9cbb139a146aa7500d4619e6e8db39683fed9c0bc34053dc8ede22525340457c1774f6ea90297a98
-EBUILD rocSPARSE-4.3.0-r2.ebuild 4922 BLAKE2B dff11f74e26d9f73f44fcb3687e621d7b5f833e20493473350d1dcca4e70af1d3137ac09c03c4d7cda890c0c20a4b0b78068812f6b7879e67463a1880a4471cd SHA512 b65c660c562d831ede3ac4ebf5dfbe968ebc72156020a54861a23ae8fff52125785bf4c3fea3dd0db4d0b968ecf0e68f9d16be6fb38c560ca2056a4e244ea2f9
+EBUILD rocSPARSE-4.3.0-r3.ebuild 4914 BLAKE2B b61c7bca88d7d063d1d0aa80e9cc7340b5d3f7d58361cfd62f9fe6817086a770cf301db4585acf72ee27e773c8a7a6eb0ad2a0565eb2cd272ab852ed4f50fca0 SHA512 d17bc9537d1c3badf56103849009685cad7459891f5f5747a3fde6e708ee609aeb2bf63d9209d5a9b8bc291b1443c0a0c4dddcfb8cad0c19b82c86c23c4757ab
+EBUILD rocSPARSE-5.0.2.ebuild 4962 BLAKE2B 01aec045e48dffd6cf959a491da5a434f6ef792e9a0ae8cb1956227ef9fa28bc66a32d47d91bd82f219584b3dbbdf02ff9783649217ea8f9f1beab69a362454b SHA512 293f195844c0e99e3bfb86a20728301a2ef0d5673bc6cf2b7c6c163292760f5045fb3ad17fe5ff2d7b89f1c36967d2113b929f0746bb8d2f41f54094432f20c7
 MISC metadata.xml 695 BLAKE2B db1c67ff216cd9c9a972c9b388f85f6e762e0a7bddffca1336219ce6ebe39f6a841da4c8c78084d91f48a5bb6a26ad0047a2a1a60915da5110b3a41977f3b641 SHA512 2f246ec382d78e414a00aedcd7a2c871ccf5b74d25d160a0f7d6012feb51c6c12861b5152cac32d3e46d0d1acea7e8b10f42f4b501abb9d778cd3c886331f59c
diff --git a/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-enable-gfx1031.patch b/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-enable-gfx1031.patch
new file mode 100644
index 000000000000..fd44bb938406
--- /dev/null
+++ b/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-enable-gfx1031.patch
@@ -0,0 +1,13 @@
+Index: rocSPARSE-rocm-5.0.2/library/src/include/common.h
+===================================================================
+--- rocSPARSE-rocm-5.0.2.orig/library/src/include/common.h
++++ rocSPARSE-rocm-5.0.2/library/src/include/common.h
+@@ -167,7 +167,7 @@ __device__ __forceinline__ void rocspars
+     if(BLOCKSIZE >   1) { if(i <   1 && i +   1 < BLOCKSIZE) { data[i] = min(data[i], data[i +   1]); } __syncthreads(); }
+ }
+ 
+-#ifndef __gfx1030__
++#if !defined(__gfx1030__) && !defined(__gfx1031__)
+ // DPP-based wavefront reduction maximum
+ template <unsigned int WFSIZE>
+ __device__ __forceinline__ void rocsparse_wfreduce_max(int* maximum)
diff --git a/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-matrices-unpacking.patch b/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-matrices-unpacking.patch
new file mode 100644
index 000000000000..81d2b4ab1458
--- /dev/null
+++ b/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-matrices-unpacking.patch
@@ -0,0 +1,42 @@
+Don't let cmake handle test data download, unpack and convert
+
+Index: rocSPARSE-rocm-5.0.2/clients/tests/CMakeLists.txt
+===================================================================
+--- rocSPARSE-rocm-5.0.2.orig/clients/tests/CMakeLists.txt
++++ rocSPARSE-rocm-5.0.2/clients/tests/CMakeLists.txt
+@@ -23,35 +23,6 @@
+ 
+ find_package(GTest 1.10.0 REQUIRED)
+ 
+-#
+-# Client matrices.
+-#
+-
+-if(NOT EXISTS "${CMAKE_MATRICES_DIR}")
+-  #
+-  # Download.
+-  #
+-  set(CMAKE_MATRICES_DIR ${PROJECT_BINARY_DIR}/matrices CACHE STRING "Matrices directory.")
+-
+-  if(NOT TARGET rocsparse)
+-    set(CONVERT_SOURCE ${CMAKE_SOURCE_DIR}/../deps/convert.cpp CACHE STRING "Convert tool mtx2csr.")
+-    include(${CMAKE_SOURCE_DIR}/../cmake/ClientMatrices.cmake)
+-  else()
+-   set(CONVERT_SOURCE ${CMAKE_SOURCE_DIR}/deps/convert.cpp CACHE STRING "Convert tool mtx2csr.")
+-    include(${CMAKE_SOURCE_DIR}/cmake/ClientMatrices.cmake)
+-  endif()
+-
+-else()
+-
+-  #
+-  # Copy.
+-  #
+-  if(NOT CMAKE_MATRICES_DIR STREQUAL "${PROJECT_BINARY_DIR}/matrices")
+-    execute_process(COMMAND cp -r ${CMAKE_MATRICES_DIR} ${PROJECT_BINARY_DIR}/matrices)
+-  endif()
+-
+-endif()
+-
+ set(ROCSPARSE_TEST_SOURCES
+   test_axpby.cpp
+   test_axpyi.cpp
diff --git a/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r2.ebuild b/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r3.ebuild
index 208d02f6cc3d..f32d34643e14 100644
--- a/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r2.ebuild
+++ b/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r3.ebuild
@@ -43,7 +43,7 @@ KEYWORDS="~amd64"
 IUSE="benchmark test"
 SLOT="0/$(ver_cut 1-2)"
 
-RDEPEND="dev-util/hip:${SLOT}
+RDEPEND="dev-util/hip
 	sci-libs/rocPRIM:${SLOT}"
 DEPEND="${RDEPEND}"
 BDEPEND="test? (
diff --git a/sci-libs/rocSPARSE/rocSPARSE-5.0.2.ebuild b/sci-libs/rocSPARSE/rocSPARSE-5.0.2.ebuild
new file mode 100644
index 000000000000..4203ba70e4de
--- /dev/null
+++ b/sci-libs/rocSPARSE/rocSPARSE-5.0.2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-any-r1 toolchain-funcs
+
+DESCRIPTION="Basic Linear Algebra Subroutines for sparse computation"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSPARSE"
+
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-${PV}.tar.gz -> rocSPARSE-${PV}.tar.gz
+test? (
+https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> ${PN}_amazon0312.tar.gz
+https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> ${PN}_Chebyshev4.tar.gz
+https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> ${PN}_sme3Dc.tar.gz
+https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> ${PN}_webbase-1M.tar.gz
+https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> ${PN}_rma10.tar.gz
+https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> ${PN}_bibd_22_8.tar.gz
+https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> ${PN}_mac_econ_fwd500.tar.gz
+https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> ${PN}_mc2depi.tar.gz
+https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> ${PN}_scircuit.tar.gz
+https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> ${PN}_ASIC_320k.tar.gz
+https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> ${PN}_bmwcra_1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> ${PN}_nos1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> ${PN}_nos2.tar.gz
+https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> ${PN}_nos3.tar.gz
+https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> ${PN}_nos4.tar.gz
+https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> ${PN}_nos5.tar.gz
+https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> ${PN}_nos6.tar.gz
+https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> ${PN}_nos7.tar.gz
+https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> ${PN}_shipsec1.tar.gz
+https://sparse.tamu.edu/MM/Cote/mplate.tar.gz -> ${PN}_mplate.tar.gz
+https://sparse.tamu.edu/MM/Bai/qc2534.tar.gz -> ${PN}_qc2534.tar.gz
+https://sparse.tamu.edu/MM/Chevron/Chevron2.tar.gz -> ${PN}_Chevron2.tar.gz
+https://sparse.tamu.edu/MM/Chevron/Chevron3.tar.gz -> ${PN}_Chevron3.tar.gz
+https://sparse.tamu.edu/MM/Chevron/Chevron4.tar.gz -> ${PN}_Chevron4.tar.gz
+)"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocPRIM:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND="test? (
+	dev-cpp/gtest
+	>=dev-util/cmake-3.22
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+)
+benchmark? ( app-admin/chrpath )
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/rocSPARSE-rocm-${PV}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.0.2-remove-matrices-unpacking.patch"
+	"${FILESDIR}/${PN}-5.0.2-enable-gfx1031.patch" )
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	eapply_user
+	sed -e "s/PREFIX rocsparse//" \
+		-e "/<INSTALL_INTERFACE/s,include,include/rocsparse," \
+		-e "/rocm_install_symlink_subdir(rocsparse)/d" \
+		-e "s:rocsparse/include:include/rocsparse:" \
+		-i "${S}/library/CMakeLists.txt" || die
+
+	# remove GIT dependency
+	sed -e "/find_package(Git/d" -i cmake/Dependencies.cmake || die
+
+	# use python interpreter specifyied by python-any-r1
+	sed -e "/COMMAND ..\/common\/rocsparse_gentest.py/s,COMMAND ,COMMAND ${EPYTHON} ," -i clients/tests/CMakeLists.txt || die
+
+	# Test need download data from https://sparse.tamu.edu (or other mirror site), check MD5, unpack and convert them into csr format
+	# This process is handled default by ${S}/cmake/ClientMatrices.cmake, but should be the responsibility of portage.
+	if use test; then
+		mkdir -p "${BUILD_DIR}"/clients/matrices
+		# compile and use the mtx2csr converter. Do not use any optimization flags, because it causes error!
+		ebegin "$(tc-getCXX) deps/convert.cpp -o deps/convert"
+		$(tc-getCXX) deps/convert.cpp -o deps/convert
+		eend $?
+		find "${WORKDIR}" -maxdepth 2 -regextype egrep -regex ".*/(.*)/\1\.mtx" -print0 |
+			while IFS= read -r -d '' mtxfile; do
+				destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).csr
+				ebegin "Converting ${mtxfile} to ${destination}"
+				deps/convert ${mtxfile} ${destination}
+				eend $?
+			done
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device to omit a sandbox violation
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	# Compiler to use
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DCMAKE_INSTALL_INCLUDEDIR="include/rocsparse"
+		-DCMAKE_SKIP_RPATH="ON"
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
+		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	addwrite /dev/kfd
+	addwrite /dev/dri/
+	cd "${BUILD_DIR}/clients/staging" || die
+	./rocsparse-test || die
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		local rocsparse_bench="${BUILD_DIR}/clients/staging/rocsparse-bench"
+		chrpath -d "${rocsparse_bench}" || die
+		dobin "${rocsparse_bench}"
+	fi
+}
diff --git a/sci-libs/rocThrust/Manifest b/sci-libs/rocThrust/Manifest
index 135c25d12f73..f929f866144d 100644
--- a/sci-libs/rocThrust/Manifest
+++ b/sci-libs/rocThrust/Manifest
@@ -2,7 +2,8 @@ AUX rocThrust-4.0-operator_new.patch 1699 BLAKE2B 1f8e4eb035768acd424cc2bae173c2
 AUX rocThrust-4.3.0-deprecate-hcc_detail.patch 492 BLAKE2B cde3fb2210e482f6b76e2d38375141b11998c05101518dbc5d75c34da3343dae6448c88cb27e5d67b23cd986f712651f9cc8fe7632b8440bc171385ed1da6de2 SHA512 5f2783ae20d4870860c812b3b996ef6b7aeb7f45bfba5482b80eba3acb9347fd3bf63e8acae21a69f700721371eb1f3a115a0f59a5f93941fe3af8990d2f9ca9
 DIST rocThrust-4.0.0.tar.gz 1166346 BLAKE2B 02c89e0c4ab2c888a20b7c956a73012157f2735e6ec76369a1f75fbc17bb3f995d1914106ec58562f28243fbe5f019ac230ac3313b6aacb4d8b868f3ac1f091e SHA512 476aa5706487c5801cc91908806a1a1fcb550171f63e0b2debd9b59b18c7435c484578ec456ccfabc140dd7bca7d9bb432a7ba223946b1fca22e72e7d053af2d
 DIST rocThrust-4.3.0.tar.gz 1156832 BLAKE2B a462cfaa31883253fabba584ca77622cc5a7234bd9979472a84ec77b91c60f48f1064149b86d624aaedd70262fb65fb6aadb03cc6e00939d4eed6cd11bfc0090 SHA512 8c6aa3aefd59c87cc8278930bf90021867f519c356c86a3c3ebfcdf90887b8631250b6a9a8156f77c0cbf7ddbad7881e5e1b802f1cd1305cc3a2e7d95ef4e6f3
+DIST rocThrust-5.0.2.tar.gz 1183550 BLAKE2B 88021266dc9ffcb8f5e803acfe767c52aaa04b2348d0dcb204eb74bdf44ed26eb6d98f8d85324b90fe73228b52a0ad22686b87274c868ef19ec8ded825b58ea9 SHA512 3599b9498db392d480c08873d9e84ff1c05e5417e14e43e56f190fe4490873fec37c944a3c252942d6275a4fa4af85c82d39b62b0fdb5daa82023a2df8a3228f
 EBUILD rocThrust-4.0.0-r1.ebuild 1244 BLAKE2B 4f8019ccf296a915a305a405d3e80d2de348ac7717782671b76306882872a6e356bdbdb63316094ce8ccc8410fced42db56423b4d96f8d690ec6838d3721612e SHA512 40671932493ab5a2a2597a4181d03c666a9272ed881d053ecc8d8285aa8a5b68b9527b4fa0e29b6acff3f31fdfafd9cc060b9e098b16a12a7370eaa37542f5de
-EBUILD rocThrust-4.3.0-r1.ebuild 2062 BLAKE2B 15a1efc0555989c16108f62d6c6c689fac172101565e771f32c36c5765a10105a7fd78cb90098e3746928b35271e3652b1a6880f451f087dc731950e237de40d SHA512 476c3cedfb959ff5764aa2893810ed9a09db58c172cc36ae91f215a35efb13354f3a363be6bd2ac1d5987739028930ce9d4ba73e36699973b7c413215462f713
-EBUILD rocThrust-4.3.0.ebuild 2082 BLAKE2B 414354d8137a09e987b908bc901d404c0025cdd77df7753a602a04b14391637f9c04cb831f0819f61b53b01e12ad01e883547fb7135034dee57a4cd22980b444 SHA512 77fbb475bceb103df10f6dfe50fc74631337fb6e72473edb7a3db03f98ce5f1f66458a501cde22f6c79232107b810a0496323166fd11814e4ee4b694f8206a4d
+EBUILD rocThrust-4.3.0-r2.ebuild 1992 BLAKE2B 67a34d8a87ede7599a72217dbcb97541dc498ca1523569b275e3f2673f2ce0236affe9ef33e04c5c37565f0a875222540c9269bea202fb4f58c14b9791f71cad SHA512 b183e41584615b0ee97ee1ec8401f83d3f229abec959e948e50b06b1b5b4449b8af1ed709ab1e1d402f62af1c2dbd42dd0bfaf3c0bf94bdebe251e7c91aa159f
+EBUILD rocThrust-5.0.2.ebuild 1953 BLAKE2B 90a7a87091b47fc790d3c90138bfd97044c4529b59ccbde5fccfb89d88d33acacea99ab5c8910ffd8ade670a1da2aa4b851a19f8dffeed7b139c03d40dee07b7 SHA512 b24a9ab688a4dab197dd9666f39f16e1e3ab498f10789563b6fe983691d7106785992fb0db6577f8336f4e150b957a79d20f368a44844ab2895c2df827b53282
 MISC metadata.xml 656 BLAKE2B cdcee7af9e0c2f8e0553cc0d41ea208dbaa27aae0847f90b048e4c8791a9be511a84c7fb5ba8dc4c0409266d5a8a855fd4ebf578ad55c5882a000fbb4c5b05c0 SHA512 adefa0bbe1487a7c29a3b175c8d27e694c5464b0f7a3f20afcfd07952ef95cb54a789f7ae174053493d893338f52cf175f4b1939b998e850b62a7fd435dc592a
diff --git a/sci-libs/rocThrust/rocThrust-4.3.0-r1.ebuild b/sci-libs/rocThrust/rocThrust-4.3.0-r2.ebuild
index fc6045bf31f2..ff4a85ba172d 100644
--- a/sci-libs/rocThrust/rocThrust-4.3.0-r1.ebuild
+++ b/sci-libs/rocThrust/rocThrust-4.3.0-r2.ebuild
@@ -16,9 +16,11 @@ IUSE="benchmark test"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-util/hip:${SLOT}
+RDEPEND="dev-util/hip
 	sci-libs/rocPRIM:${SLOT}"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+BDEPEND=">=dev-util/cmake-3.22"
 
 S="${WORKDIR}/rocThrust-rocm-${PV}"
 
@@ -56,7 +58,6 @@ src_configure() {
 		-DBUILD_TEST=$(usex test ON OFF)
 		-DBUILD_BENCHMARKS=$(usex benchmark ON OFF)
 		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
-		-D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue caused by officialy support programming language "HIP"
 	)
 
 	cmake_src_configure
diff --git a/sci-libs/rocThrust/rocThrust-4.3.0.ebuild b/sci-libs/rocThrust/rocThrust-5.0.2.ebuild
index 5063cf4dbce5..8e043631657f 100644
--- a/sci-libs/rocThrust/rocThrust-4.3.0.ebuild
+++ b/sci-libs/rocThrust/rocThrust-5.0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -17,19 +17,20 @@ IUSE="benchmark test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-util/hip:${SLOT}
-	sci-libs/rocPRIM:${SLOT}"
+	sci-libs/rocPRIM:${SLOT}
+	test? ( dev-cpp/gtest )"
 DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/cmake-3.22"
 
 S="${WORKDIR}/rocThrust-rocm-${PV}"
 
-PATCHES=( "${FILESDIR}/${PN}-4.0-operator_new.patch"
-	"${FILESDIR}/${P}-deprecate-hcc_detail.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.0-operator_new.patch" )
 
 src_prepare() {
 	sed -e "/PREFIX rocthrust/d" \
-		-e "/DESTINATION/s:rocthrust/include/thrust:include/rocthrust/thrust:" \
+		-e "/DESTINATION/s:rocthrust/include/thrust:include/thrust:" \
 		-e "/rocm_install_symlink_subdir(rocthrust)/d" \
-		-e "/<INSTALL_INTERFACE/s:rocthrust/include/:include/rocthrust/:" -i thrust/CMakeLists.txt || die
+		-e "/<INSTALL_INTERFACE/s:rocthrust/include/:include/:" -i thrust/CMakeLists.txt || die
 
 	sed -e "s:\${CMAKE_INSTALL_INCLUDEDIR}:&/rocthrust:" \
 		-e "s:\${ROCM_INSTALL_LIBDIR}:\${CMAKE_INSTALL_LIBDIR}:" -i cmake/ROCMExportTargetsHeaderOnly.cmake || die
@@ -56,7 +57,6 @@ src_configure() {
 		-DBUILD_TEST=$(usex test ON OFF)
 		-DBUILD_BENCHMARKS=$(usex benchmark ON OFF)
 		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
-		-D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue caused by officialy support programming language "HIP"
 	)
 
 	cmake_src_configure
diff --git a/sci-libs/stellarsolver/Manifest b/sci-libs/stellarsolver/Manifest
index 427333217ed6..08a48cd0d453 100644
--- a/sci-libs/stellarsolver/Manifest
+++ b/sci-libs/stellarsolver/Manifest
@@ -2,5 +2,5 @@ AUX stellarsolver-2.2-fix-implicit-vasprintf-decl.patch 3269 BLAKE2B b20b91d09de
 DIST stellarsolver-1.9.tar.gz 9117560 BLAKE2B dd458399bd53a6e9de50293ebe15538275fb494d8ef63699eb1234aaee5234fdbb81fe23a28cc1d264490ea8849569293342125461d9e638111c9acb9756fbdf SHA512 a618e551ec28bd8439a495ca6f2a69b857852f0129c8e7d692315bd124b7c7a5130763775264b3f6a7394b3d0480d4f95c1605fb02e311ab6c38b4c60bc6b9e3
 DIST stellarsolver-2.2.tar.gz 10971732 BLAKE2B 019b822d9a84401dfe2d01053da14c3f0eafb8a8b67e60c4f664ad64c0ffefe72f9dc086edef6dac5950f7fd99e655a641ecf781609b8b54e50cf3c0f8a516b5 SHA512 0b200437130ea8131ade9219e1055ea4265925168cbfb5a7bdcf3836e267a1b670df43f20d4657ef64dea2c1ef2314cfc0bcb8503eb4ead3f0cc3fae3267f7bc
 EBUILD stellarsolver-1.9.ebuild 604 BLAKE2B c0fbc8549a28b289eba9965f3c968c0517861d2f4868342112cf7168eb1a971da50d060f54e5e64323eae041e71ba63b49e0e709ae305d13710c07d08390fa80 SHA512 53064dad8130d864372c5c73fc5c9995090313c3e9b08ba3cd87c4efd4c0539fc06c24ba54b1d1c5a593e5dd9a2c75297d30f9f8242075538d519371ea24a37c
-EBUILD stellarsolver-2.2.ebuild 728 BLAKE2B 104b43d93096e224b4ffd9985f3ca512fbbb78ae4f95b16ddda1bd4710280eab7cf04f38f9c1feaf9e32563b79476d8ac3785bad07121a0e82d0f9c92bef2b80 SHA512 201fe7ede6524be9f8860bae7c06753665a113a69d6e6834031911315aeae7ec2a2e6eb7fdce71069ec1adca1d2c8048765c6908f82444f705296a4e722e2bd3
+EBUILD stellarsolver-2.2.ebuild 727 BLAKE2B ba31f186567b87a571bfeb0f58a7da8c1037891cb98a991cf9f57e338d7c2eae01e55a299ef072f5bad3132ae3c5b95ef1e6fcf01763d09fa356d8ae9415144a SHA512 a2feb145f24a6d6554b9cf2d2cd1c000f546b420982c35ded7271a764400996e3009780320cc1b7e32a210caf9f3457aa67331f2879368cb566b14e309d35f21
 MISC metadata.xml 464 BLAKE2B 4d73483b37f92bd6a6a112d27c17ce7c8c0165cb3400f10c3a5ed5a65bcaa6e2e0d892d305834fc813655258173552cdef75431d9798491d0b124de1dbb6f035 SHA512 3cc978f381b4435b05712e69733336ec7e89963d4b236059c21b4bf7f08b899e617243ef5df0e27c2ef21e59197b97fcf414c1964b86b215d0c355c4f88cac77
diff --git a/sci-libs/stellarsolver/stellarsolver-2.2.ebuild b/sci-libs/stellarsolver/stellarsolver-2.2.ebuild
index 3fd2a5f94878..a4a83b616757 100644
--- a/sci-libs/stellarsolver/stellarsolver-2.2.ebuild
+++ b/sci-libs/stellarsolver/stellarsolver-2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rlancaste/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-libs/volk/Manifest b/sci-libs/volk/Manifest
index eca220f87177..a19909054b71 100644
--- a/sci-libs/volk/Manifest
+++ b/sci-libs/volk/Manifest
@@ -1,5 +1,5 @@
 DIST volk-2.4.1.tar.xz 315072 BLAKE2B 1ce1d220f9e1e9251332fb6caf7d72eaf3db85009a49434edbf6490b02ab016c4b1eb8677f0e5f446f5783615f2256710621b1806684dffeb1ff441756e4a635 SHA512 7c16a5d750cdea2927c3b08dcad29e19f10932a3b7b35cb25ecc66554d7e441c95906a4746fcf62f895709aee1191f1bb91189c3509b444b6b4ba37a306f9909
 DIST volk-2.5.0.tar.xz 322280 BLAKE2B edbf0f7ffecf08e8f0d8ebbb85a9bc943286c5d022442d0d7e480be4ecbd696a8b2e87e4d16d7133467b429e4894a1d166c534b5a05630cb313906aed8476cfe SHA512 94e5af925d6b6e157445ca80c2ba47a92f5ee681716d2a70a5519caa30a603b3f31a9f1ccbd14ef65349645b56a3f406b4aa1f354c322be60bd76d646a4850c6
 EBUILD volk-2.4.1.ebuild 1000 BLAKE2B 035d863124b1f4d1d471bcb5161edd7b42dd46c798a235110c1c0a43106b2d584d7b58d0889ec49d6e4dda778b94ba4d65a8c97f2915ed05907a0eab08bd2948 SHA512 bededc12c3f7729c94fcbd9eb3f7ecbd455add08bce65d1c826cf50f89f7142e569b6c0fe18567101b95badb6b87a47d022922c90cf4b06deb9db2cc4e565991
-EBUILD volk-2.5.0.ebuild 1000 BLAKE2B 90c256a33f65be6a00ab88e42b015368fbc9a48cbf58dbdd2efc90489ddcd204b2f6fba050bbf58b68655d77d28922111b53e730828431a3b5a21d30d5626e68 SHA512 cf32793e963233baf10950d2b690bf3b4c910c5bc1ed5860fd584603ce0531515ebece9ed6ecbd147d9d28996d101b8144e8f70b8903b806d4ae7bf8efce08ea
+EBUILD volk-2.5.0.ebuild 1007 BLAKE2B 2ed84093225050ab52cb74fba21f0396a3efc7a1cfcbeb721bd7d52ebc6bed0c1894a24d683ba10c8b2d294b73990cb2b7cb1cbbbe5239dbfdea7ac4361cf464 SHA512 50708af8f620ba07aeecf837c3869216a5f1c5a9c2ae428976ce452884b5e18b5aafedeca415dcf643bf501a22d56aa74cceefdec0793cb6086176ca30022e65
 MISC metadata.xml 326 BLAKE2B add10950a24964807f5b5c4696f3852da2c19337e5db075bc1e2f9ba597812ac2b8e975b1747bf7a6a0e57420a9ea70f721d117f452c7971bb9a47765274938d SHA512 a5ce5f748eb162e852281a9a043c1bec629448da7f2f0a211f81c6671dbc10677aab06446fe9e1cd4105049ef95acbd03276d53472fbf73a8c3d608ea649787a
diff --git a/sci-libs/volk/volk-2.5.0.ebuild b/sci-libs/volk/volk-2.5.0.ebuild
index c60b99d87b2b..36244677883f 100644
--- a/sci-libs/volk/volk-2.5.0.ebuild
+++ b/sci-libs/volk/volk-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/gnuradio/volk/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
 IUSE="orc test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
author	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
committer	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
commit	752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree	330d16e6362a49cbed8875a777fe641a43376cd3 /sci-libs
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)