gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /sci-libs
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
265 files changed, 8199 insertions, 2047 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 48ed8c5827bf..cbd427d002d0 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/NNPACK/Manifest b/sci-libs/NNPACK/Manifest
new file mode 100644
index 000000000000..c1916415843d
--- /dev/null
+++ b/sci-libs/NNPACK/Manifest
@@ -0,0 +1,4 @@
+AUX NNPACK-2020.12.22-gentoo.patch 6218 BLAKE2B 1bc9d1bb20504b90d99492fd0c93324830aa84a58a59101288677ba0d622c5a50e8f6181089fef1e14d14f563824a9c42979387e6f3efbb0add3211d68f6ce6c SHA512 1a52cc158c4c6259a9f5fbd8ce40f8647a96ce7c7f67bbdcfe495647b75f6c2f5baa826390b8474f48a91ee4a043bfb2085915730f0dd32f4edd34a733b2cc13
+DIST NNPACK-2020.12.22.tar.gz 219318 BLAKE2B 6b6619c8a706ef9630f20fda1e276314b2ef7f6c9aed26836a48bdaa0ae198a86383e68b04c651f37c07d34e400bc54b5daa75b06fc18cdb0a9c55e2cb33bbe1 SHA512 f0b261e8698b412d12dd739e5d0cf71c284965ae28da735ae22814a004358ba3ecaea6cd26fa17b594c0245966b7dd2561c1e05c6cbf0592fd7b85ea0f21eb37
+EBUILD NNPACK-2020.12.22.ebuild 1033 BLAKE2B 250444919be164f899e0babc25ba2b5f3b6e6b295a87bf99efa87a8d785b849bc07f7ab5e3fa08ef0b6d620614402e3e1ae2e79b58ec03a6a8aeb28a1dccabb9 SHA512 8218fca96d4adf7bd6081a5a49c0ef369b6f97386f646297dd3fd86f3e1d1d89781abbc416706387bd2ab705fb144bf29c12b2efdb36ed0b2e88a84295c8ea57
+MISC metadata.xml 331 BLAKE2B 433021dbfc82b3a36aa6e63f719c18bf785cd23fa150cb1e546f01a138b06dbfa81b2fd1588fe33ebcf4c50731c173ce2bfc87e2ff4b7f1bb2e80a62b2cca82a SHA512 3499be333f3ed44729a9abb464cdcdcb39f01bb7da604433db73654886ff8e340e176cfbdcd95479e6805753e735f185d621186ab9e317ee99cbc0458970a10b
diff --git a/sci-libs/NNPACK/NNPACK-2020.12.22.ebuild b/sci-libs/NNPACK/NNPACK-2020.12.22.ebuild
new file mode 100644
index 000000000000..9f86918fe2b4
--- /dev/null
+++ b/sci-libs/NNPACK/NNPACK-2020.12.22.ebuild
@@ -0,0 +1,52 @@
+# Copyright 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
+
+CommitId=c07e3a0400713d546e0dea2d5466dd22ea389c73
+
+DESCRIPTION="acceleration package for neural network computations"
+HOMEPAGE="https://github.com/Maratyszcza/NNPACK/"
+SRC_URI="https://github.com/Maratyszcza/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=test
+RESTRICT="test" # consuming too much CPU
+
+RDEPEND="
+	dev-libs/pthreadpool
+	dev-libs/cpuinfo
+"
+DEPEND="${RDEPEND}
+	dev-libs/FP16
+	dev-libs/FXdiv
+	dev-libs/psimd
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? ( dev-cpp/gtest )
+	$(python_gen_any_dep '
+		dev-python/PeachPy[${PYTHON_USEDEP}]
+	')
+"
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+python_check_deps() {
+	has_version -b "dev-python/PeachPy[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DNNPACK_BUILD_TESTS=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/NNPACK/files/NNPACK-2020.12.22-gentoo.patch b/sci-libs/NNPACK/files/NNPACK-2020.12.22-gentoo.patch
new file mode 100644
index 000000000000..82064d5171c1
--- /dev/null
+++ b/sci-libs/NNPACK/files/NNPACK-2020.12.22-gentoo.patch
@@ -0,0 +1,149 @@
+--- a/CMakeLists.txt	2022-05-17 20:26:04.765047673 +0200
++++ b/CMakeLists.txt	2022-05-17 20:27:51.513583722 +0200
+@@ -123,7 +123,7 @@
+   CACHE PATH "Confu-style dependencies binary directory")
+ 
+ IF(NNPACK_BACKEND STREQUAL "x86-64")
+-  IF(NOT DEFINED PYTHON_SIX_SOURCE_DIR)
++  IF(FALSE)
+     MESSAGE(STATUS "Downloading six (Python package) to ${CONFU_DEPENDENCIES_SOURCE_DIR}/six (define PYTHON_SIX_SOURCE_DIR to avoid it)")
+     CONFIGURE_FILE(cmake/DownloadSix.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/six-download/CMakeLists.txt")
+     EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+@@ -133,7 +133,7 @@
+     SET(PYTHON_SIX_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/six" CACHE STRING "six (Python package) source directory")
+   ENDIF()
+ 
+-  IF(NOT DEFINED PYTHON_ENUM_SOURCE_DIR)
++  IF(FALSE)
+     IF(${PYTHON_VERSION_STRING} VERSION_LESS 3.4)
+       # ---[ Python < 3.4 does not natively support enums, and needs a polyfill
+       MESSAGE(STATUS "Downloading enum (Python package) to ${CONFU_DEPENDENCIES_SOURCE_DIR}/enum (define PYTHON_ENUM_SOURCE_DIR to avoid it)")
+@@ -148,7 +148,7 @@
+     ENDIF()
+   ENDIF()
+ 
+-  IF(NOT DEFINED PYTHON_PEACHPY_SOURCE_DIR)
++  IF(FALSE)
+     # ---[ PeachPy requires Opcodes for installation
+     IF(NOT DEFINED PYTHON_OPCODES_SOURCE_DIR)
+       MESSAGE(STATUS "Downloading opcodes (Python package) to ${CONFU_DEPENDENCIES_SOURCE_DIR}/opcodes (define PYTHON_OPCODES_SOURCE_DIR to avoid it)")
+@@ -177,7 +177,7 @@
+   ENDIF()
+ ENDIF()
+ 
+-IF(NOT DEFINED CPUINFO_SOURCE_DIR)
++IF(FALSE)
+   MESSAGE(STATUS "Downloading cpuinfo to ${CONFU_DEPENDENCIES_SOURCE_DIR}/cpuinfo (define CPUINFO_SOURCE_DIR to avoid it)")
+   CONFIGURE_FILE(cmake/DownloadCpuinfo.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/cpuinfo-download/CMakeLists.txt")
+   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+@@ -187,7 +187,7 @@
+   SET(CPUINFO_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/cpuinfo" CACHE STRING "cpuinfo source directory")
+ ENDIF()
+ 
+-IF(NOT DEFINED FP16_SOURCE_DIR)
++IF(FALSE)
+   MESSAGE(STATUS "Downloading FP16 to ${CONFU_DEPENDENCIES_SOURCE_DIR}/fp16 (define FP16_SOURCE_DIR to avoid it)")
+   CONFIGURE_FILE(cmake/DownloadFP16.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/fp16-download/CMakeLists.txt")
+   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+@@ -197,7 +197,7 @@
+   SET(FP16_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/fp16" CACHE STRING "FP16 source directory")
+ ENDIF()
+ 
+-IF(NOT DEFINED FXDIV_SOURCE_DIR)
++IF(FALSE)
+   MESSAGE(STATUS "Downloading FXdiv to ${CONFU_DEPENDENCIES_SOURCE_DIR}/fxdiv (define FXDIV_SOURCE_DIR to avoid it)")
+   CONFIGURE_FILE(cmake/DownloadFXdiv.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/fxdiv-download/CMakeLists.txt")
+   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+@@ -207,7 +207,7 @@
+   SET(FXDIV_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/fxdiv" CACHE STRING "FXdiv source directory")
+ ENDIF()
+ 
+-IF(NOT DEFINED PSIMD_SOURCE_DIR)
++IF(FALSE)
+   MESSAGE(STATUS "Downloading PSimd to ${CONFU_DEPENDENCIES_SOURCE_DIR}/psimd (define PSIMD_SOURCE_DIR to avoid it)")
+   CONFIGURE_FILE(cmake/DownloadPSimd.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/psimd-download/CMakeLists.txt")
+   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+@@ -217,7 +217,7 @@
+   SET(PSIMD_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/psimd" CACHE STRING "PSimd source directory")
+ ENDIF()
+ 
+-IF(NOT DEFINED PTHREADPOOL_SOURCE_DIR)
++IF(FALSE)
+   MESSAGE(STATUS "Downloading pthreadpool to ${CONFU_DEPENDENCIES_SOURCE_DIR}/pthreadpool (define PTHREADPOOL_SOURCE_DIR to avoid it)")
+   CONFIGURE_FILE(cmake/DownloadPThreadPool.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/pthreadpool-download/CMakeLists.txt")
+   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+@@ -227,7 +227,7 @@
+   SET(PTHREADPOOL_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/pthreadpool" CACHE STRING "pthreadpool source directory")
+ ENDIF()
+ 
+-IF(NNPACK_BUILD_TESTS AND NOT DEFINED GOOGLETEST_SOURCE_DIR)
++IF(FALSE)
+   MESSAGE(STATUS "Downloading Google Test to ${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest (define GOOGLETEST_SOURCE_DIR to avoid it)")
+   CONFIGURE_FILE(cmake/DownloadGoogleTest.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download/CMakeLists.txt")
+   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+@@ -496,7 +496,7 @@
+ TARGET_INCLUDE_DIRECTORIES(nnpack_reference_layers PUBLIC include)
+ 
+ # ---[ Configure cpuinfo
+-IF(NOT TARGET cpuinfo)
++IF(FALSE)
+   SET(CPUINFO_BUILD_TOOLS OFF CACHE BOOL "")
+   SET(CPUINFO_BUILD_UNIT_TESTS OFF CACHE BOOL "")
+   SET(CPUINFO_BUILD_MOCK_TESTS OFF CACHE BOOL "")
+@@ -508,7 +508,7 @@
+ TARGET_LINK_LIBRARIES(nnpack PRIVATE cpuinfo)
+ 
+ # ---[ Configure pthreadpool
+-IF(NOT TARGET pthreadpool)
++IF(FALSE)
+   SET(PTHREADPOOL_BUILD_TESTS OFF CACHE BOOL "")
+   SET(PTHREADPOOL_BUILD_BENCHMARKS OFF CACHE BOOL "")
+   ADD_SUBDIRECTORY(
+@@ -525,7 +525,7 @@
+ TARGET_LINK_LIBRARIES(nnpack_reference_layers PUBLIC pthreadpool)
+ 
+ # ---[ Configure FXdiv
+-IF(NOT TARGET fxdiv)
++IF(FALSE)
+   SET(FXDIV_BUILD_TESTS OFF CACHE BOOL "")
+   SET(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "")
+   ADD_SUBDIRECTORY(
+@@ -532,18 +532,16 @@
+     "${FXDIV_SOURCE_DIR}"
+     "${CONFU_DEPENDENCIES_BINARY_DIR}/fxdiv")
+ ENDIF()
+-TARGET_LINK_LIBRARIES(nnpack PRIVATE fxdiv)
+ 
+ # ---[ Configure psimd
+-IF(NOT TARGET psimd)
++IF(FALSE)
+   ADD_SUBDIRECTORY(
+     "${PSIMD_SOURCE_DIR}"
+     "${CONFU_DEPENDENCIES_BINARY_DIR}/psimd")
+ ENDIF()
+-TARGET_LINK_LIBRARIES(nnpack PRIVATE psimd)
+ 
+ # ---[ Configure FP16
+-IF(NOT TARGET fp16)
++IF(FALSE)
+   SET(FP16_BUILD_TESTS OFF CACHE BOOL "")
+   SET(FP16_BUILD_BENCHMARKS OFF CACHE BOOL "")
+   ADD_SUBDIRECTORY(
+@@ -550,8 +548,6 @@
+     "${FP16_SOURCE_DIR}"
+     "${CONFU_DEPENDENCIES_BINARY_DIR}/fp16")
+ ENDIF()
+-TARGET_LINK_LIBRARIES(nnpack PRIVATE fp16)
+-TARGET_LINK_LIBRARIES(nnpack_reference_layers PUBLIC fp16)
+ 
+ INSTALL(TARGETS nnpack
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+@@ -560,7 +560,7 @@
+ 
+ IF(NNPACK_BUILD_TESTS)
+   # ---[ Build google test
+-  IF(NOT TARGET gtest)
++  IF(FALSE)
+     SET(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+     ADD_SUBDIRECTORY(
+       "${GOOGLETEST_SOURCE_DIR}"
diff --git a/sci-libs/NNPACK/metadata.xml b/sci-libs/NNPACK/metadata.xml
new file mode 100644
index 000000000000..654ce634d4a8
--- /dev/null
+++ b/sci-libs/NNPACK/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Maratyszcza/NNPACK</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/QNNPACK/Manifest b/sci-libs/QNNPACK/Manifest
new file mode 100644
index 000000000000..9ca243cfcd94
--- /dev/null
+++ b/sci-libs/QNNPACK/Manifest
@@ -0,0 +1,4 @@
+AUX QNNPACK-2019.08.28-gentoo.patch 5090 BLAKE2B ced2f40a4c51e9d5ddd578ef92e5241023f11b1ac75940144362e50c7e4fd4293b2fa58e3b0bb83e793ed7120f985b34c423f63415a136666692cb000ff7d053 SHA512 1a44c83b6a90990086d10032d458945d51c20831dfa01af3620ff8300ea572afe95d7d38032b63035a292de13c7f37a971c74e94ffe3340d54df4f601f2ec58d
+DIST QNNPACK-2019.08.28.tar.gz 205600 BLAKE2B f174051cba9e3307633f0b12326a37d8fde23562d47e09d3c078350146439094ca6cb2f032cf3aa4af40e5968ee16b8847241f787f7c84ea501124e0528fb82d SHA512 437a835acfedae851a9a8572fa6eea9854dcb8bcca499bc4a2582314e44f5f199778e857932da4aecf943bea7cb2eb5b1c41d4b4ca6075bddbe0f18b2c7b9127
+EBUILD QNNPACK-2019.08.28.ebuild 907 BLAKE2B 6a7afceb21651b5c469206196011ce43c89150ceb1489722039b6e9e3c38ae129a34ca9bd7f22de52c00dd7701cb56c40da61213334959d2234af77b46ba2e0d SHA512 0daa7e7ac7600bd947ec97c889112eff2451ed631dd016b4d5c73174fafbef301abe1108d8144df5f05c0915190ba7d45c2083f75245722c0a087fd788350e51
+MISC metadata.xml 328 BLAKE2B 91d01f7ecc3a888de237de72067042fc78bf1a9fa99e8e62e32548d11cf0d3923ec837f141c53fe95c040f618a1319d601eec870de84bf35703be696a3788a87 SHA512 fae5ec89b7e7bd7cd962b6af41734da23766d3cb4f5c138e2325a43386e8c972306b4debc46404a86a218506edc3860df1d127e85684399b271dfc533cb32c66
diff --git a/sci-libs/QNNPACK/QNNPACK-2019.08.28.ebuild b/sci-libs/QNNPACK/QNNPACK-2019.08.28.ebuild
new file mode 100644
index 000000000000..11fde064e65b
--- /dev/null
+++ b/sci-libs/QNNPACK/QNNPACK-2019.08.28.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+CommitId=7d2a4e9931a82adc3814275b6219a03e24e36b4c
+
+DESCRIPTION="Quantized Neural Networks PACKage"
+HOMEPAGE="https://github.com/pytorch/QNNPACK/"
+SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+
+RDEPEND="
+	dev-libs/cpuinfo
+	dev-libs/pthreadpool
+"
+DEPEND="${RDEPEND}
+	dev-libs/FP16
+	dev-libs/FXdiv
+"
+
+BDEPEND="test? ( dev-cpp/gtest )"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( static-libs )"
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DQNNPACK_BUILD_BENCHMARKS=OFF
+		-DQNNPACK_BUILD_TESTS=$(usex test ON OFF)
+		-DQNNPACK_LIBRARY_TYPE=$(usex static-libs static shared)
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/QNNPACK/files/QNNPACK-2019.08.28-gentoo.patch b/sci-libs/QNNPACK/files/QNNPACK-2019.08.28-gentoo.patch
new file mode 100644
index 000000000000..46dbcc14f720
--- /dev/null
+++ b/sci-libs/QNNPACK/files/QNNPACK-2019.08.28-gentoo.patch
@@ -0,0 +1,130 @@
+--- a/CMakeLists.txt	2022-05-18 22:04:51.143871114 +0200
++++ b/CMakeLists.txt	2022-05-18 22:05:11.998576858 +0200
+@@ -57,7 +57,7 @@
+   SET(CLOG_SOURCE_DIR "${PROJECT_SOURCE_DIR}/deps/clog")
+ ENDIF()
+ 
+-IF(NOT DEFINED CPUINFO_SOURCE_DIR)
++IF(FALSE)
+   MESSAGE(STATUS "Downloading cpuinfo to ${CONFU_DEPENDENCIES_SOURCE_DIR}/cpuinfo (define CPUINFO_SOURCE_DIR to avoid it)")
+   CONFIGURE_FILE(cmake/DownloadCpuinfo.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/cpuinfo-download/CMakeLists.txt")
+   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+@@ -67,7 +67,7 @@
+   SET(CPUINFO_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/cpuinfo" CACHE STRING "cpuinfo source directory")
+ ENDIF()
+ 
+-IF(NOT DEFINED FP16_SOURCE_DIR)
++IF(FALSE)
+   MESSAGE(STATUS "Downloading FP16 to ${CONFU_DEPENDENCIES_SOURCE_DIR}/fp16 (define FP16_SOURCE_DIR to avoid it)")
+   CONFIGURE_FILE(cmake/DownloadFP16.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/fp16-download/CMakeLists.txt")
+   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+@@ -77,7 +77,7 @@
+   SET(FP16_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/fp16" CACHE STRING "FP16 source directory")
+ ENDIF()
+ 
+-IF(NOT DEFINED FXDIV_SOURCE_DIR)
++IF(FALSE)
+   MESSAGE(STATUS "Downloading FXdiv to ${CONFU_DEPENDENCIES_SOURCE_DIR}/fxdiv (define FXDIV_SOURCE_DIR to avoid it)")
+   CONFIGURE_FILE(cmake/DownloadFXdiv.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/fxdiv-download/CMakeLists.txt")
+   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+@@ -87,7 +87,7 @@
+   SET(FXDIV_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/fxdiv" CACHE STRING "FXdiv source directory")
+ ENDIF()
+ 
+-IF(NOT DEFINED PSIMD_SOURCE_DIR)
++IF(FALSE)
+   MESSAGE(STATUS "Downloading PSimd to ${CONFU_DEPENDENCIES_SOURCE_DIR}/psimd (define PSIMD_SOURCE_DIR to avoid it)")
+   CONFIGURE_FILE(cmake/DownloadPSimd.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/psimd-download/CMakeLists.txt")
+   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+@@ -97,7 +97,7 @@
+   SET(PSIMD_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/psimd" CACHE STRING "PSimd source directory")
+ ENDIF()
+ 
+-IF(NOT DEFINED PTHREADPOOL_SOURCE_DIR)
++IF(FALSE)
+   MESSAGE(STATUS "Downloading pthreadpool to ${CONFU_DEPENDENCIES_SOURCE_DIR}/pthreadpool (define PTHREADPOOL_SOURCE_DIR to avoid it)")
+   CONFIGURE_FILE(cmake/DownloadPThreadPool.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/pthreadpool-download/CMakeLists.txt")
+   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+@@ -107,7 +107,7 @@
+   SET(PTHREADPOOL_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/pthreadpool" CACHE STRING "pthreadpool source directory")
+ ENDIF()
+ 
+-IF(QNNPACK_BUILD_TESTS AND NOT DEFINED GOOGLETEST_SOURCE_DIR)
++IF(FALSE)
+   MESSAGE(STATUS "Downloading Google Test to ${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest (define GOOGLETEST_SOURCE_DIR to avoid it)")
+   CONFIGURE_FILE(cmake/DownloadGoogleTest.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download/CMakeLists.txt")
+   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+@@ -272,7 +272,7 @@
+ SET_TARGET_PROPERTIES(qnnpack PROPERTIES PUBLIC_HEADER include/qnnpack.h)
+ 
+ # ---[ Configure clog
+-IF(NOT TARGET clog)
++IF(FALSE)
+   SET(CLOG_BUILD_TESTS OFF CACHE BOOL "")
+   SET(CLOG_RUNTIME_TYPE "${CPUINFO_RUNTIME_TYPE}" CACHE STRING "")
+   ADD_SUBDIRECTORY(
+@@ -284,7 +284,7 @@
+ TARGET_LINK_LIBRARIES(qnnpack PRIVATE clog)
+ 
+ # ---[ Configure cpuinfo
+-IF(NOT TARGET cpuinfo)
++IF(FALSE)
+   SET(CPUINFO_BUILD_TOOLS OFF CACHE BOOL "")
+   SET(CPUINFO_BUILD_UNIT_TESTS OFF CACHE BOOL "")
+   SET(CPUINFO_BUILD_MOCK_TESTS OFF CACHE BOOL "")
+@@ -296,7 +296,7 @@
+ TARGET_LINK_LIBRARIES(qnnpack PRIVATE cpuinfo)
+ 
+ # ---[ Configure pthreadpool
+-IF(NOT TARGET pthreadpool)
++IF(FALSE)
+   SET(PTHREADPOOL_BUILD_TESTS OFF CACHE BOOL "")
+   SET(PTHREADPOOL_BUILD_BENCHMARKS OFF CACHE BOOL "")
+   ADD_SUBDIRECTORY(
+@@ -312,7 +312,7 @@
+ ENDIF()
+ 
+ # ---[ Configure FXdiv
+-IF(NOT TARGET fxdiv)
++IF(FALSE)
+   SET(FXDIV_BUILD_TESTS OFF CACHE BOOL "")
+   SET(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "")
+   ADD_SUBDIRECTORY(
+@@ -319,18 +319,16 @@
+     "${FXDIV_SOURCE_DIR}"
+     "${CONFU_DEPENDENCIES_BINARY_DIR}/fxdiv")
+ ENDIF()
+-TARGET_LINK_LIBRARIES(qnnpack PRIVATE fxdiv)
+ 
+ # ---[ Configure psimd
+-IF(NOT TARGET psimd)
++IF(FALSE)
+   ADD_SUBDIRECTORY(
+     "${PSIMD_SOURCE_DIR}"
+     "${CONFU_DEPENDENCIES_BINARY_DIR}/psimd")
+ ENDIF()
+-TARGET_LINK_LIBRARIES(qnnpack PRIVATE psimd)
+ 
+ # ---[ Configure FP16
+-IF(NOT TARGET fp16)
++IF(FALSE)
+   SET(FP16_BUILD_TESTS OFF CACHE BOOL "")
+   SET(FP16_BUILD_BENCHMARKS OFF CACHE BOOL "")
+   ADD_SUBDIRECTORY(
+@@ -337,7 +335,6 @@
+     "${FP16_SOURCE_DIR}"
+     "${CONFU_DEPENDENCIES_BINARY_DIR}/fp16")
+ ENDIF()
+-TARGET_LINK_LIBRARIES(qnnpack PRIVATE fp16)
+ 
+ INSTALL(TARGETS qnnpack
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+@@ -347,7 +347,7 @@
+ # ---[ QNNPACK unit tests
+ IF(QNNPACK_BUILD_TESTS)
+   # ---[ Build google test
+-  IF(NOT TARGET gtest)
++  IF(FALSE)
+     SET(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+     ADD_SUBDIRECTORY(
+       "${GOOGLETEST_SOURCE_DIR}"
diff --git a/sci-libs/QNNPACK/metadata.xml b/sci-libs/QNNPACK/metadata.xml
new file mode 100644
index 000000000000..2187de2a666b
--- /dev/null
+++ b/sci-libs/QNNPACK/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pytorch/QNNPACK</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/XNNPACK/Manifest b/sci-libs/XNNPACK/Manifest
new file mode 100644
index 000000000000..efba28139b7c
--- /dev/null
+++ b/sci-libs/XNNPACK/Manifest
@@ -0,0 +1,4 @@
+AUX XNNPACK-2022.02.17-gentoo.patch 434 BLAKE2B 23c3f9b2f368c827f9ee13da6bec050aeeb2caf7c9ff17bd1b3a4ece60f15d2e0cbfd2aab655d643e85dc0ee0b7514834d487bf1befa68331aee86ca51530e61 SHA512 38f42606a83d6fc8ee74c2ca547c9bdad9c4e38393efa22757716b76c7f527a4648f67828bb39b9e7cf044860b087fce174eea156dc8cd54907d3e863f264bdc
+DIST XNNPACK-2022.02.17.tar.gz 6761154 BLAKE2B 59be5d9efe6f46d22bc41d3152e6cd3103f6dfafd94cdf3229b86ecf44a46175c613760f3de35c98a24ccdec1783f205c1eceaf21133706fedd5f384529748eb SHA512 aacbe907bb2b7429143f4ec612881fb709fe37e7b3a7f4fd68193dee6bbe82e17d20b2c6f5a8025845a09f8269c1dfeaebfc5bd64ef196fa376d82ac9a44cb8f
+EBUILD XNNPACK-2022.02.17-r1.ebuild 1754 BLAKE2B 4808696f0afe4219972c3e40feb86b9227f031b584a68753ae1fd48daea983737350a8f3bdb32e954f53109b134195b0e8931ebf4a3ecd05b51ebd16c33d806e SHA512 a1cc06d2885731684d16f4ddb1fe55a85212130ae0b09118dd66226f54e2b70643399110057f425a907b05aeafed1b4b7b5eefb2d9fd325d5b2172319a3349ee
+MISC metadata.xml 614 BLAKE2B 4f33a22a79f975aaf528ba53bf6e26aeb91af4244f7aac4259a61033c0841f2ea3c29a62c6a984429bf2a87b8e8173df7481079e3438e76d2d7050a31856501a SHA512 e55c7b603f37211338d1472796015a24ff2d034339461eb67411ed4d59202ed52a9e8d554de5cd72636e35875421f983dee12b7173056c806cd9541148ca0f71
diff --git a/sci-libs/XNNPACK/XNNPACK-2022.02.17-r1.ebuild b/sci-libs/XNNPACK/XNNPACK-2022.02.17-r1.ebuild
new file mode 100644
index 000000000000..3f4751f7b98e
--- /dev/null
+++ b/sci-libs/XNNPACK/XNNPACK-2022.02.17-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+CommitId=84b02ad55f089598aa42a557573dc4eb6f92f3ff
+
+DESCRIPTION="library of floating-point neural network inference operators"
+HOMEPAGE="https://github.com/google/XNNPACK/"
+SRC_URI="https://github.com/google/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+assembly jit +memopt +sparse static-libs test"
+
+RDEPEND="
+	dev-libs/cpuinfo
+	dev-libs/pthreadpool
+"
+DEPEND="${RDEPEND}
+	dev-libs/FP16
+	dev-libs/FXdiv
+"
+
+BDEPEND="test? ( dev-cpp/gtest )"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( static-libs )"
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	sed -i \
+		-e "/PRIVATE fp16)/d" \
+		-e "/PRIVATE fxdiv)/d" \
+		-e "/PRIVATE clog)/d" \
+		-e "/TARGET_LINK_LIBRARIES/s: fp16::" \
+		CMakeLists.txt \
+		|| die
+	dropTest=(
+		"add-nd-test"
+		"subtract-nd-test"
+		"f32-velu-test"
+		"qc8-dwconv-minmax-fp32-test"
+		"qs8-dwconv-minmax-fp32-test"
+		"qs8-vadd-minmax-test"
+		"qs8-vaddc-minmax-test"
+		"qu8-dwconv-minmax-fp32-test"
+		"qu8-vadd-minmax-test"
+		"qu8-vaddc-minmax-test"
+	)
+	for id in ${dropTest[@]}
+	do
+		sed -i \
+			-e "/ADD_TEST(${id}/d" \
+			CMakeLists.txt \
+			|| die
+	done
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DXNNPACK_BUILD_BENCHMARKS=OFF
+		-DXNNPACK_USE_SYSTEM_LIBS=ON
+		-DXNNPACK_BUILD_TESTS=$(usex test ON OFF)
+		-DXNNPACK_LIBRARY_TYPE=$(usex static-libs static shared)
+		-DXNNPACK_ENABLE_ASSEMBLY=$(usex assembly ON OFF)
+		-DXNNPACK_ENABLE_JIT=$(usex jit ON OFF)
+		-DXNNPACK_ENABLE_MEMOPT=$(usex memopt ON OFF)
+		-DXNNPACK_ENABLE_SPARSE=$(usex sparse ON OFF)
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/XNNPACK/files/XNNPACK-2022.02.17-gentoo.patch b/sci-libs/XNNPACK/files/XNNPACK-2022.02.17-gentoo.patch
new file mode 100644
index 000000000000..f07ba08edf56
--- /dev/null
+++ b/sci-libs/XNNPACK/files/XNNPACK-2022.02.17-gentoo.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt	2022-05-10 08:26:00.636788471 +0200
++++ b/CMakeLists.txt	2022-05-10 08:26:57.097938381 +0200
+@@ -6696,9 +6696,6 @@
+   # ---[ Build google test
+   IF(NOT TARGET gtest)
+     SET(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-    ADD_SUBDIRECTORY(
+-      "${GOOGLETEST_SOURCE_DIR}"
+-      "${CMAKE_BINARY_DIR}/googletest")
+   ENDIF()
+ 
+   ADD_LIBRARY(gemm-microkernel-tester STATIC test/gemm-microkernel-tester.cc)
diff --git a/sci-libs/XNNPACK/metadata.xml b/sci-libs/XNNPACK/metadata.xml
new file mode 100644
index 000000000000..ddf909e2c6ee
--- /dev/null
+++ b/sci-libs/XNNPACK/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<use>
+		<flag name="assembly">Build with assembly micro-kernels</flag>
+		<flag name="jit">Build with JIT micro-kernels</flag>
+		<flag name="memopt">Build with optimized memory allocation scheme</flag>
+		<flag name="sparse">Build with graph rewriting for sparse inference</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">google/XNNPACK</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/arborx/Manifest b/sci-libs/arborx/Manifest
new file mode 100644
index 000000000000..6cd2b0430621
--- /dev/null
+++ b/sci-libs/arborx/Manifest
@@ -0,0 +1,3 @@
+DIST arborx-1.2.tar.gz 380705 BLAKE2B eb0006e69edb6cfd1d402dfe5a58db76954c34f847ce8acd1c0f2bd2044a29a434fc01df67829fce4ec911f5c882c1625aa7a50bc39a5d33dfb2c26d6a4cbb4f SHA512 d48650b11fc26770c43f4821999647acb0c7675367e416ad025ab21eb50da66c732f03bc6decf840d25dac26ff7f1f5dca77b7514dffc619cef8d401e83a8795
+EBUILD arborx-1.2.ebuild 695 BLAKE2B 62fb238c7a17acea04504f84e7538e38231661c7b00567ff1bb448c5c4478ce3a3cca6a01944bdc01790090953a241a14478fa439b4b7273672d4259d9c10b01 SHA512 245bd0312e60faf5ab15c90eb58aa7c4742ec4f8ac45888f0474b5b06494cb6da5b8eeda92cc19f9e6479ef7c4e9eb39a0287575f3c0b65a9076f38578bae057
+MISC metadata.xml 645 BLAKE2B 6dcc46ed6bd5b10596436f09667e159530d359fdc768350751cf3376ecfe1e0ff30477895ce367c0f0a8e35b531b8f2e42a8517992553b6cec6a16def3fc2b32 SHA512 c5bba621b5f13c28774f413d64542d2e35fbfe11b18a3f5b98799bcdc1e25dd0a258e583842f24e3b8d1ad359d8ff068a141db448af2cef04e772a82df9e1ec6
diff --git a/sci-libs/arborx/arborx-1.2.ebuild b/sci-libs/arborx/arborx-1.2.ebuild
new file mode 100644
index 000000000000..68330b8a5df7
--- /dev/null
+++ b/sci-libs/arborx/arborx-1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library for performance portable algorithms for geometric search"
+HOMEPAGE="https://github.com/arborx/ArborX"
+
+SRC_URI="https://github.com/${PN}/ArborX/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="mpi"
+
+RDEPEND="dev-libs/boost:=
+	mpi? ( virtual/mpi[cxx] )
+	sci-libs/trilinos"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/ArborX-${PV}
+
+src_configure() {
+	local mycmakeargs=(
+		-DARBORX_ENABLE_MPI="$(usex mpi)"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+}
diff --git a/sci-libs/arborx/metadata.xml b/sci-libs/arborx/metadata.xml
new file mode 100644
index 000000000000..0a701dff0e71
--- /dev/null
+++ b/sci-libs/arborx/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		ArborX is an open-source library designed to provide performance
+		portable algorithms for geometric search, similarly to nanoflann
+		and Boost Geometry.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">arborx/ArborX</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
new file mode 100644
index 000000000000..1953d56b4a0c
--- /dev/null
+++ b/sci-libs/caffe2/Manifest
@@ -0,0 +1,4 @@
+AUX caffe2-1.11.0-gentoo.patch 3659 BLAKE2B 3f65ac30ed6ebb4f45ec4abbf0368e5033e2b6bf1ff3bf5a13dfec5d28c803c52053913cfbf1f3576f6b4ac8ff324d79852eb13a2c53ca5ea40915f79edeff2b SHA512 79e82b2dbc4113bc734d6c317e8668d551e8815b0cac41ac1181bcc3e7d285e575539de9ceafaa400c72160a7b1205f3a6975c61ac801e09e4b6dc29a5a1d6ce
+DIST pytorch-1.11.0.tar.gz 20719323 BLAKE2B 24e7aaa2c26821d36f8092542de9d8d5ac85a619fb9fffb5131987958842afb1cad395780662d15f3411a7cc6ff83a445871960eca1e469fcbf0b9895d83d6e0 SHA512 2342eb7a1a241f5855a7cf12e11f62bc4baaa78d1d0864e53bfc946e783eb4addd05ca154a814d2376cd602098b5547e61c158d6eddb7cad5a9f3b0c1357adca
+EBUILD caffe2-1.11.0.ebuild 1988 BLAKE2B f671b7eb952e7f890370f810396afba225e08e358cfde43c728f1ee348eb9b8dbbc35f8be7bd2281307ad9fd31e5f914b72b9410340e5c286f2349ba2c5ae0fa SHA512 6adaf278512440ea17e6f31eec7b9f368168ef5f277a4c17c429d5cf790a859ef7fe79bd9b6ec4895158b88014b3450a278edd46e6c9c641cad67b51a33e3c92
+MISC metadata.xml 328 BLAKE2B f49c6d62ac88dfffe497ed05b1f727941a94acb87a809611dda8aedbd87508fdfdf94ec0e025cac2a649b0881b600236289943b4be0f6ca44fc105b6d8fbe97c SHA512 16c29d2c1177a89026235191ea3e33870c2e6b63f029b7febd4dbd2e99f598fab4b4fd2fa7a801ffd88393663a00752300e6e2cc847a83690b715bcc481d9dc2
diff --git a/sci-libs/caffe2/caffe2-1.11.0.ebuild b/sci-libs/caffe2/caffe2-1.11.0.ebuild
new file mode 100644
index 000000000000..e0f6d0d772f2
--- /dev/null
+++ b/sci-libs/caffe2/caffe2-1.11.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-r1 cmake
+
+MYPN=pytorch
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="A deep learning framework"
+HOMEPAGE="https://pytorch.org/"
+SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/cpuinfo
+	dev-libs/libfmt
+	dev-libs/protobuf
+	dev-libs/sleef
+	sci-libs/lapack
+	sci-libs/onnx
+	sci-libs/foxi
+"
+DEPEND="${RDEPEND}
+	dev-libs/FP16
+	dev-libs/pocketfft
+	dev-libs/flatbuffers
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	cmake_src_prepare
+	pushd torch/csrc/jit/serialization || die
+	flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
+	popd
+}
+
+src_configure() {
+	python_setup
+	local mycmakeargs=(
+		-DUSE_KINETO=OFF
+		-DUSE_XNNPACK=OFF
+		-DUSE_SYSTEM_SLEEF=ON
+		-DUSE_BREAKPAD=OFF
+		-DUSE_SYSTEM_ONNX=ON
+		-DUSE_TENSORPIPE=OFF
+		-DUSE_GLOO=OFF
+		-DUSE_SYSTEM_FP16=ON
+		-DUSE_FBGEMM=OFF
+		-DUSE_NNPACK=OFF
+		-DUSE_PYTORCH_QNNPACK=OFF
+		-DUSE_QNNPACK=OFF
+		-DUSE_SYSTEM_CPUINFO=ON
+		-DBUILD_CUSTOM_PROTOBUF=OFF
+		-DUSE_MKLDNN=OFF
+		-DUSE_NUMPY=OFF
+		-DUSE_OPENMP=OFF
+		-DUSE_DISTRIBUTED=OFF
+		-DUSE_CUDA=OFF
+		-DUSE_NCCL=OFF
+		-Wno-dev
+		-DTORCH_INSTALL_LIB_DIR=/usr/$(get_libdir)
+		-DLIBSHM_INSTALL_LIB_SUBDIR=/usr/$(get_libdir)
+		-DUSE_CCACHE=OFF
+	)
+	cmake_src_configure
+}
+
+python_install() {
+	python_domodule python/caffe2
+	python_domodule python/torch
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto "/var/lib/${PN}"
+	doins "${BUILD_DIR}"/CMakeCache.txt
+
+	rm -rf python
+	mkdir -p python/torch || die
+	mv "${D}"/usr/lib/python*/site-packages/caffe2 python/ || die
+	cp torch/version.py python/torch/ || die
+	python_foreach_impl python_install
+}
diff --git a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
new file mode 100644
index 000000000000..ac74edadab35
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch
@@ -0,0 +1,93 @@
+--- a/cmake/Dependencies.cmake	2022-06-17 22:12:34.451841710 +0200
++++ b/cmake/Dependencies.cmake	2022-06-17 22:12:48.302786501 +0200
+@@ -1512,7 +1512,6 @@
+   if(NOT USE_SYSTEM_ONNX)
+     add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/onnx EXCLUDE_FROM_ALL)
+   endif()
+-  add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/foxi EXCLUDE_FROM_ALL)
+ 
+   add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE})
+   if(NOT USE_SYSTEM_ONNX)
+@@ -1810,7 +1809,6 @@
+ #
+ set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+ set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
+-add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt)
+ 
+ # Disable compiler feature checks for `fmt`.
+ #
+@@ -1819,9 +1817,7 @@
+ # CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know
+ # `fmt` is compatible with a superset of the compilers that PyTorch is, it
+ # shouldn't be too bad to just disable the checks.
+-set_target_properties(fmt-header-only PROPERTIES INTERFACE_COMPILE_FEATURES "")
+ 
+-list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only)
+ set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE)
+ 
+ if(USE_BREAKPAD)
+--- a/c10/CMakeLists.txt	2022-06-17 22:40:53.573306905 +0200
++++ b/c10/CMakeLists.txt	2022-06-17 22:41:16.920219686 +0200
+@@ -59,7 +59,7 @@
+ if(${USE_GLOG})
+     target_link_libraries(c10 PUBLIC glog::glog)
+ endif()
+-target_link_libraries(c10 PRIVATE fmt::fmt-header-only)
++target_link_libraries(c10 PRIVATE fmt)
+ 
+ find_package(Backtrace)
+ if(Backtrace_FOUND)
+--- a/torch/CMakeLists.txt	2022-06-17 22:42:20.396982644 +0200
++++ b/torch/CMakeLists.txt	2022-06-17 22:43:20.214759326 +0200
+@@ -82,7 +82,6 @@
+ 
+ set(TORCH_PYTHON_LINK_LIBRARIES
+     shm
+-    fmt::fmt-header-only
+     ATEN_CPU_FILES_GEN_LIB)
+ 
+ set(TORCH_PYTHON_COMPILE_DEFINITIONS)
+--- a/CMakeLists.txt	2022-06-18 20:35:01.451116185 +0200
++++ b/CMakeLists.txt	2022-06-18 20:35:08.219023569 +0200
+@@ -750,7 +750,7 @@
+ 
+ # ---[ Build flags
+ if(NOT MSVC)
+-  string(APPEND CMAKE_CXX_FLAGS " -O2 -fPIC")
++  string(APPEND CMAKE_CXX_FLAGS " -fPIC")
+   string(APPEND CMAKE_CXX_FLAGS " -Wno-narrowing")
+   # Eigen fails to build with some versions, so convert this to a warning
+   # Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459
+--- a/cmake/public/utils.cmake	2022-06-18 20:50:39.314263395 +0200
++++ b/cmake/public/utils.cmake	2022-06-18 20:51:49.611291709 +0200
+@@ -512,8 +512,6 @@
+   endif()
+ 
+   # Use -O2 for release builds (-O3 doesn't improve perf, and -Os results in perf regression)
+-  target_compile_options(${libname} PRIVATE
+-      $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>>:-O2>)
+ 
+ endfunction()
+ 
+--- a/cmake/Codegen.cmake	2022-06-18 21:33:13.366381817 +0200
++++ b/cmake/Codegen.cmake	2022-06-18 21:33:30.249157610 +0200
+@@ -57,7 +57,7 @@
+   if(MSVC)
+     set(OPT_FLAG "/fp:strict ")
+   else(MSVC)
+-    set(OPT_FLAG "-O3 ")
++    set(OPT_FLAG " ")
+     if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
+       set(OPT_FLAG " ")
+     endif()
+--- a/c10/CMakeLists.txt	2022-06-19 09:57:16.776536871 +0200
++++ b/c10/CMakeLists.txt	2022-06-19 09:58:51.663356075 +0200
+@@ -107,7 +107,7 @@
+ # Note: for now, we will put all export path into one single Caffe2Targets group
+ # to deal with the cmake deployment need. Inside the Caffe2Targets set, the
+ # individual libraries like libc10.so and libcaffe2.so are still self-contained.
+-install(TARGETS c10 EXPORT Caffe2Targets DESTINATION lib)
++install(TARGETS c10 EXPORT Caffe2Targets DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+         DESTINATION include
+         FILES_MATCHING PATTERN "*.h")
diff --git a/sci-libs/caffe2/metadata.xml b/sci-libs/caffe2/metadata.xml
new file mode 100644
index 000000000000..d12749aa5c21
--- /dev/null
+++ b/sci-libs/caffe2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pytorch/pytorch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 1e8d68580574..0584d7e1e33a 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,5 +1,8 @@
-AUX cantera-2.5.1_env.patch 4600 BLAKE2B ed131f2b3d061102f197d50105176332fd07424ddff81b0af05bdc2eb3e514bcb17da85e285d80dd717d685a10a8eaa0a08769171cbb2df5103d2283519ef311 SHA512 92083e331a1ddd712d21602e50960cf0251ca688a90121f67c35b21b79851c7baa6d9373a67bec1beade53d44e6dfe2e0faf7385305d2c8cfdee2d9698b21c67
+AUX cantera-2.5.1_env.patch 5928 BLAKE2B d6d0792527a5f50c34d4d6a05c651992a82af7ed864b68178023d6a7c44632f124851fe5e79306d0b91fde82336d72f8600bd9a2ccfc9a719b07ad44da63913d SHA512 5a1d0e238cfb5f24731acfb59cd66d1dc564a9e2485405e64771735ae72b529ef64475692394cb06c68f447bffc106d73edb901df26587e4203a8c59efea3dfc
+AUX cantera-2.6.0_env.patch 3119 BLAKE2B 16844230d86a292c764da1aa4043b2eff177f2b8a94ed154c3f6a69c1737e85f6ddc9330d5ba6f26936994306381dcb40ab4e70c7b7b44bdbaf7d920ee1ef902 SHA512 12cdabc7cee106ee17050918b483245b39f927b5a5bb8f92bd6177c1d660cc18cd3a91b2710991fa09c44f58aaac464495b15ceb7ae13bf235d34a6caabe7bc4
 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 3417 BLAKE2B 9a74774ef3980c8007d952b0eab82522eeaf717d78e9af49022e20f494b3c43b773cd958d9ba381daa4eaff21d1917fe4a0e95640d3cacc85c787c99ccfe1f59 SHA512 167c28e81c8f0f7fa8abb5bb916e8b4c84d5a20083ce00b79de21fef781d3d0bae1bb321ee80f0edf5f91a55fb2881a9cbbeff260cafb944e09621c8a73f49ca
+DIST cantera-2.6.0.tar.gz 2586243 BLAKE2B 3562dc3641c70cdbd5e07062ecee56c0658b098c20bb477c3e741731db01e38fccf624e6769377420b01dd4bac72a0608cf226cce40ac12f13e71081090e06bc SHA512 74e12c89af38236bcc064034f74edcc690895151a9e453e728d130b83f5f527e675750c68a3fe36eea3c6aec6969685aa8828ae740a2e27b5df72a8ccc4d2856
+EBUILD cantera-2.5.1-r1.ebuild 3428 BLAKE2B ea9fdf73fe224d9ccc9c589b46e7ea59389e75bfa2eea8f8ea45d08d9c079b926b607c8a5f6edf469cb348803ae20748722227b96c462d39d34b97fb544684e0 SHA512 59383dbd2b324023d0802c179631d4a6edd925449b0d8195d0d7ae34a1b0c46eb695db54659673d1d23756862301b245244c4ce495fd23945541700030ff6127
+EBUILD cantera-2.5.1-r4.ebuild 3470 BLAKE2B 59c9063460a112368419e013a2c5ad8f2f51616ddf5904b461b08a4fe68369a52e8e5ca1bbc8aa27854ff2949921fef87126441bbfa5af2685a5094c86e19a7e SHA512 80f9ce4775d89c068bcea3c322e0af4ca220efb1335e60be31d6ab9f746637d29da22b89aec98572a6fdc22c98efdacdff2072ff2ec4df313aa82f642eb97996
+EBUILD cantera-2.6.0-r1.ebuild 3543 BLAKE2B 4940c9cafe4015d258ae685c010bd3864cdd82c47ae48f23300b6f83790cca4c976decf44f4feb7290e9cc2b2a6a2ce1804335d60b42bb6bb3930b06f6ba53e1 SHA512 7e077e63cbf0b5a51b395c9d601cdd5f87ed1128d7b506be9af6210f77121b297b365c2bda3e78daf23a8cca6af6752c3a8b860d7418965123fda8e179103bf7
 MISC metadata.xml 842 BLAKE2B 85e2a5268aa13a8a92e9f04212c3bcd66252a77c88dd2ddb7d81a34f486754c7faa352998484d4362b16a2bdccb85325337c13cc272a434be463a037eab846a1 SHA512 a9edb0347dc3b1510d3d2b767e7a0e96cd1d6cc50dd4e5c2830d29438dd25a0bdfa41994dbb43bbb7dc70ba3537f783b2d0a143723908dd91d434e1edb11a704
diff --git a/sci-libs/cantera/cantera-2.5.1-r1.ebuild b/sci-libs/cantera/cantera-2.5.1-r1.ebuild
index 659722a8c3cf..ecacad92743b 100644
--- a/sci-libs/cantera/cantera-2.5.1-r1.ebuild
+++ b/sci-libs/cantera/cantera-2.5.1-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
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8,9} )
 FORTRAN_NEEDED=fortran
 FORTRAN_STANDARD="77 90"
 
-inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
+inherit fortran-2 python-single-r1 scons-utils toolchain-funcs
 
 DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
 HOMEPAGE="https://www.cantera.org"
diff --git a/sci-libs/cantera/cantera-2.5.1-r3.ebuild b/sci-libs/cantera/cantera-2.5.1-r4.ebuild
index dad4dddb283b..cd12713f6574 100644
--- a/sci-libs/cantera/cantera-2.5.1-r3.ebuild
+++ b/sci-libs/cantera/cantera-2.5.1-r4.ebuild
@@ -39,7 +39,8 @@ RDEPEND="
 		')
 	)
 	dev-cpp/yaml-cpp
-	<sci-libs/sundials-5.9.0:0=[lapack?]
+	!lapack? ( <sci-libs/sundials-5.9.0:0= )
+	lapack? ( <sci-libs/sundials-5.3.0:0=[lapack] )
 "
 
 DEPEND="
diff --git a/sci-libs/cantera/cantera-2.6.0-r1.ebuild b/sci-libs/cantera/cantera-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..fb800fb485b5
--- /dev/null
+++ b/sci-libs/cantera/cantera-2.6.0-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90"
+
+inherit fortran-2 python-single-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
+HOMEPAGE="https://www.cantera.org"
+SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cti fortran lapack +python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	python? ( cti )
+	${PYTHON_REQUIRED_USE}
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	lapack? ( virtual/lapack )
+	cti? (
+		$(python_gen_cond_dep '
+			dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+		')
+	)
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		')
+	)
+	dev-cpp/yaml-cpp
+	!lapack? ( sci-libs/sundials:0= )
+	lapack? ( <sci-libs/sundials-5.3.0:0=[lapack?] )
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost
+	dev-libs/libfmt
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		>=dev-cpp/gtest-1.11.0
+		python? (
+			$(python_gen_cond_dep '
+				dev-python/h5py[${PYTHON_USEDEP}]
+				dev-python/pandas[${PYTHON_USEDEP}]
+				dev-python/pytest[${PYTHON_USEDEP}]
+				dev-python/scipy[${PYTHON_USEDEP}]
+			')
+		)
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}_env.patch" )
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+## Full list of configuration options of Cantera is presented here:
+## http://cantera.org/docs/sphinx/html/compiling/config-options.html
+src_configure() {
+	scons_vars=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		cc_flags="${CXXFLAGS}"
+		cxx_flags="-std=c++11"
+		debug="no"
+		FORTRAN="$(tc-getFC)"
+		FORTRANFLAGS="${FCFLAGS}"
+		optimize_flags="-Wno-inline"
+		renamed_shared_libraries="no"
+		use_pch="no"
+		## In some cases other order can break the detection of right location of Boost: ##
+		system_fmt="y"
+		system_sundials="y"
+		system_eigen="y"
+		system_yamlcpp="y"
+		env_vars="all"
+		extra_inc_dirs="/usr/include/eigen3"
+	)
+	use lapack && scons_vars+=( blas_lapack_libs="lapack,blas" )
+	use test || scons_vars+=( googletest="none" )
+
+	scons_targets=(
+		f90_interface=$(usex fortran y n)
+	)
+
+	if use cti ; then
+		local scons_python=$(usex python full minimal)
+		scons_targets+=( python_package="${scons_python}" python_cmd="${EPYTHON}" )
+	else
+		scons_targets+=( python_package="none" )
+	fi
+}
+
+src_compile() {
+	escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
+}
+
+src_test() {
+	escons test
+}
+
+src_install() {
+	escons install stage_dir="${D}" libdirname="$(get_libdir)"
+	if ! use cti ; then
+		rm -r "${D}/usr/share/man" || die "Can't remove man files."
+	else
+		# Run the byte-compile of modules
+		python_optimize "${D}$(python_get_sitedir)/${PN}"
+	fi
+
+	# User could remove this line if require static libs for development purpose
+	find "${ED}" -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+	if use cti && ! use python ; then
+		elog "Cantera was build without 'python' use-flag therefore the CTI tools 'ck2cti' and 'ck2yaml"
+		elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
+	fi
+
+	local post_msg=$(usex fortran "and Fortran " "")
+	elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
+
+	if use python ; then
+		elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
+	fi
+}
diff --git a/sci-libs/cantera/files/cantera-2.5.1_env.patch b/sci-libs/cantera/files/cantera-2.5.1_env.patch
index 576e2de2d577..77004803b127 100644
--- a/sci-libs/cantera/files/cantera-2.5.1_env.patch
+++ b/sci-libs/cantera/files/cantera-2.5.1_env.patch
@@ -32,6 +32,33 @@ diff -Naur old/SConstruct new/SConstruct
  
  # Print values of all build options:
  print("Configuration variables read from 'cantera.conf' and command line:")
+@@ -1149,10 +1149,24 @@
+         if retcode == 0:
+             config_error("Failed to determine Sundials BLAS/LAPACK.")
+         env['has_sundials_lapack'] = int(has_sundials_lapack.strip())
+-    else:
+-        # In Sundials 2.6, SUNDIALS_BLAS_LAPACK is either defined or undefined
++    elif sundials_ver < parse_version('5.5'):
++        # In Sundials 2.6-5.5, SUNDIALS_BLAS_LAPACK is either defined or undefined
+         env['has_sundials_lapack'] = conf.CheckDeclaration('SUNDIALS_BLAS_LAPACK',
+                 '#include "sundials/sundials_config.h"', 'C++')
++    else:
++        # In Sundials 5.5 and higher, two defines are included specific to the
++        # SUNLINSOL packages indicating whether SUNDIALS has been built with LAPACK
++        lapackband = conf.CheckDeclaration(
++            "SUNDIALS_SUNLINSOL_LAPACKBAND",
++            '#include "sundials/sundials_config.h"',
++            "C++",
++        )
++        lapackdense = conf.CheckDeclaration(
++            "SUNDIALS_SUNLINSOL_LAPACKDENSE",
++            '#include "sundials/sundials_config.h"',
++            "C++",
++        )
++        env["has_sundials_lapack"] = lapackband and lapackdense
+ 
+     # In the case where a user is trying to link Cantera to an external BLAS/LAPACK
+     # library, but Sundials was configured without this support, print a Warning.
 diff -Naur old/interfaces/cython/SConscript new/interfaces/cython/SConscript
 --- old/interfaces/cython/SConscript	2021-03-21 01:18:43.000000000 +0300
 +++ new/interfaces/cython/SConscript	2021-03-21 01:59:29.000000000 +0300
diff --git a/sci-libs/cantera/files/cantera-2.6.0_env.patch b/sci-libs/cantera/files/cantera-2.6.0_env.patch
new file mode 100644
index 000000000000..15a1e65857e4
--- /dev/null
+++ b/sci-libs/cantera/files/cantera-2.6.0_env.patch
@@ -0,0 +1,78 @@
+diff -Naur old/SConstruct new/SConstruct
+--- old/SConstruct
++++ new/SConstruct
+@@ -178,6 +178,10 @@
+ 
+ config_options = [
+     Option(
++        "AR",
++        "The archiver to use.",
++        "${AR}"),
++    Option(
+         "CXX",
+         "The C++ compiler to use.",
+         "${CXX}"),
+@@ -740,7 +744,7 @@
+     toolchain = ["default"]
+ 
+ env = Environment(tools=toolchain+["textfile", "subst", "recursiveInstall", "wix", "gch"],
+-                  ENV={"PATH": os.environ["PATH"]},
++                  ENV={'PATH': os.environ['PATH'], 'CCACHE_DIR': os.environ.get('CCACHE_DIR','')},
+                   toolchain=toolchain,
+                   **extraEnvArgs)
+ 
+@@ -775,7 +779,7 @@
+ 
+ add_RegressionTest(env)
+ 
+-opts.AddVariables(*config.to_scons(["CC", "CXX"], env=env))
++opts.AddVariables(*config.to_scons(["AR", "CC", "CXX"], env=env))
+ opts.Update(env)
+ 
+ # Check if this is actually Apple's clang on macOS
+@@ -861,11 +865,7 @@
+ env['cantera_pure_version'] = re.match(r'(\d+\.\d+\.\d+)', env['cantera_version']).group(0)
+ env['cantera_short_version'] = re.match(r'(\d+\.\d+)', env['cantera_version']).group(0)
+ 
+-try:
+-    env["git_commit"] = get_command_output("git", "rev-parse", "--short", "HEAD")
+-    logger.info(f"Building Cantera from git commit '{env['git_commit']}'")
+-except (subprocess.CalledProcessError, FileNotFoundError):
+-    env["git_commit"] = "unknown"
++env["git_commit"] = "unknown"
+ 
+ # Print values of all build options:
+ # the (updated) "cantera.conf" combines all options that were specified by the user
+diff -Naur old/interfaces/cython/SConscript new/interfaces/cython/SConscript
+--- old/interfaces/cython/SConscript
++++ new/interfaces/cython/SConscript
+@@ -107,7 +107,7 @@
+                               obj, LIBPREFIX="", SHLIBSUFFIX=module_ext,
+                               SHLIBPREFIX="", LIBSUFFIXES=[module_ext])
+ 
+-build_cmd = ("$python_cmd_esc -m pip wheel -v --no-build-isolation --use-feature=in-tree-build --no-deps "
++build_cmd = ("$python_cmd_esc -m pip wheel -v --no-build-isolation --no-deps "
+              "--wheel-dir=build/python/dist build/python")
+ plat = info['plat'].replace('-', '_').replace('.', '_')
+ wheel_name = (f"Cantera-{env['cantera_version']}-cp{py_version_nodot}"
+@@ -172,7 +172,7 @@
+ 
+     install_cmd.append(f"--root={stage_dir.resolve()}")
+ 
+-install_cmd.extend(("--no-build-isolation", "--use-feature=in-tree-build", "--no-deps", "-v", "--force-reinstall",
++install_cmd.extend(("--no-build-isolation", "--no-deps", "-v", "--force-reinstall",
+                     "build/python"))
+ if localenv['PYTHON_INSTALLER'] == 'direct':
+     mod_inst = install(localenv.Command, 'dummy', mod,
+diff -Naur old/test_problems/SConscript new/test_problems/SConscript
+--- old/test_problems/SConscript
++++ new/test_problems/SConscript
+@@ -233,7 +233,7 @@
+      artifacts=['vcs_equilibrate_res.csv'])
+ 
+ CompileAndTest('clib', 'clib_test', 'clib_test',
+-               extensions=['^clib_test.c'], libs=localenv['cantera_shared_libs'])
++               extensions=['^clib_test.c'])
+ 
+ # C++ Samples
+ Test('cxx-bvp', 'cxx_samples', '#build/samples/cxx/bvp/blasius', None,
diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index b4691cbc22b5..91e54a22fe57 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -2,7 +2,7 @@ AUX ceres-solver-2.0.0-system-mathjax.patch 325 BLAKE2B a649088517ec1bef7d5a6144
 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
+EBUILD ceres-solver-1.14.0.ebuild 2300 BLAKE2B 7b66db1e8ce10a0ffc54be552a17339f25b288e38def04063433fa0b754e23986fec29772ff90e0995d0dcfee33f32f9ccdef7c440b191d356222e48d7ec1751 SHA512 b05c82fcc33211187f507c10dec920bdcf89708227eeed3527457d186fae733c62e731bafc45c362f4b6d93449464724e9768766f20b29e1c6f6b1a2fc57ed72
+EBUILD ceres-solver-2.0.0.ebuild 2433 BLAKE2B 206bccb082e0fe7b7e9d184d3ec9db640b5d1c1444e1878e1df6f9beab5632d46dc04a27f682e971abb7fa6f7b2c7302b71cf4d1d5cb0778382043bf929884ed SHA512 050ea90c7031b9b652960f9c52693e0b93d280732309ad5b8801aa031b31d174e523e2117ea4da3fb25d3530ee31ea390cb6edd47fe52bdf909907752f9cec3c
+EBUILD ceres-solver-2.1.0.ebuild 2424 BLAKE2B 2922f15b0e58ad23bdb9e0b49cc88c97dd93d04d1e4b4a58c05eb5d48c803abdffc885c589e065fe62e3fb9f74149557b6a559873b764176120984566a0828ec SHA512 c1b506b60bf16063e66ee1117345459bca8450e2ad856c4130f34ccceb37624aeeb5388303be01fa43cdf1bd185afffd6da82221a5d593e2266f13e1e5957c86
 MISC metadata.xml 1452 BLAKE2B d754f2990a415da369d9e41a0a1b6f7634b3bb51629d8169d74fd9122030b1ceebfc4a69cdc015ba7a4ef2565f6c36ec218fd5df4c5a45c25fe8802c5c17fc3c SHA512 ebe2f54e01d3a1230e2ed3ca59502571b0d596349126e9b69d06787f85465d66a989b7a430b22c62d5176bb197151e3c59c22b22fb55d87dd3daa53a6a420cbd
diff --git a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
index 4bd35e1b7fc8..67f410873961 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.14.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
@@ -48,15 +48,11 @@ DEPEND="${RDEPEND}"
 DOCS=( README.md VERSION )
 
 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
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 	use doc && python-any-r1_pkg_setup
 }
 
diff --git a/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild b/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
index 8ed07b8f792e..66ffb261da7c 100644
--- a/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-2.0.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
@@ -48,15 +48,11 @@ DOCS=( README.md VERSION )
 PATCHES=( "${FILESDIR}/${P}-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
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 	use doc && python-any-r1_pkg_setup
 }
 
diff --git a/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild b/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
index 92fefb044a1a..fa2a76ca48ac 100644
--- a/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
@@ -48,15 +48,11 @@ PATCHES=(
 )
 
 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
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 	use doc && python-any-r1_pkg_setup
 }
 
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index 1e58a2d29310..287cde1dcbff 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -3,8 +3,12 @@ AUX cfitsio-3.490-pkgconfig.patch 613 BLAKE2B acdaedb24b8a06019346b44eade4cf9f8c
 AUX cfitsio-3.490-system-zlib.patch 2816 BLAKE2B eb16c43cc5be95877424469eeebc085a46fb37e78d0b2fb48db72d71c2bb05d5b85eaf6d7341ed07da25858765cb9902e1dcf8ef33f3ab42b191d2b7689976ed SHA512 4f05a0a35d6bcdc03676d9142d2cc46dd4df69aff4759464c2dc441753e7e3085c756059d2218e9deef9da91c27e760c0f73562bbc02b5a73e0044f47560ded8
 AUX cfitsio-4.0.0-pkgconfig.patch 560 BLAKE2B ca784b063cddb88ae6665d205dd91908499f1f1ae82ce185a9c45f8af972ffd4f4d5c075fb5bcaaddd639550785dff4aeb573efea3d87dc45e097811806a2532 SHA512 b4ceb89429c1e9139c8086cb6ab8dd0191678b8f868f36ee651b6b97779e16aeceec121cb5a6dac9dffc03add4f90469286a4134d7b31607614ec6a055d4c19e
 AUX cfitsio-4.0.0-system-zlib.patch 2406 BLAKE2B f17d54f549b4167d51eb073decd4924acad02c4239ea36fea78bd5c71a4f236d7285d669bd12c8e9de38468416e4262005bfd704ab5146353810bfd11c08036c SHA512 3d82bd4852619b1d10eb765f05e3dd03b8cc11dfac6f4eae48062b20b71e715c8eebe7c374fb83d38dfdb454fdb598a7b62a7d27f6517cc885d56189f4a0f2d7
+AUX cfitsio-4.1.0-pkgconfig.patch 600 BLAKE2B 4cf6c9a10f3b43f85b0b7d63bad64affd4da8aefee0b70884c5d6df70adc069c638379a1101594eeefcae40a7bde1c0f6253b91ea3f01eacde4ed8b35a05b95f SHA512 1f5f6a31ad7fcee675958bc63a679052dbad002dd32ba480a47bbc6d54c224e5bc35c54d213c2b7ba60ce624f9efb943896ded2383a50d01575b3fe78ba0d9a0
+AUX cfitsio-4.1.0-system-zlib.patch 2580 BLAKE2B 9c84cf98d1cfafa824c7122e1833927912af0993566750c06066426a08cdb66505ec62a5eab4018e7da7aed2ed55320018c0a0feb25c8a857dbcc4067f9cf49f SHA512 51d5c5edb6f19ad23f9ee91bfc84aba4b2aed4f53740e5721c1a9b68977549bcf00ac38c1dba0a073ce3b4525cc90239e9401de4d03702467efc72b0810dd69f
 DIST cfitsio-3.49.tar.gz 4934662 BLAKE2B ca8b701f0fec399d989efb61fdaa2bfbf49d0eea2d3ff47e156757c5a99bc77c23a1b91b4c91166696293c71c78210065dc48d0bb3c77039815f326d0ed55f0a SHA512 9836a4af3bbbfed1ea1b4c70b9d500ac485d7c3d8131eb8a25ee6ef6662f46ba52b5161c45c709ed9a601ff0e9ec36daa5650eaaf4f2cc7d6f4bb5640f10da15
 DIST cfitsio-4.0.0.tar.gz 4746177 BLAKE2B a43a21d29522cac84294e81ad5f0a45839c21c2fafcbde42504670e73757a41ebd91e42d086529df8139ce920446332f827b1abf027f8932ee73dd025103cd8e SHA512 a5b20bd6ad648450e99167f63813cc7523347aadfc9f85d2c0ed3ba7e4516b3bb6bc0851f209268f2cb045cdacc43a3da9e4506af4581f806ab9f4de248065fa
+DIST cfitsio-4.1.0.tar.gz 4305184 BLAKE2B 1edfce2b44ab990ed834b22dfc734af632f8f1401b6616f0c4322a3c40117123e52ba191610a3393c077f4a5fccd7462bcb4749e715cf2e9abae08edb1f1f8eb SHA512 bbbe10e890e74a30a9806dd2bbf711b3b1f15502b210b222d2d57cc083495c3b66b44927e4680f989045187fb7075f7187e2805ddcb4753ce53c68c3442cc813
 EBUILD cfitsio-3.490.ebuild 1718 BLAKE2B 6b89bbad5bc1876148a9360d47931bc3a03a3475a7860a01c1a6ea8ecd87d117c8f10eeff492664c2c284877b7d613aec1e926b472840dd8023b15bd9b0bc17f SHA512 a046886cb8c0e6ede4581128323f1959d24c27713e45f3443a4bfda7fed80f4917f17071a06acf34c891abe07d089ea24f4774f5cb1448da348c823ade163a31
-EBUILD cfitsio-4.0.0.ebuild 1682 BLAKE2B 7e6fd45d746a0d1dafa56d9de6c42000fdf513a7ca2d8d67b8266d3a593b0bbe399eeb2fbac00a3dcd24326f75e62e8c47dd7a86b34eddc6d8172295e05f8e2c SHA512 531824438b5b7527428287a951d165c8a19c6b6245662fbf42c1fd5fa42f5b11621c415b1a0681feead064f9881b38958c0b9127536140ce03041049f2cc057f
-MISC metadata.xml 736 BLAKE2B 460a16dc476e61655f45d7e300e6b556aec70a0fc1d85a832adf3fe1c75d0b657e2bdada3b7b04f5f24460b4fe50a5eecc83991047e70ea009acc565a0e50e7c SHA512 2896abb557ece0145f756ef1ef92a597c260b5a700aa6873efc253825e56524399cc4442c062588fd2eea8ed351385a1ffb23ebb4feb1b4b4b457c9be97e8676
+EBUILD cfitsio-4.0.0.ebuild 1677 BLAKE2B 63c18cc01c1c2037406c01e81d288a56537be3f39b72804306385005d664ac8077ef2db5225b7d585c84351ba6b7995dcbbc6da9dd4a90944acc25635dd56636 SHA512 3137d219a4c46b29f5930a965c10129b125af7887fcf1aed6e9f97e2b5903ef54b32a7984d034e4e98a4c44ab48cc7300c8508d3d0501f9df6575aaf9b10b8f0
+EBUILD cfitsio-4.1.0.ebuild 1807 BLAKE2B 492b65b81b8a2ceb64eb89531b044c8cb5e53c05d58b9d0380101a402789772e97577d7dd39dc3993b5514787ff0eb3b99c0866c71c503eedfc4ca2f0fe2f8ef SHA512 c772fdcb8c8b7c16f07cafe63db94ef7a32b4774d4002b2d43722ed7c3d3cba155e7b50df7c0f029cbf178eab0f61e73444e4d130fc5a204a8d9ba3c80aa307a
+MISC metadata.xml 881 BLAKE2B 2f978abf534047204754f13ca59b712e42fe1e9db77335f132cd323d9ea95bef5aa287ce154f77776617aebd56d52abc8d812fc06b5fa604173de669ce225c8f SHA512 54dc397e396a370b7660240dd0e04bfcc0ff249bdaf82046f89c94fffff552391e219a6314224227858d3343aea54bcb2b56d4cd3e1ae069bee749d5025717d4
diff --git a/sci-libs/cfitsio/cfitsio-4.0.0.ebuild b/sci-libs/cfitsio/cfitsio-4.0.0.ebuild
index 33e1c7b7b075..98a327a36e48 100644
--- a/sci-libs/cfitsio/cfitsio-4.0.0.ebuild
+++ b/sci-libs/cfitsio/cfitsio-4.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/9"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="bzip2 curl cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
 
 BDEPEND="
diff --git a/sci-libs/cfitsio/cfitsio-4.1.0.ebuild b/sci-libs/cfitsio/cfitsio-4.1.0.ebuild
new file mode 100644
index 000000000000..4a55f5bf63bc
--- /dev/null
+++ b/sci-libs/cfitsio/cfitsio-4.1.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fortran-2 multilib-minimal
+
+DESCRIPTION="C and Fortran library for manipulating FITS files"
+HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
+SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/9"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="bzip2 curl threads tools cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+"
+# Bug #803350
+DEPEND="${RDEPEND}
+	<dev-lang/cfortran-20110621
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.490-ldflags.patch"
+	"${FILESDIR}/${P}-system-zlib.patch"
+	"${FILESDIR}/${P}-pkgconfig.patch"
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Avoid internal cfortran
+	mv cfortran.h cfortran.h.disabled || die
+	ln -s "${EPREFIX}"/usr/include/cfortran.h . || die
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with bzip2)
+		$(use_enable curl)
+		$(use_enable threads reentrant)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable cpu_flags_x86_ssse3 ssse3)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if use tools ; then
+		emake utils
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc README docs/changes.txt
+
+	dodoc docs/{quick,cfitsio,fpackguide}.pdf
+	dodoc docs/fitsio.pdf
+
+	docinto examples
+	dodoc cookbook.c testprog.c speed.c smem.c
+	dodoc cookbook.f testf77.f
+
+	# Remove static libs
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/sci-libs/cfitsio/files/cfitsio-4.1.0-pkgconfig.patch b/sci-libs/cfitsio/files/cfitsio-4.1.0-pkgconfig.patch
new file mode 100644
index 000000000000..63502b77f756
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-4.1.0-pkgconfig.patch
@@ -0,0 +1,19 @@
+diff -ur a/cfitsio.pc.in b/cfitsio.pc.in
+--- a/cfitsio.pc.in	2022-05-26 17:25:47.094287274 +0200
++++ b/cfitsio.pc.in	2022-05-26 17:30:27.552413663 +0200
+@@ -1,12 +1,12 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir=@includedir@
++includedir=@includedir@/cfitsio
+ 
+ Name: cfitsio
+ Description: FITS File Subroutine Library
+ URL: https://heasarc.gsfc.nasa.gov/fitsio/
+ Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@.@CFITSIO_MICRO@
+ Libs: -L${libdir} -lcfitsio
+-Libs.private: -lm @LIBS@
+-Cflags: -I${includedir}
++Libs.private: -lm -lz @LIBS@
++Cflags: -D_REENTRANT -I${includedir}
diff --git a/sci-libs/cfitsio/files/cfitsio-4.1.0-system-zlib.patch b/sci-libs/cfitsio/files/cfitsio-4.1.0-system-zlib.patch
new file mode 100644
index 000000000000..6d740074857c
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-4.1.0-system-zlib.patch
@@ -0,0 +1,53 @@
+diff -ur a/Makefile.in b/Makefile.in
+--- a/Makefile.in	2022-05-26 17:33:37.986215858 +0200
++++ b/Makefile.in	2022-05-26 17:34:27.580944957 +0200
+@@ -102,7 +102,7 @@
+ shared: lib${PACKAGE}${SHLIB_SUFFIX}
+ 
+ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
+-		${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS_CURL} ${LIBS}
++		${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz -lbz2 ${LIBS_CURL} ${LIBS}
+ 		@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
+ 			ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
+ 			ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
+@@ -140,31 +140,31 @@
+ 		${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
+ 
+ smem:		smem.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz
+ 
+ testprog:	testprog.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ fpack:		fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ funpack:	funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ fitscopy:	fitscopy.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ speed:		speed.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ imcopy:		imcopy.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ cookbook:	cookbook.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ testf77:	testf77.o lib${PACKAGE}.a ${OBJECTS}
+-		${FC} ${LDFLAGS_BIN} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++		${FC} ${LDFLAGS_BIN} -o $@ ${@}.o -L. -l${PACKAGE} -lm -lz ${LIBS}
+ 
+ eval:		# Rebuild eval_* files from flex/bison source
+ 		${FLEX} -t eval.l > eval_l.c1
diff --git a/sci-libs/cfitsio/metadata.xml b/sci-libs/cfitsio/metadata.xml
index 7524e3a95041..47dcef290728 100644
--- a/sci-libs/cfitsio/metadata.xml
+++ b/sci-libs/cfitsio/metadata.xml
@@ -5,6 +5,11 @@
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
   </maintainer>
+  <use>
+    <flag name="tools">
+      Build optional utilities (cookbook fitscopy imcopy smem speed testprog fpack funpack)
+    </flag>
+  </use>
   <longdescription lang="en">
   CFITSIO is a library of C and Fortran subroutines for reading and
   writing data files in FITS (Flexible Image Transport System) data
diff --git a/sci-libs/cgnslib/Manifest b/sci-libs/cgnslib/Manifest
index 77fa6848460f..fb8fdc57c844 100644
--- a/sci-libs/cgnslib/Manifest
+++ b/sci-libs/cgnslib/Manifest
@@ -1,3 +1,5 @@
 DIST cgnslib-3.4.0.tar.gz 3393312 BLAKE2B 279d4502ff70701df6a266495ccc7750e9c51ac14bd3d5072ae8e1448b4f1e4afaefaaf254cf0afe1cc984e4d9fc7d5c161f7696f62726aaf567990ded3c9056 SHA512 e26cfb0d9f3061242d327a6c18fe40ed51bf63b61ae0d6b5cce7e6b4aa623b00e1c3fd9fe240d993323c6f4eec043fde5296a82b1f9108027f945300eec541ec
+DIST cgnslib-4.3.0.tar.gz 1472044 BLAKE2B 8fa59eb2c13b163553c03991af1886d2162295367094937c3b7bbbc687f098e736a927fb6835fabb43ecfbe59edcf0e58e8977e89eeb1ef12b26568fbdc78e2c SHA512 5db97b8df8cb5b108a65513e20774881c1dfa790dd96bec46119883d934db18e3f88450d287690cb785e0875af87a3ec32b6c4665c54edb623161122ee85aa93
 EBUILD cgnslib-3.4.0.ebuild 2084 BLAKE2B 51a8a6dd325255f70d60ce55ddc4870f6bee34cc30f7c98672626288be4ac17ae2a274ff31f80ec4262b6dd92cc4ac0513d26863177432674c7edf66a43771c8 SHA512 21b14ae07d64569ae4db22afb03b0623948beb190a99486e00a6565c10ca2adc77345acc75dfb2cde5c1adf9be27f21e34a117bbcfd4741f43ae5cfb59c0fa6f
-MISC metadata.xml 1127 BLAKE2B d9a24b01673d8f575e34aa978d76a225359ff04383cf713d9829389e55c926b77822ec1863358bb2f5f03382fc14e51dfdb941170b8392eff045f6bd9585d1ba SHA512 534402d03a0d0e530412888fd47275b8bcec951a3f91b3bfe0b3f5ef5439e26a4ff01f30657f69b7f4eb8ce1ea6a8bd5263a289c42e95ad2d1c9be2346fe39f5
+EBUILD cgnslib-4.3.0.ebuild 1923 BLAKE2B ccd9af332478c5410cbbecf56205bd3c542faf90bc5b39c356912ee5d9818927ed7230e456f0a84c0dc738d207cfb6366979b90a355a406ff4593df7976adb35 SHA512 b5d6c60df6fee3be87574eb2c725b635d03944fb9043bd0d88818d6dd8a9a4e0ad0edbefb4863979e272fbb65e60b876257f29e19f1516804ff39c26377c502e
+MISC metadata.xml 1273 BLAKE2B 05b98760182f6ab2586a969e7cd49a56b077f3c0f208460967b5b240cde12c3b62655223947646d48c743cb706b81e59693c693fbcdf703c75642958491d5902 SHA512 af36842f7cefc358474fd6b3646dda0974c0ee443d56babc48955340be64719b1c4548e952c93898265d6950f32bfb7db87472ca196b290ca13a8c20ed2244c2
diff --git a/sci-libs/cgnslib/cgnslib-4.3.0.ebuild b/sci-libs/cgnslib/cgnslib-4.3.0.ebuild
new file mode 100644
index 000000000000..dc10ae0dc1ec
--- /dev/null
+++ b/sci-libs/cgnslib/cgnslib-4.3.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED="fortran"
+FORTRAN_STANDARD="90 2003"
+
+inherit cmake fortran-2
+
+DESCRIPTION="CFD General Notation System standard library"
+HOMEPAGE="
+	https://cgns.github.io/
+	https://github.com/CGNS/CGNS
+"
+SRC_URI="https://github.com/CGNS/CGNS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/CGNS-${PV}"
+
+LICENSE="ZLIB"
+SLOT="0/4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="base-scope debug examples fortran hdf5 legacy mpi scoping szip test tools"
+
+RDEPEND="
+	hdf5? ( sci-libs/hdf5:=[mpi=,szip=] )
+	tools? (
+		dev-lang/tcl:=
+		dev-lang/tk:=
+		x11-libs/libXmu:=
+		virtual/glu
+		virtual/opengl
+	)
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="
+	fortran? ( test )
+	!test? ( test )
+"
+REQUIRED_USE="
+	mpi? ( hdf5 )
+	szip? ( hdf5 )
+"
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	# gentoo libdir
+	sed \
+		-e 's|/lib|/'$(get_libdir)'|' \
+		-e '/DESTINATION/s|lib|'$(get_libdir)'|g' \
+		-i src/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCGNS_BUILD_SHARED=ON
+		-DCGNS_USE_SHARED=ON
+
+		-DCGNS_BUILD_CGNSTOOLS="$(usex tools)"
+		-DCGNS_ENABLE_BASE_SCOPE="$(usex base-scope)"
+		-DCGNS_ENABLE_FORTRAN="$(usex fortran)"
+		-DCGNS_ENABLE_HDF5="$(usex hdf5)"
+		-DCGNS_ENABLE_LEGACY="$(usex legacy)"
+		-DCGNS_ENABLE_SCOPING="$(usex scoping)"
+		-DCGNS_ENABLE_MEM_DEBUG="$(usex debug)"
+		-DCGNS_ENABLE_TESTS="$(usex test)"
+	)
+
+	if use mpi; then
+		mycmakeargs+=(
+			-DHDF5_NEED_MPI="$(usex mpi)"
+			-DHDF5_NEED_SZIP="$(usex szip)"
+			-DHDF5_NEED_ZLIB="$(usex szip)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README.md release_docs/{HISTORY,RELEASE,changes_from_2.5}.txt
+	rm "${ED}/usr/$(get_libdir)/libcgns.a" || die
+	dodoc release_docs/*.pdf
+	docompress -x /usr/share/doc/${PF}/examples
+	use examples && dodoc -r src/examples
+}
diff --git a/sci-libs/cgnslib/metadata.xml b/sci-libs/cgnslib/metadata.xml
index c797f2727eb4..978347af49e6 100644
--- a/sci-libs/cgnslib/metadata.xml
+++ b/sci-libs/cgnslib/metadata.xml
@@ -10,7 +10,9 @@
 		an international steering committee.
 	</longdescription>
 	<use>
+		<flag name="base-scope">Enable base scoped families or connectivities</flag>
 		<flag name="legacy">Enable or disable building legacy code (3.0 compatible)</flag>
+		<flag name="scoping">Enable scoping of enumeration values</flag>
 		<flag name="tools">
 			A number of utility programs:
 			cgnscheck, cgnscompress, cgnsdiff, cgnslist, cgnsnames, cgnsupdate, cgnsconvert, adf2hdf, hdf2adf.
diff --git a/sci-libs/clblast/Manifest b/sci-libs/clblast/Manifest
index a5944c57135c..ed87a565ec1f 100644
--- a/sci-libs/clblast/Manifest
+++ b/sci-libs/clblast/Manifest
@@ -1,3 +1,6 @@
+AUX level2_xtrsv.patch 620 BLAKE2B ce46953c59e53e33315bfe3d8ccc78a6ec5e2bb72c1c67ad6717632ec07085569ed0195dc95072224df4fb665c87572c88ce6c879c452d5bee293222517ddacc SHA512 9a85a86dbfbb475ed3e9aef551efa5ad879bbefcfa0e5e2b16fe8047331b4c2954a6b3f56a06f4f672464dc9c2db3e2ba4049371274a5ececd049759036d4026
+AUX level3_xtrsv.patch 624 BLAKE2B 8c82e6ca64dce94dc02b99b5857fb148925cfdb16f4b778eb8e36d6c335a295de7c56d1cfe3c13ada1cb34aad9cb3d44ce1b48fe72406a788734c2501d7abee7 SHA512 ce7c4a545f58214b4235ba0345e5f3a76969856c91ccc839ccde5afe417c4f16dfe70be0d9f40f1e2f39781e3be508fcd93a03815189fe981d446e4a7b77fb35
 DIST clblast-1.5.2.tar.gz 419730 BLAKE2B 9954e39b490b75f3d989969260146ff9e9f5311865f13779e0ee8bc70578d6c51fd7c5e27af777a9d6c9703992d5acb164211aec39568f2f0ba1cf10db211b24 SHA512 6693704321bb7623a632ebfc71dcf07bbe4ba6c6f03a2ecf52bc10b401ae546bf82cdd3f6cc28aa9ea10f40dc7b2e86a6530f32cfbd522e24d4cf6a75c8c1100
+EBUILD clblast-1.5.2-r1.ebuild 1411 BLAKE2B ccd56d035ba87775285076122b94f9859e1538eecf5b7f8b94f93134c427660380b6ebdb8636839f005c911931416e9b87363ac8a4ef6cb5659e5b3c056b01ad SHA512 433dc281f3f711204c88f48692804535b378fe17f909484fcbe82b602584f626ad7f80e5e59a16fb169ef262eca06e3cf245d2f4cd1cef4b7d03e8239fc96ce5
 EBUILD clblast-1.5.2.ebuild 1320 BLAKE2B 0f0790cc4a4c3efb58c50c054942d2b2fc45b69f24f3dc4fcc35013c6c9442641d63d0ca4d1e4627654e0d75fc8d34b19fdd611b7f317985d04981362f567991 SHA512 e36a668a500acbcdc7a86652b1a75d46777c13a93d9a40e1eac1ca8dec0b89d7f1b41e77512662fbef0f2cea699cf9821425bfeebbafdc623630884d69c2a6db
 MISC metadata.xml 1123 BLAKE2B 76dfa4ab586b6d019a6ab22e8433a226f1bf03caa36da63355a702c47ce1de882b5a7049c872d759f869c679425fb4f4355b3c113dae574f1e77129f5fb30706 SHA512 8e0fbc24d8d8cc8f53869610d9b8533ea590cf1e7f3205445caa371f882efdde84a27abe8510764cd63daef83c4e62439b9e88cf439aacbd998e0f940d965b5d
diff --git a/sci-libs/clblast/clblast-1.5.2-r1.ebuild b/sci-libs/clblast/clblast-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..604dd3d840e1
--- /dev/null
+++ b/sci-libs/clblast/clblast-1.5.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MYPN="CLBlast"
+
+DESCRIPTION="Tuned OpenCL BLAS"
+HOMEPAGE="https://github.com/CNugteren/CLBlast"
+SRC_URI="https://github.com/CNugteren/${MYPN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MYPN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# Cuda is still beta, default to opencl
+IUSE="client cuda examples +opencl test"
+REQUIRED_USE="
+	^^ ( cuda opencl )
+	test? ( client )
+"
+# Tests require write access to /dev/dri/renderD...
+RESTRICT="test"
+# RESTRICT="!test? ( test )"
+
+RDEPEND="
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	client? ( virtual/cblas )
+	opencl? ( virtual/opencl )
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/level2_xtrsv.patch
+	"${FILESDIR}"/level3_xtrsv.patch
+)
+
+src_prepare() {
+	# no forced optimisation, libdir
+	sed -e 's/-O3//g' \
+		-e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/g' \
+		-i CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs+=(
+		-DBUILD_SHARED_LIBS=ON
+		-DSAMPLES="$(usex examples)"
+		-DCLIENTS="$(usex client)"
+		-DNETLIB="$(usex client)"
+		-DTESTS="$(usex test)"
+		-DOPENCL="$(usex opencl)"
+		-DCUDA="$(usex cuda)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README.md ROADMAP.md CONTRIBUTING.md CHANGELOG
+	dodoc -r doc
+}
diff --git a/sci-libs/clblast/files/level2_xtrsv.patch b/sci-libs/clblast/files/level2_xtrsv.patch
new file mode 100644
index 000000000000..c1e5890c986b
--- /dev/null
+++ b/sci-libs/clblast/files/level2_xtrsv.patch
@@ -0,0 +1,14 @@
+This fixes a bug in the upstream code.  There is an extra argument in
+the call to the x_buffer.CopyToAsync function that must be removed. Otherwise
+the build fails when CUDA is enabled.
+--- CLBlast/src/routines/level2/xtrsv.cpp	2022-05-21 08:44:13.811816246 -0600
++++ CLBlast_fixed/src/routines/level2/xtrsv.cpp	2022-05-21 08:28:34.601124921 -0600
+@@ -154,7 +154,7 @@
+   }
+ 
+   // Retrieves the results
+-  x_buffer.CopyToAsync(queue_, x_size, b_buffer, event_);
++  x_buffer.CopyToAsync(queue_, x_size, b_buffer);
+ }
+ 
+ // =================================================================================================
diff --git a/sci-libs/clblast/files/level3_xtrsv.patch b/sci-libs/clblast/files/level3_xtrsv.patch
new file mode 100644
index 000000000000..abba1cd23026
--- /dev/null
+++ b/sci-libs/clblast/files/level3_xtrsv.patch
@@ -0,0 +1,14 @@
+This fixes a problem in the upstream code.  There is an extra argument in
+the call to the x_buffer.CopyToAsync function that must be removed. Otherwise
+the build fails when CUDA is enabled.
+--- CLBlast/src/routines/level3/xtrsm.cpp	2022-05-21 08:44:13.815816361 -0600
++++ CLBlast_fixed/src/routines/level3/xtrsm.cpp	2022-05-21 08:28:06.756355738 -0600
+@@ -246,7 +246,7 @@
+   }
+ 
+   // Retrieves the results
+-  x_buffer.CopyToAsync(queue_, b_size, b_buffer, event_);
++  x_buffer.CopyToAsync(queue_, b_size, b_buffer);
+ }
+ 
+ // =================================================================================================
diff --git a/sci-libs/coinor-csdp/Manifest b/sci-libs/coinor-csdp/Manifest
index 0779c7b4a691..f8027a684551 100644
--- a/sci-libs/coinor-csdp/Manifest
+++ b/sci-libs/coinor-csdp/Manifest
@@ -1,4 +1,4 @@
 AUX coinor-csdp-6.2.0_toolchain-vars.patch 2795 BLAKE2B 4a3278cab9ddd6991a78dfea8a82df6cd572f761517208d0dd861b2681f0ec31e341305882bdb1215253920508fd09d9373b59c700a1137d019ff71ab265a935 SHA512 c8c58cfc511076067795be183795c3519fc93572d44756671ba6ef58a65662782d413559e6f8b38a9c6e166d23ef5bc884d4209f849fe766e1d803ccaacc5f65
 DIST coinor-csdp-6.2.0.tar.gz 526179 BLAKE2B af2ac8cb4268aef006cf68fb85d344a0f9eb9f47b78c38e176c24f87ac1c88059cf47eb40cf638d131e093b6d469b6a458a1eb59fa8eb33c53b49d1a4c50aae2 SHA512 6362e174f2935645dac359c48879c42cfd387c403fc264974922322de2f02f5ffac5a35f991eb793cf8ba5516a144f5e107d1cddd0ec0da79e7ebb9c1375269f
-EBUILD coinor-csdp-6.2.0.ebuild 2717 BLAKE2B d90a47d9a029d7ac8560c4f7820ed0822f44280723f7be020167718ed0653e8a308023574ed46099bb5593de8d013f29afdd6a41fdea15a9f1f6659e238afc5e SHA512 71ee5aae32bb60a3a4557ebc2e028ab38b9b80b146a23513f94a83621001dbd53a6b4f89ed05ca0f9d5e09330b2b51d05d88ddfc9473fe9be849468935f27eec
+EBUILD coinor-csdp-6.2.0.ebuild 2787 BLAKE2B b6fe23e0a8f1e6527f13414c2e8b2cc2089e0621f8024e49a529a45cce4a428258e8f6dc4f723985a95cd0db83170ed99f80dae642a9bae5da50aaac9f189fcb SHA512 14fb472e9c47d82f6ac500f92586eb24549a8beb497c914fa568756583ec984f078990eae4b536c2936345e155f86ef28609521031f7b9846abb3b35169e2df7
 MISC metadata.xml 884 BLAKE2B ebe74eef2755e5db041a0da7b9f422f25b0862522d96503c8e3ca73851ab87af72d433723a463ca100253bde856a02fda9f82d116f54569272894c7b59602a14 SHA512 07b7fd9ba383cae23255d7e6dd3955f498c62b0ba200ceed34552950925ae590c985413fbdf3a5ae1d7b2964f6799a881e0fb6d56136533aa76b8c8da347a165
diff --git a/sci-libs/coinor-csdp/coinor-csdp-6.2.0.ebuild b/sci-libs/coinor-csdp/coinor-csdp-6.2.0.ebuild
index a00b0d8e16f1..89c14acd5dff 100644
--- a/sci-libs/coinor-csdp/coinor-csdp-6.2.0.ebuild
+++ b/sci-libs/coinor-csdp/coinor-csdp-6.2.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=8
@@ -60,10 +60,12 @@ static_to_shared() {
 	fi
 }
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		 use openmp && tc-check-openmp
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {
diff --git a/sci-libs/cqrlib/Manifest b/sci-libs/cqrlib/Manifest
index d9a57e4f7501..a89fbf30f893 100644
--- a/sci-libs/cqrlib/Manifest
+++ b/sci-libs/cqrlib/Manifest
@@ -1,4 +1,8 @@
 AUX 1.0.6-gentoo.patch 4265 BLAKE2B 61e9f8fab6c84a1d809895b9de3b7106ab47853c60bf6c60f6a5676f6812ace111afdece07154174151befe6af8efb9ee5a406175fdb62f6fcd5f3974c07a18e SHA512 9a21d5950e378d041dc5fb318debc1790701fd3a8e2f8c651c9a77b526f641c1a5a2a1615c6c3af114f1a5a6e9246b30bbd774f15fc9eeefaf154a13e561a44e
+AUX 1.1.4-build.patch 14479 BLAKE2B 79cee0cc380ee3e9f703a9da8cf307e92093f56fd0f951a95b764276ac5e6e732622b31f72e7f1711fce0a94222684bd3fefab4b94cc04b41730511f58badb1b SHA512 c55e53f13884660f499841c6c658b3c1ea3a88a5a78a409af92e753568748dfad8d36261a092dfa1b2511b5b991d440155a17a3de45dd2688f0f199dbfe30078
+AUX 1.1.4-libtool.patch 2256 BLAKE2B a70f6288a6f0343b725f2231c3aaa89e0b72c204f3463724478771d4b4143f2c2b7671a2a8e1c99d6790f5eba51f08a2e5b991c52279e2468f72d2789d7e5296 SHA512 d03c094be631f67346cc3d0409d25173b76a979622f52913055f55501fb5050e1c686a862819cb28bb20467867af770af858e0a7e9b8706f391792714d12147c
 DIST CQRlib-1.1.3.tar.gz 93987 BLAKE2B d95dc83f92c322fe6185c8a9989d4814bcae95ac870c2555c5cce0e4279a676180050b0e23bc29cc1032f3ee7a7e2ccc8bbe75be7dba4e336a27afda532aadc4 SHA512 49ee134171bc4736513556781cc978599a3017c0692cf48fba876b2cf8d846ff9b1bbce41c0beba3836701de0dc00d987142253683cd9c1da71586435a5c4010
+DIST cqrlib-1.1.4.tar.gz 41521 BLAKE2B 2b69dbf401de9908886798425ec33c28c55ef4b892d35883ffe3c715ddff03fb81b32222b6c755c3c690a016b2ded72e965d83408f14b316913e6f8c7ebb5a41 SHA512 14f49ebc5f562b31081cd53c738aa1571cbefb369ebfe4ca8c27af07a691e4eae288fcf374527453b8d6e36a114a97be26204909be478bd67fb8d94934b1bec7
 EBUILD cqrlib-1.1.3.ebuild 1133 BLAKE2B de0b1366ca00249d4c5ea6a6a74240931fb414aaac076474d82c37da0692d6d831f22806c62f169d7ac683835f8fa361e34c0591fcd095053743477e75641cd0 SHA512 4876fe152990789bd65d32b8ef90eb868f0691821943ee8f19d4834f171f46a2437526f8717a1f4e16a8e21ddcbad9fa2c6a54cb239bd55598d0a54d7839e54c
-MISC metadata.xml 340 BLAKE2B 6a3f4f36879758c497632683f752e8df8bd369512d79fc60c827efb4702c9ccb52d2080a04eb83899688c2b93caf018599f79ede9b01db21c9fc4e8fea1cdc0e SHA512 72de0065a012384c67bb71c515d154d8b7a13783ccc4d04f28c520320b88fc6591cfee7f9a989c5317d6a6013993713bf45a0418abc060f551ce337d779bad25
+EBUILD cqrlib-1.1.4.ebuild 896 BLAKE2B e2eeb1254455181c6c67841ca764cd5fae3e44da6adbef504555e88e6b4d31de828707f135bc022dbe8bbbff06a53551f1dc7a37177bb308d59c3159a0542869 SHA512 d5b6b4874d5348818b6159bf9bc1d5c60dfb074463ff34adf87da2f9b9f0ec5a6629da9fb9aa2ca82e264f0600ab20f1bb909148f66344cfa8d30fc055cee6a2
+MISC metadata.xml 396 BLAKE2B 0426ec41f80319a5d8791686185e2e64e33c519626b0ba0129b302476798ff667ae3ce840d0395a2ed67cb822fb7f3281dad2dcd08b4ebe57e8f3d08e29a010e SHA512 b9c8fc0431ab8d8921cb169869f5368a989e3870d214ef8e278318d10550cbf89cfd77721e0da83a9ef727cd22d5e82a6ede3b24a4f0278216b585a2a78bf09d
diff --git a/sci-libs/cqrlib/cqrlib-1.1.4.ebuild b/sci-libs/cqrlib/cqrlib-1.1.4.ebuild
new file mode 100644
index 000000000000..525ebb014f17
--- /dev/null
+++ b/sci-libs/cqrlib/cqrlib-1.1.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_PN=CQRlib
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Utility library for quaternion arithmetic / rotation math (ANSI C implemented)"
+HOMEPAGE="http://cqrlib.sourceforge.net/"
+SRC_URI="https://github.com/yayahjb/${PN}/archive/${MY_P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/cvector"
+DEPEND="${RDEPEND}"
+
+DOCS=( README_CQRlib.txt )
+HTML_DOCS=( README_CQRlib.html )
+
+S="${WORKDIR}"/${PN}-${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PV}-libtool.patch" # 778911
+	"${FILESDIR}/${PV}-build.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	emake all
+}
+
+src_test() {
+	emake tests
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/cqrlib/files/1.1.4-build.patch b/sci-libs/cqrlib/files/1.1.4-build.patch
new file mode 100644
index 000000000000..d7b20e33338e
--- /dev/null
+++ b/sci-libs/cqrlib/files/1.1.4-build.patch
@@ -0,0 +1,331 @@
+Upstream-PR: https://github.com/yayahjb/cqrlib/pull/1
+
+From d1a82913a39168bb6d519fd7d2e14e23f4e9f291 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 23:39:18 -0700
+Subject: [PATCH 1/7] build: Fix parallel make
+
+The build will fail with slibtool when the required directories do not
+yet exist. This is because slibtool is significantly faster than GNU
+libtool...
+---
+ Makefile.in | 26 ++++++++------------------
+ 1 file changed, 8 insertions(+), 18 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index fe556ff..59a508e 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -189,12 +189,13 @@ default:
+ #
+ # Compile the library and examples
+ #
+-all:	$(LIB) $(BIN) $(SOURCE) $(HEADERS) \
++all:	$(LIB)/.tag $(BIN)/.tag $(SOURCE) $(HEADERS) \
+ 		$(LIB)/libCQRlib.$(LIB_EXT) \
+ 		$(BIN)/CQRlibTest $(BIN)/CPPQRTest
+ 		
+-install:  all $(INSTALLDIR) $(INSTALLDIR)/lib $(INSTALLDIR)/include \
+-          $(INC) $(LIB)/libCQRlib.$(LIB_EXT)  $(INC)/cqrlib.h
++install:  all $(LIB)/libCQRlib.$(LIB_EXT) $(INC)/cqrlib.h
++		  @mkdir -p $(INSTALLDIR)/lib
++		  @mkdir -p $(INSTALLDIR)/include
+ 		  $(INSTALL_COMMAND) $(LIB)/libCQRlib.$(LIB_EXT) $(INSTALLDIR)/lib/libCQRlib.$(LIB_EXT)
+ 		  $(INSTALL_FINISH_COMMAND) $(INSTALLDIR)/lib/libCQRlib.$(LIB_EXT)
+ 		  -cp $(INSTALLDIR)/include/cqrlib.h $(INSTALLDIR)/include/CQRlib_old.h
+@@ -228,24 +229,13 @@ install:  all $(INSTALLDIR) $(INSTALLDIR)/lib $(INSTALLDIR)/include \
+ #
+ # Directories
+ #
+-$(INSTALLDIR):
+-	mkdir -p $(INSTALLDIR)
+-
+-$(INSTALLDIR)/lib:  $(INSTALLDIR)
+-	mkdir -p $(INSTALLDIR)/lib
+-
+-$(INSTALLDIR)/bin:  $(INSTALLDIR)
+-	mkdir -p $(INSTALLDIR)/bin
+-
+-$(INSTALLDIR)/include:  $(INSTALLDIR)
+-	mkdir -p $(INSTALLDIR)/include
+-	
+-
+-$(LIB):
++$(LIB)/.tag:
+ 	mkdir $(LIB)
++	@touch $@
+ 
+-$(BIN):
++$(BIN)/.tag:
+ 	mkdir $(BIN)
++	@touch $@
+ 
+ #
+ # CQRlib library
+
+From 3cdf6a442228d63c8f771fc0822d74d75fe8b486 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 23:40:46 -0700
+Subject: [PATCH 2/7] build: Use the .la file to link
+
+The correct way to link with internal dependencies and libtool is to use
+the .la files. When using the linker flag directly the build will fail
+with slibtool when it doesn't know where the required library is
+located.
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 59a508e..ab21e89 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -203,13 +203,13 @@ install:  all $(LIB)/libCQRlib.$(LIB_EXT) $(INC)/cqrlib.h
+ 		  chmod 644 $(INSTALLDIR)/include/cqrlib.h
+ 		  echo "Testing final install dynamic"
+ 		  $(BUILD_COMMAND_DYNAMIC)  $(EXAMPLES)/CQRlibTest.c \
+-		  -lCQRlib -lm -o $(BIN)/CQRlibTest_dynamic
++		  $(LIB)/libCQRlib.la -lm -o $(BIN)/CQRlibTest_dynamic
+ 		  $(BIN)/CQRlibTest_dynamic > $(TESTDATA)/CQRlibTest_dynamic.lst
+ 		  diff -b -c $(TESTDATA)/CQRlibTest_orig.lst \
+ 		    $(TESTDATA)/CQRlibTest_dynamic.lst
+ 		  echo "Testing final install static"
+ 		  $(BUILD_COMMAND_STATIC) $(EXAMPLES)/CQRlibTest.c \
+-		   -lCQRlib -lm -o $(BIN)/CQRlibTest_static
++		   $(LIB)/libCQRlib.la -lm -o $(BIN)/CQRlibTest_static
+ 		  $(BIN)/CQRlibTest_static > $(TESTDATA)/CQRlibTest_static.lst
+ 		  diff -b -c $(TESTDATA)/CQRlibTest_orig.lst \
+ 		    $(TESTDATA)/CQRlibTest_static.lst
+
+From b81e63099004e53f1bfd984f00a4b878485b13b1 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 23:59:24 -0700
+Subject: [PATCH 3/7] build: Use standard install variables
+
+---
+ Makefile.in | 40 ++++++++++++++++++++++------------------
+ 1 file changed, 22 insertions(+), 18 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index ab21e89..22e1ffd 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -72,8 +72,12 @@ SRC      = $(top_builddir)
+ INC      = $(top_builddir)
+ EXAMPLES = $(top_builddir)
+ TESTDATA = $(top_builddir)
+-#INSTALLDIR = /usr/local
+-INSTALLDIR  = $(HOME)
++
++prefix := @prefix@
++exec_prefix := @exec_prefix@
++
++LIBDIR := @libdir@
++INCDIR := @includedir@
+ 
+ #
+ # Include directories
+@@ -85,15 +89,15 @@ INCLUDES = -I$(INC)
+ endif
+ 
+ COMPILE_COMMAND         =  $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
+-LIBRARY_LINK_COMMAND    =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib
++LIBRARY_LINK_COMMAND    =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -rpath $(LIBDIR)
+ BUILD_COMMAND_LOCAL     =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
+-BUILD_COMMAND_DYNAMIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -dynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
+-BUILD_COMMAND_STATIC    =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
++BUILD_COMMAND_DYNAMIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -dynamic $(INCLUDES)
++BUILD_COMMAND_STATIC    =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static $(INCLUDES)
+ CPPCOMPILE_COMMAND      =  $(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(INCLUDES) $(WARNINGS) -c
+-CPPLIBRARY_LINK_COMMAND =  $(LIBTOOL) --mode=link $(CXX) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib
++CPPLIBRARY_LINK_COMMAND =  $(LIBTOOL) --mode=link $(CXX) -version-info $(VERSION) -rpath $(LIBDIR)
+ CPPBUILD_COMMAND_LOCAL  =  $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) $(INCLUDES)
+-CPPBUILD_COMMAND_DYNAMIC=  $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -dynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
+-CPPBUILD_COMMAND_STATIC =  $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib
++CPPBUILD_COMMAND_DYNAMIC=  $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -dynamic $(INCLUDES)
++CPPBUILD_COMMAND_STATIC =  $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -static $(INCLUDES)
+ INSTALL_COMMAND         =  $(LIBTOOL) --mode=install cp
+ INSTALL_FINISH_COMMAND  =  $(LIBTOOL) --mode=finish
+ 
+@@ -162,9 +166,9 @@ default:
+ 	@echo ' '
+ 	@echo ' The current values are :'
+ 	@echo ' '
+-	@echo '   $(INSTALLDIR) '	
+-	@echo '   $(INSTALL_COMMAND) '	
+-	@echo '   $(INSTALL_FINISH) '	
++	@echo '   $(DESTDIR) '
++	@echo '   $(INSTALL_COMMAND) '
++	@echo '   $(INSTALL_FINISH) '
+ 	@echo ' '
+ 	@echo ' To compile the CQRlib library and example programs type:'
+ 	@echo ' '
+@@ -194,13 +198,13 @@ all:	$(LIB)/.tag $(BIN)/.tag $(SOURCE) $(HEADERS) \
+ 		$(BIN)/CQRlibTest $(BIN)/CPPQRTest
+ 		
+ install:  all $(LIB)/libCQRlib.$(LIB_EXT) $(INC)/cqrlib.h
+-		  @mkdir -p $(INSTALLDIR)/lib
+-		  @mkdir -p $(INSTALLDIR)/include
+-		  $(INSTALL_COMMAND) $(LIB)/libCQRlib.$(LIB_EXT) $(INSTALLDIR)/lib/libCQRlib.$(LIB_EXT)
+-		  $(INSTALL_FINISH_COMMAND) $(INSTALLDIR)/lib/libCQRlib.$(LIB_EXT)
+-		  -cp $(INSTALLDIR)/include/cqrlib.h $(INSTALLDIR)/include/CQRlib_old.h
+-		  cp $(INC)/cqrlib.h $(INSTALLDIR)/include/cqrlib.h
+-		  chmod 644 $(INSTALLDIR)/include/cqrlib.h
++		  @mkdir -p $(DESTDIR)$(INCDIR)
++		  @mkdir -p $(DESTDIR)$(LIBDIR)
++		  $(INSTALL_COMMAND) $(LIB)/libCQRlib.$(LIB_EXT) $(DESTDIR)$(LIBDIR)/libCQRlib.$(LIB_EXT)
++		  $(INSTALL_FINISH_COMMAND) $(DESTDIR)$(LIBDIR)/libCQRlib.$(LIB_EXT)
++		  -cp $(DESTDIR)$(INCDIR)/cqrlib.h $(DESTDIR)$(INCDIR)/CQRlib_old.h
++		  cp $(INC)/cqrlib.h $(DESTDIR)$(INCDIR)/cqrlib.h
++		  chmod 644 $(DESTDIR)$(INCDIR)/cqrlib.h
+ 		  echo "Testing final install dynamic"
+ 		  $(BUILD_COMMAND_DYNAMIC)  $(EXAMPLES)/CQRlibTest.c \
+ 		  $(LIB)/libCQRlib.la -lm -o $(BIN)/CQRlibTest_dynamic
+
+From f3f780c5504b0f689a37062bb8820a638e0abeb6 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sun, 19 Jun 2022 00:04:58 -0700
+Subject: [PATCH 4/7] build: Support LDFLAGS
+
+---
+ Makefile.in | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 22e1ffd..192aef9 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -49,6 +49,7 @@ CC = @CC@
+ CXX = @CXX@
+ CFLAGS  = -g -O2  -Wall -ansi -pedantic
+ CPPFLAGS = $(CFLAGS) -DCQR_NOCCODE=1
++LDFLAGS = @LDFLAGS@
+ 
+ # Build directory
+ top_builddir = @top_builddir@
+@@ -89,12 +90,12 @@ INCLUDES = -I$(INC)
+ endif
+ 
+ COMPILE_COMMAND         =  $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
+-LIBRARY_LINK_COMMAND    =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -rpath $(LIBDIR)
++LIBRARY_LINK_COMMAND    =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -rpath $(LIBDIR) $(LDFLAGS)
+ BUILD_COMMAND_LOCAL     =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
+ BUILD_COMMAND_DYNAMIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -dynamic $(INCLUDES)
+ BUILD_COMMAND_STATIC    =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static $(INCLUDES)
+ CPPCOMPILE_COMMAND      =  $(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(INCLUDES) $(WARNINGS) -c
+-CPPLIBRARY_LINK_COMMAND =  $(LIBTOOL) --mode=link $(CXX) -version-info $(VERSION) -rpath $(LIBDIR)
++CPPLIBRARY_LINK_COMMAND =  $(LIBTOOL) --mode=link $(CXX) -version-info $(VERSION) -rpath $(LIBDIR) $(LDFLAGS)
+ CPPBUILD_COMMAND_LOCAL  =  $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) $(INCLUDES)
+ CPPBUILD_COMMAND_DYNAMIC=  $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -dynamic $(INCLUDES)
+ CPPBUILD_COMMAND_STATIC =  $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -static $(INCLUDES)
+
+From dd4f0a4fb0cd30a472140cd1c3a3b35b1bb063a4 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sun, 19 Jun 2022 00:36:06 -0700
+Subject: [PATCH 5/7] build: Fix make install
+
+---
+ Makefile.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 192aef9..3613e37 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -203,7 +203,6 @@ install:  all $(LIB)/libCQRlib.$(LIB_EXT) $(INC)/cqrlib.h
+ 		  @mkdir -p $(DESTDIR)$(LIBDIR)
+ 		  $(INSTALL_COMMAND) $(LIB)/libCQRlib.$(LIB_EXT) $(DESTDIR)$(LIBDIR)/libCQRlib.$(LIB_EXT)
+ 		  $(INSTALL_FINISH_COMMAND) $(DESTDIR)$(LIBDIR)/libCQRlib.$(LIB_EXT)
+-		  -cp $(DESTDIR)$(INCDIR)/cqrlib.h $(DESTDIR)$(INCDIR)/CQRlib_old.h
+ 		  cp $(INC)/cqrlib.h $(DESTDIR)$(INCDIR)/cqrlib.h
+ 		  chmod 644 $(DESTDIR)$(INCDIR)/cqrlib.h
+ 		  echo "Testing final install dynamic"
+
+From 59b95069aab8885919c8b91c825c14384c3d8087 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sun, 19 Jun 2022 20:09:46 -0700
+Subject: [PATCH 6/7] build: Fix compile flags
+
+This sets the compile flags using the configure process and changes
+CPPFLAGS to CXXFLAGS as is standard. CPPFLAGS is also supported now
+which are for setting defines for both C and CXX builds.
+---
+ Makefile.in | 27 ++++++++++++++++-----------
+ 1 file changed, 16 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 3613e37..e4c6942 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -47,8 +47,10 @@ RELEASE = @PACKAGE_VERSION@
+ #
+ CC = @CC@
+ CXX = @CXX@
+-CFLAGS  = -g -O2  -Wall -ansi -pedantic
+-CPPFLAGS = $(CFLAGS) -DCQR_NOCCODE=1
++CFLAGS  = @CFLAGS@
++CXXFLAGS = @CXXFLAGS@
++CPPFLAGS = @CPPFLAGS@
++WARNINGS = -Wall -ansi -pedantic
+ LDFLAGS = @LDFLAGS@
+ 
+ # Build directory
+@@ -89,16 +91,19 @@ else
+ INCLUDES = -I$(INC)
+ endif
+ 
+-COMPILE_COMMAND         =  $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
+-LIBRARY_LINK_COMMAND    =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -rpath $(LIBDIR) $(LDFLAGS)
+-BUILD_COMMAND_LOCAL     =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
+-BUILD_COMMAND_DYNAMIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -dynamic $(INCLUDES)
+-BUILD_COMMAND_STATIC    =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static $(INCLUDES)
+-CPPCOMPILE_COMMAND      =  $(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(INCLUDES) $(WARNINGS) -c
++COMPILE_C = $(CC) -std=c90 $(WARNINGS) $(CPPFLAGS) $(CFLAGS)
++COMPILE_CXX = $(CXX) -std=c++98 $(WARNINGS) $(CPPFLAGS) -DCQR_NOCCODE=1 $(CXXFLAGS)
++
++COMPILE_COMMAND         =  $(LIBTOOL) --mode=compile $(COMPILE_C) $(INCLUDES) -c
++LIBRARY_LINK_COMMAND    =  $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -rpath $(LIBDIR) $(LDFLAGS)
++BUILD_COMMAND_LOCAL     =  $(LIBTOOL) --mode=link $(COMPILE_C) $(INCLUDES)
++BUILD_COMMAND_DYNAMIC   =  $(LIBTOOL) --mode=link $(COMPILE_C) -dynamic $(INCLUDES)
++BUILD_COMMAND_STATIC    =  $(LIBTOOL) --mode=link $(COMPILE_C) -static $(INCLUDES)
++CPPCOMPILE_COMMAND      =  $(LIBTOOL) --mode=compile $(COMPILE_CXX) $(INCLUDES) -c
+ CPPLIBRARY_LINK_COMMAND =  $(LIBTOOL) --mode=link $(CXX) -version-info $(VERSION) -rpath $(LIBDIR) $(LDFLAGS)
+-CPPBUILD_COMMAND_LOCAL  =  $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) $(INCLUDES)
+-CPPBUILD_COMMAND_DYNAMIC=  $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -dynamic $(INCLUDES)
+-CPPBUILD_COMMAND_STATIC =  $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) -static $(INCLUDES)
++CPPBUILD_COMMAND_LOCAL  =  $(LIBTOOL) --mode=link $(COMPILE_CXX) $(INCLUDES)
++CPPBUILD_COMMAND_DYNAMIC=  $(LIBTOOL) --mode=link $(COMPILE_CXX) -dynamic $(INCLUDES)
++CPPBUILD_COMMAND_STATIC =  $(LIBTOOL) --mode=link $(COMPILE_CXX) -static $(INCLUDES)
+ INSTALL_COMMAND         =  $(LIBTOOL) --mode=install cp
+ INSTALL_FINISH_COMMAND  =  $(LIBTOOL) --mode=finish
+ 
+
+From 87cd184f4df7188380251346dcda502fa21f8cdd Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sun, 19 Jun 2022 20:28:48 -0700
+Subject: [PATCH 7/7] build: Change -dynamic to -shared
+
+With libtool shared libraries can be created with -shared.
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e4c6942..9b407c1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -97,12 +97,12 @@ COMPILE_CXX = $(CXX) -std=c++98 $(WARNINGS) $(CPPFLAGS) -DCQR_NOCCODE=1 $(CXXFLA
+ COMPILE_COMMAND         =  $(LIBTOOL) --mode=compile $(COMPILE_C) $(INCLUDES) -c
+ LIBRARY_LINK_COMMAND    =  $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -rpath $(LIBDIR) $(LDFLAGS)
+ BUILD_COMMAND_LOCAL     =  $(LIBTOOL) --mode=link $(COMPILE_C) $(INCLUDES)
+-BUILD_COMMAND_DYNAMIC   =  $(LIBTOOL) --mode=link $(COMPILE_C) -dynamic $(INCLUDES)
++BUILD_COMMAND_DYNAMIC   =  $(LIBTOOL) --mode=link $(COMPILE_C) -shared $(INCLUDES)
+ BUILD_COMMAND_STATIC    =  $(LIBTOOL) --mode=link $(COMPILE_C) -static $(INCLUDES)
+ CPPCOMPILE_COMMAND      =  $(LIBTOOL) --mode=compile $(COMPILE_CXX) $(INCLUDES) -c
+ CPPLIBRARY_LINK_COMMAND =  $(LIBTOOL) --mode=link $(CXX) -version-info $(VERSION) -rpath $(LIBDIR) $(LDFLAGS)
+ CPPBUILD_COMMAND_LOCAL  =  $(LIBTOOL) --mode=link $(COMPILE_CXX) $(INCLUDES)
+-CPPBUILD_COMMAND_DYNAMIC=  $(LIBTOOL) --mode=link $(COMPILE_CXX) -dynamic $(INCLUDES)
++CPPBUILD_COMMAND_DYNAMIC=  $(LIBTOOL) --mode=link $(COMPILE_CXX) -shared $(INCLUDES)
+ CPPBUILD_COMMAND_STATIC =  $(LIBTOOL) --mode=link $(COMPILE_CXX) -static $(INCLUDES)
+ INSTALL_COMMAND         =  $(LIBTOOL) --mode=install cp
+ INSTALL_FINISH_COMMAND  =  $(LIBTOOL) --mode=finish
diff --git a/sci-libs/cqrlib/files/1.1.4-libtool.patch b/sci-libs/cqrlib/files/1.1.4-libtool.patch
new file mode 100644
index 000000000000..da189845f0e5
--- /dev/null
+++ b/sci-libs/cqrlib/files/1.1.4-libtool.patch
@@ -0,0 +1,105 @@
+Bug: https://bugs.gentoo.org/778911
+Upstream-PR: https://github.com/yayahjb/cqrlib/pull/1
+
+From 23f422c3049185ad0f24b9f0317b52a21ea771f3 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 23:02:44 -0700
+Subject: [PATCH] build: Add minimal configure.ac
+
+When building with slibtool using the rlibtool symlink the build will
+fail when it fails to find the generated libtool. This file is required
+for rlibtool because it is used to determine if building shared or
+static.
+
+This will require these commands to build:
+
+  autoreconf -fi
+  ./configure
+  make
+
+Gentoo Bug: https://bugs.gentoo.org/778911
+---
+ Makefile => Makefile.in | 29 +++++++++++++----------------
+ configure.ac            | 10 ++++++++++
+ 2 files changed, 23 insertions(+), 16 deletions(-)
+ rename Makefile => Makefile.in (97%)
+ create mode 100644 configure.ac
+
+diff --git a/Makefile b/Makefile.in
+similarity index 97%
+rename from Makefile
+rename to Makefile.in
+index 555e370..fe556ff 100644
+--- a/Makefile
++++ b/Makefile.in
+@@ -40,41 +40,38 @@
+ 
+ # Version string
+ VERSION = 3:0:1
+-RELEASE = 1.1.0
+-
++RELEASE = @PACKAGE_VERSION@
+ 
+ #
+ # Compiler and compilation flags
+ #
+-CC	= gcc
+-CXX = g++
++CC = @CC@
++CXX = @CXX@
+ CFLAGS  = -g -O2  -Wall -ansi -pedantic
+ CPPFLAGS = $(CFLAGS) -DCQR_NOCCODE=1
+ 
++# Build directory
++top_builddir = @top_builddir@
++
+ #
+ # libtool path if system default is not suitable
+ #
+-#LIBTOOL = $(HOME)/bin/libtool
+-ifndef LIBTOOL
+-  LIBTOOL = libtool
+-endif
++LIBTOOL = @LIBTOOL@
+ 
+ #
+ # If local headers must be quoted uncomment the next line
+ #
+ #USE_LOCAL_HEADERS = 1
+ 
+-
+ #
+ # Directories
+ #
+-ROOT     = .
+-LIB      = $(ROOT)/lib
+-BIN      = $(ROOT)/bin
+-SRC      = $(ROOT)
+-INC      = $(ROOT)
+-EXAMPLES = $(ROOT)
+-TESTDATA = $(ROOT)
++LIB      = $(top_builddir)/lib
++BIN      = $(top_builddir)/bin
++SRC      = $(top_builddir)
++INC      = $(top_builddir)
++EXAMPLES = $(top_builddir)
++TESTDATA = $(top_builddir)
+ #INSTALLDIR = /usr/local
+ INSTALLDIR  = $(HOME)
+ 
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..6af5b28
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,10 @@
++AC_INIT([cqrlib], [1.1.4])
++AC_CONFIG_FILES([Makefile])
++
++LT_INIT
++
++AC_PROG_CXX
++
++AC_SUBST([top_builddir], [$abs_builddir])
++
++AC_OUTPUT
diff --git a/sci-libs/cqrlib/metadata.xml b/sci-libs/cqrlib/metadata.xml
index 5bc340b2ec67..b8e1e1e8db7d 100644
--- a/sci-libs/cqrlib/metadata.xml
+++ b/sci-libs/cqrlib/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="sourceforge">cqrlib</remote-id>
+    <remote-id type="github">yayahjb/cqrlib</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
index f73d8d75495a..118989ac450f 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -1,3 +1,7 @@
+AUX dcmtk-3.6.5-rename-bundled-charls.patch 2913 BLAKE2B 246d283ccb98606faaee4ef6ad25368ee47e6c96ef44e334d774625b375788e5c1ae41ca3aa6048ff6c76b1ddaae242d3c783875fe7e9e9c740675e96d8a2495 SHA512 dce186372d22e7b5ae06d3fe623029e95b9cb40005716fc97cd7493ba4fd6c4694228d878941efd9a0f57b2424f713edbebb38ed607ed2e84b65a368f647bab6
 DIST dcmtk-3.6.5.tar.gz 6483626 BLAKE2B 6182ef207b42b16ee91e94397cc8a5b2d108435a30d4c86f0b7e39af91186604f16be07a75e176bf50575446abcab21b2f63158dc4e5f2cb6de3996a0881b295 SHA512 c0cf61b0095c5708709406bfef5e8bb82dd01dbf77df7f2af2118004920bda68218eb1e4174bf92941cdae0acdb275c886570dafd29476eee2eb815e9a82830a
-EBUILD dcmtk-3.6.5.ebuild 1919 BLAKE2B e334f7b963aa93cb55fd46f7fa5435d518d7276470143ecc78b1d7ac6805a54c8ef0a5f614b8677493821be495b37d367ea29274b315ac5f434f41b13f1d4689 SHA512 1b17a38ecc51b31d395286a7eac4caa898b05863653636546ab3f82bf03326c1ef9beed1e847fa695fb2926bbc4b01bc0eb3cd3cc8a7ac9ceec0ca7a72700ffe
+DIST dcmtk-3.6.7.tar.gz 6877857 BLAKE2B 242ba19ed3876b27c8eeb6917f9264911c951e91ab27d2ebd3e95ab5dcf55a0e18986cede87c8ab7e6280eafeb19fda120ccb2114d24a16f222b411b44cc28d8 SHA512 b9c227f496de65424256636fa7ad266affc6593f72c6849271da94837b68c93a5b8e056ecd09d46550b6ac0530c406ab9f71751d317a5fd4171a222f9fc9ca45
+EBUILD dcmtk-3.6.5-r1.ebuild 1945 BLAKE2B a40ee8472d2ff8f67d80a7cdacc2dcae82466e16326926712fd664474a4b4269275949797384603c5b5c5431bac5f076778b88140920f96bc903820fb4dd4176 SHA512 d9eaf46e4e071ba2c64cada1e64adb88d955d006af0b750f40f7c37abc051afcad1206bc9aab32a9c832cd37dfdad144667a9935e8475c4b7ba4f13055e2c16f
+EBUILD dcmtk-3.6.5.ebuild 1903 BLAKE2B 4c23e6ef59e7b471624b6f0d39be7b8a9e3ac702ff5c63c8562dd631c4a9c031f3a996f9c15a628ec5ab808101d44f01115c5ed50d55e1f997cbd618eeccb671 SHA512 0dc10bef0ce6901685bc959ed77f348db1ef1ed6ddb0576fa6d9b86856726d467bc6c85a5cffc5f794135c1013ecf801213a610d1638b95e2feddd84bc9bd9d7
+EBUILD dcmtk-3.6.7.ebuild 1905 BLAKE2B c4a6d201f2cb85441be5ee53b673cdd1e77004ef3827c908b40ed61f7f7b2851349ee2129b52a2b3e42db03011da63943207bb5a9821d66b9ce82a68344bde92 SHA512 3015277a8faf07802b90378708f4c1958947bbfd8540c4e855a0e62ad848ee65e52ecfaaedbeb721075cd95b4ecfa1eeffc78a3b19ca852eee0b5ebb7861bda1
 MISC metadata.xml 228 BLAKE2B aed5dcff29c27f92a26fb6756bc7ac8951564825a29dd244c02f697ddc0cc72a3171a360dc67db9d2fb3dcf51bcfe4078bb085c5ca0e343856819732a1aaa410 SHA512 34ff32136442a7884b3bacd8d838f962357f15cbbb4e172bbfe2f042e716313d5dfd29d29d38c4acab816a85803e2c94f98f1933c688cc76c2866454891257ad
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5-r1.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5-r1.ebuild
new file mode 100644
index 000000000000..b635fd5468e2
--- /dev/null
+++ b/sci-libs/dcmtk/dcmtk-3.6.5-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The DICOM Toolkit"
+HOMEPAGE="https://dicom.offis.de/dcmtk.php.en"
+SRC_URI="https://dicom.offis.de/download/dcmtk/release/${P}.tar.gz"
+
+LICENSE="OFFIS"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+SLOT="0"
+IUSE="doc png ssl tcpd tiff +threads xml zlib"
+
+RDEPEND="
+	dev-libs/icu:=
+	png? ( media-libs/libpng:* )
+	ssl? ( dev-libs/openssl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tiff? ( media-libs/tiff:0 )
+	xml? ( dev-libs/libxml2:2 )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-rename-bundled-charls.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "s:share/doc/dcmtk:&-${PV}:" \
+		-e "s:DIR \"/:DIR \"/usr/:" \
+		-e "s:usr/etc:etc:" \
+		-e "s:/lib\":/$(get_libdir)\":" \
+		-e "s:COPYRIGHT::" \
+		-i CMakeLists.txt || die
+	sed -e 's:${CMAKE_INSTALL_PREFIX}/::' \
+		-i dcmwlm/data/CMakeLists.txt doxygen/CMakeLists.txt || die
+	# Temporary workaround: docs are not built with CMake
+	sed -i -e '/include/d' doxygen/Makefile.in || die
+
+	# fix -D deprecation warnings
+	sed -i -e "s|_BSD_SOURCE|_DEFAULT_SOURCE|g" \
+		"${S}"/config/configure.in \
+		"${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DDCMTK_WITH_ICU=ON
+		-DDCMTK_WITH_TIFF=$(usex tiff)
+		-DDCMTK_WITH_PNG=$(usex png)
+		-DDCMTK_WITH_XML=$(usex xml)
+		-DDCMTK_WITH_ZLIB=$(usex zlib)
+		-DDCMTK_WITH_OPENSSL=$(usex ssl)
+		-DDCMTK_WITH_DOXYGEN=$(usex doc)
+		-DDCMTK_WITH_THREADS=$(usex threads)
+	)
+
+	cmake_src_configure
+
+	if use doc; then
+		cd "${S}"/doxygen || die
+		econf
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		emake -C "${S}"/doxygen
+	fi
+}
+
+src_install() {
+	doman doxygen/manpages/man1/*
+
+	if use doc; then
+		local HTML_DOCS=( "${S}"/doxygen/htmldocs/. )
+	fi
+	cmake_src_install
+}
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
index d611928362a6..44b08cfa35d0 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
@@ -16,7 +16,6 @@ IUSE="doc png ssl tcpd tiff +threads xml zlib"
 
 RDEPEND="
 	dev-libs/icu:=
-	virtual/jpeg:0
 	png? ( media-libs/libpng:* )
 	ssl? ( dev-libs/openssl:0= )
 	tcpd? ( sys-apps/tcp-wrappers )
diff --git a/sci-libs/dcmtk/dcmtk-3.6.7.ebuild b/sci-libs/dcmtk/dcmtk-3.6.7.ebuild
new file mode 100644
index 000000000000..64387ea2536d
--- /dev/null
+++ b/sci-libs/dcmtk/dcmtk-3.6.7.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The DICOM Toolkit"
+HOMEPAGE="https://dicom.offis.de/dcmtk.php.en"
+SRC_URI="https://dicom.offis.de/download/dcmtk/release/${P}.tar.gz"
+
+LICENSE="OFFIS"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+SLOT="0"
+IUSE="doc png ssl tcpd tiff +threads xml zlib"
+
+RDEPEND="
+	dev-libs/icu:=
+	png? ( media-libs/libpng:* )
+	ssl? ( dev-libs/openssl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tiff? ( media-libs/tiff:0 )
+	xml? ( dev-libs/libxml2:2 )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? (
+	app-doc/doxygen
+	virtual/latex-base
+)"
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "s:share/doc/dcmtk:&-${PV}:" \
+		-e "s:DIR \"/:DIR \"/usr/:" \
+		-e "s:usr/etc:etc:" \
+		-e "s:/lib\":/$(get_libdir)\":" \
+		-e "s:COPYRIGHT::" \
+		-i CMakeLists.txt || die
+	sed -e 's:${CMAKE_INSTALL_PREFIX}/::' \
+		-i dcmwlm/data/CMakeLists.txt doxygen/CMakeLists.txt || die
+	# Temporary workaround: docs are not built with CMake
+	sed -i -e '/include/d' doxygen/Makefile.in || die
+
+	# fix -D deprecation warnings
+	sed -i -e "s|_BSD_SOURCE|_DEFAULT_SOURCE|g" \
+		"${S}"/config/configure.in \
+		"${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DDCMTK_WITH_ICU=ON
+		-DDCMTK_WITH_TIFF=$(usex tiff)
+		-DDCMTK_WITH_PNG=$(usex png)
+		-DDCMTK_WITH_XML=$(usex xml)
+		-DDCMTK_WITH_ZLIB=$(usex zlib)
+		-DDCMTK_WITH_OPENSSL=$(usex ssl)
+		-DDCMTK_WITH_DOXYGEN=$(usex doc)
+		-DDCMTK_WITH_THREADS=$(usex threads)
+	)
+
+	cmake_src_configure
+
+	if use doc; then
+		cd "${S}"/doxygen || die
+		econf
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		emake -C "${S}"/doxygen
+	fi
+}
+
+src_install() {
+	doman doxygen/manpages/man1/*
+
+	if use doc; then
+		local HTML_DOCS=( "${S}"/doxygen/htmldocs/. )
+	fi
+	cmake_src_install
+}
diff --git a/sci-libs/dcmtk/files/dcmtk-3.6.5-rename-bundled-charls.patch b/sci-libs/dcmtk/files/dcmtk-3.6.5-rename-bundled-charls.patch
new file mode 100644
index 000000000000..5bb51fdc3273
--- /dev/null
+++ b/sci-libs/dcmtk/files/dcmtk-3.6.5-rename-bundled-charls.patch
@@ -0,0 +1,70 @@
+Upstream: https://git.dcmtk.org/?p=dcmtk.git;a=commitdiff;h=09afb527bb889932f919c28f47b08c84fe19ab32
+
+From 46b4b4c2d48612b60f27969db142599f56042a47 Mon Sep 17 00:00:00 2001
+From: Marco Eichelberg <dicom@offis.de>
+Date: Tue, 10 Nov 2020 12:31:00 +0100
+Subject: [PATCH] Renamed libcharls to libdcmtkcharls.
+
+Renamed the CharLS JPEG-LS library that is built into DCMTK from
+"charls" to "dcmtkcharls" to avoid a naming conflict with another
+installation of the CharLS library when building shared libraries.
+
+Thanks to Mathieu Malaterre <malat@debian.org> for the suggestion
+and the patch.
+---
+ dcmjpls/apps/CMakeLists.txt      | 2 +-
+ dcmjpls/libcharls/CMakeLists.txt | 4 ++--
+ dcmjpls/libcharls/intrface.h     | 2 +-
+ dcmjpls/libsrc/CMakeLists.txt    | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/dcmjpls/apps/CMakeLists.txt b/dcmjpls/apps/CMakeLists.txt
+index 2a9a452..0cb3f53 100644
+--- a/dcmjpls/apps/CMakeLists.txt
++++ b/dcmjpls/apps/CMakeLists.txt
+@@ -8,5 +8,5 @@ endforeach()
+ 
+ # make sure executables are linked to the corresponding libraries
+ foreach(PROGRAM dcmcjpls dcmdjpls dcml2pnm)
+-  DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd)
++  DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls dcmtkcharls dcmimage dcmimgle dcmdata oflog ofstd ofstd)
+ endforeach()
+diff --git a/dcmjpls/libcharls/CMakeLists.txt b/dcmjpls/libcharls/CMakeLists.txt
+index 0c5b143..ae0c017 100644
+--- a/dcmjpls/libcharls/CMakeLists.txt
++++ b/dcmjpls/libcharls/CMakeLists.txt
+@@ -2,6 +2,6 @@
+ include_directories("${dcmjpls_SOURCE_DIR}/libcharls" "${ofstd_SOURCE_DIR}/include")
+ 
+ # create library from source files
+-DCMTK_ADD_LIBRARY(charls header intrface jpegls)
++DCMTK_ADD_LIBRARY(dcmtkcharls header intrface jpegls)
+ 
+-DCMTK_TARGET_LINK_MODULES(charls ofstd oflog)
++DCMTK_TARGET_LINK_MODULES(dcmtkcharls ofstd oflog)
+diff --git a/dcmjpls/libcharls/intrface.h b/dcmjpls/libcharls/intrface.h
+index c8fdaa9..3aa27fd 100644
+--- a/dcmjpls/libcharls/intrface.h
++++ b/dcmjpls/libcharls/intrface.h
+@@ -10,7 +10,7 @@
+ #include "dcmtk/ofstd/ofstd.h"    /* for size_t */
+ #include "dcmtk/ofstd/ofdefine.h" /* for DCMTK_DECL_EXPORT */
+ 
+-#ifdef charls_EXPORTS
++#ifdef dcmtkcharls_EXPORTS
+ #define DCMTK_CHARLS_EXPORT DCMTK_DECL_EXPORT
+ #else
+ #define DCMTK_CHARLS_EXPORT DCMTK_DECL_IMPORT
+diff --git a/dcmjpls/libsrc/CMakeLists.txt b/dcmjpls/libsrc/CMakeLists.txt
+index 314face..bd928f8 100644
+--- a/dcmjpls/libsrc/CMakeLists.txt
++++ b/dcmjpls/libsrc/CMakeLists.txt
+@@ -4,4 +4,4 @@ include_directories("${dcmjpls_SOURCE_DIR}/include" "${ofstd_SOURCE_DIR}/include
+ # create library from source files
+ DCMTK_ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd djutils djcodece)
+ 
+-DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage charls)
++DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage dcmtkcharls)
+-- 
+2.1.4
+
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index 59077f0defaf..9e6804b2bd28 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -5,7 +5,10 @@ DIST dealii-9.3.1-offline_documentation.tar.gz 342389060 BLAKE2B 71b47816dd22f49
 DIST dealii-9.3.1.tar.gz 24459280 BLAKE2B c7f1d461017da24efd6f3247217fd1b889e0cbf2ac62c3fd305e03aed90d5ba82b58ceb84d34a84608b833b734e12abc77a63693aaa6eed767b4f5f157233ba0 SHA512 c3ba3e16fa4792bb4f3e85163e67b08271c84faff72c49b858a955851401adf2499e278790803061a61c4024964f6da3f0ef7b09c0370d8d0b5af16b7c3bdaef
 DIST dealii-9.3.3-offline_documentation.tar.gz 346914833 BLAKE2B 8a3661f44aef70c25837fca67175e410f1404991a5fa3698d2e732f1ae045f987a3d9c2fb21294de32768533968e94178f7537f2c3221afdb427fb10478257b5 SHA512 05d8c9573e8277c88f81ff318d295b099e2241c5358cc243eaae35044703a8abc8cac7b7b8049b3527d167f60b11820bd8418fde2e6a6929c03abbf6cc5b6658
 DIST dealii-9.3.3.tar.gz 24462944 BLAKE2B 581a8c618fab96127ac95fe9ba5ea5410eb6f9193ce96b6a0d8d28dd125689fb11868115ae8163b7e223970321ddd75347ea21568ea1cdc1e783f94506f00d91 SHA512 31a05a2f539dd2336683c2ab887fef47f08a5127fe23163128036f3143c0c77dca08004b014704e1c7cc07d7578458636715dcbefd654e5fc4511d6d315b604d
-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 2441 BLAKE2B 21afc338e112d389480c41a91bdaa5b29e57a532803df8df98f93c7b8327a1cf293c92a04d87852f5abff176a8aa7aa84d0647e31876b7162504005bdd07d191 SHA512 cfcafe9b4c9ff48d1d4631db2cce79248d04ee8de71684a9b8201ee9367d294095dbddc200b9cbd16026d4200afe386455708eaa6dbd747e8177a16d2c3ec897
+DIST dealii-9.4.0-offline_documentation.tar.gz 390747598 BLAKE2B 6e8ed938b31a9e6bbbdd5baacce056edc31d489ecd3e9528283650f431d004ca122c968567fe342744d52bab8f8be53ab1b20d56636e2dc48f8cf551791a08bd SHA512 703eb50150ae5bd77f0d84271babd50483c3a9b069abb5b7e8827d00efaa5d189a43ac54f0ef8b2f746b12a10dc611669f5fddd655241a66af4915ec1d458185
+DIST dealii-9.4.0.tar.gz 30297914 BLAKE2B 6beb4c7b83f5316e703d4b77340900c376e622b1dc59c9058a8927174a8c6991994957588b6adf88238e72eec93f8941bfbfb2d0bb01070560468d051d9829f8 SHA512 3be740fbabff65a18870496f483ac4ed6d35c8a53b5128dd09b2dfabe82d60e4a75f02fd508b44f6c93805999aab98f551154f10ca2ad5fabede65c2d6dce320
+EBUILD dealii-9.3.1-r5.ebuild 5081 BLAKE2B 1422f7a68e01424b233f3b85afeb1e35ed98c2311229386c9d47165141ddd8a55e858ab0f3975994ca4e455a60d65e536e2fe0f76ca58c950faa4c8b1e6eb931 SHA512 4592ab31c5b6d15e0c23ed8d55aeaede0cb6b58fc788bb6d56e156e28afc20363ce9d75e613d5bda1fc8765c3950f3962e8280f9ee936751813fbcbfad0c3ec8
+EBUILD dealii-9.3.3-r1.ebuild 5080 BLAKE2B 1fcaf183a79fc3284cb2ef4d4d169a47f63c628b972b5ba113346911a2c182826c93647dfdb3768b8f54a3b1934406fc2ed2003ed29fecc7f1970d8e30be09bb SHA512 b4f065ae9f3d438a825e8450b2a7cf8561ac14e504ff1d4742d9d109efea3196aef402d40cde33ae0890be2fb3148584eb493da458730866c9fa4ffdcfc01381
+EBUILD dealii-9.4.0.ebuild 5470 BLAKE2B 18acd6401019d894868165b5afe4df60f574ddd6016917f24c77c803613105277e73b6f3d2b07877f674d6f296c0931526b54f71f7f33ab54c5ebd2d19fab639 SHA512 92ac36201ae15d58f12d380bedb3dd62b70d4c9dec919ccacce0ceccae1f5163540aa722b43b96863534538f820bbc4a07702aa39d77f91e0aad35bbfb5463b4
+EBUILD dealii-9999.ebuild 5470 BLAKE2B 18acd6401019d894868165b5afe4df60f574ddd6016917f24c77c803613105277e73b6f3d2b07877f674d6f296c0931526b54f71f7f33ab54c5ebd2d19fab639 SHA512 92ac36201ae15d58f12d380bedb3dd62b70d4c9dec919ccacce0ceccae1f5163540aa722b43b96863534538f820bbc4a07702aa39d77f91e0aad35bbfb5463b4
+MISC metadata.xml 2606 BLAKE2B ddc06108fefd98f57745fb01cd3772e9f7d2a36889de37ab0030123d3e8e45958a74042acf2df79a7c3a0d21b70e64a8e1e72beeb6f1f2867d7370216994713b SHA512 ae25ab5c6309c190118bfa9a1b88809c56221684a1f056b55b2f86fb670f9b96e901283433197f2c38a62b6fbc93e9736098831670e7b540614d72ce7204b4ac
diff --git a/sci-libs/dealii/dealii-9.3.1-r4.ebuild b/sci-libs/dealii/dealii-9.3.1-r5.ebuild
index 9edb8b2d5a83..78407e89e17e 100644
--- a/sci-libs/dealii/dealii-9.3.1-r4.ebuild
+++ b/sci-libs/dealii/dealii-9.3.1-r5.ebuild
@@ -8,7 +8,7 @@ EAPI=7
 # any of these modules:
 CMAKE_REMOVE_MODULES_LIST=""
 
-inherit cmake flag-o-matic multilib
+inherit cmake flag-o-matic
 
 DESCRIPTION="Solving partial differential equations with the finite element method"
 HOMEPAGE="https://www.dealii.org/"
@@ -46,7 +46,7 @@ RDEPEND="dev-libs/boost:=
 	dev-cpp/tbb:=
 	adolc? ( sci-libs/adolc )
 	arpack? ( sci-libs/arpack[mpi=] )
-	assimp? ( media-libs/assimp )
+	assimp? ( media-libs/assimp:= )
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	ginkgo? ( sci-libs/ginkgo )
 	gmsh? ( sci-libs/gmsh )
@@ -59,7 +59,7 @@ RDEPEND="dev-libs/boost:=
 	)
 	mpi? ( virtual/mpi[cxx] )
 	muparser? ( dev-cpp/muParser )
-	opencascade? ( >=sci-libs/opencascade-7.6.0:= )
+	opencascade? ( sci-libs/opencascade:= )
 	p4est? ( sci-libs/p4est[mpi] )
 	petsc? ( sci-mathematics/petsc[mpi=] )
 	scalapack? ( sci-libs/scalapack )
@@ -123,9 +123,8 @@ src_configure() {
 		-DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
 	)
 
-	# Do a little dance for purely cosmetic QA reasons.
 	use opencascade && mycmakeargs+=(
-		-DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade"
+		-DCMAKE_PREFIX_PATH="/usr/$(get_libdir)/opencascade"
 	)
 
 	# Do a little dance for purely cosmetic QA reasons. The build system
diff --git a/sci-libs/dealii/dealii-9.3.3.ebuild b/sci-libs/dealii/dealii-9.3.3-r1.ebuild
index 72eaba883927..a093157e2d71 100644
--- a/sci-libs/dealii/dealii-9.3.3.ebuild
+++ b/sci-libs/dealii/dealii-9.3.3-r1.ebuild
@@ -8,7 +8,7 @@ EAPI=7
 # any of these modules:
 CMAKE_REMOVE_MODULES_LIST=""
 
-inherit cmake flag-o-matic multilib
+inherit cmake flag-o-matic
 
 DESCRIPTION="Solving partial differential equations with the finite element method"
 HOMEPAGE="https://www.dealii.org/"
@@ -46,7 +46,7 @@ RDEPEND="dev-libs/boost:=
 	dev-cpp/tbb:=
 	adolc? ( sci-libs/adolc )
 	arpack? ( sci-libs/arpack[mpi=] )
-	assimp? ( media-libs/assimp )
+	assimp? ( media-libs/assimp:= )
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	ginkgo? ( sci-libs/ginkgo )
 	gmsh? ( sci-libs/gmsh )
@@ -59,7 +59,7 @@ RDEPEND="dev-libs/boost:=
 	)
 	mpi? ( virtual/mpi[cxx] )
 	muparser? ( dev-cpp/muParser )
-	opencascade? ( >=sci-libs/opencascade-7.6.0:= )
+	opencascade? ( sci-libs/opencascade:= )
 	p4est? ( sci-libs/p4est[mpi] )
 	petsc? ( sci-mathematics/petsc[mpi=] )
 	scalapack? ( sci-libs/scalapack )
@@ -123,9 +123,8 @@ src_configure() {
 		-DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
 	)
 
-	# Do a little dance for purely cosmetic QA reasons.
 	use opencascade && mycmakeargs+=(
-		-DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade"
+		-DCMAKE_PREFIX_PATH="/usr/$(get_libdir)/opencascade"
 	)
 
 	# Do a little dance for purely cosmetic QA reasons. The build system
diff --git a/sci-libs/dealii/dealii-9.4.0.ebuild b/sci-libs/dealii/dealii-9.4.0.ebuild
new file mode 100644
index 000000000000..b493d369767a
--- /dev/null
+++ b/sci-libs/dealii/dealii-9.4.0.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# deal.II uses its own FindLAPACK.cmake file that calls into the system
+# FindLAPACK.cmake module and does additional internal setup. Do not remove
+# any of these modules:
+CMAKE_REMOVE_MODULES_LIST=""
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Solving partial differential equations with the finite element method"
+HOMEPAGE="https://www.dealii.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dealii/dealii.git"
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
+		doc? (
+			https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz
+			)"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="
+	adolc arborx assimp arpack cgal cpu_flags_x86_avx cpu_flags_x86_avx512f
+	cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5
+	+lapack metis mpi muparser opencascade p4est petsc scalapack slepc
+	+sparse static-libs sundials symengine trilinos
+"
+
+# TODO: add slepc use flag once slepc is packaged for gentoo-science
+REQUIRED_USE="
+	arborx? ( trilinos )
+	p4est? ( mpi )
+	slepc? ( petsc )
+	trilinos? ( mpi )"
+
+RDEPEND="dev-libs/boost:=
+	app-arch/bzip2
+	sys-libs/zlib
+	dev-cpp/tbb:=
+	arborx? ( sci-libs/arborx[mpi=] )
+	adolc? ( sci-libs/adolc )
+	arpack? ( sci-libs/arpack[mpi=] )
+	assimp? ( media-libs/assimp:= )
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+	ginkgo? ( sci-libs/ginkgo )
+	gmsh? ( sci-libs/gmsh )
+	gsl? ( sci-libs/gsl:= )
+	hdf5? ( sci-libs/hdf5[mpi=] )
+	lapack? ( virtual/lapack )
+	metis? (
+		>=sci-libs/metis-5
+		mpi? ( >=sci-libs/parmetis-4 )
+	)
+	mpi? ( virtual/mpi[cxx] )
+	muparser? ( dev-cpp/muParser )
+	opencascade? ( sci-libs/opencascade:= )
+	p4est? ( sci-libs/p4est[mpi] )
+	petsc? ( sci-mathematics/petsc[mpi=] )
+	scalapack? ( sci-libs/scalapack )
+	slepc? ( sci-mathematics/slepc[mpi=] )
+	sparse? ( sci-libs/umfpack )
+	sundials? ( sci-libs/sundials:= )
+	symengine? ( >=sci-libs/symengine-0.4:= )
+	trilinos? ( sci-libs/trilinos )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] dev-lang/perl )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
+)
+
+src_configure() {
+	# deal.II needs a custom build type:
+	local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
+
+	local mycmakeargs=(
+		-DDEAL_II_PACKAGE_VERSION="${PV}"
+		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
+		-DDEAL_II_ALLOW_AUTODETECTION=OFF
+		-DDEAL_II_ALLOW_BUNDLED=OFF
+		-DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
+		-DDEAL_II_COMPILE_EXAMPLES=OFF
+		-DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html"
+		-DDEAL_II_DOCREADME_RELDIR="share/doc/${P}"
+		-DDEAL_II_COMPILE_EXAMPLES=OFF
+		-DDEAL_II_EXAMPLES_RELDIR="share/doc/${P}/examples"
+		-DDEAL_II_LIBRARY_RELDIR="$(get_libdir)"
+		-DDEAL_II_SHARE_RELDIR="share/${PN}"
+		-DDEAL_II_WITH_ZLIB=ON
+		-DDEAL_II_WITH_ADOLC="$(usex adolc)"
+		-DDEAL_II_WITH_ARBORX="$(usex arborx)"
+		-DDEAL_II_WITH_ASSIMP="$(usex assimp)"
+		-DDEAL_II_WITH_ARPACK="$(usex arpack)"
+		-DDEAL_II_WITH_CGAL="$(usex cgal)"
+		-DDEAL_II_WITH_CUDA="$(usex cuda)"
+		-DDEAL_II_WITH_GINKGO="$(usex ginkgo)"
+		-DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)"
+		-DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)"
+		-DDEAL_II_WITH_GMSH="$(usex gmsh)"
+		-DDEAL_II_WITH_GSL="$(usex gsl)"
+		-DDEAL_II_WITH_HDF5="$(usex hdf5)"
+		-DDEAL_II_WITH_KOKKOS="$(usex trilinos)"
+		-DDEAL_II_WITH_LAPACK="$(usex lapack)"
+		-DDEAL_II_WITH_METIS="$(usex metis)"
+		-DDEAL_II_WITH_MPI="$(usex mpi)"
+		-DDEAL_II_WITH_MUPARSER="$(usex muparser)"
+		-DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)"
+		-DDEAL_II_WITH_P4EST="$(usex p4est)"
+		-DDEAL_II_WITH_PETSC="$(usex petsc)"
+		-DDEAL_II_WITH_SCALAPACK="$(usex scalapack)"
+		-DDEAL_II_WITH_SLEPC="$(usex slepc)"
+		-DDEAL_II_WITH_SUNDIALS="$(usex sundials)"
+		-DDEAL_II_WITH_SYMENGINE="$(usex symengine)"
+		-DDEAL_II_WITH_UMFPACK="$(usex sparse)"
+		-DBUILD_SHARED_LIBS="$(usex !static-libs)"
+		-DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)"
+		-DDEAL_II_WITH_TBB=ON
+		-DDEAL_II_WITH_TASKFLOW=OFF
+		-DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
+	)
+
+	use opencascade && mycmakeargs+=(
+		-DCMAKE_PREFIX_PATH="/usr/$(get_libdir)/opencascade"
+	)
+
+	# Do a little dance for purely cosmetic QA reasons. The build system
+	# does query for the highest instruction set first and skips the other
+	# variables if a "higher" variant is set
+	if use cpu_flags_x86_avx512f; then
+		mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes )
+		append-cxxflags "-mavx512f"
+	elif use cpu_flags_x86_avx; then
+		mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes )
+		append-cxxflags "-mavx2"
+	elif use cpu_flags_x86_avx; then
+		mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes )
+		append-cxxflags "-msse2"
+	fi
+
+	# Unconditionally enable strict C++17 standard. This is necessary for
+	# USE=cgal and USE=kokkos and safe to set for all presently supported
+	# compilers
+	append-cxxflags "-std=c++17"
+
+	cmake_src_configure
+}
+
+src_install() {
+	if use doc && [[ ${PV} != *9999* ]]; then
+		# copy missing images to the build directory:
+		cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \
+			"${BUILD_DIR}"/doc/doxygen/deal.II || die
+		# replace links:
+		sed -i \
+			's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
+			"${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed"
+	fi
+	cmake_src_install
+
+	# decompress the installed example sources:
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 2e1f4a47b3ba..b493d369767a 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # deal.II uses its own FindLAPACK.cmake file that calls into the system
 # FindLAPACK.cmake module and does additional internal setup. Do not remove
 # any of these modules:
 CMAKE_REMOVE_MODULES_LIST=""
 
-inherit cmake flag-o-matic multilib
+inherit cmake flag-o-matic
 
 DESCRIPTION="Solving partial differential equations with the finite element method"
 HOMEPAGE="https://www.dealii.org/"
@@ -28,14 +28,15 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="
-	adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f
+	adolc arborx assimp arpack cgal cpu_flags_x86_avx cpu_flags_x86_avx512f
 	cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5
-	+lapack metis mpi muparser opencascade p4est petsc
-	scalapack slepc +sparse static-libs sundials symengine trilinos
+	+lapack metis mpi muparser opencascade p4est petsc scalapack slepc
+	+sparse static-libs sundials symengine trilinos
 "
 
 # TODO: add slepc use flag once slepc is packaged for gentoo-science
 REQUIRED_USE="
+	arborx? ( trilinos )
 	p4est? ( mpi )
 	slepc? ( petsc )
 	trilinos? ( mpi )"
@@ -43,11 +44,11 @@ REQUIRED_USE="
 RDEPEND="dev-libs/boost:=
 	app-arch/bzip2
 	sys-libs/zlib
-	dev-cpp/cpp-taskflow
 	dev-cpp/tbb:=
+	arborx? ( sci-libs/arborx[mpi=] )
 	adolc? ( sci-libs/adolc )
 	arpack? ( sci-libs/arpack[mpi=] )
-	assimp? ( media-libs/assimp )
+	assimp? ( media-libs/assimp:= )
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	ginkgo? ( sci-libs/ginkgo )
 	gmsh? ( sci-libs/gmsh )
@@ -60,7 +61,7 @@ RDEPEND="dev-libs/boost:=
 	)
 	mpi? ( virtual/mpi[cxx] )
 	muparser? ( dev-cpp/muParser )
-	opencascade? ( >=sci-libs/opencascade-7.6.0:= )
+	opencascade? ( sci-libs/opencascade:= )
 	p4est? ( sci-libs/p4est[mpi] )
 	petsc? ( sci-mathematics/petsc[mpi=] )
 	scalapack? ( sci-libs/scalapack )
@@ -86,6 +87,7 @@ src_configure() {
 		-DDEAL_II_PACKAGE_VERSION="${PV}"
 		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
 		-DDEAL_II_ALLOW_AUTODETECTION=OFF
+		-DDEAL_II_ALLOW_BUNDLED=OFF
 		-DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
 		-DDEAL_II_COMPILE_EXAMPLES=OFF
 		-DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html"
@@ -96,8 +98,10 @@ src_configure() {
 		-DDEAL_II_SHARE_RELDIR="share/${PN}"
 		-DDEAL_II_WITH_ZLIB=ON
 		-DDEAL_II_WITH_ADOLC="$(usex adolc)"
+		-DDEAL_II_WITH_ARBORX="$(usex arborx)"
 		-DDEAL_II_WITH_ASSIMP="$(usex assimp)"
 		-DDEAL_II_WITH_ARPACK="$(usex arpack)"
+		-DDEAL_II_WITH_CGAL="$(usex cgal)"
 		-DDEAL_II_WITH_CUDA="$(usex cuda)"
 		-DDEAL_II_WITH_GINKGO="$(usex ginkgo)"
 		-DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)"
@@ -105,6 +109,7 @@ src_configure() {
 		-DDEAL_II_WITH_GMSH="$(usex gmsh)"
 		-DDEAL_II_WITH_GSL="$(usex gsl)"
 		-DDEAL_II_WITH_HDF5="$(usex hdf5)"
+		-DDEAL_II_WITH_KOKKOS="$(usex trilinos)"
 		-DDEAL_II_WITH_LAPACK="$(usex lapack)"
 		-DDEAL_II_WITH_METIS="$(usex metis)"
 		-DDEAL_II_WITH_MPI="$(usex mpi)"
@@ -120,13 +125,12 @@ src_configure() {
 		-DBUILD_SHARED_LIBS="$(usex !static-libs)"
 		-DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)"
 		-DDEAL_II_WITH_TBB=ON
-		-DDEAL_II_WITH_TASKFLOW=ON
+		-DDEAL_II_WITH_TASKFLOW=OFF
 		-DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
 	)
 
-	# Do a little dance for purely cosmetic QA reasons.
 	use opencascade && mycmakeargs+=(
-		-DOPENCASCADE_DIR="${CASROOT}/$(get_libdir)/opencascade"
+		-DCMAKE_PREFIX_PATH="/usr/$(get_libdir)/opencascade"
 	)
 
 	# Do a little dance for purely cosmetic QA reasons. The build system
@@ -143,6 +147,11 @@ src_configure() {
 		append-cxxflags "-msse2"
 	fi
 
+	# Unconditionally enable strict C++17 standard. This is necessary for
+	# USE=cgal and USE=kokkos and safe to set for all presently supported
+	# compilers
+	append-cxxflags "-std=c++17"
+
 	cmake_src_configure
 }
 
diff --git a/sci-libs/dealii/metadata.xml b/sci-libs/dealii/metadata.xml
index 8b4433d57a7d..c25ce26eaf2c 100644
--- a/sci-libs/dealii/metadata.xml
+++ b/sci-libs/dealii/metadata.xml
@@ -17,7 +17,9 @@ to the complex data structures and algorithms required.
 </longdescription>
 	<use>
 		<flag name="adolc">Adds support for ADOL-C (<pkg>sci-libs/adolc</pkg>)</flag>
+		<flag name="arborx">Adds support for ARBORX (<pkg>sci-libs/arborx</pkg>)</flag>
 		<flag name="arpack">Adds support for ARPACK (<pkg>sci-libs/arpack</pkg>)</flag>
+		<flag name="cgal">Adds support for CGAL (<pkg>sci-mathematics/cgal</pkg>)</flag>
 		<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
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index eeaabe5fdddb..bd5d08c4fdc1 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,4 +1,4 @@
 DIST fftw-3.3.10.tar.gz 4144100 BLAKE2B 3663872bd95a01d2c79af185f53918e1d1a9c91c620082402772c07f25b9b77d4920a78dc686fac6b51aa961b8d62b7e2cef3f3031e096bed40ced80b59b29d5 SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40
-EBUILD fftw-3.3.10.ebuild 4010 BLAKE2B af5c9c90eb31e8bd5a34fadfbe78e4fea3fc55c555f7e028c5511f0153974f4800fd638a6f78e71a0555f459ece00118be42ff1d3e7cfe0726fee5ead03618e0 SHA512 0c0602273d5a2e6f33fab9c02f8e54dbe83ea4cf337d5d8ea0f91dd5579ed670a65c6a40c2ae54c3711fd470151f47b87c17a5708a7291ca37641fedb7067389
+EBUILD fftw-3.3.10.ebuild 4017 BLAKE2B fec696c07522b2b2761cf6228224224f5b86551800192371b42c1c5ddda221c14b985040c42a3c5001614f6a19bc795f7d5dc428035cc221d47d97e8f9002da8 SHA512 89f83da18d3112f6f9ec3baa9be1d4b361fb0fe2b84fc4bd870d5ebcf3f54bbfa2441802c3140be1c6334ddeb501c662747f5edda2d2d583cf8c6ce8be51c50d
 EBUILD fftw-9999.ebuild 4012 BLAKE2B 4acc326f3ea2c3d68018aada983a6df9a82a60e8deaf2072b1c0649c4b6a673f3f9a96bfa2747d092de9c99199de4aed38bd07ce46bb8d9b5818cc4feed3ca29 SHA512 861ba96a2f2952dfc72b92db0647719f48443f11e7fbf39ebfe699acc231da40fcb325d29642b535811aa5bc3eb227afdb6eab64e547b85c23859e8807f5e844
-MISC metadata.xml 960 BLAKE2B f9bd9e8190241bb5c757b521fc7c0d9adb608d3f616f4bd32c7fdba895a464e49c6eb3080d849c70ece5993f2999eaa22b08033954b60c33834ea1af8b646df7 SHA512 21ffca8724d5e4a73d9545bd1a73dad15d1341cc15a5340172315d1ace97cf5fda30973685890b7b18255feeb67f80317fde1b9d951c4f114b1d5e45a1587a7c
+MISC metadata.xml 912 BLAKE2B 31401361074ed434c0af38ee4bd41f099b2a461122871b2835782375a197e77661853c5c611708aac13e2834d0d7101b67898286b5d3f5987fd8e78a051f30e6 SHA512 863b3290050a769ad87a2a188534577fbc4b94f3035a961de18049e8f4bdf49085c5ba38e32d3a4870e03f97f4819127812299c06827b0815f03faceccce1fe7
diff --git a/sci-libs/fftw/fftw-3.3.10.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
index d0089f5165db..213b53606d55 100644
--- a/sci-libs/fftw/fftw-3.3.10.ebuild
+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml
index 1a94d1573c47..0c67c1caf7f3 100644
--- a/sci-libs/fftw/metadata.xml
+++ b/sci-libs/fftw/metadata.xml
@@ -19,6 +19,5 @@
   </use>
   <upstream>
     <remote-id type="github">FFTW/fftw3</remote-id>
-    <remote-id type="freecode">fftw</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/foxi/Manifest b/sci-libs/foxi/Manifest
new file mode 100644
index 000000000000..13a9dc7d0725
--- /dev/null
+++ b/sci-libs/foxi/Manifest
@@ -0,0 +1,4 @@
+AUX foxi-2021.05.27-gentoo.patch 2398 BLAKE2B 53ed8efa8c86460768839ef071567632793fadca138d72b5e7f07619db769dbbd2d4497bfb71d63ba47c201b17fb6a415a116ee05f56083c8cbc1a00b147e31a SHA512 4b81687444653d1614226b6696ee6515e652b62746187e0b44dcff1db7bfea653cee4d9e20775d6b8e2aca7430f0f654db3da95e3a784d477373da528b05b39e
+DIST foxi-2021.05.27.tar.gz 28960 BLAKE2B 06c960f829b090eec4fe9e8c981e119578f358724e0b63991173bb7e318d23654261b901d1e15efeb6240bba75cc05fd45ab32fb30bbdf48369e139cf152f398 SHA512 ad42cfd70e40ba0f0a9187b34ae9e3bd361c8c0038669f4c1591c4f7421d12ad93f76f42b33c2575eea1a3ddb3ff781da2895cdc636df5b60422598f450203c7
+EBUILD foxi-2021.05.27.ebuild 545 BLAKE2B 042d2c219e2d64eedec13ec8f08088cb2b974bca10901a75bec3c4cc9f5336a3393887fcb8575007f0d0081678a58c7c7b3c1a60a69f81e0e10b14bb160031d7 SHA512 673a11afbc86b6d9dd01956e391caf26f284a2719a5ce6f2c1489b7b6e9193cceaed00442b2565ae183bdd99a83c342d06e4b9cb7edadf0c1876b4ec0cd3dc34
+MISC metadata.xml 327 BLAKE2B d9b056783fbf66675262cb93b1faf4cd410f1ea34c877480896602f07b1a6e136d7e4168d41725d4b4bd8743155508500e1f9d80b9158acce72bca7a84596953 SHA512 4598a70431dd411d24237ec4b97ec2ab57d9a46fcbcfd3416edfa1623baf7f10599c932ae22d6bd9d69f7898a1e51322ae084ececd2a44c2d73d07cc9817f863
diff --git a/sci-libs/foxi/files/foxi-2021.05.27-gentoo.patch b/sci-libs/foxi/files/foxi-2021.05.27-gentoo.patch
new file mode 100644
index 000000000000..f252ae4fcdb2
--- /dev/null
+++ b/sci-libs/foxi/files/foxi-2021.05.27-gentoo.patch
@@ -0,0 +1,73 @@
+--- a/CMakeLists.txt	2022-06-13 21:42:28.197087591 +0200
++++ b/CMakeLists.txt	2022-06-13 21:44:49.787170054 +0200
+@@ -77,6 +77,7 @@
+     OUTPUT_NAME "foxi"
+     POSITION_INDEPENDENT_CODE YES)
+   target_link_libraries(foxi_wrapper PRIVATE foxi_loader foxi)
++  target_link_options(foxi_wrapper PUBLIC "-Wl,-soname=libfoxi.so")
+   if(DEFINED FOXI_SEARCH_DIR)
+     target_compile_definitions(foxi_wrapper PRIVATE "FOXI_SEARCH_DIR=\"${FOXI_SEARCH_DIR}\"")
+   endif()
+@@ -115,11 +116,11 @@
+ 
+ install(TARGETS
+   foxi foxi_dummy foxi_loader
+-  EXPORT ONNXTargets DESTINATION lib)
++  EXPORT ONNXTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ if(NOT ANDROID AND NOT IOS)
+   install(TARGETS foxi_wrapper
+-    EXPORT ONNXTargets DESTINATION lib)
++    EXPORT ONNXTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
+ 
+ set(FOXI_INCLUDE_DIRS "${FOXI_ROOT}" "${CMAKE_CURRENT_BINARY_DIR}")
+--- a/foxi/onnxifi_wrapper.c	2022-06-14 08:07:07.351585673 +0200
++++ b/foxi/onnxifi_wrapper.c	2022-06-14 08:11:21.680855591 +0200
+@@ -761,7 +761,9 @@
+     const void* onnxModel,
+     uint32_t weightsCount,
+     const onnxTensorDescriptorV1* weightDescriptors,
+-    onnxGraph* graph)
++    onnxGraph* graph,
++    uint32_t maxSeqLength,
++    void* deferredWeightReader)
+ {
+   if (graph == NULL) {
+     return ONNXIFI_STATUS_INVALID_POINTER;
+@@ -797,7 +799,9 @@
+     onnxModel,
+     weightsCount,
+     weightDescriptors,
+-    &graph_wrapper->graph);
++    &graph_wrapper->graph,
++    maxSeqLength,
++    deferredWeightReader);
+   switch (status) {
+     case ONNXIFI_STATUS_SUCCESS:
+     case ONNXIFI_STATUS_FALLBACK:
+--- a/foxi/onnxifi_dummy.c	2022-06-14 08:14:02.484503254 +0200
++++ b/foxi/onnxifi_dummy.c	2022-06-14 08:17:01.408891030 +0200
+@@ -103,7 +103,9 @@
+     const void* onnxModel,
+     uint32_t weightCount,
+     const onnxTensorDescriptorV1* weightDescriptors,
+-    onnxGraph* graph) {
++    onnxGraph* graph,
++    uint32_t maxSeqLength,
++    void* deferredWeightReader) {
+   if (graph == NULL) {
+     return ONNXIFI_STATUS_INVALID_POINTER;
+   }
+@@ -215,6 +217,8 @@
+ onnxWaitEventFor(onnxEvent event,
+                  uint32_t timeoutMs,
+                  onnxEventState* eventState,
+-                 onnxStatus* eventStatus) {
++                 onnxStatus* eventStatus,
++                 char* message,
++                 size_t* messageLength) {
+   return ONNXIFI_STATUS_SUCCESS;
+-}
+\ No newline at end of file
++}
diff --git a/sci-libs/foxi/foxi-2021.05.27.ebuild b/sci-libs/foxi/foxi-2021.05.27.ebuild
new file mode 100644
index 000000000000..5a3d59c25fd3
--- /dev/null
+++ b/sci-libs/foxi/foxi-2021.05.27.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+CommitId=c278588e34e535f0bb8f00df3880d26928038cad
+
+DESCRIPTION="ONNXIFI with Facebook Extension"
+HOMEPAGE="https://github.com/houseroad/foxi/"
+SRC_URI="https://github.com/houseroad/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+"
+RESTRICT="test" # No test available
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
diff --git a/sci-libs/foxi/metadata.xml b/sci-libs/foxi/metadata.xml
new file mode 100644
index 000000000000..2b6c8e44882d
--- /dev/null
+++ b/sci-libs/foxi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">houseroad/foxi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/fplll/Manifest b/sci-libs/fplll/Manifest
index 55fccd0d29f4..501985a47021 100644
--- a/sci-libs/fplll/Manifest
+++ b/sci-libs/fplll/Manifest
@@ -1,4 +1,7 @@
 AUX fplll-5.4.0-gcc11.patch 623 BLAKE2B 230fcf908c4a6604f6da3800927b9bfee0d9c8b979d0b4cfeba5bf5ae68256f1d457bade2d62c30f2a7e7c07d8433374b19459a3f6d37ba71766b73e1cb189bc SHA512 35b1589267cadddbb7aef7859a748eb171f4545ed42037645588d44df0e404a3ec5f21419ad4a1e34dd5fd037cdceeb927ec7b7a770e4a24eecdbdee6b3176bd
+AUX fplll-5.4.2-with-qd-fix.patch 942 BLAKE2B 3335262a47db7cc8fe48d79f2638882a8522ea026f55bbcd9b612457ef6186b84e673e0d9b0b9a022f4a3915dff830ab28ab47a5093fc3364fa4d4fc1317ef8f SHA512 4fcfb3aea3fe72d8072996c2bc6e5f626b4972448871578a29119cd10325d0451186d410f6732d58f96eb18ae040ed8410213228b63aa3012dba63a1916e68bd
 DIST fplll-5.4.0.tar.gz 2612340 BLAKE2B 723230856461ac6418dad00e82fc7505dbbb7bfbbf68fa7f4f3240402d62f3e1ded3049c436a0f6aad9f020727d10acb3fe15dfb8b8a907f5b3c7b191e55e9a9 SHA512 a583aac73e4618ba240c28d3e8485cef6b9c184c11b33799404e96ab99502023073ed1c6fc0d3fbc4e6737415e9ea1a273f3f1e59ccba69d1546f56903567ebe
+DIST fplll-5.4.2.tar.gz 2618377 BLAKE2B e730c8646b9afb68515a23e533ea8ef833439d69f2130157bd6e38b1efab9116817535c261721c98b23410185271ffc323c687630e3ba262adb97fa5f69be787 SHA512 45324d89d0efeb269c1d1400332a51432e5d09f7bf0a6d651650e0941bb718493cbb66d65056b98691691236eaf348b2cae686ee06761f64380df98b6206c004
 EBUILD fplll-5.4.0.ebuild 707 BLAKE2B dec4dd083a0d8800dd51ba6f851c73355641b69cf693394696f055f42ad282269d049b2dacf049ba415fe9db5e9a549bdded08388bb66da66b9886c35c660ced SHA512 1851a3d2f7faa5ee5254900e11ac35fa2d6b95925052b2005776236c6811cfa0eefde8f848253fcd65f7eadd02bd23fcba45be6a3031019c0df7e309793f9bc1
+EBUILD fplll-5.4.2.ebuild 776 BLAKE2B 95f30d5f71776a7b80657a411e29ecf424089ec08f7c9682981778134753dcac1fff1d94b63d4f58cf1d78579dbd483cfd349385b525312fea15e6bc00fdcd2f SHA512 f36d9b5da2cf0122ae8ed3e985200d920e29f6f4fe0dd3d8353b983a4565f7d1f473924bc7d1292ef3da95978e7f3d1e00e986928591d82424e5eab56a9b53b3
 MISC metadata.xml 858 BLAKE2B e27b47f6a8d0bb3c17eb023c24f95472c5f791e8a9bf86c1805d1c832b0973a665fe2231f82a289c37afd5318deb89717029ae6694005ade8e112a2769a56170 SHA512 49b6fd4968670fb0da92a883b81420e4739a893a6866ae500106181df5182324e616ccee8e0f290a7cda20f3f4d850fbf9a9462d03f0057da9ced4ba1d835ba7
diff --git a/sci-libs/fplll/files/fplll-5.4.2-with-qd-fix.patch b/sci-libs/fplll/files/fplll-5.4.2-with-qd-fix.patch
new file mode 100644
index 000000000000..73c9b4386fd1
--- /dev/null
+++ b/sci-libs/fplll/files/fplll-5.4.2-with-qd-fix.patch
@@ -0,0 +1,27 @@
+From 94010a8c4c93c6ba9520b7c26bb6cb36344a4bf9 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 1 Jun 2022 22:11:48 -0400
+Subject: [PATCH 1/1] configure.ac: fix bashism in --with-qd test.
+
+There's a double-equals test here that doesn't work properly when
+/bin/sh is not bash. We simply change it to single-equals.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0ccc4c4..ed0cd59 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,7 +104,7 @@ AS_IF([test -z "$with_qd"], [with_qd=yes])
+ # and libraries if that didn't work for some reason.
+ #
+ # We only show a warning if we cannot find libqd, it is optional but recommended
+-AS_IF([test "x$with_qd" == "xyes"], [
++AS_IF([test "x$with_qd" = "xyes"], [
+   PKG_CHECK_MODULES([LIBQD], [qd], [have_libqd="yes"], [
+     # fall back to manual search.
+     AC_SEARCH_LIBS(c_dd_add,
+-- 
+2.35.1
+
diff --git a/sci-libs/fplll/fplll-5.4.2.ebuild b/sci-libs/fplll/fplll-5.4.2.ebuild
new file mode 100644
index 000000000000..dc83e78f3551
--- /dev/null
+++ b/sci-libs/fplll/fplll-5.4.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Implementations of the floating-point LLL reduction algorithm"
+HOMEPAGE="https://github.com/fplll/fplll"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/7"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs qd"
+
+BDEPEND="qd? ( virtual/pkgconfig )"
+DEPEND="dev-libs/gmp:0
+	dev-libs/mpfr:0
+	qd? ( sci-libs/qd )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-with-qd-fix.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with qd) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 0aa1292c7452..b806a8755dc9 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -6,7 +6,12 @@ AUX gdal-3.4.1-poppler-22.03.0.patch 2056 BLAKE2B 119a71daf7d53ee405041b8e7c2bd3
 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
+DIST gdal-3.5.0-build-fixes-no-deps.patch.xz 5016 BLAKE2B 0d0ef0ccae73f8a903b0ccbf992fa775b394df85a89d86f86ad60187bfce6a87eb8b23a573bd65c0173c0e7cffe3df447cef0ddddfd5aebfcedfbed3e6a7716e SHA512 e32c97e3fef948f2fa9c0f4b7116ccb231554e962380d7bebb433083926fb4e1902b0a3bc243f747c81c95813651153ce2751d8c2de4e8abb096778ffe589a2e
+DIST gdal-3.5.0.tar.xz 8826500 BLAKE2B 7123ff4a7270b309d458e4a7bd32241cdef53953c305c5027873424794f4ed27d2a4838f86c42f9f84b5174ff499ee5539694c41e906509d21d899ccfe38ff99 SHA512 15d9675ffe5e76fdcb431bef1dce0ed8c23695f418186f37c63f4c7274322924095662bbbc95232d5b4d700704c1c4922d52b419cef5bb67f3bb64ee59654d8b
+DIST gdalautotest-3.5.0.tar 50442240 BLAKE2B 15005f16530690e584e39b036881c339f147e525e3e0dc39b57d027c493ab89027baa2ea3a0ed148c8fa3ebb7cd53cdb4cf4d53c96d068b5a89caf28165e213b SHA512 723c57425dd5f8acd61795be98b450844b5664b9940d47823829d510b8fb84d1d6db9ca880200d7732a83e7b0f1ae6e33269d8ebd91bf0e7d99e887b5f79aad0
 EBUILD gdal-3.4.1.ebuild 8131 BLAKE2B 49f36d5018cf65bfc92369d4d7e7f8eecfa823fb6ec88069fa7ae605d5c0a57643ddcc690fc5cfd830d45023a75baf6007da7f510174cfe8a4b67ef661a87b37 SHA512 f462eb9247d7f0c9b281e95d7ae69808811fb619973ea785de5061c84b5aaf2b42222b61425e49ac6b614573ec49da72ba35426694731445313f814888240aa5
 EBUILD gdal-3.4.2-r2.ebuild 8171 BLAKE2B dcb8f1836bd8f40c9c6c78a178e7cbe3bd38934345d2d0dc6a7f4e6057ae4e06b9d7a50f8d3c9e5a74013e2ae6068ea9bbc7c38bfa297731136a9662f946f561 SHA512 d47d70febcbaa9b9e3df4a3eb9d1ecf43f006629e1afec4ef1b399fd9a8fb3664d9a99b7af291ac941137b373e86e4c59cfe6eac5620508f251af658bddf242a
 EBUILD gdal-3.4.3-r1.ebuild 8125 BLAKE2B e6c3df82d9d1ccd60d57405d17ccb93ffa31353c1738e6adc67cac1faafe01c3da4650d2f4f0ad413c08c7d1bc8cf20e649978a9ac8d500873aa3c0b171d996c SHA512 0e1f00f7607d9b3b7cc6d64ac7e7c7619a6b4eb9c86a5ce102c087703ba36a8c15016fbcc1f196073126b22d2aa6f201a7ece1cd509244d95060946c34b43c1f
+EBUILD gdal-3.5.0-r3.ebuild 6663 BLAKE2B 90012f3cc1e50719569d6511d463874b8f25b9c3b2851b29b59311dce21d9105e8edd6197af84481a08e25a12d179fde606170cef6662a1c2a3332ae9bc98e6e SHA512 3613cb30254c17f1cb9f918bd4909c460a4483e9e88c264004b21a225a148bde0207115453be6d318b8458be9321e040ae07c493b6e78e524551e26dc8caa061
+EBUILD gdal-3.5.0-r4.ebuild 6868 BLAKE2B 36f8e0a8189936d631ca9028ea0ca220a0b587dae2e21ee6895c182e6a0739ea79d2c80742913343226db9ec1b6069c655b170bb2bdb67800127eb5ae1608988 SHA512 99c93ead2623dde711f4041eb7dc2a283ac6b0328547ffb18ebb4736d7fb34a617a561ca8c74126d1b4e551332e312753920a4065a4a3e312d4df0575f368adf
 MISC metadata.xml 1623 BLAKE2B af7c9d5cc3c16ffef6fa9ef5dd5cf54ffcd34229d1e82b90e310f9eeccf5a5b4fa2119112b5427b520ce6e964e368aef7313edb3837940bed4b960ced7714fc3 SHA512 ed206877adac0b8b190e0edfb04f48c435d698fd523a14d54a14638b908c9e9452b1a2d394046093f5aa86cb48c611790f56ae511807855eb80bfcd4cc1d425c
diff --git a/sci-libs/gdal/gdal-3.5.0-r3.ebuild b/sci-libs/gdal/gdal-3.5.0-r3.ebuild
new file mode 100644
index 000000000000..42e368935481
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.5.0-r3.ebuild
@@ -0,0 +1,237 @@
+# 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 java-pkg-opt-2 python-single-r1
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="https://gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.xz"
+# Seems to not be compressed...
+SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.tar.gz -> ${PN}autotest-${PV}.tar )"
+
+LICENSE="BSD Info-ZIP MIT"
+SLOT="0/31" # subslot is libgdal.so.<SONAME>
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd"
+# Tests fail to build in 3.5.0, let's not worry too much yet given
+# we're only just porting to CMake. Revisit later.
+RESTRICT="!test? ( test ) test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	spatialite? ( sqlite )"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	java? (
+		dev-java/ant-core
+		dev-lang/swig:0
+		>=virtual/jdk-1.8:*
+	)
+	python? (
+		dev-lang/swig:0
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)"
+DEPEND="dev-libs/expat
+	dev-libs/json-c:=
+	dev-libs/libpcre2
+	dev-libs/libxml2:2
+	dev-libs/openssl:=
+	media-libs/tiff
+	>=sci-libs/libgeotiff-1.5.1-r1:=
+	>=sci-libs/proj-6.0.0:=
+	sys-libs/zlib[minizip(+)]
+	armadillo? ( sci-libs/armadillo:=[lapack] )
+	curl? ( net-misc/curl )
+	fits? ( sci-libs/cfitsio:= )
+	geos? ( >=sci-libs/geos-3.8.0 )
+	gif? ( media-libs/giflib:= )
+	gml? ( >=dev-libs/xerces-c-3.1 )
+	heif? ( media-libs/libheif:= )
+	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma
+	) )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf:= )
+	odbc? ( dev-db/unixODBC )
+	ogdi? ( sci-libs/ogdi )
+	opencl? ( virtual/opencl )
+	oracle? ( dev-db/oracle-instantclient:= )
+	pdf? ( app-text/poppler:= )
+	png? ( media-libs/libpng:= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		')
+	)
+	spatialite? ( dev-db/spatialite )
+	sqlite? ( dev-db/sqlite:3 )
+	webp? ( media-libs/libwebp:= )
+	xls? ( dev-libs/freexl )
+	zstd? ( app-arch/zstd:= )"
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.8:* )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use test ; then
+		mv "${WORKDIR}"/gdalautotest-${PV} "${S}"/autotest || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_IPO=OFF
+		-DGDAL_USE_EXTERNAL_LIBS=ON
+		-DGDAL_USE_INTERNAL_LIBS=OFF
+
+		# bug #844874 and bug #845150
+		-DCMAKE_INSTALL_INCLUDEDIR="include/gdal"
+
+		# Options here are generally off because of one of:
+		# - Not yet packaged dependencies
+		#
+		# - Off for autotools build and didn't want more churn by
+		#   enabling during port to CMake. Feel free to request them
+		#   being turned on if useful for you.
+		-DGDAL_USE_ARMADILLO=$(usex armadillo)
+		-DGDAL_USE_ARROW=OFF
+		-DGDAL_USE_BLOSC=OFF
+		-DGDAL_USE_BRUNSLI=OFF
+		-DGDAL_USE_CRNLIB=OFF
+		-DGDAL_USE_CFITSIO=$(usex fits)
+		-DGDAL_USE_CURL=$(usex curl)
+		-DGDAL_USE_CRYPTOPP=OFF
+		-DGDAL_USE_DEFLATE=OFF
+		-DGDAL_USE_ECW=OFF
+		-DGDAL_USE_EXPAT=ON
+		-DGDAL_USE_FILEGDB=OFF
+		-DGDAL_USE_FREEXL=$(usex xls)
+		-DGDAL_USE_FYBA=OFF
+		-DGDAL_USE_GEOTIFF=ON
+		-DGDAL_USE_GEOS=$(usex geos)
+		-DGDAL_USE_GIF=$(usex gif)
+		-DGDAL_USE_GTA=OFF
+		-DGDAL_USE_HEIF=$(usex heif)
+		-DGDAL_USE_HDF4=OFF
+		-DGDAL_USE_HDF5=$(usex hdf5)
+		-DGDAL_USE_HDFS=OFF
+		-DGDAL_USE_ICONV=ON # TODO dep
+		-DGDAL_USE_IDB=OFF
+		-DGDAL_USE_JPEG=$(usex jpeg)
+
+		# https://gdal.org/build_hints.html#jpeg12
+		# Independent of whether using system libjpeg
+		-DGDAL_USE_JPEG12_INTERNAL=ON
+
+		-DGDAL_USE_JSONC=ON
+		-DGDAL_USE_JXL=OFF
+		-DGDAL_USE_KDU=OFF
+		-DGDAL_USE_KEA=OFF
+		-DGDAL_USE_LERC=OFF
+		-DGDAL_USE_LIBKML=OFF
+		-DGDAL_USE_LIBLZMA=$(usex lzma)
+		-DGDAL_USE_LIBXML2=ON
+		-DGDAL_USE_LURATECH=OFF
+		-DGDAL_USE_LZ4=OFF
+		-DGDAL_USE_MONGOCXX=OFF
+		-DGDAL_USE_MRSID=OFF
+		-DGDAL_USE_MSSQL_NCLI=OFF
+		-DGDAL_USE_MSSQL_ODBC=OFF
+		-DGDAL_USE_MYSQL=$(usex mysql)
+		-DGDAL_USE_NETCDF=$(usex netcdf)
+		-DGDAL_USE_ODBC=$(usex odbc)
+		-DGDAL_USE_ODBCCPP=OFF
+		-DGDAL_USE_OGDI=$(usex ogdi)
+		-DGDAL_USE_OPENCAD=OFF
+		-DGDAL_USE_OPENCL=$(usex opencl)
+		-DGDAL_USE_OPENEXR=OFF
+		-DGDAL_USE_OPENJPEG=$(usex jpeg2k)
+		-DGDAL_USE_OPENSSL=ON
+		-DGDAL_USE_ORACLE=$(usex oracle)
+		-DGDAL_USE_PARQUET=OFF
+		-DGDAL_USE_PCRE2=ON
+		-DGDAL_USE_PDFIUM=OFF
+		-DGDAL_USE_PNG=$(usex png)
+		-DGDAL_USE_POPPLER=$(usex pdf)
+		-DGDAL_USE_POSTGRESQL=$(usex postgres)
+		-DGDAL_USE_QHULL=OFF
+		-DGDAL_USE_RASTERLITE2=OFF
+		-DGDAL_USE_RDB=OFF
+		-DGDAL_USE_SPATIALITE=$(usex spatialite)
+		-DGDAL_USE_SQLITE3=$(usex sqlite)
+		-DGDAL_USE_SFCGAL=OFF
+		-DGDAL_USE_TEIGHA=OFF
+		-DGDAL_USE_TIFF=ON
+		-DGDAL_USE_TILEDB=OFF
+		-DGDAL_USE_WEBP=$(usex webp)
+		-DGDAL_USE_XERCESC=$(usex gml)
+		-DGDAL_USE_ZLIB=ON
+		-DGDAL_USE_ZSTD=$(usex zstd)
+
+		# Bindings
+		-DBUILD_PYTHON_BINDINGS=$(usex python)
+		-DBUILD_JAVA_BINDINGS=$(usex java)
+
+		# Check work/gdal-3.5.0_build/CMakeCache.txt after configure
+		# and https://github.com/OSGeo/gdal/blob/master/cmake/helpers/CheckCompilerMachineOption.cmake#L71
+		# Commented out: not (yet?) implemented upstream.
+		# Also, arm64 stuff is a TODO upstream, but not there (yet?)
+		-Dtest_avx=$(usex cpu_flags_x86_avx)
+		-Dtest_avx2=$(usex cpu_flags_x86_avx2)
+		-Dtest_sse=$(usex cpu_flags_x86_sse)
+		-Dtest_sse2=$(usex cpu_flags_x86_sse2)
+		#-Dtest_sse3=$(usex cpu_flags_x86_sse3)
+		-Dtest_sse4.1=$(usex cpu_flags_x86_sse4_1)
+		#-Dtest_sse4.2=$(usex cpu_flags_x86_sse4_2)
+		#-Dtest_sse4a=$(usex cpu_flags_x86_sse4a)
+		-Dtest_ssse3=$(usex cpu_flags_x86_ssse3)
+		#-Dtest_fma4=$(usex cpu_flags_x86_fma4)
+		#-Dtest_xop=$(usex cpu_flags_x86_xop)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile doc
+}
+
+src_test() {
+	export GDAL_RUN_SLOW_TESTS=0
+	export GDAL_DOWNLOAD_TEST_DATA=0
+
+	# Two test suites:
+	# 1. autotests (much larger, uses pytest)
+	# 2. Small set of fuzzing tests (no download needed)
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# TODO: install docs?
+}
+
+pkg_postinst() {
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
diff --git a/sci-libs/gdal/gdal-3.5.0-r4.ebuild b/sci-libs/gdal/gdal-3.5.0-r4.ebuild
new file mode 100644
index 000000000000..8133f3f2903d
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.5.0-r4.ebuild
@@ -0,0 +1,244 @@
+# 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 java-pkg-opt-2 python-single-r1
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="https://gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.xz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-build-fixes-no-deps.patch.xz"
+# Seems to not be compressed...
+SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.tar.gz -> ${PN}autotest-${PV}.tar )"
+
+LICENSE="BSD Info-ZIP MIT"
+SLOT="0/31" # subslot is libgdal.so.<SONAME>
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd"
+# Tests fail to build in 3.5.0, let's not worry too much yet given
+# we're only just porting to CMake. Revisit later.
+RESTRICT="!test? ( test ) test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	spatialite? ( sqlite )"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	java? (
+		dev-java/ant-core
+		dev-lang/swig:0
+		>=virtual/jdk-1.8:*
+	)
+	python? (
+		dev-lang/swig:0
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)"
+DEPEND="dev-libs/expat
+	dev-libs/json-c:=
+	dev-libs/libpcre2
+	dev-libs/libxml2:2
+	dev-libs/openssl:=
+	media-libs/tiff
+	>=sci-libs/libgeotiff-1.5.1-r1:=
+	>=sci-libs/proj-6.0.0:=
+	sys-libs/zlib[minizip(+)]
+	armadillo? ( sci-libs/armadillo:=[lapack] )
+	curl? ( net-misc/curl )
+	fits? ( sci-libs/cfitsio:= )
+	geos? ( >=sci-libs/geos-3.8.0 )
+	gif? ( media-libs/giflib:= )
+	gml? ( >=dev-libs/xerces-c-3.1 )
+	heif? ( media-libs/libheif:= )
+	hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma
+	) )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf:= )
+	odbc? ( dev-db/unixODBC )
+	ogdi? ( sci-libs/ogdi )
+	opencl? ( virtual/opencl )
+	oracle? ( dev-db/oracle-instantclient:= )
+	pdf? ( app-text/poppler:= )
+	png? ( media-libs/libpng:= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		')
+	)
+	spatialite? ( dev-db/spatialite )
+	sqlite? ( dev-db/sqlite:3 )
+	webp? ( media-libs/libwebp:= )
+	xls? ( dev-libs/freexl )
+	zstd? ( app-arch/zstd:= )"
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.8:* )"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-build-fixes-no-deps.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use test ; then
+		mv "${WORKDIR}"/gdalautotest-${PV} "${S}"/autotest || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_IPO=OFF
+		-DGDAL_USE_EXTERNAL_LIBS=ON
+		-DGDAL_USE_INTERNAL_LIBS=OFF
+
+		# bug #844874 and bug #845150
+		-DCMAKE_INSTALL_INCLUDEDIR="include/gdal"
+
+		# Options here are generally off because of one of:
+		# - Not yet packaged dependencies
+		#
+		# - Off for autotools build and didn't want more churn by
+		#   enabling during port to CMake. Feel free to request them
+		#   being turned on if useful for you.
+		-DGDAL_USE_ARMADILLO=$(usex armadillo)
+		-DGDAL_USE_ARROW=OFF
+		-DGDAL_USE_BLOSC=OFF
+		-DGDAL_USE_BRUNSLI=OFF
+		-DGDAL_USE_CRNLIB=OFF
+		-DGDAL_USE_CFITSIO=$(usex fits)
+		-DGDAL_USE_CURL=$(usex curl)
+		-DGDAL_USE_CRYPTOPP=OFF
+		-DGDAL_USE_DEFLATE=OFF
+		-DGDAL_USE_ECW=OFF
+		-DGDAL_USE_EXPAT=ON
+		-DGDAL_USE_FILEGDB=OFF
+		-DGDAL_USE_FREEXL=$(usex xls)
+		-DGDAL_USE_FYBA=OFF
+		-DGDAL_USE_GEOTIFF=ON
+		-DGDAL_USE_GEOS=$(usex geos)
+		-DGDAL_USE_GIF=$(usex gif)
+		-DGDAL_USE_GTA=OFF
+		-DGDAL_USE_HEIF=$(usex heif)
+		-DGDAL_USE_HDF4=OFF
+		-DGDAL_USE_HDF5=$(usex hdf5)
+		-DGDAL_USE_HDFS=OFF
+		-DGDAL_USE_ICONV=ON # TODO dep
+		-DGDAL_USE_IDB=OFF
+		-DGDAL_USE_JPEG=$(usex jpeg)
+
+		# https://gdal.org/build_hints.html#jpeg12
+		# Independent of whether using system libjpeg
+		-DGDAL_USE_JPEG12_INTERNAL=ON
+
+		-DGDAL_USE_JSONC=ON
+		-DGDAL_USE_JXL=OFF
+		-DGDAL_USE_KDU=OFF
+		-DGDAL_USE_KEA=OFF
+		-DGDAL_USE_LERC=OFF
+		-DGDAL_USE_LIBKML=OFF
+		-DGDAL_USE_LIBLZMA=$(usex lzma)
+		-DGDAL_USE_LIBXML2=ON
+		-DGDAL_USE_LURATECH=OFF
+		-DGDAL_USE_LZ4=OFF
+		-DGDAL_USE_MONGOCXX=OFF
+		-DGDAL_USE_MRSID=OFF
+		-DGDAL_USE_MSSQL_NCLI=OFF
+		-DGDAL_USE_MSSQL_ODBC=OFF
+		-DGDAL_USE_MYSQL=$(usex mysql)
+		-DGDAL_USE_NETCDF=$(usex netcdf)
+		-DGDAL_USE_ODBC=$(usex odbc)
+		-DGDAL_USE_ODBCCPP=OFF
+		-DGDAL_USE_OGDI=$(usex ogdi)
+		-DGDAL_USE_OPENCAD=OFF
+		-DGDAL_USE_OPENCL=$(usex opencl)
+		-DGDAL_USE_OPENEXR=OFF
+		-DGDAL_USE_OPENJPEG=$(usex jpeg2k)
+		-DGDAL_USE_OPENSSL=ON
+		-DGDAL_USE_ORACLE=$(usex oracle)
+		-DGDAL_USE_PARQUET=OFF
+		-DGDAL_USE_PCRE2=ON
+		-DGDAL_USE_PDFIUM=OFF
+		-DGDAL_USE_PNG=$(usex png)
+		-DGDAL_USE_POPPLER=$(usex pdf)
+		-DGDAL_USE_POSTGRESQL=$(usex postgres)
+		-DGDAL_USE_QHULL=OFF
+		-DGDAL_USE_RASTERLITE2=OFF
+		-DGDAL_USE_RDB=OFF
+		-DGDAL_USE_SPATIALITE=$(usex spatialite)
+		-DGDAL_USE_SQLITE3=$(usex sqlite)
+		-DGDAL_USE_SFCGAL=OFF
+		-DGDAL_USE_TEIGHA=OFF
+		-DGDAL_USE_TIFF=ON
+		-DGDAL_USE_TILEDB=OFF
+		-DGDAL_USE_WEBP=$(usex webp)
+		-DGDAL_USE_XERCESC=$(usex gml)
+		-DGDAL_USE_ZLIB=ON
+		-DGDAL_USE_ZSTD=$(usex zstd)
+
+		# Bindings
+		-DBUILD_PYTHON_BINDINGS=$(usex python)
+		-DBUILD_JAVA_BINDINGS=$(usex java)
+		# bug #845369
+		-DBUILD_CSHARP_BINDINGS=OFF
+
+		# Check work/gdal-3.5.0_build/CMakeCache.txt after configure
+		# and https://github.com/OSGeo/gdal/blob/master/cmake/helpers/CheckCompilerMachineOption.cmake#L71
+		# Commented out: not (yet?) implemented upstream.
+		# Also, arm64 stuff is a TODO upstream, but not there (yet?)
+		-Dtest_avx=$(usex cpu_flags_x86_avx)
+		-Dtest_avx2=$(usex cpu_flags_x86_avx2)
+		-Dtest_sse=$(usex cpu_flags_x86_sse)
+		-Dtest_sse2=$(usex cpu_flags_x86_sse2)
+		#-Dtest_sse3=$(usex cpu_flags_x86_sse3)
+		-Dtest_sse4.1=$(usex cpu_flags_x86_sse4_1)
+		#-Dtest_sse4.2=$(usex cpu_flags_x86_sse4_2)
+		#-Dtest_sse4a=$(usex cpu_flags_x86_sse4a)
+		-Dtest_ssse3=$(usex cpu_flags_x86_ssse3)
+		#-Dtest_fma4=$(usex cpu_flags_x86_fma4)
+		#-Dtest_xop=$(usex cpu_flags_x86_xop)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile doc
+}
+
+src_test() {
+	export GDAL_RUN_SLOW_TESTS=0
+	export GDAL_DOWNLOAD_TEST_DATA=0
+
+	# Two test suites:
+	# 1. autotests (much larger, uses pytest)
+	# 2. Small set of fuzzing tests (no download needed)
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# TODO: install docs?
+}
+
+pkg_postinst() {
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
diff --git a/sci-libs/ginkgo/Manifest b/sci-libs/ginkgo/Manifest
index 42c1ff7e8037..0a4de83c295e 100644
--- a/sci-libs/ginkgo/Manifest
+++ b/sci-libs/ginkgo/Manifest
@@ -1,3 +1,3 @@
 DIST ginkgo-1.4.0.tar.gz 2574052 BLAKE2B 99677d9d75831991cac40312095d32c44bef18cd05b120d80fdb9e64ea6dc15796c09b26f35dc8230db6b55c7be4dd76efd6d1cd8ca13c83e1f3087550db0dca SHA512 9bfcb2c415c7a1a70cf8e49f20adf62d02cab83bb23b6fcecfeaeeb322b2d4e1ad8d8fa6582735073753f9a05eac8688b9bd1ff1d4203957c1a80702d117e807
-EBUILD ginkgo-1.4.0-r3.ebuild 1243 BLAKE2B d668fc49470c799eb92d5dc58a89aeecccb8cc414005b487236fdceb87136ea530901f1a2c3c010edb8d19223a77f0c3b0b2d308065d56911aa044e9e1db1487 SHA512 ee366aa6e69985cd0e9a618bd8b99c0245724f2c8f9bd166ef722a943272250fe0d17a202537bd2712a2137f1412d6a070bf5942116f7dace39701626cf3b758
+EBUILD ginkgo-1.4.0-r3.ebuild 1267 BLAKE2B 509ac83701e30924c09f1ff6b4c56e6c2ebebec69e8debc96fbaafa3110a6cc81437f81ad20d77ef7b9cf6341be87e82bcea20fd0191b6baf5c8f32909eca037 SHA512 1801ec71a30814acd8e521e313a722ce472edffb20d10cd627093360ab62b9ee10d09e27dd4ffdeff0bd8f153e636d9fad45268a262e1619d3def6cd952e7965
 MISC metadata.xml 888 BLAKE2B 31ec7f013eac6db60b8f4a1ae447000719a59cc6733daca5579c774360e40aa9daafbc652e8f6cc994fee088bc4ccfaeec72dff2fad99e0aa44c2f115371c19b SHA512 6e7f04db8def94eba57a6cd7eda7f47aceaa1c8b1475bcd35e6c34d540117fe848af545ddb9c93d0a12d4088fe8f33d26a7e300e14814b6b414751edb56b42f4
diff --git a/sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild b/sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild
index 5092a73a706d..abd270c911c4 100644
--- a/sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild
+++ b/sci-libs/ginkgo/ginkgo-1.4.0-r3.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=8
@@ -26,11 +26,12 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && \
-		use openmp && ! tc-has-openmp ; then
-			die "Need an OpenMP capable compiler"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {
diff --git a/sci-libs/gloo/Manifest b/sci-libs/gloo/Manifest
new file mode 100644
index 000000000000..967cace160e3
--- /dev/null
+++ b/sci-libs/gloo/Manifest
@@ -0,0 +1,4 @@
+AUX gloo-2022.05.18-gentoo.patch 2285 BLAKE2B fc8ab0b188fa7e1acacf3a915c34842ff73e7dd72762165530d175c71ccb62bf7a43f754821ded74a2b67d626e2c16b1f3df59fd97968b3544ff8020e6f099b0 SHA512 b8b75b0258a89c5105f0b7888b25aa9c5f9aa1c997136f261559cba4b5f4fae8f6e4dcea4e33c2cf7572b3798ad4ec3033fdc46d937d965bacd34cc5f40e9703
+DIST gloo-2022.05.18.tar.gz 251778 BLAKE2B 90bd97cff437d030b87c333ebb6679f199491b97826f09278b7a6740d781ca750af4e8eda18f29a4311462473146aae1fd0686443a0eb2c73e8ba34e6837b0af SHA512 356b4bd4480fda0f9db039babd223c17ed24c35945877bdb6c5b28eb45ee8ce08def73d308bc906c478c4c9d485bb0f74080d90c7a4fafe84818df0a97a7f6e2
+EBUILD gloo-2022.05.18.ebuild 1044 BLAKE2B 3123f3d977677405e28d7a80b7666a781fad05880a6894e56187a92c4167a7d72a9d2a0e488ca379668bc15fe2d9a9bc7551a8d0c001f4f9f9ae7ac55a0274d9 SHA512 022673a9308eecf06f81e17b26f58fd29f8daca24b959e1e4ebc44db6b7a0ed49052104a2da683685a530576c0164fd5dafa288780f9936000aada25b1ccd9b7
+MISC metadata.xml 492 BLAKE2B be64dabc0bd193d99c4458e6bad8c78042ef1d65800ebd3a3818ffdac3b361f18011ae044036e3c73deba03886e8aa6ffdcb5c2a66b635ecc2f29d636c660227 SHA512 e342a7d570f7ff12718f51e91fd6d359d038670dfb3b679a4cd8d7de61bef8d4b048e2362303bb925eddfd7c40e67f4179e89c24dc2f9b5c21e5a220bf9d4aa2
diff --git a/sci-libs/gloo/files/gloo-2022.05.18-gentoo.patch b/sci-libs/gloo/files/gloo-2022.05.18-gentoo.patch
new file mode 100644
index 000000000000..41a1ace42dc7
--- /dev/null
+++ b/sci-libs/gloo/files/gloo-2022.05.18-gentoo.patch
@@ -0,0 +1,64 @@
+--- a/CMakeLists.txt	2022-06-09 08:29:13.172119535 +0200
++++ b/CMakeLists.txt	2022-06-09 08:29:27.474929097 +0200
+@@ -2,6 +2,9 @@
+ 
+ project(gloo CXX C)
+ 
++include(GNUInstallDirs)
++include(CTest)
++
+ set(GLOO_VERSION_MAJOR 0)
+ set(GLOO_VERSION_MINOR 5)
+ set(GLOO_VERSION_PATCH 0)
+--- a/gloo/CMakeLists.txt	2022-06-09 08:41:09.883773600 +0200
++++ b/gloo/CMakeLists.txt	2022-06-09 08:42:39.045637103 +0200
+@@ -176,7 +176,7 @@
+ # want to statically link with Gloo and not install any artifacts.
+ if(GLOO_INSTALL)
+   install(TARGETS gloo EXPORT GlooTargets
+-      DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
++          DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   if(USE_CUDA)
+     install(TARGETS gloo_cuda EXPORT GlooTargets
+         DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+--- a/gloo/test/CMakeLists.txt	2022-06-10 22:17:03.682856314 +0200
++++ b/gloo/test/CMakeLists.txt	2022-06-10 22:17:49.671242697 +0200
+@@ -68,3 +68,4 @@
+   gloo_hip_add_executable(gloo_test_hip ${GLOO_TEST_HIP_SRCS})
+   target_link_libraries(gloo_test_hip gloo_hip gtest OpenSSL::SSL OpenSSL::Crypto)
+ endif()
++add_test(NAME gloo_test COMMAND gloo_test)
+--- a/gloo/test/memory_test.cc	2022-06-10 22:28:53.815371465 +0200
++++ b/gloo/test/memory_test.cc	2022-06-10 22:29:14.504094854 +0200
+@@ -52,7 +52,7 @@
+ class MemoryTest : public BaseTest,
+                    public ::testing::WithParamInterface<Param> {};
+ 
+-TEST_P(MemoryTest, ManySlotsNoLeaks) {
++TEST_P(MemoryTest, DISABLED_ManySlotsNoLeaks) {
+   const auto transport = GetParam();
+   spawn(transport, 2, [&](std::shared_ptr<Context> context) {
+     size_t tmp0;
+--- a/cmake/Dependencies.cmake	2022-06-11 23:38:57.367089917 +0200
++++ b/cmake/Dependencies.cmake	2022-06-11 23:48:57.690866797 +0200
+@@ -81,7 +81,7 @@
+       pkg_search_module(libuv REQUIRED libuv>=1.26)
+       find_file(
+         libuv_LIBRARY
+-        NAMES libuv.a libuv_a.a
++        NAMES libuv.so
+         PATHS ${libuv_LIBDIR}
+         NO_DEFAULT_PATH)
+       if(NOT EXISTS ${libuv_LIBRARY})
+@@ -90,10 +90,7 @@
+     endif()
+ 
+     add_library(uv_a INTERFACE IMPORTED)
+-    set_target_properties(uv_a PROPERTIES
+-      INTERFACE_INCLUDE_DIRECTORIES ${libuv_INCLUDE_DIRS}
+-      INTERFACE_LINK_LIBRARIES ${libuv_LIBRARY}
+-      )
++    list(APPEND gloo_DEPENDENCY_LIBS -luv)
+   endif()
+ endif()
+ 
diff --git a/sci-libs/gloo/gloo-2022.05.18.ebuild b/sci-libs/gloo/gloo-2022.05.18.ebuild
new file mode 100644
index 000000000000..5b1fc445c18d
--- /dev/null
+++ b/sci-libs/gloo/gloo-2022.05.18.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+CommitId=5b143513263133af2b95547e97c07cebeb72bf72
+
+DESCRIPTION="library of floating-point neural network inference operators"
+HOMEPAGE="https://github.com/facebookincubator/gloo/"
+SRC_URI="https://github.com/facebookincubator/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libuv mpi redis ssl test"
+
+RDEPEND="
+	libuv? ( dev-libs/libuv )
+	mpi? ( virtual/mpi )
+	redis? (
+		dev-db/redis
+		dev-libs/hiredis
+	)
+	ssl? ( dev-libs/openssl )
+"
+DEPEND="${RDEPEND}
+"
+
+BDEPEND="test? ( dev-cpp/gtest )"
+RESTRICT="test" # For some test the network is needed
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DUSE_LIBUV=$(usex libuv ON OFF)
+		-DUSE_MPI=$(usex mpi ON OFF)
+		-DUSE_REDIS=$(usex redis ON OFF)
+		-DUSE_TCP_OPENSSL_LINK=$(usex ssl ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/gloo/metadata.xml b/sci-libs/gloo/metadata.xml
new file mode 100644
index 000000000000..453b2878b484
--- /dev/null
+++ b/sci-libs/gloo/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facebookincubator/gloo</remote-id>
+	</upstream>
+	<use>
+		<flag name="libuv">Enable libuv support</flag>
+		<flag name="redis">Enable Redis backend for storage via <pkg>dev-libs/hiredis</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index f76e4aff6141..d99868f2dc62 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1,3 +1,6 @@
+AUX gmsh-4.9.5-opencascade.patch 1136 BLAKE2B 3613e9a19c76c107eec2090a0a12474d94ac1d548cf6b5137644e3a7834c12a9a8c6dc63d217b8473c385b2ea5bd1ea3d9699e61cbc897bf7cdd121ba00bdff2 SHA512 3774335121ae1d7b4a2369b36e1dab84e9b08eb6336ad1ed6893e0b2260402cb750e202f0244d61c8772d809dd31d95adfb19d8deee5255185c968838e495cd5
+DIST gmsh-4.10.3-source.tgz 14994941 BLAKE2B b9229f81fc8daabdb3b3db3acd50a0a0e602fec1423bc67a0033a02217c908910eeb1f9bd1cbc57fe2d24b566f256b969fe92e9e9ceefe4cd5af34dd07cf1a9e SHA512 863c5a7fe13095afad37b4450855b2079d034222b5a595fc25b2b0d840d8ef63ceafbbf56ea642b3c3e9277faabe08a2cc19a7a3126a8e12e9d4117243244653
 DIST gmsh-4.9.5-source.tgz 14921704 BLAKE2B e805bd786154bf6ce8bebb2d2c38204a88d06a251c45fbe6dd37641a15e02291993c244f26a01faad2a6445a4852274e5481d4236b7a3d9b7ee65fc863f1b880 SHA512 4da61bdf03fb9466af80ac790e83c8888bab755c78d860d601474d7ebca220ac51cba620db310165021412dbecc1cf187ccdff47b8a78e0579339bb72cfa6484
-EBUILD gmsh-4.9.5-r1.ebuild 1839 BLAKE2B 410b50fbde4f16a87bf96c61a2971b43a8361e066755eefde825767a4766a7d37496a961a340ece6747f84ba50d8c93dd7c7308930782dc4d2931e00ab345c8d SHA512 d7aa4fb98209e3f1f447be4656148faa11c4dca0e0797defc7ca4ec86bde4140fd473d2d0449f1a6df15ee4a8c88ae002b58e16fbda3adbac1ecf1fae3f52bf4
-MISC metadata.xml 802 BLAKE2B 5ddd7f70af792e529ca9b5197b80775cea3390fdb04fdc65df5e43333aac0ac3f1d5f2fc16c32c5eb5336f3ec12ad4b2fefd6b055a3f2361f42a2bd77aa83b47 SHA512 08356d610e96e262c6d2b49647835e8dfc96ebb7efa3b9c078f5d930c83eb23211c9b61bd57fdcdbc067d957b47ab0c8c650b15169fa40c3a8da5aab8b325666
+EBUILD gmsh-4.10.3.ebuild 2640 BLAKE2B c0e979a42b57d719bc98962515676fde72740f481d53a214509452c2e4d057b9afacfe40abd4af46b0ff38ad900fb24563e71475ab751b92ef36856910f5a84b SHA512 579b92da1da3480491a2c1be72dfb2acc0fe6cc0715c892ea5bc162085d63d92e2b026f2fbfe0a07cebc1d2fb213e6839a1bd0cdb2ea4e2e09d1a9e5cb0f5508
+EBUILD gmsh-4.9.5-r2.ebuild 1914 BLAKE2B ba0bc6302edfa5e3cc21ae2dee9d4dcb30af22a1941b50bca489382fb93a50d98907bea6a1eb335eb24dc5bfbc797360965cf744f284ec47d1f15e81507695e5 SHA512 c8098c5fd7aa38efa369f3938c8ea958e6a6db91bf57a552e6d32427c1e5de3772520bf4d8980c9767f3eb05b520b872ab0544bceea5b5347b8d3d7855d21537
+MISC metadata.xml 1216 BLAKE2B d7a71c97766032f77b2152313368a583168c20a38b065b048bfdfc774c2b4006939806994751d0aecabd53372f587f846da3e8b7c04baf0e5beaefffc9163702 SHA512 b5cabe48e5ab3ba2e18bded74c15d7c886aac9421e0b18edffc81995cfacf5b11ab787fb68f890c3910e6a99a83ceb3bfef74bb6ce164b536b038c4d40ee6574
diff --git a/sci-libs/gmsh/files/gmsh-4.9.5-opencascade.patch b/sci-libs/gmsh/files/gmsh-4.9.5-opencascade.patch
new file mode 100644
index 000000000000..63281d42e1f2
--- /dev/null
+++ b/sci-libs/gmsh/files/gmsh-4.9.5-opencascade.patch
@@ -0,0 +1,20 @@
+--- ./CMakeLists.txt	2022-05-24 12:36:43.084752081 +0200
++++ ./CMakeLists.txt.new	2022-05-24 12:44:08.895710126 +0200
+@@ -1282,7 +1282,7 @@
+     else()
+       set(OCC_LIBS)
+       foreach(OCC ${OCC_LIBS_REQUIRED})
+-        find_library(OCC_LIB ${OCC} HINTS ENV CASROOT PATH_SUFFIXES
++        find_library(OCC_LIB ${OCC} HINTS ENV CASROOT PATH_SUFFIXES opencascade
+                      lib ${OCC_SYS_NAME}/vc8/lib  ${OCC_SYS_NAME}/vc9/lib
+                          ${OCC_SYS_NAME}/vc10/lib ${OCC_SYS_NAME}/vc11/lib
+                          ${OCC_SYS_NAME}/vc12/lib ${OCC_SYS_NAME}/vc14/lib
+@@ -1308,7 +1308,7 @@
+       list(LENGTH OCC_CAF_LIBS_REQUIRED NUM_OCC_CAF_LIBS_REQUIRED)
+       set(OCC_CAF_LIBS)
+       foreach(OCC ${OCC_CAF_LIBS_REQUIRED})
+-        find_library(OCC_CAF_LIB ${OCC} HINTS ENV CASROOT PATH_SUFFIXES
++        find_library(OCC_CAF_LIB ${OCC} HINTS ENV CASROOT PATH_SUFFIXES opencascade
+                      lib ${OCC_SYS_NAME}/vc8/lib  ${OCC_SYS_NAME}/vc9/lib
+                          ${OCC_SYS_NAME}/vc10/lib ${OCC_SYS_NAME}/vc11/lib
+                          ${OCC_SYS_NAME}/vc12/lib ${OCC_SYS_NAME}/vc14/lib
diff --git a/sci-libs/gmsh/gmsh-4.10.3.ebuild b/sci-libs/gmsh/gmsh-4.10.3.ebuild
new file mode 100644
index 000000000000..81dc07c58474
--- /dev/null
+++ b/sci-libs/gmsh/gmsh-4.10.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake fortran-2 python-any-r1 toolchain-funcs
+
+DESCRIPTION="Three-dimensional finite element mesh generator"
+HOMEPAGE="https://gmsh.info"
+SRC_URI="https://gmsh.info/src/${P}-source.tgz"
+
+LICENSE="
+	GPL-2+ free-noncomm
+	alglib? ( MIT )
+	gmm? ( LGPL-2.1+ )
+	metis? ( Apache-2.0 )
+	netgen? ( LGPL-2.1+ )
+	voro? ( BSD )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+## cgns is not compiling ATM, maybe fix cgns lib first
+IUSE="+alglib +blas cgns eigen examples +gmm jpeg med metis mpi mumps netgen opencascade petsc pdf png python shared slepc X voro zlib"
+
+REQUIRED_USE="
+	^^ ( blas eigen )
+	mumps? ( blas )
+	slepc? ( petsc )
+	"
+
+RDEPEND="
+	virtual/fortran
+	X? ( x11-libs/fltk:1[xft] )
+	alglib? ( sci-libs/alglib )
+	blas? (
+		virtual/blas
+		virtual/lapack
+		sci-libs/fftw:3.0
+	)
+	cgns? (
+		sci-libs/cgnslib
+		sci-libs/hdf5[mpi=]
+	)
+	eigen? ( dev-cpp/eigen )
+	gmm? ( sci-mathematics/gmm )
+	jpeg? ( media-libs/libjpeg-turbo )
+	med? (
+		sci-libs/med[mpi=]
+		sci-libs/hdf5[mpi=]
+	)
+	mpi? ( virtual/mpi[cxx] )
+	mumps? ( sci-libs/mumps[mpi=] )
+	opencascade? ( sci-libs/opencascade:* )
+	pdf? ( app-text/poppler:= )
+	png? ( media-libs/libpng:0 )
+	petsc? ( sci-mathematics/petsc[mpi=] )
+	slepc? ( sci-mathematics/slepc[mpi=] )
+	voro? ( sci-libs/voro++ )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	python? ( dev-lang/swig:0 )
+	"
+
+S="${WORKDIR}"/${P}-source
+
+PATCHES=( "${FILESDIR}"/${PN}-4.9.5-opencascade.patch )
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=( )
+
+	use blas && \
+		mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
+
+	mycmakeargs+=(
+		-DENABLE_ALGLIB="$(usex alglib)"
+		-DENABLE_BLAS_LAPACK="$(usex blas)"
+		-DENABLE_BUILD_DYNAMIC="$(usex shared)"
+		-DENABLE_CGNS="$(usex cgns)"
+		-DENABLE_EIGEN="$(usex eigen)"
+		-DENABLE_FLTK="$(usex X)"
+		-DENABLE_GMM="$(usex gmm)"
+		-DENABLE_GRAPHICS="$(usex X)"
+		-DENABLE_MED="$(usex med)"
+		-DENABLE_MPI="$(usex mpi)"
+		-DENABLE_METIS="$(usex metis)"
+		-DENABLE_MUMPS="$(usex mumps)"
+		-DENABLE_NETGEN="$(usex netgen)"
+		-DENABLE_OCC="$(usex opencascade)"
+		-DENABLE_PETSC="$(usex petsc)"
+		-DENABLE_POPPLER="$(usex pdf)"
+		-DENABLE_SLEPC="$(usex slepc)"
+		-DENABLE_PRIVATE_API="$(usex shared)"
+		-DENABLE_SYSTEM_CONTRIB="YES"
+		-DENABLE_VOROPP="$(usex voro)"
+		-DENABLE_WRAP_PYTHON="$(usex python)")
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples ; then
+		dodoc -r examples tutorials
+		docompress -x /usr/share/doc/${PF}/{examples,tutorials}
+	fi
+}
diff --git a/sci-libs/gmsh/gmsh-4.9.5-r1.ebuild b/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
index 902c8379230d..48328b69280e 100644
--- a/sci-libs/gmsh/gmsh-4.9.5-r1.ebuild
+++ b/sci-libs/gmsh/gmsh-4.9.5-r2.ebuild
@@ -7,9 +7,9 @@ PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake fortran-2 python-any-r1 toolchain-funcs
 
-DESCRIPTION="A three-dimensional finite element mesh generator"
-HOMEPAGE="http://www.geuz.org/gmsh/"
-SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz"
+DESCRIPTION="Three-dimensional finite element mesh generator"
+HOMEPAGE="https://gmsh.info/"
+SRC_URI="https://gmsh.info/src/${P}-source.tgz"
 
 LICENSE="GPL-3 free-noncomm"
 SLOT="0"
@@ -24,7 +24,7 @@ RDEPEND="
 	X? ( x11-libs/fltk:1[xft] )
 	blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
 	cgns? ( sci-libs/cgnslib )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo )
 	med? ( sci-libs/med[mpi] )
 	opencascade? ( sci-libs/opencascade:* )
 	png? ( media-libs/libpng:0 )
@@ -38,10 +38,9 @@ DEPEND="${RDEPEND}
 	python? ( dev-lang/swig:0 )
 	"
 
-S=${WORKDIR}/${P}-source
+S="${WORKDIR}"/${P}-source
 
-PATCHES=(
-)
+PATCHES=( "${FILESDIR}"/${P}-opencascade.patch )
 
 pkg_setup() {
 	fortran-2_pkg_setup
@@ -53,7 +52,7 @@ src_configure() {
 	use blas && \
 		mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77))
 
-	local mycmakeargs+=(
+	mycmakeargs+=(
 		-DENABLE_BLAS_LAPACK="$(usex blas)"
 		-DENABLE_BUILD_DYNAMIC="$(usex shared)"
 		-DENABLE_CGNS="$(usex cgns)"
@@ -65,6 +64,7 @@ src_configure() {
 		-DENABLE_NETGEN="$(usex netgen)"
 		-DENABLE_OCC="$(usex opencascade)"
 		-DENABLE_PETSC="$(usex petsc)"
+		-DENABLE_PRIVATE_API="$(usex shared)"
 		-DENABLE_WRAP_PYTHON="$(usex python)")
 
 	cmake_src_configure
@@ -74,7 +74,7 @@ src_install() {
 	cmake_src_install
 
 	if use examples ; then
-		dodoc -r demos tutorial
-		docompress -x /usr/share/doc/${PF}/{demos,tutorial}
+		dodoc -r examples tutorials
+		docompress -x /usr/share/doc/${PF}/{examples,tutorials}
 	fi
 }
diff --git a/sci-libs/gmsh/metadata.xml b/sci-libs/gmsh/metadata.xml
index 896b5d03abdb..79e8c7790e0a 100644
--- a/sci-libs/gmsh/metadata.xml
+++ b/sci-libs/gmsh/metadata.xml
@@ -10,12 +10,18 @@
 		<name>Gentoo Science Project</name>
 	</maintainer>
 	<use>
-		<flag name="cgns"> Enables cgns output support</flag>
-		<flag name="metis"> Enables metis support</flag>
-		<flag name="med"> Enables med support</flag>
-		<flag name="netgen"> Enable 3D Frontal triangulation using netgen lib</flag>
-		<flag name="petsc"> Enable sci-mathematics/petsc support</flag>
-		<flag name="opencascade"> Enable OpenCASCADE support</flag>
+		<flag name="alglib">Enable alglib support for mesh optimizers</flag>
+		<flag name="cgns">Enables cgns output support</flag>
+		<flag name="eigen">Build matrix manipulation with dev-cpp/eigen</flag>
+		<flag name="gmm">A simple alternative to petsc based on sci-mathematics/gmm</flag>
+		<flag name="metis">Enables metis support</flag>
+		<flag name="med">Enables med support</flag>
+		<flag name="mumps">Enables mumps solver support</flag>
+		<flag name="netgen">Enable 3D Frontal triangulation using netgen lib</flag>
+		<flag name="petsc">Enable sci-mathematics/petsc support</flag>
+		<flag name="opencascade">Enable OpenCASCADE support</flag>
 		<flag name="shared">Install shared library and headers</flag>
+		<flag name="slepc">Enable sci-mathematics/slepc support</flag>
+		<flag name="voro">Enable support to sci-libs/voro++ meshing</flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index ff7643efa35f..67bbd93db376 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 1491 BLAKE2B 72c9d8a3173334ba9e28903c5c66c759756a617c0ef110066f26e9768fb3be35f0d9dbcee6a2c58bfd552a45313949f7a50adaf699a2e3da4260d56ebfabbee9 SHA512 0e0831a79856483a8b43358f16a1521840f80b2a799dd391b8426044d09642318b1e90a1457ccc3aae6ad332f9874deea11724285f9de6cd24eb06d227074e37
-EBUILD gsl-2.7.ebuild 1456 BLAKE2B b5fb1ef6587526b39804ce175d0f67a7917a0f48a90ff3585577b51ba7547b026e3518801fb66f43cff5c8228142189e65cfe5e1bf0ef7cdb3c166b9532b5231 SHA512 14e1f9ee0d3d7b3e9942082b143971426352011c27ff4cfdeb9e63294c68598e38b2ff8074f4431909b1d06603b8120288a4504981732c6e8beb2fb0e597dcf3
+EBUILD gsl-2.7.1-r1.ebuild 1323 BLAKE2B 52c5d89e0f6b514c2f4098ac3e28b59f28761a2982c0be0a3f0132f3546c5a6998c0fa6258704ee9b425de6960eafe5fed550108e2d29df02d3771b4dde22d27 SHA512 aa1cab10dcf2536ccec66607dead1c23175216c5a23b88393551c1be40fc847062f0ef4ae715fc767b8d5539e2d37038a050638e861e36dcf0757ce087310ba7
+EBUILD gsl-2.7.ebuild 1288 BLAKE2B dad0fb8afcf6ab39b112406574081aa2fdb339f4625d96c751042f9bf5dcf046b4e73287c62319e819e505925bd6efb4e2c27731fa40c017ccb225f798bac843 SHA512 f824d23f42c08409d4d993ed073143501b34e393b75409d8af1623eabb6c3cfb88a26ec40e79125f4ee388de46bbacfed59c789a7494bc391ec709bb92a25b29
 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 7c8a0d0550f5..19f17d317bdc 100644
--- a/sci-libs/gsl/gsl-2.7.1-r1.ebuild
+++ b/sci-libs/gsl/gsl-2.7.1-r1.ebuild
@@ -25,11 +25,6 @@ PATCHES=(
 )
 
 src_prepare() {
-	# bug #349005
-	[[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(tc-getCC)$ != *apple* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \
-		&& filter-mfpmath sse
 	filter-flags -ffast-math
 
 	default
diff --git a/sci-libs/gsl/gsl-2.7.ebuild b/sci-libs/gsl/gsl-2.7.ebuild
index 1f76267c23d5..ac5938b4fe8d 100644
--- a/sci-libs/gsl/gsl-2.7.ebuild
+++ b/sci-libs/gsl/gsl-2.7.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
@@ -24,11 +24,6 @@ PATCHES=(
 )
 
 src_prepare() {
-	# bug #349005
-	[[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(tc-getCC)$ != *apple* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \
-		&& filter-mfpmath sse
 	filter-flags -ffast-math
 
 	default
diff --git a/sci-libs/gts/Manifest b/sci-libs/gts/Manifest
index 7d8d0c5516c5..48712e5adaec 100644
--- a/sci-libs/gts/Manifest
+++ b/sci-libs/gts/Manifest
@@ -1,4 +1,4 @@
 AUX gts-20121130-autotools.patch 612 BLAKE2B 1dd5e897db2453d704554918c4473ec60f0371994e05964ac11c561cfda55980ce7fc12611fb3d5588ab346cc4a78f280371b5c0db633ba052dcc0cbf4d12d55 SHA512 dc80e024813c045f3379552f2ad3ed63b048462622149e33ab97c74ab0c75cfb09f928f6ba975b4e94ac201f3d04a4bec1016cce014c134e4baee4480ec38158
 DIST gts-snapshot-121130.tar.gz 880569 BLAKE2B ffd35083122ec40b9ab3c301965e2f40f35f81cbb51947fee01d851f545d5314cdce6c24eee2cbcdf08fe492a63eadb3720535d3f4ed913f3309561d0d382c80 SHA512 84c38dc345830eea75755d9d55235b6d76786a84c3b9c3b7e057437bf395a9f2687596bbf037afd601b9f31a485d425a371ca5e60680265f10cb414400db4142
-EBUILD gts-20121130.ebuild 1171 BLAKE2B 5cbeae94b0f52293a02f943a0c84d79e254dbbacb7454c817f1053567104a45b4f8c4a80b704fcb4622a0df78aa65199d6dd9e3e8787d6405c75414adcbe991b SHA512 25af265360e1e3fbdb6d368a590d50447b3564cacc09abb4796c5290bcd062d4aefabcb07901698329630234e89b34e86ea5f9e0df2392107503a79a7b719534
+EBUILD gts-20121130.ebuild 1178 BLAKE2B 9fb3df924fb853fdf101b0f75528e7088b4f7966577a5c29ae481160d6c886bfcc5fbc2d5ee6e0cc3fc5b732f156c40156171ccd168422e1740b5c2e537da2a4 SHA512 fc7ff92ac6818961a84f982159178306aeae6d83498dfcb57e99b9f0b5491b13049413d1cf7a01ad53b41e3ba70c831f5fec8ec21f0d8cfad7d200115433197f
 MISC metadata.xml 511 BLAKE2B 7d84726e3807de09c17f463a9b03e993592cfdffc9c8a6e6604f4fd8707366302057cd298f294aba2f84f05114587e6b4ac9bc9f70393c2cda2ee5ca2f121c7c SHA512 80ab76a08373dd78b3de544b8cb1c1c185c55cd6bc86baabd932bc6ddaaf6737f2a6add2406d9c40816c6124d6bcfbab203fa33303300f4428d075532610354a
diff --git a/sci-libs/gts/gts-20121130.ebuild b/sci-libs/gts/gts-20121130.ebuild
index 3a6449d4a08d..9db12aa99d2e 100644
--- a/sci-libs/gts/gts-20121130.ebuild
+++ b/sci-libs/gts/gts-20121130.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
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ~m68k ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="test" # bug #277165
 
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index fca66049cd37..1b93996cac29 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1,5 +1,7 @@
 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.12.2-no-messing-ldpath.patch 1086 BLAKE2B 77aba02cd8f3663883fa5cf91b3f77067163f58ec4270d22e2c4e1a5b9b1cc138a2e9dd1c7a44331165c69d6c7a0427fe2708bae63958b416a9f26c799de7443 SHA512 8b8aa080cb6feded376900cf9f4b1f1bbe98550b37e9ae8ad660419f732e686aae2ff6eac37e7810ee438a0e9c1b7a37d24f5db8590cce0c91f482ec7b873527
+AUX hdf5-1.12.2-no-strip-symbols.patch 434 BLAKE2B c8d96cb95d3444c18349d72b7fd59f76b4af3d0c5422a7c31161b8f98afacb322b042b8f5751b581565b351148fd0f4003379349b6ca964f5957cd9e19ebdebc SHA512 6b593a8bbbd4a4e9b97e8b3324ad90024b2c09c669d2f6e21a0d23adb66bbbec34afc5961bf97bc6f913492e33610a4b5aeca6a7a4ef9f7605ce5b69fbba6527
 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
@@ -10,5 +12,7 @@ EBUILD hdf5-1.10.5-r1.ebuild 2940 BLAKE2B 45e4cf6004cb70667829844ddf37f2c4f96d6b
 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
+EBUILD hdf5-1.12.2-r1.ebuild 3389 BLAKE2B 536c7a51533849c8b19f2a086b35352a9a845d89417ba10464ef53b0ee444fcab2fec0e369d5bdf9a1aa4746c0f004726200db1b60b67b3876eb425504d6d173 SHA512 1ccc6ce4ca8712bdd39d79e5acd82886a592d0578f14162ed374675e9bfcd2e8fe838354acea030298b340c9fac22f250913e205a9e943a4919237c0603766cc
+EBUILD hdf5-1.12.2-r2.ebuild 3456 BLAKE2B d59c684d4494e7f7f484dc87297ef1465998a8f9d75c2cf268e1d689353fd5e092c27dd0a61907ffe11cb35c424e2f9e972a7e3770f0938808bd704cdeca7961 SHA512 4e0b609458298ab12214aa68bb298063d35f64c12c4eff0cc656546b930dce5cc5891e9cdd6d030f7d616aa4ca13386dbbb020970cbea6d939bbe2356fb310ed
+EBUILD hdf5-1.12.2-r4.ebuild 3139 BLAKE2B 7a307b26c007fdfdb84e2eda430093fed044854c40330b0d584dfce5fc51f17c6a73db07369ea4f002ced8634b00924d8a2e99ae8ed135aee870418d45cae456 SHA512 6036a8152dc08610784596c616acc72822f095daea25f90ed907ff1683f7b9d7e8e0449bc9f3b36a89cfaf6f63b9fe4ef621f5ec76367996a7df82adbf50e5f1
 MISC metadata.xml 935 BLAKE2B b9195ac707556cdb2ee2c4d032fabd88aad674ad4fa52a60fbeb31c47ae51b9511bb097d4271d19b05d1dbc3b59b3cafb3b7d407bd9b8095bfd449fa8728ab6a SHA512 57c4694ea2c024c7babdf34474a61b92165b6c322fa11ec7fefdf16d66b44f91f66d63eeb355311b121fbeec8da810e393e3e785a4c434ff658c7b4bd7baf22b
diff --git a/sci-libs/hdf5/files/hdf5-1.12.2-no-messing-ldpath.patch b/sci-libs/hdf5/files/hdf5-1.12.2-no-messing-ldpath.patch
new file mode 100644
index 000000000000..b8585fc647f6
--- /dev/null
+++ b/sci-libs/hdf5/files/hdf5-1.12.2-no-messing-ldpath.patch
@@ -0,0 +1,20 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -159,8 +159,6 @@ settings_DATA=libhdf5.settings
+ # Remove the generated .c file if errors occur unless HDF5_Make_Ignore
+ # is set to ignore the error.
+ H5Tinit.c: H5detect$(EXEEXT)
+-	LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) |                  \
+-		sed -e 's/-L/:/g' -e 's/ //g'`"                               \
+ 	$(RUNSERIAL) ./H5detect$(EXEEXT)  $@  ||                               \
+ 	    (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||          \
+ 	    ($(RM) $@ ; exit 1)
+@@ -171,8 +169,6 @@ H5Tinit.c: H5detect$(EXEEXT)
+ # Remove the generated .c file if errors occur unless HDF5_Make_Ignore
+ # is set to ignore the error.
+ H5lib_settings.c: H5make_libsettings$(EXEEXT) libhdf5.settings
+-	LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) |                  \
+-		sed -e 's/-L/:/g' -e 's/ //g'`"                               \
+ 	$(RUNSERIAL) ./H5make_libsettings$(EXEEXT)  $@  ||                               \
+ 	    (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||          \
+ 	    ($(RM) $@ ; exit 1)
diff --git a/sci-libs/hdf5/files/hdf5-1.12.2-no-strip-symbols.patch b/sci-libs/hdf5/files/hdf5-1.12.2-no-strip-symbols.patch
new file mode 100644
index 000000000000..0f3bf3981fa7
--- /dev/null
+++ b/sci-libs/hdf5/files/hdf5-1.12.2-no-strip-symbols.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/665378
+--- a/configure.ac
++++ b/configure.ac
+@@ -2368,9 +2368,9 @@ case "X-$SYMBOLS" in
+     AC_MSG_RESULT([yes])
+     ;;
+   X-no)
+-    H5_CFLAGS="$H5_CFLAGS $NO_SYMBOLS_CFLAGS"
+-    H5_CXXFLAGS="$H5_CXXFLAGS $NO_SYMBOLS_CXXFLAGS"
+-    H5_FCFLAGS="$H5_FCFLAGS $NO_SYMBOLS_FCFLAGS"
++    H5_CFLAGS="$H5_CFLAGS"
++    H5_CXXFLAGS="$H5_CXXFLAGS"
++    H5_FCFLAGS="$H5_FCFLAGS"
+     AC_MSG_RESULT([no])
+     ;;
+   *)
diff --git a/sci-libs/hdf5/hdf5-1.12.2-r1.ebuild b/sci-libs/hdf5/hdf5-1.12.2-r1.ebuild
index d5390cee5762..325f24396b29 100644
--- a/sci-libs/hdf5/hdf5-1.12.2-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.12.2-r1.ebuild
@@ -64,6 +64,10 @@ 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
+		# https://github.com/HDFGroup/hdf5/issues/1027 upstream.
+		-DCMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE=ON
 		-DBUILD_STATIC_LIBS=OFF
 		-DONLY_SHARED_LIBS=ON
 		-DFETCHCONTENT_FULLY_DISCONNECTED=ON
diff --git a/sci-libs/hdf5/hdf5-1.12.2-r2.ebuild b/sci-libs/hdf5/hdf5-1.12.2-r2.ebuild
new file mode 100644
index 000000000000..12d13c181a04
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.12.2-r2.ebuild
@@ -0,0 +1,125 @@
+# 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 ~s390 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=(
+		# Workaround needed to allow build with USE=fortran when an older
+		# version is installed. See bug #808633 and
+		# https://github.com/HDFGroup/hdf5/issues/1027 upstream.
+		-DCMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE=ON
+		-DBUILD_STATIC_LIBS=OFF
+		-DONLY_SHARED_LIBS=ON
+		-DFETCHCONTENT_FULLY_DISCONNECTED=ON
+		-DHDF5_BUILD_EXAMPLES=OFF
+		-DH5_DEFAULT_PLUGINDIR="${EPREFIX}/usr/$(get_libdir)/hdf5/plugin"
+		-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/hdf5/hdf5-1.12.2-r4.ebuild b/sci-libs/hdf5/hdf5-1.12.2-r4.ebuild
new file mode 100644
index 000000000000..7cb1b8716025
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.12.2-r4.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+
+# We've reverted *back* to autotools from CMake because of
+# https://github.com/HDFGroup/hdf5/issues/1814.
+inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix
+
+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"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="NCSA-HDF"
+SLOT="0/${PV%%_p*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxx debug examples fortran +hl mpi szip threads zlib"
+REQUIRED_USE="
+	cxx? ( !mpi ) mpi? ( !cxx )
+	threads? ( !cxx !mpi !fortran !hl )"
+
+RDEPEND="
+	mpi? ( virtual/mpi[romio] )
+	szip? ( virtual/szip )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch
+	"${FILESDIR}"/${PN}-1.12.2-no-messing-ldpath.patch
+	"${FILESDIR}"/${PN}-1.12.2-no-strip-symbols.patch
+)
+
+pkg_setup() {
+	# Workaround for bug 285148
+	tc-export CXX CC AR
+
+	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
+	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_prepare() {
+	default
+
+	# Respect Gentoo examples directory
+	sed \
+		-e "s:hdf5_examples:doc/${PF}/examples:g" \
+		-i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die
+	sed \
+		-e '/docdir/d' \
+		-i config/commence.am || die
+
+	if ! use examples; then
+		# bug #409091
+		sed -e '/^install:/ s/install-examples//' \
+			-i Makefile.am || die
+	fi
+
+	# Enable shared libs by default for h5cc config utility
+	sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" bin/h5cc.in || die
+	hprefixify m4/libtool.m4
+
+	eautoreconf
+}
+
+src_configure() {
+	# bug #686620
+	use sparc && tc-is-gcc && append-flags -fno-tree-ccp
+
+	econf \
+		--disable-static \
+		--enable-deprecated-symbols \
+		--enable-build-mode=$(usex debug debug production) \
+		$(use_enable cxx) \
+		$(use_enable debug codestack) \
+		$(use_enable fortran) \
+		$(use_enable hl) \
+		$(use_enable mpi parallel) \
+		$(use_enable threads threadsafe) \
+		$(use_with szip szlib) \
+		$(use_with threads pthread) \
+		$(use_with zlib)
+}
+
+src_install() {
+	emake DESTDIR="${D}" EPREFIX="${EPREFIX}" install
+
+	# No static archives
+	find "${ED}" -name '*.la' -delete || die
+
+	# Remove "perf" executable due to file collisions with dev-util/perf.
+	# Previously with the CMake build system we only installed h5perf, so
+	# let's simply remove the file for now.
+	use mpi && { rm "${ED}"/usr/bin/perf || die "rm failed" ; }
+}
diff --git a/sci-libs/hipBLAS/Manifest b/sci-libs/hipBLAS/Manifest
index d7dd34857a9a..0c5f580574d0 100644
--- a/sci-libs/hipBLAS/Manifest
+++ b/sci-libs/hipBLAS/Manifest
@@ -1,3 +1,5 @@
 DIST hipBLAS-4.3.0.tar.gz 428016 BLAKE2B 5a86f7a59aaed9cd6219779546135080f4c583a010f47b902f25545046c50451cd48e570b58c9c3721d735f3ab54295d5eddc61fecc01236e960e37fc87761c8 SHA512 128ee56d6db3d19c83b20fbc315eae8de6ee52aae6c2c5727351bab76c14d9131318cd49a6bcc724f5ec73485783058618bca4dddf96b05cd2f3a772c04f469f
+DIST hipBLAS-5.0.2.tar.gz 475009 BLAKE2B e7cb123c4ce08a8423f48816fe9248d580df59d089379c3c71eba8725470482cde591254cb2c4af7def390c702fdf6e6ddbe4fda70a6bc4579809c3e00e7d088 SHA512 40bccf8845467d14d614d2eba5482668167fa0488f118e30bbf4cf5fad3aea5e591f89ae2ae63bcb898cff624812d2f94572c18b8ed3d55d4bb254a440790c21
 EBUILD hipBLAS-4.3.0.ebuild 1229 BLAKE2B 2fcb641fbe83945020a84546e240b5b14094985d1afe40c144feebc9423ccbed344f01535a04aaaae53bbabcf97abf68315b2eb90df9b050d8b9e59728828d0b SHA512 f62e7b19d28d908863646492e6732563674fbcf07eb7eae68f32e7316085130b522d7c0665a0eee2074cb9fd08b4adeb166245066bc876693c0d52666dc2b6c4
+EBUILD hipBLAS-5.0.2.ebuild 1221 BLAKE2B 3e19f4bd5b50dea3ffedc25533df0ef07df4c7c8c10e0643bebde58112680772ec3a8e7b01baeb9e1418834de242715381f7f9310fc96c22cffddb9506773311 SHA512 ae48ef2bb8aaa9ae7dac477ba72c194b8037d2ae237f83551336c601b6af48c7d98485896326b8b20fc5f533397d86fd52132a092d0bd39b6e06b87b63fe7944
 MISC metadata.xml 453 BLAKE2B 4c1e76cbc277e93a92a95cda405973cc72863882ab9a6729a07976e7815119e985688387c14fc5017fd6e85aaa64eaa72b900375c7f7428eb6bbb2569c5ecaa6 SHA512 0e42066a5ac8720d1b561bcf23269013d9cceff52a9ddd6a6e0af58c7d2628c335bb290e0dc6c262a0542e286f54fd07cb487dd908343fac5cfca07410df6e56
diff --git a/sci-libs/hipBLAS/hipBLAS-5.0.2.ebuild b/sci-libs/hipBLAS/hipBLAS-5.0.2.ebuild
new file mode 100644
index 000000000000..4bf865ad1d81
--- /dev/null
+++ b/sci-libs/hipBLAS/hipBLAS-5.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+DESCRIPTION="ROCm BLAS marshalling library"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipBLAS"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/hipBLAS/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocBLAS:${SLOT}
+	sci-libs/rocSOLVER:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/hipBLAS-rocm-${PV}"
+
+src_prepare() {
+	sed -e "s:<INSTALL_INTERFACE\:include:<INSTALL_INTERFACE\:include/hipblas/:" -i library/src/CMakeLists.txt || die
+	sed -e "/PREFIX hipblas/d" -i library/src/CMakeLists.txt || die
+	sed -e "/rocm_install_symlink_subdir( hipblas )/d" -i library/src/CMakeLists.txt || die
+	sed -e "s:hipblas/include:include/hipblas:" -i library/src/CMakeLists.txt || die
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_CLIENTS_TESTS=OFF  # currently hipBLAS is a wrapper of rocBLAS which has tests, so no need to perform test here
+		-DBUILD_CLIENTS_BENCHMARKS=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/hipFFT/Manifest b/sci-libs/hipFFT/Manifest
index 53a3b2a4fa30..7c6df9ba6773 100644
--- a/sci-libs/hipFFT/Manifest
+++ b/sci-libs/hipFFT/Manifest
@@ -1,7 +1,12 @@
 AUX hipFFT-4.3.0-add-complex-header.patch 381 BLAKE2B 962865d4dd1a38bbc4e70756d614c92a287029e5bd6d987e8adbabb4b33a83e616cc1156bfc5dc415124d25373e146178a99854972d957039654007d5d3d5122 SHA512 8dfda0eb470005b9ed4701dbf0a1022040ce6bc90f0e04ca16704083074047b5170396257c1aa8c5d0855c055e491249c63516f4f1ba7583d5214f39705433fa
 AUX hipFFT-4.3.0-gentoo-install-locations.patch 1959 BLAKE2B 1f603bc411eda7aa7b999f3eb3c52822b27be51c2101562cd259d68856b019957c512add96f1c28ff0cb8ad58ab1911be3b97ffc9542758abae40f5e2e5b3d19 SHA512 4c358996e41750f938cb4997825aa00adbcda39b90bf0d3fbf180edecff57a1f7bf5d6c6e26c7b60274a1c1316858b911b69bf20e823a064d81fed498b3edf23
 AUX hipFFT-4.3.0-remove-git-dependency.patch 1505 BLAKE2B e98eb5b680ef2b5e45f85af8e93e25723dceebd6c849ca65ca132dab83a0eae7933c67affbf020a604c4773147907d40ccabe6cf2df6c92e213f5cab9a3e4736 SHA512 9d3c048d6f4242499d07d3c45baffc39f1766e3411d1e106ccdbae1325543d7df883531c0d2969b67805dd75bc505a63c3d3818ca5d141bbbcf8984f8d51a418
+AUX hipFFT-5.0.2-gentoo-install-locations.patch 978 BLAKE2B 3f452b7cf2dd9286a38f94890520d3de92932acba43de60ed66c866fed3b39e56139ff51e345301b41ac7bd0deabdedb040e9a1f80504504fffe87f5bdd4a496 SHA512 2bdfa7804a5ddb7913dc43e5835e16d498e7e08a4678f0de97eafa7829d6da4197bb3bc25824c357e9dc1bdb966f279e7950e8298bd36a16c1e1c43ae09b5484
+AUX hipFFT-5.0.2-remove-git-dependency.patch 1489 BLAKE2B 800033e728c4871c9c8de797779f3c9ca0f3441e1946068e4d826aabf02d1e27145e0fc627ae583ac27eaa43abeafba271fda48c22d087eda3cdace18cd62af2 SHA512 4c0ca6282b3fccf99d7ae25c17f5961b10b0ff49e1d1e1a65055d7ff20fe4a17901b8c5e9ec78953a2de86ab9408f583eb85cc211db1e2dc339fb8e2217a9f10
 DIST hipFFT-rocm-4.3.0.tar.gz 83355 BLAKE2B ee99b4cb685cbb846084d8a7c77982d75cf0d1597f9270260284bb26ae00702a31dd4d5ad9ae1885ab631c390f65c0f584f302be189701ba4f0dd9061b1bba5a SHA512 0d3100b054ff485eae06b13b8c568626b8e3a3286f36012c5a5f9bb4918e03c30c687a2714049bd797f6c3973f1730ad0936f02ad044cde1663c9c5750bbcf40
+DIST hipFFT-rocm-5.0.2.tar.gz 88405 BLAKE2B c3a2e5e029d7d91c7cdc1c4e2ddec71c17df0cf2d863c81ef263eea3734488fcc31795ea681b27dffd04c0833c99df252256c3ffacfbf29305fa1ba5b8bd4efa SHA512 4fdc080479f1094e9ce92acc0eceb630a6a6ce711ffdc5ffef58d61baf23e8ea9ec45a922d798fb17a7724425d5785451f5f114bc7db40ebbfb50359b56456a6
 DIST rocFFT-4.3.0.tar.gz 840748 BLAKE2B 236a5faa930751d35e501a9a32ecc8b4075448ef21a0ffb0bb7ec04f4ed1cb67b908aa153b5b424e0823d3e306cf375d7c01a77d687220ed79de6d374037e003 SHA512 765d41e4018a04a53e847c03de80eec830d3e8766187fb8cb493624afa2673175347c16e6eeeebd4ad7d88bb866e58f7e572708f22238723c710b98565a0cd3d
+DIST rocFFT-5.0.2.tar.gz 837508 BLAKE2B b74d0c6edd7b232f775bffefbca829d88d9d7cd9108c27a0698f45d7fe2760d40463bcda8c710e923874b3bbfb1e83e0fe8622db4dfa28afb29392b3e135e9a5 SHA512 d6810a92a10a27dbcac8a04e8fcd56c7fa198f208da626d8938d5ff28b6ab8b89a058c7a56b5666464165e8f6bd7c4c031a94315625a3613eb02a9b8eccd9eb9
 EBUILD hipFFT-4.3.0.ebuild 1885 BLAKE2B fd0653407acbeaaf3276535b64ddbc4ed33bebcf428b5de47561b583077e30da92314cdfa03a9f1ec1d488dbef38cadbb62087cc8181d8567b1df6aa4ae33c8f SHA512 0ebd42f6b2ae1e1719d227b96bc51023e2117751b6bf4e39ed44f46a81967d8fe9946abb4975eb7bcbad656ded7cbf5a1473e3ceb82ddb90b6546c0c2992b7cf
+EBUILD hipFFT-5.0.2.ebuild 1920 BLAKE2B 4219451958bea97b48850a26e36048486158b3c19a30702ac283c54a4f0f60cf725a5a122807c86e91348f41be293c7207e4e632224a1bab869aab49e21a6280 SHA512 8061026feaab2bb883e728a0bb064c3a31d0860aa646950ed36130dbd2b1429bb076f1b8f2b01a567c51fcf7a54e36a78765645bddb158efe9e3d69732a1f219
 MISC metadata.xml 727 BLAKE2B 29e2218926627115b138fc101b5d582d4c6fd29b998bd92d23f8e2a63b33e9882d312bf5ab766d72757a4a2abb1f29357e4d95c663e3525ec536a86b325ff0b9 SHA512 e8d1501ce980d5fba12bdbbc5ef1a17c13c5cfe16cd3ae9f89d151cb8843f4ef581b2c807814e9af542ce94d9924dfade9efd1e1527444b1464132ae2601d208
diff --git a/sci-libs/hipFFT/files/hipFFT-5.0.2-gentoo-install-locations.patch b/sci-libs/hipFFT/files/hipFFT-5.0.2-gentoo-install-locations.patch
new file mode 100644
index 000000000000..eefdb2aaaaf5
--- /dev/null
+++ b/sci-libs/hipFFT/files/hipFFT-5.0.2-gentoo-install-locations.patch
@@ -0,0 +1,28 @@
+Index: hipFFT-rocm-5.0.2/library/CMakeLists.txt
+===================================================================
+--- hipFFT-rocm-5.0.2.orig/library/CMakeLists.txt
++++ hipFFT-rocm-5.0.2/library/CMakeLists.txt
+@@ -81,7 +81,7 @@ target_include_directories( hipfft
+   PUBLIC  $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/library/include>
+   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
+   $<BUILD_INTERFACE:${HIP_INCLUDE_DIRS}>
+-  $<INSTALL_INTERFACE:include>
++  $<INSTALL_INTERFACE:include/hipfft>
+   ${HIP_INCLUDE_DIRS}
+   )
+ 
+@@ -142,13 +142,11 @@ if( ROCM_FOUND )
+   rocm_install_targets( TARGETS hipfft
+     INCLUDE
+     ${CMAKE_SOURCE_DIR}/library/include
+-    ${CMAKE_BINARY_DIR}/include
+-    PREFIX hipfft )
++    ${CMAKE_BINARY_DIR}/include )
+   rocm_export_targets( TARGETS hip::hipfft
+     PREFIX hipfft
+     DEPENDS PACKAGE hip
+     NAMESPACE hip:: )
+-  rocm_install_symlink_subdir( hipfft )
+ 
+   # Package specific CPACK vars
+   if( NOT BUILD_WITH_LIB STREQUAL "CUDA" )
diff --git a/sci-libs/hipFFT/files/hipFFT-5.0.2-remove-git-dependency.patch b/sci-libs/hipFFT/files/hipFFT-5.0.2-remove-git-dependency.patch
new file mode 100644
index 000000000000..fb2c97936a42
--- /dev/null
+++ b/sci-libs/hipFFT/files/hipFFT-5.0.2-remove-git-dependency.patch
@@ -0,0 +1,35 @@
+Index: hipFFT-rocm-5.0.2/cmake/dependencies.cmake
+===================================================================
+--- hipFFT-rocm-5.0.2.orig/cmake/dependencies.cmake
++++ hipFFT-rocm-5.0.2/cmake/dependencies.cmake
+@@ -21,9 +21,6 @@
+ #
+ # #############################################################################
+ 
+-# Git
+-find_package(Git REQUIRED)
+-
+ # HIP
+ if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" )
+   if( NOT BUILD_WITH_LIB STREQUAL "CUDA" )
+Index: hipFFT-rocm-5.0.2/clients/CMakeLists.txt
+===================================================================
+--- hipFFT-rocm-5.0.2.orig/clients/CMakeLists.txt
++++ hipFFT-rocm-5.0.2/clients/CMakeLists.txt
+@@ -54,16 +54,6 @@ list( APPEND CMAKE_MODULE_PATH ${CMAKE_C
+ 
+ include( build-options )
+ 
+-if( GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git" )
+-  message(STATUS "rocFFT submodule update")
+-  execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
+-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/clients/rocFFT
+-    RESULT_VARIABLE GIT_SUBMOD_RESULT)
+-  if( NOT GIT_SUBMOD_RESULT EQUAL "0" )
+-    message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules manually.")
+-  endif( )
+-endif( )
+-
+ if( NOT EXISTS "${CMAKE_SOURCE_DIR}/clients/rocFFT/CMakeLists.txt" )
+   message(FATAL_ERROR "The rocFFT submodule is not present!  Please update git submodules and try again. ${CMAKE_CURRENT_SOURCE_DIR}/clients/rocFFT/CMakeLists.txt")
+ endif( )
diff --git a/sci-libs/hipFFT/hipFFT-5.0.2.ebuild b/sci-libs/hipFFT/hipFFT-5.0.2.ebuild
new file mode 100644
index 000000000000..bf7e339f002a
--- /dev/null
+++ b/sci-libs/hipFFT/hipFFT-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="CU / ROCM agnostic hip FFT implementation"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipFFT"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/hipFFT/archive/refs/tags/rocm-${PV}.tar.gz -> hipFFT-rocm-${PV}.tar.gz
+	test? ( https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz )"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+SLOT="0/$(ver_cut 1-2)"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/hip:${SLOT}
+	sci-libs/rocFFT:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-cpp/gtest
+		dev-libs/boost
+)"
+
+S="${WORKDIR}/hipFFT-rocm-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.2-gentoo-install-locations.patch"
+	"${FILESDIR}/${PN}-5.0.2-remove-git-dependency.patch"
+	"${FILESDIR}/${PN}-4.3.0-add-complex-header.patch"
+)
+
+src_prepare() {
+	use test && rmdir rocFFT && ln -s ../rocFFT-rocm-${PV} rocFFT
+	sed -e "/CMAKE_INSTALL_LIBDIR/d" -i CMakeLists.txt || die
+	CXX=hipcc cmake_src_prepare
+}
+
+src_configure() {
+	# Grant access to the device
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_INCLUDEDIR="include/hipfft"
+		-DCMAKE_SKIP_RPATH=ON
+		-DCMAKE_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/cmake"
+		-DHIP_ROOT_DIR="${EPREFIX}/usr"
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_RIDER=$(usex benchmark ON OFF)
+		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+	)
+
+	export CXX=hipcc
+	cmake_src_configure
+}
+
+src_test () {
+	addwrite /dev/kfd
+	addpredict /dev/dri
+	cd "${BUILD_DIR}/clients/staging" || die
+	einfo "Running hipfft-test"
+	LD_LIBRARY_PATH=${BUILD_DIR}/library ./hipfft-test || die
+}
+
+src_install() {
+	cmake_src_install
+	if use benchmark; then
+		cd "${BUILD_DIR}/clients/staging" || die
+		dobin hipfft-rider
+	fi
+}
diff --git a/sci-libs/hipSPARSE/Manifest b/sci-libs/hipSPARSE/Manifest
index 7270530756e5..ee0deff6dd1c 100644
--- a/sci-libs/hipSPARSE/Manifest
+++ b/sci-libs/hipSPARSE/Manifest
@@ -23,6 +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-r2.ebuild 3707 BLAKE2B f62868a9d57aa7add43e8717c7478cfce82f7562794f0fd8aeffdd7dc1f740402f502d0c349dd7906eb42e5a479503ad020f7fb46b81afdd71c2949a58c04203 SHA512 10ea8f3b765150c72f3bf9d327db6e5c1c1adbadbf3ad9e0c7b7f4ef12a6013a7a040aa5352e11166d2544cec5cba44a5b4d9b3f919f33d0979541512342bc1d
-EBUILD hipSPARSE-5.0.2.ebuild 3707 BLAKE2B d888276f197b9e27d4d0ac5f7952382100fdeb089659c7e0312cfd604ab4e801b31096df762403b15dadc1838f3ea1107269351edb03e8cff709c36760f10b86 SHA512 633d5273e0854067db2b1892c0355630ff7d7d14b0f005989182362f1086612b30b1262ad5233ec2c5713c878044c14ccbd7ccd08ebbfabfb8b08b01367b598f
+EBUILD hipSPARSE-4.3.0-r2.ebuild 3709 BLAKE2B eda9d93375d8a3db0da922d615224d27d1e2048c03718c0f77212b09838a3d0627b1dd13025de51bb0779fb99404b1f5b2f65fe1882b26f499dd98b302c99107 SHA512 e11817f8844084bbc129d392c167f9606590a5f23fd35b49bf8586f08ef53616373228524da996ad0539b859619f0384700da423bd1943ef6922c628b6ff0a84
+EBUILD hipSPARSE-5.0.2.ebuild 3709 BLAKE2B 57334096115755129d2f97628a7ee0f65eb27b7905a6daa8c01691f8c6e23114fa996437aa5e00b865997d8580d033c3b038dcc75ad07c78b150cfbc34e5cd50 SHA512 96a293fd1643f3d004206573a6ae47ca4450b13ce8e4e93309dee2777f8c1e28032aef98477ca7b4fb26a3a52c0e3b50d8ddeda1fc6f9767a727889b6b9670a6
 MISC metadata.xml 603 BLAKE2B 21c5f53de40b5582b8541e1cef239a4a2eff2eaaaa966a4168439417cd6f80ea00dbd48636bea73aedbaaf580950803768f02ab5f0cca0f76d433d80a80026e1 SHA512 4ff1ebefa7203326a5c2feed7c0deffa10f17383bb4a05fdf3057d8ab1d6f8427a45126ec17aa88e02a93e9114e79f6d89cd4564e72faebf970b7f63814d701a
diff --git a/sci-libs/hipSPARSE/hipSPARSE-4.3.0-r2.ebuild b/sci-libs/hipSPARSE/hipSPARSE-4.3.0-r2.ebuild
index 9498143b5003..1a75d379785e 100644
--- a/sci-libs/hipSPARSE/hipSPARSE-4.3.0-r2.ebuild
+++ b/sci-libs/hipSPARSE/hipSPARSE-4.3.0-r2.ebuild
@@ -65,7 +65,7 @@ src_prepare() {
 		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 |
+		find "${WORKDIR}" -maxdepth 2 -regextype grep -E -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}"
diff --git a/sci-libs/hipSPARSE/hipSPARSE-5.0.2.ebuild b/sci-libs/hipSPARSE/hipSPARSE-5.0.2.ebuild
index 7ce5fdc224c8..3b9e1f762bd7 100644
--- a/sci-libs/hipSPARSE/hipSPARSE-5.0.2.ebuild
+++ b/sci-libs/hipSPARSE/hipSPARSE-5.0.2.ebuild
@@ -65,7 +65,7 @@ src_prepare() {
 		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 |
+		find "${WORKDIR}" -maxdepth 2 -regextype grep -E -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}"
diff --git a/sci-libs/htslib/Manifest b/sci-libs/htslib/Manifest
index 66510cf1b757..319557fa6017 100644
--- a/sci-libs/htslib/Manifest
+++ b/sci-libs/htslib/Manifest
@@ -1,5 +1,3 @@
-DIST htslib-1.13.tar.bz2 4226834 BLAKE2B ae1f64e564f0f7bea80ea9d276b5d5b2b04fa3c8bd58f2c68966225b4324962f34d8a26b74267ab90dc530dfced1b9c01702d25918fd7a7c74e13913f00d5007 SHA512 16a3d61c115b71406bc4411a0c1176909166b52c4f7bb11614e398df4defaec4d09763413053e4d0d5916921c866d20019096d8fed866e77f9f1cafbd1e95b16
-DIST htslib-1.15.tar.bz2 4141168 BLAKE2B 20462b01e065b65de2b7df883cf61f9beb9ccca6fa3dc159c0aa7b303daf7c3779938f5eadbd3320e85ec19de105dc55e238c47a922ff6ace6fcaea2b0e95c19 SHA512 b87ce3eaa63a731d812953129f1c9aa857fe896ea9e924b7eb92173d8e624dd45e5582b3a97e7120ff7fe339e4d40148077424029626f50372b3f164093aa6cc
-EBUILD htslib-1.13.ebuild 1052 BLAKE2B 1d219220299500bce4aaf8927bde67beba02afda02319527cae8f3aa7ccce131a21c0b27e9eaa0ade634d99d910915108abd48385a9686a95795b74733f3c0ce SHA512 3d5bc8e165e27b5a5f1e0d87c7802e65c2de55bc7754cb13d5bcd5f2c211de37ecd81e8ebfa0377158eea196449d9b71858c08372ab73f30614e6e787af47005
-EBUILD htslib-1.15.ebuild 1052 BLAKE2B dda021a25b1066d6e0f79aabed974ed1d6b96bb78ebbf86741207ae61ee11b1b399895c3863b1bab59669812794a0e13372c4b824612dee4cdad00a0e57aa5b9 SHA512 68f35d2c93c397ec6034468d5a5a10ca5dca42f9954fc6e5ca3583a443014324e1b802b5f42d7851c277f8f1f86c544cf574d32fe813c06e985158a8c1ab0fc9
+DIST htslib-1.15.1.tar.bz2 4141140 BLAKE2B 312f67c8916586199b32b7703b43a9fd365b8af22802bf4d63fc40960c62b956915e7c60bbd777a8b179066608cd3a281929a10b60eef21d6eedb4caf8c147c1 SHA512 69d0c7f3ac50a9b9c579e9b3479b6745fc30d0ac838ff14695cf4e3da593854350e345ed1f4a496931ef57395f3416da4316903488f3e641f1e00fec544f3620
+EBUILD htslib-1.15.1.ebuild 1074 BLAKE2B d04ae956ac6d4819704e8342d9679d0c54274c09da155c6d73d0e889b3db75cfbbae80665e750c0d7387cf9eeeac7642ff31bbe301220cef06915d7081c3aa74 SHA512 6c617b18f47e2823077527653dcf2a6976577efde1481087d5188ce151089edc9a98343ef6ad3864117477c60531694287adae5def956f016d6e105445ae1963
 MISC metadata.xml 350 BLAKE2B 6512256a4c692625cb824d90fc8b85942f88db717fd265548b97a5b535158fc65e1f2e74df4ebd3c2a259dfd3a4244a13493fc410b1663b8054b29a14995787d SHA512 926efc676b0619ae901253f2207c8ba948ebe3db560377a55edecd9cd58cd2ec806bcdff875e9c5c9a170921c44818271e8ddd691fe1a84ed651f7aca75265ec
diff --git a/sci-libs/htslib/htslib-1.13.ebuild b/sci-libs/htslib/htslib-1.13.ebuild
deleted file mode 100644
index cfd9cfb3263e..000000000000
--- a/sci-libs/htslib/htslib-1.13.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="C library for high-throughput sequencing data formats"
-HOMEPAGE="http://www.htslib.org/"
-SRC_URI="mirror://sourceforge/samtools/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bzip2 curl +lzma"
-
-RDEPEND="
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	curl? ( net-misc/curl )
-	lzma? ( app-arch/xz-utils )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# upstream injects LDFLAGS into the .pc file,
-	# which is a big nono for QA
-	sed -e '/^\(static_l\|Libs.private\|Requires.private\)/d' \
-		-i htslib.pc.in || die
-}
-
-src_configure() {
-	econf \
-		--disable-gcs \
-		--disable-plugins \
-		--disable-s3 \
-		$(use_enable bzip2 bz2) \
-		$(use_enable curl libcurl) \
-		$(use_enable lzma)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	# doesn't use libtool, can't disable static libraries
-	find "${ED}" -name '*.a' -delete || die
-}
diff --git a/sci-libs/htslib/htslib-1.15.ebuild b/sci-libs/htslib/htslib-1.15.1.ebuild
index e651576d8a81..c4bd910685de 100644
--- a/sci-libs/htslib/htslib-1.15.ebuild
+++ b/sci-libs/htslib/htslib-1.15.1.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="C library for high-throughput sequencing data formats"
 HOMEPAGE="http://www.htslib.org/"
-SRC_URI="mirror://sourceforge/samtools/${PV}/${P}.tar.bz2"
+SRC_URI="https://github.com/samtools/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0/3"
diff --git a/sci-libs/hypre/Manifest b/sci-libs/hypre/Manifest
index d6e2ca21d138..85b4beed0c6c 100644
--- a/sci-libs/hypre/Manifest
+++ b/sci-libs/hypre/Manifest
@@ -1,5 +1,7 @@
 DIST hypre-2.20.0.tar.gz 5971556 BLAKE2B 63cef33913f1f4c569c396dd18227ae4346807e659306521e9340789944e22dc70be3b9baec7fb1385f562b53045e5c87fcad604aa242a941199ff9fe0a0c21d SHA512 842868b494960506fa3df4e72abb42084d701ec14305f9b040b9dcb578b4bbdaa8afb079057a7e53ad721b440c72ee804775c3b8319f2d01a2f281920a9cd350
 DIST hypre-2.21.0.tar.gz 6017038 BLAKE2B 500885cbd9f2b79c8740d1031a3dd9e5fd141dccfe2101ceed555cb7cbef77989b6af2c80f9b08e8efd6e2401269415532614d40512f93371397389e0fb15595 SHA512 20f860b0c25190608b50d577e03ab241d8caa1dbf7a7e56484e984710a586b1f4b63c72135488a756f42aa6a58d0a26b0c4e6e1680c3f7faabdf68e2559293b0
-EBUILD hypre-2.20.0.ebuild 2786 BLAKE2B e83539542a2b250cc17700f72a3835978d33e5b9681100c219b23eb45cb65a7e0c5ec704dca793bf75dabc6e68b24604079c57655ffb16c444c693ceb633e241 SHA512 b214006890a03be04184e0c4bbfebd2480fd2d9e586bc6735a1b6af430bba808fedd31f9f98002ae69f0d7ba47f67c3aee264e37e6595f30ec96f7bb8c3a1eab
-EBUILD hypre-2.21.0.ebuild 2779 BLAKE2B f71b1e6911f8a6e586c6b8d0a0d7a7a87038c0fa78548f21251f3c702d208f13ebb42a48e0c6447e6ece36eafd2003a7730b14f0f4381deea49736615a8b52c4 SHA512 82912a5d3327850a6ba4bfaa88d2a33fd06e58e2c5e4e264df0f8139847be20361c1520e5e98b1b77e3d678d9ea8d6c9a627214a8a0d931703149063b28b7939
+DIST hypre-2.24.0.tar.gz 6116863 BLAKE2B fade61df0dcef3a93c8f4ff32eb72adbef56d572b8ef18202d8cdbbbd4c53a46a21f3478cf10720c64b1eaf0731e5a6f2236736ec9631f8500ce966f55d03cfe SHA512 4f27e99ba2923c6394ccc3705930897430becef840415004d6fae2fa311fef5b2399265ec1211364f883b35d00933523e65888419890902bcd4e1e6942b66560
+EBUILD hypre-2.20.0.ebuild 2601 BLAKE2B 8369a62a5984128a6c16241afd3e888634176bed2ca65e1bae0bbd98c32a09b42ddd8e01ac72a392d5fd693ec4105b9ee65b8c7ca83945f9a972ce964c357447 SHA512 b72eb3ad60e1f2640cbdff6ae85025794d49cba2d7813cef8719c9667bec9aa37e14230c495799de2728280d7bf2909458165694ff8a4908048d77b15288d207
+EBUILD hypre-2.21.0.ebuild 2594 BLAKE2B 5f2114028d0b4e79be150d198f5e1dcb09c54384d4dd3e19da7d2886d3d3e101e1f8b3696fad65ae3c9bd4c0dd0a646aa9d3b0571bd605e36657aa10af67f046 SHA512 00f80fc4a1a3fe80fcfa0b3c37aa99721f29a3e7efcbb11d1c73d6807d8599d30eed5bc3d33fb1f28d1225a96debf0aab6fdbe07c19d0f06912e282a7e48c5b4
+EBUILD hypre-2.24.0.ebuild 2594 BLAKE2B 5f2114028d0b4e79be150d198f5e1dcb09c54384d4dd3e19da7d2886d3d3e101e1f8b3696fad65ae3c9bd4c0dd0a646aa9d3b0571bd605e36657aa10af67f046 SHA512 00f80fc4a1a3fe80fcfa0b3c37aa99721f29a3e7efcbb11d1c73d6807d8599d30eed5bc3d33fb1f28d1225a96debf0aab6fdbe07c19d0f06912e282a7e48c5b4
 MISC metadata.xml 616 BLAKE2B e048d1098bac6c90fe41d2971044618675902957e8b2e1acbc6b4a0b1ad045d33d43f7fecea667848e533796ce05cd5735fecbea9b84bd8950f3bf38d84e11fc SHA512 c24906c2f269b820f3d926b805e5debac9d2fa864f15e800da698a93f517f6b6d2c14987d8edac0691627e892d3c2a2b8e58075feb8db2c701200861fdb05195
diff --git a/sci-libs/hypre/hypre-2.20.0.ebuild b/sci-libs/hypre/hypre-2.20.0.ebuild
index c7a163995f57..f1b93093da7b 100644
--- a/sci-libs/hypre/hypre-2.20.0.ebuild
+++ b/sci-libs/hypre/hypre-2.20.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
@@ -27,16 +27,12 @@ DEPEND="${RDEPEND}"
 DOCS=( CHANGELOG COPYRIGHT README )
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] ; then
-		tc-check-openmp
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp ; then
-		ewarn "You are using a non capable gcc compiler ( < 4.2 ? )"
-		die "Need an OpenMP capable compiler"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	use fortran && fortran-2_pkg_setup
 }
 
 src_prepare() {
@@ -60,8 +56,9 @@ src_configure() {
 	tc-export CC CXX
 	append-flags -Dhypre_dgesvd=dgesvd_
 
-	if use openmp && [[ $(tc-getCC) == *gcc* ]] ; then
-		append-flags -fopenmp && append-ldflags -fopenmp
+	if use openmp ; then
+		append-flags -fopenmp
+		append-ldflags -fopenmp
 	fi
 
 	if use mpi ; then
diff --git a/sci-libs/hypre/hypre-2.21.0.ebuild b/sci-libs/hypre/hypre-2.21.0.ebuild
index dea4da0e5cd7..8c9d5ab220f1 100644
--- a/sci-libs/hypre/hypre-2.21.0.ebuild
+++ b/sci-libs/hypre/hypre-2.21.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
@@ -28,16 +28,12 @@ DEPEND="${RDEPEND}"
 DOCS=( CHANGELOG COPYRIGHT README )
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] ; then
-		tc-check-openmp
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp ; then
-		ewarn "You are using a non capable gcc compiler ( < 4.2 ? )"
-		die "Need an OpenMP capable compiler"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	use fortran && fortran-2_pkg_setup
 }
 
 src_prepare() {
@@ -61,8 +57,9 @@ src_configure() {
 	tc-export CC CXX
 	append-flags -Dhypre_dgesvd=dgesvd_
 
-	if use openmp && [[ $(tc-getCC) == *gcc* ]] ; then
-		append-flags -fopenmp && append-ldflags -fopenmp
+	if use openmp ; then
+		append-flags -fopenmp
+		append-ldflags -fopenmp
 	fi
 
 	if use mpi ; then
diff --git a/sci-libs/hypre/hypre-2.24.0.ebuild b/sci-libs/hypre/hypre-2.24.0.ebuild
new file mode 100644
index 000000000000..8c9d5ab220f1
--- /dev/null
+++ b/sci-libs/hypre/hypre-2.24.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 toolchain-funcs flag-o-matic
+
+DESCRIPTION="Parallel matrix preconditioners library"
+HOMEPAGE="https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods"
+SRC_URI="https://github.com/hypre-space/hypre/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug examples fortran int64 openmp mpi"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	sci-libs/superlu:=
+	virtual/blas
+	virtual/lapack
+	mpi? ( virtual/mpi )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG COPYRIGHT README )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# link with system superlu and propagate LDFLAGS
+	sed -e "s:@LIBS@:@LIBS@ $($(tc-getPKG_CONFIG) --libs superlu):" \
+		-e 's:_SHARED@:_SHARED@ $(LDFLAGS):g' \
+		-i src/config/Makefile.config.in || die
+
+	sed -e '/HYPRE_ARCH/s: = :=:g' \
+		-i src/configure || die
+
+	# link with system blas and lapack
+	sed -e '/^BLASFILES/d' \
+		-e '/^LAPACKFILES/d' \
+		-i src/lib/Makefile || die
+}
+
+src_configure() {
+	tc-export CC CXX
+	append-flags -Dhypre_dgesvd=dgesvd_
+
+	if use openmp ; then
+		append-flags -fopenmp
+		append-ldflags -fopenmp
+	fi
+
+	if use mpi ; then
+		CC=mpicc
+		FC=mpif77
+		CXX=mpicxx
+	fi
+
+	cd src || die
+
+	# without-superlu: means do not use bundled one
+	econf \
+		--enable-shared \
+		--with-blas-libs="$($(tc-getPKG_CONFIG) --libs-only-l blas | sed -e 's/-l//g')" \
+		--with-blas-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L blas | sed -e 's/-L//g')" \
+		--with-lapack-libs="$($(tc-getPKG_CONFIG) --libs-only-l lapack | sed -e 's/-l//g')" \
+		--with-lapack-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L lapack | sed -e 's/-L//g')" \
+		--with-timing \
+		--without-superlu \
+		$(use_enable debug) \
+		$(use_enable openmp hopscotch) \
+		$(use_enable int64 bigint) \
+		$(use_enable fortran) \
+		$(use_with openmp) \
+		$(use_with mpi MPI)
+}
+
+src_compile() {
+	emake -C src
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/src/lib:${LD_LIBRARY_PATH}" \
+		PATH="${S}/src/test:${PATH}" \
+		emake -C src check
+}
+
+src_install() {
+	emake -C src install \
+		HYPRE_INSTALL_DIR="${ED}" \
+		HYPRE_LIB_INSTALL="${ED}/usr/$(get_libdir)" \
+		HYPRE_INC_INSTALL="${ED}/usr/include/hypre"
+
+	if use examples; then
+		dodoc -r src/examples
+	fi
+}
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index bca2c622f3e0..bd7b01648150 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,8 +1,3 @@
-AUX indilib-1.9.4-musl-stdint.patch 3712 BLAKE2B 6642d8dc96779aaba01cccbb4ef5f2ab280ce4f9d8076c244d52d085545679c56b8aa0490fb331617becd4ba2eed62aa1a8bd1f9f3bae9b94b145b5148dd7748 SHA512 31b9d57b2353e5876da74048839e3b94f35c087d38834429dd6955045ae64f8c7cbc6f8f3f5e6f7441044cc5b80655eec8476726cf10f5de0e1d6a07c4a4d2fb
-DIST indilib-1.9.2.tar.gz 2335834 BLAKE2B 47d8bde8e3c783cefb23c8a8f865fa46bb9a6ed4ee08618d198680f3036e9ca9a16178b1ec4dab070d0cb3ec8d638847cedb752a2a5a1d5e2dc5ddbd362c0a86 SHA512 0a1ada5b5880553ddbcf794bac952ddce76d3aa46652c48621e284a04a7d3d9ba7492d8874bf30f7e3f614a904a829109eaee9dae53dd5854d72bb1c98740f44
-DIST indilib-1.9.4.tar.gz 2370816 BLAKE2B 4df98abfaecdfe226d889e063928d3d5a09f9141b7bbeb2798da8190f874d0137313ff05b9c524a645440298d79655f9627ac611ae3132ee30f902e46d2db34d SHA512 2331d49545cfeb5904529f74b52ba0454c81066cb644e158e159a8f3597269d6d48bb1a608162771108c30f2fdb7e21fc5c1078b152f0e2a640f2e10ad3f9142
-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 1538 BLAKE2B 726604e729b18065d8ee12a1411a7eae118311bad40e8c87d2c8d32ce157ce16432665c605ddd8b552f89e09f6915264f382c2812eab186d8e548bd3cc8c5181 SHA512 d3f8de3e30d5a5f8bf7bed35bd84f5e5ce9bb32a589f1c5bbe33f5876f5ddadf326c65196932173b67e02dce88c2adf4a394d84886069166bfd76cca4e50c8f4
+DIST indilib-1.9.6.tar.gz 2422813 BLAKE2B 5f45f1c53d4cc459d840aca3a27a9cefcd0b988fda7a4f7a3988aa2ef0b0c7c762403b76676160f14767fd8214b69f8d5ff183fcd4f1d951d7e3d2f1ba42e35b SHA512 f85cec8dc4bda4d4bf5b7787eec409bcebe5e569aa5abc7c21904c8bb8bb471b9c0a505394a0f7ce4965e233191ef859cfc2e76148af51753525788f80cf2ee6
+EBUILD indilib-1.9.6-r1.ebuild 1613 BLAKE2B 25beb2e2984c8fe759a8f624abf06dcab61c1e17fc139fcdfa70eebf1cb55c59280915217976e8aa72ab78522c23d6a84bf710d705f09d57f9ce3b5e3e611567 SHA512 d30af17b2a4f9beae44611d330ad7fdbd264f76681074701e8bf2976f28eab6ce4662aef34fb786344859e98180f5228381330347e157974d0acdaf2f63dfa9e
 MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f
diff --git a/sci-libs/indilib/files/indilib-1.9.4-musl-stdint.patch b/sci-libs/indilib/files/indilib-1.9.4-musl-stdint.patch
deleted file mode 100644
index 9adfae6bac25..000000000000
--- a/sci-libs/indilib/files/indilib-1.9.4-musl-stdint.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-https://patch-diff.githubusercontent.com/raw/indilib/indi/pull/1618.patch
-
-From: Sam James <sam@gentoo.org>
-Date: Sun, 6 Feb 2022 08:16:44 +0000
-Subject: [PATCH] Use <stdint.h> for uint* types (fix build on musl)
-
-<stdint.h> is already being used in some places, as are its
-types, e.g. uint8_t, but in some places, non-standard types
-like u_int16_t were being mix-and-matched.
-
-Consistently use the <stdint.h> types to fix build on e.g.
-musl.
-
-Bug: https://bugs.gentoo.org/829487
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/base64.c
-+++ b/base64.c
-@@ -45,7 +45,7 @@
-  * Swap bytes in 16-bit value.
-  */
- //#define bswap_16(x) __builtin_bswap16 (x);
--#define bswap_16(x) ((__uint16_t) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)))
-+#define bswap_16(x) ((uint16_t) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)))
- 
- #include <arpa/inet.h>
- #define  IS_BIG_ENDIAN     (1 == htons(1))
---- a/drivers/focuser/focuslynxbase.cpp
-+++ b/drivers/focuser/focuslynxbase.cpp
-@@ -2821,7 +2821,7 @@ bool FocusLynxBase::SyncFocuser(uint32_t ticks)
- /************************************************************************************
-  *
- * ***********************************************************************************/
--//bool FocusLynxBase::setMaxTravel(u_int16_t travel)
-+//bool FocusLynxBase::setMaxTravel(uint16_t travel)
- bool FocusLynxBase::SetFocuserMaxPosition(uint32_t ticks)
- {
-     char cmd[LYNX_MAX] = {0};
-@@ -2886,7 +2886,7 @@ bool FocusLynxBase::SetFocuserMaxPosition(uint32_t ticks)
- /************************************************************************************
-  *
- * ***********************************************************************************/
--bool FocusLynxBase::setStepSize(u_int16_t stepsize)
-+bool FocusLynxBase::setStepSize(uint16_t stepsize)
- {
-     char cmd[LYNX_MAX] = {0};
-     int errcode = 0;
---- a/drivers/focuser/focuslynxbase.h
-+++ b/drivers/focuser/focuslynxbase.h
-@@ -28,6 +28,7 @@
- #include "connectionplugins/connectiontcp.h"
- 
- #include <map>
-+#include <stdint.h>
- #include <termios.h>
- #include <unistd.h>
- #include <memory>
-@@ -154,7 +155,7 @@ class FocusLynxBase : public INDI::Focuser
-         // Set functions
- 
-         // Position
--        bool setStepSize(u_int16_t stepsize);
-+        bool setStepSize(uint16_t stepsize);
- 
-         // Temperature
-         bool setTemperatureCompensation(bool enable);
---- a/drivers/rotator/gemini.h
-+++ b/drivers/rotator/gemini.h
-@@ -23,6 +23,7 @@
- #include "indifocuser.h"
- #include "indirotatorinterface.h"
- 
-+#include <stdint.h>
- #include <map>
- 
- class Gemini : public INDI::Focuser, public INDI::RotatorInterface
-@@ -132,7 +133,7 @@ class Gemini : public INDI::Focuser, public INDI::RotatorInterface
-         // Set functions
- 
-         // Position
--        bool setFocusPosition(u_int16_t position);
-+        bool setFocusPosition(uint16_t position);
- 
-         // Temperature
-         bool setTemperatureCompensation(bool enable);
---- a/drivers/telescope/celestrondriver.h
-+++ b/drivers/telescope/celestrondriver.h
-@@ -28,10 +28,7 @@
- #include <string>
- #include "indicom.h"
- 
--#ifdef __FreeBSD__
- #include <stdint.h>
--typedef uint8_t u_int8_t;
--#endif
- 
- //#include <thread>
- //#include <condition_variable>
-@@ -312,8 +309,8 @@ class CelestronDriver
- 
-         // get and set guide rate
-         // 0 to 255 corresponding to 0 to 100% sidereal
--        bool get_guide_rate(CELESTRON_AXIS axis, u_int8_t  * rate);
--        bool set_guide_rate(CELESTRON_AXIS axis, u_int8_t  rate);
-+        bool get_guide_rate(CELESTRON_AXIS axis, uint8_t  * rate);
-+        bool set_guide_rate(CELESTRON_AXIS axis, uint8_t  rate);
- 
-         // Pointing state, pier side, returns 'E' or 'W'
-         bool get_pier_side(char * sop);
diff --git a/sci-libs/indilib/indilib-1.9.2.ebuild b/sci-libs/indilib/indilib-1.9.2.ebuild
deleted file mode 100644
index 0f889477df8c..000000000000
--- a/sci-libs/indilib/indilib-1.9.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="https://www.indilib.org/"
-SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/lib/}"
-
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 ppc ppc64 ~riscv x86"
-IUSE="ogg rtlsdr test websocket"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-misc/curl
-	sci-libs/cfitsio:=
-	sci-libs/fftw:3.0=
-	sci-libs/gsl:=
-	sci-libs/libnova:=
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libusb:0
-	ogg? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-	rtlsdr? ( net-wireless/rtl-sdr )
-	websocket? ( dev-libs/boost:= )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? ( sys-kernel/linux-headers )
-	test? ( >=dev-cpp/gtest-1.8.0 )
-	websocket? ( dev-cpp/websocketpp )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINDI_BUILD_QT5_CLIENT=OFF
-		-DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
-		$(cmake_use_find_package ogg OggTheora)
-		$(cmake_use_find_package rtlsdr RTLSDR)
-		-DINDI_BUILD_UNITTESTS=$(usex test)
-		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=()
-
-	if use ppc || use ppc64 || use sparc ; then
-		# Broken on big endian for quite some time.
-		# Reported upstream: file needs to be replaced w/ a normal library
-		# for b64.
-		# bug #763126
-		myctestargs+=(
-			-E "(test_base64)"
-		)
-	fi
-
-	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
-}
diff --git a/sci-libs/indilib/indilib-1.9.5.1.ebuild b/sci-libs/indilib/indilib-1.9.5.1.ebuild
deleted file mode 100644
index 79e0a912fc19..000000000000
--- a/sci-libs/indilib/indilib-1.9.5.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="https://www.indilib.org/"
-SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/lib/}"
-
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 ppc ppc64 ~riscv ~x86"
-IUSE="ogg rtlsdr test websocket"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-misc/curl
-	sci-libs/cfitsio:=
-	sci-libs/fftw:3.0=
-	sci-libs/gsl:=
-	sci-libs/libnova:=
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libusb:0
-	ogg? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-	rtlsdr? ( net-wireless/rtl-sdr )
-	websocket? ( dev-libs/boost:= )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? ( sys-kernel/linux-headers )
-	test? ( >=dev-cpp/gtest-1.8.0 )
-	websocket? ( dev-cpp/websocketpp )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINDI_BUILD_QT5_CLIENT=OFF
-		-DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d
-		$(cmake_use_find_package ogg OggTheora)
-		$(cmake_use_find_package rtlsdr RTLSDR)
-		-DINDI_BUILD_UNITTESTS=$(usex test)
-		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=()
-
-	if use ppc || use ppc64 || use sparc ; then
-		# Broken on big endian for quite some time.
-		# Reported upstream: file needs to be replaced w/ a normal library
-		# for b64.
-		# bug #763126
-		myctestargs+=(
-			-E "(test_base64)"
-		)
-	fi
-
-	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
-}
diff --git a/sci-libs/indilib/indilib-1.9.4.ebuild b/sci-libs/indilib/indilib-1.9.6-r1.ebuild
index 54d7bca89031..af62007d828a 100644
--- a/sci-libs/indilib/indilib-1.9.4.ebuild
+++ b/sci-libs/indilib/indilib-1.9.6-r1.ebuild
@@ -12,19 +12,19 @@ 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 )"
 
 RDEPEND="
+	media-libs/libjpeg-turbo:=
 	net-misc/curl
 	sci-libs/cfitsio:=
 	sci-libs/fftw:3.0=
 	sci-libs/gsl:=
 	sci-libs/libnova:=
 	sys-libs/zlib
-	virtual/jpeg:0
 	virtual/libusb:0
 	ogg? (
 		media-libs/libogg
@@ -39,10 +39,6 @@ DEPEND="${RDEPEND}
 	websocket? ( dev-cpp/websocketpp )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.4-musl-stdint.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DINDI_BUILD_QT5_CLIENT=OFF
@@ -71,3 +67,11 @@ src_test() {
 
 	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sci-libs/keras-applications/Manifest b/sci-libs/keras-applications/Manifest
index 1129706aecea..ca1026717f92 100644
--- a/sci-libs/keras-applications/Manifest
+++ b/sci-libs/keras-applications/Manifest
@@ -1,3 +1,3 @@
 DIST keras-applications-1.0.8.tar.gz 288909 BLAKE2B 41d70552f5dfdd0c1385a7ca0b527ce0e0c3441c1ee3f72c90569f3e43e6a82485d0d4affee83afc645f3b99a519facb41d11a3fc1384c98f44182dddbea02bb SHA512 58af0d8e0289d97b416559bf235deeb9a5405d50f2a2c93612cdbde36e4d6d006db5c570acb814c209414a4b61c2310a99257aa0e2feaf24e5260d549b8b94f6
-EBUILD keras-applications-1.0.8-r1.ebuild 545 BLAKE2B 0ac41382b219ebd3c3e42cbef5d9ef7ff9964d81e9d22e67cc0d6169a5a52bfdec39cf522b569fae3b8a2910f7449b92772d66dad87db4dc8e8e2c853c924cf5 SHA512 96b1f4199889b92d5909f2bde219ee4b6bd1b79b7a2f39d33b84218c328de49d90dddb72c91397ef832335bb6d3236af8187e0f710297d6375dcc1ecb7a55753
+EBUILD keras-applications-1.0.8-r1.ebuild 546 BLAKE2B d72e1b368e83581ff0c20cad6bb838f1174b7ed4131eee5f107a92f584d4ea0ba748cc3ef37ea7db60688904c1fd12ec6b4f99bc3b3010c9bb7c41fcb3717fbe SHA512 88a14bc3aaa4d77ef620c4e4bb816e850ebbdc19b4756cebe391740dd3ac0551a45255404688930abb144f9a7482f1ccb7cbe2c82bfeaa8a6961cb5809686cd2
 MISC metadata.xml 622 BLAKE2B 284cb36e61afaf60b1a8f59ba55f52d5dd4489709e927df4c5e62afdbc7c604b38a6959578498adb1014ccfd0cd725d1a6b06966976acd6ad50efb38195ffc32 SHA512 b2137434d3919e17e79fdd2884502c8b082565e9462e159f38f3b7ac873e0c1266124afc2ffc57ea94f0f4bc987d692968b998f2089215f1b68665ea9b44b33c
diff --git a/sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild b/sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild
index e640d34d62a7..bdb62d7aa08c 100644
--- a/sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild
+++ b/sci-libs/keras-applications/keras-applications-1.0.8-r1.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=6
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 inherit distutils-r1
 
 DESCRIPTION="Keras deep learning library reference implementations of deep learning models"
diff --git a/sci-libs/keras-preprocessing/Manifest b/sci-libs/keras-preprocessing/Manifest
index 7b69a2ed7fd4..59a46f0a89f1 100644
--- a/sci-libs/keras-preprocessing/Manifest
+++ b/sci-libs/keras-preprocessing/Manifest
@@ -1,3 +1,3 @@
 DIST Keras_Preprocessing-1.1.2.tar.gz 163598 BLAKE2B 94d0bac41ac140015a5d46453c99e1180c8c06d8fab4d6707890b1f24466d287f6da54d66b395e5e50c7aac67cc0abc8153fbfbeb4ffb0e79561bca528a6b81b SHA512 aae4d52accdfb9df260070336b1c5a628e57563978f7cb299aa67a6265f26eb44deb803cef795616a5e94cd8bcd2b9aa067570258fff96642b88cc0c701c3cec
-EBUILD keras-preprocessing-1.1.2.ebuild 671 BLAKE2B 477fb6c959caeed1eabcfd4e1c34f3636386ae212b7c8befd5b584972896414c9762527366d2bc13e96124093451a6db07987f2ba2aa85ae21a6c78689f1a005 SHA512 c98b2460e71d3698e026b95dca48a7cb284fb7491ba81847fc1cd04eae94d47e5eae3638342510cd72d625fff863c6c87241986f9567bee2ce24ef8bba130e46
+EBUILD keras-preprocessing-1.1.2.ebuild 672 BLAKE2B cc6ec01d12433b5cb8a5d5fd529c23f9367d9b9a31819007840913086665cb4961c79d072d1b215b0d491bdebf54956f8e5102380408d0d093e2d2dcf3f60698 SHA512 eb735069c6cdccabd8b11c2a4bd5ad47a980ae4c98d484563201e3421c485c30805608fe017d71c32573c3b39a165d36a9af29e12d4922847bf82bdfde64e097
 MISC metadata.xml 586 BLAKE2B ad53f0cfe824544995fe03a0b13af89ca96e443d140751b6ca9f8fe566a50f4a1492a5ba767635dafd4a47ab7470524b31bd592439f369e9f9f2ece8a643d05e SHA512 ccc05fd9545e6a56af7685d560c16ce9237a45dc1a78b4f04e23729603f5f1c77c22c528916087a9a6d44e19087b7ccb6e4126751004eb0d72e956fa3c35afc5
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild
index a864e1a89657..6bd98c017bd6 100644
--- a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.ebuild
+++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2.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=6
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 inherit distutils-r1
 MY_PN="Keras_Preprocessing"
 
diff --git a/sci-libs/keras/Manifest b/sci-libs/keras/Manifest
index f8dd672fe575..2a61126482f1 100644
--- a/sci-libs/keras/Manifest
+++ b/sci-libs/keras/Manifest
@@ -1,8 +1,9 @@
 AUX keras-2.7.0-0001-bazel-Use-system-protobuf.patch 10785 BLAKE2B 3d9c08a2ed78cfa04dd6c1f76ade37cb487d22f78fa5035ac876f83f813fcc1bd437433750652ce1f49c5a5724ef96fca17f7280ab8ac8c31323faea632e8842 SHA512 052ed0d16847263279b72f204d5356391de319e84b17e0b70df3bb49ac906058182a99de46e3610eaa94c8b5d4f205b97c798827b01bd38b174b4c87b39fd417
+AUX keras-2.9.0-0001-bazel-Use-system-protobuf.patch 11303 BLAKE2B 06455041b4340183e80862dcf714b52d9584a2ba5f7e6dfbe2389450abd8ee19288e4807c670cfed2fc2256e14346495214cd817ce04b68937eff86644ce4192 SHA512 0af8047de7558443a6014ac7567adab053f00a39624eebbf288a8f25fc89e785bacac3b54af14e1e467ceb240e3f55f25a3672b2261474872aa0b173f36f6f1d
 DIST bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip 201360 BLAKE2B 0173a8edb17f344b18e42026e2f8a62a1909d4694ab0be83562b6437a3f1ef38889f069269ddd2308b41062e5f375f791be0d2631a8e52ede668203779813b56 SHA512 2ba1dc316d88947c1d17ec67154c052700e3571b8d03370a9f204cf9fe94a1bd58f93a2c4a3c0b02233ee3250053a4c30a4133b5b38745858c1d04be8c9d973f
 DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c
-DIST keras-2.7.0.tar.gz 2221030 BLAKE2B 1920e2d01ed88599a49c188691999e30e2ade2fceb3e2225f0c972a34bc0690e4edc56405e0f17c869695b99345eac9fb9a22e9c9aa4fd7dd02be37286ffd62c SHA512 31e4b2d2d10509e8b3cb86d08965cb5d1b1dad96dce322ba3c1aed1e0e585241e121c9873aa2f7986c6ac9c01d6c0a15b7a7d970caa288ac8eb95a93263df56f
 DIST keras-2.8.0.tar.gz 2001168 BLAKE2B 64e756da102369bd41b176245f7f8184b2376b6fb714485627e30107af552035931c9fcff18d82def5f4e1b83f2eae2fa3d0c18b030986f8d3a53dffbdbb2963 SHA512 a70ae1409761211f3b59d358df4d5abf6bb76b915f5dde90ada5a867aef2831581836d38876bd2e962f3c345f59373bf76a7c21247cef8aeaec45ba1301f787b
-EBUILD keras-2.7.0.ebuild 2269 BLAKE2B 575fcc1136e8157a2cf95b89ae1487c1bd1f4cd34f9cea16837c0238838091589135c7cfe443595a1bb90c254998bd3ecc182eb28f5bb2a4144cddc0a5a42e62 SHA512 6854e59c4bb0c67311935adf1ae5d3a69bb46d1a425f46cc130611e8a22a135a3d311a56d47359aa500211f6b2a5f6ec9a03dbb38806c9d6ee35baf9f75a30a8
+DIST keras-2.9.0.tar.gz 2142884 BLAKE2B 9d90ad998ef7215f9a3ab0f0ac9d035f81023f7049e5c73823a0aa8561ead2f697ff762c225f668f3d9fe376d69a2bfbdf8b137128c915a711cee53d809093d6 SHA512 779828aff9aa31970e7f68b32423e47b81f47d2284d9e9734428c3bc3789e6b0e9ef151315e1cae666b14b1cdc387828ddaf520811250f9ad4fa73cf5c98781d
 EBUILD keras-2.8.0.ebuild 2267 BLAKE2B ad23f660b7c5f27cd1befb7f4e8d29f99979a076b6c05a5f38f2dbef0303145dd1e33b5988e2a433cb07e77d64be0f7eb2151752c8a9a469861641e5f1c964c2 SHA512 0872278a00b74f7170f847f722aef6eb81cf1cb87ccad3dc97f64e4bee76023b2f5356da447103386a74f1d6cf4e513b1ec6569ae90640565bcd73370967be43
+EBUILD keras-2.9.0.ebuild 2241 BLAKE2B 460c88230140a33308222b29d011e179a3e7f85e919a856995c47ed9eaed4f9c8c91b9bc22113ee787a22c146a84842a860501f09d2fa91457f7d774f10c8090 SHA512 4d39023bbce137655b316c2ef80d1c3f6123657632b79a703a4c69c87237aeaee8205368c72f11dff560a25fec4234b0d90663738875d2fb5b37b2484390a431
 MISC metadata.xml 500 BLAKE2B 503c82776ec2dd8ceb09ec37e41fb2555c34937d4bf8febb25aaf2faeefb6ae86d67d8e9e04ff47d0b81758fe4710a02ecb0939f727a7af0dbd25bcee50f3e2b SHA512 e2e0edf60e56427234b6a39e4a818735bd691d582eadca23d92debde8f3f759dea2b2a3acc399e1010ffd37d7bb4fa8d468076c0220b653a41668ead58ee5f66
diff --git a/sci-libs/keras/files/keras-2.9.0-0001-bazel-Use-system-protobuf.patch b/sci-libs/keras/files/keras-2.9.0-0001-bazel-Use-system-protobuf.patch
new file mode 100644
index 000000000000..b571a8b994bc
--- /dev/null
+++ b/sci-libs/keras/files/keras-2.9.0-0001-bazel-Use-system-protobuf.patch
@@ -0,0 +1,331 @@
+From c79e1177ff9f2e0de9070c604a812ff768c2c8c8 Mon Sep 17 00:00:00 2001
+From: Jason Zaman <jason@perfinion.com>
+Date: Sun, 14 Nov 2021 17:59:39 -0800
+Subject: [PATCH] bazel: Use system protobuf
+
+---
+ WORKSPACE                |  53 ----------
+ keras/protobuf/BUILD     |   2 +-
+ third_party/BUILD        |   8 +-
+ third_party/protobuf.bzl | 216 +++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 224 insertions(+), 55 deletions(-)
+ create mode 100644 third_party/protobuf.bzl
+
+diff --git a/WORKSPACE b/WORKSPACE
+index 39f478f8..61282aea 100644
+--- a/WORKSPACE
++++ b/WORKSPACE
+@@ -1,54 +1 @@
+ workspace(name = "org_keras")
+-
+-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+-
+-# Needed by protobuf
+-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+-http_archive(
+-    name = "bazel_skylib",
+-    url = "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.1/bazel-skylib-1.0.1.tar.gz",
+-    sha256 = "f1c8360c01fcf276778d3519394805dc2a71a64274a3a0908bc9edff7b5aebc8",
+-)
+-load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+-bazel_skylib_workspace()
+-
+-# Needed by protobuf
+-http_archive(
+-    name = "six_archive",
+-    build_file = "//third_party:six.BUILD",
+-    sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73",
+-    strip_prefix = "six-1.12.0",
+-    urls = [
+-        "http://mirror.bazel.build/pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz",
+-        "https://pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz",  # 2018-12-10
+-    ],
+-)
+-
+-bind(
+-    name = "six",
+-    actual = "@six_archive//:six",
+-)
+-
+-http_archive(
+-    name = "com_google_protobuf",
+-    sha256 = "1fbf1c2962af287607232b2eddeaec9b4f4a7a6f5934e1a9276e9af76952f7e0",
+-    strip_prefix = "protobuf-3.9.2",
+-    urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.9.2.tar.gz"],
+-)
+-
+-# ZLIB
+-# Need by com_google_protobuf. Note that the original URL from zlib side is not
+-# available for now. We need to use bazel mirror as a backup.
+-http_archive(
+-    name = "zlib",
+-    build_file = "@com_google_protobuf//:third_party/zlib.BUILD",
+-    sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
+-    strip_prefix = "zlib-1.2.11",
+-    urls = [
+-        "https://mirror.bazel.build/zlib.net/zlib-1.2.11.tar.gz",
+-        "https://zlib.net/zlib-1.2.11.tar.gz",
+-    ],
+-)
+-
+-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+-protobuf_deps()
+diff --git a/keras/protobuf/BUILD b/keras/protobuf/BUILD
+index 413dcb74..80133c06 100644
+--- a/keras/protobuf/BUILD
++++ b/keras/protobuf/BUILD
+@@ -1,7 +1,7 @@
+ # Description:
+ #   Contains Keras protobufs
+ 
+-load("@com_google_protobuf//:protobuf.bzl", "py_proto_library")
++load("//third_party:protobuf.bzl", "py_proto_library")
+ 
+ package(
+     default_visibility = [
+diff --git a/third_party/BUILD b/third_party/BUILD
+index 9be54076..9399232f 100644
+--- a/third_party/BUILD
++++ b/third_party/BUILD
+@@ -1,4 +1,5 @@
+ package(
++    default_visibility = ["//visibility:public"],
+     licenses = ["notice"],  # Apache 2.0
+ )
+ 
+@@ -7,4 +8,9 @@ exports_files([
+     "six.BUILD",
+ ])
+ 
+-package(default_visibility = ["//visibility:public"])
++genrule(
++    name = "protoc",
++    outs = ["protoc.bin"],
++    cmd = "ln -s $$(which protoc) $@",
++    executable = 1,
++)
+diff --git a/third_party/protobuf.bzl b/third_party/protobuf.bzl
+new file mode 100644
+index 00000000..3a7ef0a2
+--- /dev/null
++++ b/third_party/protobuf.bzl
+@@ -0,0 +1,216 @@
++def _GetPath(ctx, path):
++    if ctx.label.workspace_root:
++        return ctx.label.workspace_root + "/" + path
++    else:
++        return path
++
++def _IsNewExternal(ctx):
++    # Bazel 0.4.4 and older have genfiles paths that look like:
++    #   bazel-out/local-fastbuild/genfiles/external/repo/foo
++    # After the exec root rearrangement, they look like:
++    #   ../repo/bazel-out/local-fastbuild/genfiles/foo
++    return ctx.label.workspace_root.startswith("../")
++
++def _GenDir(ctx):
++    if _IsNewExternal(ctx):
++        # We are using the fact that Bazel 0.4.4+ provides repository-relative paths
++        # for ctx.genfiles_dir.
++        return ctx.genfiles_dir.path + (
++            "/" + ctx.attr.includes[0] if ctx.attr.includes and ctx.attr.includes[0] else ""
++        )
++
++    # This means that we're either in the old version OR the new version in the local repo.
++    # Either way, appending the source path to the genfiles dir works.
++    return ctx.var["GENDIR"] + "/" + _SourceDir(ctx)
++
++def _SourceDir(ctx):
++    if not ctx.attr.includes:
++        return ctx.label.workspace_root
++    if not ctx.attr.includes[0]:
++        return _GetPath(ctx, ctx.label.package)
++    if not ctx.label.package:
++        return _GetPath(ctx, ctx.attr.includes[0])
++    return _GetPath(ctx, ctx.label.package + "/" + ctx.attr.includes[0])
++
++def _PyOuts(srcs, use_grpc_plugin = False):
++    ret = [s[:-len(".proto")] + "_pb2.py" for s in srcs]
++    if use_grpc_plugin:
++        ret += [s[:-len(".proto")] + "_pb2_grpc.py" for s in srcs]
++    return ret
++
++def _proto_gen_impl(ctx):
++    """General implementation for generating protos"""
++    srcs = ctx.files.srcs
++    deps = []
++    deps += ctx.files.srcs
++    source_dir = _SourceDir(ctx)
++    gen_dir = _GenDir(ctx)
++    if source_dir:
++        import_flags = ["-I" + source_dir, "-I" + gen_dir]
++    else:
++        import_flags = ["-I."]
++
++    for dep in ctx.attr.deps:
++        import_flags += dep.proto.import_flags
++        deps += dep.proto.deps
++    import_flags = depset(import_flags).to_list()
++    deps = depset(deps).to_list()
++
++    args = []
++    if ctx.attr.gen_cc:
++        args += ["--cpp_out=" + gen_dir]
++    if ctx.attr.gen_py:
++        args += ["--python_out=" + gen_dir]
++
++    inputs = srcs + deps
++    tools = [ctx.executable.protoc]
++    if ctx.executable.plugin:
++        plugin = ctx.executable.plugin
++        lang = ctx.attr.plugin_language
++        if not lang and plugin.basename.startswith("protoc-gen-"):
++            lang = plugin.basename[len("protoc-gen-"):]
++        if not lang:
++            fail("cannot infer the target language of plugin", "plugin_language")
++
++        outdir = gen_dir
++        if ctx.attr.plugin_options:
++            outdir = ",".join(ctx.attr.plugin_options) + ":" + outdir
++        args += ["--plugin=protoc-gen-%s=%s" % (lang, plugin.path)]
++        args += ["--%s_out=%s" % (lang, outdir)]
++        tools.append(plugin)
++
++    if args:
++        ctx.actions.run(
++            inputs = inputs,
++            outputs = ctx.outputs.outs,
++            arguments = args + import_flags + [s.path for s in srcs],
++            executable = ctx.executable.protoc,
++            mnemonic = "ProtoCompile",
++            tools = tools,
++            use_default_shell_env = True,
++        )
++
++    return struct(
++        proto = struct(
++            srcs = srcs,
++            import_flags = import_flags,
++            deps = deps,
++        ),
++    )
++
++proto_gen = rule(
++    attrs = {
++        "srcs": attr.label_list(allow_files = True),
++        "deps": attr.label_list(providers = ["proto"]),
++        "includes": attr.string_list(),
++        "protoc": attr.label(
++            cfg = "host",
++            executable = True,
++            allow_single_file = True,
++            mandatory = True,
++        ),
++        "plugin": attr.label(
++            cfg = "host",
++            allow_files = True,
++            executable = True,
++        ),
++        "plugin_language": attr.string(),
++        "plugin_options": attr.string_list(),
++        "gen_cc": attr.bool(),
++        "gen_py": attr.bool(),
++        "outs": attr.output_list(),
++    },
++    output_to_genfiles = True,
++    implementation = _proto_gen_impl,
++)
++"""Generates codes from Protocol Buffers definitions.
++
++This rule helps you to implement Skylark macros specific to the target
++language. You should prefer more specific `cc_proto_library `,
++`py_proto_library` and others unless you are adding such wrapper macros.
++
++Args:
++  srcs: Protocol Buffers definition files (.proto) to run the protocol compiler
++    against.
++  deps: a list of dependency labels; must be other proto libraries.
++  includes: a list of include paths to .proto files.
++  protoc: the label of the protocol compiler to generate the sources.
++  plugin: the label of the protocol compiler plugin to be passed to the protocol
++    compiler.
++  plugin_language: the language of the generated sources
++  plugin_options: a list of options to be passed to the plugin
++  gen_cc: generates C++ sources in addition to the ones from the plugin.
++  gen_py: generates Python sources in addition to the ones from the plugin.
++  outs: a list of labels of the expected outputs from the protocol compiler.
++"""
++
++def py_proto_library(
++        name,
++        srcs = [],
++        deps = [],
++        py_libs = [],
++        py_extra_srcs = [],
++        include = None,
++        default_runtime = None,
++        protoc = "//third_party:protoc",
++        use_grpc_plugin = False,
++        **kwargs):
++    """Bazel rule to create a Python protobuf library from proto source files
++
++    NOTE: the rule is only an internal workaround to generate protos. The
++    interface may change and the rule may be removed when bazel has introduced
++    the native rule.
++
++    Args:
++      name: the name of the py_proto_library.
++      srcs: the .proto files of the py_proto_library.
++      deps: a list of dependency labels; must be py_proto_library.
++      py_libs: a list of other py_library targets depended by the generated
++          py_library.
++      py_extra_srcs: extra source files that will be added to the output
++          py_library. This attribute is used for internal bootstrapping.
++      include: a string indicating the include path of the .proto files.
++      default_runtime: the implicitly default runtime which will be depended on by
++          the generated py_library target.
++      protoc: the label of the protocol compiler to generate the sources.
++      use_grpc_plugin: a flag to indicate whether to call the Python C++ plugin
++          when processing the proto files.
++      **kwargs: other keyword arguments that are passed to py_library.
++
++    """
++    outs = _PyOuts(srcs, use_grpc_plugin)
++
++    includes = []
++    if include != None:
++        includes = [include]
++
++    grpc_python_plugin = None
++    if use_grpc_plugin:
++        grpc_python_plugin = "//external:grpc_python_plugin"
++        # Note: Generated grpc code depends on Python grpc module. This dependency
++        # is not explicitly listed in py_libs. Instead, host system is assumed to
++        # have grpc installed.
++
++    proto_gen(
++        name = name + "_genproto",
++        srcs = srcs,
++        deps = [s + "_genproto" for s in deps],
++        includes = includes,
++        protoc = protoc,
++        gen_py = 1,
++        outs = outs,
++        visibility = ["//visibility:public"],
++        plugin = grpc_python_plugin,
++        plugin_language = "grpc",
++    )
++
++    if default_runtime and not default_runtime in py_libs + deps:
++        py_libs = py_libs + [default_runtime]
++
++    native.py_library(
++        name = name,
++        srcs = outs + py_extra_srcs,
++        deps = py_libs + deps,
++        imports = includes,
++        **kwargs
++    )
+-- 
+2.35.1
+
diff --git a/sci-libs/keras/keras-2.7.0.ebuild b/sci-libs/keras/keras-2.9.0.ebuild
index 7997b0f4b4b6..e6119a59a075 100644
--- a/sci-libs/keras/keras-2.7.0.ebuild
+++ b/sci-libs/keras/keras-2.9.0.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
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 inherit bazel distutils-r1
 
 DESCRIPTION="Deep Learning for humans"
@@ -32,20 +32,20 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	>=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}]
 	>=sci-libs/keras-preprocessing-1.1.2[${PYTHON_USEDEP}]
-	>=sci-libs/tensorflow-2.7[python,${PYTHON_USEDEP}]"
+	>=sci-libs/tensorflow-2.9[python,${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 BDEPEND="
 	app-arch/unzip
 	>=dev-libs/protobuf-3.13.0
 	dev-java/java-config
-	>=dev-util/bazel-3.7.2"
+	>=dev-util/bazel-4.2.2"
 
 # Bazel tests not pytest, also want GPU access
 RESTRICT="test"
 DOCS=( CONTRIBUTING.md README.md )
 PATCHES=(
-	"${FILESDIR}/keras-2.7.0-0001-bazel-Use-system-protobuf.patch"
+	"${FILESDIR}/keras-2.9.0-0001-bazel-Use-system-protobuf.patch"
 )
 
 src_unpack() {
@@ -59,29 +59,27 @@ src_prepare() {
 	python_copy_sources
 }
 
-src_compile() {
-	export JAVA_HOME=$(java-config --jre-home)
+python_compile() {
+	pushd "${BUILD_DIR}" >/dev/null || die
 
-	do_compile() {
-		ebazel build //keras/tools/pip_package:build_pip_package
-		ebazel shutdown
+	ebazel build //keras/tools/pip_package:build_pip_package
+	ebazel shutdown
 
-		local srcdir="${T}/src-${EPYTHON/./_}"
-		mkdir -p "${srcdir}" || die
-		bazel-bin/keras/tools/pip_package/build_pip_package --src "${srcdir}" || die
-	}
+	local srcdir="${T}/src-${EPYTHON/./_}"
+	mkdir -p "${srcdir}" || die
+	bazel-bin/keras/tools/pip_package/build_pip_package --src "${srcdir}" || die
 
-	python_foreach_impl run_in_build_dir do_compile
+	popd || die
 }
 
-src_install() {
-	do_install() {
-		cd "${T}/src-${EPYTHON/./_}" || die
-		esetup.py install
-		python_optimize
-	}
-	python_foreach_impl do_install
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home)
+	distutils-r1_src_compile
+}
 
-	cd "${S}" || die
-	einstalldocs
+python_install() {
+	pushd "${T}/src-${EPYTHON/./_}" >/dev/null || die
+	esetup.py install
+	python_optimize
+	popd || die
 }
diff --git a/sci-libs/kineto/Manifest b/sci-libs/kineto/Manifest
new file mode 100644
index 000000000000..2b992b77f285
--- /dev/null
+++ b/sci-libs/kineto/Manifest
@@ -0,0 +1,4 @@
+AUX kineto-2021.11.17-gentoo.patch 2959 BLAKE2B f94a133150915ad20b9b09f7c1666fefde9380e0b3db7f8a18266b2d3a29214db52271ab746eada3782a0fb6e7685053cc12efa5ed6b08b4a33f72d9c5a39f14 SHA512 0063dcf8dce4a98bc44a0ab4a299bf94128c86a2c63f1d9d4b952e45d0a948b3c8b5335bc02d5b4824486c947464b8a56562210cf5789b3f630f9f0bcafaa620
+DIST kineto-2021.11.17.tar.gz 7497956 BLAKE2B b15573ab63ed0f2e09658a2d7fdd0746a659eb61ca48e996ef471f56af0be3a2778be8c1e93af69efe9d35e52090711ea7cce433988fa3ef1b7c9be8087bfda6 SHA512 bf237e66e44da9fbdf90e7bbf347ae68453cebb3c34c753472eeeeca27d22c0fa1e672dc148ec6394108146d10d1ee77d420cdc2397902fe457aa085643b9714
+EBUILD kineto-2021.11.17.ebuild 762 BLAKE2B 0ba3a4437f6d47eec80f9725fb81d007a7b50ab2ee1eb01019b2b43a0e868a65250991c16ec482cab9fe5217d13442d54848f32eee1b5003fbbd858a47db394f SHA512 174509c7fafda4e5c4320d59e3d6856c4bb0027647919a4a850b61712159aa722d36636f8164dbcfd9ea616bd24da9089a36a42052b30d2ea84ff44696deaedb
+MISC metadata.xml 327 BLAKE2B f48b87396bdfbc5a12b807941e162b596bbf760252fbfd08dc05ef8aeb9dcd8fc1b0ed3c8d4ec5f531da5a7315a041b8db7b0f6449c86fc52fba4f6d4476beb5 SHA512 9f6906e171f530b6f5de417338af00c26681fe757d823b4ab88cb9749506404c2d9baa96ea3c71c4fe523f6f5877a81e20f2378abe4a2e9895e501829e3fe85d
diff --git a/sci-libs/kineto/files/kineto-2021.11.17-gentoo.patch b/sci-libs/kineto/files/kineto-2021.11.17-gentoo.patch
new file mode 100644
index 000000000000..0c4cb7261273
--- /dev/null
+++ b/sci-libs/kineto/files/kineto-2021.11.17-gentoo.patch
@@ -0,0 +1,77 @@
+--- a/libkineto/CMakeLists.txt	2022-05-24 11:16:18.537610972 +0200
++++ b/libkineto/CMakeLists.txt	2022-05-24 11:19:15.011073535 +0200
+@@ -78,10 +78,10 @@
+ set_target_properties(kineto_base kineto_api PROPERTIES
+       CXX_STANDARD 14
+       CXX_STANDARD_REQUIRED YES
+-      CXX_EXTENSIONS NO
+-      CXX_VISIBILITY_PRESET hidden)
++      CXX_EXTENSIONS NO)
+ 
+-set(KINETO_COMPILE_OPTIONS "-DKINETO_NAMESPACE=libkineto")
++set(KINETO_COMPILE_OPTIONS "-DKINETO_NAMESPACE=libkineto"
++        ${CMAKE_SHARED_LIBRARY_C_FLAGS})
+ list(APPEND KINETO_COMPILE_OPTIONS "-DFMT_HEADER_ONLY")
+ if(NOT MSVC)
+   list(APPEND KINETO_COMPILE_OPTIONS "-std=c++14")
+@@ -100,7 +102,7 @@
+ target_compile_options(kineto_base PRIVATE "${KINETO_COMPILE_OPTIONS}")
+ target_compile_options(kineto_api PRIVATE "${KINETO_COMPILE_OPTIONS}")
+ 
+-if(NOT TARGET fmt)
++if(FALSE)
+   if(NOT FMT_SOURCE_DIR)
+     set(FMT_SOURCE_DIR "${LIBKINETO_THIRDPARTY_DIR}/fmt"
+       CACHE STRING "fmt source directory from submodules")
+@@ -118,9 +120,7 @@
+   set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE)
+ endif()
+ 
+-set(FMT_INCLUDE_DIR "${FMT_SOURCE_DIR}/include")
+ message(STATUS "Kineto: FMT_SOURCE_DIR = ${FMT_SOURCE_DIR}")
+-message(STATUS "Kineto: FMT_INCLUDE_DIR = ${FMT_INCLUDE_DIR}")
+ if (NOT CUPTI_INCLUDE_DIR)
+     set(CUPTI_INCLUDE_DIR "${CUDA_SOURCE_DIR}/extras/CUPTI/include")
+ endif()
+@@ -140,14 +140,12 @@
+ target_include_directories(kineto_base PUBLIC
+       $<BUILD_INTERFACE:${LIBKINETO_INCLUDE_DIR}>
+       $<BUILD_INTERFACE:${LIBKINETO_SOURCE_DIR}>
+-      $<BUILD_INTERFACE:${FMT_INCLUDE_DIR}>
+       $<BUILD_INTERFACE:${CUPTI_INCLUDE_DIR}>
+       $<BUILD_INTERFACE:${CUDA_INCLUDE_DIRS}>
+       $<BUILD_INTERFACE:${ROCTRACER_INCLUDE_DIR}>
+       $<BUILD_INTERFACE:${ROCM_INCLUDE_DIRS}>)
+ 
+ target_include_directories(kineto_api PUBLIC
+-      $<BUILD_INTERFACE:${FMT_INCLUDE_DIR}>
+       $<BUILD_INTERFACE:${LIBKINETO_INCLUDE_DIR}>)
+ 
+ if(KINETO_LIBRARY_TYPE STREQUAL "default")
+@@ -178,8 +180,6 @@
+ if(NOT LIBKINETO_NOCUPTI)
+   target_link_libraries(kineto "${CUDA_cupti_LIBRARY}")
+ endif()
+-target_link_libraries(kineto $<BUILD_INTERFACE:fmt::fmt-header-only>)
+-add_dependencies(kineto fmt::fmt-header-only)
+ 
+ install(TARGETS kineto EXPORT kinetoLibraryConfig
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+--- a/libkineto/libkineto_defs.bzl	2022-05-24 22:06:17.324000422 +0200
++++ b/libkineto/libkineto_defs.bzl	2022-05-24 22:07:08.326419268 +0200
+@@ -46,6 +46,7 @@
+         "src/init.cpp",
+         "src/output_csv.cpp",
+         "src/output_json.cpp",
++        "src/ILoggerObserver.cpp",
+     ] + (get_libkineto_api_srcs() if with_api else [])
+ 
+ def get_libkineto_public_headers():
+@@ -51,6 +56,7 @@
+     return [
+         "include/AbstractConfig.h",
+         "include/ActivityProfilerInterface.h",
++        "include/ActivityTraceInterface.h",
+         "include/ActivityType.h",
+         "include/Config.h",
+         "include/ClientInterface.h",
diff --git a/sci-libs/kineto/kineto-2021.11.17.ebuild b/sci-libs/kineto/kineto-2021.11.17.ebuild
new file mode 100644
index 000000000000..4a2841c7a5a9
--- /dev/null
+++ b/sci-libs/kineto/kineto-2021.11.17.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit python-any-r1 cmake
+
+CommitId=659a7f99ee737103273ef60551bfe1611c2d2cba
+
+DESCRIPTION="part of the PyTorch Profiler"
+HOMEPAGE="https://github.com/pytorch/kineto"
+SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/libfmt
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? ( dev-cpp/gtest )
+	${PYTHON_DEPS}
+"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-gentoo.patch
+	cd libkineto
+	cmake_src_prepare
+}
+
+src_configure() {
+	cd libkineto
+	cmake_src_configure
+}
diff --git a/sci-libs/kineto/metadata.xml b/sci-libs/kineto/metadata.xml
new file mode 100644
index 000000000000..9d79d73e5c54
--- /dev/null
+++ b/sci-libs/kineto/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pytorch/kineto</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/kissfft/Manifest b/sci-libs/kissfft/Manifest
index e75abe6a2038..4b3f2ffd4ac5 100644
--- a/sci-libs/kissfft/Manifest
+++ b/sci-libs/kissfft/Manifest
@@ -1,4 +1,4 @@
 DIST kissfft-131.1.0.tar.gz 52383 BLAKE2B 74e6d2e7d132a311b31c28a468e13d9772a53f0ea0abed0e0f49d8db9c183fb0646f58fd38df3e797b8577285899daf6b80446b149ce2582bb828410656d96df SHA512 bd715868ce0e93a291a0592fb1f8b960e832fc64efe863755e52b67d5addff9bcb444a1bf2570d1914c52b41dad1023d0d86400f5ea30c9fb84cd6b4f7210708
-EBUILD kissfft-131.1.0.ebuild 1238 BLAKE2B 1900bf48bafd22ae4a7424cdd3d0458e8d9e54e4781bb8991bb8553946c60162d5a38097f1333b4cb1b853c2e6e00c333ba319623786754ca4e7d80667220c8a SHA512 ed05af1985f90456a13a7ec70b79371c5e3181876314a455d84b3609976e76dc7108a8fc51f19ec32f5b7f7cef38706629e9b1cad6e8c857c0bb79919d59fc0c
-EBUILD kissfft-9999.ebuild 1238 BLAKE2B 1900bf48bafd22ae4a7424cdd3d0458e8d9e54e4781bb8991bb8553946c60162d5a38097f1333b4cb1b853c2e6e00c333ba319623786754ca4e7d80667220c8a SHA512 ed05af1985f90456a13a7ec70b79371c5e3181876314a455d84b3609976e76dc7108a8fc51f19ec32f5b7f7cef38706629e9b1cad6e8c857c0bb79919d59fc0c
+EBUILD kissfft-131.1.0.ebuild 1320 BLAKE2B e6e888cf80e0538104792b70e26d429ee339b7c018d3c22550714e0462134b11210c8212b9a493e8a22bd4892b8c3ad20da62d18c19831566b8ac54b6c5db0f2 SHA512 a0e4f4c0942caccf965fb20e934b69db86d0894ade322435ccf58c9a9ba6c713062db0d21aa311cdfee051426245ba13aba05e7fb08144165acb3565f75ae259
+EBUILD kissfft-9999.ebuild 1321 BLAKE2B ebb2b52af3e118da353e46dd2e3842507d80d26f37c1371d6c771125c5e1792f198f1d238c9b953f865e18c5b0c9dea0a3d5a672fb536dba4fac676cb631dd2e SHA512 8e3193cc6dcd84fd361fa074ea477d76b9ed6fc6ac220fcdd43c17757b6fbd249734f9ad3643631b7acd935a1f593fcca0d042a8b32c079f59b8f297e29d2196
 MISC metadata.xml 408 BLAKE2B 14d2f480a1f7bf7bdb5bd52ae17e4746bf7413fdf7e73de686dbd1d05371dddf1d079f1d621afd2e28e9aec8c4be73f51964aff0a6b1896c5ca7398a97d2afee SHA512 390bd36cd3c2481e38808cc85cf362a67337240295ed0fdf24b9b4617fd5b93cef607eaa10f76b4dc234eb4f75055e404898f8b1fb773441707952b9512142a7
diff --git a/sci-libs/kissfft/kissfft-131.1.0.ebuild b/sci-libs/kissfft/kissfft-131.1.0.ebuild
index 719285275283..76993eb680fd 100644
--- a/sci-libs/kissfft/kissfft-131.1.0.ebuild
+++ b/sci-libs/kissfft/kissfft-131.1.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 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/mborgerding/kissfft/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="BSD"
@@ -36,6 +36,10 @@ python_check_deps() {
 	has_version -d "dev-python/numpy[${PYTHON_USEDEP}]"
 }
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/sci-libs/kissfft/kissfft-9999.ebuild b/sci-libs/kissfft/kissfft-9999.ebuild
index 719285275283..bc06fee4c8e0 100644
--- a/sci-libs/kissfft/kissfft-9999.ebuild
+++ b/sci-libs/kissfft/kissfft-9999.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
@@ -36,6 +36,10 @@ python_check_deps() {
 	has_version -d "dev-python/numpy[${PYTHON_USEDEP}]"
 }
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index 75e94f61b4cc..848eb9e147d7 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,5 +1,5 @@
 DIST lapack-3.10.0.tar.gz 7630775 BLAKE2B fd2f920dd3f69eab471aa8c20d1b8178fb5c6e80337a2ed6948aba3ec639a816f8d368bb59ff6fb513b2f5cda9e61c2a547182f22fbc84a8c34191acefc3406a SHA512 56055000c241bab8f318ebd79249ea012c33be0c4c3eca6a78e247f35ad9e8088f46605a0ba52fd5ad3e7898be3b7bc6c50ceb3af327c4986a266b06fe768cbf
 DIST lapack-3.10.1.tar.gz 7632257 BLAKE2B f2653239029ed9c136173fc2e54773a785ad3e469d581ca2b7f6a72697e6bb9d22879edaf8327ada510df259c08fe984202d14cb3860c0d2a711eb55a1cc11dd SHA512 0500bbbb48483208c0a35b74972ff0059c389da6032824a2079637266a99fa980882eedf7f1fc490219ee4ff27812ac8c6afe118e25f40a9c2387e7b997762fb
 EBUILD lapack-3.10.0.ebuild 3004 BLAKE2B d30beb1a09b7f69bd0dca44ffb013e1fa3646017c527b41a6453de3dc6f01ac61fa409855c510ab4164f6e939b059d2b8479751601c12564faae3c1fdd55026b SHA512 8e58ec461d8a7b14b1df611743f8fdfe41022c5a01873fc367781545bfbea407502661129078bb3172a9ca4a031209b713862f38e9d7648834563e9af68608ad
-EBUILD lapack-3.10.1.ebuild 2974 BLAKE2B 065a365797777b8e332c6af0a20854f7bdec6b203484c5d58c570c5210801fe368aeffd7509b68dbab60fe3461d89c216c9999a5d3fa2a320c4a00f1b2328d1b SHA512 30b03f9078b18dafddafd45faa07b9e9913f06cfbb9e154723f93c051ea5feb5505abe8afe7ac82bbc7577844be8c1c645075d01c2ff6aa7ec0c8042633f8b8d
+EBUILD lapack-3.10.1.ebuild 2981 BLAKE2B ba262a076ff86b493c231132306ad1092a6670021b43cc0ae98e2a9e4199593d25b23d20a79c25f372fea4d31d8b6e5be8e1215e82d656ee09aa7baeb58fd76d SHA512 c9de2a3d3bc346b2ab25281af7b2aeffab196a0301b21f7e7fbd6c1f109d91eb7121dfad6253ac2de57243e3f00ef9bbcd9340418190781a5b79595f910fcab0
 MISC metadata.xml 1583 BLAKE2B 8db26f3744a6ee5f88f7ad37e749843eb8b63cd11af4182dd9d6408a854a5b060a651abd5f2f2098252a38b68b34c464a99f9654be9e6cba8f444eff23e4e297 SHA512 d8e8eb140e1a05f297b9e6edcc9aeb48e958baa7741be2a693ea4fca1a6d3f66a60d72c4c61e2dac8b8efd6210daf10ea9350fdbcfbaf801ac6366d0025ad2ca
diff --git a/sci-libs/lapack/lapack-3.10.1.ebuild b/sci-libs/lapack/lapack-3.10.1.ebuild
index 962b68b1d175..d45811165730 100644
--- a/sci-libs/lapack/lapack-3.10.1.ebuild
+++ b/sci-libs/lapack/lapack-3.10.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 # TODO: static-libs 64bit-index
 IUSE="lapacke deprecated doc eselect-ldso test"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/libaec/Manifest b/sci-libs/libaec/Manifest
index 1aacf2422ae4..b25418b06bad 100644
--- a/sci-libs/libaec/Manifest
+++ b/sci-libs/libaec/Manifest
@@ -1,3 +1,5 @@
 DIST libaec-1.0.4.tar.gz 2775768 BLAKE2B e083c5e268296227b5193c2192f7c52d47f8cef08823de013453ffd2c5f8c115921a79c60286e7582cbfcbb914c5e8ad4c2493e4ec89395df3be2206bc893591 SHA512 74d01208ad3a426d68895dbfa8a830c96618a219f27745ecfd94b248462748e772c266e7fb0d4e4f4c75f8953a97f835fb2ece67317cf9e9a7495360362d22eb
+DIST libaec-1.0.6.tar.gz 2777547 BLAKE2B 20da3fdf659c9d47ffde442ceaa9f9a831aab70330e27683ed4b62a28fdad02ec9c100413580f04d5a2bbbe86f3fe54b065230393bfb5e7746c522cce71513bc SHA512 f5d118c48225f97b229ac11425b94adff4d3698733bf18767b427e49047f8e08768464bc9cd9f5e6a66ceb44c8ebd9904c4f6f46566e2e66fcaa1049b2ebfcc1
 EBUILD libaec-1.0.4.ebuild 752 BLAKE2B 69a347bf06cf69874142484f14037de94bf358bc6969616cfe707721df850f43336bc6ee5cb4045420c39f79293043daa62d08684cb899f3f5b83cdac32c56d8 SHA512 37fc7ee6489b05edc05f63636ff8e65be8f417f0dbc57bc94940fa80835800a908527c4986b51e90bcd01557ec60688fd85630574159f8de4ff34229068e3c63
+EBUILD libaec-1.0.6.ebuild 1077 BLAKE2B ed2651b198c74c6512a6da8758594d6b5a53594debe9e4b67b90abc71ade471b1d3e1005a336eeb86e8f2689c394b7bb92ac2f71d8a83c1550dc2f015c092f19 SHA512 cd6a002f5e6d31026a23e5a82706db9447d48f551eb9b9b5059581fe3d4c0b09eb752b8bc12a01279315c4d8270fb1fd95b960c0ff5ecc1471c3218194b86039
 MISC metadata.xml 720 BLAKE2B 08fdb1266842d4855449e2b444beea95e1bddac8b4501a85ec79b1aa40d4838d3d0140b48a0fd366ce588a55873a986483c0ba3216eb5609fb4c4c13da205eb3 SHA512 ffae51194154bcd13ef917b2e16fd9a49725ed163f742d67715a2b1c350bcc3a2bbb9e9ef788fa9e776ae4361911a8954fd56e03adcd59c54e83a64d5b41a0fe
diff --git a/sci-libs/libaec/libaec-1.0.6.ebuild b/sci-libs/libaec/libaec-1.0.6.ebuild
new file mode 100644
index 000000000000..2c95da741a7c
--- /dev/null
+++ b/sci-libs/libaec/libaec-1.0.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake
+
+MY_P="${PN}-v${PV}"
+DESCRIPTION="Adaptive Entropy Coding library"
+HOMEPAGE="https://gitlab.dkrz.de/k202009/libaec"
+SRC_URI="https://gitlab.dkrz.de/k202009/libaec/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="+szip"
+
+RDEPEND="szip? ( !sci-libs/szip )"
+
+src_configure() {
+	mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# avoid conflict with szip (easier than to patch)
+	if ! use szip; then
+		rm "${ED}"/usr/include/szlib.h || die
+		rm "${ED}"/usr/$(get_libdir)/libsz* || die
+		rm "${ED}"/usr/share/doc/${PF}/README.SZIP || die
+	fi
+
+	# Move these cmake files to a proper location
+	dodir "/usr/$(get_libdir)/cmake/${PN}"
+	mv "${ED}/usr/cmake/"* "${ED}/usr/$(get_libdir)/cmake/${PN}" || die
+	rm -r "${ED}/usr/cmake/" || die
+}
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 87707425025e..801cc65b3aed 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,7 +1,9 @@
 DIST libqalculate-3.21.0.tar.gz 2117414 BLAKE2B eaf8b886e716a6f8e9631dbda6533906cc7c5ed986233d75b9384aefb4123479914715d37268db5e1d403d1ee1835cde77314abe5380768fce5c266d1c253ca3 SHA512 7ca876ffe359ab2c6c6ae266007f489f9cd26f6650d6ace4e1d80cc660d16294cce601ed81046baca25cc4ec41668498af0a555fddc47c4118241e72af039614
 DIST libqalculate-3.22.0.tar.gz 2150167 BLAKE2B 2023dc00e516f26d93e6acae66acb6211fb4dd234fba7e1e012c29ea224276040e75552b923b275e0cbe3e168ed419849f7f204aac3952a872ad0f1916470358 SHA512 2fc7e9e2edda0dfa221865050068eead29f9fecfef8eb8817bacc7493ed03215c60931b40e69165f565fc0574e370131ebebd9b247fedafc5821aae35b71dac9
 DIST libqalculate-4.1.1.tar.gz 2172017 BLAKE2B e9dcc22ad2d102572610ddc103afc5a279cf4f63681750c6165dac40225c7e29ebb4ccdc4f54cb97031ca8684ef17e08e99478c6b200870c7858e832a7588f18 SHA512 7a0f2fac6c96247b40565bdd015f8b52dc250fa74a8d8ed4a52a6f2134fb2b628e469c0253723f22b433a8f575590a28be8c0d4aa6cfb473b58f1b2c63707956
+DIST libqalculate-4.2.0.tar.gz 2215812 BLAKE2B 393bab0d9cf5d4a3158d93bf676805d829a2103ec1dc733e3d98fd7a54ab0c42d3797dadb1cde72b1df2e13cfb691430982f5fbd886ac9f0a906b3884f912202 SHA512 105f567a3b24a1c396df0eb85f299d18228f489e4d989f0fa09cf97321494030e9a85d9cd9fe4b5dd8cc233b4329025788275ba168546929e912598dee8ef6b8
 EBUILD libqalculate-3.21.0.ebuild 1654 BLAKE2B c5b306253cf8573552a4317a2472933b38356c174d47e609f4cdb8c44345563c385844c634153c884c16d6e67f8c069d9f3f4e7af751b65f02eec38c6d58391b SHA512 3ef1a0e55ccf8b9457c3a5bd1d40d34196f201faad18e7085b1af42c8ef27f4b9fd8d2f83ae5cdc2ce698f696b200bc85e23f2b575f42d26af78ace024504cd6
 EBUILD libqalculate-3.22.0.ebuild 1774 BLAKE2B 6722314fab7a62696124df0e3813b9d3f4309900c34dff7ef30dee9b0184e8cab34131ca45d3b26bb7137d53b5761347c1e80efd5fa1f2cc6294c6ea2bea49f4 SHA512 7a14d2b32fd478eb11a597a08bb7c7e9a5f0035c94ab7b2b5b36f3a0086807d4b4c6e844a91c8176ddf8cb2be574d031c54c8cc652ead9ad2c9d25e441a67e23
 EBUILD libqalculate-4.1.1.ebuild 1774 BLAKE2B 23f655bbecef591ab2fe8b12c0c4590c5e5bbe9465e7813207561fb8b94d4a042fd9901304e12ab324bbcfdc046ac3e5682d04224eed57e88046e6193058b5dc SHA512 2c45e268d85005c089d34c2f5e6dd76c44b182ceeca3d3a0267fb739cc721d9d49471362fa119d65a8e2e13daadc439273caf2a7e4017a2f02ebb94fa89576f8
+EBUILD libqalculate-4.2.0.ebuild 1781 BLAKE2B e23053dd9aeb9115fdc08e2dfdbf9fca73547283f8c64e533ce29bf8e9989693954d7ea07330707c9e822b86200a68a8d78f2a6ede562c1e5d8dd9dd5440f578 SHA512 79bdde4b78735c4991467711492823ddf2a290fc6c36648be316a15303de277295448067ffb550c02e2e0a37286b0dfeb82e03751459009d0b99ff28a0cd7664
 MISC metadata.xml 413 BLAKE2B 40f271cbe3f5ca30aa6ec6320d382faef0864e064ae57599a6da937da85b4de9d57eeec6f8b737698ede76d663149b13247d1edf8b5b291de19ac3d6b5266492 SHA512 053e75b77c4ff628535db22d9763e27c32cee904f0b268d2d507f367c938aff5bdd75a66e3f4c2316dc1d3db579d721564d3a12e139740a3a0d50c36f8d52e94
diff --git a/sci-libs/libqalculate/libqalculate-4.2.0.ebuild b/sci-libs/libqalculate/libqalculate-4.2.0.ebuild
new file mode 100644
index 000000000000..afe9ca2da752
--- /dev/null
+++ b/sci-libs/libqalculate/libqalculate-4.2.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bump with sci-calculators/qalculate-gtk!
+
+inherit toolchain-funcs
+
+DESCRIPTION="A modern multi-purpose calculator library"
+HOMEPAGE="https://qalculate.github.io/"
+SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+# SONAME changes pretty often on bumps. Check!
+SLOT="0/22"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="curl icu gnuplot readline test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/gmp:=
+	dev-libs/libxml2:2
+	dev-libs/mpfr:=
+	virtual/libiconv
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:= )
+	readline? ( sys-libs/readline:= )"
+RDEPEND="${DEPEND}
+	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
+BDEPEND="dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	cat >po/POTFILES.skip <<-EOF || die
+		# Required by make check
+		data/currencies.xml.in
+		data/datasets.xml.in
+		data/elements.xml.in
+		data/functions.xml.in
+		data/planets.xml.in
+		data/prefixes.xml.in
+		data/units.xml.in
+		data/variables.xml.in
+		src/defs2doc.cc
+	EOF
+}
+
+src_configure() {
+	# Needed for po-defs/Makefile
+	export CXX_FOR_BUILD="$(tc-getBUILD_CXX)"
+	export CXXCPP_FOR_BUILD="$(tc-getBUILD_CXX) -E"
+
+	# bug #792027
+	tc-export CC
+
+	econf \
+		$(use_enable test tests) \
+		$(use_enable test unittests) \
+		$(use_with curl libcurl) \
+		$(use_with gnuplot gnuplot-call) \
+		$(use_with icu) \
+		$(use_with readline)
+}
+
+src_install() {
+	# docs/reference/Makefile.am -> referencedir=
+	emake \
+		DESTDIR="${D}" \
+		referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		install
+
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index 55eed7878dda..2dc1475e039e 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -3,6 +3,6 @@ AUX libsigrok-0.5.2-ruby-swig-docs.patch 3085 BLAKE2B 865f38a8230762f58620c06b91
 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 3910 BLAKE2B d09247d9500282261fa2b62e4b9ee6f5505973f6b836893f166871b8d67fd3a90c89542c882f3367a38f50bac6a064d727cf26a32555fe54b53165481b752973 SHA512 e5f9c8451451788b05c15353a4b1136b423fc6ab576ea55e7c720c25c6b96391c49a3bb4240ef96322b212a49f37dcd0495df646a8648a06d18c4f25ed3617ab
-EBUILD libsigrok-0.5.2-r3.ebuild 4055 BLAKE2B 63c6571becc1bb712e13038a2872628453890aacd48c9db415f7c3e6f2e5a4e787a189bab9c6c753561cce817b1a1cd2bd7d07077e9f9e0eb00bcb18bfae2ca1 SHA512 8d71b9445e7d0beee9953c92cf0a3730b753d986906f52f601f39d8e0ffc22fbdeeb1293cdd6571803ba9b6214b26d0f6fb4cc900c4f3f2a64f6689439972e01
+EBUILD libsigrok-0.5.2-r3.ebuild 4065 BLAKE2B 94e72b79adcf4038ddedb811ef1dcf576c2844f17d659c51f6173e20c0650c823ee1285d41f41d4c94a29edc4dea7ff3f52d931d3cc8822021ab8125c020763b SHA512 b3f70628616d00308008f9cf7ba5a240401beb2cb16edc0bf38c5442b0f8a5bffc6fd2acc786cb74d03bd76452f7e30df8eda39f84c40d1ba71925f5d9ec54d7
 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-r3.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
index 8ea5f166972b..3523b5e36b13 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support"
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index aa0986bd7ab2..876112d86a09 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -1,5 +1,5 @@
-AUX 3.11-openmp.patch 943 BLAKE2B 39f092a108f808711dd928595cd82d507f6154efd549c319047c7a94edb772887338209549dba99cca4ed0a8106dc40ef4afd3a42dfe41d7d884f7f630391bfe SHA512 17bcea4da6a6aa32192ce7fb66e7eefef5e037ca2afd968e67de385938555975abe2103ee2cc50d02cd21d9783e9334eac93de694d6e685f13af80c49e42af38
-AUX 3.14-makefile.patch 1634 BLAKE2B f25e5225e07040e43cc6057558914f177de4e3d40254df9668de8719fbacd6cbadd685d38e2935c13e1778d8a260ef0733672bfc5c719a9e5d9a8832cbbe8ca8 SHA512 f4c2e2f6556604bf3572e341176c855e87caf4c3db8c2b347ce4e7a7948d21b708a7df29d5bf9b741dd3f34e08a0750572b94bd5e94bb4052f1ba4b9ae50e918
+AUX libsvm-3.25-makefile.patch 1563 BLAKE2B ed88feaf7f2b6ce51b39f7ed875c6ab880a6e323a610d4f3a01b5830bc79e4bdb98a322fe1d150c3d4abd5f80761241ea81e4ac398dce0cfe307f8729793b999 SHA512 5d37a6298586273e772d0f249f876a31b39895a3394ea470626ea845ac28bad4c0a552b88bc1c3103331c72590e7c485b042c329d58384c3a7337e0d6da6d07d
+AUX libsvm-3.25-openmp.patch 864 BLAKE2B ef67a094c7cd3cafa3c998caa78bd226d83e462e358caa4cf15382087962b1eb9214553ae560d7c13812178d5f9a528764589c9f805b479a4931f7f94f9b4fdc SHA512 60250a325b6d22a1d8404f1b1d8ecd1b47e28003982c8f851107598b0553125afefb9b0a2b2e940761646152c05d6fdcd438994cdc991c2bffe10a9d87923b04
 DIST libsvm-3.25.tar.gz 892471 BLAKE2B a80b7192981811f57446a966c911a07a2de17042e67faa26451c23129dafeac642596a619731b57a27d9845f904e2e4c5c11ae8aa3006fa49e2f62d7cec4cca2 SHA512 91afbcfd204f5fc9c367df446550cecaf01d5e34770fa10fc6bb02277d79b756393f7d057290df0f72fc941faaf0f4c84a863a3bf9d8628eeff1f99b6bc57a98
-EBUILD libsvm-3.25.ebuild 2658 BLAKE2B 67355f60c6071c4f9ab900cdbbde0dc02bc71c43dbda9f1a6ca055d7c6b802ef64daf64952382f9c41a155e04848417e1c86302463b68a6d9af21cbd802d4173 SHA512 8dd28ea1eb14bc85a12690b8ff80ae7e6b5d06d84f72e68847cc0418edb54d8fa71465ec3cd9538adff71a269f7411108fde249b1ce9fdc1d7e1ca5fee627ead
+EBUILD libsvm-3.25-r1.ebuild 2505 BLAKE2B baedba6258eb4f7e7a191a9cfa22a06bbf6aa6ba08cb0b14a8b4096e6301db0955cf5fc95e349364d192c32f6a873bcbb334cb82b2c7a06f505dae1d28d2ba32 SHA512 cc8a9625acc8b2e4e76c1d6651636c17b45b86cc1f4e4a50c70254ee123a952fe9083d0ba6e85db9650980adfc9d236b9b16665d2ddedcb38fd6a6e89b426f7a
 MISC metadata.xml 816 BLAKE2B 59108eaf569019b5adde56aa0197503346d53d3ab07285c65768e4663f8aec41d441c1c8b894ddd4cf86f16d40784800918345a15cd48b8bc6f3fcf1da8dc08b SHA512 8a6fe72c2ad1f017e36bef14eed3d61909395bd2aaa13c561d7818942099f3b20fe020b5548053758c30ec7ba09c0e4f7238c6906452ad6c3f049a857cf8eac6
diff --git a/sci-libs/libsvm/files/3.14-makefile.patch b/sci-libs/libsvm/files/libsvm-3.25-makefile.patch
index e38dafc10b20..ea48368b27a5 100644
--- a/sci-libs/libsvm/files/3.14-makefile.patch
+++ b/sci-libs/libsvm/files/libsvm-3.25-makefile.patch
@@ -3,15 +3,13 @@
 * propagate and respect user's LDFLAGS
 * PIC only used for the library
 * link the shared version library
-nov 2012 - bicatali@gentoo.org
 
---- a/Makefile.orig	2012-11-29 10:39:07.149421728 -0800
-+++ b/Makefile	2012-11-29 10:57:19.727766521 -0800
-@@ -1,9 +1,12 @@
- CXX ?= g++
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,10 @@
+-CXX ?= g++
 -CFLAGS = -Wall -Wconversion -O3 -fPIC
-+CC ?= gcc
-+CFLAGS ?= -Wall -Wconversion -O3
++CFLAGS ?= -Wall -Wconversion
 +CXXFLAGS ?= $(CFLAGS)
  SHVER = 2
  OS = $(shell uname)
@@ -22,30 +20,30 @@ nov 2012 - bicatali@gentoo.org
  
  lib: svm.o
  	if [ "$(OS)" = "Darwin" ]; then \
-@@ -11,15 +14,20 @@
+@@ -11,15 +12,17 @@
  	else \
  		SHARED_LIB_FLAG="-shared -Wl,-soname,libsvm.so.$(SHVER)"; \
  	fi; \
 -	$(CXX) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER)
-+	$(CXX) $(LDFLAGS) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER) ; \
++	$(CXX) $(LDFLAGS) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER) $(OPENMP_LIBS) ; \
 +	ln -s libsvm.so.$(SHVER) libsvm.so
++
++svm-predict: svm-predict.o lib
++	$(CXX) $(LDFLAGS) $< -o $@ $(LIBS) -L. -lsvm -lm
++svm-train: svm-train.o lib
++	$(CXX) $(LDFLAGS) $< -o $@ $(LIBS) -L. -lsvm -lm
++svm-scale: svm-scale.o
++	$(CXX) $(LDFLAGS) $< -o $@ $(LIBS)
  
- svm-predict: svm-predict.c svm.o
+-svm-predict: svm-predict.c svm.o
 -	$(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
-+	$(CC) $(CFLAGS) -c $@.c -o $@.o
-+	$(CXX) $(LDFLAGS) $@.o svm.o -lm -o $@
- svm-train: svm-train.c svm.o
+-svm-train: svm-train.c svm.o
 -	$(CXX) $(CFLAGS) svm-train.c svm.o -o svm-train -lm
-+	$(CC) $(CFLAGS) -c $@.c -o $@.o
-+	$(CXX) $(LDFLAGS) $@.o svm.o -lm -o $@
- svm-scale: svm-scale.c
+-svm-scale: svm-scale.c
 -	$(CXX) $(CFLAGS) svm-scale.c -o svm-scale
-+	$(CC) $(CFLAGS) -c $@.c -o $@.o
-+	$(CXX) $(LDFLAGS) $@.o -o $@
-+
  svm.o: svm.cpp svm.h
 -	$(CXX) $(CFLAGS) -c svm.cpp
-+	$(CXX) $(CXXFLAGS) $(PICFLAGS) -c svm.cpp -o $@
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PICFLAGS) $(OPENMP_CFLAGS) -c svm.cpp -o $@
  clean:
 -	rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER)
 +	rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) libsvm.so
diff --git a/sci-libs/libsvm/files/3.11-openmp.patch b/sci-libs/libsvm/files/libsvm-3.25-openmp.patch
index e07b03e57380..1d12e198648e 100644
--- a/sci-libs/libsvm/files/3.11-openmp.patch
+++ b/sci-libs/libsvm/files/libsvm-3.25-openmp.patch
@@ -1,6 +1,6 @@
---- a/svm.cpp.orig	2011-05-27 04:32:19.000000000 +0100
-+++ b/svm.cpp	2011-12-29 19:17:07.000000000 +0000
-@@ -1281,6 +1281,9 @@
+--- a/svm.cpp
++++ b/svm.cpp
+@@ -1282,6 +1282,9 @@
  		int start, j;
  		if((start = cache->get_data(i,&data,len)) < len)
  		{
@@ -10,7 +10,7 @@
  			for(j=start;j<len;j++)
  				data[j] = (Qfloat)(y[i]*y[j]*(this->*kernel_function)(i,j));
  		}
-@@ -2463,7 +2466,10 @@
+@@ -2506,7 +2509,10 @@
  	   model->param.svm_type == NU_SVR)
  	{
  		double *sv_coef = model->sv_coef[0];
@@ -22,9 +22,9 @@
  		for(i=0;i<model->l;i++)
  			sum += sv_coef[i] * Kernel::k_function(x,model->SV[i],model->param);
  		sum -= model->rho[0];
-@@ -2480,6 +2486,9 @@
+@@ -2523,6 +2529,9 @@
  		int l = model->l;
- 		
+ 
  		double *kvalue = Malloc(double,l);
 +#ifdef OPENMP
 +#pragma omp parallel for private(i)
diff --git a/sci-libs/libsvm/libsvm-3.25.ebuild b/sci-libs/libsvm/libsvm-3.25-r1.ebuild
index fb3107631476..78e21cefa8d4 100644
--- a/sci-libs/libsvm/libsvm-3.25.ebuild
+++ b/sci-libs/libsvm/libsvm-3.25-r1.ebuild
@@ -27,27 +27,16 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/3.11-openmp.patch"
-	"${FILESDIR}/3.14-makefile.patch"
+	"${FILESDIR}"/${PN}-3.25-openmp.patch
+	"${FILESDIR}"/${PN}-3.25-makefile.patch
 )
 
-pkg_setup() {
-	if use openmp; then
-		if ! tc-has-openmp; then
-			ewarn "OpenMP is not supported by your currently selected compiler"
-
-			if tc-is-clang; then
-				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
-				ewarn "which you will need to build ${CATEGORY}/${PN} for USE=\"openmp\""
-			fi
-
-			die "need openmp capable compiler"
-		fi
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
 
-		append-cflags -fopenmp
-		append-cxxflags -fopenmp
-		append-cppflags -DOPENMP
-	fi
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {
@@ -66,6 +55,14 @@ src_prepare() {
 			-e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \
 			java/Makefile || die "Failed to fix java makefile"
 	fi
+}
+
+src_configure() {
+	if use openmp; then
+		export OPENMP_CFLAGS="-fopenmp -DOPENMP"
+		export OPENMP_LIBS="-fopenmp"
+	fi
+
 	tc-export CXX CC
 }
 
diff --git a/sci-libs/linbox/Manifest b/sci-libs/linbox/Manifest
index ecb896cfbf56..bc9e1213cae5 100644
--- a/sci-libs/linbox/Manifest
+++ b/sci-libs/linbox/Manifest
@@ -1,4 +1,4 @@
 AUX linbox-1.6.3-pc.patch 1082 BLAKE2B 7d5b055c0622b61245f193eb39d7e52951262c56456dceba5b3e72f54add82b2fc1660c4590eba2c4a97009bd78119893bfccb0909ed5374752f4bf563e75655 SHA512 5739738de34c28fb9970a869ee97a6ab528fd48e3f8b3d82f39966959fa97d6076a44263678d25c06bea3c46e06c8869ba4ea94484d5b57aee3a302df49fd06b
 DIST linbox-1.6.3.tar.gz 1968034 BLAKE2B 55fb83db7da375d8d97f2567c6a120ac48fefc41eb02db68152cc32f1f16009b8c8108a07bbc68087ad2ef3279108db61b48b805c9ce39f4c5f0072ab6e96304 SHA512 ccef3b4c7b9d8f999e5e4ce4e544f22cd869154513827501ecb7e1abf132ff585dfb3315cced963abe842feecda9331dda9081efb3948987365d338223a8305c
-EBUILD linbox-1.6.3-r1.ebuild 3334 BLAKE2B d9332c8bb46f771c217e50587bf4aa59617e97188a41cf555970ddc04d0eaaef4178cd5a9eea4093acdf7395e8849381a54482ce67512c129b57c9aa05458f89 SHA512 9ddc67db13986a2a78e778785a15a72b9fc30b270aea68c8d2af2e0e0a0bdc9264f27717b981aed9578fdbf2fcfd603f054316d8edd1eb3c59a6f3c8d16a1ca2
+EBUILD linbox-1.6.3-r1.ebuild 3411 BLAKE2B 7690226c067c00e60467bc95939640333afcd71ef7a627f4b109417fd5cdae80a939141b42bc7d891df9b05c3276b1ce51ad212f50850aa7e01a4157a4459886 SHA512 dbfa10550a5ca468555dbaceb197b518dcb9c94149a89628d1a88f9c1dc63e5a6eb5a08697c0a7dab3d1aa3788a3e5a38ccd2b13c74718f9d395b0c05a66b7d2
 MISC metadata.xml 1273 BLAKE2B 44f0e4d4b7533e7206ec34c2683977ca85a3e4e635f8dd8611f4915e09d004b5faf7639d34ae2807bb1242be19f5c8abc6b3de2913bfe3a5c807560237e2962c SHA512 c29ebb754e2d681dab82a020d12d383dd243a88f704470881b0c471d87028027b7fc3ce9ade55aff211e1e33c7a387539d8f97f428d670e56a73c0021ce42d53
diff --git a/sci-libs/linbox/linbox-1.6.3-r1.ebuild b/sci-libs/linbox/linbox-1.6.3-r1.ebuild
index 1771643dd4d6..cabe5a6d2cf9 100644
--- a/sci-libs/linbox/linbox-1.6.3-r1.ebuild
+++ b/sci-libs/linbox/linbox-1.6.3-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
@@ -34,7 +34,11 @@ RDEPEND="${DEPEND}"
 PATCHES=( "${FILESDIR}/${PN}-1.6.3-pc.patch" )
 
 pkg_pretend() {
-	[[ "${MERGE_TYPE}" != "binary" ]] && use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_configure() {
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index d7e8cf09ba04..94669c24657b 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -1,5 +1,7 @@
 AUX linux-gpib-4.3.0-perl.patch 546 BLAKE2B 9695c1a9f48a2a8bcb5f5998c40eb909e6b1b3624defe87a08bc4b91b34f53e8176531678dff3d4810b0b85b811eb477795c0dffe0275b864c0e4d4bac9b0ea9 SHA512 21bf64366d4b68dcfc2f4fa932480f8ff6af62bf792fe90c0dd0330606c3b95c073040dfa87bd1e277391a02ad324612d58b6d618d83c637b3df60c638289d06
 DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5dcac5a6715dfbb6df5c6fbe8b78900adf8ca7b1c28db350674ff1dd9c77e24507e98b536ca1af8b558c9a46ef8c25034c9769 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af
+DIST gpib_firmware-2008-08-10.tar.gz 173004 BLAKE2B 05fcde09de5246b86004c263c733d64316511bdb0b84dfbd9b94cb78e2909c0d191ff21ee0d77e7f0947e9231bd4cd62d6348e8f9beefd6d201b473732ff23d2 SHA512 f2a0ee3316b75ac36ed88568e45ca4c69935a6d10783c65582003ab39686f2a69d3002901866065f4f5efa9fdd4c779e038d1d7ce24bba266a619c164d5ac10d
 DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B 3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832 SHA512 397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
+EBUILD linux-gpib-4.3.4-r1.ebuild 4985 BLAKE2B 7a6509bcae552683696d0e6cf31e5f03f547038bfaf215809a4f67550ad06c5fcd1e2fe37df689e7c9320c95f222cb873ff0b32cbfc85150a020fe514e5f01b5 SHA512 fbb969ef412db9656ec279d87749bea111280d000e7a2f4a5721fa08e13f7b1d8b4d91ac1412090b8260a5d0f2a40b6942eed6b5ad328b2e0ca4ab9ddc6ed5b7
 EBUILD linux-gpib-4.3.4.ebuild 4797 BLAKE2B 0016f765269875faedfac78d04a99e39860396b5fe01d78487a72f0b12d8b0cf4202ecb1ee5c08dc6be50183a3adeca78af240d3f07203268610213787fc9661 SHA512 f3e020026a4b0b63be4988492f05ad3f27251f9d87b8e56c184a815449448aa45c3806d8c9881892b72c8b1683c8130f271d84427e9f213a593d9774c61a0184
 MISC metadata.xml 548 BLAKE2B c976143b910efb6a8920f064f35fdac9cb325ff272aca8a7644511300f4dfe9232c280577a90eae225ca4f88bc2b4cd09d175d4190bc13513d89457f57c9bb52 SHA512 c611a420ab28d623b5b9167bd59c04c2fe27404a7fd85de72a555f99ef8bad4383702482ae808d4eb66014a9e63ca057aa7195748f9c230f0778fcbde07fb71f
diff --git a/sci-libs/linux-gpib/linux-gpib-4.3.4-r1.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.4-r1.ebuild
new file mode 100644
index 000000000000..0584a67f9064
--- /dev/null
+++ b/sci-libs/linux-gpib/linux-gpib-4.3.4-r1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit readme.gentoo-r1 autotools perl-functions python-single-r1 udev
+
+# Check for latest firmware version on bump
+FW_PV="2008-08-10"
+
+DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="https://linux-gpib.sourceforge.io/"
+SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
+	firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-${FW_PV}.tar.gz )
+"
+S="${WORKDIR}/${PN}-user-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="pcmcia static guile perl php python tcl doc firmware"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMONDEPEND="
+	sys-libs/readline:=
+	tcl? ( dev-lang/tcl:0= )
+	guile? ( dev-scheme/guile:12 )
+	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php:= )
+	python? ( ${PYTHON_DEPS} )
+	firmware? ( sys-apps/fxload )
+"
+RDEPEND="${COMMONDEPEND}
+	acct-group/gpib
+	~sci-libs/linux-gpib-modules-${PV}
+"
+DEPEND="${COMMONDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/docbook-sgml-utils )
+	perl? ( virtual/perl-ExtUtils-MakeMaker )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.0-perl.patch
+)
+
+pkg_setup() {
+	use perl && perl_set_version
+	use python && python_setup
+}
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz"
+}
+
+src_prepare() {
+	default
+
+	# We have to use --root instead of --prefix for setup.py.
+	# Otherwise the python files are not installed properly into site-packages.
+	sed -i -e \
+		's/--prefix=$(DESTDIR)$(prefix)/--root=$(DESTDIR)/g' \
+		language/python/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static) \
+		$(use_enable guile guile-binding) \
+		$(use_enable perl perl-binding) \
+		$(use_enable php php-binding) \
+		$(use_enable python python-binding) \
+		$(use_enable tcl tcl-binding) \
+		$(use_enable doc documentation)
+}
+
+src_install() {
+	# PYTHONDONTWRITEBYTECODE=0 is required, otherwise
+	# installation of the python files is skipped
+	FIRM_DIR=/usr/share/usb
+	emake \
+		DESTDIR="${ED}" \
+		INSTALL_MOD_PATH="${ED}" \
+		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
+		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
+		USB_FIRMWARE_DIR=${FIRM_DIR} \
+		PYTHONDONTWRITEBYTECODE=0 \
+		docdir="/usr/share/doc/${PF}/html" install
+
+	if use perl; then
+		einfo "Installing perl module"
+		cd "${S}"/language/perl || die
+		emake DESTDIR="${ED}" install
+		perl_fix_packlist
+		perl_delete_emptybsdir
+		cd "${S}" || die
+	fi
+
+	echo "KERNEL==\"gpib[0-9]*\",	MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
+	udev_dorules 99-gpib.rules
+
+	dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
+
+	insinto /etc
+	newins util/templates/gpib.conf gpib.conf
+	newins util/templates/gpib.conf gpib.conf.example
+
+	if use pcmcia; then
+		insinto /etc/pcmcia
+		doins "${S}"/etc/pcmcia/*
+	fi
+
+	# fix rules files
+	local f
+	find "${ED}$(get_udevdir)"/rules.d -type f -print0 | while read -rd '' f ; do
+		grep -q "${ED}" "${f}" && einfo "File ${f} contains a temporary path, fixing."
+		sed -i -e "s:${ED}:/:g" "${f}"
+	done
+
+	DOC_CONTENTS="
+As the udev rules were changed and refactored in this release it is
+necessary to remove any manually installed pre-4.3.0 gpib udev rules files
+in /etc/udev/rules.d/. The files to remove are:
+\n
+	99-agilent_82357a.rules\n
+	99-gpib-generic.rules\n
+	99-ni_usb_gpib.rules\n
+\n
+You need to run the 'gpib_config' utility to setup the driver before
+you can use it. In order to do it automatically you can add to your
+start script something like this (supposing the appropriate driver
+is loaded on the startup):
+\n
+		gpib_config --minor 0
+\n
+To give a user access to the computer's gpib board you will have to add
+them to the group 'gpib' or, you could change the permissions on the device
+files /dev/gpib[0-15] to something you like better, using 'chmod'
+\n
+Edit /etc/gpib.conf to match your interface board, and any devices you wish
+to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for
+more information.
+\n
+"
+
+	if use pcmcia; then
+		DOC_CONTENTS+='
+For PCMCIA cards:\n
+All files needed for a PCMCIA board were copied to /etc/pcmcia.
+You may wish to edit the options passed to the gpib_config call in the
+/etc/pcmcia/linux-gpib-pcmcia script.
+You may need to send a SIGHUP signal to the cardmgr daemon to force it
+to reload the files in /etc/pcmcia \(alternatively you could use your
+pcmcia init.d script to restart the cardmgr, or you could just reboot\).
+The driver module will be loaded as needed by the cardmgr.
+
+'
+	fi
+
+	if use firmware; then
+		DOC_CONTENTS+='
+For Agilent \(HP\) 82341C and 82341D cards:
+The firmware for these boards is uploaded by passing the appropriate
+firmware file from /usr/share/linux-gpib/hp_82341 directory to
+gpib_config using the -I or --init-data command line option. Example:\n
+gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin
+'
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sci-libs/lis/Manifest b/sci-libs/lis/Manifest
index 1a83f9863050..ec1e0937b9da 100644
--- a/sci-libs/lis/Manifest
+++ b/sci-libs/lis/Manifest
@@ -1,4 +1,4 @@
 AUX lis-1.6.2-autotools.patch 14903 BLAKE2B 9e9e0cb511989f3ef1164632bb460fb331ac4a5e11be0d1ae9cf91519107943d1d441008f3d7c2a4f0ad96acb1edc4fbe17f0dd796181f263a43375f5546137c SHA512 a9483fac16ab9b384bb06a80ff11fd6cd717100517d9f9af639cb2984a26774fdfe7233b0eb9b2602a8ba0aaf34969c9fa7267d5f4bbc8e11dc872245c74b389
 DIST lis-1.6.5.tar.gz 3130045 BLAKE2B 34627d7e310000a2b3acbbc5f11bd163b682224e42dc521adea318a69587e663e59c8296806f6271e8c39062a16bd6c3c24cda5b183bec41f2aba1be09f77a47 SHA512 0cd2fc445c6464490f01def99960f33bbde53b45b453e289edbc9f31b7a20f00d70538bd3feb03324b56ddbc5993d8ba3bfbc8a0574809be08a854c05c097f13
-EBUILD lis-1.6.5.ebuild 1573 BLAKE2B c5d90167e27cdae9a862824384bf1867d3fe0a2039aa0e2d1d4890e46cb1736a007d2502707b7161d423c4c579bd35f90088a2b0894978a04dfe5b8a984dbb4d SHA512 e6369b183eaea1ff9798255d28fc68703a7240a8c75cec5f5164a5ec375d9131744e5e4db0bef286cc7f9e452d9792df4905d5f2230d70079830213523e349f9
+EBUILD lis-1.6.5.ebuild 1334 BLAKE2B 3513def989910cf23c22e604c00aa04f85d7f209b368f2ab2ae99c8f4157e5313525c2e15beecb74dd40a4dfbfe31a6dcf133d42e23bcc86015da84451a3080c SHA512 f6ba6c86a3e655b56595b263ee95a714879711c2c4582fd1777c320d9cefc492854f7633829e12c56474a8a7e6371131de7bd0e877a795696d9def5c70364525
 MISC metadata.xml 696 BLAKE2B 84421b7e9c65c2054f46733ea170e2cda4d7f1d4796431096f972074aee4622ab2a566cd3ae3c4b1dce1cf072532ff793ac37472bde0e6c4604bc4e8bc875f3f SHA512 2a929f38e7a3669aef46eaf086b434c63161126a9335eb1e9b25c91b4ac465e2693bdd778a05c0731a784404e5ede7f8778dc375369ef1c2775388b1b666f75b
diff --git a/sci-libs/lis/lis-1.6.5.ebuild b/sci-libs/lis/lis-1.6.5.ebuild
index 75c41a7dd9e8..27d638831af1 100644
--- a/sci-libs/lis/lis-1.6.5.ebuild
+++ b/sci-libs/lis/lis-1.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,21 +19,12 @@ DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.6.2-autotools.patch )
 
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		if ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected compiler"
-
-			if tc-is-clang; then
-				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
-				ewarn "which you will need to build ${CATEGORY}/${PN} with USE=\"openmp\""
-			fi
-
-			die "need openmp capable compiler"
-		fi
-		FORTRAN_NEED_OPENMP=1
-	fi
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
 
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp && FORTRAN_NEED_OPENMP=1
 	use fortran && fortran-2_pkg_setup
 }
 
diff --git a/sci-libs/m4ri/Manifest b/sci-libs/m4ri/Manifest
index 4e8da3a90b2b..5fdac4fe8540 100644
--- a/sci-libs/m4ri/Manifest
+++ b/sci-libs/m4ri/Manifest
@@ -1,3 +1,3 @@
 DIST m4ri-20200125.tar.gz 511132 BLAKE2B 637dbf7f17b84dc5fc91c9d8f501fa223cfacd687cb953ce3b9c4716e9a6d39318ef168c2ec8a4b5eeb469a4b46abbcd8802aaf694991d82deb20c832843c3ab SHA512 212ea58a93b792c1901f62411b06cd1a2ee60b3506c987e45ded73c146f2fa6baf5461b1dcabf31a5771ab5a44eab050d64714f7a5fca3df2d141d0d80c6c51a
-EBUILD m4ri-20200125.ebuild 1156 BLAKE2B 57c77e1d4b1314d2f3b1e2886a2a8173285d6bfc6eb92b2a162ab57d646b17185830e4f878c2c56d863a705265aa94c98f123051ce09efd492b193673f384f0f SHA512 5e9d34aaca2ad3f99edcd13a3525a9f9e0fb7692c8cdf3c08c3af4ef3ef5e8fa8998d87861c8739727b2f2fe6914658ef0dafcb8a2e9ef8c792a6ad008ac7f98
+EBUILD m4ri-20200125.ebuild 1270 BLAKE2B 0bfd62cfa0c6eb44e8d168a45fa27823263f47a6258e80029b268a1297f8b5eea705808f954b338fa79124b150a6862ed0a40c63951880ed065dab8d608a18ec SHA512 75136a2e4943fc4f20ea601218e4649ccb082aab18f28b9cf2bcc624c18adcd313504eb4b2f4f3fc7db15009e26765fb8d0d2aa275a19dbf93c56924468c72cb
 MISC metadata.xml 1190 BLAKE2B 57ec862b1b1d29fedbdb9f75fd560e24fa0494afc168ae9894219aeccc890fc77f6909a2f9b241122b51bb438bf6774b8d1b77444051095d18e1dbe62a5a5f0e SHA512 f756e8d2a9c5bf44763933eb09c00a058b88d88120553809618f5c927e39a7fe8c19fd7342206eea97474a6d596959493a8390bff39ad032890dfa2d4a49a7e5
diff --git a/sci-libs/m4ri/m4ri-20200125.ebuild b/sci-libs/m4ri/m4ri-20200125.ebuild
index 3dfda8659c37..ae6db04b9138 100644
--- a/sci-libs/m4ri/m4ri-20200125.ebuild
+++ b/sci-libs/m4ri/m4ri-20200125.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
@@ -23,7 +23,11 @@ RDEPEND="${DEPEND}"
 DOCS=( AUTHORS )
 
 pkg_pretend() {
-	use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_configure() {
diff --git a/sci-libs/miopen/Manifest b/sci-libs/miopen/Manifest
index eab02baef5f1..5526cc592151 100644
--- a/sci-libs/miopen/Manifest
+++ b/sci-libs/miopen/Manifest
@@ -4,6 +4,11 @@ AUX miopen-4.3.0-enable-test.patch 1046 BLAKE2B a9a103eee9b3b6890c02349f36dba7c4
 AUX miopen-4.3.0-fix-interface-include-in-HIP_COMPILER_FLAGS.patch 954 BLAKE2B 11f260c1ab9dd1569cf25363626e6431615f8853f334b0123d82b0e3404dcdb1b4ecd9e26658e2f39e4fa6a15ba672cb6940b0279e0ef22535e46992721fd060 SHA512 28724e7e1c1de5cee2d18b6c3da76fa857f95aee64a286262c8426149787f62d07f4a3892472cef91d3c091ec53c7f474a70616ce63e5fbbb4c531ed2ab91a50
 AUX miopen-4.3.0-no-strip.patch 530 BLAKE2B 7706c0cfb7497a116f1a8a30735615254c907b6a11af243aa2d4945c54fdfb117d6196f0b1fa38163d00d8c7313653cec6342464bde9bf120ccfaf1d795aa374 SHA512 feb4181dbde51a41702450ae7f09231d6a24d94d4a93085250ae07c511d24f45b0149e78ee782b222b6a76e7cfde920598084188a6bcc634875b0fc5979bb708
 AUX miopen-4.3.0-strip-xnack-in-flags.patch 1032 BLAKE2B 6cd0d65676edd394e8b8e06c3ec2a7e7bd16888c81f017f1608db7f658166c6354afc26eb71f70f1a94191ed49a87bc17263ef57b61c74bbace82a51e5dc11ec SHA512 d266707d57b7d05124e808c7ba10d7487a6c07a38285927270eb117422c761e3e382a56401a5f1527177e62fb43fe280e365c823969079842766b345dc0b5747
+AUX miopen-5.0.2-gfx1031.patch 11488 BLAKE2B 25b3136015309e8a06de6fcac7864f90d146beb50674db9810ed568b1ff1e8a761bf3a2a96f74ca4e215c1c670df0fcf09bb60c51d54122a063c8c8ee4059ebf SHA512 ebc1fb32aeef147366440e4ded002a833cc2f7b621b5cb2059ec5b3cc5786167c3f5955d04b0e6e3d9cfab86fe6f414e2e74a15db0090429fd97be3671c7445c
+AUX miopen-5.0.2-no-strip.patch 670 BLAKE2B 20a9c14b5df7d1d964ade240fc5c77ff3d119bded10f3b60e6bb17b98db116d3b7e954a6fb9ff6b5bf47243ca0e2c6160e63f27113a0663ee62eeac438c50f8d SHA512 342238b750bdf8210ccb6fc2e4839ce8d236efeec8bbf23b8fb70b0e31027aac39a8f443f0a38835d59365bc9d55bb0ecb210695c9c6488cd8e765c42754b674
+AUX miopen-5.0.2-strip-xnack-in-flags.patch 1205 BLAKE2B d1ba065387050b51288dba37631adea42398b2f7cd8b604e5c305d3491fb661dce8c448e31db42c70f8b6e4dec84c4214ce869dd1419eb67c2ea4c33f18849b5 SHA512 ad32335831c7d1057b53469aa2d1f8f3366b23ccdc71cb7e9a4e7813e7da7e9bb73e62465f1086391653538ccbab2f662baf2446e10e8dbc0f0db631d7368a4d
 DIST MIOpen-4.3.0.tar.gz 59405686 BLAKE2B fe91bd91a74023866883d6d0a2a8071a8fe40c4cff2fb4ef58fc6e343a05ac2a731f73e657f4d183ade4e5b7c1fbbe41f3f032918f6e50cb713073aee8d97dc5 SHA512 a8615b7738acfbc7f68d9417b0746c62630d2b48fb8485fafba4db65a4b277a8230f601d249d7e54f89ba25c14176429ca76ad8365a437b09d836b031b0c4fbb
+DIST MIOpen-5.0.2.tar.gz 76294827 BLAKE2B 7b2a1f0e675793aee4a0fa2a270caac8332cda36c8f04cee483cc2882ed987b6e676e9c24a1acf4976a16a10f922b1a6263470b419aa88a29cfcb6d6d4b4cc29 SHA512 a581b45220797904db3e4dd3840f2ef96085f00baf8187c5ab574325a66da4f599dee6496457bb1cc32825b57a13fb0ef35a2ef1bd2a5f449c7e7b9fa64b27d1
 EBUILD miopen-4.3.0.ebuild 2207 BLAKE2B 832fd084293d879ed5e71ff61c4c68fc268c38bbae73498355029e7d7e555ed1e216e9177f48fcd3bcdea8ff88a90cbc43c15663f9fcb9ed89fb4e2eada4aa26 SHA512 1a87523a8ee9fd56eee6c7936d28ef8cd6ec491c20a0cfdcba638b820b88f708de5c6add56fee9b08930537c5c7c5eb9c354bf2fc3d8d2f6ce51c599c71fee39
+EBUILD miopen-5.0.2.ebuild 2228 BLAKE2B 7a1c18be68ff73b09fd7f0f22ad868462d7ab35c25f32ca939cb79ebb8726a80f9187611a50eb6b1c806908e438b6e174064dd19544cede5b26cb6aa6c684fed SHA512 f3c49585ad9ca9374bfc28007466a9a787bc0945acd64c09adfe3b686a6d440fb269cc8d76b2ce48893a9ea817617d6a50739610e366ed9a50d97d7717d5c321
 MISC metadata.xml 453 BLAKE2B 4c1e76cbc277e93a92a95cda405973cc72863882ab9a6729a07976e7815119e985688387c14fc5017fd6e85aaa64eaa72b900375c7f7428eb6bbb2569c5ecaa6 SHA512 0e42066a5ac8720d1b561bcf23269013d9cceff52a9ddd6a6e0af58c7d2628c335bb290e0dc6c262a0542e286f54fd07cb487dd908343fac5cfca07410df6e56
diff --git a/sci-libs/miopen/files/miopen-5.0.2-gfx1031.patch b/sci-libs/miopen/files/miopen-5.0.2-gfx1031.patch
new file mode 100644
index 000000000000..15ac67bd3cef
--- /dev/null
+++ b/sci-libs/miopen/files/miopen-5.0.2-gfx1031.patch
@@ -0,0 +1,241 @@
+Index: MIOpen-rocm-5.0.2/src/include/miopen/solver/implicitgemm_util.hpp
+===================================================================
+--- MIOpen-rocm-5.0.2.orig/src/include/miopen/solver/implicitgemm_util.hpp
++++ MIOpen-rocm-5.0.2/src/include/miopen/solver/implicitgemm_util.hpp
+@@ -478,7 +478,7 @@ static inline bool is_use_amd_buffer_loa
+ {
+ #if WORKAROUND_MIOPEN_ISSUE_557
+     const auto device_name = ctx.GetStream().GetDeviceName();
+-    return !StartsWith(device_name, "gfx1030");
++    return !StartsWith(device_name, "gfx1030") && !StartsWith(device_name, "gfx1031");
+ #else
+     return true;
+ #endif
+@@ -487,7 +487,7 @@ static inline bool is_use_amd_buffer_loa
+ static inline bool is_use_v_fmac_f32(const ConvolutionContext& ctx)
+ {
+     const auto device_name = ctx.GetStream().GetDeviceName();
+-    return StartsWith(device_name, "gfx1030");
++    return StartsWith(device_name, "gfx1030") || StartsWith(device_name, "gfx1031");
+ }
+ 
+ static inline bool support_amd_buffer_atomic_fadd(const std::string& device_name)
+@@ -608,7 +608,8 @@ static inline bool IsComposableKernelSup
+            StartsWith(c.GetStream().GetDeviceName(), "gfx906") ||
+            StartsWith(c.GetStream().GetDeviceName(), "gfx908") ||
+            StartsWith(c.GetStream().GetDeviceName(), "gfx90a") ||
+-           StartsWith(c.GetStream().GetDeviceName(), "gfx1030");
++           StartsWith(c.GetStream().GetDeviceName(), "gfx1030")||
++           StartsWith(c.GetStream().GetDeviceName(), "gfx1031");
+ }
+ 
+ // greatest common divisor, aka highest common factor
+Index: MIOpen-rocm-5.0.2/src/kernels/batchnorm_functions.h
+===================================================================
+--- MIOpen-rocm-5.0.2.orig/src/kernels/batchnorm_functions.h
++++ MIOpen-rocm-5.0.2/src/kernels/batchnorm_functions.h
+@@ -159,6 +159,10 @@
+ #define MIO_BN_GFX1030 0
+ #endif
+ 
++#ifndef MIO_BN_GFX1031
++#define MIO_BN_GFX1031 0
++#endif
++
+ #define UNUSED __attribute__((__unused__))
+ 
+ #if(MIO_BN_VARIANT != 4)
+Index: MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormActivBwdPerAct.cl
+===================================================================
+--- MIOpen-rocm-5.0.2.orig/src/kernels/MIOpenBatchNormActivBwdPerAct.cl
++++ MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormActivBwdPerAct.cl
+@@ -34,7 +34,7 @@
+ #endif
+ 
+ #define MIOPEN_USE_AMDGCN 0
+-#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
++#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
+ #undef MIOPEN_USE_AMDGCN
+ #define MIOPEN_USE_AMDGCN 1
+ #endif
+Index: MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormActivBwdSpatial.cl
+===================================================================
+--- MIOpen-rocm-5.0.2.orig/src/kernels/MIOpenBatchNormActivBwdSpatial.cl
++++ MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormActivBwdSpatial.cl
+@@ -32,7 +32,7 @@
+ #endif
+ 
+ #define MIOPEN_USE_AMDGCN 0
+-#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
++#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
+ #undef MIOPEN_USE_AMDGCN
+ #define MIOPEN_USE_AMDGCN 1
+ #endif
+Index: MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormActivFwdTrainSpatial.cl
+===================================================================
+--- MIOpen-rocm-5.0.2.orig/src/kernels/MIOpenBatchNormActivFwdTrainSpatial.cl
++++ MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormActivFwdTrainSpatial.cl
+@@ -33,7 +33,7 @@
+ #endif
+ 
+ #define MIOPEN_USE_AMDGCN 0
+-#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
++#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
+ #undef MIOPEN_USE_AMDGCN
+ #define MIOPEN_USE_AMDGCN 1
+ #endif
+Index: MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormBwdSpatial.cl
+===================================================================
+--- MIOpen-rocm-5.0.2.orig/src/kernels/MIOpenBatchNormBwdSpatial.cl
++++ MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormBwdSpatial.cl
+@@ -33,7 +33,7 @@
+ #endif
+ 
+ #define MIOPEN_USE_AMDGCN 0
+-#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
++#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
+ #undef MIOPEN_USE_AMDGCN
+ #define MIOPEN_USE_AMDGCN 1
+ #endif
+Index: MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormFwdTrainSpatial.cl
+===================================================================
+--- MIOpen-rocm-5.0.2.orig/src/kernels/MIOpenBatchNormFwdTrainSpatial.cl
++++ MIOpen-rocm-5.0.2/src/kernels/MIOpenBatchNormFwdTrainSpatial.cl
+@@ -33,7 +33,7 @@
+ #endif
+ 
+ #define MIOPEN_USE_AMDGCN 0
+-#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
++#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
+ #undef MIOPEN_USE_AMDGCN
+ #define MIOPEN_USE_AMDGCN 1
+ #endif
+Index: MIOpen-rocm-5.0.2/src/md_graph.cpp
+===================================================================
+--- MIOpen-rocm-5.0.2.orig/src/md_graph.cpp
++++ MIOpen-rocm-5.0.2/src/md_graph.cpp
+@@ -738,8 +738,8 @@ void FusionMDGraph::InitConv(FusionMDGra
+ 
+             add_v21_wino("gfx9", {"gfx900", "gfx906", "gfx908", "gfx90a"}, 1);
+             add_v21_wino("gfx9", {"gfx900", "gfx906", "gfx908", "gfx90a"}, 2);
+-            add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030"}, 1);
+-            add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030"}, 2);
++            add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030", "gfx1031"}, 1);
++            add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030", "gfx1031"}, 2);
+         }
+     }
+ 
+Index: MIOpen-rocm-5.0.2/src/ocl/fusionopbiasbnactivocl.cpp
+===================================================================
+--- MIOpen-rocm-5.0.2.orig/src/ocl/fusionopbiasbnactivocl.cpp
++++ MIOpen-rocm-5.0.2/src/ocl/fusionopbiasbnactivocl.cpp
+@@ -392,7 +392,8 @@ miopenStatus_t BatchNormBwdTrainFusionOp
+            " -DMIO_BN_USESAVED=" + std::to_string(static_cast<int>(true)) +
+            " -DMIO_BN_VARIANT=" + std::to_string(variant) +
+            " -DMIO_BN_CBA_WRITE_INTERMEDIATE=" + std::to_string(0) +
+-           " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0");
++           " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0") +
++           " -DMIO_BN_GFX1031=" + ((handle.GetDeviceName() == "gfx1031") ? "1" : "0");
+ 
+     compile_config += add;
+     MIOPEN_LOG_I2(add);
+@@ -607,7 +608,8 @@ miopenStatus_t BatchNormFwdTrainFusionOp
+            " -DMIO_SAVE_MEAN_VARIANCE=" + (saveBatchStats ? "1" : "0") +
+            " -DMIO_RUNNING_RESULT=" + ((savePopStats) ? "1" : "0") +
+            " -DMIO_BN_VARIANT=" + std::to_string(variant) +
+-           " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0");
++           " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0") +
++           " -DMIO_BN_GFX1031=" + ((handle.GetDeviceName() == "gfx1031") ? "1" : "0");
+ 
+     compile_config += add;
+     MIOPEN_LOG_I2(add);
+Index: MIOpen-rocm-5.0.2/src/target_properties.cpp
+===================================================================
+--- MIOpen-rocm-5.0.2.orig/src/target_properties.cpp
++++ MIOpen-rocm-5.0.2/src/target_properties.cpp
+@@ -54,6 +54,7 @@ static std::string GetDeviceNameFromMap(
+         {"Vega10", "gfx900"},
+         {"gfx901", "gfx900"},
+         {"10.3.0 Sienna_Cichlid 18", "gfx1030"},
++        {"10.3.1 Navi_flounder 18", "gfx1031"},
+     };
+ 
+     const char* const p_asciz = miopen::GetStringEnv(MIOPEN_DEBUG_ENFORCE_DEVICE{});
+Index: MIOpen-rocm-5.0.2/test/CMakeLists.txt
+===================================================================
+--- MIOpen-rocm-5.0.2.orig/test/CMakeLists.txt
++++ MIOpen-rocm-5.0.2/test/CMakeLists.txt
+@@ -37,6 +37,7 @@ option( MIOPEN_TEST_GFX908 "Test on MI10
+ option( MIOPEN_TEST_GFX90A "Test on gfx90a" OFF )
+ option( MIOPEN_TEST_VEGA "Test on Vega10/20 (gfx900, gfx906)" OFF )
+ option( MIOPEN_TEST_GFX1030 "Test on Navi21 (gfx1030)" OFF )
++option( MIOPEN_TEST_GFX1031 "Test on Navi21 (gfx1031)" OFF )
+ option( MIOPEN_TEST_GPU_XNACK_ENABLED "Test as if XNACK mode is enabled" OFF )
+ option( MIOPEN_TEST_CONV Off)
+ option( MIOPEN_TEST_DEEPBENCH Off)
+@@ -74,7 +75,7 @@ endif()
+ # Also we do not detect GPU when target GPU for testing is specified explicitly.
+ set(MIOPEN_TEST_GPU_DETECTION_FAILED FALSE)
+ set(MIOPEN_NO_GPU FALSE)
+-if(NOT (MIOPEN_TEST_VEGA OR MIOPEN_TEST_GFX908 OR MIOPEN_TEST_GFX90A OR MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_HIP_NOGPU))
++if(NOT (MIOPEN_TEST_VEGA OR MIOPEN_TEST_GFX908 OR MIOPEN_TEST_GFX90A OR MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031 OR MIOPEN_TEST_HIP_NOGPU))
+     find_program(ROCMINFO
+         NAMES rocminfo
+         PATHS
+@@ -96,6 +97,8 @@ if(NOT (MIOPEN_TEST_VEGA OR MIOPEN_TEST_
+         elseif (NOT ROCMINFO_EXIT_STATUS EQUAL 0)
+             message(WARNING "ROCMINFO FAILED, GPU TYPE UNKNOWN. Manually set respective MIOPEN_TEST_GFX* CMake variable to specify target GPU for testing.")
+             set(MIOPEN_TEST_GPU_DETECTION_FAILED TRUE)
++        elseif(ROCMINFO_OUTPUT MATCHES "gfx1031")
++            set(MIOPEN_TEST_GFX1031 ON)
+         elseif(ROCMINFO_OUTPUT MATCHES "gfx1030")
+             set(MIOPEN_TEST_GFX1030 ON)
+         elseif(ROCMINFO_OUTPUT MATCHES "gfx900|gfx906")
+@@ -122,6 +125,7 @@ message(STATUS "MIOPEN_TEST_VEGA ${MIOPE
+ message(STATUS "MIOPEN_TEST_GFX908 ${MIOPEN_TEST_GFX908}")
+ message(STATUS "MIOPEN_TEST_GFX90A ${MIOPEN_TEST_GFX90A}")
+ message(STATUS "MIOPEN_TEST_GFX1030 ${MIOPEN_TEST_GFX1030}")
++message(STATUS "MIOPEN_TEST_GFX1031 ${MIOPEN_TEST_GFX1031}")
+ message(STATUS "MIOPEN_TEST_GPU_XNACK_ENABLED ${MIOPEN_TEST_GPU_XNACK_ENABLED}")
+ message(STATUS "MIOPEN_TEST_GPU_DETECTION_FAILED ${MIOPEN_TEST_GPU_DETECTION_FAILED}")
+ 
+@@ -164,10 +168,10 @@ endmacro()
+ set_var_to_condition(WORKAROUND_ISSUE_1187_DEFAULT MIOPEN_TEST_GFX90A AND MIOPEN_TEST_FLOAT)
+ option( WORKAROUND_ISSUE_1187 "" ${WORKAROUND_ISSUE_1187_DEFAULT})
+ 
+-set_var_to_condition(WORKAROUND_ISSUE_1148_DEFAULT MIOPEN_TEST_GFX1030 AND MIOPEN_TEST_FLOAT)
++set_var_to_condition(WORKAROUND_ISSUE_1148_DEFAULT MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031 AND MIOPEN_TEST_FLOAT)
+ option( WORKAROUND_ISSUE_1148 "" ${WORKAROUND_ISSUE_1148_DEFAULT})
+ 
+-set_var_to_condition(WORKAROUND_ISSUE_1334_DEFAULT MIOPEN_TEST_GFX1030 AND MIOPEN_TEST_FLOAT)
++set_var_to_condition(WORKAROUND_ISSUE_1334_DEFAULT MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031 AND MIOPEN_TEST_FLOAT)
+ option( WORKAROUND_ISSUE_1334 "" ${WORKAROUND_ISSUE_1334_DEFAULT})
+ 
+ set_var_to_condition(WORKAROUND_ISSUE_1317_DEFAULT MIOPEN_TEST_OPENCL)
+@@ -216,7 +220,7 @@ if (MIOPEN_NO_GPU)
+             test_pooling3d test_perfdb)
+ endif()
+ 
+-if(MIOPEN_TEST_GFX1030)
++if(MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031)
+     if(WORKAROUND_ISSUE_1053 AND MIOPEN_TEST_ALL)
+         list(APPEND SKIP_TESTS test_lrn_test)
+     endif()
+@@ -443,7 +447,7 @@ endfunction()
+ #   If nothing is specified, the default value is taken.
+ #   Default: FLOAT_ENABLED HALF_DISABLED BF16_DISABLED INT8_DISABLED
+ #
+-# GPU types: VEGA, GFX908, GFX90A, GFX1030
++# GPU types: VEGA, GFX908, GFX90A, GFX1030, GFX1031
+ #   VEGA tests are intended to be run on gfx900 or gfx906.
+ #   The option can be enabled or disabled by using '_ENABLED' and '_DISABLED' suffix.
+ #   If nothing is specified, the default value is taken.
+@@ -574,7 +578,7 @@ function(add_custom_test NAME)
+         set_tests_properties(${NAME} PROPERTIES RUN_SERIAL On)
+     endif()
+ 
+-    if(  (is_vega_check OR is_gfx908_check OR is_gfx1030_check OR is_gfx90a_check)
++	if(  (is_vega_check OR is_gfx908_check OR is_gfx1030_check OR is_gfx1031_check OR is_gfx90a_check)
+      AND is_full_check
+      AND is_xnack_on_check
+      AND (is_miotensile_check AND is_mlir_check)
diff --git a/sci-libs/miopen/files/miopen-5.0.2-no-strip.patch b/sci-libs/miopen/files/miopen-5.0.2-no-strip.patch
new file mode 100644
index 000000000000..a7be67e99578
--- /dev/null
+++ b/sci-libs/miopen/files/miopen-5.0.2-no-strip.patch
@@ -0,0 +1,18 @@
+Don't strip for release. Let portage handle stripping.
+Index: MIOpen-rocm-5.0.2/CMakeLists.txt
+===================================================================
+--- MIOpen-rocm-5.0.2.orig/CMakeLists.txt
++++ MIOpen-rocm-5.0.2/CMakeLists.txt
+@@ -78,12 +78,6 @@ option( BUILD_DEV "Build for development
+ option(MIOPEN_ENABLE_FIN "Enable the fin driver for MIOpen"  OFF)
+ 
+ 
+-# Strip symbols for release
+-if(NOT WIN32 AND NOT APPLE)
+-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+-endif()
+-
+ rocm_setup_version(VERSION 2.15.0)
+ 
+ list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )
diff --git a/sci-libs/miopen/files/miopen-5.0.2-strip-xnack-in-flags.patch b/sci-libs/miopen/files/miopen-5.0.2-strip-xnack-in-flags.patch
new file mode 100644
index 000000000000..14d2c5b9daa5
--- /dev/null
+++ b/sci-libs/miopen/files/miopen-5.0.2-strip-xnack-in-flags.patch
@@ -0,0 +1,20 @@
+if options like :xnack- exists in ${AMDGPU_TARGETS}, CMakeLists cannot handle HIP_COMPILER_FLAGS well
+
+the original regex replace should include :+- so xnack- is stripped as well. Otherwise clang complation at MIOpen runtime will fail.
+
+Signed-off-by: Yiyang Wu <xgreenlandforwyy@gmail.com>
+Index: MIOpen-rocm-5.0.2/CMakeLists.txt
+===================================================================
+--- MIOpen-rocm-5.0.2.orig/CMakeLists.txt
++++ MIOpen-rocm-5.0.2/CMakeLists.txt
+@@ -198,8 +198,8 @@ find_package(hip REQUIRED PATHS /opt/roc
+ message(STATUS "Build with HIP ${hip_VERSION}")
+ target_flags(HIP_COMPILER_FLAGS hip::device)
+ # Remove cuda arch flags
+-string(REGEX REPLACE --cuda-gpu-arch=[a-z0-9]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
+-string(REGEX REPLACE --offload-arch=[a-z0-9]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
++string(REGEX REPLACE --cuda-gpu-arch=[a-z0-9:+-]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
++string(REGEX REPLACE --offload-arch=[a-z0-9:+-]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
+ string(REPLACE "$<LINK_LANGUAGE:CXX>" "1" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
+ string(REPLACE "SHELL:" "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
+ 
diff --git a/sci-libs/miopen/miopen-5.0.2.ebuild b/sci-libs/miopen/miopen-5.0.2.ebuild
new file mode 100644
index 000000000000..1a75457baec2
--- /dev/null
+++ b/sci-libs/miopen/miopen-5.0.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="AMD's Machine Intelligence Library"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/MIOpen"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/MIOpen/archive/rocm-${PV}.tar.gz -> MIOpen-${PV}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/hip
+	>=dev-db/sqlite-3.17
+	dev-libs/ocl-icd
+	dev-util/rocm-clang-ocl:${SLOT}
+	sci-libs/rocBLAS:${SLOT}
+	>=dev-libs/boost-1.72
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dev-libs/half:0/1"
+
+S="${WORKDIR}/MIOpen-rocm-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-disable-no-inline-boost.patch"
+	"${FILESDIR}/${PN}-4.2.0-gcc11-numeric_limits.patch"
+	"${FILESDIR}/${PN}-5.0.2-strip-xnack-in-flags.patch"
+	"${FILESDIR}/${PN}-4.3.0-fix-interface-include-in-HIP_COMPILER_FLAGS.patch"
+	"${FILESDIR}/${PN}-4.3.0-enable-test.patch"
+	"${FILESDIR}/${PN}-5.0.2-no-strip.patch"
+	"${FILESDIR}/${PN}-5.0.2-gfx1031.patch"
+)
+
+src_prepare() {
+	sed -e "s:/opt/rocm/llvm:""${EPREFIX}""/usr/lib/llvm/roc/ NO_DEFAULT_PATH:" \
+		-e "s:/opt/rocm/hip:""${EPREFIX}""/usr/lib/hip/ NO_DEFAULT_PATH:" \
+		-e '/set( MIOPEN_INSTALL_DIR/s:miopen:${CMAKE_INSTALL_PREFIX}:' \
+		-e '/MIOPEN_TIDY_ERRORS ALL/d' \
+		-i CMakeLists.txt || die
+
+	sed -e "/rocm_install_symlink_subdir(\${MIOPEN_INSTALL_DIR})/d" -i src/CMakeLists.txt || die
+	sed -e "/add_test/s:--build \${CMAKE_CURRENT_BINARY_DIR}:--build ${BUILD_DIR}:" -i test/CMakeLists.txt || die
+
+	sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:${EPREFIX}/usr/lib/amdgcn/bitcode:" -i cmake/hip-config.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	if ! use debug; then
+		append-cflags "-DNDEBUG"
+		append-cxxflags "-DNDEBUG"
+		CMAKE_BUILD_TYPE="Release"
+	else
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	export CXX="${EPREFIX}/usr/lib/llvm/roc/bin/clang++"
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DMIOPEN_BACKEND=HIP
+		-DBoost_USE_STATIC_LIBS=OFF
+		-DBUILD_TESTS=$(usex test ON OFF)
+		-DMIOPEN_TEST_ALL=$(usex test ON OFF)
+		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index 00e12bda4510..6050e64e9253 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 1805 BLAKE2B 58f10750c4403c3659c6cedf5fecfc49d950f63c6d4c4993603583c2c42cca6eb975629b818882a008e844ac9eb82f54b4866b747daba3eda95a780434a7becc SHA512 67c452ce1cc88926833d1b28e4ea0805b8bbc85fe0981898e2004ad8d379eec5921a4ba57fea0cc29f816ae8cd02e143474d93b0795d80cb5e5c4aebeac9b65c
-MISC metadata.xml 793 BLAKE2B ea8420472a58d5971fe2766e0a19097f99fdceb59d01961ac6494906b1f279376c86101cb697c26eda2bde3dcf94d14a150e3c9f17f9f337234093c09fd20417 SHA512 8f6a6b2eeab02fd00e8182a69c01f77065d9dc20b2582124f7d58f0b4d8debd9ea1d94581ed52e9cf0b1b2948c984a11f86c385bf55d1e8f559a65d8c8330be0
+EBUILD mpir-3.0.0-r1.ebuild 1802 BLAKE2B f8e160c944066fe4b23d87eb5ed4dd2ff4da9eaf5c4b85c306bc1801f571e6cbcf17ceed9937316880e7d42071fdecdc64857f2cea26b1f05313ede6afdb4869 SHA512 8cf6c27cc2e6eaa7e843150711b8bb006a81b1a4c7367b79e4a4c903c0b37564a1761ff03c649730640ec78e5395b413e09210a337489848f1e7c1ad6f15f186
+MISC metadata.xml 859 BLAKE2B daa9dd3f1bae0f85a5dc4418416efa8ab6a98dd268792db8dcf6e4b376c34c9c5339ea7a16348b465b9bf37e7630bf1a74bcb78e979a3cd2e2f62fdecffe7c95 SHA512 fdb600446c5438e31506832a847e6ef3b2a4c7436ace89a23e2e78c1e14e92dd9ac8c2523eded60752d621e754b742986660b1357d79f2fe0b3f3d5f2f774d44
diff --git a/sci-libs/mpir/metadata.xml b/sci-libs/mpir/metadata.xml
index 069a5c0beaec..926ae4d3740e 100644
--- a/sci-libs/mpir/metadata.xml
+++ b/sci-libs/mpir/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription> 
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription> 
 MPIR is an open source multiprecision integer (bignum) library forked
 from the GMP (GNU Multi Precision) project. It consists of much code
 from past GMP releases, in combination with much original contributed
@@ -14,8 +14,11 @@ code.
 MPIR is constructed by a developer and vendor friendly community of
 professional and amateur mathematicians, computer scientists and
 hobbyists.
-</longdescription>
-  <use>
-    <flag name="cpudetection">Enables runtime cpudetection (useful for bindist, compatability on other CPUs)</flag>
-  </use>
+	</longdescription>
+	<use>
+		<flag name="cpudetection">Enables runtime cpudetection (useful for bindist, compatibility on other CPUs)</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">wbhart/mpir</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/mpir/mpir-3.0.0-r1.ebuild b/sci-libs/mpir/mpir-3.0.0-r1.ebuild
index 3c3622524aac..e5b47d07a8db 100644
--- a/sci-libs/mpir/mpir-3.0.0-r1.ebuild
+++ b/sci-libs/mpir/mpir-3.0.0-r1.ebuild
@@ -6,12 +6,12 @@ EAPI=7
 inherit autotools toolchain-funcs
 
 DESCRIPTION="Library for arbitrary precision integer arithmetic (fork of gmp)"
-HOMEPAGE="http://www.mpir.org/"
-SRC_URI="http://www.mpir.org/${P}.tar.bz2"
+HOMEPAGE="https://www.mpir.org/"
+SRC_URI="https://www.mpir.org/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~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="
@@ -25,12 +25,14 @@ PATCHES=(
 
 src_prepare() {
 	tc-export CC
+
 	default
+
 	# In the same way there was QA regarding executable stacks
 	# with GMP we have some here as well. We cannot apply the
 	# GMP solution as yasm is used, at least on x86/amd64.
 	# Furthermore we are able to patch config.ac.
-	ebegin "Patching assembler files to remove executable sections"
+	einfo "Patching assembler files to remove executable sections"
 	local i
 	for i in $(find . -type f -name '*.asm') ; do
 		cat >> $i <<-EOF || die
@@ -49,7 +51,7 @@ src_prepare() {
 			%endif
 		EOF
 	done
-	eend
+
 	eautoreconf
 }
 
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 5f2e7be4a217..db562270ffa6 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -3,6 +3,9 @@ AUX netcdf-4.7.4-big-endian-test.patch 689 BLAKE2B ab28269ee5922816e7ef7834dddec
 AUX netcdf-4.8.1-big-endian-build.patch 690 BLAKE2B ee79d940d47b69c7628d325b8a4b002942d7198d0a98b7d64a843056f2b0ac8888c9bd6cf37f74f5788a1b075a309c60a9e80a1e072dd1ff45cf3213ad7ffe4d SHA512 e2dcf92063806e56ec02df8a3b2dea97b67ee58768703db2672188d9837188f7bab68a04da2df78b6130c6d87137f8b9974b91d09eab8cd90dba77aadac6ea5e
 DIST netcdf-4.7.4.tar.gz 19711158 BLAKE2B b49532e6f87b458e7f5654f70ec932d6c8c81272c97ce44df3d27bb61b01d3e005f918b959ce12e42e26f7c12309ab72eeb57a35216d20ab5761837db65741a4 SHA512 15922818fdd71be285eb7dd2fc9be2594fe9af979de3ed316465636c7bbdaec65eb151ca57ef8b703e6a360cdba036b8f9bc193ddff01ff7ce4214c0a66efa79
 DIST netcdf-4.8.1.tar.gz 18957280 BLAKE2B 05fc6cd10cb5cbb11dc077b9a884fbc63c4cb840b241e782702da58ad9831fba065a6f1e97c2be092437735d39658482285850a00618d0582d6e4728d64c4402 SHA512 c97207867abf10d414abf34624268710f5b812c26c38f97e73afe00558b3f07917331fbc7fdb9e70b09813acf15a9a09bae2c432a3266ce10a791b9472f87a42
+DIST netcdf-4.9.0.tar.gz 19491744 BLAKE2B b669f7ccb2f7a8def9d5b944a97d101ea7b7307d6e1495a97c0966b4ac9722b404d6039dee192da759d14d52259be2ff4f49be3bfb6cbbfac48732684cbff9c3 SHA512 62cb593b99a6e9c56426175d141907572d3974de8dc39549c85337acf410539f9b7dcd9a375808e271da1d0dc93fce7586b955eddd2bb45901d9cc48a72db705
 EBUILD netcdf-4.7.4.ebuild 1703 BLAKE2B 33294c879140f07bce3943cf77ec41b36045dd9df219d0cf1f3784a683b6392a6c3adb5561c6b2f18048379580fd28c6782bea986a5b5f422c5ec103a7c64b13 SHA512 7d6ea028a446b4f0d8a5cfd8b22c15f582722ae3f6f839c28a42e3a45ed9ed7952ff8c3bd5b43471c02ba237d06707d8cba8399e489eb1cb1849a9fa7f3f39d8
 EBUILD netcdf-4.8.1-r1.ebuild 1810 BLAKE2B e73bab3d4748a0e509f5f6bfeae90ac10250744e3cff0bd588b9337a340c177c97cbb424f7880a5285026b997ec378631933979cfe9b4694d41e4244aabf9bb4 SHA512 aae2f847567d803b175ce97a529763f4e1c74e7a5b65fd85ec235b2451ce02c7afabaac2a90bb4904f8068f822ffac5329fefd5108d396788d36bda6968380c3
+EBUILD netcdf-4.8.1-r2.ebuild 2005 BLAKE2B 27ddd0dfc01e7ba32d889efb9085c9b16f4cdd076e860c2734ad78397d562c3eb2e1a231449983b5817968efe211ced789f0624d621d257c565ca362a02b1a3d SHA512 3672c96fca8d1d60f1757192d4d39cb0d0a5f57fe8e102de1a4bfc16449c478ae9c7fb2aeb42b669241c269d9dbd1cdba6712cfbcd52d595cc7bbdf733b0eedd
+EBUILD netcdf-4.9.0.ebuild 1798 BLAKE2B 96a50cc2fc982431cd12f210f91fe49f6d0ba33c7750f868ff7e4ca3370ada3c8e2cf69c758df577b2d9ab466927071f80a4917671596accfa44f6bcaa7fe8c6 SHA512 705c6306a510b8748f9e4b8215f9f311df8e724c4c7769c7dc2417a878fde5152d2c22b361b00810f3bd564e53259ec7784c4e16e1560dd1f3621d20f149c1a4
 MISC metadata.xml 1065 BLAKE2B 7e661019c6f97a0720a45cc93a59079834135a1994ab9abd90b769dec892c4b0ad60f09b87b6e15ceda6ee99f289a992ca8315a1d168a3eec6d50d09b6de1273 SHA512 fe82704383f8021a861936927fc9a1450257433d6589f1b4bfef3fd0527b912543813ff8d66c6fe33d98cb7a16bcbcb26149df8d809f92fa2e48c6fb83c8455b
diff --git a/sci-libs/netcdf/netcdf-4.8.1-r2.ebuild b/sci-libs/netcdf/netcdf-4.8.1-r2.ebuild
new file mode 100644
index 000000000000..d4e17743df68
--- /dev/null
+++ b/sci-libs/netcdf/netcdf-4.8.1-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Scientific library and interface for array oriented data access"
+HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
+SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+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"
+IUSE="+dap doc examples hdf +hdf5 mpi szip test tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/libxml2
+	dap? ( net-misc/curl:0= )
+	hdf? (
+		media-libs/libjpeg-turbo:=
+		sci-libs/hdf:0=
+		sci-libs/hdf5:0=
+	)
+	hdf5? ( sci-libs/hdf5:0=[hl(+),mpi=,szip=,zlib] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+REQUIRED_USE="
+	test? ( tools )
+	szip? ( hdf5 )
+	mpi? ( hdf5 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.1-big-endian-build.patch"
+	"${FILESDIR}/${PN}-4.7.4-big-endian-test.patch"
+)
+
+src_prepare() {
+	# skip test that requires network
+	sed -i -e '/run_get_hdf4_files/d' hdf4_test/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	use mpi && export CC=mpicc
+
+	# Temporary workaround for test breakage
+	# https://github.com/Unidata/netcdf-c/issues/1983
+	# bug #827042
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		-DENABLE_DAP_REMOTE_TESTS=OFF
+		# Enable for >4.8.1 (not yet in a release)
+		#-DENABLE_LIBXML2=ON
+		-DBUILD_UTILITIES=$(usex tools)
+		-DENABLE_DAP=$(usex dap)
+		-DENABLE_DOXYGEN=$(usex doc)
+		-DENABLE_EXAMPLES=$(usex examples)
+		-DENABLE_HDF4=$(usex hdf)
+		-DENABLE_NETCDF_4=$(usex hdf5)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# fails parallel tests: bug #621486
+	cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	# bug #827188
+	sed -i -e "s:${EPREFIX}/usr/$(get_libdir)/libdl.so;:dl;:" "${ED}/usr/$(get_libdir)/cmake/netCDF/netCDFTargets.cmake" || die
+}
diff --git a/sci-libs/netcdf/netcdf-4.9.0.ebuild b/sci-libs/netcdf/netcdf-4.9.0.ebuild
new file mode 100644
index 000000000000..8ffc629f18a2
--- /dev/null
+++ b/sci-libs/netcdf/netcdf-4.9.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Scientific library and interface for array oriented data access"
+HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
+SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+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"
+IUSE="+dap doc examples hdf +hdf5 mpi szip test tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/libxml2
+	dap? ( net-misc/curl:= )
+	hdf? (
+		media-libs/libjpeg-turbo:=
+		sci-libs/hdf:=
+		sci-libs/hdf5:=
+	)
+	hdf5? ( sci-libs/hdf5:=[hl(+),mpi=,szip=,zlib] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+REQUIRED_USE="
+	test? ( tools )
+	szip? ( hdf5 )
+	mpi? ( hdf5 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.4-big-endian-test.patch
+)
+
+src_configure() {
+	use mpi && export CC=mpicc
+
+	# Temporary workaround for test breakage
+	# https://github.com/Unidata/netcdf-c/issues/1983
+	# bug #827042
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		-DENABLE_DAP_REMOTE_TESTS=OFF
+		#-DENABLE_HDF4_FILE_TESTS=OFF
+		-DENABLE_LIBXML2=ON
+		-DBUILD_UTILITIES=$(usex tools)
+		-DENABLE_DAP=$(usex dap)
+		-DENABLE_DOXYGEN=$(usex doc)
+		-DENABLE_EXAMPLES=$(usex examples)
+		-DENABLE_HDF4=$(usex hdf)
+		-DENABLE_NETCDF_4=$(usex hdf5)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Fails parallel tests: bug #621486
+	cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	# bug #827188
+	sed -i -e "s:${EPREFIX}/usr/$(get_libdir)/libdl.so;:dl;:" "${ED}/usr/$(get_libdir)/cmake/netCDF/netCDFTargets.cmake" || die
+}
diff --git a/sci-libs/nfft/Manifest b/sci-libs/nfft/Manifest
index 4feae49ae8ce..85a0f6095455 100644
--- a/sci-libs/nfft/Manifest
+++ b/sci-libs/nfft/Manifest
@@ -1,3 +1,3 @@
 DIST nfft-3.5.2.tar.gz 5377870 BLAKE2B 5a9b79fd2db781f163f3e694e25096f9abfac67ae9e2f0614444e99160ac6ce150356b72130ba44f82c541120f8876723a06e989a5c125e1da1b85976b7ff500 SHA512 e5437b358f22807de2251527025accf326d77322e029cfc3df6ee733ccca4d020cbd3c045773735de0641618c71e5cc9b8f4df53becea3b7a7e27750f21fa64e
-EBUILD nfft-3.5.2.ebuild 1156 BLAKE2B 05598b4f826a66a98ad47833f50068b2f1d77b9203db8dc1abe44e4e0f0a08b1d39085916a0101bcd072a61376231802367f09259b76812ddca1a9cbd8bb7d89 SHA512 93b8eddfd7c41e50f2c4c1b373b486ea886dd8820ceb733f38230bfb9a0cc8388209cb1eeeac86dfb083ab4dcd5f80ec0c972b1528a491c6918e4312a7531891
+EBUILD nfft-3.5.2.ebuild 915 BLAKE2B 19b9331a9c96181bad3edaf92bdca7b1526f7b3f4df0018e25a8096bf9a1f6b3e66bc666394e9a1c848e1c4d87f04de42376da83958c79cd19ffc9c4abd61e6c SHA512 0d9e0aee237dad6bac189e0223c6895c091f8cb02e158689f619c93cd0e3f055f5c99c8ad7c652bc1f135d1a0917f2f8477d688068972911aa4b9bbdd1c04a43
 MISC metadata.xml 442 BLAKE2B 8326c9a95fc8c57e5f09c401e93e7d5576795d99b348e0fa51d25ca043912c50605655097ce9dc9ea7bf8c6de06b76df05863d30213923bb62ec20f8d7714ace SHA512 0794e58e77382ff8dd951a663a862190b2a0b8fccf12389b46ae181aefd536402bff7d013e09ddc97d210aefbf8e08603acb8e22677b832474a9f62d6fe593e0
diff --git a/sci-libs/nfft/nfft-3.5.2.ebuild b/sci-libs/nfft/nfft-3.5.2.ebuild
index f0ea656c7539..066540701d6c 100644
--- a/sci-libs/nfft/nfft-3.5.2.ebuild
+++ b/sci-libs/nfft/nfft-3.5.2.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
@@ -18,18 +18,11 @@ RDEPEND="sci-libs/fftw:3.0[threads,openmp?]"
 DEPEND="${RDEPEND}"
 
 pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		if ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected compiler"
-
-			if tc-is-clang; then
-				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
-				ewarn "which you will need to build ${CATEGORY}/${PN} with USE=\"openmp\""
-			fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
 
-			die "need openmp capable compiler"
-		fi
-	fi
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_configure() {
diff --git a/sci-libs/nlopt/Manifest b/sci-libs/nlopt/Manifest
index 2bcf88c97164..f6081120bd30 100644
--- a/sci-libs/nlopt/Manifest
+++ b/sci-libs/nlopt/Manifest
@@ -1,3 +1,5 @@
 DIST nlopt-2.6.2.tar.gz 2040229 BLAKE2B f1f4124de574600ddbef8a885bbdd3a4f57b469b2f958ce94bbc831cf9bfa8a845e438fccfe4ab219a73a5675b8d880f6d49e0e7cbe9d0966777b0d2344521d4 SHA512 61e5c01140a57c0ad2a0acd82ad50dce1b5679dc281e55cbbc332e876b19a689013100617545a42b721d8c487df37d6ccd67859171243433fe29468f259b556b
+DIST nlopt-2.7.1.tar.gz 2044180 BLAKE2B 6d459f94a26ee6dd7f72c73c48992bd047150aa525bc4ad088c8516127afc5c7843f6fbb6726c2f845271b87934c13e0892a063362ab50df51f92e81979111fb SHA512 e23cb522fc696010574c14b72be85acc0f8ccf0bf208bf2b8789c57d6c5a6e6d419ee10330581518b1c1567018ae909b626ce7761d4fbd5bf112916871e420e2
 EBUILD nlopt-2.6.2-r1.ebuild 2307 BLAKE2B 9c57f104122725bb2660bde7259ff187256d26cffbb4f0bd399acd2b07dcbac522ea4c83ea2196c84a274fe3c188ee61830e0e09d93505a78df1d74618505364 SHA512 858cc72c427ec512c1ef07619fc44230b1b5fe9b1ca68899341a80c13db7a9a1ac82cc8a8dd3d419a832519739ec672361ee3acdb058f31140df9195101fefd9
+EBUILD nlopt-2.7.1.ebuild 1991 BLAKE2B c3e17104cf44dd3a64fe4a3e2bbcc348b27e4e3d465d1098404317d29a836e8ddb5efa3e443edb86b18250efe2668bdf08107406c6bf2ddce957e864f3dd3c73 SHA512 b94a753fcab605f2549f19d348736cef3a0d9017a71af65fec1b81555286b856ec888a7962ece98c67e03b5e16048c737e1643947eaa2fcd6528791640655991
 MISC metadata.xml 1096 BLAKE2B 2b35b6f79c882fbae26b6bc68c75e30b0e2d48f540696cbbc48f06c2686e89a1a5f582d59d2c1ee3b47d5f813f4dbc20cd1d35228c7f968e327e41bb2f1f4da9 SHA512 5776b4b8faa1a6406f1d65bcd9de9ce4087580d98b5c3272804d442905c34d64c6e7d632022425e6e13b12161c94a99906a6196c3624b5b9b4aa1eac6fe9aa1e
diff --git a/sci-libs/nlopt/nlopt-2.7.1.ebuild b/sci-libs/nlopt/nlopt-2.7.1.ebuild
new file mode 100644
index 000000000000..814c7a1440fc
--- /dev/null
+++ b/sci-libs/nlopt/nlopt-2.7.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit python-r1 cmake fortran-2
+
+DESCRIPTION="Non-linear optimization library"
+HOMEPAGE="https://github.com/stevengj/nlopt"
+SRC_URI="https://github.com/stevengj/nlopt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="cxx guile octave python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	guile? ( dev-scheme/guile:* )
+	octave? ( >=sci-mathematics/octave-6 )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	"
+DEPEND="
+	${RDEPEND}
+	python? ( dev-lang/swig )
+	"
+
+src_prepare() {
+	cmake_src_prepare
+	use python && python_copy_sources
+}
+
+src_configure() {
+	# MATLAB detection causes problems (as in bug 826774) if we don't
+	# explicitly disable it.
+	local mycmakeargs=(
+		-DNLOPT_CXX=$(usex cxx)
+		-DNLOPT_FORTRAN=$(usex test)
+		-DNLOPT_GUILE=$(usex guile)
+		-DNLOPT_OCTAVE=$(usex octave)
+		-DNLOPT_MATLAB=OFF
+		-DNLOPT_PYTHON=$(usex python)
+		-DNLOPT_SWIG=$(usex python)
+		-DNLOPT_TESTS=$(usex test)
+	)
+	if use python; then
+		python_foreach_impl run_in_build_dir cmake_src_configure
+	else
+		cmake_src_configure
+	fi
+}
+
+src_compile() {
+	if use python; then
+		python_foreach_impl run_in_build_dir cmake_src_compile
+	else
+		cmake_src_compile
+	fi
+}
+
+src_test() {
+	do_test() {
+		local a f
+		cd "${BUILD_DIR}"/test
+		for a in {1..$(usex cxx 9 7)}; do
+			for f in {5..9}; do
+				./testopt -a $a -o $f || die "algorithm $a function $f failed"
+			done
+		done
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_test
+	else
+		do_test
+	fi
+}
+
+nlopt_install() {
+	cmake_src_install
+	python_optimize
+}
+
+src_install() {
+	if use python; then
+		python_foreach_impl run_in_build_dir nlopt_install
+	else
+		cmake_src_install
+	fi
+	local r
+	for r in */README; do newdoc ${r} README.$(dirname ${r}); done
+}
diff --git a/sci-libs/onnx/Manifest b/sci-libs/onnx/Manifest
new file mode 100644
index 000000000000..562499923ccd
--- /dev/null
+++ b/sci-libs/onnx/Manifest
@@ -0,0 +1,3 @@
+DIST onnx-1.11.0.tar.gz 9464979 BLAKE2B dfc8ab81d4776f806fa26c751c1eb1e19ea4cf9f0aa498880dc18eca160fdd9c43eda0077124ea7a674082e5ed93de7497411c48c3f9a12146905072e6477af6 SHA512 dc7045702188d7f40fead3ab6eccd8ff63357824c36873b415ad989d19aa952ff2c3758120de9050d84d92a35993198971be54ffa8e8d99fc70aa1b14b2ff73e
+EBUILD onnx-1.11.0-r1.ebuild 812 BLAKE2B 235e44d0b93832979e8adb23cf14a4e024a35985a768ea714545e550e71c87a84f9f46febfbd96ab3b48964f1043623d61eb91880b4db7cc4ddaf0eadc428da0 SHA512 eab613583b0a53e91003863bab53dfd01177ff121d29b6037b91866be1ae6dfcfa33910b5948b17e94b9a917fd7d284a6fdf0bce8e4fc46046a873f380f9b7c9
+MISC metadata.xml 322 BLAKE2B a78b6feffba2cf354154448a0e0cef5e866ec51ff0158939e7a5be1f3c4cb9bb3b29ae88ae06540627946fc3e0f6e9a63ef4d8951385e840a7a87ada99e1d50a SHA512 9d81e8e43822232c8c8cf690b6bdb9939f04adeb9230f8225a5b0b10083f9555304768901c46cc5d29c41038397bbb3b12e0111c3d0443f4c0003e99b99fc50f
diff --git a/sci-libs/onnx/metadata.xml b/sci-libs/onnx/metadata.xml
new file mode 100644
index 000000000000..2a58de7a87a9
--- /dev/null
+++ b/sci-libs/onnx/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">onnx/onnx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/onnx/onnx-1.11.0-r1.ebuild b/sci-libs/onnx/onnx-1.11.0-r1.ebuild
new file mode 100644
index 000000000000..5b2ac804bf1d
--- /dev/null
+++ b/sci-libs/onnx/onnx-1.11.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+inherit python-any-r1 cmake
+
+DESCRIPTION="Open Neural Network Exchange (ONNX)"
+HOMEPAGE="https://github.com/onnx/onnx"
+SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-libs/protobuf"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/patchelf
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DONNX_USE_PROTOBUF_SHARED_LIBS=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	patchelf --set-soname libonnxifi.so "${D}"/usr/lib/libonnxifi.so \
+		|| die
+	mv "${D}"/usr/lib/libonnxifi.so "${D}"/usr/$(get_libdir)/libonnxifi.so \
+		|| die
+}
diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index b2968054a629..333d1056cb60 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -1,9 +1,10 @@
 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
+AUX openblas-0.3.20-fix-loong.patch 5694 BLAKE2B 0d4eb185ead0a47855e411670816aaf52e22530160cc2b29c7eca8a077d7bfb49a501d154c7492a259287efbd6dd24496f53d91cb834a97b2fec441d3dd06cf1 SHA512 1e90165549bc0a441003cf7bc0b1fa3e2af6eaaaad92ab5aca0d3f9569976184cbe653a049c26e81f016cf66152ac9903f619a990f54613fe3f091eb94fd742f
+AUX openblas-0.3.20-fix-riscv.patch 3786 BLAKE2B 5ba65c1f44aa8cd8f1b88458dfe16ef32bfd92260bed2b3b60596a16c9778a94b7c03752f41ad649ba1742c72b7528768fa51fcf30639c2bc0064ad132b0d747 SHA512 aec236b9d6fa9c80cef6401cf43e594cb17c73137cfcc17286046d8d85bb6a5bb6367b808a8b85152313cb596919de0173812832037ba88e4e39b722e4a8d2e1
 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 5733 BLAKE2B 5ec06e96b7a7d2ac7d8cf695380373cc72f041467e3db7af95b89d5102370175e6751b0b78177c80885c453e31b0e1bcc54d6f58c62a2aeb682001c7dc8be433 SHA512 94e07466dcc89cdae7010bf8c643773d80e4393fd106e1dacdae05d907deebd24f877fe9dfb77601a8b32b1b83105031ebea123107010f1d0db32d110e545c5e
+EBUILD openblas-0.3.18.ebuild 5779 BLAKE2B 851a9cb092537a519d15db945762b876d698bbf4bee13cccc1a4fd33daaf22713f36b22c0308340f8355bc0f765661554e1aff4184fbffc0045847972e1ad41d SHA512 0b3cebbd102011506335d5b76becadb5bae701442e3cf3aa13670f775a113c16c998e12d9088ebcff01798e4386fe4c21384d173bf86c29ebc949bc7df5d7f0f
+EBUILD openblas-0.3.19.ebuild 5779 BLAKE2B 851a9cb092537a519d15db945762b876d698bbf4bee13cccc1a4fd33daaf22713f36b22c0308340f8355bc0f765661554e1aff4184fbffc0045847972e1ad41d SHA512 0b3cebbd102011506335d5b76becadb5bae701442e3cf3aa13670f775a113c16c998e12d9088ebcff01798e4386fe4c21384d173bf86c29ebc949bc7df5d7f0f
+EBUILD openblas-0.3.20.ebuild 5882 BLAKE2B 84a0e9f32f6a529ca73a3385914de515ee6cad9def3d54013f08aeb13a6900c4918e0e383fbe6f5e7979370a643287daf405b2fb94101327219d955a5072af62 SHA512 75298d119f27a89c64fbace665917d54838bb27f7bea5aa6e51713b59c1be872f1c970045890cf6a1dbfdc273488264aa1d2b864d227d1031c8f0a81d207fc4b
 MISC metadata.xml 1561 BLAKE2B 5ba7ec66dd8ba7ca8bc29bc0193b48b6a82b4949bb79bab461400040667aa66aac3cfd2ad9c7323798048fd43d18ac96a562d53b68f3f7ae8bf8505ac7a04691 SHA512 05272eb56480ff82b240d0f430df3df03981e24b971dbd37c13d464f4f4b334bac19b54915446a09326a334aa76249bb79a4fa389d26150365f21389992f9a48
diff --git a/sci-libs/openblas/files/openblas-0.3.20-fix-loong.patch b/sci-libs/openblas/files/openblas-0.3.20-fix-loong.patch
new file mode 100644
index 000000000000..2745d26cb3a5
--- /dev/null
+++ b/sci-libs/openblas/files/openblas-0.3.20-fix-loong.patch
@@ -0,0 +1,178 @@
+https://github.com/xianyi/OpenBLAS/pull/3626, rebased on top of v0.3.20.
+
+From: WANG Xuerui <xen0n@gentoo.org>
+Date: Fri, 13 May 2022 15:26:33 +0800
+Subject: [PATCH 1/3] Move LoongArch make rules to Makefile.loongarch64
+
+--- a/Makefile.loongarch64
++++ b/Makefile.loongarch64
+@@ -1,3 +1,4 @@
+-ifdef BINARY64
+-else
++ifeq ($(CORE), LOONGSON3R5)
++CCOMMON_OPT += -march=loongarch64 -mabi=lp64
++FCOMMON_OPT += -march=loongarch64 -mabi=lp64
+ endif
+--- a/Makefile.system
++++ b/Makefile.system
+@@ -886,13 +886,6 @@ ifeq ($(OSNAME), AIX)
+ BINARY_DEFINED = 1
+ endif
+ 
+-ifeq ($(ARCH), loongarch64)
+-ifeq ($(CORE), LOONGSON3R5)
+-CCOMMON_OPT += -march=loongarch64 -mabi=lp64
+-FCOMMON_OPT += -march=loongarch64 -mabi=lp64
+-endif
+-endif
+-
+ endif
+ 
+ ifndef BINARY_DEFINED
+From: WANG Xuerui <xen0n@gentoo.org>
+Date: Fri, 13 May 2022 15:53:22 +0800
+Subject: [PATCH 2/3] Probe for old-world LASX flavor on LoongArch and use
+ generic DGEMM kernel otherwise
+
+See: https://bugs.gentoo.org/844013
+--- a/Makefile.system
++++ b/Makefile.system
+@@ -1683,6 +1683,7 @@ export TARGET_CORE
+ export NO_AVX512
+ export NO_AVX2
+ export BUILD_BFLOAT16
++export NO_LASX
+ 
+ export SBGEMM_UNROLL_M
+ export SBGEMM_UNROLL_N
+--- a/c_check
++++ b/c_check
+@@ -270,6 +270,37 @@ if (($architecture eq "x86") || ($architecture eq "x86_64")) {
+     }
+ }
+ 
++$no_lasx = 0;
++if (($architecture eq "loongarch64")) {
++    eval "use File::Temp qw(tempfile)";
++    if ($@){
++        warn "could not load PERL module File::Temp, so could not check compiler compatibility with the LoongArch LASX extension";
++        # Assume no LASX, because currently LASX is only present in vendor
++        # toolchains, undocumented nor upstreamed.
++        $no_lasx = 1;
++    } else {
++        # Old-world assembly flavor: LASX registers named "$xrNN", different
++        # from the ISA manual which suggests "$xNN". This is the flavor we
++        # currently support.
++        #
++        # As the LASX ISA manual is not out yet, we cannot predict what the
++        # new-world flavor would look like, so do not probe flavor for now.
++        # The compiler flags are also unsuitable for new-world gcc.
++        ($fh,$tmpf) = tempfile( SUFFIX => '.c' , UNLINK => 1 );
++        $code = '"xvld $xr0, $a0, 0\n"';
++        print $fh "int main(void){ __asm__ volatile($code); }\n";
++        $args = " -march=loongarch64 -mabi=lp64 -mlasx -c -o $tmpf.o $tmpf";
++        my @cmd = ("$compiler_name $flags $args >/dev/null 2>/dev/null");
++        system(@cmd) == 0;
++        if ($? != 0) {
++            $no_lasx = 1;
++        } else {
++            $no_lasx = 0;
++        }
++        unlink("$tmpf.o");
++    }
++}
++
+ $c11_atomics = 0;
+ if ($data =~ /HAVE_C11/) {
+     eval "use File::Temp qw(tempfile)";
+@@ -393,6 +424,7 @@ print MAKEFILE "HAVE_MSA=1\n" if $have_msa eq 1;
+ print MAKEFILE "MSA_FLAGS=$msa_flags\n" if $have_msa eq 1;
+ print MAKEFILE "NO_AVX512=1\n" if $no_avx512 eq 1;
+ print MAKEFILE "NO_AVX2=1\n" if $no_avx2 eq 1;
++print MAKEFILE "NO_LASX=1\n" if $no_lasx eq 1;
+ print MAKEFILE "OLDGCC=1\n" if $oldgcc eq 1;
+ 
+ $os           =~ tr/[a-z]/[A-Z]/;
+--- a/kernel/loongarch64/KERNEL.LOONGSON3R5
++++ b/kernel/loongarch64/KERNEL.LOONGSON3R5
+@@ -1,3 +1,7 @@
++ifeq ($(NO_LASX), 1)
++# No LASX support in compiler, unable to consume the optimized version
++# leave out DGEMMKERNEL to pull in the generic version
++else
+ DGEMMKERNEL    = dgemm_kernel_16x4.S
+ DGEMMINCOPY    = dgemm_ncopy_16.S
+ DGEMMITCOPY    = dgemm_tcopy_16.S
+@@ -7,6 +11,7 @@ DGEMMINCOPYOBJ = dgemm_incopy.o
+ DGEMMITCOPYOBJ = dgemm_itcopy.o
+ DGEMMONCOPYOBJ = dgemm_oncopy.o
+ DGEMMOTCOPYOBJ = dgemm_otcopy.o
++endif
+ 
+ DTRSMKERNEL_LN  = ../generic/trsm_kernel_LN.c
+ DTRSMKERNEL_LT  = ../generic/trsm_kernel_LT.c
+From: WANG Xuerui <xen0n@gentoo.org>
+Date: Fri, 13 May 2022 16:23:46 +0800
+Subject: [PATCH 3/3] Fix ABI CFLAGS setting on new-world LoongArch
+
+See: https://bugs.gentoo.org/844013
+--- a/Makefile.loongarch64
++++ b/Makefile.loongarch64
+@@ -1,4 +1,13 @@
+ ifeq ($(CORE), LOONGSON3R5)
+-CCOMMON_OPT += -march=loongarch64 -mabi=lp64
+-FCOMMON_OPT += -march=loongarch64 -mabi=lp64
++CCOMMON_OPT += -march=loongarch64
++FCOMMON_OPT += -march=loongarch64
++
++ifeq ($(LOONGARCH_CC_FLAVOR), NEW)
++CCOMMON_OPT += -mabi=lp64d
++FCOMMON_OPT += -mabi=lp64d
++endif
++ifeq ($(LOONGARCH_CC_FLAVOR), OLD)
++CCOMMON_OPT += -mabi=lp64
++FCOMMON_OPT += -mabi=lp64
++endif
+ endif
+--- a/Makefile.system
++++ b/Makefile.system
+@@ -1683,6 +1683,7 @@ export TARGET_CORE
+ export NO_AVX512
+ export NO_AVX2
+ export BUILD_BFLOAT16
++export LOONGARCH_CC_FLAVOR
+ export NO_LASX
+ 
+ export SBGEMM_UNROLL_M
+--- a/c_check
++++ b/c_check
+@@ -270,6 +270,21 @@ if (($architecture eq "x86") || ($architecture eq "x86_64")) {
+     }
+ }
+ 
++$loongarch_cc_flavor = "";
++if (($architecture eq "loongarch64")) {
++    # Currently there are only 2 flavors: new-world and old-world.
++    # They differ in ABI names accepted, so check it to avoid creating temp
++    # files.
++    $args = " -mabi=lp64d -E -o - /dev/null";
++    my @cmd = ("$compiler_name $flags $args >/dev/null 2>/dev/null");
++    system(@cmd) == 0;
++    if ($? != 0) {
++        $loongarch_cc_flavor = "OLD";
++    } else {
++        $loongarch_cc_flavor = "NEW";
++    }
++}
++
+ $no_lasx = 0;
+ if (($architecture eq "loongarch64")) {
+     eval "use File::Temp qw(tempfile)";
+@@ -424,6 +439,7 @@ print MAKEFILE "HAVE_MSA=1\n" if $have_msa eq 1;
+ print MAKEFILE "MSA_FLAGS=$msa_flags\n" if $have_msa eq 1;
+ print MAKEFILE "NO_AVX512=1\n" if $no_avx512 eq 1;
+ print MAKEFILE "NO_AVX2=1\n" if $no_avx2 eq 1;
++print MAKEFILE "LOONGARCH_CC_FLAVOR=$loongarch_cc_flavor\n" if $architecture eq "loongarch64";
+ print MAKEFILE "NO_LASX=1\n" if $no_lasx eq 1;
+ print MAKEFILE "OLDGCC=1\n" if $oldgcc eq 1;
+ 
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
index 9a14180cb85d..a386a0b38467 100644
--- a/sci-libs/openblas/files/openblas-0.3.20-fix-riscv.patch
+++ b/sci-libs/openblas/files/openblas-0.3.20-fix-riscv.patch
@@ -1,7 +1,6 @@
 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.
@@ -9,12 +8,6 @@ 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
@@ -27,19 +20,11 @@ index ac60eae5b6..1104893b55 100644
  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 @@
@@ -92,8 +77,6 @@ index 0eb50e0018..2aa4217816 100644
    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[]){
diff --git a/sci-libs/openblas/openblas-0.3.18.ebuild b/sci-libs/openblas/openblas-0.3.18.ebuild
index 3ac219fa41cf..ec15a244d0b8 100644
--- a/sci-libs/openblas/openblas-0.3.18.ebuild
+++ b/sci-libs/openblas/openblas-0.3.18.ebuild
@@ -30,6 +30,8 @@ PATCHES=(
 )
 
 pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
 	elog "This software has a massive number of options that"
 	elog "are configurable and it is *impossible* for all of"
 	elog "those to fit inside any manageable ebuild."
@@ -57,7 +59,7 @@ pkg_setup() {
 	export HOSTCC="$(tc-getBUILD_CC)"
 
 	# threading options
-	use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 	USE_THREAD=0
 	if use openmp; then
 		USE_THREAD=1; USE_OPENMP=1;
diff --git a/sci-libs/openblas/openblas-0.3.19.ebuild b/sci-libs/openblas/openblas-0.3.19.ebuild
index 3ac219fa41cf..ec15a244d0b8 100644
--- a/sci-libs/openblas/openblas-0.3.19.ebuild
+++ b/sci-libs/openblas/openblas-0.3.19.ebuild
@@ -30,6 +30,8 @@ PATCHES=(
 )
 
 pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
 	elog "This software has a massive number of options that"
 	elog "are configurable and it is *impossible* for all of"
 	elog "those to fit inside any manageable ebuild."
@@ -57,7 +59,7 @@ pkg_setup() {
 	export HOSTCC="$(tc-getBUILD_CC)"
 
 	# threading options
-	use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 	USE_THREAD=0
 	if use openmp; then
 		USE_THREAD=1; USE_OPENMP=1;
diff --git a/sci-libs/openblas/openblas-0.3.20.ebuild b/sci-libs/openblas/openblas-0.3.20.ebuild
index 5d2349e6998f..01fd54d252c4 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 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~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 )"
@@ -28,9 +28,12 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}/${PN}-0.3.12-shared-blas-lapack.patch"
 	"${FILESDIR}/${PN}-0.3.20-fix-riscv.patch"
+	"${FILESDIR}/${PN}-0.3.20-fix-loong.patch"
 )
 
 pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
 	elog "This software has a massive number of options that"
 	elog "are configurable and it is *impossible* for all of"
 	elog "those to fit inside any manageable ebuild."
@@ -58,7 +61,7 @@ pkg_setup() {
 	export HOSTCC="$(tc-getBUILD_CC)"
 
 	# threading options
-	use openmp && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 	USE_THREAD=0
 	if use openmp; then
 		USE_THREAD=1; USE_OPENMP=1;
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 5b8d613f848b..2030d8988935 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -5,13 +5,15 @@ AUX opencascade-7.5.1-0004-fix-installation-of-cmake-config-files.patch 2207 BLA
 AUX opencascade-7.5.1-0005-fix-write-permissions-on-scripts.patch 2453 BLAKE2B 01b0ec99fb9ad032d6a90cceabb50900528abd0528b53e976484bf02f04eac9bc02b063bce5c221ae88782a126103e8077db9e90aa7f64f4f187dad00354d4d2 SHA512 fb3c374fe8aff8d2bac039a0eef754f2e823a97bfd7860bdd7e047c1b357202abfca0e37b46afc32220c7e354b5edb54805fbbbffde015bb4be2d7f4ded4a8da
 AUX opencascade-7.5.1-0006-fix-creation-of-custom.sh-script.patch 1245 BLAKE2B 1972c41e264a86761f8b3a3a649e67211776d0a4791b7e0f3adc859833e1d62e3a1d964484b2c53a516f5a33680ab2f32ad2010bf3fd531fca36373435307b68 SHA512 a2ffef88cb87acbc8215a7d1d7fe69ee17210392d39a64535d1538b2c08e43f5918c5b5e4a7540e8d636b1ba0df51670013e9d49f205bfc93a1e0d10a04388a7
 AUX opencascade-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch 5749 BLAKE2B 9176a738ec6b39a1cd5da61f2d72d096b09f6019f63a5b7733c5aa00796529f2cc5e3becdf5c24cfa01e4ff5b9da5ae9cd359372e6974eeaae7bcdf87e8c03c8 SHA512 5f7970e1461652966c34b1adb6e2580cfd7e3e230abbf108193027f67afbd5e78fc7451b50bf632fa3889174626384e4a0044d693e4f49ab9ece84a2ec6bd04a
+AUX opencascade-7.5.3-tbb-2021.patch 1931 BLAKE2B cf4f6895f7418a4af75f164065945aff9b7f592ed221b1802f08c9b912fb970c5f7a868c9302f05865f8bd5f30de1bdda2abcb0dc928d28500ca3956735efa2b SHA512 203d28fe8b61ac7cabac2f6d2dd1e1deea80e9f18123ced4581bf2cfa054d350251cdc9e32f01a95b713ac915859be42f25e770593469ca3f07169e0508ef18c
+AUX opencascade-7.6.2-avoid-pre-stripping-binaries.patch 1187 BLAKE2B fbfc9f3aafc4e69259cc37e82c266f7af979716bed7d80fd0f680b4b6d6fdad3b26b0214f06fbbc8ee09db08602572a4543ad0aa8ec7b1af98139312cdba291d SHA512 04c7f37e42eeafe6d8ee99df8c50bb5bf8bbc90c8b958fcf486adbfbf79fcba60c4a3bbbf7495388096f5902b0af7280f0561556eae6e6f030b73850df55ca2c
 AUX opencascade.env.in 4571 BLAKE2B 81780f83a476ba5a2691c003c7fde48fec14be4e355480080749800602307d64b88f779cde09aa94a7bb815849d669b054d5ca00908199d1a9857b07518b4f0d SHA512 98e6861469725f6880e38a2d7389f7bc748bcbdf54930aa3fe05ab6a5e1fab5249c4ffed4f45b6ef982325acece0d5acb7ffd8d92adac9be2db9a41ee5356019
 DIST opencascade-7.5.2.tar.gz 47812603 BLAKE2B 86995ea60e24329f91a2cbede26112a70794fb091b34d33614bef412b05b8cc9f1e770aecf78272b54a241c2524422c86f8ff722b3f27b54bf10fa5eda626288 SHA512 f951a941043a56f381cfd25e4d78bb9ae08e5cc29a894e6c0c35daf30aeabf1e44ee09af65bb6b7d62d9325be67741ddcf52266b7186b4c336c70ed8bcfa1676
 DIST opencascade-7.5.3.tar.gz 47817862 BLAKE2B be438a08997c18c3cb2c08c520fff2f439cc8a406cc3f471be3b24f874ac3bd892c4afe6fa37f742ffb5da21b5a29f9c8f737e3160dcbda35a217286218eb5e1 SHA512 2d7cf284a1b3ce8d05151085b41579cc2f4e29489b7920769cd04f86a6d76e49f533b570226d3cf041c75582894ed8a6aff889312c7c507fffae47d3e57c5c47
-DIST opencascade-7.6.0.tar.gz 48193117 BLAKE2B c16cd096f20e90267a00b6be21b17b22b491cf5d9aa1a311d64d7707042dc88380c60ececceb6728dbcdd4ff56a67558144292950e11518b21cbc49ace4e88cd SHA512 6839eb6641b9e0752474fce11cf1756223067febe0f5bcd5db249e3eccef29517a6952c124aae818220b6360070a792dacd1b0b4ce970b8351ce38598f31b4be
 DIST opencascade-7.6.1.tar.gz 48201174 BLAKE2B 7d13f0e17dfb9261ae77de9e66cf93053803313ac6848b3412a147f311e935c4ea9c930c7c9948bbce1f0172365ea9d326047f42b967ecdee435d68325093c61 SHA512 1466d95eea7539f5cf52a40ada712b2b0cfb9c1970271f5ea60d0408a1c3f1ae16b885dd36c3c0fcef3cedb05c420a7c637ee5168b5b081b0f55068cda412bb0
-EBUILD opencascade-7.5.2-r5.ebuild 4820 BLAKE2B 15a42ac3171ce97fa5c0d657d154ad64c07aab00056f40cc09ae449b5e5bc63583c524e5adecd74e31ae80256f83b6345f473b1bfecb52c37450b0f26d0221b2 SHA512 6233a105921396b139df7ca05de9aa18d1165306bc4cc68059ae1f0bec902dd14c72b12144f6a9f9a00ad68aa016f2a9081f818efa881666c7edd1329d3534f9
-EBUILD opencascade-7.5.3-r6.ebuild 4820 BLAKE2B c5b1c77e7ef2e36c371bcf4b4e5998618edb3e3f7100df4cd8c91789c0ddc9312fa1edcde5f85881ace777e2340c89ce6aae54baaaf4e56304255db684548103 SHA512 6c4a3f77ed0bc4152bafc269903fe0448f58c1e9094a700518665b9729f1d50da8fa5a710ff49aaa9eb58844385bffe1c20bd5f4b04c106422eea9fd767868a0
-EBUILD opencascade-7.6.0-r3.ebuild 4523 BLAKE2B 2a3c1bb8033c90263e49661cd2888d19a340fe542fcb94f126a8ec6d4d82f304bf65258a3cf1e043b1625dc4103a15e814861ca6c6d478b1d053610bb494b762 SHA512 987649f02e80e4798a10bc5e73a5b25d1a433e45cf000656ac6e9958110567be555d03f628622d07a0ee8d249ddb9b73364e1e9304c0e1798849465643b17261
-EBUILD opencascade-7.6.1.ebuild 4523 BLAKE2B 2a3c1bb8033c90263e49661cd2888d19a340fe542fcb94f126a8ec6d4d82f304bf65258a3cf1e043b1625dc4103a15e814861ca6c6d478b1d053610bb494b762 SHA512 987649f02e80e4798a10bc5e73a5b25d1a433e45cf000656ac6e9958110567be555d03f628622d07a0ee8d249ddb9b73364e1e9304c0e1798849465643b17261
+DIST opencascade-7.6.2.tar.gz 48207505 BLAKE2B 62d0015fdd6321036c4be02214730da46339d7032eec84969164497d1138bc8125c025f1af55beb3587e456845dbfa04596375085d694c0d2b5bc787ee18abeb SHA512 fa3874f0a7783c03fec863f28b87430ad794d1397147aa2c51604599bdd1510b08c8d98de799fef724100db5de5696eeeb170149a38228774864c692861f8ccc
+EBUILD opencascade-7.5.2-r6.ebuild 4937 BLAKE2B 7e864ea1414609e1475b222628d880142496e3e0cb0d5d1dbc850d92a484a17f2c7287b3d214ee9bf6d11ea11a2bbb427b8d28ccd6efafbc4b94de5747f56b1e SHA512 f689e21037b0aef011b2e9946d498eeaf52161e286a4112976c534f043e5aeab50a18fe67f49599a990d89c660cc37df4fde638657faa7e258774efad56d4ec2
+EBUILD opencascade-7.5.3-r8.ebuild 4970 BLAKE2B dec350db72a38f08fd6ceea88994219b504637cd2f62f4a5eae147c7c79617ccb1213e25ec9d2b77acde5e70e87b82ae4fd9667bd2d1c572031878e5214da002 SHA512 aa50be18383db9144e7bf791e08a3b6e2b5bae3ea194db7480429bfb62a6cc8697aecba29b3539c2ae4ff9093750fc1e56c253b0df65ace5e4c385f1b2db5025
+EBUILD opencascade-7.6.1-r2.ebuild 4676 BLAKE2B 5bda6fc2f7848ec7a0656a1b76c1a6dfd63490c50c3ca10619daff3a3428a3b6f9ef489b9da00bef1ac47021dc8e9363e71aee7759e435e1a9007400f8c4dc51 SHA512 67a2480662dcecf1e3413e80c37d2f5c79f560cf1a5e346a0cc574321b0319938d8b00ecc4c2db27b7e3147fbd8c4f1ea64ec66dfa290a0dd6bb5fe61f0a309a
+EBUILD opencascade-7.6.2-r1.ebuild 4695 BLAKE2B 33d27519fa153a40499d8963c44382c424151b8b84e04e96ddd5b0e224fb6da5bfe9022a8c95591a67d62056998b310ce243be8fd6d818de5a8008f91ec6af61 SHA512 e14048fef6b3e3889eb5b74d16c0e7fc7c6819dbde1f38d9564367aaee114c3c9ec6435b782ad8e7d153d82928157f850b4e48bdbde1a018aa0df471889ddecf
 MISC metadata.xml 1102 BLAKE2B 8569899b7ab437a4115ced11d3421f063d99233ed81bb5360228e580b20af2ee9753b41a8b3cb1291550160fa627058d915fde0e23514dcbed0f9cddc961ae11 SHA512 e9a38c41beec8eb54d6b9232447df3bc05635318f8dc727ddebc5f13be4d58b8d10576ddbb07a9fef41ba2adeb7ba1abcb4e10087b4711c4ff348d873c4916a8
diff --git a/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch b/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch
new file mode 100644
index 000000000000..38770ac9a541
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.5.3-tbb-2021.patch
@@ -0,0 +1,51 @@
+https://github.com/Open-Cascade-SAS/OCCT/commit/740833a6a88e481f474783c426b6f6311ed586d3
+
+From 740833a6a88e481f474783c426b6f6311ed586d3 Mon Sep 17 00:00:00 2001
+From: kgv <kgv@opencascade.com>
+Date: Mon, 29 Nov 2021 21:26:45 +0300
+Subject: [PATCH] 0032697: Configuration - fix compilation errors with oneTBB
+ 2021
+
+Removed usage of no more existing tbb::task_scheduler_init and tbb::captured_exception.
+--- a/src/OSD/OSD_Parallel_TBB.cxx
++++ b/src/OSD/OSD_Parallel_TBB.cxx
+@@ -25,7 +25,9 @@ Standard_DISABLE_DEPRECATION_WARNINGS
+ #include <tbb/parallel_for.h>
+ #include <tbb/parallel_for_each.h>
+ #include <tbb/blocked_range.h>
+-#include <tbb/task_scheduler_init.h>
++#if TBB_VERSION_MAJOR < 2021
++  #include <tbb/task_scheduler_init.h>
++#endif
+ Standard_ENABLE_DEPRECATION_WARNINGS
+ 
+ //=======================================================================
+@@ -38,12 +40,16 @@ void OSD_Parallel::forEachExternal (UniversalIterator& theBegin,
+                                     const FunctorInterface& theFunctor,
+                                     Standard_Integer theNbItems)
+ {
++#if TBB_VERSION_MAJOR >= 2021
++  // task_scheduler_init is removed,
++  // exceptions are captured without proxy tbb::captured_exception object
++  (void )theNbItems;
++  tbb::parallel_for_each (theBegin, theEnd, theFunctor);
++#else
+   try
+   {
+     const Handle(OSD_ThreadPool)& aThreadPool = OSD_ThreadPool::DefaultPool();
+-    const Standard_Integer aNbThreads = theNbItems > 0 ?
+-      aThreadPool->NbDefaultThreadsToLaunch() : -1;
+-
++    const Standard_Integer aNbThreads = theNbItems > 0 ? aThreadPool->NbDefaultThreadsToLaunch() : -1;
+     tbb::task_scheduler_init aScheduler (aNbThreads);
+     tbb::parallel_for_each (theBegin, theEnd, theFunctor);
+   }
+@@ -51,6 +57,7 @@ void OSD_Parallel::forEachExternal (UniversalIterator& theBegin,
+   {
+     throw Standard_ProgramError (anException.what());
+   }
++#endif
+ }
+ 
+ #endif /* HAVE_TBB */
+
diff --git a/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch b/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch
new file mode 100644
index 000000000000..144047fba163
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-7.6.2-avoid-pre-stripping-binaries.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/831800
+https://dev.opencascade.org/content/dont-pre-strip-binaries
+
+From 88e59e0199daaf66184833e366e9deb1299078a9 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sun, 5 Jun 2022 09:48:09 +0200
+Subject: [PATCH] avoid pre-stripping binaries
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/adm/cmake/occt_defs_flags.cmake
++++ b/adm/cmake/occt_defs_flags.cmake
+@@ -133,8 +133,6 @@ if ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang")
+     # does not support option "-std=c++0x"
+     set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
+   endif()
+-  # Optimize size of binaries
+-  set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS}")
+ elseif(MINGW)
+   add_definitions(-D_WIN32_WINNT=0x0601)
+   # _WIN32_WINNT=0x0601 (use Windows 7 SDK)
+@@ -150,9 +148,6 @@ elseif(MINGW)
+ elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
+   # Require C++11
+   set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
+-  # Optimize size of binaries
+-  set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+-  set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+ endif()
+ 
+ if (BUILD_RELEASE_DISABLE_EXCEPTIONS)
+-- 
+2.35.1
+
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
index 5b0cab240b53..d4500132ab1f 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r5.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
 	"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
 	"${FILESDIR}"/${PN}-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
+	"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
 )
 
 src_prepare() {
@@ -89,6 +90,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOC_Overview=$(usex doc)
 		-DBUILD_Inspector=$(usex examples)
+		-DBUILD_RELEASE_DISABLE_EXCEPTIONS=OFF # bug #847916
 
 		-DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin"
 		-DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
index 19b5d7637932..87b782fa5e6a 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/occt-V${MY_PV}"
 
 LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
 SLOT="0/${PV_MAJ}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="debug doc examples ffmpeg freeimage gles2-only json optimize tbb vtk"
 
 REQUIRED_USE="?? ( optimize tbb )"
@@ -47,7 +47,7 @@ RDEPEND="
 	)
 	ffmpeg? ( media-video/ffmpeg:= )
 	freeimage? ( media-libs/freeimage )
-	tbb? ( <dev-cpp/tbb-2021.4.0 )
+	tbb? ( dev-cpp/tbb:= )
 	vtk? ( sci-libs/vtk:=[rendering] )
 "
 DEPEND="${RDEPEND}"
@@ -67,6 +67,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
 	"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
 	"${FILESDIR}"/${PN}-7.5.1-fix-AllValues-name-collision-with-vtk-9.0.patch
+	"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
+	"${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch
 )
 
 src_prepare() {
@@ -89,6 +91,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOC_Overview=$(usex doc)
 		-DBUILD_Inspector=$(usex examples)
+		-DBUILD_RELEASE_DISABLE_EXCEPTIONS=OFF # bug #847916
 
 		-DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin"
 		-DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
diff --git a/sci-libs/opencascade/opencascade-7.6.1.ebuild b/sci-libs/opencascade/opencascade-7.6.1-r2.ebuild
index ab4bbc4c974b..e11b24187775 100644
--- a/sci-libs/opencascade/opencascade-7.6.1.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.1-r2.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	)
 	ffmpeg? ( <media-video/ffmpeg-5:= )
 	freeimage? ( media-libs/freeimage )
-	tbb? ( <dev-cpp/tbb-2021.4 )
+	tbb? ( dev-cpp/tbb:= )
 	vtk? ( sci-libs/vtk:=[rendering] )
 "
 DEPEND="
@@ -64,6 +64,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
 	"${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
 	"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
+	"${FILESDIR}"/${PN}-7.6.2-avoid-pre-stripping-binaries.patch
+	"${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch
 )
 
 src_prepare() {
@@ -84,6 +86,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOC_Overview=$(usex doc)
 		-DBUILD_Inspector=$(usex examples)
+		-DBUILD_RELEASE_DISABLE_EXCEPTIONS=OFF # bug #847916
 
 		-DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin"
 		-DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
diff --git a/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild b/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
index ab4bbc4c974b..7773a90fb9f2 100644
--- a/sci-libs/opencascade/opencascade-7.6.0-r3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.2-r1.ebuild
@@ -47,13 +47,14 @@ RDEPEND="
 	)
 	ffmpeg? ( <media-video/ffmpeg-5:= )
 	freeimage? ( media-libs/freeimage )
-	tbb? ( <dev-cpp/tbb-2021.4 )
+	tbb? ( dev-cpp/tbb:= )
 	vtk? ( sci-libs/vtk:=[rendering] )
 "
 DEPEND="
 	${RDEPEND}
 	eigen? ( dev-cpp/eigen )
 	json? ( dev-libs/rapidjson )
+	vtk? ( dev-libs/utfcpp )
 "
 BDEPEND="
 	doc? ( app-doc/doxygen[dot] )
@@ -64,6 +65,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.5.1-0004-fix-installation-of-cmake-config-files.patch
 	"${FILESDIR}"/${PN}-7.5.1-0005-fix-write-permissions-on-scripts.patch
 	"${FILESDIR}"/${PN}-7.5.1-0006-fix-creation-of-custom.sh-script.patch
+	"${FILESDIR}"/${P}-avoid-pre-stripping-binaries.patch
+	"${FILESDIR}"/${PN}-7.5.3-tbb-2021.patch
 )
 
 src_prepare() {
@@ -84,6 +87,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOC_Overview=$(usex doc)
 		-DBUILD_Inspector=$(usex examples)
+		-DBUILD_RELEASE_DISABLE_EXCEPTIONS=OFF # bug #847916
 
 		-DINSTALL_DIR_BIN="$(get_libdir)/${PN}/bin"
 		-DINSTALL_DIR_CMAKE="$(get_libdir)/cmake/${PN}"
diff --git a/sci-libs/orocos_kdl/Manifest b/sci-libs/orocos_kdl/Manifest
index fac2334c242d..9886a14964de 100644
--- a/sci-libs/orocos_kdl/Manifest
+++ b/sci-libs/orocos_kdl/Manifest
@@ -1,6 +1,6 @@
 DIST orocos_kinematics_dynamics-1.5.0.tar.gz 251515 BLAKE2B 53c14354b0833867b6fd030cde91c9524b6f0537ea0d0f3977e7aeb8482030edd5723a571030e8b78e4d6d01eba38c6a8e5c49d66c49c4b1b0f2e7a3d8159c74 SHA512 5fc9c336d6ed31ad59a5bdf6ee06444cac29beae090b9026b34f35a3cb4cdf1cd6c33af621205b8d6a5201070e679531c8b5bbdeb8a91cd1d8061153b0e47e49
 DIST orocos_kinematics_dynamics-1.5.1.tar.gz 251074 BLAKE2B 6be8171c3ce3bc6613fc342b8d3c772de766bfab78c5530364339ce2f9c4a37e6bc5519482f30939b210d9cb9e7899b3da66784a5c301653493212bc690917a8 SHA512 9774b76b755ea81168390643813789783f60d0b1cdb46cd250e3e0d27f75a6cf2fd3bfd2081c04e30a14ff4fc70d0080c9b43b82ee181c2dda82f23f052b338d
 EBUILD orocos_kdl-1.5.0.ebuild 1616 BLAKE2B 3b7daf7074e00e3d735e330a53b09964eeb685d3771814798e40cb75d717779e73f028d7e7bd23612f8cb106c04b6e3d429f3c1fbea99a96daf55d3c3e386484 SHA512 ea14a1fa34bb8ff8ff83529f5e5990a5829cfcdf26382a1d97fbde7367cd4c6c0017ea368fb2e1766d055483f8c350c5957a33f77adc87f0668ec246892be8b3
-EBUILD orocos_kdl-1.5.1.ebuild 1616 BLAKE2B 3b7daf7074e00e3d735e330a53b09964eeb685d3771814798e40cb75d717779e73f028d7e7bd23612f8cb106c04b6e3d429f3c1fbea99a96daf55d3c3e386484 SHA512 ea14a1fa34bb8ff8ff83529f5e5990a5829cfcdf26382a1d97fbde7367cd4c6c0017ea368fb2e1766d055483f8c350c5957a33f77adc87f0668ec246892be8b3
+EBUILD orocos_kdl-1.5.1.ebuild 1615 BLAKE2B b6dac30a20141c7d0d1f1d202794e8a3a1a467646af629c1a40d8e4ea957caeb72702c32f2f943a0d9d6cd9986422986a14c1dc6fcc6b758ee8e6517aa00d8fd SHA512 0da03e475d7b1c2cd8db0034abb76d7eb312a8c427ecdd7a7fef0b9a009c42667b08ffca398fe4d7680b0ebb949a101984dfdb3c9ba499a93d792a5cea797453
 EBUILD orocos_kdl-9999.ebuild 1616 BLAKE2B 3b7daf7074e00e3d735e330a53b09964eeb685d3771814798e40cb75d717779e73f028d7e7bd23612f8cb106c04b6e3d429f3c1fbea99a96daf55d3c3e386484 SHA512 ea14a1fa34bb8ff8ff83529f5e5990a5829cfcdf26382a1d97fbde7367cd4c6c0017ea368fb2e1766d055483f8c350c5957a33f77adc87f0668ec246892be8b3
 MISC metadata.xml 935 BLAKE2B 25910d53204e9c42ba2a6953955b075ef7f1ba63fb95a62cffbeaffd1c169dfb935c4b5c0deb81aa310bb0d7b79d3643296751a12b0d38cb95b0fd39c9c8f39e SHA512 0f33c7285c8bb90e26ad0f9f9957d67669d75c60afebd8d72ef59590f5ab5f4e7458f4a9726104dd042ff4fdf41eae7a3eaa6fa679f43cbae1c928e600c59a6a
diff --git a/sci-libs/orocos_kdl/orocos_kdl-1.5.1.ebuild b/sci-libs/orocos_kdl/orocos_kdl-1.5.1.ebuild
index bb20a06d821c..a0120f6e86a1 100644
--- a/sci-libs/orocos_kdl/orocos_kdl-1.5.1.ebuild
+++ b/sci-libs/orocos_kdl/orocos_kdl-1.5.1.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
@@ -14,7 +14,7 @@ if [[ ${PV} = *9999 ]]; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 	S="${WORKDIR}/orocos_kinematics_dynamics-${PV}/${PN}"
 fi
 
diff --git a/sci-libs/parmetis/Manifest b/sci-libs/parmetis/Manifest
index c2f1face46f5..219013a5849b 100644
--- a/sci-libs/parmetis/Manifest
+++ b/sci-libs/parmetis/Manifest
@@ -1,5 +1,5 @@
 AUX parmetis-4.0.3-01-cmake-paths.patch 1145 BLAKE2B 68b601d3421e88114a4cf3c6e580f92a9b5efa301e4480b55e820cfb18f75b1062b8ddec6e3aab0e49f97cbe0e8e8ac42d1db6f7f99f8f4d4bcdd2dad4ce8d2c SHA512 96892b7e8e8e4779233dfbc5737506a80454447eac0f0cbf07fa76aecc37dfe61bc16e5638bc36bc4f99ee89b259bd5f13a5fe4c5218b076810a498387ee01cf
 AUX parmetis-4.0.3-02-unbundle-metis.patch 300 BLAKE2B 4baa2ef83d09746ec74e058eb4aba8e5bf6cbdf1f1ed44bf2b5d7a858afc677ac639a605cdb060960d646f2effa6c6eb6b173ebc78a09253046c1fffef7bbe32 SHA512 9f242db228d02c57d93c710be4f1cf8535012d13134064ea21588faa884f689ceac8deab9cee1f00a7192d64601753121a906622dbc900c6efc7e86d0e857744
 DIST parmetis-4.0.3.tar.gz 5567670 BLAKE2B 69a44ea8e50d8fd78046a342807b994220d03da3ab1695533d92772b1840302917a7d5d6f9eb020d9ff8ab7e5372bff0386d6354b662f58495b74f8f596c45f9 SHA512 454a91921ca35c981df11c9846a11963ff8fd8407a25179453af33f8fe69493f6dd7f2a0b8feed9a7d3f121e45b715749dd7a94873eaac2bae4cad1e535ca132
-EBUILD parmetis-4.0.3-r2.ebuild 1612 BLAKE2B b0fd4084d4a2c4f981440739318c06633a958c7e2552f4430beb15c2c7a813ff38f0779f700a90eab428524557c9e404bd06796e8f69796fe1752bf79aabf36c SHA512 fcf695d2eff2c523f8e45e59a4195b3b4cb68c686dd8f61db00dde57f8ec64a1d6d79efb62f90a44125de32fb4e8be6b35fff25ab9d4119261756e72701a9781
+EBUILD parmetis-4.0.3-r2.ebuild 1683 BLAKE2B 1d00cfed913adcd92a85e9cee47fc86a8d7aa2c94057dc575d1e5501a20575ade98350f23b067cef3b1b0b9b29b3bf1225b2cb58dc5c414c5116ea155a8e3746 SHA512 d923c1995dfb34792150ba1e09bb9aea7b667c07caf85740244137a38c68af8fea9dc9deba8ce60a868ea91b1c44bc957af28fbfceb6022b1fc18567e3e07167
 MISC metadata.xml 654 BLAKE2B 563c44ef3f6bbc67b9adcd611c85446048756f2fedfefd65436f7a0c4926393616b4deedf3994e74ed5f7fc7045a1810c7cdf69f8cad58c03327f6f231cea1d6 SHA512 f5572f73d3f62fe18efb7291595bde01df63ccffdf45f211cd41bf9c0c347391c8d22cd43a53f404467db68a56eebea4d992ad77d4e45e2f67a8cda0c21082b7
diff --git a/sci-libs/parmetis/parmetis-4.0.3-r2.ebuild b/sci-libs/parmetis/parmetis-4.0.3-r2.ebuild
index 1f1b3c8b4398..f24d1ffbe973 100644
--- a/sci-libs/parmetis/parmetis-4.0.3-r2.ebuild
+++ b/sci-libs/parmetis/parmetis-4.0.3-r2.ebuild
@@ -26,10 +26,12 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.3-02-unbundle-metis.patch
 )
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		use openmp && tc-check-openmp
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {
diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest
index 59aa5b6cc709..632c60868e6e 100644
--- a/sci-libs/pcl/Manifest
+++ b/sci-libs/pcl/Manifest
@@ -1,7 +1,8 @@
 AUX pcl-1.12.0-cmake-targets.patch 818 BLAKE2B 6d0592ce47444514763719754670415f21098f4654756057cf384777572a2adf59d170d06c9800ba0a526c5b6a0349d90ece5fce1b5a8daeb895a0b75b2650dc SHA512 f619d1cebef985c74093020792c9fb58e820830b96060cc218292e7d96d41154b00b441eaf1394ecbe0dddf6c5cad4601a95d8afcd4b22b219f0970f62df7bd5
 DIST pcl-1.12.0.tar.gz 68547886 BLAKE2B 1734af6fb44587cf52bf37802494fcdd7b3623f8fad6ca83ce40803912a48dc76a58263ba454678d18bc7ce46486c3053a5eed32947864db6653fd7381fada42 SHA512 ce0544fdd82bcc415f81a9c74d58e5f6da2d0e0aaa54238a2601eca90386774155f1e032e6fb55a9edbf467ffa5ebf2ad695ec652ab437b323b8c6241f81193f
 DIST pcl-1.12.1.tar.gz 68565637 BLAKE2B e93ecc9e562ba0ab6d91fbc9d890accacafe4558ddcf4950ed46d7f11bcc2b74111ea249ac2a300c2411f553f4d267467dbe77af54d8eb9538ce27e98f19a913 SHA512 5cef7699ad69df67129520b50405d62b6a1c37da791b472c112e4e0b9f24b4a37303344c774ec121370495492eee1e61c8565dee58aabec090795585365afc1b
-EBUILD pcl-1.12.0.ebuild 2215 BLAKE2B 6cb97a8ba3ef0b6fb14d38c799744295df07eab1ee6b4c0945dc7bb1c27dce980739fd1eee3d99bdb6a01aa214c514c1f4ebbd62789d0d79a95d1a5faa737ef9 SHA512 06290666f42c1e4c84df6671f54776b2126d743c294c92736c1371e684c6431ba95917455d5810bb61c1a70057bc06f8208e10aeb40cca04fcf7d34c5f81ef98
+EBUILD pcl-1.12.0.ebuild 2214 BLAKE2B d16b35f038880a896c717dc095f7519b49b2284901cab42f007f816989ea030650718aa704c338aeff849f74a5521c632eabd9fc5b54a609a98fa2abb6d4daa2 SHA512 8786c5698dc6d8d9c9387d4b7790921882ec5e3bb15012b360f7929f0b5eea63538632d6555347209be21523e5fcccd53d1735b8d6d756c518c72e44bc3cb553
+EBUILD pcl-1.12.1-r1.ebuild 2160 BLAKE2B 3aef0f61e1411b80e4650edaafccf6afe7f3299920f5968c18cdc5755dad6ab518eb1ba2cd6eef8be1c5d69d3c05c517b3ed677ab24b6a3be7d4dae0dd0ba3fa SHA512 183b98c8ba4931ad79728f568fd3d0ef973365101448d0357ab602bf9266375591db552df60b87b25d1ac4f79188064a330438b8cf0b771306c379737d2d7f09
 EBUILD pcl-1.12.1.ebuild 2154 BLAKE2B daeaa288ad7c5cb1daf51c2a4ba8464adbd77b5175daa0bef3ca280b0932f04d54bf24900267cfa7f0cef47f16f2742ea225523570c66c07f030ff354083f831 SHA512 aac99539c12066877eac2eef7d645d9976ad4cafeac7339d848080074aba19564b853763a36261c7261b2d1630f4bc5fcee7c2225002d9e47ebfccd80c19d20f
-EBUILD pcl-9999.ebuild 2154 BLAKE2B 40cce6d9991fbb8d1a3c83c2f93a850fa95fc146964c9875064e97d245afdcec851dca54cf57f0fd4ba62b71fbfa1e83f392dc75bd9b9133612031b41638b98e SHA512 8e4c201bfdd9dc462a50489c30aeb79949f7e5edf9e4564c65f5a57ad7f24c665020dd0a2ed02e6eeb96196667a324523a1f834779e4d5f6fda624934a78227f
+EBUILD pcl-9999.ebuild 2160 BLAKE2B 3aef0f61e1411b80e4650edaafccf6afe7f3299920f5968c18cdc5755dad6ab518eb1ba2cd6eef8be1c5d69d3c05c517b3ed677ab24b6a3be7d4dae0dd0ba3fa SHA512 183b98c8ba4931ad79728f568fd3d0ef973365101448d0357ab602bf9266375591db552df60b87b25d1ac4f79188064a330438b8cf0b771306c379737d2d7f09
 MISC metadata.xml 1126 BLAKE2B 3e04d24d862e13d5c89bfe4099660df099f1d498c376292f7984be6064953cdc972455c99cf4f7819bab537ee99f367269f593f266b5d517be9808b00a86b965 SHA512 2afabfca4c5a7f3da157e59e07015132c91b1b24e464a1fcfd0505ca51f27b53f3256657d0a5b8a8698f8136aecd3790e7e7f70de7c58cbf3017389bbb2cb6a1
diff --git a/sci-libs/pcl/pcl-1.12.0.ebuild b/sci-libs/pcl/pcl-1.12.0.ebuild
index e3cd374256f5..c233a2f8c9c0 100644
--- a/sci-libs/pcl/pcl-1.12.0.ebuild
+++ b/sci-libs/pcl/pcl-1.12.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
@@ -14,7 +14,7 @@ inherit ${SCM} cmake multilib
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm"
+	KEYWORDS="amd64 ~arm"
 	SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${P}"
 fi
diff --git a/sci-libs/pcl/pcl-1.12.1-r1.ebuild b/sci-libs/pcl/pcl-1.12.1-r1.ebuild
new file mode 100644
index 000000000000..eeb47d9d7c6a
--- /dev/null
+++ b/sci-libs/pcl/pcl-1.12.1-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/PointCloudLibrary/pcl"
+fi
+
+inherit ${SCM} cmake multilib
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/PointCloudLibrary/pcl/archive/${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${P}"
+fi
+
+HOMEPAGE="https://pointclouds.org/"
+DESCRIPTION="2D/3D image and point cloud processing"
+LICENSE="BSD"
+SLOT="0/1.12"
+IUSE="cuda doc opengl openni openni2 pcap png +qhull qt5 usb vtk cpu_flags_x86_sse test tutorials"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=sci-libs/flann-1.7.1
+	dev-libs/boost:=[threads(+)]
+	dev-cpp/eigen:3
+	opengl? ( virtual/opengl media-libs/freeglut )
+	openni? ( dev-libs/OpenNI )
+	openni2? ( dev-libs/OpenNI2 )
+	pcap? ( net-libs/libpcap )
+	png? ( media-libs/libpng:0= )
+	qhull? ( media-libs/qhull:= )
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtcore:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtopengl:5
+	)
+	usb? ( virtual/libusb:1 )
+	vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering,views] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
+"
+DEPEND="${RDEPEND}
+	!!dev-cpp/metslib
+	test? ( >=dev-cpp/gtest-1.6.0 )
+"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	tutorials? ( dev-python/sphinx dev-python/sphinxcontrib-doxylink )
+	virtual/pkgconfig"
+
+REQUIRED_USE="
+	openni? ( usb )
+	openni2? ( usb )
+	tutorials? ( doc )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DLIB_INSTALL_DIR=$(get_libdir)"
+		"-DWITH_CUDA=$(usex cuda TRUE FALSE)"
+		"-DWITH_LIBUSB=$(usex usb TRUE FALSE)"
+		"-DWITH_OPENGL=$(usex opengl TRUE FALSE)"
+		"-DWITH_PNG=$(usex png TRUE FALSE)"
+		"-DWITH_QHULL=$(usex qhull TRUE FALSE)"
+		"-DWITH_QT=$(usex qt5 TRUE FALSE)"
+		"-DWITH_VTK=$(usex vtk TRUE FALSE)"
+		"-DWITH_PCAP=$(usex pcap TRUE FALSE)"
+		"-DWITH_OPENNI=$(usex openni TRUE FALSE)"
+		"-DWITH_OPENNI2=$(usex openni2 TRUE FALSE)"
+		"-DPCL_ENABLE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
+		"-DWITH_DOCS=$(usex doc TRUE FALSE)"
+		"-DWITH_TUTORIALS=$(usex tutorials TRUE FALSE)"
+		"-DBUILD_TESTS=$(usex test TRUE FALSE)"
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/pcl/pcl-9999.ebuild b/sci-libs/pcl/pcl-9999.ebuild
index 1ab0b8e362ff..eeb47d9d7c6a 100644
--- a/sci-libs/pcl/pcl-9999.ebuild
+++ b/sci-libs/pcl/pcl-9999.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
@@ -43,7 +43,7 @@ RDEPEND="
 		dev-qt/qtopengl:5
 	)
 	usb? ( virtual/libusb:1 )
-	vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering] )
+	vtk? ( >=sci-libs/vtk-5.6:=[imaging,rendering,views] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
 "
 DEPEND="${RDEPEND}
diff --git a/sci-libs/pdal/Manifest b/sci-libs/pdal/Manifest
index bbcb1717ea04..9963e8a643fe 100644
--- a/sci-libs/pdal/Manifest
+++ b/sci-libs/pdal/Manifest
@@ -4,5 +4,5 @@ AUX pdal-2.3.0-upgrade_cmake_min.patch 2605 BLAKE2B 972bfd638ccc22b1773a8d26a76f
 DIST PDAL-2.3.0-src.tar.gz 110530128 BLAKE2B 435997e7ae7fe84ff77d8546e68ce6d32e54a221b5a4bbea45543554355506d7900f65ebb47a4f5333d0f3a44192ffe548178b6b3e8b3b7575d3c104618e288b SHA512 9de87de7370175e76b95d3ec08667eb28b90a63eed8133f144427ff931e575d1f37aa13496f12054577539ee552458475dd054bcbdedfabe52eb0e32c4483d05
 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
+EBUILD pdal-2.4.0-r1.ebuild 1148 BLAKE2B eb3adb6444f2b20ebdec16fb9557b0eacd1584ee241ec323e35f1bcd2948d9a2feb05a46b3deff0a8f6519df3cbdeb72dc19bfbb3a2d64d3c7bad6b946a6d053 SHA512 d355971c09429fcb34863fe4d367568a26e27d616193530890ae97b9940da4bb302f0d2b50c8c3387d1f1c4870c53dea0000ba4a6f8bda0dc600ad3e8582951c
 MISC metadata.xml 799 BLAKE2B 44fff88edc36553687a49ecf5113b1f7f3c8d092e82ef4e45f0d96cf53cc619647f45b3d3439a5b98bf43a8965e1b80582e7b074489dcd69f6f3aad9e5c7f59a SHA512 da405bacd840b714fe274fa5ca658f7a51b0078054058dcce46f690b33e641579981739de9511f4a876ff0f88aec5c2dbaa59e4db035eb9a85bdd8e9725bc7c2
diff --git a/sci-libs/pdal/pdal-2.4.0-r1.ebuild b/sci-libs/pdal/pdal-2.4.0-r1.ebuild
index 9bd82c4dc76e..4c4d9e8a35d3 100644
--- a/sci-libs/pdal/pdal-2.4.0-r1.ebuild
+++ b/sci-libs/pdal/pdal-2.4.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/PDAL/PDAL/releases/download/${PV}/PDAL-${PV}-src.tar
 
 LICENSE="BSD"
 SLOT="0/14"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="postgres test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/pgplot/Manifest b/sci-libs/pgplot/Manifest
index a5d5fa4e6472..001360951d7a 100644
--- a/sci-libs/pgplot/Manifest
+++ b/sci-libs/pgplot/Manifest
@@ -5,5 +5,5 @@ AUX pgplot-libpng15.patch 374 BLAKE2B 975eed22e5f2c4ff7bd169224eee766b5438ad25dd
 AUX pgplot-makemake.patch 7901 BLAKE2B 65b6d9fa41667d95376530315269872a25fc9445753e0f7b57ebe02feb3bfbf8deb75e977c771a09c4bf7851e5a9d392c145916c054ebd5624309487a4756fad SHA512 a29bc78eb17397c8fc3a0ec0f8dcec28d5d3f1345b16b90c05aad6459c9b312b63d04e55882b99c47ab22e7b3e16ee3e437c684fb5f50a43aaecd5fc6915689a
 AUX pgplot-tk86.patch 1863 BLAKE2B 23abf5177049d19ce782ff68987689fe9e6cac0267bd664c681bb1bd94a11da1898ed6c639d0a3773d64f43502c588352304e593672940fdf83e42ac00219ab2 SHA512 32abe4409cc1b63bf807a3544c36c163c6278dbe3dfd50ce24c6c65da6e22c8d8c0992217bab44c3e3105a11a6cad9b721c1ed8efe6835b46686072f40b83468
 DIST pgplot522.tar.gz 1197397 BLAKE2B 9eafde628373abdbda7adeb365b107618197aa5884d16b27f42b20c7957efa9b09d64adbcbc311ec92b974427355f8410a35c3f12969d240e8e25f3a72cae82b SHA512 03a075c84506ead1d665a7105cd41c7cfbe19d12094cb36fb7459a0f6ee0df0638543b7eca92aaf80677984cc47a07b968f854db8eaa90ec605f78d89c615d1f
-EBUILD pgplot-5.2.2-r7.ebuild 4524 BLAKE2B 61495ae8f603797a947ebaa9aab2da9c5a78dc16bc9dfd646e511fb6b5956fb73d4405e13948fa171f80851ba36016c0d637e800ece95d7fe913000c5e38fc5f SHA512 2f36ddeda1214356d92247e68e05b85abed44a22a293e3eb04c33c6370876107e084318f1d488a89d7f52124997f40ef4732d2ecc22681315831c9656fb2bd27
+EBUILD pgplot-5.2.2-r7.ebuild 4036 BLAKE2B fa122a7773906b33b9b1495612edef185d458e399e15c5b8c874c781c61fea60a7ee27c5fac9c1ec76a65beadbfa2aa0571314b8ffbf54be5bb3f2dcdb414d3f SHA512 9dca103d228714df225a33795110d776a8ca62ab9f533b84d314a0473366437514467c1788b6e39670b60e1dab22bed8d38e163c832c11fa073968534e8951ec
 MISC metadata.xml 623 BLAKE2B 572db5337c5f7e55c3bd2fabcfb1258b36c4badc3dcacd73bb3e6d9d89f2d7bde93fc8ae7b737d3deb5e9fcf277f746eed35d22d8a13d3daff09ce13e6cb8fc9 SHA512 ee01cf933cd01b6589014df892b69e988e1a0b8b68c1ccf00a6574b0191dd5b038d212660573953ee51558e5785f45b1cc4be37942d9e8397b64ac5b2fddbfe2
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
index cd3605a71415..f0722506dc29 100644
--- a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
@@ -38,18 +38,6 @@ PATCHES=(
 
 src_prepare() {
 	default
-	# gfortran < 4.3 does not compile gif, pp and wd drivers
-	if [[ $(tc-getFC) == *gfortran* ]] &&
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]] ; then
-		ewarn "Warning!"
-		ewarn "gfortran < 4.3 selected: does not compile all drivers"
-		ewarn "disabling gif, wd, and ppd drivers"
-		ewarn "if you want more drivers, use gfortran >= 4.3"
-		sed -e 's/GIDRIV/! GIDRIV/g' \
-			-e 's/PPDRIV/! GIDRIV/g' \
-			-e 's/WDDRIV/! GIDRIV/g' \
-			-i drivers.list || die "sed drivers failed"
-	fi
 
 	# fix pointers for 64 bits
 	if use amd64 || use ia64; then
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 3e62713f18e0..15bab63ee82d 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -6,5 +6,5 @@ AUX plplot-5.15.0-ocaml-rpath.patch 9583 BLAKE2B b475580f9e4da0ab660dc2d0dfbdbbf
 AUX plplot-5.15.0-ocaml.patch 3424 BLAKE2B ba1c9f758c319a76b0a457a287ee6934ee39300401e2d9a364c70446e12af679ce55c22eda0bf7aa7cb621fd4c76f56268afa649ba935a716495049f41706187 SHA512 1387625d1e784fb92ab3279a342c08d8f85fc055e0c69ce1af9656492102072c7a1d5a6498f8758dc3fd35e0543e80b65cd315641886f9baff60f7740583a0e3
 AUX plplot-5.9.6-python.patch 379 BLAKE2B cf08250c851c3405517183e8f3425f42ede2f850cc8bcd89828e3e1b89035731a8a3face0988750e9f9e5dce2fa0404b23b2721c5b315ff61aeac552fd6e05f2 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4
 DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B 41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8
-EBUILD plplot-5.15.0-r102.ebuild 7490 BLAKE2B b6eec0097527b227142d257e2e452c08d95a4b955cb42ba2433bf9671e55f7863f6d3d8c44072f183a656370b9294937faf73a8f1d370530a906a1d6ae4d0e13 SHA512 9dcb96928d40aba19f409d57343a426dc8bcfcb5504e2ab34730a5e1e1987821294a0ed8c24ab1a3a98cefa5433793fffe1c93289a9ef5e9d4c47cd508784fe1
+EBUILD plplot-5.15.0-r103.ebuild 7496 BLAKE2B b6759895f34ff55ed55bd97b92290d79288397cd73b56ebf5d8c5b3233587093f0d3d54a9688b9e6b8988e0eceb2cfe305dbc5da0b68311dfc21a4fa39878424 SHA512 352c50c8ddebf960d87e4b4e9758aa72f54f76da86015eb5b8e2c874b8a04d6b8e467bb2a6ba2cbc5771aa88efd71bcfc17d619e91e516c0df4a77c8f32fff6a
 MISC metadata.xml 1421 BLAKE2B a15479caf11e0f90cb45613ee48ca2d4270a18b57b8f409d4687cee5c55f660fca46a8a2a36c3c1c4a5d02a4c964b1d8db6ea4112039af8bcda808e50b4bf1f1 SHA512 fc99a3225ce54af9945e8fec3cd96f9c75cdc74b8ad4d5362bd5b1529b3872eddd06a190ea9f1cafa727d28e3e2086a27ecd5db89afd993d844ba8f299f2f317
diff --git a/sci-libs/plplot/plplot-5.15.0-r102.ebuild b/sci-libs/plplot/plplot-5.15.0-r103.ebuild
index c4d312740e5a..3b7f2ddfb10f 100644
--- a/sci-libs/plplot/plplot-5.15.0-r102.ebuild
+++ b/sci-libs/plplot/plplot-5.15.0-r103.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
@@ -6,7 +6,7 @@ EAPI=7
 WX_GTK_VER=3.0-gtk3
 FORTRAN_NEEDED=fortran
 LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 # fails with ninja, due to USE=java missing swig output dependencies
 CMAKE_MAKEFILE_GENERATOR=emake
 
@@ -45,8 +45,8 @@ RDEPEND="
 	)
 	lua? ( ${LUA_DEPS} )
 	ocaml? (
-		dev-lang/ocaml
-		dev-ml/camlidl
+		dev-lang/ocaml:=
+		dev-ml/camlidl:=
 	)
 	octave? ( sci-mathematics/octave:0= )
 	pdf? ( media-libs/libharu:0= )
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index bd6b09b255c6..b5b8757fb0d1 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,6 +1,7 @@
 DIST proj-7.2.1.tar.gz 5714666 BLAKE2B 9379ef758b1221b9487f162a27e7afa737e668ad7a13fc7adbd8e1e2c1c4699263d5d3105d03781b423f284205de3c79fc68850b9fba6aa05f1dc553b77b0842 SHA512 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324
 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-9.0.1.tar.gz 5264935 BLAKE2B 4957727fab9f6158e83025eed502bfc42f0c2fb4ca26ece34284f1b410d490c70ed414b7fc82a01753052acad93d592bb946aed83a2b2d985028554681d61b85 SHA512 9cb716a061315752a23405bd5bf879cdf63432493286ef828f442eea0bea872301be10f6e35a8e28ffe42cb6aafc039213e35be65ab692223a135b03422e3dab
 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
@@ -8,4 +9,5 @@ DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d6
 EBUILD proj-7.2.1.ebuild 1215 BLAKE2B 26a84ff93fefa9b88ab8017fa58da6ec89f037beb788bb11e3302bcf38ae578a846416ef23094b9a32ca8be447ee4e3a0d865f66db7c97cb30499930c48237b0 SHA512 b854fcbb1879b5bc161a06f853a5705c32705539bc0a3572d8b9df38cb7707e201e075e148e48534768dbacd550ebfa3ab836dbb387fa15e630e86e740e87a33
 EBUILD proj-8.2.1.ebuild 1486 BLAKE2B 67bf1c6d3f0852c39c89c70b8c63f104ac2b395b5f5a11263955d60c12cb23d0426e009958af46228e5fc614e89daf432425f2ae44aa35d85509c049388c779b SHA512 318b2d8b027cf84c53246ac8c1c181d30deae0f93db8c3d589691809abaaa8a0d36786f2c9848c2ee3a3e7bb1e6f18da44a8ffcc29cf65c48b20d39010a4080f
 EBUILD proj-9.0.0.ebuild 1512 BLAKE2B 6a8e2546269eab8e2a18caf3ef0521d959497e3998376e027240a847bf22c4e882c888ee02f519f761aa8b57c650a659a765f9bd68e934f9f7c5f4b2caedc3ba SHA512 a2619ffc5229ca6b51f0f73e5449f73cc9860363fdf066734af8ee66211e9067e258de9bda21c4025a55e86e5ecd73a6e4aabc086b08683c74e5f60ae1f9c6e3
+EBUILD proj-9.0.1.ebuild 1512 BLAKE2B 6a8e2546269eab8e2a18caf3ef0521d959497e3998376e027240a847bf22c4e882c888ee02f519f761aa8b57c650a659a765f9bd68e934f9f7c5f4b2caedc3ba SHA512 a2619ffc5229ca6b51f0f73e5449f73cc9860363fdf066734af8ee66211e9067e258de9bda21c4025a55e86e5ecd73a6e4aabc086b08683c74e5f60ae1f9c6e3
 MISC metadata.xml 450 BLAKE2B a29666b3ab3d0e39d3d2ab247f250cd4f9a716ee1f01563e8d6739f507b96f553187999c6fcd501a0f8e9a564f7e5fe3a54c29dd985d1f91873da8252840ebf7 SHA512 c319fbe8249838dc881424641a19abc639d4a74d585e434be1a27802eb9fa88711a1c631ba92abd333d7baaa739b1c98faebe7c20ce7c1a4639d38b9dbe40381
diff --git a/sci-libs/proj/proj-9.0.1.ebuild b/sci-libs/proj/proj-9.0.1.ebuild
new file mode 100644
index 000000000000..8f75a4028225
--- /dev/null
+++ b/sci-libs/proj/proj-9.0.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+# Check https://proj.org/download.html for latest data tarball
+PROJ_DATA="proj-data-1.9.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"
+# Changes on every major release
+SLOT="0/$(ver_cut 1)"
+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_test() {
+	local myctestargs=(
+		# proj_test_cpp_api: https://lists.osgeo.org/pipermail/proj/2019-September/008836.html
+		# testprojinfo: Also related to map data?
+		-E "(proj_test_cpp_api|testprojinfo)"
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	cd data || die
+	dodoc README.DATA
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest
new file mode 100644
index 000000000000..4acd576b8054
--- /dev/null
+++ b/sci-libs/pytorch/Manifest
@@ -0,0 +1,7 @@
+AUX 0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch 599 BLAKE2B 4ad99f05d69f53336e6c874b7783c5fb9e800808c6adf588263af215eda865ddf215df8fa803e48220b879fd2f90d71139a6e38bbdc947abc7854cab88a756ad SHA512 fd0e3db9cb68e14d3d90a613d91511acc752c1d764bada85e6dace59b45fe2cf42bca6b77c281084bd04de88d5fefbb5d81be165d288ed3da251e7b0d4c6e86e
+AUX pytorch-1.6.0-global-dlopen.patch 592 BLAKE2B a5e3742fcb0cf2286a9406e11bade1eea43a11e1982853cf07531cdf7b2c62c3619b8973ead1059faae35e64d3c3ed3ea53407bc9e61e597a828ed8d79c12137 SHA512 28e22b5321cf6e894828bb33a94a3fff14999470fffe941dcb515cd3701630ece41676bbb2d2509bbe8904c5a7016a109770c6192d7c787365184770de933390
+AUX pytorch-1.7.1-torch_shm_manager.patch 441 BLAKE2B 28b87353a0afa0ef25c8ab00e204998b4fb3472fbbb5bb2b300a3fb22d864846d51ccef652ce331484c7a522f7d74e6674c1ceaf26d0a4956d1c8b57b29a7428 SHA512 08f2e5f35768e70713a1432797d9fbe0b133a80ae7dff2898e4b9b51ab398f88bce90a0698b3c9f77bf8a4c5c054911c22931d0684276a0b6d4f2afb69633088
+AUX pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch 1063 BLAKE2B c93cb4c1ff40ef332cd518474a397e9b61d310f4cbdb8701c18749f103533a69e4a3e892f1e3613113cc97ae320951dacb956025ba6be694c5275448d2af3a78 SHA512 7931a220068a36b15ee0f282161f23422acdbef32990bd1eafeab55e06131748f5b4ad93e6a0dc7a4f92e7ebd0595a97835c768b46dd7139f626df666642ce18
+DIST pytorch-1.11.0.tar.gz 20719323 BLAKE2B 24e7aaa2c26821d36f8092542de9d8d5ac85a619fb9fffb5131987958842afb1cad395780662d15f3411a7cc6ff83a445871960eca1e469fcbf0b9895d83d6e0 SHA512 2342eb7a1a241f5855a7cf12e11f62bc4baaa78d1d0864e53bfc946e783eb4addd05ca154a814d2376cd602098b5547e61c158d6eddb7cad5a9f3b0c1357adca
+EBUILD pytorch-1.11.0.ebuild 1342 BLAKE2B f3b4cffbd3d282facdf8965ae43d079edb68171966c909ba7d3757e6557aa9a5bbb35fb88a35efcb511bfa52fd67f88c657247b37597d179cd327eb1fb498b77 SHA512 f33c3cd6c6aba09dd58109589bf34fc616aba285851d1b7eb3cfcd7c7cf1abeff8a343064fb9af5ba4ee91c0d238c0beaad790d51bcf49f47391b6b2285c16dc
+MISC metadata.xml 328 BLAKE2B f49c6d62ac88dfffe497ed05b1f727941a94acb87a809611dda8aedbd87508fdfdf94ec0e025cac2a649b0881b600236289943b4be0f6ca44fc105b6d8fbe97c SHA512 16c29d2c1177a89026235191ea3e33870c2e6b63f029b7febd4dbd2e99f598fab4b4fd2fa7a801ffd88393663a00752300e6e2cc847a83690b715bcc481d9dc2
diff --git a/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch b/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch
new file mode 100644
index 000000000000..640d061fcc59
--- /dev/null
+++ b/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index 2db381644c..2241a33015 100644
+--- a/setup.py
++++ b/setup.py
+@@ -363,13 +363,6 @@ def build_deps():
+     check_submodules()
+     check_pydep('yaml', 'pyyaml')
+ 
+-    build_caffe2(version=version,
+-                 cmake_python_library=cmake_python_library,
+-                 build_python=True,
+-                 rerun_cmake=RERUN_CMAKE,
+-                 cmake_only=CMAKE_ONLY,
+-                 cmake=cmake)
+-
+     if CMAKE_ONLY:
+         report('Finished running cmake. Run "ccmake build" or '
+                '"cmake-gui build" to adjust build options and '
diff --git a/sci-libs/pytorch/files/pytorch-1.6.0-global-dlopen.patch b/sci-libs/pytorch/files/pytorch-1.6.0-global-dlopen.patch
new file mode 100644
index 000000000000..1e9388ff17a6
--- /dev/null
+++ b/sci-libs/pytorch/files/pytorch-1.6.0-global-dlopen.patch
@@ -0,0 +1,15 @@
+Don't hardcode the library path. Leave it to the dynamic loader.
+
+Index: pytorch-1.6.0/torch/__init__.py
+===================================================================
+--- pytorch-1.6.0.orig/torch/__init__.py
++++ pytorch-1.6.0/torch/__init__.py
+@@ -138,7 +138,7 @@ def _load_global_deps():
+     here = os.path.abspath(__file__)
+     lib_path = os.path.join(os.path.dirname(here), 'lib', lib_name)
+ 
+-    ctypes.CDLL(lib_path, mode=ctypes.RTLD_GLOBAL)
++    ctypes.CDLL(lib_name, mode=ctypes.RTLD_GLOBAL)
+ 
+ 
+ if (USE_RTLD_GLOBAL_WITH_LIBTORCH or os.getenv('TORCH_USE_RTLD_GLOBAL')) and \
diff --git a/sci-libs/pytorch/files/pytorch-1.7.1-torch_shm_manager.patch b/sci-libs/pytorch/files/pytorch-1.7.1-torch_shm_manager.patch
new file mode 100644
index 000000000000..69c2ddc5947e
--- /dev/null
+++ b/sci-libs/pytorch/files/pytorch-1.7.1-torch_shm_manager.patch
@@ -0,0 +1,13 @@
+diff --git a/torch/__init__.py b/torch/__init__.py
+index 03f6eca622..297fb169a4 100644
+--- a/torch/__init__.py
++++ b/torch/__init__.py
+@@ -412,7 +412,7 @@ def manager_path():
+ 
+ 
+ # Shared memory manager needs to know the exact location of manager executable
+-_C._initExtension(manager_path())
++_C._initExtension(b"/usr/bin/torch_shm_manager")
+ del manager_path
+ 
+ # Appease the type checker: it can't deal with direct setting of globals().
diff --git a/sci-libs/pytorch/files/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch b/sci-libs/pytorch/files/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch
new file mode 100644
index 000000000000..214267487c95
--- /dev/null
+++ b/sci-libs/pytorch/files/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch
@@ -0,0 +1,32 @@
+From 52019a3f395e5fa97b26d424152d91f73b400f8e Mon Sep 17 00:00:00 2001
+From: Alexey Chernov <4ernov@gmail.com>
+Date: Wed, 13 Nov 2019 23:44:12 +0300
+Subject: [PATCH 5/5] Change library directory according to CMake build
+Modified: Tue, 03 Aug 2021, fit for pytorch-1.9.0
+
+Change `lib_path` in favour of out-of-tree CMake build
+directory, so that all the C++ libraries be found.
+---
+ setup.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 60502b6add..cbced52192 100644
+--- a/setup.py
++++ b/setup.py
+@@ -268,9 +268,10 @@ else:
+ 
+ # Constant known variables used throughout this file
+ cwd = os.path.dirname(os.path.abspath(__file__))
+-lib_path = os.path.join(cwd, "torch", "lib")
++cmake_build_dir = os.environ.get("CMAKE_BUILD_DIR", os.path.join(cwd, "build"))
++lib_path = os.path.join(cmake_build_dir, "lib")
+ third_party_path = os.path.join(cwd, "third_party")
+-caffe2_build_dir = os.path.join(cwd, "build")
++caffe2_build_dir = cmake_build_dir
+ 
+ # CMAKE: full path to python library
+ if IS_WINDOWS:
+-- 
+2.23.0
+
diff --git a/sci-libs/pytorch/metadata.xml b/sci-libs/pytorch/metadata.xml
new file mode 100644
index 000000000000..d12749aa5c21
--- /dev/null
+++ b/sci-libs/pytorch/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pytorch/pytorch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/pytorch/pytorch-1.11.0.ebuild b/sci-libs/pytorch/pytorch-1.11.0.ebuild
new file mode 100644
index 000000000000..0a1cae78f4bb
--- /dev/null
+++ b/sci-libs/pytorch/pytorch-1.11.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Tensors and Dynamic neural networks in Python"
+HOMEPAGE="https://pytorch.org/"
+SRC_URI="https://github.com/pytorch/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RDEPEND="
+	${PYTHON_DEPS}
+	~sci-libs/caffe2-${PV}[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch \
+		"${FILESDIR}"/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch \
+		"${FILESDIR}"/${PN}-1.6.0-global-dlopen.patch \
+		"${FILESDIR}"/pytorch-1.7.1-torch_shm_manager.patch
+
+	# Set build dir for pytorch's setup
+	sed -i \
+		-e "/BUILD_DIR/s|build|/var/lib/caffe2/|" \
+		tools/setup_helpers/env.py \
+		|| die
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	PYTORCH_BUILD_VERSION=${PV} \
+	PYTORCH_BUILD_NUMBER=0 \
+	USE_SYSTEM_LIBS=ON \
+	CMAKE_BUILD_DIR="${BUILD_DIR}" \
+	BUILD_DIR= \
+	distutils-r1_src_compile
+}
+
+src_install() {
+	USE_SYSTEM_LIBS=ON distutils-r1_src_install
+}
diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest
index f14ced4683ec..760a1305cc4a 100644
--- a/sci-libs/rocSPARSE/Manifest
+++ b/sci-libs/rocSPARSE/Manifest
@@ -1,5 +1,6 @@
 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-incorrect-assert.patch 1658 BLAKE2B 26aa66d7d61657eb591f7b345b64211f3cfb47f0a1b656716b32e299799bb8172483b4898878e532f7c6ca3f99bcb4a8789a1b6a913bc40dfebdc144613b0f27 SHA512 bfae11079c621b3372678ade78bea979b751777a48060b5ef26b3567fb89b1cf8591c998e199be649b03157662ef9b4889ca79498b16cf0bf6fbd1b9a532e485
 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
@@ -29,6 +30,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-r3.ebuild 4914 BLAKE2B b61c7bca88d7d063d1d0aa80e9cc7340b5d3f7d58361cfd62f9fe6817086a770cf301db4585acf72ee27e773c8a7a6eb0ad2a0565eb2cd272ab852ed4f50fca0 SHA512 d17bc9537d1c3badf56103849009685cad7459891f5f5747a3fde6e708ee609aeb2bf63d9209d5a9b8bc291b1443c0a0c4dddcfb8cad0c19b82c86c23c4757ab
-EBUILD rocSPARSE-5.0.2.ebuild 4962 BLAKE2B 01aec045e48dffd6cf959a491da5a434f6ef792e9a0ae8cb1956227ef9fa28bc66a32d47d91bd82f219584b3dbbdf02ff9783649217ea8f9f1beab69a362454b SHA512 293f195844c0e99e3bfb86a20728301a2ef0d5673bc6cf2b7c6c163292760f5045fb3ad17fe5ff2d7b89f1c36967d2113b929f0746bb8d2f41f54094432f20c7
+EBUILD rocSPARSE-4.3.0-r3.ebuild 4916 BLAKE2B 350c192f3fa3456d45564eb6dc48ae405df21221fd4d373ba0fe15abebb7ffbbefa3a3938f88530b929c87064cfccaecb260b16e773dd9a8bcd50878139a6d24 SHA512 913d98214489545a4624e9ad774b33cb954ee1cbe5bf14d4910de00695f340a34dd57ecb6e70ba3a6e7539775af90734033b7518f1bc58c3d4e6de5697251277
+EBUILD rocSPARSE-5.0.2.ebuild 5060 BLAKE2B 5801d8816ecf962150ee8a11512f7d90001f9c271cb8eaa0f0ce44f03430767628105e66ab85426904c3f202021b63820ecc4999e55f91265bb8b7efec6f0308 SHA512 2f60b9d2643063f6b767a6ad3d48a7018ab66c1fa62de7e67264a2731638a5eb6e23df26b39ffd6cfb40b9e229613e68e8fd268903050c8ff966a04c142413fd
 MISC metadata.xml 695 BLAKE2B db1c67ff216cd9c9a972c9b388f85f6e762e0a7bddffca1336219ce6ebe39f6a841da4c8c78084d91f48a5bb6a26ad0047a2a1a60915da5110b3a41977f3b641 SHA512 2f246ec382d78e414a00aedcd7a2c871ccf5b74d25d160a0f7d6012feb51c6c12861b5152cac32d3e46d0d1acea7e8b10f42f4b501abb9d778cd3c886331f59c
diff --git a/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-incorrect-assert.patch b/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-incorrect-assert.patch
new file mode 100644
index 000000000000..9baa962c05f5
--- /dev/null
+++ b/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-incorrect-assert.patch
@@ -0,0 +1,34 @@
+From 48b763f01b658dece7f71784fe4362e56167db2f Mon Sep 17 00:00:00 2001
+From: James Sandham <33790278+jsandham@users.noreply.github.com>
+Date: Fri, 28 Jan 2022 10:24:08 -0800
+Subject: [PATCH] remove incorrect assert from spmm_bell (#302)
+
+Co-authored-by: jsandham <james.sandham@amd.com>
+---
+ library/src/level3/rocsparse_bellmm_template_general.cpp | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/library/src/level3/rocsparse_bellmm_template_general.cpp b/library/src/level3/rocsparse_bellmm_template_general.cpp
+index 81f36a32..bbce9a17 100644
+--- a/library/src/level3/rocsparse_bellmm_template_general.cpp
++++ b/library/src/level3/rocsparse_bellmm_template_general.cpp
+@@ -1,6 +1,6 @@
+ /*! \file */
+ /* ************************************************************************
+- * Copyright (c) 2021 Advanced Micro Devices, Inc.
++ * Copyright (c) 2021-2022 Advanced Micro Devices, Inc.
+  *
+  * Permission is hereby granted, free of charge, to any person obtaining a copy
+  * of this software and associated documentation files (the "Software"), to deal
+@@ -101,9 +101,8 @@ rocsparse_status rocsparse_bellmm_template_general(rocsparse_handle          han
+                                                    I                         ldc)
+ {
+     hipStream_t stream = handle->stream;
+-    assert(block_dim > 32);
+-    dim3 bellmm_blocks((mb - 1) / 1 + 1, (n - 1) / 32 + 1);
+-    dim3 bellmm_threads(32, 32, 1);
++    dim3        bellmm_blocks((mb - 1) / 1 + 1, (n - 1) / 32 + 1);
++    dim3        bellmm_threads(32, 32, 1);
+     assert(trans_A == rocsparse_operation_none);
+     //
+     // What happends if A needs to be transposed?
diff --git a/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r3.ebuild b/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r3.ebuild
index f32d34643e14..e9c16ef9287c 100644
--- a/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r3.ebuild
+++ b/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r3.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
 		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 |
+		find "${WORKDIR}" -maxdepth 2 -regextype grep -E -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}"
diff --git a/sci-libs/rocSPARSE/rocSPARSE-5.0.2.ebuild b/sci-libs/rocSPARSE/rocSPARSE-5.0.2.ebuild
index 4203ba70e4de..90733f9a5e59 100644
--- a/sci-libs/rocSPARSE/rocSPARSE-5.0.2.ebuild
+++ b/sci-libs/rocSPARSE/rocSPARSE-5.0.2.ebuild
@@ -59,7 +59,8 @@ 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" )
+	"${FILESDIR}/${PN}-5.0.2-enable-gfx1031.patch"
+	"${FILESDIR}/${PN}-5.0.2-remove-incorrect-assert.patch" )
 
 python_check_deps() {
 	if use test; then
@@ -81,6 +82,8 @@ src_prepare() {
 	# 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
 
+	cmake_src_prepare
+
 	# 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
@@ -89,7 +92,7 @@ src_prepare() {
 		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 |
+		find "${WORKDIR}" -maxdepth 2 -regextype grep -E -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}"
@@ -97,8 +100,6 @@ src_prepare() {
 				eend $?
 			done
 	fi
-
-	cmake_src_prepare
 }
 
 src_configure() {
@@ -125,7 +126,7 @@ src_test() {
 	addwrite /dev/kfd
 	addwrite /dev/dri/
 	cd "${BUILD_DIR}/clients/staging" || die
-	./rocsparse-test || die
+	LD_LIBRARY_PATH="${BUILD_DIR}/library" ./rocsparse-test || die
 }
 
 src_install() {
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 25fa96be482a..77f4ffda74a5 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1,5 +1,8 @@
+AUX ocv.patch 1361 BLAKE2B a1d019c791e4d5d1fd9546fd5756f18a695ad3702c2dae9b83e989723a7aef497eeabc46058f151984e7e6c8e8134fa0f256cb637587e063496bf6becfb72c19 SHA512 6573dfddad74d5b75e59df6122fe42701e5b4e72b4d52c6c0fb41dba207d3261edd27f9e6ec3e548b42a70f65e37cb72615259402b391ebff1a8926c12a63964
 AUX yamlcpp.patch 675 BLAKE2B 269eb1d6f0e276cc6863d4ae8e8a3c73c6264b681a76f9bc32db185ed0c7b3a115b0fd1871569ff0ddb34dfd10c5aaafe658a620f70e4964bf196fd6ad57780c SHA512 fa8aabe06b75c2fdd3be222c4c51de6c5bc9ca9f2444c4e97cb63c910bf572f616cf0ac6381d4bf0a5f5fe07cb520eb6f748a4fcd19cf7cdd89f76a52da6a5bc
 DIST rtabmap-0.20.13.tar.gz 21501493 BLAKE2B eddec6e4812cea231f88263ce136eb535bc099939a482d6fb6de0e6ab3a302c395eb5f6c824d04da8d48a7f7ad9d63b8fa313ae3c21dcada74ec89c7e8130af5 SHA512 4014ec3b7bc2edbd7f361026d5a4be9222b094e398fde68512aab37b3edcb01d47256e4931de6ea1b3bcada9ac81405946e85e774220b9cf43d14a2db6c91118
+DIST rtabmap-0.20.18.tar.gz 21545395 BLAKE2B 1cd7727cc499f0c78fa62f94fca4517e9a5f1eb79e0690683da1c61536542a6d3e342794f4282c92aa725be221fd88afb1f730cc8e431bb9ac293bd73e7146cf SHA512 313b95ba741ecbbec721ce3c339b508e75578f2b85f23739d22ddda5be28c03104e9bb6c4ab8a45ac2225bd72c7b9e84b4c5a5ae7bd4d04b1bb054566be23fff
 EBUILD rtabmap-0.20.13-r1.ebuild 1517 BLAKE2B f6f415f78c97b509432c136a7f94880d66225fa046efc34461fa5041ccdcf2c69ca681498b7cf4465b3df525af9fd6076d1f8b09ab1425bcd63f85584aad28e5 SHA512 47a8781ad4605bed3ef323d870287ac654d393794e261e6e4a5e40f382bb4b7fd7678824a1dd5a4b17943f746c55b15c1959f3d822a15936d002c6e10f21ea99
+EBUILD rtabmap-0.20.18.ebuild 1541 BLAKE2B c30a4dd87b128e3f95b9efe8711a12cfcec05c08f727f97f2743ad92f332572a41445509c64476d3f8d2acb2ecac159f0872afb1d320552498ebfb3b77ff60f8 SHA512 42ce75938cf5960752a8cf1ea3e5b75c72480634c6d6b1df33baebd276ce060c9046fb30c732338ae2bc65c3e4627a8ca58f5713de0579e6b906a70df43c5038
 EBUILD rtabmap-9999.ebuild 1517 BLAKE2B f6f415f78c97b509432c136a7f94880d66225fa046efc34461fa5041ccdcf2c69ca681498b7cf4465b3df525af9fd6076d1f8b09ab1425bcd63f85584aad28e5 SHA512 47a8781ad4605bed3ef323d870287ac654d393794e261e6e4a5e40f382bb4b7fd7678824a1dd5a4b17943f746c55b15c1959f3d822a15936d002c6e10f21ea99
 MISC metadata.xml 472 BLAKE2B 141f2e2a39f7e3e8543c255995ecc14ee3168985e47a4c0882d32fdd884a81ca0aeade5a41092ce5525a54a0ac2802714e2c6031c09af9671682231378918c64 SHA512 a472fd8de805c23ebf8de91fdecab35cb5af78bb971ad10f8e4b23ab97efaffc3f7fa3ffbec457ab120d3fe75f4d021079a67d426f0df022be389f00bc311651
diff --git a/sci-libs/rtabmap/files/ocv.patch b/sci-libs/rtabmap/files/ocv.patch
new file mode 100644
index 000000000000..642f2e1e911b
--- /dev/null
+++ b/sci-libs/rtabmap/files/ocv.patch
@@ -0,0 +1,30 @@
+From cf64b20e1fd5b7aca6f5f708e9b790aa41e799db Mon Sep 17 00:00:00 2001
+From: matlabbe <matlabbe@gmail.com>
+Date: Tue, 10 May 2022 22:47:15 -0400
+Subject: [PATCH] =?UTF-8?q?Fixed=20error:=20=E2=80=98drawAxis=E2=80=99=20i?=
+ =?UTF-8?q?s=20not=20a=20member=20of=20=E2=80=98cv::aruco=E2=80=99=20(open?=
+ =?UTF-8?q?cv=204.5.5)?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ corelib/src/MarkerDetector.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/corelib/src/MarkerDetector.cpp b/corelib/src/MarkerDetector.cpp
+index b59cb9468..2a3957f90 100644
+--- a/corelib/src/MarkerDetector.cpp
++++ b/corelib/src/MarkerDetector.cpp
+@@ -304,7 +304,11 @@ std::map<int, MarkerInfo> MarkerDetector::detect(const cv::Mat & image,
+                 std::map<int, MarkerInfo>::iterator iter = detections.find(ids[i]);
+                 if(iter!=detections.end())
+                 {
++#if CV_MAJOR_VERSION > 4 || (CV_MAJOR_VERSION == 4 && (CV_MINOR_VERSION >1 || (CV_MINOR_VERSION==1 && CV_PATCH_VERSION>=1)))
++                    cv::drawFrameAxes(*imageWithDetections, model.K(), model.D(), rvecs[i], tvecs[i], iter->second.length() * 0.5f);
++#else
+                     cv::aruco::drawAxis(*imageWithDetections, model.K(), model.D(), rvecs[i], tvecs[i], iter->second.length() * 0.5f);
++#endif
+                 }
+ 			}
+ 		}
diff --git a/sci-libs/rtabmap/rtabmap-0.20.18.ebuild b/sci-libs/rtabmap/rtabmap-0.20.18.ebuild
new file mode 100644
index 000000000000..61f45ae6ab9f
--- /dev/null
+++ b/sci-libs/rtabmap/rtabmap-0.20.18.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
+fi
+
+inherit ${SCM} cmake multilib
+
+VER_SUFFIX=rolling
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P}-${VER_SUFFIX}"
+fi
+
+DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
+HOMEPAGE="http://introlab.github.io/rtabmap/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples ieee1394 openni2 qt5"
+
+RDEPEND="
+	media-libs/opencv:=[qt5(-)?]
+	sci-libs/pcl:=[openni,vtk,qt5(-)?]
+	sci-libs/vtk:=[qt5(-)?]
+	sys-libs/zlib
+	sci-libs/octomap:=
+	dev-libs/boost:=
+	dev-cpp/yaml-cpp:=
+	ieee1394? ( media-libs/libdc1394:2= )
+	openni2? ( dev-libs/OpenNI2 )
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/yamlcpp.patch" "${FILESDIR}/ocv.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		"-DWITH_QT=$(usex qt5 ON OFF)"
+		"-DWITH_DC1394=$(usex ieee1394 ON OFF)"
+		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
+		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# Needed since we force ros crawling to be done only in
+	# /usr/share/ros_packages/
+	insinto /usr/share/ros_packages/${PN}
+	doins "${ED}/usr/share/${PN}/package.xml"
+}
diff --git a/sci-libs/rtree/Manifest b/sci-libs/rtree/Manifest
index 5b3eea47728f..6686a31d48d4 100644
--- a/sci-libs/rtree/Manifest
+++ b/sci-libs/rtree/Manifest
@@ -1,3 +1,5 @@
 DIST Rtree-0.9.7.tar.gz 44877 BLAKE2B 4ee5ad4c478ada448a8faa5ba29bdfbb67bc2f688cb8c6f465f4637fbd890cbd997f24573b25a936b7ceb503cc0b7684a1932e6ac91a85e4c37730ee9a6d39f0 SHA512 35b39e29f6d2b9cf4e774191bed69ade515680d07213f0ba74748da11ba916b41c93dfc4f489d7320855f3722ac8b5b58bac4614ea95e6230fcffe33f4332607
+DIST Rtree-1.0.0.tar.gz 48837 BLAKE2B 60e516155e7e48158494b7ea4720dc71ece2111fb94e320976a6dd691d2458b8586c2bf8109a37d86db211ac342d77877b435bdb54627a94c898642e8520a071 SHA512 9a414cd65b27ba35313dd7185dece83f5d7235867f6f0c72c2902d7ffd72808138dbf30d8fe11c8bbf0ec463072e5f6112d75b5fdd5a1dab7720c56d3632d576
 EBUILD rtree-0.9.7.ebuild 642 BLAKE2B 808ded37fc08e2b4a3a56e2492c370217623a5b64a0def61a5ad78849f6b2e1df7b9543e4faf397e4a993b7e23df761c98078a601ac2f9d32ba688a1112b1349 SHA512 32c774abe0eb1c35ee779d22b502799a3275f5d09bd8783015ab8cebc9ce4c10a571dfa5d0b857d54908ef6eb71b5dee1d1359ccaf26bfebab18517bbe0a024c
+EBUILD rtree-1.0.0.ebuild 680 BLAKE2B 1bb55f3624a8fbf761c2656d805272fa7d3c3338b65ff6796aa7c88632a7da4990afc4463c1079611b8d688de4958e1b70c8c2ded9a2a31e754d920361990876 SHA512 5b1f17f16c17be75d7806d2c5e1502d7e6e5165b0d47d438133154c7c2042429327c6d612a2bb11c9b5c72f5ce7e5c27c43f19542cae628f1b243c97129a0470
 MISC metadata.xml 839 BLAKE2B 1a948191fec4142d6c2731639ff99c4185a58231d22683f0541ec557b6b0650d2b4cb1c54238a0d5d6baf1cd7a7fe24722f832306050179b5f6c0a168ffc18ac SHA512 b63ea233bec3285bda6008728a82799c97f7ea544e1800952a53f480e4eedb8a59a2e9e77901785d93ab46eb79ea397d8829c16210bb3bd84820c87a54c7d287
diff --git a/sci-libs/rtree/rtree-1.0.0.ebuild b/sci-libs/rtree/rtree-1.0.0.ebuild
new file mode 100644
index 000000000000..7ec082e7b4e4
--- /dev/null
+++ b/sci-libs/rtree/rtree-1.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+MY_PN="Rtree"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="R-Tree spatial index for Python GIS"
+HOMEPAGE="https://rtree.readthedocs.io"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	sci-libs/libspatialindex
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? ( dev-python/numpy[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
diff --git a/sci-libs/scikit-image/Manifest b/sci-libs/scikit-image/Manifest
index 5899e4a43bbe..173fa0473095 100644
--- a/sci-libs/scikit-image/Manifest
+++ b/sci-libs/scikit-image/Manifest
@@ -1,5 +1,7 @@
 DIST scikit-image-0.17.2.tar.gz 29818001 BLAKE2B 360c5f8c23b8441d145029c09a3b1d1407d4103463497c63274583e6c03d1fc57baa3e6c53909cfaa5daba54d5909fc106e84dc7036f0240ad8de93804ef9f65 SHA512 3ca2511f03d533ac7f1850d72de396dc5493831bce6200f30d426c3f47eff9b25ec9b69e141100dc56e03f2310aab255f92ff4aff8bc7b80d15d669cbe2ebb5e
 DIST scikit-image-0.19.1.tar.gz 22225936 BLAKE2B 86aca2f120c12178d64fd62bce2b5272fc6df345789ed4b1ddee705384e583c7070af7bf885d47ae6769bbfb0676bfeef7fc431abfb10e1618594f31a27a7de8 SHA512 d7ccd4172abc07843a17a2de40240790cbeeb4177c7948cbf74663363ec9cecd3e40e70a245795d88ace57699e178f159198862b4c503fcb3fff95e8ef8f4ed9
+DIST scikit-image-0.19.2.tar.gz 22231106 BLAKE2B b99aa3e70ef01bb8964ed1ec98d14feea87bdef61a9d8590298391f7ead95ba89b287a07e2688e4fa0173ce97c43127c7b0d4b5356ca9d5ea9c2ed596ce99a3a SHA512 366d3e88842fab4febc4bd7dedf8a18a930a36437ea34e8cbe41c6bcfd3d5f59d496856b1a8d3a2f7fc1117563c162209677f2c5776066acc51783aab164db10
 EBUILD scikit-image-0.17.2-r1.ebuild 1187 BLAKE2B cfe9fdb911ede840f3fd4876aeef4281d840ebef24fa9adb88baf6440ebb3dc35a1f10b6c0b6d262ec698df28587103ad1f34cf5ffb387099027531e114bc161 SHA512 9a89cf779e7e244da72abad09c49183fb0038528fe1a80ab1f5a8e3a4442590e7d5cd74c7c350cc0dee64b1b06100269d8dcaec05b8add707698307d70f218f6
 EBUILD scikit-image-0.19.1.ebuild 1435 BLAKE2B 85af932ca4a4526ecf275cbaf21f9573ba3770102217460541a98fe70debb419d1beb2e3059542ce299df1357f7920d680878dbea12ebb17aeb996a070561046 SHA512 e87935c2c74f41a9a709e5a49d7a3ecffc65f5f1d32a35158565c0f913fce0d5a49ded8a38f756ba4013cb818a1453f8ecf4e5ae63fa0241eb8461edcbf73929
+EBUILD scikit-image-0.19.2.ebuild 1634 BLAKE2B dea9f5fd336cc9bc597e6035f243351676def90fb47adcadb118dac22bd4bd8b3f62651653809b516ece9f718d535ad17f6403eff12855994da4d1c47092fcf4 SHA512 cad2e0e886ab4a5e6b8409e0c5090e5c597df6a2bbce8ec4481f725f27164325df316e0ae6f2282fd4559c07ddd597e81da80bfce87e54d49edb0f561ac25232
 MISC metadata.xml 695 BLAKE2B 11487b964bde2ce1a39a8680bc3cc62045c4a7e2e17844de830d5f0e043660c431cd002a2a0fc19acb4c0262289ee280195475dd1f8b35f6a51ce0df369871f8 SHA512 fca83587d443373fc7219911900105676bdba5a7ced07ac00a9ab5cbe361d8ca1175b02b04fa53cdbde6f198a986b21f989baf32139cd76b7d1b2b78034d3142
diff --git a/sci-libs/scikit-image/scikit-image-0.19.2.ebuild b/sci-libs/scikit-image/scikit-image-0.19.2.ebuild
new file mode 100644
index 000000000000..ab2d264aa8f2
--- /dev/null
+++ b/sci-libs/scikit-image/scikit-image-0.19.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Image processing routines for SciPy"
+HOMEPAGE="https://scikit-image.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/imageio[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pywavelets[${PYTHON_USEDEP}]
+	dev-python/scipy[sparse,${PYTHON_USEDEP}]
+	dev-python/tifffile[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+
+DOCS=( CONTRIBUTORS.txt RELEASE.txt )
+
+distutils_enable_tests pytest
+# There is a programmable error in your configuration file:
+#distutils_enable_sphinx doc/source dev-python/numpydoc dev-python/myst_parser
+
+python_test() {
+	# This needs to be run in the install dir
+	cd "${WORKDIR}/${P}-${EPYTHON//./_}/install/usr/lib/${EPYTHON}/site-packages/skimage" || die
+	distutils-r1_python_test
+}
+
+pkg_postinst() {
+	optfeature "FITS io capability" dev-python/astropy
+	optfeature "GTK" dev-python/pygtk
+	optfeature "Parallel computation" dev-python/dask
+	optfeature "io plugin providing most standard formats" dev-python/imread
+	# not in portage yet
+	#optfeature "io plugin providing a wide variety of formats, including specialized formats using in medical imaging." dev-python/simpleitk
+}
diff --git a/sci-libs/scikit-learn/Manifest b/sci-libs/scikit-learn/Manifest
index 267dfb3dead3..8a976a10f119 100644
--- a/sci-libs/scikit-learn/Manifest
+++ b/sci-libs/scikit-learn/Manifest
@@ -1,6 +1,8 @@
 AUX scikit-learn-0.24.2-no-O3.patch 2346 BLAKE2B b4186a3e6a242ac964f4970adf227d2c6512141faf89828df60626aef73ab3d3de9fdeaf5fd31e230d196293b45feb11ff599a31b882ef86e1e563ff9209d7e6 SHA512 a6f2b74c424a000675ad838d95c71e459ca392f600875839cc5a740249a5db08e3d7968f87ae587398259d8dbf5ece91fe114f7c59581a32a03f3e9d183f81e8
 DIST scikit-learn-0.24.2.tar.gz 7589697 BLAKE2B a5a32db690e76d6ecfcb12d57a7f84ebcc7e67ecb73258c1d923f9b98a9d87c46aac96918ef7c3d8741f5dbeb46f169c73a7744fb7b92e6ab5cf42101a6bc2f1 SHA512 2159baf63414b9594918b40e1b72af2ab47349335ad4e3afd9756921f786737ed41d6deb333881e8c5c6e1f7ce9cfa10691b966dc2476c48c051621f9049d2ee
 DIST scikit-learn-1.0.2.tar.gz 6783296 BLAKE2B c5894b83c616117ac69e99d3eafe6b7218e085bfae099b41d09ecafc5cf116d4ef6849e69de2c1d833be1eb1e2479c1d200147ec1fcf73798c4e341dcaaa4d79 SHA512 1921a722ce887e04db94586a8100f435ca26038c32f1841ed8c7d5f17b5c7a3dbf5e036f5b0fca0f9907c32f80db5b082cb04141d14d22719ad78f3cfef51415
+DIST scikit-learn-1.1.1.gh.tar.gz 6896597 BLAKE2B c08bde0c531d221c40eb385ecdaa34e655442704142fe0e59b206ab17fb19ecf76866aad7dcf06f7eff3932be375ccbbdf43e150285b4f829bfb36604c963672 SHA512 366df2f0eea4d7ebf8e02829cd140c90299ee4a572e07e4e153032ffa650a990dd5ffc7d33bf8a23a4c76fdd97e296c801bc1471c79075f5631b1a341eb297ac
 EBUILD scikit-learn-0.24.2.ebuild 1813 BLAKE2B 179cc80ad5984f5179f156ef4114fe1a009d2d6258c758f030e832f191c477b1c1b22758cbbdb51ac95d7ebdc52341f9bba6fde02482dbdccf92c19e82fbf774 SHA512 0877f97ab8bae1392b183fdf26bc7f5036c1b7ddf8c58fab8acf19e6756592aa3c05128e9c34416d11cb2202e7c886b44b5d3929a2bf120d078a52965762dbef
 EBUILD scikit-learn-1.0.2.ebuild 1340 BLAKE2B 1984373b7d7f56884a502dd015ab1803f51e124baa76895a7a3e9f162836dc98f01df8497834857250a0bcd7cedcb9eb76b243ca4d4fdd9195f42f0f57926dbf SHA512 1d731915b21f348458a2443bd577cef7761f1aa644a8c7dbbd5f78762e19280f8bdcb2a041ab8adabc809042ca0889b9e266fcb95d466d2ccc2a34d8d0d68c6a
+EBUILD scikit-learn-1.1.1.ebuild 1529 BLAKE2B 3b307b4ef2f84580e777a08c6051672f05a04ce734cace26a1914154be548dea65de135440283d42c838dead454d97d539c30ddc338c989f33138f2e0675e72e SHA512 04d231193cd26225cee1b0a76fff119b29bbd7db7a5f085eead7c2d308b75f0410936451d058d04f6cb2b783f024daeb30496f6616d36c1d02c75ebaf71aea3e
 MISC metadata.xml 614 BLAKE2B b5425c2d022592581647c9b97c0ab22bfc2afe347b2e5ea22f141245238f145322f39406c62318ba1e6af1462b2691267b39976bfde38faaf1d28b1d29c4e015 SHA512 74ac79123848bc385c29fcfdc4a1e780529dda685c1deb5eb722f5d4919ee6ac9d80798d52c4af0be0cc8dbbaea3784963dd97e2b7c1258cc2f5605b0bc8907a
diff --git a/sci-libs/scikit-learn/scikit-learn-1.1.1.ebuild b/sci-libs/scikit-learn/scikit-learn-1.1.1.ebuild
new file mode 100644
index 000000000000..5877d6d117d6
--- /dev/null
+++ b/sci-libs/scikit-learn/scikit-learn-1.1.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Machine learning library for Python"
+HOMEPAGE="https://scikit-learn.org/stable/"
+SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+# Fatal Python error: Segmentation fault
+RESTRICT="test"
+
+DEPEND="
+	virtual/blas:=
+	virtual/cblas:=
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/wheel[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/joblib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/threadpoolctl[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+# For some reason this wants to use urllib to fetch things from the internet
+# distutils_enable_sphinx doc \
+# 	dev-python/matplotlib \
+# 	dev-python/memory_profiler \
+# 	dev-python/numpydoc \
+# 	dev-python/pandas \
+# 	dev-python/pillow \
+# 	dev-python/seaborn \
+# 	dev-python/sphinx-gallery \
+# 	dev-python/sphinx-prompt \
+# 	sci-libs/scikit-image
+
+python_test() {
+	# This needs to be run in the install dir
+	cd "${WORKDIR}/${P}-${EPYTHON//./_}/install/usr/lib/${EPYTHON}/site-packages/sklearn" || die
+	distutils-r1_python_test
+}
+
+python_install_all() {
+	find "${S}" -name \*LICENSE.txt -delete || die
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index b53987c8563b..bc387e631132 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -1,10 +1,5 @@
-DIST scotch-v6.1.0.tar.gz 6292006 BLAKE2B 5b76b01c0fa752468a36830a15c190cd78efc851c3b6831eb2d16b7cf34a71d55463b266ffdee4c6addd4e66ca7caf75e63825051e600ee8a32494e5033cabbd SHA512 e6d217a23e39635f8749811a3fc64c8da14d0396a71b4042a4f8f3ce32ff1f0b4ed033ebae90f3785443dae9b35ded68ea512ed1e3e7f9ea9a471a499ae26b89
-DIST scotch-v6.1.1.tar.gz 6363384 BLAKE2B 337c81608fd245dde5b19bb6c79924e0ee80181ce3c935ae37e6248be2511a2f4d70bdda5b9217e5e1ed79fc00269de15755c3b6829579aa190ca6da9c3c2dac SHA512 daa62463f25416764250fe0452ae84bc6a2e485ee62a387418b4686c2ab93a2ca2d5a12cba922857c99a1c9ec67fc82951b0f9563ab97f5f3a6b86bb9da22b0c
 DIST scotch-v6.1.2.tar.gz 6395320 BLAKE2B 07aa4f56c097cf364d7d63613f3c5d5d3f2a8419ce27da95a4a20d5ea48fcf2f036acaa62ab1f591b5d1dc672151562bc0721a66f203c60d5ee26a501cf90352 SHA512 dcf63c65bf8155590a70483f80ad21b4a303debf50d47a3c154983935dc056f3df93a61c3d88304f3d1a4517ab3a355e176d72b3835382cd65c1556fbbd21702
 DIST scotch-v7.0.1.tar.gz 6838403 BLAKE2B 48cb928bf8586bbbe206dcb4f685e6c392ae078f5493e0384776cf6788137361286adbebceb7ad5c171eced34f5dda3f4852092413e79cbb791bd3ced204784c SHA512 c3267d5c8785a2258af3baf999d2c1eb75ef361062e74962b6e985a75cc4f5ef1f79919759ba1b7cf028f94d06a5ddf3818108a97eca4123a11d7750b5d7093d
-EBUILD scotch-6.1.0-r1.ebuild 4948 BLAKE2B 4856a6123e7663f65de9cef8855875b45faa1dcd208e6a9833d4a255ca7cda7a82222e64a21ca3cfa9a1c9955af69e83ef13241c103ae81593fefb72be3b3187 SHA512 a469054850e7bc409d1f5e69f98d3d52337b4108f88aa0ed9fc9136c407e950be912b9c16aec452c010eee8ad77c3db3ce36035c83c0e143e9dacf79f006513c
-EBUILD scotch-6.1.0.ebuild 4942 BLAKE2B abbe129155d654ca4bf9ea5be27a703f44beb31bf2626042f763120ecdf70aad3a145e2dee2068b34038d92d634d29fe189353176eed242f37487aa62cf2f874 SHA512 4364a04ccfd41d423d439072a45be468ce844b916fd2f302e0e4dc7585217ff39ed0e52406fb96016e5b457606175b64c118f9d525629ed506bf11c700548d9e
-EBUILD scotch-6.1.1.ebuild 4957 BLAKE2B 66fe678726e0d48fa2e0d4eaa2147accd72088629b9ff7a250e7d2893a513e201032e3092a84b12b4150f6ef5005f5f6602fcd69bd57ef14e4bf56791c2db7b8 SHA512 c02acd26fa18fba7d8b04a4bb38e0b51b920abbc629c71033e2e1edfd65ad95a893c5309d96d90b660a58afa311aed898e7001a9767374452ec7d497299a2a5b
 EBUILD scotch-6.1.2.ebuild 4951 BLAKE2B 3d3e5e04719603bb8af5794a7f9b3cf650f142df1a8a30904e2d5791a32e99af5fe75f630aec51bbee425f8b49b0ce7b987c7f25439e5268c906a3eece0ab9bf SHA512 c3371fd91658a459675e945f0a5287967ead597af4d4f83243b1dba01ad84d754558f170cb480cefa65d0a03ddfc541346c2400846408ae486dc19e4f5d0185a
 EBUILD scotch-7.0.1-r1.ebuild 4955 BLAKE2B c0a41b850ecef6cf64045baabf46a5faa12b96f8d6f291115f5c927327ca1cd6ddb70b61d43baf56f6bb05a109c039596c8d24a0bdab0e6d84e19566927aad36 SHA512 f730bbf00a5b19f5b6760460b38fc7b3f10f383022c1b838c072338023489e3041d90cb298c87cfb99a6ca8130bc6f600b9ddab1b3187a504425dd458d5686d9
 MISC metadata.xml 1169 BLAKE2B 33a4a76609e0b19a5b6f90556abc534dd36dc8b0c3baa1111197aaa0d8ff0bb29302ac52f67deb6b3f625eaad59fe18a25fb966086c67c53778202fc10d3e06c SHA512 282c23c6725a838a36b1f9a28ae3c96d2854cb988ba2563440d07f45adeb0c6dca642aa41d8ca88165a5d9e5ebeebf350e61b6466bdb785aa5669e7310d4374b
diff --git a/sci-libs/scotch/scotch-6.1.0-r1.ebuild b/sci-libs/scotch/scotch-6.1.0-r1.ebuild
deleted file mode 100644
index d6ca0e868e39..000000000000
--- a/sci-libs/scotch/scotch-6.1.0-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic multilib
-
-SOVER=$(ver_cut 1)
-
-DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
-HOMEPAGE="https://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/ https://gitlab.inria.fr/scotch/scotch"
-SRC_URI="https://gitlab.inria.fr/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="CeCILL-2"
-SLOT="0/${SOVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc int64 mpi static-libs test tools threads"
-# bug #532620
-REQUIRED_USE="test? ( threads )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sys-libs/zlib
-	mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-static_to_shared() {
-	local libstatic=${1}; shift
-	local libname=$(basename ${libstatic%.a})
-	local soname=${libname}$(get_libname ${SOVER})
-	local libdir=$(dirname ${libstatic})
-
-	einfo "Making ${soname} from ${libstatic}"
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
-			-Wl,-all_load -Wl,${libstatic} \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-	else
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-shared -Wl,-soname=${soname} \
-			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-		VERS_COMP=${PV//.}
-		[[ "${#VERS_COMP}" -gt 1 ]] && \
-			ln -s ${soname} ${libdir}/${libname}$(get_libname ${SOVER})
-		ln -s ${soname} ${libdir}/${libname}$(get_libname)
-	fi
-}
-
-src_prepare() {
-	default
-	use int64 && append-cflags -DINTSIZE64 -DIDXSIZE64
-	if use threads; then
-		append-cflags "-DSCOTCH_PTHREAD_NUMBER=$(nproc)"
-	else
-		append-cflags "-DSCOTCH_PTHREAD_NUMBER=1"
-		sed -i \
-			-e 's/ -DSCOTCH_PTHREAD//' \
-			src/Make.inc/Makefile.inc.i686_pc_linux3 || die
-	fi
-
-	# Be careful with replacing here, bug #577272
-	sed -e "s/= gcc$/= $(tc-getCC)/" \
-		-e "s/-O3/${CFLAGS} -pthread/" \
-		-e "s/= ar$/= $(tc-getAR)/" \
-		-e "s/= ranlib$/= $(tc-getRANLIB)/" \
-		-e "s/= ranlib$/= $(tc-getRANLIB)/" \
-		-e "/^LDFLAGS/ s/$/ ${LDFLAGS}/" \
-		src/Make.inc/Makefile.inc.i686_pc_linux3 > src/Makefile.inc || die
-}
-
-src_compile() {
-	emake -C src CLIBFLAGS=-fPIC scotch esmumps
-	static_to_shared lib/libscotcherr.a
-	static_to_shared lib/libscotcherrexit.a
-	static_to_shared lib/libscotch.a -Llib -lz -lm -lrt -lpthread -lscotcherr
-	static_to_shared lib/libesmumps.a -Llib -lscotch
-	static_to_shared lib/libscotchmetis.a -Llib -lscotch
-
-	if use mpi; then
-		emake -C src CLIBFLAGS=-fPIC ptscotch ptesmumps
-		export LINK=mpicc
-		static_to_shared lib/libptscotcherr.a
-		static_to_shared lib/libptscotcherrexit.a
-		static_to_shared lib/libptscotch.a -Llib -lscotch -lptscotcherr -lz -lm -lrt
-		static_to_shared lib/libptesmumps.a -Llib -lscotch -lptscotch
-		static_to_shared lib/libptscotchparmetis.a -Llib -lscotch -lptscotch
-	fi
-	if use static-libs; then
-		emake -C src clean
-		emake -C src
-		use mpi && emake -C src ptscotch
-	fi
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/lib" emake -C src check
-}
-
-src_install() {
-	dolib.so lib/lib*$(get_libname)*
-	use static-libs && dolib.a lib/*.a
-
-	#install metis headers into a subdir
-	#to allow usage of real metis and scotch
-	#in the same code
-	insinto /usr/include/scotch/metis
-	doins include/*metis*
-	rm include/*metis*
-	insinto /usr/include/scotch
-	doins include/*
-
-	cat <<-EOF > scotchmetis.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: scotchmetis
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch
-		Private: -lm -lz -lrt
-		Cflags: -I\${includedir}/scotch/metis
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins scotchmetis.pc
-
-	# not sure it is actually a full replacement of metis
-	#alternatives_for metis scotch 0 \
-	#	/usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc
-
-	if use mpi; then
-		cat <<-EOF > ptscotchparmetis.pc
-			prefix=${EPREFIX}/usr
-			libdir=\${prefix}/$(get_libdir)
-			includedir=\${prefix}/include
-			Name: ptscotchparmetis
-			Description: ${DESCRIPTION}
-			Version: ${PV}
-			URL: ${HOMEPAGE}
-			Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch
-			Private: -lm -lz -lrt
-			Cflags: -I\${includedir}/scotch/metis
-			Requires: scotchmetis
-		EOF
-			insinto /usr/$(get_libdir)/pkgconfig
-			doins ptscotchparmetis.pc
-			# not sure it is actually a full replacement of parmetis
-			#alternatives_for metis-mpi ptscotch 0 \
-			#	/usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc
-	fi
-
-	dodoc README.txt
-
-	if use tools; then
-		local b m
-		pushd bin > /dev/null || die
-		for b in *; do
-			newbin ${b} scotch_${b}
-		done
-		popd > /dev/null || die
-
-		pushd man/man1 > /dev/null || die
-		for m in *.1; do
-			newman ${m} scotch_${m}
-		done
-		popd > /dev/null || die
-	fi
-
-	use doc && dodoc doc/*.pdf
-}
diff --git a/sci-libs/scotch/scotch-6.1.0.ebuild b/sci-libs/scotch/scotch-6.1.0.ebuild
deleted file mode 100644
index 60cc08c6645a..000000000000
--- a/sci-libs/scotch/scotch-6.1.0.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic multilib
-
-SOVER=$(ver_cut 1)
-
-DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
-HOMEPAGE="https://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/ https://gitlab.inria.fr/scotch/scotch"
-SRC_URI="https://gitlab.inria.fr/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="CeCILL-2"
-SLOT="0/${SOVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc int64 mpi static-libs test tools threads"
-# bug #532620
-REQUIRED_USE="test? ( threads )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sys-libs/zlib
-	mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-static_to_shared() {
-	local libstatic=${1}; shift
-	local libname=$(basename ${libstatic%.a})
-	local soname=${libname}$(get_libname ${SOVER})
-	local libdir=$(dirname ${libstatic})
-
-	einfo "Making ${soname} from ${libstatic}"
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
-			-Wl,-all_load -Wl,${libstatic} \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-	else
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-shared -Wl,-soname=${soname} \
-			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-		VERS_COMP=${PV//.}
-		[[ "${#VERS_COMP}" -gt 1 ]] && \
-			ln -s ${soname} ${libdir}/${libname}$(get_libname ${SOVER})
-		ln -s ${soname} ${libdir}/${libname}$(get_libname)
-	fi
-}
-
-src_prepare() {
-	default
-	use int64 && append-cflags -DIDXSIZE64
-	if use threads; then
-		append-cflags "-DSCOTCH_PTHREAD_NUMBER=$(nproc)"
-	else
-		append-cflags "-DSCOTCH_PTHREAD_NUMBER=1"
-		sed -i \
-			-e 's/ -DSCOTCH_PTHREAD//' \
-			src/Make.inc/Makefile.inc.i686_pc_linux3 || die
-	fi
-
-	# Be careful with replacing here, bug #577272
-	sed -e "s/= gcc$/= $(tc-getCC)/" \
-		-e "s/-O3/${CFLAGS} -pthread/" \
-		-e "s/= ar$/= $(tc-getAR)/" \
-		-e "s/= ranlib$/= $(tc-getRANLIB)/" \
-		-e "s/= ranlib$/= $(tc-getRANLIB)/" \
-		-e "/^LDFLAGS/ s/$/ ${LDFLAGS}/" \
-		src/Make.inc/Makefile.inc.i686_pc_linux3 > src/Makefile.inc || die
-}
-
-src_compile() {
-	emake -C src CLIBFLAGS=-fPIC scotch esmumps
-	static_to_shared lib/libscotcherr.a
-	static_to_shared lib/libscotcherrexit.a
-	static_to_shared lib/libscotch.a -Llib -lz -lm -lrt -lpthread -lscotcherr
-	static_to_shared lib/libesmumps.a -Llib -lscotch
-	static_to_shared lib/libscotchmetis.a -Llib -lscotch
-
-	if use mpi; then
-		emake -C src CLIBFLAGS=-fPIC ptscotch ptesmumps
-		export LINK=mpicc
-		static_to_shared lib/libptscotcherr.a
-		static_to_shared lib/libptscotcherrexit.a
-		static_to_shared lib/libptscotch.a -Llib -lscotch -lptscotcherr -lz -lm -lrt
-		static_to_shared lib/libptesmumps.a -Llib -lscotch -lptscotch
-		static_to_shared lib/libptscotchparmetis.a -Llib -lscotch -lptscotch
-	fi
-	if use static-libs; then
-		emake -C src clean
-		emake -C src
-		use mpi && emake -C src ptscotch
-	fi
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}/lib" emake -C src check
-}
-
-src_install() {
-	dolib.so lib/lib*$(get_libname)*
-	use static-libs && dolib.a lib/*.a
-
-	#install metis headers into a subdir
-	#to allow usage of real metis and scotch
-	#in the same code
-	insinto /usr/include/scotch/metis
-	doins include/*metis*
-	rm include/*metis*
-	insinto /usr/include/scotch
-	doins include/*
-
-	cat <<-EOF > scotchmetis.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: scotchmetis
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch
-		Private: -lm -lz -lrt
-		Cflags: -I\${includedir}/scotch/metis
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins scotchmetis.pc
-
-	# not sure it is actually a full replacement of metis
-	#alternatives_for metis scotch 0 \
-	#	/usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc
-
-	if use mpi; then
-		cat <<-EOF > ptscotchparmetis.pc
-			prefix=${EPREFIX}/usr
-			libdir=\${prefix}/$(get_libdir)
-			includedir=\${prefix}/include
-			Name: ptscotchparmetis
-			Description: ${DESCRIPTION}
-			Version: ${PV}
-			URL: ${HOMEPAGE}
-			Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch
-			Private: -lm -lz -lrt
-			Cflags: -I\${includedir}/scotch/metis
-			Requires: scotchmetis
-		EOF
-			insinto /usr/$(get_libdir)/pkgconfig
-			doins ptscotchparmetis.pc
-			# not sure it is actually a full replacement of parmetis
-			#alternatives_for metis-mpi ptscotch 0 \
-			#	/usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc
-	fi
-
-	dodoc README.txt
-
-	if use tools; then
-		local b m
-		pushd bin > /dev/null || die
-		for b in *; do
-			newbin ${b} scotch_${b}
-		done
-		popd > /dev/null || die
-
-		pushd man/man1 > /dev/null || die
-		for m in *.1; do
-			newman ${m} scotch_${m}
-		done
-		popd > /dev/null || die
-	fi
-
-	use doc && dodoc doc/*.pdf
-}
diff --git a/sci-libs/scotch/scotch-6.1.1.ebuild b/sci-libs/scotch/scotch-6.1.1.ebuild
deleted file mode 100644
index 7075116f20e0..000000000000
--- a/sci-libs/scotch/scotch-6.1.1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic multilib
-
-SOVER=$(ver_cut 1)
-
-DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
-HOMEPAGE="https://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/ https://gitlab.inria.fr/scotch/scotch"
-SRC_URI="https://gitlab.inria.fr/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="CeCILL-2"
-SLOT="0/${SOVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc int64 mpi static-libs test tools +threads"
-# bug #532620
-REQUIRED_USE="test? ( threads )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sys-libs/zlib
-	mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-static_to_shared() {
-	local libstatic=${1}; shift
-	local libname=$(basename ${libstatic%.a})
-	local soname=${libname}$(get_libname ${SOVER})
-	local libdir=$(dirname ${libstatic})
-
-	einfo "Making ${soname} from ${libstatic}"
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
-			-Wl,-all_load -Wl,${libstatic} \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-	else
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-shared -Wl,-soname=${soname} \
-			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-		VERS_COMP=${PV//.}
-		[[ "${#VERS_COMP}" -gt 1 ]] && \
-			ln -s ${soname} ${libdir}/${libname}$(get_libname ${SOVER})
-		ln -s ${soname} ${libdir}/${libname}$(get_libname)
-	fi
-}
-
-src_prepare() {
-	default
-	use int64 && append-cflags -DIDXSIZE64
-	if use threads; then
-		append-cflags "-DSCOTCH_PTHREAD_NUMBER=$(nproc)"
-	else
-		append-cflags "-DSCOTCH_PTHREAD_NUMBER=1"
-		sed -i \
-			-e 's/ -DSCOTCH_PTHREAD//' \
-			src/Make.inc/Makefile.inc.i686_pc_linux3 || die
-	fi
-
-	# Be careful with replacing here, bug #577272
-	sed -e "s/= gcc$/= $(tc-getCC)/" \
-		-e "s/-O3/${CFLAGS} -pthread/" \
-		-e "s/= ar$/= $(tc-getAR)/" \
-		-e "s/= ranlib$/= $(tc-getRANLIB)/" \
-		-e "s/= ranlib$/= $(tc-getRANLIB)/" \
-		-e "/^LDFLAGS/ s/$/ ${LDFLAGS}/" \
-		src/Make.inc/Makefile.inc.i686_pc_linux3 > src/Makefile.inc || die
-}
-
-src_compile() {
-	emake -C src CLIBFLAGS=-fPIC scotch esmumps
-	static_to_shared lib/libscotcherr.a
-	static_to_shared lib/libscotcherrexit.a
-	static_to_shared lib/libscotch.a -Llib -lz -lm -lrt -lpthread -lscotcherr
-	static_to_shared lib/libesmumps.a -Llib -lscotch
-	static_to_shared lib/libscotchmetis.a -Llib -lscotch
-
-	if use mpi; then
-		emake -C src CLIBFLAGS=-fPIC ptscotch ptesmumps
-		export LINK=mpicc
-		static_to_shared lib/libptscotcherr.a
-		static_to_shared lib/libptscotcherrexit.a
-		static_to_shared lib/libptscotch.a -Llib -lscotch -lptscotcherr -lz -lm -lrt
-		static_to_shared lib/libptesmumps.a -Llib -lscotch -lptscotch
-		static_to_shared lib/libptscotchparmetis.a -Llib -lscotch -lptscotch
-	fi
-	if use static-libs; then
-		emake -C src clean
-		emake -C src
-		use mpi && emake -C src ptscotch
-	fi
-}
-
-src_test() {
-	tc-export FC
-	LD_LIBRARY_PATH="${S}/lib" emake -C src check
-}
-
-src_install() {
-	dolib.so lib/lib*$(get_libname)*
-	use static-libs && dolib.a lib/*.a
-
-	#install metis headers into a subdir
-	#to allow usage of real metis and scotch
-	#in the same code
-	insinto /usr/include/scotch/metis
-	doins include/*metis*
-	rm include/*metis*
-	insinto /usr/include/scotch
-	doins include/*
-
-	cat <<-EOF > scotchmetis.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: scotchmetis
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch
-		Private: -lm -lz -lrt
-		Cflags: -I\${includedir}/scotch/metis
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins scotchmetis.pc
-
-	# not sure it is actually a full replacement of metis
-	#alternatives_for metis scotch 0 \
-	#	/usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc
-
-	if use mpi; then
-		cat <<-EOF > ptscotchparmetis.pc
-			prefix=${EPREFIX}/usr
-			libdir=\${prefix}/$(get_libdir)
-			includedir=\${prefix}/include
-			Name: ptscotchparmetis
-			Description: ${DESCRIPTION}
-			Version: ${PV}
-			URL: ${HOMEPAGE}
-			Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch
-			Private: -lm -lz -lrt
-			Cflags: -I\${includedir}/scotch/metis
-			Requires: scotchmetis
-		EOF
-			insinto /usr/$(get_libdir)/pkgconfig
-			doins ptscotchparmetis.pc
-			# not sure it is actually a full replacement of parmetis
-			#alternatives_for metis-mpi ptscotch 0 \
-			#	/usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc
-	fi
-
-	dodoc README.txt
-
-	if use tools; then
-		local b m
-		pushd bin > /dev/null || die
-		for b in *; do
-			newbin ${b} scotch_${b}
-		done
-		popd > /dev/null || die
-
-		pushd man/man1 > /dev/null || die
-		for m in *.1; do
-			newman ${m} scotch_${m}
-		done
-		popd > /dev/null || die
-	fi
-
-	use doc && dodoc doc/*.pdf
-}
diff --git a/sci-libs/stellarsolver/Manifest b/sci-libs/stellarsolver/Manifest
index 08a48cd0d453..bece3663ae2d 100644
--- a/sci-libs/stellarsolver/Manifest
+++ b/sci-libs/stellarsolver/Manifest
@@ -1,6 +1,4 @@
 AUX stellarsolver-2.2-fix-implicit-vasprintf-decl.patch 3269 BLAKE2B b20b91d09de085aa6473b9bce472054fc4aba1516d782694e4351beda79b763347ec8012312b1384fbf1894747071dc20b4a25ca7bb2894382281fba528bc30e SHA512 026fc39584b73d2b90a26a1ad9028f94a6e63095f793da8f3fd185d48a7d055369d8e257f4032271d9a4729a499ccb051c8df1e2c559ff77f21f2ec1767518de
-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 727 BLAKE2B ba31f186567b87a571bfeb0f58a7da8c1037891cb98a991cf9f57e338d7c2eae01e55a299ef072f5bad3132ae3c5b95ef1e6fcf01763d09fa356d8ae9415144a SHA512 a2feb145f24a6d6554b9cf2d2cd1c000f546b420982c35ded7271a764400996e3009780320cc1b7e32a210caf9f3457aa67331f2879368cb566b14e309d35f21
+EBUILD stellarsolver-2.2.ebuild 726 BLAKE2B 69c0c81e5ae55303b250a9a2623cf03438336f569273e3e720e4a020af0417d49ec06f0939fd597268099bdc5aa824883fd5993791d86143897bbb8141360894 SHA512 64d19d43a0cd417083868cf47decc48c3efcbd50cbf209998d480ab096e54f51de20d8fc036a36e0cbe88b17e1f66edc226e79926faedd62ba8e5619d414f59f
 MISC metadata.xml 464 BLAKE2B 4d73483b37f92bd6a6a112d27c17ce7c8c0165cb3400f10c3a5ed5a65bcaa6e2e0d892d305834fc813655258173552cdef75431d9798491d0b124de1dbb6f035 SHA512 3cc978f381b4435b05712e69733336ec7e89963d4b236059c21b4bf7f08b899e617243ef5df0e27c2ef21e59197b97fcf414c1964b86b215d0c355c4f88cac77
diff --git a/sci-libs/stellarsolver/stellarsolver-1.9.ebuild b/sci-libs/stellarsolver/stellarsolver-1.9.ebuild
deleted file mode 100644
index 745064e47d62..000000000000
--- a/sci-libs/stellarsolver/stellarsolver-1.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Cross-platform Sextractor and Astrometry.net-Based internal astrometric solver"
-HOMEPAGE="https://github.com/rlancaste/stellarsolver"
-SRC_URI="https://github.com/rlancaste/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	sci-libs/cfitsio:=
-	sci-libs/gsl:=
-	sci-astronomy/wcslib:=
-"
-DEPEND="${RDEPEND}"
diff --git a/sci-libs/stellarsolver/stellarsolver-2.2.ebuild b/sci-libs/stellarsolver/stellarsolver-2.2.ebuild
index a4a83b616757..e33679de6897 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/sundials/Manifest b/sci-libs/sundials/Manifest
index afb5b6d03aa9..100da425d423 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -2,6 +2,8 @@ AUX sundials-5.2.0-fix-license-install-path.patch 468 BLAKE2B e2c9963f3c528cbe84
 AUX sundials-5.8.0-fix-license-install-path.patch 874 BLAKE2B 134158ced2c1850aedb7599f6c2de33adc7b63f60ccce831f494006b41664acf31ccf838ca9715c4470309648935b194a0706f487cdc6e4b1a3ba52c0ca3c941 SHA512 7775dd78cd4dfbf647087058126314305232657c6f32d4811bc181902d925cee51142e92e2f50c15c02475b2b6c4f1c7be70a223dbf838b9205a811ed9fca4a9
 DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f
 DIST sundials-5.8.0.tar.gz 24012815 BLAKE2B f707ad7465218532f3dc4df7627b87933b2bc52be6f1ad290b91ab83a3414ae83bc64503126af8772daa000f58a89855d7ca35fe74fa21bd91180695582442c7 SHA512 d22e699aaddaeef026e91e18dd070d06278c75b6980b36c6fb2e50203ba6445420e4a8e0612a6317dcaa521aeffbdf62ab88737be235ef70cef3a8be02a13dbb
-EBUILD sundials-5.2.0.ebuild 2191 BLAKE2B 522ba0de818acec9ae05b929a032b6ae43389b215d53ff84ef296024fe18c893d60af374d3a1433ca8c46b5e32f0163c4142b1ba5d00ce3ffe76acc7bdf6e3b2 SHA512 4c1b05f3c4bb9160d20bff5e43a1b7d1d05529cacc8676f19056a7865f52081d1c9e07b8c535b7e8b8ad2c163f76622c5063d43003ee365f7cb591dcfdd2a9ef
-EBUILD sundials-5.8.0.ebuild 2777 BLAKE2B 5bc6e47e4dc53fe64453b27e682f9b4abd56c72b4cfb840706e995894156deef3069dcc62a3e3ba2a653270f0bdb91ad07feb0670336864bfddb60a82049f1a7 SHA512 47ce09f541247c8892310d547506529a94e8b3b56a90d829c1ce93b69401370206ca3567a2286150588c1b5bfbf97b3849d6bb33b137102f306e02e2028697a3
+DIST sundials-6.2.0.tar.gz 82410068 BLAKE2B c6aa9735198465bb458590ef1a90101e246202632afd6bd7f48970b9a2752810ce8c5be7983097cd816189cb994efbddf8d34706665846c67d6442bd7c12db38 SHA512 0dd0a2bf6390a13a5846caf440aa6d459f3890f6d13c0eff8c8180a92a636d6eae7f64679d45acd2048de742d4c644e2ae112cb09028b3fdef10a247bee44c0b
+EBUILD sundials-5.2.0.ebuild 2173 BLAKE2B c7765f5fbb12395c2474f352a3200225cb2ec75360fa2089bf34ee0ddb313d136b0e66ad1955936bac2bf6f6e63bca055e7077d46fb92a69771417c51b86fb9a SHA512 00d5b62fabe026e5637cd655dc53ba12e4ff8db286b451e79a993b18ef09dcbce58805424c903bfb35ebbfcd2881873f91cfb63faa353f1789bd95fba7f17a17
+EBUILD sundials-5.8.0.ebuild 2759 BLAKE2B 2f2872218e337cda6e067925f4f67ce4021a284d0d4badb31737efd6fc0917808769c24b74df4086aaef08384bd36dd744358b9d797da08c40d34f5b1aa34bdc SHA512 7cdaed08db6eab4713df5477d3051d009881cb1ef38714496618f56f831ab9e3973a0b37092cc716512c5d8dc6ed73cbb7da2fb46d0373b066290c48993cd805
+EBUILD sundials-6.2.0.ebuild 2724 BLAKE2B 6fcb90fccbe4129c3a1f60f79016f0f1ec49c123628d73368c29b9d1678ef93188280a890816ae18c46601b922a3ddffa923e14021cde909197780351c12284e SHA512 c3041f39a729f7cffd7d7b4ba8529d29ce2966ca182125a89ad11d0d86be27b5aa7590aacc85dd2d1b2a1a57fe1339ff00c10ae647a5f9c8a1e0fa7f8d5c1ac4
 MISC metadata.xml 1131 BLAKE2B f898dfbe0da057432c5c0549d850293224137cb07d234721894752821b638f3002a1d17a06c4258b94fbc2d0e4ce5e9ee2b06c1099c473989de36b62001f2d63 SHA512 f53a7aec4b5ebc0f7737938f811e4c87842a07b03c423715296ad2992e353f661022eb2bb344e33fb03d70af6e4ffdf1908a34bdbafc3ebe9d30fa7f4bd7cad1
diff --git a/sci-libs/sundials/sundials-5.2.0.ebuild b/sci-libs/sundials/sundials-5.2.0.ebuild
index c99c2b643966..5af24cd4ed75 100644
--- a/sci-libs/sundials/sundials-5.2.0.ebuild
+++ b/sci-libs/sundials/sundials-5.2.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
@@ -31,11 +31,13 @@ DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-		ewarn "OpenMP is not available in your current selected gcc"
-		die "need openmp capable gcc"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	use fortran && fortran-2_pkg_setup
 }
 
 src_prepare() {
diff --git a/sci-libs/sundials/sundials-5.8.0.ebuild b/sci-libs/sundials/sundials-5.8.0.ebuild
index 623a8cee16ed..517e32342ded 100644
--- a/sci-libs/sundials/sundials-5.8.0.ebuild
+++ b/sci-libs/sundials/sundials-5.8.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=8
@@ -39,11 +39,13 @@ PATCHES=(
 		"${FILESDIR}"/${P}-fix-license-install-path.patch
 )
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-		ewarn "OpenMP is not available in your current selected gcc"
-		die "need openmp capable gcc"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	use fortran && fortran-2_pkg_setup
 }
 
 src_prepare() {
diff --git a/sci-libs/sundials/sundials-6.2.0.ebuild b/sci-libs/sundials/sundials-6.2.0.ebuild
new file mode 100644
index 000000000000..bc44870f0732
--- /dev/null
+++ b/sci-libs/sundials/sundials-6.2.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90 2003"
+# if FFLAGS and FCFLAGS are set then should be equal
+
+inherit cmake flag-o-matic fortran-2 toolchain-funcs
+
+DESCRIPTION="Suite of nonlinear solvers"
+HOMEPAGE="https://computing.llnl.gov/projects/sundials"
+SRC_URI="https://github.com/LLNL/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fortran hypre +int64 lapack mpi openmp sparse +static-libs superlumt threads"
+REQUIRED_USE="
+	fortran? ( static-libs )
+	hypre? ( mpi )
+"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	lapack? ( virtual/lapack )
+	mpi? (
+		sci-libs/hypre:=[fortran?,mpi?]
+		virtual/mpi[fortran?]
+	)
+	sparse? ( sci-libs/klu )
+	superlumt? ( sci-libs/superlu_mt:=[int64=] )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.8.0-fix-license-install-path.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	# bug #707240
+	append-cflags -fcommon
+	use threads && append-ldflags -pthread
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs+=(
+		-DBUILD_FORTRAN_MODULE_INTERFACE=$(usex fortran)
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DENABLE_HYPRE=$(usex hypre)
+		-DENABLE_KLU=$(usex sparse)
+		-DENABLE_LAPACK=$(usex lapack)
+		-DENABLE_MPI=$(usex mpi)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PTHREAD=$(usex threads)
+		-DENABLE_SUPERLUMT=$(usex superlumt)
+		-DEXAMPLES_INSTALL=ON
+		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
+		-DSUNDIALS_INDEX_SIZE="$(usex int64 64 32)"
+		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
+		-DSUPERLUMT_LIBRARY="-lsuperlu_mt"
+		-DUSE_GENERIC_MATH=ON
+	)
+
+	if use examples; then
+		mycmakeargs+=(
+			-DEXAMPLES_ENABLE_C=ON
+			-DEXAMPLES_ENABLE_CXX=ON
+		)
+		if use fortran; then
+			mycmakeargs+=(
+				-DEXAMPLES_ENABLE_F77=ON
+				-DEXAMPLES_ENABLE_F90=ON
+				-DEXAMPLES_ENABLE_F2003=ON
+			)
+		fi
+	fi
+
+	if use fortran; then
+		mycmakeargs+=(
+			-DFortran_INSTALL_MODDIR="${EPREFIX}/usr/$(get_libdir)/fortran"
+		)
+	fi
+
+	if use hypre; then
+		mycmakeargs+=(
+			-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
+			-DHYPRE_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libHYPRE.so"
+		)
+	fi
+
+	if use sparse; then
+		mycmakeargs+=(
+			-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc doc/*/*.pdf
+}
diff --git a/sci-libs/superlu_mt/Manifest b/sci-libs/superlu_mt/Manifest
index d49def4fb329..a5183fe2f844 100644
--- a/sci-libs/superlu_mt/Manifest
+++ b/sci-libs/superlu_mt/Manifest
@@ -1,5 +1,5 @@
 AUX superlu_mt-3.1-duplicate-symbols.patch 7284 BLAKE2B 6402f745b280c02dfb4b0fadee120c9def38819d01c5e00406f68a812a06f3d86d4ac0ee799e3abe7b081737d2566bfb6ad981f7768ac29b3a2ad0b0bc147ee1 SHA512 b233677071ce175116454614b6289faa80f60ef0dfeee728bc4a1a7603ce8490c93e63ba635d1db231c92a055dee5cdbeff2793a2e138fa688efc18bd72b693f
 AUX superlu_mt-3.1-fix-predefs.patch 606 BLAKE2B e372ddc40a61c09203a439e28becb91e720909f481212b2dda2a9dfe9a924aa218b2c34e066f9d9617a84c7d1cc3658f1bc09d9bd2d8415be47d374d7946d8c6 SHA512 8242236118033bcd9b4fb0562f2820c2d42d72c887d2124cdd9a224e2946266371b3fe3f6717a46b89e2af35ad76facd22dc75e931ece804df2deda7d5926810
 DIST superlu_mt_3.1.tar.gz 1824440 BLAKE2B 6355c624eca13a6ad7fa0e6100b3a548215d93aafc5958b9a0e693b3333006e4b1e98facddf352f62ef1632c8528cb39a85ca15509abf046d32f8d97335749c5 SHA512 41b8d9808f6a9c3f8d9e983ab253b0c5aec486df1cc419d043a201bd950034fa4bdd5465410e1198a2314d072b92cb388fc117165a06f820922f04060c755971
-EBUILD superlu_mt-3.1-r1.ebuild 2615 BLAKE2B c522c9a924accc3757a5d3f2b51a2452e635d2f422a83bd026dcdfdc86bf57c8b58351bdc678508d1009289817495b0aa4c26fff434972883313e44df7abfba0 SHA512 6923af456f9b97a8948c4daa85e8d320fa323f6d7d8b23142334f71a7f397ab076d8582f7e60056bc676e7e67d5fbc3dc994e940cae0b5221eea53fe34d46b01
+EBUILD superlu_mt-3.1-r1.ebuild 2606 BLAKE2B 1ddbea18b3f1b3196255dbeccfc416e7ee54c2b1ed6ecef9dc3460bb931fe747b01d15e967a9b0819bfd303a583ddf2d881b363f379a52b89b4b44198bec1ae5 SHA512 df827f4797387137e6d0d1d77b28eb0fc265a157e6725c2cff24871c08ae6bad41885efa3927cdabd62a5883ba69a76bf5eba09d6d7ed0ac5e411261e4cfd616
 MISC metadata.xml 1472 BLAKE2B 75500639996e0b9e541913a3e8c65b094f38e79615e8cc07cb99c6b889259458c0cff14414004452fe320034bb7c442efa112b9eab75a853890a0c780b4850b8 SHA512 914c5f3d6e8e00e678db0c266278971a7586f7ddc06441954c6b31c272efb2e45fce7e5d93017fdee3075337a0b01f653d4d1854fc028a8e850f448ba729d969
diff --git a/sci-libs/superlu_mt/superlu_mt-3.1-r1.ebuild b/sci-libs/superlu_mt/superlu_mt-3.1-r1.ebuild
index ec84973ee7d0..adfa9a6f3431 100644
--- a/sci-libs/superlu_mt/superlu_mt-3.1-r1.ebuild
+++ b/sci-libs/superlu_mt/superlu_mt-3.1-r1.ebuild
@@ -31,18 +31,12 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.1-fix-predefs.patch
 )
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && ! use threads && tc-check-openmp
+}
+
 pkg_setup() {
-	if use openmp && ! use threads; then
-		if [[ "$(tc-getCC)" == *gcc ]] && ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-		CTHREADS="-D__OPENMP"
-		[[ "$(tc-getCC)" == *gcc ]] && LDTHREADS="-fopenmp"
-	else
-		CTHREADS="-D__PTHREAD"
-		LDTHREADS="-pthread"
-	fi
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && ! use threads && tc-check-openmp
 }
 
 src_prepare() {
@@ -68,6 +62,14 @@ src_prepare() {
 		-e '/:.*$(SUPERLULIB)/s|../lib/$(SUPERLULIB)||g' \
 		-e 's|../lib/$(SUPERLULIB)|-lsuperlu_mt|g' \
 		-i EXAMPLE/Makefile || die
+
+	if use openmp && ! use threads; then
+		CTHREADS="-D__OPENMP"
+		LDTHREADS="-fopenmp"
+	else
+		CTHREADS="-D__PTHREAD"
+		LDTHREADS="-pthread"
+	fi
 }
 
 src_compile() {
diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest
index 65214ee0a5a2..9666c8cc1d86 100644
--- a/sci-libs/symengine/Manifest
+++ b/sci-libs/symengine/Manifest
@@ -1,11 +1,8 @@
-AUX symengine-0.7.0-boost-1.77.patch 607 BLAKE2B 8f9c6103369e83413667dc65fcacea8301d4c0535d0620b9cce2b9d082f635512a2a75f973425da137b5b64f6096a285c8997c8f5561025b936bbd9ba2e428d2 SHA512 12166126fad2927d3f68af17f1cb58134f17ac4dcd7b31eb47ee0c21327c9f55fe7f35a913b7400983c8c806fafcdf62c48eef516ec66383c7e416ccd3757fd8
 AUX symengine-0.7.0-cmake-build-type.patch 1234 BLAKE2B b416e9b83db5eb6689bb9e18682d8f36f6ec13a4fe368004d2c3f961945cb0d1ec94081cb2c99bb16656439214cfd127a21cad2844a4752cd5c2fa6f40f3a3dc SHA512 d5e09a9603fab4caa9d9b091a0636be5ab8eddea6cb5b37b184ff7a65ac9707536f1a71e1893e0b5f795efb33396ae653d2745487aa863f7a239c63e42d22032
-DIST symengine-0.6.0.tar.gz 763481 BLAKE2B 37fe94ad08463b31c7387ab296b201a4dda821ba59dfa548d0c42e70d23958bae24df3f035bd3fffb46cc08cc010d13a25e607a9e0644e9b3c0602fa0eb363b3 SHA512 cc6f0468534e5bcd466a810d44f9884b17858ca6c7151cdcadb3af0f7d8faf0d96697d5887ab65fc9094de80df825f8243dabc54e3f5c387be544880f49b482b
-DIST symengine-0.7.0.tar.gz 802307 BLAKE2B de207f565f179deae37479eec82dfced3d83bfb7e643b4e6969135e10130dd05c888f34aa75c76c238ff1babfd0864f3329c3deee126b84ec33c4937c11dc20c SHA512 fd3198bc4a05ca2b9b8a58039cc21af65b44457f295362a1a9b8dbf9c6e3df5186c0c84b289bc9fe85d9efd5ac1a683f6b7ba9a661fb6d913d6ceefb14ee2348
+AUX symengine-0.8.1-fix_llvm.patch 2674 BLAKE2B f7d493318389f63a8b61f47ee2ba6429d205e91fec3f94a5c45a062622fa7b6c29ab410fb04a260d98f983402e4e74103ca591ea3aa035c68bd4e431dfde371f SHA512 683e9acac3f6304e2ac1d2c67304d1e6a2fc6915115a201a870e29253c804e378b39d8d00298a70ac5a4e1456a153febe69d63cfbab821b31cda46fc94782131
+AUX symengine-0.9.0-pthread-cmake.patch 1973 BLAKE2B c66e3b3eb8895ac27e1a294632a1496a23271c1c315ea0781c50f48dc02ea35795759900ae152f942a2246bafd777398195d851ee9b8910f29216d92f4227a76 SHA512 7c76371c6892b6faf0848b0d25f895f37b56e318ade48eff27ac2fabe830a17dd317a48641d47cee0e4eaa689898d54c675dd5f6d01ba29d233255aaa0b9c86a
 DIST symengine-0.8.1.tar.gz 733007 BLAKE2B b218674bd4cc1eb5b5ebf7ec9d69093d3ab0d25c5fd302430457189ff56f44cb56640fab380a7415fdc241e9c7e3e1a4199ec8063a54b9358b35f0ab8076f05a SHA512 b83b354a722c589cf262fbfad902b277a7232ae2b949ff97f4ad8f654c44965f15eae7d78e87045a42dd6ee5f6f6f67af0a2c4def8899db430fc17e3360696a9
 DIST symengine-0.9.0.tar.gz 878574 BLAKE2B 32c37ca6575b3f7e37184c80c2df74ebf7bb7846537e951be6c888994b8dc049c1ed2a6f51da1c1cfb038e0a47393b18acff60cfef665c5a5e714beb9b0ecb12 SHA512 dceca49ddb6e2ac7c4f8ecb73ce19824cbaa3eff41ad0f50008e403498121184b4e9dc660628dbd8e4db979f8c16b83a709a40540f7834954ab01f9854e12caa
-EBUILD symengine-0.6.0-r1.ebuild 2216 BLAKE2B 4d9be11362f6b7b5a7727d32a7c78d95bc9d0a53287cedd127cb270f445b6e1b0af29c3414390c89ab21839c404310dc830ff4338cfbf66fa3504eb95e1fddef SHA512 135c11c561c74e6e337d0525ee8ad093fcd94ad3610d237a950c6f0e123aeeced09556201a34b893fe33e4f5d6115059f9ca422fd1441423447a30da8b61bcc9
-EBUILD symengine-0.7.0-r1.ebuild 2307 BLAKE2B 58738cdf35d5656e25cbeec02bbba2d9d847ecb21fabb65163b957d52a5edf7a010628ced7891f79905a7f31a33452040c149b31a6525ddcde00707dadebf8b5 SHA512 1817320a9de0950a17295edb02bb1f0685e030916133d55039a9b8087bbfeb2d076a33b6dab22e79912a8bcbcfad7c457d850b5500ba1a43afd8934504189975
-EBUILD symengine-0.8.1-r1.ebuild 2263 BLAKE2B f452bd2334c12daaa62d66fa0aa8af88fc712403ff00e6326c6974bcb723c717ebe162a26fa6b5dd36ab021e094b4abe2cc59ad4271f7326f0180b592407c8e6 SHA512 ee425d08b3f264ebae3ec28f829e0adb42dbc9e3abe2d83bf8f82b4db035559e5b87a887e7d9a6cb910e2ea0b69329029d96d8e26b4f6425ea7296e2e1565cee
-EBUILD symengine-0.9.0.ebuild 2506 BLAKE2B 00dd886354362a51a34155046792477d415a7783c7a65be763206eb2bd84ecf71fbac16784d032245cb144e549ca0740acfa51d65685642c3f78bd027f932dc8 SHA512 bcc2feec0af7335c10499a4b0fed09bfc6e6eddc6b62e636665bad534802073ad8f8c348155fd293d184290982a426bc3d370178ebcadebb336203db2869c61e
+EBUILD symengine-0.8.1-r2.ebuild 2386 BLAKE2B 6147d12c2fdabec0f92337d89da05ba8e09ae4d281e766b13617cb59f180167b887b3acb1577bdbc04d52bc4e75af30891f36d83c3bcbeff1cd569afbf44cdb9 SHA512 f0c45508d7ddf1e357d6764022132def42ab2e0d22eaaf82b00644fab25c3cc443664335f96c94221fa4616287fd32b85403284eea38371d2733a96ccce4ff6f
+EBUILD symengine-0.9.0-r2.ebuild 2619 BLAKE2B 53fa816f959d8382b9501e467f896e8576d3d27d9f26fe17fa56f1feac067c426fd9d34064298af713d969eba69ca349c3cb861c50722327a0a663f9a6a0e535 SHA512 846146c45383d9c81146030e1cbc5be835abc7955fe11a2cc16b2433ddaeb88ddb5298c99d97444b75f465587afdde697bf59248860167a36e187043765b9549
 MISC metadata.xml 1270 BLAKE2B e52ff12980457252a05195ef47bd90e52816794948169473a597e263d744d163cbe42d35e995243daf6b8664f1ed7d41879b63927606187277cdf503fc7bf846 SHA512 4fd6f340d1d4952774eb0fcd47d9ed6e9f145bd83ba7bd04fe428faa96ec63b6cd62173b6ead116a649471fe9b6466be7bbb48c8e534b3203f232f9a7bae12b9
diff --git a/sci-libs/symengine/files/symengine-0.7.0-boost-1.77.patch b/sci-libs/symengine/files/symengine-0.7.0-boost-1.77.patch
deleted file mode 100644
index c4d6dc28e8f8..000000000000
--- a/sci-libs/symengine/files/symengine-0.7.0-boost-1.77.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/symengine/symengine/commit/ceae675dccd593f119f3010d46e133de74fc01bc
-https://bugs.gentoo.org/808057
-
-From: Liam Keegan <liam@keegan.ch>
-Date: Mon, 31 May 2021 21:31:02 +0200
-Subject: [PATCH] use list initialization for int parameter since type depends
- on boost version
-
---- a/symengine/mp_boost.cpp
-+++ b/symengine/mp_boost.cpp
-@@ -279,7 +279,7 @@ unsigned long mp_scan1(const integer_class &i)
-     if (i == 0) {
-         return ULONG_MAX;
-     }
--    return find_lsb(i, int_<0>());
-+    return find_lsb(i, {});
- }
- 
- // define simple 2x2 matrix with exponentiation by repeated squaring
diff --git a/sci-libs/symengine/files/symengine-0.8.1-fix_llvm.patch b/sci-libs/symengine/files/symengine-0.8.1-fix_llvm.patch
new file mode 100644
index 000000000000..810e2ac766d7
--- /dev/null
+++ b/sci-libs/symengine/files/symengine-0.8.1-fix_llvm.patch
@@ -0,0 +1,68 @@
+From: Matthias Maier <tamiko@43-1.org>
+Date: Sat, 11 Jun 2022 01:44:54 -0500
+Subject: [PATCH] Fix cmake configure for shared LLVM libraries
+
+Gentoo builds LLVM into a combined shared library. The CMake
+configuration shipped with LLVM is evidently broken in this case, see
+
+  https://github.com/llvm/llvm-project/issues/34593
+  https://bugs.gentoo.org/745915
+
+We work around this issue by simply linking against the monolithic
+"LLVM" target.
+---
+ CMakeLists.txt | 23 +----------------------
+ 1 file changed, 1 insertion(+), 22 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cf5ab3b..dfa6605 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -402,28 +402,7 @@ if (WITH_LLVM)
+     endforeach()
+     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
+ 
+-    llvm_map_components_to_libnames(llvm_libs_direct ${SYMENGINE_LLVM_COMPONENTS})
+-    llvm_expand_dependencies(llvm_libs ${llvm_libs_direct})
+-
+-    if (BUILD_SHARED_LIBS)
+-        set(SYMENGINE_LLVM_LINK_DOWNSTREAM_DEFAULT False)
+-        foreach(LLVM_LIB ${llvm_libs})
+-            get_target_property(${LLVM_LIB}_IMPORT_LOCATION ${LLVM_LIB} LOCATION)
+-            if (NOT "${${LLVM_LIB}_IMPORT_LOCATION}" MATCHES "NOTFOUND")
+-                if (NOT "${${LLVM_LIB}_IMPORT_LOCATION}" MATCHES ".a$|.lib$")
+-                    set(SYMENGINE_LLVM_LINK_DOWNSTREAM_DEFAULT True)
+-                endif()
+-            endif()
+-        endforeach()
+-    else()
+-        set(SYMENGINE_LLVM_LINK_DOWNSTREAM_DEFAULT True)
+-    endif()
+-    set(SYMENGINE_LLVM_LINK_DOWNSTREAM ${SYMENGINE_LLVM_LINK_DOWNSTREAM_DEFAULT}
+-        CACHE INTERNAL "Link to llvm in SymEngineConfig.cmake")
+-    if (NOT SYMENGINE_LLVM_LINK_DOWNSTREAM)
+-        unset(SYMENGINE_LLVM_COMPONENTS)
+-    endif ()
+-    set(LIBS ${LIBS} ${llvm_libs})
++    set(LIBS ${LIBS} LLVM)
+     include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
+     set(HAVE_SYMENGINE_LLVM yes)
+     set(PKGS ${PKGS} "LLVM")
+diff --git a/cmake/SymEngineConfig.cmake.in b/cmake/SymEngineConfig.cmake.in
+index b01ef9b..6d82c10 100644
+--- a/cmake/SymEngineConfig.cmake.in
++++ b/cmake/SymEngineConfig.cmake.in
+@@ -67,9 +67,7 @@ set(SYMENGINE_LLVM_COMPONENTS @SYMENGINE_LLVM_COMPONENTS@)
+ 
+ if (NOT "${SYMENGINE_LLVM_COMPONENTS}" STREQUAL "")
+     find_package(LLVM REQUIRED ${SYMENGINE_LLVM_COMPONENTS} HINTS @LLVM_DIR@)
+-    llvm_map_components_to_libnames(llvm_libs_direct ${SYMENGINE_LLVM_COMPONENTS})
+-    llvm_expand_dependencies(llvm_libs ${llvm_libs_direct})
+-    set(SYMENGINE_LIBRARIES ${SYMENGINE_LIBRARIES} ${llvm_libs})
++    set(SYMENGINE_LIBRARIES ${SYMENGINE_LIBRARIES} LLVM)
+ else()
+     set(SYMENGINE_LLVM_INCLUDE_DIRS)
+ endif()
+-- 
+2.35.1
+
diff --git a/sci-libs/symengine/files/symengine-0.9.0-pthread-cmake.patch b/sci-libs/symengine/files/symengine-0.9.0-pthread-cmake.patch
new file mode 100644
index 000000000000..0fa049dbf218
--- /dev/null
+++ b/sci-libs/symengine/files/symengine-0.9.0-pthread-cmake.patch
@@ -0,0 +1,63 @@
+From 6ad9620ffc578abdb920b84ea5e393c726389ac0 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 8 Jun 2022 06:02:25 +0100
+Subject: [PATCH] cmake: fix pthread detection
+
+The homebrew FindPTHREAD.cmake module was hardcoding the path to libpthread
+in the installed CMake config file which broke consumers when upgrading from
+< glibc-2.34 (e.g. glibc-2.33 -> glibc-2.34).
+
+CMake provides FindThreads which does the job fine for us. Tested with both
+glibc-2.33 (with a previously bad generated file, and then fixed) and glibc-2.35.
+
+This should be fine on musl and friends too. This brings symengine in line
+with most CMake packages.
+
+Bug: https://bugs.gentoo.org/849803
+Fixes: https://github.com/symengine/symengine/issues/1910
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -335,11 +335,10 @@ if (WITH_PIRANHA)
+ endif()
+ 
+ if (WITH_PTHREAD)
+-    find_package(PTHREAD REQUIRED)
+-    include_directories(SYSTEM ${PTHREAD_INCLUDE_DIRS})
+-    set(LIBS ${LIBS} ${PTHREAD_TARGETS})
++    find_package(Threads)
++    set(THREADS_PREFER_PTHREAD_FLAG ON)
++    set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT})
+     set(HAVE_SYMENGINE_PTHREAD yes)
+-    set(PKGS ${PKGS} "PTHREAD")
+ endif()
+ 
+ if (WITH_MPFR)
+@@ -761,10 +760,6 @@ if (WITH_BOOST)
+ endif()
+ 
+ message("WITH_PTHREAD: ${WITH_PTHREAD}")
+-if (WITH_PTHREAD)
+-    message("PTHREAD_INCLUDE_DIRS: ${PTHREAD_INCLUDE_DIRS}")
+-    message("PTHREAD_LIBRARIES: ${PTHREAD_LIBRARIES}")
+-endif()
+ 
+ message("WITH_MPC: ${WITH_MPC}")
+ if (WITH_MPC)
+--- a/cmake/FindPTHREAD.cmake
++++ /dev/null
+@@ -1,14 +0,0 @@
+-include(LibFindMacros)
+-
+-libfind_include(pthread.h pthread)
+-libfind_library(pthread pthread)
+-
+-set(PTHREAD_LIBRARIES ${PTHREAD_LIBRARY})
+-set(PTHREAD_INCLUDE_DIRS ${PTHREAD_INCLUDE_DIR})
+-set(PTHREAD_TARGETS pthread)
+-
+-include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(PTHREAD DEFAULT_MSG PTHREAD_LIBRARIES
+-    PTHREAD_INCLUDE_DIRS)
+-
+-mark_as_advanced(PTHREAD_INCLUDE_DIR PTHEARD_LIBRARY)
+
diff --git a/sci-libs/symengine/symengine-0.6.0-r1.ebuild b/sci-libs/symengine/symengine-0.6.0-r1.ebuild
deleted file mode 100644
index 1454ac3431a0..000000000000
--- a/sci-libs/symengine/symengine-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-inherit cmake flag-o-matic toolchain-funcs
-
-DESCRIPTION="Fast symbolic manipulation library, written in C++"
-HOMEPAGE="https://github.com/sympy/symengine"
-SRC_URI="https://github.com/sympy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="arb benchmarks boost debug doc ecm flint llvm mpc mpfr openmp test tcmalloc threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/gmp:=
-	sys-libs/binutils-libs:=
-	arb? ( sci-mathematics/arb:= )
-	boost? ( dev-libs/boost:= )
-	ecm? ( sci-mathematics/gmp-ecm )
-	flint? ( sci-mathematics/flint:= )
-	mpc? ( dev-libs/mpc:= )
-	tcmalloc? ( dev-util/google-perftools )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-"
-
-pkg_pretend() {
-	use openmp && [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "s|DESTINATION doc| DESTINATION share/doc/${PF}/html|" \
-		-e "s|/lib|/$(get_libdir)|g" \
-		-e "s|lib/|$(get_libdir)/|g" \
-		-e "/DESTINATION/s|lib|$(get_libdir)|g" \
-		-i CMakeLists.txt symengine/CMakeLists.txt \
-		symengine/utilities/teuchos/CMakeLists.txt || die
-}
-
-src_configure() {
-	# not in portage yet: piranha
-	local int_class
-	if use arb || use flint; then
-		int_class=flint
-	elif use mpfr; then
-		int_class=gmpxx
-	elif use boost; then
-		int_class=boostmp
-	else
-		int_class=gmp
-	fi
-	local mycmakeargs=(
-		-DINTEGER_CLASS="${int_class}"
-		-DBUILD_BENCHMARKS="$(usex benchmarks)"
-		-DBUILD_DOXYGEN="$(usex doc)"
-		-DBUILD_TESTS="$(usex test)"
-		-DWITH_ARB="$(usex arb)"
-		-DWITH_BFD="$(usex debug)"
-		-DWITH_SYMENGINE_ASSERT="$(usex debug)"
-		-DWITH_SYMENGINE_THREAD_SAFE="$(usex threads)"
-		-DWITH_FLINT="$(usex flint)"
-		-DWITH_OPENMP="$(usex openmp)"
-		-DWITH_MPFR="$(usex mpfr)"
-		-DWITH_MPC="$(usex mpc)"
-		-DWITH_LLVM="$(usex llvm)"
-		-DWITH_PTHREAD="$(usex threads)"
-		-DWITH_TCMALLOC="$(usex tcmalloc)"
-		-DWITH_ECM="$(usex ecm)"
-	)
-	use arb && mycmakeargs+=( -DARB_INCLUDE_DIR="${EPREFIX}/usr/include" )
-
-	test-flag-CXX -std=c++11 && append-cxxflags -std=c++11
-	cmake_src_configure
-}
diff --git a/sci-libs/symengine/symengine-0.7.0-r1.ebuild b/sci-libs/symengine/symengine-0.7.0-r1.ebuild
deleted file mode 100644
index 8b1becc43784..000000000000
--- a/sci-libs/symengine/symengine-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic toolchain-funcs
-
-DESCRIPTION="Fast symbolic manipulation library, written in C++"
-HOMEPAGE="https://github.com/sympy/symengine"
-SRC_URI="https://github.com/sympy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="arb benchmarks boost debug doc ecm flint llvm mpc mpfr openmp test tcmalloc threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/gmp:=
-	sys-libs/binutils-libs:=
-	arb? ( sci-mathematics/arb:= )
-	boost? ( dev-libs/boost:= )
-	ecm? ( sci-mathematics/gmp-ecm )
-	flint? ( sci-mathematics/flint:= )
-	mpc? ( dev-libs/mpc:= )
-	tcmalloc? ( dev-util/google-perftools )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.7.0-cmake-build-type.patch"
-	"${FILESDIR}/${PN}-0.7.0-boost-1.77.patch"
-)
-
-pkg_pretend() {
-	use openmp && [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "s|DESTINATION doc| DESTINATION share/doc/${PF}/html|" \
-		-e "s|/lib|/$(get_libdir)|g" \
-		-e "s|lib/|$(get_libdir)/|g" \
-		-e "/DESTINATION/s|lib|$(get_libdir)|g" \
-		-i CMakeLists.txt symengine/CMakeLists.txt \
-		symengine/utilities/teuchos/CMakeLists.txt || die
-}
-
-src_configure() {
-	# not in portage yet: piranha
-	local int_class
-
-	if use arb || use flint; then
-		int_class=flint
-	elif use mpfr; then
-		int_class=gmpxx
-	elif use boost; then
-		int_class=boostmp
-	else
-		int_class=gmp
-	fi
-
-	local mycmakeargs=(
-		-DINTEGER_CLASS="${int_class}"
-		-DBUILD_BENCHMARKS="$(usex benchmarks)"
-		-DBUILD_DOXYGEN="$(usex doc)"
-		-DBUILD_TESTS="$(usex test)"
-		-DWITH_ARB="$(usex arb)"
-		-DWITH_BFD="$(usex debug)"
-		-DWITH_SYMENGINE_ASSERT="$(usex debug)"
-		-DWITH_SYMENGINE_THREAD_SAFE="$(usex threads)"
-		-DWITH_FLINT="$(usex flint)"
-		-DWITH_OPENMP="$(usex openmp)"
-		-DWITH_MPFR="$(usex mpfr)"
-		-DWITH_MPC="$(usex mpc)"
-		-DWITH_LLVM="$(usex llvm)"
-		-DWITH_PTHREAD="$(usex threads)"
-		-DWITH_TCMALLOC="$(usex tcmalloc)"
-		-DWITH_ECM="$(usex ecm)"
-	)
-	use arb && mycmakeargs+=( -DARB_INCLUDE_DIR="${EPREFIX}/usr/include" )
-
-	test-flag-CXX -std=c++11 && append-cxxflags -std=c++11
-	cmake_src_configure
-}
diff --git a/sci-libs/symengine/symengine-0.8.1-r1.ebuild b/sci-libs/symengine/symengine-0.8.1-r2.ebuild
index 68c0939697b8..93bc13fbc646 100644
--- a/sci-libs/symengine/symengine-0.8.1-r1.ebuild
+++ b/sci-libs/symengine/symengine-0.8.1-r2.ebuild
@@ -30,11 +30,16 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.7.0-cmake-build-type.patch"
+	"${FILESDIR}"/${PN}-0.7.0-cmake-build-type.patch
+	"${FILESDIR}"/${PN}-0.8.1-fix_llvm.patch
 )
 
 pkg_pretend() {
-	use openmp && [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_prepare() {
diff --git a/sci-libs/symengine/symengine-0.9.0.ebuild b/sci-libs/symengine/symengine-0.9.0-r2.ebuild
index c4f5a9c49a23..52ecab72e67c 100644
--- a/sci-libs/symengine/symengine-0.9.0.ebuild
+++ b/sci-libs/symengine/symengine-0.9.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/symengine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 # BUILD_FOR_DISTRIBUTION enables threads by default so do it here
 IUSE="arb benchmarks boost debug doc ecm +flint llvm +mpc +mpfr openmp test tcmalloc +threads"
 RESTRICT="!test? ( test )"
@@ -31,15 +31,17 @@ DEPEND="${RDEPEND}
 BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.7.0-cmake-build-type.patch"
+	"${FILESDIR}"/${PN}-0.7.0-cmake-build-type.patch
+	"${FILESDIR}"/${PN}-0.8.1-fix_llvm.patch
+	"${FILESDIR}"/${PN}-0.9.0-pthread-cmake.patch
 )
 
 pkg_pretend() {
-	use openmp && [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 pkg_setup() {
-	use openmp && [[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 
 	use llvm && llvm_pkg_setup
 }
diff --git a/sci-libs/symmetrica/Manifest b/sci-libs/symmetrica/Manifest
index b3c5a4746fcd..905ab97f2cdd 100644
--- a/sci-libs/symmetrica/Manifest
+++ b/sci-libs/symmetrica/Manifest
@@ -1,3 +1,3 @@
 DIST symmetrica-3.0.1.tar.xz 789336 BLAKE2B 88521356bdc006413e0922b49b23f345da96bbe8cb2a4a6ae12bf53fe46150078f086e6d1f6e514817453f2a868b6eb578b716c05f5459397ed8d766d321ec24 SHA512 1e4c42e1ae9fcdf246dff1c1f01522d6cd416c12302363f82356018847df2f64d2f5ea6256459832d195e8e333ae14743794d5a53346e92d8ba1bb1c0949c271
 EBUILD symmetrica-3.0.1.ebuild 530 BLAKE2B b9a3cd7f3edacb76e66acceae8385a7c86bdb353cc460c22b7ea3a955c24e3f45dc4dda3ef571b6b11975917d598f9419c89f30601bc20eb6c9de807e3dbdd49 SHA512 7915db0df900b3cd85c0633beaa280fefd9556a59c3a9917120edf4301dc480da1887c9242a2f015a576e3582e5de08539aada45ed54cda60550e15201c40649
-MISC metadata.xml 789 BLAKE2B 3c2a8e6deffce4bf791da0e2a0009b42a5e9ae94e7311fce239c53faae0c60b71f862ae39d3d4201bcde0438c493dfb82ea4a9e5f736c92a2ba3f901b178ed8d SHA512 b2ea369de62bcdf7b2e10ab69a25dee1b278ef88a3bf921bace29301ca94a954d61ad5d2d45631469a4e648df8173d80d1a29b8682c231235ebc1b41c4f8deb9
+MISC metadata.xml 770 BLAKE2B 6a6035b830992a2d990f2bc0de458622f15c2d423f270ee542d6af9af128032f41108a9b9c3d40360e6847c0fe4c5bb10ca68564246a2c8ee2f2a96b3bb79d4e SHA512 aa5e5ea606826363afe447924f02f7800197dce9ef928558ff9a3b6f95bb3229747e42c4e004bcb76fd0faea34f9d807c6b720ffdd16b9b35e394f1330386f09
diff --git a/sci-libs/symmetrica/metadata.xml b/sci-libs/symmetrica/metadata.xml
index 478938a9d0fc..dd46d20f6c33 100644
--- a/sci-libs/symmetrica/metadata.xml
+++ b/sci-libs/symmetrica/metadata.xml
@@ -19,6 +19,6 @@
   </maintainer>
 
   <upstream>
-    <remote-id type="gitlab">https://gitlab.com/sagemath/symmetrica</remote-id>
+    <remote-id type="gitlab">sagemath/symmetrica</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/ta-lib/Manifest b/sci-libs/ta-lib/Manifest
index fc4d6fb4169d..1ebaf264f933 100644
--- a/sci-libs/ta-lib/Manifest
+++ b/sci-libs/ta-lib/Manifest
@@ -1,4 +1,6 @@
 AUX ta-lib-0.4.0-asneeded.patch 3304 BLAKE2B 5350248ae6511136ed09f66faca62021175b4c98030e271f98f08ad948b8b7795eeba84d44b4e808217da76e163a1f1cbcd1dde052de6a8f2351d53947728328 SHA512 aa43a9cd5382eb43cce2dd64325a36fd88bdae7969c3c191ddbbc7ed726145d7cd1cca17196093c7b4af63a95d3a118d6f2e93ff5d021105091056a325042123
+AUX ta-lib-0.4.0-slibtool.patch 3093 BLAKE2B ac4390830fdb25157cb6a0a85b7ff408f32a324effdc5dfc2d4bc19fccbb1b171000efb4b40401c9f90afa175ef3b691b4cf49ec17a70326260f5697c021f65c SHA512 37f9916e8f4d340f5f342e6db267094f514987fae8d0a6404b2b1a6c5f77cec2ad09d7e129a09c77307e1cb2a4b787e84e22ce56785b1c134fa239a906171a06
 DIST ta-lib-0.4.0-src.tar.gz 1330299 BLAKE2B 2acc09c2a01c02912dd4ea9a72296376dcb4b434723508829d3b97fcb77baaf8d4eaa44a84fbdb094119890fc1949fc52f759345101d8848032c3814576623c7 SHA512 d7ae2acd830cd23b58bded8a90759edfabc73923fbed3cc09501c121cc937caf728c29678f456c2dc7e72fabb52166bccc19ab51ab1131c7d8d35c201c94ed4c
+EBUILD ta-lib-0.4.0-r1.ebuild 630 BLAKE2B 1ac1a0860aa9203e451c0c98113436730f37e4758175c4b74417be56eeeee952ff31e9ed9121f5588da21a4716c627070b27f077fbd3b6ab178fee7c50f232ed SHA512 0f2de4782b9c1d9a8ec6d5d993ce402a5e20fb49cbdb393bcbe7e707dadce21275a6a469dd15803b9936fb08968762be5d2e009eaecfdbfd4b5a3db65125b3c5
 EBUILD ta-lib-0.4.0.ebuild 680 BLAKE2B 39f49bcc48aa0555ce6dcce4ab9b65198b48b052e93901bca53b61c68455327ca339cb65dec102de69ca5b3c1bd16b3d485c678bba6ec9e5690d2d8eb50fb864 SHA512 570ad457f5a9c1367179e2aaddae6760308d012747bc9f0c16976a84586ad5ba82000f96256d41c4b755ef4d7f3f4d6fb888b83160f81f0b162d65def8546403
 MISC metadata.xml 244 BLAKE2B 25bb8bc62b2f5654892b8d241d9fd530bebf9237f2dfde258ed282f6a1d398775a5278ca6be98357740d268660a182040ca8bc2d76b934b3d94f4dc0fe97e501 SHA512 53ab594e08bc9477d304f567775a92b93b28b7f387b3bb8bce55b64ef72f46f8b2790a627d6caa6dddcd1ac3947e4f8b748b9c75aed82b7d97e066a2cb157d3c
diff --git a/sci-libs/ta-lib/files/ta-lib-0.4.0-slibtool.patch b/sci-libs/ta-lib/files/ta-lib-0.4.0-slibtool.patch
new file mode 100644
index 000000000000..7aa9c96159eb
--- /dev/null
+++ b/sci-libs/ta-lib/files/ta-lib-0.4.0-slibtool.patch
@@ -0,0 +1,92 @@
+Upstream-PR: https://sourceforge.net/p/ta-lib/patches/6/
+From 05375dd96c3bdec814214f37a6c49d4a27079960 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Thu, 12 May 2022 11:13:59 -0700
+Subject: [PATCH] Fix parallel Make issue with slibtool
+
+---
+ configure.in => configure.ac       |  4 ++++
+ src/tools/gen_code/Makefile.am     | 13 ++++++++-----
+ src/tools/gen_code/gen_code_bin.sh | 16 ++++++++++++++++
+ src/tools/ta_regtest/Makefile.am   |  4 ++--
+ 4 files changed, 30 insertions(+), 7 deletions(-)
+ rename configure.in => configure.ac (96%)
+ create mode 100755 src/tools/gen_code/gen_code_bin.sh
+
+diff --git a/configure.in b/configure.ac
+similarity index 96%
+rename from configure.in
+rename to configure.ac
+index d2e5784..359d400 100644
+--- a/configure.in
++++ b/configure.ac
+@@ -35,6 +35,10 @@ AC_FUNC_STRTOD
+ AC_FUNC_VPRINTF
+ AC_CHECK_FUNCS([floor isascii localeconv mblen memmove memset modf pow sqrt strcasecmp strchr strerror strncasecmp strrchr strstr strtol strtoul])
+ 
++# Checks for libm
++AC_CHECK_LIBM
++AC_SUBST([LIBM])
++
+ # Versioning:
+ # Only change this if library is no longer
+ # ABI compatible with previous version
+diff --git a/src/tools/gen_code/Makefile.am b/src/tools/gen_code/Makefile.am
+index cb839c2..2ec2360 100644
+--- a/src/tools/gen_code/Makefile.am
++++ b/src/tools/gen_code/Makefile.am
+@@ -6,9 +6,12 @@ noinst_PROGRAMS = gen_code
+ gen_code_SOURCES = gen_code.c
+ 
+ gen_code_CPPFLAGS = -I../../ta_common
+-gen_code_LDFLAGS = -L../../ta_common -L../../ta_abstract -L../../ta_func
+-gen_code_LDADD = -lta_common -lta_abstract_gc -lta_func -lm
++gen_code_LDFLAGS = -no-undefined
++gen_code_LDADD = \
++	../../ta_common/libta_common.la \
++	../../ta_abstract/libta_abstract_gc.la \
++	../../ta_func/libta_func.la \
++	$(LIBM)
+ 
+-all-local:
+-	$(MAKE) $(AM_MAKEFLAGS) gen_code
+-	cp gen_code ../../../bin
++all-local: gen_code
++	$(LIBTOOL) --mode=execute ./gen_code_bin.sh gen_code
+diff --git a/src/tools/gen_code/gen_code_bin.sh b/src/tools/gen_code/gen_code_bin.sh
+new file mode 100755
+index 0000000..b19fd09
+--- /dev/null
++++ b/src/tools/gen_code/gen_code_bin.sh
+@@ -0,0 +1,16 @@
++#!/bin/sh
++
++# This is a work around for a slibtool bug with --mode=execute
++#
++# With slibtool the gen_code binary is created in the .libs directory while GNU
++# libtool outputs in the same directory as the Makefile. This means that cp(1)
++# needs to be invoked with $(LIBTOOL) --mode=execute.
++#
++# However slibtool currently has a bug where the destination argument is dropped
++# which will result in the command failing.
++#
++# See https://bugs.gentoo.org/790770
++
++set -eu
++
++cp "${1}" ../../../bin
+diff --git a/src/tools/ta_regtest/Makefile.am b/src/tools/ta_regtest/Makefile.am
+index 64229e2..255a87e 100644
+--- a/src/tools/ta_regtest/Makefile.am
++++ b/src/tools/ta_regtest/Makefile.am
+@@ -34,5 +34,5 @@ ta_regtest_CPPFLAGS = -I../../ta_func \
+ 		      -I../../ta_common/mt \
+ 		      -I../../ta_common \
+ 		      -I../../ta_abstract
+-ta_regtest_LDFLAGS = -L../.. -lta_lib \
+-		     -lm
++ta_regtest_LDFLAGS = -no-undefined
++ta_regtest_LDADD = ../../libta_lib.la $(LIBM)
+-- 
+2.35.1
+
diff --git a/sci-libs/ta-lib/ta-lib-0.4.0-r1.ebuild b/sci-libs/ta-lib/ta-lib-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..600814664e17
--- /dev/null
+++ b/sci-libs/ta-lib/ta-lib-0.4.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Technical Analysis Library for analyzing financial markets trends"
+HOMEPAGE="https://www.ta-lib.org/"
+SRC_URI="mirror://sourceforge/ta-lib/${P}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-asneeded.patch
+	"${FILESDIR}"/${P}-slibtool.patch # 790770
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_test() {
+	src/tools/ta_regtest/ta_regtest || die
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/tensorflow-estimator/Manifest b/sci-libs/tensorflow-estimator/Manifest
index c6eb2c87a0e8..4c9b393bab88 100644
--- a/sci-libs/tensorflow-estimator/Manifest
+++ b/sci-libs/tensorflow-estimator/Manifest
@@ -1,11 +1,7 @@
-DIST bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip 72534 BLAKE2B 0bbcc2b3fefb8df84d9f72b13da59c377fcd657ead378f85f80a587f8750302236212ae5c58819933015e62425126bead0733d2924a567fb9c5cb14fb75271a8 SHA512 1818c555504ba89afff88d75fe8b4e1386b3665a3ad477c26b4e9504c8f52f398b6aaedbad41a4ab8b8d9b3f86e0992e7c83a6da70241685d7b79ba177af1035
-DIST bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip 159656 BLAKE2B c2ebed5165907e5452db2e8797253ce17fb39a00d3ca3aab11dec475399821dd529629d710af6f9892b74d0654293bd7989fa2be24caf5836490e8df566c7c18 SHA512 deecf484f5e888db345a57c3b557d6548e4e71fd4c62ea10b4dc9c47be9d303df55c03bb446158675b131064c4eccb401bf217e131e78d629c8fc1836600cb51
 DIST bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip 201360 BLAKE2B 0173a8edb17f344b18e42026e2f8a62a1909d4694ab0be83562b6437a3f1ef38889f069269ddd2308b41062e5f375f791be0d2631a8e52ede668203779813b56 SHA512 2ba1dc316d88947c1d17ec67154c052700e3571b8d03370a9f204cf9fe94a1bd58f93a2c4a3c0b02233ee3250053a4c30a4133b5b38745858c1d04be8c9d973f
 DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c
-DIST tensorflow-estimator-2.5.0.tar.gz 689339 BLAKE2B 6fb491b047cabed6edf67cccc913de54e4c2337eb052ba833239b72b07facaf33410b8a57a8f95fc0e2c225190d9b26b7955579d77883dbc236519cb784784c3 SHA512 dc49d92f4d2e63770dd901b272d7c62db50bfef7107e38f6525b6a458ad9915d1cbcdc9961c70c6ef88b9a38361f7b6712f6a2d30e240a35aab4bb25ffe17e71
-DIST tensorflow-estimator-2.7.0.tar.gz 691956 BLAKE2B 8a6cdc88fadbac6275d1c766c4b183dc7d1d374a1e898651ecdf0802d2f5c5bbc01d437a85826e3ef5dc0700b44c69ff84d8610fdf7ac3150fa4c0541f901707 SHA512 e02ee93baf2e36f2e42dec71bd2e31486dc96a7ff25d813fbbe3aae1d0eb1fccdda2cfcad46a87c6cdcd143c1b88915b95bc158ac3240a36734b725b3f89bda3
 DIST tensorflow-estimator-2.8.0.tar.gz 691913 BLAKE2B 7c8059ec3c5e94f67b7fbb49b508e313f0a12eac0627b04471fe1ac82c26aaae2a120a834ce3dc5a16931119ffc31a9d96935b8f727d851885fa132eb08fa2ea SHA512 02a3009fd8f9f560dea6190989af7c58402777a414cd4bf036d24546fc4a747bb8a5515a5d6fea3bdb848cb9604239b19d43096c5f125a1fa434ae8fee44cf0a
-EBUILD tensorflow-estimator-2.5.0.ebuild 2175 BLAKE2B e9e90aee52d27b13f193a2a91f84ff97f641ac23fb948cfb34911212c2db3347f30639ebe537573cbd2b5e6788d843fe70f2c473e6b35889906d1b8fe66d292b SHA512 eacca70003a320d3c7c5a51609a8a62d887fae1eaa5e0405c8fa019549cb004fb0a46db79a646a744e2c589fdd66412c0f44a746387a35158ad0d67b4d013fb1
-EBUILD tensorflow-estimator-2.7.0.ebuild 1864 BLAKE2B 7ae71ffe9d5c2ff6675194b280c7d62a33ea4c1cf63998d3465ef904ea829194b1d6ff7a00675a5a593441953716d10b23f0bbb41282e4014298ae577ee3ea18 SHA512 0042f613b7039030daaa6fee801603410906869320c1b773b7ef1cf18d5db9e71643952ec03ecfe2d6a04b4dad9578b9e576731e829a4e6a8e8593d514c89300
+DIST tensorflow-estimator-2.9.0.tar.gz 654755 BLAKE2B 24cd6fc0b78144f8b529ef5b502cdbf9702dc630ac28256a99d68b98b51518b65af533897e837ced6a6da11e1260847aa0e4ebdf90d37aa22bb3bcd2841bd3ea SHA512 277e398104ac92a48e481e0ee4d3bbc607ae79d0a03c6685723a2430117461c1f17090f56ab88b2ae1c86c8dfc6ec1b44a478a1b606b4432bd68d79ac0720475
 EBUILD tensorflow-estimator-2.8.0.ebuild 1862 BLAKE2B efcfc8a1a4b5429ccfd701450c94d0e13d37e020cddf1d92339fcb7a154f6ce9b23738f274bcbf9663f9c1050d12b2d70b0775b158d03986ddb39ecccfff1c70 SHA512 b5d9a6e4a49d2775ad1da6534492c2a67a2bcc7a3aec329dda50669fd78f86bc4ea98379fa687163b4bb565745439befa432105cb5529100f19ee4d91f3ed573
+EBUILD tensorflow-estimator-2.9.0.ebuild 1836 BLAKE2B 55f8034fc784c1b671a8c339009bb8499b3e4a8657cd06507ea53ca86b95d14daf2cc052e5434f5626e2e76f22f3b77732eda8204e1f0e05982ed24c153b668c SHA512 32389d89ee4dfd392843cb12dc9e9ddbeaa39b751279325c98c962fcfc6aecca1873074cebba4d8f8852be63b34f174abe7dde1a4ef6e98fafb6a35073107d10
 MISC metadata.xml 581 BLAKE2B f3c4be0d25d3337871d9fc5f0d2e1e420fd68f45c2a7fbabaab0557f2f323661d4dd1ab847778ccc5a06bfe86a6fcf77bc4f65a04baa8ed569fd868ca8a03009 SHA512 41e7c5f2bce2166ed98259fa86fcf92cb3e2e186e7387a1cc75d630313791fc83e297288ce52ad25655292eb14b28a651dec3cb6b3101c75c327f447b15d6293
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.5.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.5.0.ebuild
deleted file mode 100644
index 913bf9e0bcc2..000000000000
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.5.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-MY_PN="estimator"
-MY_PV=${PV/_rc/-rc}
-MY_P=${MY_PN}-${MY_PV}
-
-inherit bazel distutils-r1 flag-o-matic toolchain-funcs
-
-DESCRIPTION="A high-level TensorFlow API that greatly simplifies machine learning programming"
-HOMEPAGE="https://www.tensorflow.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-bazel_external_uris="
-	https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip
-	https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip
-	https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip -> bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip
-	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
-
-SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${bazel_external_uris}"
-
-RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	dev-java/java-config
-	>=dev-util/bazel-3"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	bazel_load_distfiles "${bazel_external_uris}"
-}
-
-src_prepare() {
-	bazel_setup_bazelrc
-	default
-	python_copy_sources
-}
-
-src_compile() {
-	export JAVA_HOME=$(java-config --jre-home)
-
-	do_compile() {
-		ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package
-		ebazel shutdown
-
-		local srcdir="${T}/src-${EPYTHON/./_}"
-		mkdir -p "${srcdir}" || die
-		bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die
-	}
-
-	python_foreach_impl run_in_build_dir do_compile
-}
-
-src_install() {
-	do_install() {
-		cd "${T}/src-${EPYTHON/./_}" || die
-		esetup.py install
-		python_optimize
-	}
-	python_foreach_impl do_install
-
-	cd "${S}" || die
-	einstalldocs
-}
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.7.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.9.0.ebuild
index f5176e8c9bc9..df19c5f9a037 100644
--- a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.7.0.ebuild
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.9.0.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
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 MY_PN="estimator"
 MY_PV=${PV/_rc/-rc}
 MY_P=${MY_PN}-${MY_PV}
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	app-arch/unzip
 	dev-java/java-config
-	>=dev-util/bazel-3.7.2"
+	>=dev-util/bazel-4.2.2"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -49,29 +49,27 @@ src_prepare() {
 	python_copy_sources
 }
 
-src_compile() {
-	export JAVA_HOME=$(java-config --jre-home)
+python_compile() {
+	pushd "${BUILD_DIR}" >/dev/null || die
 
-	do_compile() {
-		ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package
-		ebazel shutdown
+	ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package
+	ebazel shutdown
 
-		local srcdir="${T}/src-${EPYTHON/./_}"
-		mkdir -p "${srcdir}" || die
-		bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die
-	}
+	local srcdir="${T}/src-${EPYTHON/./_}"
+	mkdir -p "${srcdir}" || die
+	bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die
 
-	python_foreach_impl run_in_build_dir do_compile
+	popd || die
 }
 
-src_install() {
-	do_install() {
-		cd "${T}/src-${EPYTHON/./_}" || die
-		esetup.py install
-		python_optimize
-	}
-	python_foreach_impl do_install
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home)
+	distutils-r1_src_compile
+}
 
-	cd "${S}" || die
-	einstalldocs
+python_install() {
+	pushd "${T}/src-${EPYTHON/./_}" >/dev/null || die
+	esetup.py install
+	python_optimize
+	popd || die
 }
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index f9ccee100f2c..1e0acc5c1c7a 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -3,66 +3,55 @@ DIST FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3.zip 91462 BLAKE2B dc40d6129c0
 DIST FXdiv-63058eff77e11aa15bf531df5dd34395ec3017c8.zip 16646 BLAKE2B 8f6ca6feee16cb57d9b4504e7615703c2c7ea86fa8ea3f814668478cc13b8cb3cb1429200359be5521ca11f77e1c3d575b2222d123d3ac03586faab88a131ac2 SHA512 6b4830a56137e226d51ba8166fe1a31c51256f1666cc0a683abfb154fbe313d415ce15e362756865a1dd91510cf581c619604b29e8a5288c328c85da57d53308
 DIST OouraFFT-v1.0.tar.gz 110531 BLAKE2B de0e280407e21118e2bc6ca93a7caf3c4a49d0a13eda018b1497f98851af73dda4cef56460dba310336c7ed958e34feef4784ca2575a13287dec2c1ac9a5af6d SHA512 89c6e8fd57abf26351b3efb792008a1bbe62d404a4225dcae8aa666b3782a421be071bdc9760ebb0c95b5336ee5ea517d2fa43ab915045f7cf6fd76e73578079
 DIST XNNPACK-113092317754c7dea47bfb3cb49c4f59c3c1fa10.zip 14407754 BLAKE2B db0ba9250f83e413ebb9ca956bb59886d44da86054d54eed8f3fda736eff9aa424115c7b74b60298fe5ac71171e2b3ab0d6e61ce50bcee87038d5d60e6b06559 SHA512 4febbce5126d4129881106767d282a1df87b461235236861c38bb61f075b58cfbd83778576fc4f8cfc73cba4223d5dd0453391c81cf2e99008ec40a7b26a6264
-DIST XNNPACK-694d2524757f9040e65a02c374e152a462fe57eb.zip 12962048 BLAKE2B b7e2292f65b33a81281a5c1a813a02bf5bae172b640523919384a7b6fae4a583ffdab459179edc84d760a0e3c33779666b48ac68e4af5d1432537a77ef3d895b SHA512 6498d9f0f139c1a017d5986c065b4842bd2a03262518a02113f6a40f40370906a2a3dd4b31e6700b49edac96c9a31fececb146f5063f618ae7a9d73328022c67
-DIST abseil-cpp-6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz 1785034 BLAKE2B 83cee194b416fff3d6ec3f4c02b4210a60ebfcf0316524fe9deb94372bfc34f33075fa59e2e71d8bb17c32f61a6e324072651c2bbf382d3d4a7540657b8a33a8 SHA512 f64fee62863f2103c1991136fd3bc2b71cd28c7ff62138ac991b5a7f81780a05e0e2bdd6a119d02e1d70dd54f989f584093957efaec94f26c9d6c3f4ee37f8ae
-DIST abseil-cpp-997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz 1774075 BLAKE2B 2f082ce0a16df2a323add4b74cdc73443d720a5e1afe02e3eda18239b00bb8ce05488ef17a0a2553af4d92f1f26c6041215b0e914028ff5bc8c869c38cbce4b7 SHA512 bdd80a2278eef121e8837791fdebca06e87bfff4adc438c123e0ce11efc42a8bd461edcbbe18c0eee05be2cd6100f9acf8eab3db58ac73322b5852e6ffe7c85b
-DIST backports.weakref-1.0rc1.tar.gz 7761 BLAKE2B 4cb2554a4b71bb1f8c41a790268511e4b382effc7e0328f74346d086de539a177111de9e2dabac19a44b2a1cdbf59a7425e30eee4caa4bfe66b0ca97f1f460a9 SHA512 f37e9eb0d9060d2e1588a941f623460bd4477d7e180b38b5cd46d9c1db1ee094ae63e4f5eeeb422823bf3d067f46c4124cb124a9e4ddb795bc0bfbc4802ab826
+DIST XNNPACK-11b2812d64e49bab9b6c489f79067fc94e69db9f.zip 17103217 BLAKE2B fd7143588c2b8bcc14a8336922a4b5cf72358e31efa5dae236bdebe0386daf627109396336ee62b119c4696c8b37ae256cfe34be3a1e4fa449a2b76a946e05f2 SHA512 d6b807a834f1d654729397ddca47925261e74449d47f8db559b24487da668a4ed07b7cbe4d5a87c3b69941ef92c6c77cb81b2963da1309385503c38d19f60da3
+DIST apple_support.0.12.1.tar.gz 26708 BLAKE2B ed14e5d3b93797d6ecbf2dfe2cbba32c4e6468ece25b0d8e5f07c02f4218a988cb8b963db4e4a98c70f6586b12eb77a46f1dec832256fb0a4b54cc9b87524e61 SHA512 b4d3850787c0aa43fb4443dc306642b8db1ed8423ca7a4bd56e9cc27b4b3254e2c4efbf86126e5352e4d4b1a1fe93cb8662614daafce48263e6f239ecb721d54
 DIST bazel-skylib-1.0.3.tar.gz 30711 BLAKE2B 86d6db9be4e627f6695329e16e8f9b6c2d0d683142a15f62c6924941405ab1d12292818ebf16642fc8d2664b0f113a35e002210034e80de14726387fcdafd765 SHA512 e28e62214b6c1e6724d26ebbee7c0b436b13e7b054d598788c15f03a56d248378068f5d29fae722a19d4519e2568983011ff50a13577dbc1bd174464ef4a49cc
-DIST bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz 660374 BLAKE2B 549292aa3ad8a6e01c29391a123f3cbc84d1f714ff9c68bfc6c8df07fa0ba3b19c22e61627f227a8a484f6d7d6c59935fd7560c447559ff5e774ddf1437eefe1 SHA512 83531a2646a9f63557eff6fefaf551ee7e9f0ccdb31374d7a17c35b9f9d844b9b405597972fcd31b2b68e9da312511bbfd9c8fbb75222f5924e1d2500cd1c2a6
 DIST bazel-toolchains-dfc67056200b674accd08d8f9a21e328098c07e2.tar.gz 1056209 BLAKE2B 7f47207bc38766a7879874d88c07ed2a2b0ab2dfb3f054f3a24b8e00c464d46f9cd3431d6ef7d8d323e20d33ec05f2a8b3a20b804b45a49c843f0cf6b3f8cb03 SHA512 a5093e3725e020b6fe6242128dea6dec9ae091248b21c1380448059d0e8233d367068d62f41748d65b56e2ecf663d26d46a5cd448c40e282f4c50dfca483baf2
 DIST bazelbuild-platforms-0.0.2.tar.gz 5278 BLAKE2B 0c247bb6efdc30ec2c46fd7e1eeaab6aa20c29d8f9a12e6425530c0e8bd70c4fcafe4b9168c43aa43dc59d55aa27fc975acf15840f6cdb87f0bbda31eac8fb70 SHA512 11119d44627208b04be20f63e486d871866148b52f6d66e7cae3da1fd5daa3ba5b291bad9c5fd40231add8fe770dafb6b71c4b9e0a803317a4f94f7a4be7cad9
 DIST bazelbuild-rules_android-v0.1.1.zip 14654 BLAKE2B 1cfd5af08c6eab9602883f62d85ef1b9eb02383f73dcc31ae84af880c9ba228ae349ac6b017c550286e248347193e2c56eba30c86174432429809447dd940ed2 SHA512 80628a5e2ca9806ab031cd0c2f2999bd67f5621a83e8300a51fe6233373bdaf7c90ff8fa9551c81e60fc904c4d7b24554327ac8ed2ee101e92c4ab9319c53f4a
-DIST bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip 171775 BLAKE2B ec0ece4555d779bc8380937baac517a8adf3b0176c4bfb1324943a91366ad9688f528a4bd69e4587bcc4ad427c71a53016a3e2d32a050d9d4ec99caac4967a8e SHA512 5c5e82f276c1c962fbd9c7ddf21df9aa4291f3285f3fa07cd2c2790475ccba670b0627fc3d6faedd1508eca4d80bdae64a31383f001f04f3031112be81c3e697
+DIST bazelbuild-rules_cc-081771d4a0e9d7d3aa0eed2ef389fa4700dfb23e.tar.gz 130803 BLAKE2B 406331205e8e35fc9f7f727f6f7f9697c658af800e4b90373440c433ec5cfedfe0a3986ce5b1499a2db5b7aa4dc62efac364e73639b98864d2f63076e5b209e3 SHA512 2dc8f50c405cadf10d797117b51868fa22798c4ff7cc1c4f7d4c39fa0d2e5ffbfe8269df42f90c92e0870bb8e8a9c204d3dea237a7ded03f6275657060ee9774
 DIST bazelbuild-rules_cc-40548a2974f1aea06215272d9c2b47a14a24e556.tar.gz 129521 BLAKE2B 368feec785ba0f9abb0f02d14a48ba6ff03859be9245465817c30a0174f897a2dcb6ab1503995da0b521858f96ece3b6eafe6e36cc7e2f8feeb7b6b9620a4d22 SHA512 4573fcd097b7d288024931fd5875358bba3f6db8d904b70e191e0c9a3b34280f8aecac600862883b7692f6faf96c5e8c582441f5f5eff086917b3901fbdbb40b
 DIST bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz 464906 BLAKE2B 033d76b8081f4f987e64875ad5c8e7b8f894ec6be58c52ee02c4d31d4480fee02f3f432ea9c4630ad3f5d1163f820aff37f6493da797ec51b148b361ab3c8b25 SHA512 2cd841f4530503ed31fa6425cb749ef29f8a1071b5d55594644303233e58455783cb02402bc23d7104ef036745733087d43075a1fcdab2ac96cd1a9872a6ea4a
 DIST bazelbuild-rules_docker-v0.10.0.tar.gz 549649 BLAKE2B e7a537b21138a5c5d9ce360e46238f57c917d2dbf5dd17887607402227cbe7c5d68aead9db0ecdb74c09eed9dac26eb86e004a9020c251152d15beb48be0e0d7 SHA512 7802107f8520c88646728800637cce54dbcefc54aa4361288a5b46e403e41998bc23e16fbe94f23a2ca52e5c33fc255af65846963c2fd0139ca1195435ce1b03
 DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c
 DIST bazelbuild-rules_pkg-0.2.5.tar.gz 29857 BLAKE2B 3d03ac639c45b1cdbcaaaa039f14442277e09fe0b18d6753e6d390785613890135a5cfa9025c50e02b83db325baf4d9a0ec207b083064391cd7e8037451a417b SHA512 f37ae1e52462cf77e63c7fede7f3b31e20cb79a8ffdd453ec0291f25ba2145aa819182e1a94145b3fe47a6779777e0c65ff0660e4647bab52335dae18dca995e
-DIST bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz 7612 BLAKE2B de9edd2e1f49edaec782cf58c4ebd3dc3c6d144499a18ac76a0685e28bb9fa6898980ea769c54186816dc696b2e9186d929e99602d8ea535409e1fd23b87da7b SHA512 dd2aef9011c6006e8adc777c211174c26ab74e3cf186541aba865012669ceebf7d96fa34a202654cdfb2beee4f67904f5b7736be466f2838cf31dfb3970f69cd
+DIST bazelbuild-rules_proto-11bf7c25e666dd7ddacbcd4d4c4a9de7a25175f8.tar.gz 14304 BLAKE2B cdd23ef47d247f6d1b9fbaa49edbda7e1cd55ad2e3616f43ff8d21fa42888c1f36172683e47beb3f3678a2b252d9b6c82fd692711e3133862eade8b64da06ea1 SHA512 024021816b4999b62db41709e0e9354ffdc88beb61a081b061d934241f06b1aa5be3b74324cbec94d1871e60eb65209b2e6b4bb8ca4a101218eaf6196ec6a974
 DIST bazelbuild-rules_proto-a0761ed101b939e19d83b2da5f59034bffc19c12.zip 22322 BLAKE2B 733ae2d7d94e9faa6729789ee562945465af59b184ed83c2b11670111117d965b65611df0f5cf3657c637c53db4d41c2344537bbd85208b494a3c3ad9c1df26a SHA512 341d4183e00a08c22885554d5f9654f21b14316328ec5e80eadc159d20c64611d96c5632cdf97f91922d6fe53a60c00733fadb771e1c2463abf11460c9b926f5
 DIST bazelbuild-rules_python-0.0.1.tar.gz 2302092 BLAKE2B 1db52eebf2461d779f764f2afdd070d1d0dd65eb2b83ccd98c2831da1784614ca281b114064729a9f257c64eceb62975aac8362d231c84f32abdf19aee7a1852 SHA512 40fa069a4482e2f83e29dc8e109652d14d187b2ec8efdcd36e98d117de93d66a938ed74999b42a2293fcb6eccc0a111cbbcf65c5c155579214bb1b96644280a5
-DIST bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz 140484 BLAKE2B 2526d808a4763fffa16bb035de78993eefe6371a29139b152370081f548d8147868cc95194c06a54f1c5c0cd8b63ffbc59b00686bfaedede2463a448e38c2810 SHA512 e22a85a5dba52cc3474481798264571f6671aace19eecb058b24ac7d586ea7822ed3ae042b4a812671f81d4f9f8915aa2381fa6ac278da7969b976eaf28db636
 DIST bazelbuild-rules_swift.0.21.0.tar.gz 170336 BLAKE2B 3e9465c37b5c5a98f9ffdda178ce9ed2eeb1dcfdf5f1a3f6b4f7d90bcf26d6de478b7156012fb830b5a4145ef55e9f6f4a50fa34e292366c866d84061dc069fe SHA512 0b521bb3bcf322ecc0d962e45f09d01a7550740ea8174fecc57f609cfacab76c7a2bb7b92e7095dd0af217946ecfa2105f6de81930d08217deaf7b3dd9ceb9d2
+DIST bazelbuild-rules_swift.0.25.0.tar.gz 184783 BLAKE2B 8b1ed7432cf0bc4d12cabeafcc4d9662903d33d3a17d2bf026e34dce0dd04c969bdd910efedf435762702269753516ed32f8d9001f29d694c7743bb0209efb60 SHA512 3cf2cde3ea38ff21a84b795e18056b9895ef8a7aff6c75a00f9779e4baf2faf046acd337dfd1d3583d0939fdbaef389f6a98cb69c7a8b0d9eaf1f0c480ae93ab
 DIST cub-1.9.9.zip 619595 BLAKE2B 265b797a906b03da886de88863236c9ab90daa31498ddf848fcaf5e5ee1342614ad9a41618120ca09cc4c0da3e96eeec5e20ca9d7ba3f9860c507f06d15e59e1 SHA512 8c9c0a3f66f8d518ec07f857b5625e006d52f28bade1c1478a0f37420e2f7586dc3ff029d551748a1802bb5544b16fde5388e8d5a45d61eec595201b9db7a30d
-DIST cudnn-frontend-360d6e7164dfb7c802493fd1c0464f0d815b852a.zip 7781836 BLAKE2B 5fe215bf699c6e64ea29e36535965e86489fbb5d953cd5c4eec74c1f30c0f84008e691337962a4b51128d4066bfc72f48d2561c6eb17be89b2a393080cfbdbaa SHA512 4001c11fecf5f34ebac3f792833b37d4aa1456631f8d5110659548e0329d7a338db9c192f72fc0c54d93217f8c349c4a83392f8cd1cdb79034137a25cd73e005
 DIST cudnn-frontend-73210a930333eaf66b42b01693bce7b70719c354.zip 16944576 BLAKE2B abe918fb4a17e9080b40c59a3d66ea520c3034e8f2e31ca8f1114cfbd0f7f41838af49dae592463243d08952e04ceb8bc9708454a62ba02a847b0874e1000a1c SHA512 febb13ca3f93d708594259c2c3b7c11137649d2df346cb47b1501f650b8d9439dddbf33ba706693f5346b0c75d8501ac105805f2ae9ec47988d2bb8840f468ec
 DIST dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz 39637 BLAKE2B 532a3ce3d0e354a73c19433f0210a64ecbf00d9134d06a0ee7462baaff3f2b981524aa630cf250595671d6673105724482c7d69e803179aac247f2020c883bd0 SHA512 3728db5213e887fd946f64ba5dc0c336be9a72a0966ee83f146148749ffc93ddb342e0735df6117d7943874c18f87de5791a28e4a57ea420bb8a4e2a5b7338bc
+DIST dlpack-790d7a083520398268d92d0bd61cf85dfa32ee98.tar.gz 45837 BLAKE2B a4a117b17c1a4d30efc41da045667a09740184bbc677be4a812146954288e3a0fdf7763481720b060330b9fd382fad0353e7b0dab224321dc83af3c336466ac3 SHA512 34ed254f3971f80d57ecf3f49e282e25405810c09dffaceb047af5088d0c2a16532b1f77cf6d49f60b31f419a01a903651adee7dfcced8c5051c441d24758835
+DIST eigen-008ff3483a8c5604639e1c4d204eae30ad737af6.tar.gz 2733792 BLAKE2B 58becba24ee639faa81d00a9690cb5ec0f1a687602bfc14b376731a91cb4aa972dc6373a706d3c39b89b0950c6ab4b59213b274e0ea53d7d0047103d3dbce6cd SHA512 cf46389aa5f22880ff88a523df2ca011d8ed2490012832c58601ff65732452f294965cb7a7eeb1cfb358053a19cc19d74f5c7165a748b1a662f99c9eb60d2c87
 DIST eigen-085c2fc5d53f391afcccce21c45e15f61c827ab1.tar.gz 2734859 BLAKE2B 2085b4ecf978aa36d6323d8ead00cd27994d5e92b341587bf5dc60e2a123c809f61be48058fdbb0e2a2f272412be847b1c95245bc159b430c727d3f831d9733a SHA512 1f5222718a538e16a0703592cc8f3f0f94fdfbb30d46f8f5d8cc3ba4716eb7ea65dc855665c9ce9f966cc2cf71d46b2ac67ef69b808c1bc3fec6a87ca19af163
-DIST eigen-7792b1e909a98703181aecb8810b4b654004c25d.tar.gz 2711240 BLAKE2B 5a0c5647bd786d8dbf2fea1b85cda5f9ab5a5b94cce0c3a4230cf10359d126ec2b5be0ebbc252b265aaa540b6820eea9ba20e8a4ecd187933f2457023bc03160 SHA512 1e5ee840c2cfa9bfc4e72e5bd15716ed4b7f3a0f3e1f52326c5f86b080b2694a56f31830209935bb910d45185abbe716e5e9ade31c722a5f3ec5d1213732bb27
-DIST eigen-f612df273689a19d25b45ca4f8269463207c4fee.tar.gz 2721573 BLAKE2B a6f3fdfd622b11d1dc634518e0c50bac5246c6eb91ad52ba08db6b846a22f74fd151ac0a27d7ea330137cb5a572c41ca6a916796a94919663c46136b634c7ebb SHA512 71ed7b5e1c70a3a3502c9c1901120eebba7a3668f1b13c1e8156ef49e25decc0c2897fd9d729c505530d85842afd3084c615f87e1a43bc7a5f1f12ba34eaed36
 DIST farmhash-0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz 467251 BLAKE2B 74fd0cf3de41a6db0aac74148f795335df58b5a3bdd370b22ae0763aba5a4952dcd0133ed300350636a4678ff54a5c59eedee749dfcef7283e21c181b88f92cb SHA512 7bc14931e488464c1cedbc17551fb90a8cec494d0e0860db9df8efff09000fd8d91e01060dd5c5149b1104ac4ac8bf7eb57e5b156b05ef42636938edad1518f1
-DIST farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz 467122 BLAKE2B 8b9dd426f4b9f732df6c8c09d868d1b1cc006c395b1525c46ea91c75318b723358c8e64bb0d86a73aace2032eded93f0d80cc7c2c77fddd6a39e3402ab4f2cb7 SHA512 7f5110514a8cdc7ce48d33fd94ad67d96a24e42e11b203e4d0986f4190545f051b2a63f8e09f2ac38c3aa4a5c62d9a0e02cd8ce02045037381fb62a99f0dcd00
+DIST gemmlowp-e844ffd17118c1e17d94e1ba4354c075a4577b88.zip 940590 BLAKE2B 72e8ef48e6c20d3f3510eb3a891748df386f3ac127e79cd5c594b7289826294e29be5987632800898d94d6ded9016e398672fbdabd07af8f55d458540e66ec7b SHA512 b5683bd6e1cb942d0e1e07c3bd28d83d74706c45a33b59896124f659f361bb4f93181d3ccd282d9dd61df49695b38470f138ffd2c88b6d11fe160a0266d3909a
 DIST gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip 936866 BLAKE2B 0977df121a80de979a9996b58a0a8cad157db8d0862b96f95b3be1157cddbc6b40dff4fc7da4ee78f5986cbfff2a67c173155e849e772ae476398c51f3028311 SHA512 4bf036de43f5e0890f66e0b16cd9a0f52911b160f79c9c50cf403454fa9d6040df225d34e02f424da8bb8c5f7f5c002f88f4d232c61503aa825c907ad8742823
 DIST highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz 138574 BLAKE2B cecd95039fc31545ced38a1949e7cb31d6f34deef7c8923b573aa7a632576d0a9b60fd24fbc8a40b8a840a7d2442ea28382fe842178a77467772ed4ba8a2cfb6 SHA512 d25162ed266a8c9c00e6978fcf642cf924f03c0d196f971d0d6f6a3454ca7dfc82f758eabd038ac08e0a5dacc51eccb9b674f588f64692f37cb7a17150aefe4f
 DIST kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz 44744 BLAKE2B aeea5d23c122417ddb70a44354890242c4fb61c456fba9af79054293a1355939af51a681760ac27be55423f888649fd2826e634422c7e9cb3749a9d7f50ef990 SHA512 30f4fcd351bbcb950a27e2a77ca100ccdfd37deb17a05e7e31c3e8f1c56d7c626ab81bbd7497484e6b512e41f7b1bed714722a194b2218c669b297911101df7b
-DIST llvm-1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz 136085334 BLAKE2B 1f2e920c0e146b0d10f394fe7e0a4fa42c1099f998c68bf7b1d2d8bb0882165c1ab18f872db93bace5a835cea53edd0c0fdc2d3e3864031debfdc8db3c5e6713 SHA512 e7d28cfa9eb1a0d8738431767612136d43a639011bafa4dfdd48ae2c75b3b1864ceb237fe9863355649e0f4bc28062077015335d7dcc2b83c886f5fc24cd41a2
-DIST llvm-project-43d6991c2a4cc2ac374e68c029634f2b59ffdfdf.tar.gz 149180712 BLAKE2B ad18ff889ebfc0eda6509b379669e7896fcaf7bcdd0bd50e2664c577df0e079846abdd0bd2504b1e26507fc8176cbf6137763b6f01ad21c01346a43a3b3a937b SHA512 3cf2c8ebcb263cafbc2406d163b67dfbc05c0a433fdf6beaad0dfe9eb1dfc8b79e48082f5ec4258b809408fab92958cc98e0a53b5ea34a7792d526c0db483af3
+DIST llvm-project-2760cdc9c6e42b92d311c697c54f7d79f8d668e4.tar.gz 162328438 BLAKE2B 8a8367aff664467aca4d0f688aebc0da54634dbd9d231a5fab7161048c721d58f6236c0ed3239408c9f77ae9699a89a0840ccf109f7f4544113e4287766239b3 SHA512 3a523ecacc2bd826d8a4acb04ac676720de423c459d47db71cc081ada8bf150cf99a4e43127a138239dbbfb65914f5645f5c87ea5fe8473ed5ac42fe67637d3f
 DIST llvm-project-55c71c9eac9bc7f956a05fa9258fad4f86565450.tar.gz 156068346 BLAKE2B b7c67175a36ae493969a9a4bc9d0c808a1deb7d488445d8c91a53e807442789861779652a398f1d308e46090d0f0a00b15917d192f3ad90f94ab98ea08a952da SHA512 62a1576722ada202f7004ac00d5e79a19c5a01a0ec5fc9f159736aea75f05faf231258383ff5cd8813777ed61cf3bc2ab95ae86371674f0d1d78bf8ac875828a
 DIST llvmorg-10.0.1-openmp-10.0.1.src.tar.xz 955492 BLAKE2B 4197ecfb2e3498a95a2ba5923f2b4bdafbab645ddf2d3f1875d39752d3ab7304fb35bce918d2dc6e40e5ea809545ae0907d6bc0b94a3d68b8d96da48f5a62adc SHA512 5b6f6487feaabd2a18ef2bbb1a5f86bb567e264f9fdf56805cfdd3f65f36f21e7c1392ba5170fafb52a395fc1606b277233beba3df31dc2ab825ef8924e7a05a
 DIST nvidia-nccl-v2.8.3-1.tar.gz 203650 BLAKE2B 2b4995aa04b0b204c7315420b6d130c90baadf78f709b82352701c29116fbf053878e62623b6949ab114051a4df828536764bbe9374ab817af9a56879d7d8f08 SHA512 9a17b570ebda54116b1292899e086724c57c7b8ef03f8c529f760f79294cb710f599c2fddc29ab6bc4b843271af9e824dd1af1e705b98fdcbc201f737490d8f3
-DIST oneDNN-v2.2.tar.gz 9529895 BLAKE2B 63975f8ff4763732b9b45ad96b97053b8b9edd20beec1aaa0bb81e81493e9740e7d0aa04b221e52ccbcd403877a7e4e556b2826640b3cf28149c2af0f449fd41 SHA512 9ff7f6706a176057fdaed3a453639bb3bef7c94b6d275d90401bf310ee7ee11262f3cd2b0b67476d27c90ce91bbbb3ac3765a82c1117649f1832d33a838f7d66
-DIST oneDNN-v2.4.1.tar.gz 5798948 BLAKE2B bedb961f65c0661b56d5e2d34324004f241b3b06fc906424a4297b530e34ca66021217960103f78548b838a046218e3ca8cfdc88adfdafff0766c28d4ec231ed SHA512 5976ef36baca23f242113b8e8d8083c8ab55d7945f295ac75bcd139adcdd731992554002b7c70e2a374d86037a3728dfb23d5613c70278ca2ad35c5449267b5b
 DIST oneDNN-v2.5.1.tar.gz 5807775 BLAKE2B da852ddd92d4573645448d30dc35fd68c07deef99c7280cea99a5de7c57fc8fc348cdbeff77aeef8189beaac830315d681a139be55719d9df85529bca781475f SHA512 cce14aaacdc822d606e747f30e552062ca1bd342b262568253008ed4f145cd6fe42a19421ee15245f63d009b305a39ea435a055305570cedff2752d251b7f7d4
+DIST oneDNN-v2.6.tar.gz 5840464 BLAKE2B 9c593a55b791d877dde5b495cfcd4c255f53a3deeedf7867d53a7cf1294e34bb8d483d11e96e1b95ae5f621016fb6db63f94c1fcdf91cc0ba4f5d0ee0f0828ef SHA512 4cb7b80bfe16920bc096e18e7d8caa56b9ab7a4dab2a091a230bcf562c09533392f4a4ccd4db22754a10293670efdea20382db0994dc47949005a4c77f14b64c
 DIST pthreadpool-b8374f80e42010941bda6c85b0e3f1a1bd77a1e0.zip 61524 BLAKE2B 924419730bc6b94ec98a13db94f177b3b70d6c763158f43fb6f9e45605e73cfce238e6c996e2bf629dbb2a5af93ae99849ddc91174fc4664d702667f7423892d SHA512 d25262b47e39058d5aa8b8197c4984a5b941587a19079a2210f738c3af34ab8e8477731c88ca80c3f812a6a04635f80300124d93cc1e099352ef2aca04bdc3ae
 DIST pytorch-cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.zip 3787933 BLAKE2B 169620d461103f271ae927d84af27282189509b2ba2fbed2c09f9ae387b5f392eea635dfdf2d3a23e1fc19b5d467bee3f13d3e473946e42bba4b6a9a2fd60e32 SHA512 6f1c8c931b62990ab0228679efb52207a6e21cb847139c11bf6117051b7315ff87c12ed1373670d006f0bc7e3d390d59f2d28a8250d0bd7df850583ae42afdf2
 DIST pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz 3489028 BLAKE2B aa6b7719eb9871b6cc71318cb4a9c2e2397e665662b7978daecd9e8380304691a78b95118eba5cbbb738c4b490352a847f6ce6b5c4ae29de0543b95ecc557cbb SHA512 ecd2115340fa82a67db7889ce286c3070d5ab9c30b02372b08aac893e90ccebc65c6b3e66aa02a9ae9c57892d2d8c3b77cb836e5fc3b88df2c75d33e574d90d2
 DIST re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz 316237 BLAKE2B 8a975bc3e78b690f70944651c7022c6d946f40b2eb5fe01b2e203141f94b890cf1ad5c72af8e7c6ff3c5242d42af5a8657ed69e3c74d9ac081beb15de6334c0c SHA512 e3e00e92700d08bc55ba0e96148ddf1e00de2d329c1fdac08691ff15976937829f66dbc84af886a4b749ad66ba4ab208d66811e97e33bb9c2d7359735406c450
-DIST ruy-54774a7a2cf85963777289193629d4bd42de4a59.zip 363561 BLAKE2B 81ff61f1a125c99f7bc8c2f4e03909036a759543cf56774dc872db5987ed4ef099b376597acc2f07758c4813933e7b27fe336281bc05da19f284fb085492ade2 SHA512 b15b6e0464f7612276bc8b198341653e3b72b5e166132a5107f825d4c4612e179018f92a16f7a41490d176bb138417b18a6f1b7fc165c4e829d889808cb89276
+DIST rules_apple.0.33.0.tar.gz 2168079 BLAKE2B eac0462030d02a8c3237d0d5aa0ca6e34fdb076c1a31c03bb60c03f1d25f94a2882daad95ec00317bc13381e30318e95d1f618c31ca4293cc8e6ffeeaf19ed81 SHA512 917b402d3bd39ba47c7169d1a6074d60ea7935e564120ed54ae3144069742c9fc6cb38562b66f62a7000e768dfe997e7084b130e1854509c2a6bdcb91f62875c
 DIST ruy-e6c1b8dc8a8b00ee74e7268aac8b18d7260ab1ce.zip 375516 BLAKE2B d026fcb8cf5226fca9153bd5acb848f04382cf759efda334e9bdbc58cb838a54c8e26d85d8c1577cca835b82319a80a61c7be83e6f61e0dab01d8119995a6c2e SHA512 e556764ef8505509cadf6cf28bb172be96b3650b410b1ccc3a34ef4c2bb8f67e911597962dd392c6441e68d329c66a0f0215fa545df01c63912adda1b08b25ce
 DIST sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz 2569603 BLAKE2B cd66dc8a0b4ad3ea586a79ef588c8d68e4f05b6ea89e6d8119b5ee338b9046c11a747ca57c2f80a3c90fab119c05e85f5965571c9e522ccb8a312b95804d1a36 SHA512 b819d050bb38246b503f1eb3d6e7d878d0f166f3602ae3c327749b1f6ddc2b1d6ac7f768b1f1d055b98b7b98812e4643a75bcebc9728c7f615d67ca739761b3e
 DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856
-DIST tensorflow-2.5.0.tar.gz 55999506 BLAKE2B 0f1f29ed9ff6e5fd3fc0c98419bca636f48085810f934290885b3469c45817b2ce17e9dbd3d93d70b09ec7975088edd0973f147449f527a8f2e23b388e2592ce SHA512 637c63b1bed1c0eb7bb018f1ff7f29f7f0d78e75dac384df4ecb5dfb92bbcb28209e3d3d2204145abddf88e3247d8c31bbb4cea032a73b7122b2ef3eb0d2b947
-DIST tensorflow-2.7.0.tar.gz 57751022 BLAKE2B ae022bffd0609f2bac388510e270e5ec4bf400cbebd074e4580d3a85734b238ad2daf19196246f1bc93a7679383c2527fd27bcbd7da9ddb17189a7998796bdac SHA512 f1e892583c7b3a73d4d39ec65dc135a5b02c789b357d57414ad2b6d05ad9fbfc8ef81918ba6410e314abd6928b76f764e6ef64c0b0c84b58b50796634be03f39
 DIST tensorflow-2.8.0.tar.gz 65416640 BLAKE2B 0446678db956e6f583a4a79d93d89285be0aafe1b62a83fad8b88f1d9bebd82de1e83661477d6e959934413a0176f25ce063bef608ed429576fd1439350713ea SHA512 9cddb78c0392b7810e71917c3731f895e31c250822031ac7f498bf20435408c640b2fba4de439fa4a47c70dbff38b86e50fed2971df1f1916f23f9490241cfed
-DIST tensorflow-patches-2.5.0-r3.tar.bz2 6385 BLAKE2B 5cd3a9639884aa67bbd192cb1b06cfedc557b8ad05aca0f4887987c615656620b9294de98b119bf9d6edafd5b56b9d5e6900f95adb06a3a49cfdf342c6195b22 SHA512 8f0d2be9ffed81aba5c85088a79ca56af889e0247516f51657d214d19d39877cfe331e60f63e8c54e2b12acd7a624b181e281534acbd9a103f6eec0aae70fd8a
-DIST tensorflow-patches-2.7.0.tar.bz2 2928 BLAKE2B 4814c3b31d1c6236711c41f62b5653fbca0ff9810c08081aa070eb87c4d6c296cb6ae3c6fd3409b48dd06540098404eb60be7f74e7fdfc55808b694b8bffbbf4 SHA512 20d138d00a1d54a748bf47031ab0d308b13ed1c51ae931bc60141221a0db902d4839040ab21de7b3d87c1d890223fda0c11e18ad61157d6e07bcca9f3f90375c
+DIST tensorflow-2.9.0.tar.gz 66647793 BLAKE2B bc12e0735e5c0eb9dfbd31c6e855d820045a165c9b6d09a6a26af54a38de5b6feabae7bc49539d6a5d5333516f49a91e3d94c08b4fc01e044062bb1f8b156f2c SHA512 1196f8bdf1e3dba53b1d96f32d5f99f1f372a06feafa46147b636f19ad7de0e877a82619770e6393c2cd72093147b848d1cc30a0a989826f7ab2c1f7a06b08b6
 DIST tensorflow-patches-2.8.0.tar.bz2 7950 BLAKE2B 21961f7b12294c51e1ed97445f02845502bb680b502bffea57732468417ef1c556246b29f630392e7045efe909452a44055b827b7b75533f5b8440240abf0508 SHA512 454b0a909f04b63e5f9de598981077c21ba9bee22b4251566c298ed7c7a7e6edae628b1f995de4f9fb1b84e4b80e6b42c19cdf363de13e43534994bf7e2b17b8
-DIST tensorflow-runtime-64c92c8013b557087351c91b5423b6046d10f206.tar.gz 15224747 BLAKE2B b6aaaf4f6dd488dbfc49f6f9bd6d7820894b7f205ab76c38288175c70dd9ee656128a0655fc1f7ca1ada33d96193c9bb3569da02d0b591aea9ffbb9cf1f223b8 SHA512 1e66742ccda9778fdf9e0e1e83b0524d6b3e82e7792918ae058c031e81b033bc51cebf49752832aa2f27a53a6a9846256e4e9e9eec7c5285ad2db2cb8995ecfc
+DIST tensorflow-patches-2.9.0.tar.bz2 10683 BLAKE2B c2e783004ad779d96d7b794a051baa484649b9f090c06dded15cd0357435da22a5abfa877d2b0a7622df7cb9cea8e0d691666f7aacc5962c390d7aed71426f5e SHA512 8df1888d48a61fa84b64d43a849a6fce5302cb1259fa093d0485a915ad1fe87f9c09a8f75d371ce164c5d0b631ba9110d87501109cb8afe0993b686f5f3c1cf9
+DIST tensorflow-runtime-093ed77f7d50f75b376f40a71ea86e08cedb8b80.tar.gz 15323415 BLAKE2B 5d4277b032bdb7002d1766abb2300c48728057d0bb81559d44f567a4b2a33a0b90d9298471677838159fdbe062328f64a2a7db839975a7359e1cca82c83ec812 SHA512 e9dc796739cfc7ed9a03ac7fa7896959da8312d95afb53d9c50c14218393f772c2196f27c01353d95b0d723bb6893fe8037f32de80c4009ade018abdba863621
 DIST tensorflow-runtime-c3e082762b7664bbc7ffd2c39e86464928e27c0c.tar.gz 15263217 BLAKE2B cb782725c7e876ee39c2d9dab589c40ebbfea6b1002bd7809464514e46c5cdff30defcfac9c0bea3863d6c525ea919c201874774c194252f70ea44ea45da5f61 SHA512 2f01b37e7f042d35f6fb854db67afc46451b6d9120317dca8bb255e53825460ab9ad34a6cf6e2cd2728bb2117e2aa056f826ccacdcf4f898512715d58f5b4339
-DIST tensorflow-toolchains-v1.1.10.tar.gz 137512 BLAKE2B 774b22a599070564c0f77ed0da79f6a96359b196dd3007370be885b796c236b9a29c01597507a3049f82cf489824c8016740b778cacb2b8cd859500f9ecb1887 SHA512 1daf4684f5b364a89b3cc475cf2d13d0d0622fc14d2b32d7ad8518932538e716782d755cfcedc98d129a3986bc7c38bfc7854c8ad596891e397510b75ae2f93e
-DIST tensorflow-toolchains-v1.2.7.tar.gz 97867 BLAKE2B 2f613366b34b81d044da1407ff6371c6183b14593c719ea82ffc964c310df72282ba102be50a9c65655f9185b4ab59d707fe823608b6e452ebf9afc70589bcd5 SHA512 b70da3594aa0499b4e158258ba29ef30044cb6e354e2608b79274f712976b687b09e28a2576d3d89e6bd8ff41416ee19f2d5505b712ec98488c8b8cb839ede84
 DIST tensorflow-toolchains-v1.3.2.tar.gz 98057 BLAKE2B 01dda11552a989344c9efb0aceb16aea632fbd97ef4687bfd7d6967631ea6ad81c5d2de065a793a25048781b57f881bf2cadf9ba1aabe0f23c836cf062e32278 SHA512 cdf32e849ca4fda6417bd0e1243501e8f9416086dc0dddf3535229c6be33368010584f4709e5acf2b81a4fdee53c27cf81fed1a940db100819851432ec5756fc
-EBUILD tensorflow-2.5.0-r3.ebuild 15589 BLAKE2B f9c8d5e5b60c8b259ed17f78314380d111d945486866902b40df7cc090a7bcff2bcb92e386530a10d3abc43e0b30255651c445f5b16df4acf4c5a4ff83500f92 SHA512 b629a9216c691b4076d340a45cc067add1a45ec5c1ef653817c3c9f792d5e0c5abd2a69eb8c3a9260b61ee10473fe08fe62f3643c31ff8846b1f7a9ad9bfb2fc
-EBUILD tensorflow-2.7.0.ebuild 15923 BLAKE2B 3578ec3cb7f6dbf54c1e3171284d862c407b9c1f078e7b9ceafe9aafbc97a24e47b188e63230c31494e74b7886c6a9b20aa0cb8b66535de80f747627fbac562a SHA512 5d84e03c16d3a6358af0d2e4c089e634e15af89a2956c70ac2bf903f6e2e3f1b926b7c5c96ff981c04a2c31954cba99e68e9b6db61f03da86b8b9df3ca9a5239
-EBUILD tensorflow-2.8.0.ebuild 16352 BLAKE2B 28d8ea0a6769c931a8af5ba6a2353a234de4959499582f866d1a888f4f1955cf3b9abaad08206b842b1b937d6c0492d1e803ad90bf5ab80ded953c1c10f25b7d SHA512 5750cd0b7b192aa162a6a4e0c6b5580104602fe205f953f8f5d7d6b3f1d1d57a7d7dfb95ae213adb200269f59cae4a8f839ad734255b503ba9a20e3046eb9faa
+EBUILD tensorflow-2.8.0.ebuild 16350 BLAKE2B 47bea95d8a4a052e688c25a6f16470a515b467eb69ac7fe4589a0900c8d16b92e2e6bbb0767012181cbbb1f09044572c24fd18ab9e4ec265588df8bf67c3060f SHA512 db7f9ab082afbd1c6bb71a385def429cdd33b9a661465140b3ce9f70f5fb791788a676a4def90714c7a3c05795b6594eaa1062dffd1b0f65d80d564f26fbd183
+EBUILD tensorflow-2.9.0.ebuild 16450 BLAKE2B 368b6438e4799e5488c9f36af08fa3cdd01391c06faf43bc901b65f5a9f4f476ba3382a6f102d0d1cc97f2803f4a473a1c2f7a19f1d1daecac6312eeb83a2e70 SHA512 facd8e68569f80cc30bb8600d57dea28edc8666238ee68149b49ce856840aadd38db6cee52a9726e2450193d5b72438e3fed52281fd59c2a7414c9bfdec54f77
 MISC metadata.xml 501 BLAKE2B 16095ae1e7ff9fdd7efe0bb5184ce1d7e46cb5c8f98a650ec4f69742262c678b9945d35b12ba518f8a9b36cad8cd23483a95aca0141ddbe07e4210cef16d2949 SHA512 d1f08e9360ab7c4ec516787807cc53f795d99dde6287b7024535bae4dae4a0107117548784bb25ac07cee15ad1676d98e9c9d472ec97023dfc3e0bdd72a26d28
diff --git a/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild b/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild
deleted file mode 100644
index 0c3051005d95..000000000000
--- a/sci-libs/tensorflow/tensorflow-2.5.0-r3.ebuild
+++ /dev/null
@@ -1,407 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{7,8,9} )
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-${MY_PV}
-
-inherit bazel check-reqs cuda distutils-r1 flag-o-matic prefix toolchain-funcs
-
-DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
-HOMEPAGE="https://www.tensorflow.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda mpi +python xla"
-CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
-for i in $CPU_USE_FLAGS_X86; do
-	IUSE+=" cpu_flags_x86_${i}"
-done
-
-# distfiles that bazel uses for the workspace, will be copied to basel-distdir
-bazel_external_uris="
-	https://github.com/abseil/abseil-cpp/archive/6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz -> abseil-cpp-6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz
-	https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz
-	https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz
-	https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip
-	https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip
-	https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz
-	https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz
-	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
-	https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz
-	https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz
-	https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz
-	https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz
-	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
-	https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip
-	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
-	https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz
-	https://github.com/google/ruy/archive/54774a7a2cf85963777289193629d4bd42de4a59.zip -> ruy-54774a7a2cf85963777289193629d4bd42de4a59.zip
-	https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz
-	https://github.com/llvm/llvm-project/archive/1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz -> llvm-1f6a57c1a0fad922e04a2b1f414b092d4b0cd8b0.tar.gz
-	https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz -> llvmorg-10.0.1-openmp-10.0.1.src.tar.xz
-	https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
-	https://github.com/oneapi-src/oneDNN/archive/v2.2.tar.gz -> oneDNN-v2.2.tar.gz
-	https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz
-	https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.zip -> pytorch-cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.zip
-	https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz
-	https://github.com/tensorflow/toolchains/archive/v1.1.10.tar.gz -> tensorflow-toolchains-v1.1.10.tar.gz
-	https://gitlab.com/libeigen/eigen/-/archive/f612df273689a19d25b45ca4f8269463207c4fee/eigen-f612df273689a19d25b45ca4f8269463207c4fee.tar.gz
-	cuda? (
-		https://github.com/NVIDIA/cudnn-frontend/archive/360d6e7164dfb7c802493fd1c0464f0d815b852a.zip -> cudnn-frontend-360d6e7164dfb7c802493fd1c0464f0d815b852a.zip
-		https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip
-		https://github.com/nvidia/nccl/archive/v2.8.3-1.tar.gz -> nvidia-nccl-v2.8.3-1.tar.gz
-	)
-	python? (
-		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz
-		https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt
-		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
-	)"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
-		${bazel_external_uris}"
-
-RDEPEND="
-	app-arch/snappy
-	dev-db/lmdb
-	dev-db/sqlite
-	dev-libs/double-conversion
-	dev-libs/icu:=
-	>=dev-libs/jsoncpp-1.9.2:=
-	dev-libs/libpcre
-	dev-libs/nsync
-	dev-libs/openssl:0=
-	<dev-libs/protobuf-3.19.1:=
-	>=dev-libs/re2-0.2019.06.01:=
-	media-libs/giflib
-	media-libs/libjpeg-turbo
-	media-libs/libpng:0
-	<net-libs/grpc-1.39:=
-	net-misc/curl
-	sys-libs/zlib
-	>=sys-apps/hwloc-2:=
-	cuda? (
-		<dev-util/nvidia-cuda-toolkit-11.6_pre:=[profiler]
-		=dev-libs/cudnn-8*
-	)
-	mpi? ( virtual/mpi )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/flatbuffers-1.12.0:=
-		dev-python/absl-py[${PYTHON_USEDEP}]
-		>=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
-		dev-python/astunparse[${PYTHON_USEDEP}]
-		dev-python/dill[${PYTHON_USEDEP}]
-		dev-python/flatbuffers[${PYTHON_USEDEP}]
-		>=dev-python/gast-0.3.3[${PYTHON_USEDEP}]
-		dev-python/h5py[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-		>=dev-python/google-pasta-0.1.8[${PYTHON_USEDEP}]
-		>=dev-python/opt-einsum-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/protobuf-python-3.13.0[${PYTHON_USEDEP}]
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		dev-python/termcolor[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		>=dev-python/grpcio-1.28[${PYTHON_USEDEP}]
-		>=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}]
-		>=net-libs/google-cloud-cpp-0.10.0
-		>=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}]
-		>=sci-libs/keras-preprocessing-1.1.2[${PYTHON_USEDEP}]
-		>=sci-visualization/tensorboard-2.5.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}"
-PDEPEND="python? (
-		>=sci-libs/tensorflow-estimator-2.5.0[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	app-arch/unzip
-	>=dev-libs/protobuf-3.8.0
-	dev-java/java-config
-	>=dev-util/bazel-3.7.2
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-9.1[profiler]
-	)
-	!python? ( dev-lang/python )
-	python? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/grpcio-tools-1.28
-	)"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
-CHECKREQS_MEMORY="5G"
-CHECKREQS_DISK_BUILD="10G"
-
-get-cpu-flags() {
-	local i f=()
-	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
-	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
-		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
-	done
-	use cpu_flags_x86_fma3 && f+=( -mfma )
-	echo "${f[*]}"
-}
-
-pkg_setup() {
-	ewarn "TensorFlow 2.0 is a major release that contains some incompatibilities"
-	ewarn "with TensorFlow 1.x. For more information about migrating to TF2.0 see:"
-	ewarn "https://www.tensorflow.org/guide/migrate"
-
-	local num_pythons_enabled
-	num_pythons_enabled=0
-	count_impls() {
-		num_pythons_enabled=$((${num_pythons_enabled} + 1))
-	}
-	use python && python_foreach_impl count_impls
-
-	# 10G to build C/C++ libs, 5G per python impl
-	CHECKREQS_DISK_BUILD="$((10 + 6 * ${num_pythons_enabled}))G"
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	# Only unpack the main distfile
-	unpack "${P}.tar.gz"
-	unpack tensorflow-patches-${PVR}.tar.bz2
-	bazel_load_distfiles "${bazel_external_uris}"
-}
-
-src_prepare() {
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-
-	append-flags $(get-cpu-flags)
-	append-cxxflags -std=c++14 # bug 787938
-	filter-flags '-fvtable-verify=@(std|preinit)'
-	bazel_setup_bazelrc
-
-	eapply "${WORKDIR}"/patches/*.patch
-
-	# Relax version checks in setup.py
-	sed -i "/^    '/s/==/>=/g" tensorflow/tools/pip_package/setup.py || die
-	sed -i "/config_googleapis/d" tensorflow/workspace0.bzl || die
-
-	# Prefixify hard-coded command locations
-	hprefixify -w /host_compiler_prefix/ third_party/gpus/cuda_configure.bzl
-
-	default
-	use python && python_copy_sources
-
-	use cuda && cuda_add_sandbox
-}
-
-src_configure() {
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
-
-	do_configure() {
-		export CC_OPT_FLAGS=" "
-		export TF_ENABLE_XLA=$(usex xla 1 0)
-		export TF_NEED_OPENCL_SYCL=0
-		export TF_NEED_OPENCL=0
-		export TF_NEED_COMPUTECPP=0
-		export TF_NEED_ROCM=0
-		export TF_NEED_MPI=$(usex mpi 1 0)
-		export TF_SET_ANDROID_WORKSPACE=0
-
-		if use python; then
-			export PYTHON_BIN_PATH="${PYTHON}"
-			export PYTHON_LIB_PATH="$(python_get_sitedir)"
-		else
-			export PYTHON_BIN_PATH="$(which python)"
-			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
-		fi
-
-		export TF_NEED_CUDA=$(usex cuda 1 0)
-		export TF_DOWNLOAD_CLANG=0
-		export TF_CUDA_CLANG=0
-		export TF_NEED_TENSORRT=0
-		if use cuda; then
-			export TF_CUDA_PATHS="${EPREFIX}/opt/cuda"
-			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
-			export TF_CUDA_VERSION="$(cuda_toolkit_version)"
-			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
-			einfo "Setting CUDA version: $TF_CUDA_VERSION"
-			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
-
-			if [[ $(cuda-config -s) != *$(gcc-version)* ]]; then
-				ewarn "TensorFlow is being built with Nvidia CUDA support. Your default compiler"
-				ewarn "version is not supported by the currently installed CUDA. TensorFlow will"
-				ewarn "instead be compiled using: ${GCC_HOST_COMPILER_PATH}."
-				ewarn "If the build fails with linker errors try rebuilding the relevant"
-				ewarn "dependencies using the same compiler version."
-			fi
-
-			if [[ -z "$TF_CUDA_COMPUTE_CAPABILITIES" ]]; then
-				ewarn "WARNING: TensorFlow is being built with its default CUDA compute capabilities: 3.5 and 7.0."
-				ewarn "These may not be optimal for your GPU."
-				ewarn ""
-				ewarn "To configure TensorFlow with the CUDA compute capability that is optimal for your GPU,"
-				ewarn "set TF_CUDA_COMPUTE_CAPABILITIES in your make.conf, and re-emerge tensorflow."
-				ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TF_CUDA_COMPUTE_CAPABILITIES=7.5,3.5"
-				ewarn ""
-				ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus"
-				ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'"
-			fi
-		fi
-
-		# com_googlesource_code_re2 weird branch using absl, doesnt work with released re2
-		#com_github_googleapis_googleapis
-		local SYSLIBS=(
-			absl_py
-			astor_archive
-			astunparse_archive
-			boringssl
-			com_github_googlecloudplatform_google_cloud_cpp
-			com_github_grpc_grpc
-			com_google_protobuf
-			curl
-			cython
-			dill_archive
-			double_conversion
-			enum34_archive
-			flatbuffers
-			functools32_archive
-			gast_archive
-			gif
-			hwloc
-			icu
-			jsoncpp_git
-			libjpeg_turbo
-			lmdb
-			nasm
-			nsync
-			opt_einsum_archive
-			org_sqlite
-			pasta
-			pcre
-			png
-			pybind11
-			six_archive
-			snappy
-			tblib_archive
-			termcolor_archive
-			typing_extensions_archive
-			wrapt
-			zlib
-		)
-
-		export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
-		export TF_IGNORE_MAX_BAZEL_VERSION=1
-
-		# This is not autoconf
-		./configure || die
-
-		echo 'build --config=noaws --config=nohdfs' >> .bazelrc || die
-		echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die
-		echo "build --action_env=KERAS_HOME=\"${T}/.keras\"" >> .bazelrc || die
-		echo "build --host_action_env=KERAS_HOME=\"${T}/.keras\"" >> .bazelrc || die
-
-		for cflag in $($(tc-getPKG_CONFIG) jsoncpp --cflags)
-		do
-			echo "build --copt=\"${cflag}\"" >> .bazelrc || die
-			echo "build --host_copt=\"${cflag}\"" >> .bazelrc || die
-		done
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir do_configure
-	else
-		do_configure
-	fi
-}
-
-src_compile() {
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
-
-	if use python; then
-		python_setup
-		BUILD_DIR="${S}-${EPYTHON/./_}"
-		cd "${BUILD_DIR}"
-	fi
-
-	# fail early if any deps are missing
-	ebazel build -k --nobuild \
-		//tensorflow:libtensorflow_framework.so \
-		//tensorflow:libtensorflow.so \
-		//tensorflow:libtensorflow_cc.so \
-		$(usex python '//tensorflow/tools/pip_package:build_pip_package' '')
-
-	ebazel build \
-		//tensorflow:libtensorflow_framework.so \
-		//tensorflow:libtensorflow.so
-	ebazel build //tensorflow:libtensorflow_cc.so
-
-	do_compile() {
-		ebazel build //tensorflow/tools/pip_package:build_pip_package
-	}
-	BUILD_DIR="${S}"
-	cd "${BUILD_DIR}"
-	use python && python_foreach_impl run_in_build_dir do_compile
-	ebazel shutdown
-}
-
-src_install() {
-	local i l
-	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
-	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
-
-	do_install() {
-		einfo "Installing ${EPYTHON} files"
-		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
-		mkdir -p "${srcdir}" || die
-		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
-		cd "${srcdir}" || die
-		esetup.py install
-
-		# libtensorflow_framework.so is in /usr/lib already
-		rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die
-		rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die
-		python_optimize
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir do_install
-
-		# Symlink to python-exec scripts
-		for i in "${ED}"/usr/lib/python-exec/*/*; do
-			n="${i##*/}"
-			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
-		done
-
-		python_setup
-		local BUILD_DIR="${S}-${EPYTHON/./_}"
-		cd "${BUILD_DIR}" || die
-	fi
-
-	einfo "Installing headers"
-	ebazel build //tensorflow:install_headers
-	ebazel shutdown
-	insinto /usr/include/${PN}/
-	doins -r bazel-bin/tensorflow/include/*
-
-	einfo "Installing libs"
-	# Generate $(tc-getPKG_CONFIG) file
-	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc ${PN}_cc.pc
-
-	for l in libtensorflow{,_framework,_cc}.so; do
-		dolib.so bazel-bin/tensorflow/${l}
-		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1)
-		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3)
-	done
-
-	einstalldocs
-}
diff --git a/sci-libs/tensorflow/tensorflow-2.8.0.ebuild b/sci-libs/tensorflow/tensorflow-2.8.0.ebuild
index 8049c63fb372..051e6b0afd28 100644
--- a/sci-libs/tensorflow/tensorflow-2.8.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.8.0.ebuild
@@ -101,7 +101,7 @@ RDEPEND="
 	mpi? ( virtual/mpi )
 	python? (
 		${PYTHON_DEPS}
-		>=dev-libs/flatbuffers-1.12.0:=
+		<dev-libs/flatbuffers-2.0.6:=
 		dev-python/absl-py[${PYTHON_USEDEP}]
 		>=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
 		dev-python/astunparse[${PYTHON_USEDEP}]
diff --git a/sci-libs/tensorflow/tensorflow-2.7.0.ebuild b/sci-libs/tensorflow/tensorflow-2.9.0.ebuild
index 2ab771170c61..84e1f2e81e42 100644
--- a/sci-libs/tensorflow/tensorflow-2.7.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.9.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 MY_PV=${PV/_rc/-rc}
 MY_P=${PN}-${MY_PV}
 
@@ -13,6 +13,7 @@ inherit bazel check-reqs cuda distutils-r1 flag-o-matic prefix toolchain-funcs
 DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
 HOMEPAGE="https://www.tensorflow.org/"
 
+RESTRICT="test" # Tests need GPU access
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -23,37 +24,43 @@ for i in $CPU_USE_FLAGS_X86; do
 done
 
 # distfiles that bazel uses for the workspace, will be copied to basel-distdir
+# pkgcheck complains but do NOT change the .zip to .tar.gz, bazel requires the exact tarball (basename and sha256).
+# the build will fail if different archives are used.
 bazel_external_uris="
-	https://github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz -> abseil-cpp-997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz
 	https://github.com/bazelbuild/platforms/releases/download/0.0.2/platforms-0.0.2.tar.gz -> bazelbuild-platforms-0.0.2.tar.gz
+	https://github.com/bazelbuild/apple_support/releases/download/0.12.1/apple_support.0.12.1.tar.gz
 	https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz
 	https://github.com/bazelbuild/bazel-toolchains/archive/dfc67056200b674accd08d8f9a21e328098c07e2.tar.gz -> bazel-toolchains-dfc67056200b674accd08d8f9a21e328098c07e2.tar.gz
 	https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip
-	https://github.com/bazelbuild/rules_cc/archive/40548a2974f1aea06215272d9c2b47a14a24e556.tar.gz -> bazelbuild-rules_cc-40548a2974f1aea06215272d9c2b47a14a24e556.tar.gz
+	https://github.com/bazelbuild/rules_apple/releases/download/0.33.0/rules_apple.0.33.0.tar.gz
+	https://github.com/bazelbuild/rules_cc/archive/081771d4a0e9d7d3aa0eed2ef389fa4700dfb23e.tar.gz -> bazelbuild-rules_cc-081771d4a0e9d7d3aa0eed2ef389fa4700dfb23e.tar.gz
 	https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz
 	https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz
 	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
-	https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz -> bazelbuild-rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz
+	https://github.com/bazelbuild/rules_pkg/releases/download/0.2.5/rules_pkg-0.2.5.tar.gz -> bazelbuild-rules_pkg-0.2.5.tar.gz
+	https://github.com/bazelbuild/rules_proto/archive/11bf7c25e666dd7ddacbcd4d4c4a9de7a25175f8.tar.gz -> bazelbuild-rules_proto-11bf7c25e666dd7ddacbcd4d4c4a9de7a25175f8.tar.gz
 	https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz
-	https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz -> bazelbuild-rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz
-	https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz
+	https://github.com/bazelbuild/rules_swift/releases/download/0.25.0/rules_swift.0.25.0.tar.gz -> bazelbuild-rules_swift.0.25.0.tar.gz
+	https://github.com/dmlc/dlpack/archive/790d7a083520398268d92d0bd61cf85dfa32ee98.tar.gz -> dlpack-790d7a083520398268d92d0bd61cf85dfa32ee98.tar.gz
 	https://github.com/google/farmhash/archive/0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz -> farmhash-0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz
-	https://github.com/google/gemmlowp/archive/fda83bdc38b118cc6b56753bd540caa49e570745.zip -> gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip
+	https://github.com/google/gemmlowp/archive/e844ffd17118c1e17d94e1ba4354c075a4577b88.zip -> gemmlowp-e844ffd17118c1e17d94e1ba4354c075a4577b88.zip
 	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
 	https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz
 	https://github.com/google/ruy/archive/e6c1b8dc8a8b00ee74e7268aac8b18d7260ab1ce.zip -> ruy-e6c1b8dc8a8b00ee74e7268aac8b18d7260ab1ce.zip
 	https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz
-	https://github.com/llvm/llvm-project/archive/43d6991c2a4cc2ac374e68c029634f2b59ffdfdf.tar.gz -> llvm-project-43d6991c2a4cc2ac374e68c029634f2b59ffdfdf.tar.gz
+	https://github.com/llvm/llvm-project/archive/2760cdc9c6e42b92d311c697c54f7d79f8d668e4.tar.gz -> llvm-project-2760cdc9c6e42b92d311c697c54f7d79f8d668e4.tar.gz
 	https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz -> llvmorg-10.0.1-openmp-10.0.1.src.tar.xz
 	https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
-	https://github.com/oneapi-src/oneDNN/archive/v2.4.1.tar.gz -> oneDNN-v2.4.1.tar.gz
+	https://github.com/oneapi-src/oneDNN/archive/refs/tags/v2.6.tar.gz -> oneDNN-v2.6.tar.gz
 	https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz
 	https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.zip -> pytorch-cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.zip
 	https://github.com/pytorch/cpuinfo/archive/d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz -> pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz
-	https://github.com/tensorflow/toolchains/archive/v1.2.7.tar.gz -> tensorflow-toolchains-v1.2.7.tar.gz
-	https://github.com/tensorflow/runtime/archive/64c92c8013b557087351c91b5423b6046d10f206.tar.gz -> tensorflow-runtime-64c92c8013b557087351c91b5423b6046d10f206.tar.gz
-	https://gitlab.com/libeigen/eigen/-/archive/7792b1e909a98703181aecb8810b4b654004c25d/eigen-7792b1e909a98703181aecb8810b4b654004c25d.tar.gz
-	https://github.com/google/XNNPACK/archive/694d2524757f9040e65a02c374e152a462fe57eb.zip -> XNNPACK-694d2524757f9040e65a02c374e152a462fe57eb.zip
+	https://github.com/tensorflow/runtime/archive/093ed77f7d50f75b376f40a71ea86e08cedb8b80.tar.gz -> tensorflow-runtime-093ed77f7d50f75b376f40a71ea86e08cedb8b80.tar.gz
+	https://gitlab.com/libeigen/eigen/-/archive/008ff3483a8c5604639e1c4d204eae30ad737af6/eigen-008ff3483a8c5604639e1c4d204eae30ad737af6.tar.gz
+	https://github.com/google/XNNPACK/archive/11b2812d64e49bab9b6c489f79067fc94e69db9f.zip -> XNNPACK-11b2812d64e49bab9b6c489f79067fc94e69db9f.zip
+	https://github.com/Maratyszcza/pthreadpool/archive/b8374f80e42010941bda6c85b0e3f1a1bd77a1e0.zip -> pthreadpool-b8374f80e42010941bda6c85b0e3f1a1bd77a1e0.zip
+	https://github.com/Maratyszcza/FP16/archive/4dfe081cf6bcd15db339cf2680b9281b8451eeb3.zip -> FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3.zip
+	https://github.com/Maratyszcza/FXdiv/archive/63058eff77e11aa15bf531df5dd34395ec3017c8.zip -> FXdiv-63058eff77e11aa15bf531df5dd34395ec3017c8.zip
 	cuda? (
 		https://github.com/NVIDIA/cudnn-frontend/archive/73210a930333eaf66b42b01693bce7b70719c354.zip -> cudnn-frontend-73210a930333eaf66b42b01693bce7b70719c354.zip
 		https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip
@@ -62,16 +69,16 @@ bazel_external_uris="
 	python? (
 		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz
 		https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt
-		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
 	)"
 
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
 		${bazel_external_uris}"
 
+# abseil-cpp-20211102.0-r0 does not work with NVCC
 RDEPEND="
 	app-arch/snappy
-	dev-cpp/abseil-cpp
+	>=dev-cpp/abseil-cpp-20211102-r2:=
 	dev-db/lmdb
 	dev-db/sqlite
 	dev-libs/double-conversion
@@ -84,21 +91,22 @@ RDEPEND="
 	media-libs/giflib
 	media-libs/libjpeg-turbo
 	media-libs/libpng:0
-	>=net-libs/grpc-1.24:=
+	>=net-libs/grpc-1.28:=
 	net-misc/curl
 	sys-libs/zlib
 	>=sys-apps/hwloc-2:=
 	cuda? (
-		<dev-util/nvidia-cuda-toolkit-11.6_pre:=[profiler]
+		<dev-util/nvidia-cuda-toolkit-11.7_pre:=[profiler]
 		=dev-libs/cudnn-8*
 	)
 	mpi? ( virtual/mpi )
 	python? (
 		${PYTHON_DEPS}
-		>=dev-libs/flatbuffers-1.12.0:=
+		<dev-libs/flatbuffers-2.0.6:=
 		dev-python/absl-py[${PYTHON_USEDEP}]
 		>=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
 		dev-python/astunparse[${PYTHON_USEDEP}]
+		dev-python/clang-python[${PYTHON_USEDEP}]
 		dev-python/dill[${PYTHON_USEDEP}]
 		dev-python/flatbuffers[${PYTHON_USEDEP}]
 		>=dev-python/gast-0.3.3[${PYTHON_USEDEP}]
@@ -115,26 +123,29 @@ RDEPEND="
 		>=dev-python/grpcio-1.28[${PYTHON_USEDEP}]
 		>=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}]
 		>=net-libs/google-cloud-cpp-0.10.0
-		>=sci-visualization/tensorboard-2.7.0[${PYTHON_USEDEP}]
+		>=sci-visualization/tensorboard-2.9.0[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	python? (
+		dev-python/mock
+		dev-python/setuptools
 	)"
-DEPEND="${RDEPEND}"
 PDEPEND="python? (
-		>=sci-libs/keras-2.7.0[${PYTHON_USEDEP}]
-		>=sci-libs/tensorflow-estimator-2.7.0[${PYTHON_USEDEP}]
+		>=sci-libs/keras-2.9.0[${PYTHON_USEDEP}]
+		>=sci-libs/tensorflow-estimator-2.9.0[${PYTHON_USEDEP}]
 	)"
 BDEPEND="
 	app-arch/unzip
 	>=dev-libs/protobuf-3.8.0
 	dev-java/java-config
-	>=dev-util/bazel-3.7.2
+	>=dev-util/bazel-4.2.1
 	cuda? (
 		>=dev-util/nvidia-cuda-toolkit-9.1[profiler]
 	)
 	!python? ( dev-lang/python )
 	python? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/cython
+		dev-python/mock
 		>=dev-python/grpcio-tools-1.28
 	)"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -156,10 +167,6 @@ get-cpu-flags() {
 }
 
 pkg_setup() {
-	ewarn "TensorFlow 2.0 is a major release that contains some incompatibilities"
-	ewarn "with TensorFlow 1.x. For more information about migrating to TF2.0 see:"
-	ewarn "https://www.tensorflow.org/guide/migrate"
-
 	local num_pythons_enabled
 	num_pythons_enabled=0
 	count_impls() {
@@ -167,7 +174,7 @@ pkg_setup() {
 	}
 	use python && python_foreach_impl count_impls
 
-	# 10G to build C/C++ libs, 5G per python impl
+	# 10G to build C/C++ libs, 6G per python impl
 	CHECKREQS_DISK_BUILD="$((10 + 6 * ${num_pythons_enabled}))G"
 	check-reqs_pkg_setup
 }
@@ -183,7 +190,8 @@ src_prepare() {
 	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
 
 	append-flags $(get-cpu-flags)
-	append-cxxflags -std=c++14 # bug 787938
+	append-cxxflags -std=c++17
+	export BUILD_CXXFLAGS+=" -std=c++17"
 	filter-flags '-fvtable-verify=@(std|preinit)'
 	bazel_setup_bazelrc
 
@@ -266,12 +274,12 @@ src_configure() {
 			boringssl
 			com_github_googlecloudplatform_google_cloud_cpp
 			com_github_grpc_grpc
+			com_google_absl
 			com_google_protobuf
 			curl
 			cython
 			dill_archive
 			double_conversion
-			enum34_archive
 			flatbuffers
 			functools32_archive
 			gast_archive
@@ -328,7 +336,7 @@ src_compile() {
 	if use python; then
 		python_setup
 		BUILD_DIR="${S}-${EPYTHON/./_}"
-		cd "${BUILD_DIR}"
+		cd "${BUILD_DIR}" || die
 	fi
 
 	# fail early if any deps are missing
@@ -342,14 +350,16 @@ src_compile() {
 		//tensorflow:libtensorflow_framework.so \
 		//tensorflow:libtensorflow.so
 	ebazel build //tensorflow:libtensorflow_cc.so
+	ebazel build //tensorflow:install_headers
+	ebazel shutdown
 
 	do_compile() {
 		ebazel build //tensorflow/tools/pip_package:build_pip_package
+		ebazel shutdown
 	}
 	BUILD_DIR="${S}"
-	cd "${BUILD_DIR}"
+	cd "${BUILD_DIR}" || die
 	use python && python_foreach_impl run_in_build_dir do_compile
-	ebazel shutdown
 }
 
 src_install() {
@@ -386,13 +396,11 @@ src_install() {
 	fi
 
 	einfo "Installing headers"
-	ebazel build //tensorflow:install_headers
-	ebazel shutdown
 	insinto /usr/include/${PN}/
 	doins -r bazel-bin/tensorflow/include/*
 
 	einfo "Installing libs"
-	# Generate $(tc-getPKG_CONFIG) file
+	# Generate pkg-config file
 	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins ${PN}.pc ${PN}_cc.pc
@@ -404,4 +412,7 @@ src_install() {
 	done
 
 	einstalldocs
+
+	# Workaround for https://bugs.gentoo.org/831927
+	export MAKEOPTS="-j1"
 }
diff --git a/sci-libs/tensorpipe/Manifest b/sci-libs/tensorpipe/Manifest
new file mode 100644
index 000000000000..c5bb13a8fdf1
--- /dev/null
+++ b/sci-libs/tensorpipe/Manifest
@@ -0,0 +1,4 @@
+AUX tensorpipe-2022.05.13-gentoo.patch 522 BLAKE2B b5efc8193549a84569125794e65a931343f26996f487158f39dd6c9d1689ecd1390bae1616e1f498461a3b4b0a17478a8a14c1cbd6b76c82b7dc2a4452e72d7e SHA512 3c8cd91daf9cf1c4249c5e5f7154f9d4495d33ab011802f83a96d056723ebfb86406f4bc9c8bacc8af2a70336d706de9d88d538d196348d2d6ea4e56886b5162
+DIST tensorpipe-2022.05.13.tar.gz 259678 BLAKE2B 09231216b7ea1a5f4559bfd38d82337cdcde160c34ceb160c728b85ccf94566b812f0c38b6d3f6bc74b6f08b49b749939970265df343e3ca0214803f9d88e58c SHA512 cf0334f81affb2d844bc8b63c533a749753e36ee096f841641716a3bf044b17580262a2e9056d8d1351228e323c4f75401a2a120a5de397e80ec21a33fe56d2b
+EBUILD tensorpipe-2022.05.13.ebuild 569 BLAKE2B 70d536748302b8a0fa0fcbbc96b45901ab242bf0eaa3f7d2ab92da0280fc7a252673dc62ae426c3844bf52817e9456087d9eda270659784d96b7e207d7fb9449 SHA512 517023c737aed9ab89783f28c88b4cb68c5bd4bfb90dba56fe99edf4d585addfafd47e4efb352e7a9a6ffe0bd322a17a6396feaf0998bb7d435d3d47160e726e
+MISC metadata.xml 331 BLAKE2B 6a5a854e8e6c987dc1b105a3c905d8113b0613e63f479e700f85a01b96e4b939de8706bc876c1bf44bd61f40b9b3b18eb87f3899c1f3697ddfb5ca6bed2a7a61 SHA512 8843f661956cdbfbda49aebfe4586c5eaafa7e7b82f134d5881e46ac6ebf69b20167f532a372280be17ae29016aca82e2930762b2bdbb7616918b7200a3a2a49
diff --git a/sci-libs/tensorpipe/files/tensorpipe-2022.05.13-gentoo.patch b/sci-libs/tensorpipe/files/tensorpipe-2022.05.13-gentoo.patch
new file mode 100644
index 000000000000..1d3ab0724030
--- /dev/null
+++ b/sci-libs/tensorpipe/files/tensorpipe-2022.05.13-gentoo.patch
@@ -0,0 +1,10 @@
+--- a/tensorpipe/CMakeLists.txt	2022-05-27 16:04:55.374134087 +0200
++++ b/tensorpipe/CMakeLists.txt	2022-05-27 16:05:11.596909345 +0200
+@@ -184,7 +184,6 @@
+ # We should keep libnop headers private as they should not be exposed to downstream users,
+ # but they're currently transitively included by tensorpipe/transport/connection.h (which
+ # is still unclear whether it should be a public or private header).
+-list(APPEND TP_INCLUDE_DIRS $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party/libnop/include>)
+ 
+ 
+ ## Target
diff --git a/sci-libs/tensorpipe/metadata.xml b/sci-libs/tensorpipe/metadata.xml
new file mode 100644
index 000000000000..a676d5dbb87a
--- /dev/null
+++ b/sci-libs/tensorpipe/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pytorch/tensorpipe</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/tensorpipe/tensorpipe-2022.05.13.ebuild b/sci-libs/tensorpipe/tensorpipe-2022.05.13.ebuild
new file mode 100644
index 000000000000..23422f9cc125
--- /dev/null
+++ b/sci-libs/tensorpipe/tensorpipe-2022.05.13.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+CommitId=bb1473a4b38b18268e8693044afdb8635bc8351b
+
+DESCRIPTION="provides a tensor-aware channel"
+HOMEPAGE="https://github.com/pytorch/tensorpipe/"
+SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT=test
+
+RDEPEND="
+	dev-libs/libuv
+"
+DEPEND="${RDEPEND}
+	dev-libs/libnop
+"
+BDEPEND=""
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
diff --git a/sci-libs/trilinos/Manifest b/sci-libs/trilinos/Manifest
index 891cd5ed7f7e..2be47572d150 100644
--- a/sci-libs/trilinos/Manifest
+++ b/sci-libs/trilinos/Manifest
@@ -1,4 +1,10 @@
 DIST trilinos-13.0.0-patches-r0.tar.xz 7672 BLAKE2B 6412f1226549086ef2fca3c4d8bba3c5541489879f4fa37c3598a7271128e3232fa1cc56a51d44fb88d679458a79a082c3984085ddbe4bc0884b0cb45ba683c0 SHA512 91372fe0f47a1f5d4dbc1856e2cfb9d4f1eb8cc0de941013a7a6e791730c9e10decdcd4ca39b36bae836ac66040bee70af187b4a056d46b0da0fe72e8c5943fc
 DIST trilinos-13.0.1.tar.gz 157950374 BLAKE2B 79f337b02a0fe9ddf7b55334e035946204b3bb469b92fff4063896a378c82d9c5f04c0bf0e9ddd21603ecf9d84a91860606482b545916f16029a11d2b6c64aa0 SHA512 22241a9ad8b6b6ab9117aba254f65195fc0c8e1b52eacb16e763c999086b6da6b0c180d8864fbe421704e0fe0c433d37512099755d54e60f13ed525dc6c0fd57
-EBUILD trilinos-13.0.1-r2.ebuild 6356 BLAKE2B 6b0106b2d0a830e222d9551155ab3b082239b4d5be8ca0f98564b5842652b87a0c11ac7c1b87bb357c24756e0557e903653f5a71e8bfc60195e24551d0a8a6c7 SHA512 6b8444aff5763c279f8b68130f621475754bb507203504bde30302b23388bc006bd4ada1f06e6f603d55880bf290495ede9f96736242622f9cdbdb948e6c6f15
-MISC metadata.xml 2701 BLAKE2B 3899b8aa8424eca96d406c0ae3d66d30ed0d44a2070c9e5844b456730b89d8017feba10c5c75e1bcd6d3649a6ba37d044fa14f2822eb883b2b72bdb1667c32c7 SHA512 888dc051b32d4b3e227d3cca17bf64ec5885169c59669944a522d5d304ea2a5fa19854524b48e61ae3bb6c8483e717329d6384836301b691f6de15f6d13ed114
+DIST trilinos-13.2.0-patches-r0.tar.xz 7896 BLAKE2B 7bd482fd17c7a9a0f7d536f6e65ac49d5921daf82d22803aab8cf3b24e9ce7776b5c68b20c3efdd4b1b83e558b3be3386a61ca637066828e4d535c2b0bc85138 SHA512 14824c9998152bd044d048da07787cde94636dda99999c25ad2c5d66cd59b1975bcf0618a48fe2a28d44c6e3769f2fcabc09b0ba21dca9a6beecf278c1ad2bff
+DIST trilinos-13.2.0.tar.gz 165860771 BLAKE2B 9ea8b27fd37a277aa1a988659919a012928edfd8b57a0fde240d9b9dce2832ab08fc0daf780aaab2a1422337bd02eddd6301fee203ab7ba4c213391cccd3be83 SHA512 b16dc9a815c8983f44786aac537b1b4ad7a43721eb553d6d33f07188280988f4297b4978b36d2d837a43faf16b518db29bf9b7997549318e3c95fd366eb16bc9
+DIST trilinos-13.4.0-patches-r0.tar.xz 8740 BLAKE2B 333ab9ff1acb2f4b08007c7b99b96f023f6c742e4f991fc0ab9dd6595be7e3e319a77d5e329790cedca72d7a9060df837549d28e8a6cb4b8a838570d455ae356 SHA512 f30c16801cadec2a612ab2f7d3ca05c5ddfdfc513343a182562253cdfb58d38fa8b771ab07f7bc6bcb2505d146469da2ddda478f74447de746d5eca850da123e
+DIST trilinos-13.4.0.tar.gz 168733479 BLAKE2B 3c4a1c89b792ec771c6347eebb6bb54a82fa5f172d1c5934bbd42c8bc9708a71451bd030ec0f5264191a62169b3c1305ac7a1290b3ab4845fb6e8ffef15ee03c SHA512 27a5636bac8106a0705948ca4705b739878f0d8afa74264d1cd31036811084457e27e03e86dfad59a80d5e9ee798237fa930b50574ec3e43979e53c6ab5da535
+EBUILD trilinos-13.0.1-r4.ebuild 6593 BLAKE2B 84736d151a7412e84999a31cc60a91a89e717d5d8c889c2e765403811b3db0fe7dbb4958f0363cb1dbabcd33827603a46dcfc9e13f97ac0dc83aee9d5f59ad64 SHA512 ccdbdb5ad13aac787d33b3259683b1e6f71e6ba875928b6f52a1b3e89ded59892c4160046cf9a3ea763433966137788fc4abc879ad182bf866b194855e57bf2f
+EBUILD trilinos-13.2.0.ebuild 7360 BLAKE2B 92e46832f36d7de4a70967fb78a59b660f004c945624b3cc2b1d9c27b1d0172f99351fe55b17e545dce981b57895455d1c2e48ac5814b6517bedb582de66e313 SHA512 29d2d07511bb19c90353850a5573f6c4f7674134c2e24bfc77d371b86fab2ca229c81e13989463b5c35706016c417d24a0b77e34826cc427b42db3d9d75c85d0
+EBUILD trilinos-13.4.0-r3.ebuild 7360 BLAKE2B e166d328c767fd6a0ca36544e3911d0076f47dcf3c4a169a4dfea2d87871bd0a4f157bb59fe8afaa78f13264d3a3e200c488e6f05b6558c12153fa83f20ef033 SHA512 9a1c3cdab829e20806a0f4ccd95c41910fc7358e08db8ef20a7042e059af91945a5628e5dd4674560b43ba4bdd31ec38d2dab228374e25fa800f3f7223ba3816
+MISC metadata.xml 2812 BLAKE2B 2e800301cbcdb1e1a4fecb285a4e98901cf4dae3e84b33a257fd14be86a762fe396541480187044c0787ade12b8b3b142535352e29afbb2bcb1435d7016e47a0 SHA512 91c25350aac731a5a57b8def2678147e35b8e58e447bb02688f89fd3aca76728af1e85df1aedcc208a8dd7cf19118a69867d907ccf1ff6bb0fcb7c27cd701253
diff --git a/sci-libs/trilinos/metadata.xml b/sci-libs/trilinos/metadata.xml
index 8e99b0a5654f..75b56d669dac 100644
--- a/sci-libs/trilinos/metadata.xml
+++ b/sci-libs/trilinos/metadata.xml
@@ -16,6 +16,7 @@ of large-scale, complex multi-physics engineering and scientific problems.
 </longdescription>
 	<use>
 		<flag name="adolc">Add support for adolc (<pkg>sci-libs/adolc</pkg>)</flag>
+		<flag name="all-packages">Enable all supported Trilinos packages (per default only a subset is built)</flag>
 		<flag name="arprec">Add support for arprec (<pkg>sci-libs/arprec</pkg>)</flag>
 		<flag name="clp">Add support for clp (<pkg>sci-libs/coinor-clp</pkg>)</flag>
 		<flag name="cuda">Add support for cuda (<pkg>dev-util/nvidia-cuda-toolkit</pkg>)</flag>
diff --git a/sci-libs/trilinos/trilinos-13.0.1-r2.ebuild b/sci-libs/trilinos/trilinos-13.0.1-r4.ebuild
index b4408c0d397a..8f5af315e03e 100644
--- a/sci-libs/trilinos/trilinos-13.0.1-r2.ebuild
+++ b/sci-libs/trilinos/trilinos-13.0.1-r4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake toolchain-funcs multilib
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Scientific library collection for large scale problems"
 HOMEPAGE="http://trilinos.sandia.gov/"
@@ -19,7 +19,7 @@ SLOT="0"
 
 IUSE="
 	adolc arprec clp cuda eigen glpk gtest hdf5 hwloc hypre
-	matio metis mkl mumps netcdf petsc qd scalapack scotch sparse
+	matio metis mkl mumps netcdf openmp petsc qd scalapack scotch sparse
 	superlu taucs tbb test threads tvmet yaml zlib X
 "
 
@@ -69,6 +69,14 @@ PATCHES=(
 	"${WORKDIR}"/patches
 )
 
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
 trilinos_conf() {
 	local dirs libs d
 	for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
@@ -95,11 +103,13 @@ src_configure() {
 		-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
 		-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
 		-DTrilinos_ENABLE_ALL_PACKAGES=ON
+		-DTrilinos_ENABLE_OpenMP="$(usex openmp)"
 		-DTrilinos_ENABLE_PyTrilinos=OFF
-		-DTrilinos_ENABLE_SEACAS=OFF
 		-DTrilinos_ENABLE_SEACASChaco=OFF
 		-DTrilinos_ENABLE_SEACASExodiff="$(usex netcdf)"
 		-DTrilinos_ENABLE_SEACASExodus="$(usex netcdf)"
+		-DTrilinos_ENABLE_SEACAS=OFF
+		-DTrilinos_ENABLE_ADELUS=OFF
 		-DTrilinos_ENABLE_TESTS="$(usex test)"
 		-DTPL_ENABLE_BinUtils=ON
 		-DTPL_ENABLE_BLAS=ON
diff --git a/sci-libs/trilinos/trilinos-13.2.0.ebuild b/sci-libs/trilinos/trilinos-13.2.0.ebuild
new file mode 100644
index 000000000000..b4df7074f964
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-13.2.0.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Scientific library collection for large scale problems"
+HOMEPAGE="http://trilinos.sandia.gov/"
+MY_PV="${PV//\./-}"
+PATCHSET="r0"
+SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-${PATCHSET}.tar.xz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+
+IUSE="
+	adolc all-packages arprec clp cuda eigen glpk gtest hdf5 hwloc hypre
+	matio metis mkl mumps netcdf openmp petsc qd scalapack scotch
+	sparse superlu taucs tbb test threads tvmet yaml zlib X
+"
+
+# TODO: fix export cmake function for tests
+RESTRICT="test"
+
+RDEPEND="
+	!dev-cpp/kokkos
+	dev-libs/boost:=
+	sys-libs/binutils-libs:=
+	virtual/blas
+	virtual/lapack
+	virtual/mpi
+	adolc? ( sci-libs/adolc )
+	arprec? ( sci-libs/arprec )
+	clp? ( sci-libs/coinor-clp )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
+	eigen? ( dev-cpp/eigen:3 )
+	glpk? ( sci-mathematics/glpk )
+	gtest? ( dev-cpp/gtest )
+	hdf5? ( sci-libs/hdf5:=[mpi] )
+	hypre? ( sci-libs/hypre:= )
+	hwloc? ( sys-apps/hwloc:= )
+	matio? ( sci-libs/matio )
+	mkl? ( sci-libs/mkl )
+	metis? ( sci-libs/metis )
+	mumps? ( sci-libs/mumps )
+	netcdf? ( sci-libs/netcdf:= )
+	petsc? ( sci-mathematics/petsc )
+	qd? ( sci-libs/qd )
+	scalapack? ( sci-libs/scalapack )
+	scotch? ( sci-libs/scotch:= )
+	sparse? ( sci-libs/cxsparse sci-libs/umfpack )
+	superlu? ( sci-libs/superlu:= )
+	taucs? ( sci-libs/taucs )
+	tbb? ( dev-cpp/tbb:= )
+	tvmet? ( dev-libs/tvmet )
+	yaml? ( dev-cpp/yaml-cpp:= )
+	zlib? ( sys-libs/zlib )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}"
+
+PATCHES=(
+	"${WORKDIR}"/patches
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+trilinos_conf() {
+	local dirs libs d
+	for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
+		dirs="${dirs};${d:2}"
+	done
+	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
+	for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
+		libs="${libs};${d:2}"
+	done
+	[[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
+	dirs=""
+	for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
+		dirs="${dirs};${d:2}"
+	done
+	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
+}
+
+#
+# The following packages are currently disabled:
+#  - Adelus/Zadelus due to underlinkage.
+#  - Moertel due to underlinkage
+#  - SEACAS is incompatible with netcdf, see
+#    https://github.com/trilinos/Trilinos/tree/master/packages/seacas#netcdf
+#
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
+		-DCMAKE_SKIP_INSTALL_RPATH=ON
+		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
+		-DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
+		-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
+		-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
+		-DTrilinos_ENABLE_ALL_PACKAGES="$(usex all-packages)"
+		-DTrilinos_ENABLE_Adelus=OFF
+		-DTrilinos_ENABLE_Moertel=OFF
+		-DTrilinos_ENABLE_PyTrilinos=OFF
+		-DTrilinos_ENABLE_SEACAS=OFF
+		-DTrilinos_ENABLE_Amesos=ON
+		-DTrilinos_ENABLE_AztecOO=ON
+		-DTrilinos_ENABLE_COMPLEX_DOUBLE=ON
+		-DTrilinos_ENABLE_COMPLEX_FLOAT=ON
+		-DTrilinos_ENABLE_EpetraExt=ON
+		-DTrilinos_ENABLE_Epetra=ON
+		-DTrilinos_ENABLE_Ifpack=ON
+		-DTrilinos_ENABLE_ML=ON
+		-DTrilinos_ENABLE_MueLu=ON
+		-DTrilinos_ENABLE_OpenMP="$(usex openmp)"
+		-DTrilinos_ENABLE_ROL=ON
+		-DTrilinos_ENABLE_Sacado=ON
+		-DTrilinos_ENABLE_Teuchos=ON
+		-DTrilinos_ENABLE_Tpetra=ON
+		-DTrilinos_ENABLE_Zoltan=ON
+		-DTrilinos_ENABLE_TESTS="$(usex test)"
+		-DTPL_ENABLE_BinUtils=ON
+		-DTPL_ENABLE_BLAS=ON
+		-DTPL_ENABLE_LAPACK=ON
+		-DTPL_ENABLE_MPI=ON
+		-DTPL_ENABLE_ADOLC="$(usex adolc)"
+		-DTPL_ENABLE_AMD="$(usex sparse)"
+		-DTPL_ENABLE_ARPREC="$(usex arprec)"
+		-DTPL_ENABLE_BLACS="$(usex scalapack)"
+		-DTPL_ENABLE_BoostLib=ON
+		-DTPL_ENABLE_Boost=ON
+		-DTPL_ENABLE_Clp="$(usex clp)"
+		-DTPL_ENABLE_CSparse="$(usex sparse)"
+		-DTPL_ENABLE_CUDA="$(usex cuda)"
+		-DTPL_ENABLE_CUSPARSE="$(usex cuda)"
+		-DTPL_ENABLE_Eigen="$(usex eigen)"
+		-DTPL_ENABLE_GLPK="$(usex glpk)"
+		-DTPL_ENABLE_gtest="$(usex gtest)"
+		-DTPL_ENABLE_HDF5="$(usex hdf5)"
+		-DTPL_ENABLE_HWLOC="$(usex hwloc)"
+		-DTPL_ENABLE_HYPRE="$(usex hypre)"
+		-DTPL_ENABLE_Matio="$(usex matio)"
+		-DTPL_ENABLE_METIS="$(usex metis)"
+		-DTPL_ENABLE_MKL="$(usex mkl)"
+		-DTPL_ENABLE_MUMPS="$(usex mumps)"
+		-DTPL_ENABLE_Netcdf="$(usex netcdf)"
+		-DTPL_ENABLE_PARDISO_MKL="$(usex mkl)"
+		-DTPL_ENABLE_PETSC="$(usex petsc)"
+		-DTPL_ENABLE_Pthread="$(usex threads)"
+		-DTPL_ENABLE_QD="$(usex qd)"
+		-DTPL_ENABLE_SCALAPACK="$(usex scalapack)"
+		-DTPL_ENABLE_Scotch="$(usex scotch)"
+		-DTPL_ENABLE_SuperLU="$(usex superlu)"
+		-DTPL_ENABLE_TAUCS="$(usex taucs)"
+		-DTPL_ENABLE_TBB="$(usex tbb)"
+		-DTPL_ENABLE_Thrust="$(usex cuda)"
+		-DTPL_ENABLE_TVMET="$(usex tvmet)"
+		-DTPL_ENABLE_UMFPACK="$(usex sparse)"
+		-DTPL_ENABLE_X11="$(usex X)"
+		-DTPL_ENABLE_yaml-cpp="$(usex yaml)"
+		-DTPL_ENABLE_Zlib="$(usex zlib)"
+	)
+
+	#
+	# Make sure some critical configuration options are always set
+	# correctly independently of what Trilinos dependency resolver thinks
+	# it should be doing.
+	#
+	local mycmakeargs+=(
+		-DAmesos2_ENABLE_LAPACK=ON
+		-DAmesos2_ENABLE_MUMPS=OFF
+		-DTpetra_INST_SERIAL=ON
+	)
+
+	use eigen && \
+		mycmakeargs+=(
+		-DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3"
+	)
+	use hypre && \
+		mycmakeargs+=(
+		-DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre"
+	)
+	use scotch && \
+		mycmakeargs+=(
+		-DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch"
+	)
+
+	# cxsparse is a rewrite of csparse + extras
+	use sparse && \
+		mycmakeargs+=(
+		-DCSparse_LIBRARY_NAMES="cxsparse"
+	)
+
+	# mandatory blas and lapack
+	trilinos_conf blas BLAS
+	trilinos_conf lapack LAPACK
+	use superlu && trilinos_conf superlu SuperLU
+	use metis && trilinos_conf metis METIS
+
+	# blacs library is included in scalapack these days
+	if use scalapack; then
+		trilinos_conf scalapack SCALAPACK
+		mycmakeargs+=(
+			-DBLACS_LIBRARY_NAMES="scalapack"
+			-DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs"
+		)
+	fi
+
+	#
+	# Make sure we use the compiler wrappers in order to build trilinos.
+	#
+	[ ! -z "${CC}"] && export OMPI_CC="${CC}" MPICH_CC="${CC}" && tc-export OMPI_CC MPICH_CC
+	[ ! -z "${CXX}"] && export OMPI_CXX="${CXX}" MPICH_CXX="${CXX}" && tc-export OMPI_CXX MPICH_CXX
+	export CC=mpicc CXX=mpicxx && tc-export CC CXX
+
+	# Trilinos needs a custom build type:
+	local CMAKE_BUILD_TYPE=Release
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# Clean up the mess:
+	mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
+	mv "${ED}/usr/$(get_libdir)"/trilinos/cmake/* "${ED}/usr/$(get_libdir)"/cmake || die "mv failed"
+	rmdir "${ED}/usr/$(get_libdir)/trilinos/cmake" || die "rmdir failed"
+
+	#
+	# register $(get_libdir)/trilinos in LDPATH so that the dynamic linker
+	# has a chance to pick up the libraries...
+	#
+	cat >> "${T}"/99trilinos <<- EOF
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos"
+	PATH="${EPREFIX}/usr/$(get_libdir)/trilinos/bin"
+	EOF
+	doenvd "${T}"/99trilinos
+}
diff --git a/sci-libs/trilinos/trilinos-13.4.0-r3.ebuild b/sci-libs/trilinos/trilinos-13.4.0-r3.ebuild
new file mode 100644
index 000000000000..9996b79bd35d
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-13.4.0-r3.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Scientific library collection for large scale problems"
+HOMEPAGE="http://trilinos.sandia.gov/"
+MY_PV="${PV//\./-}"
+PATCHSET="r0"
+SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-${PATCHSET}.tar.xz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+
+IUSE="
+	adolc all-packages arprec clp cuda eigen glpk gtest hdf5 hwloc hypre
+	matio metis mkl mumps netcdf openmp petsc qd scalapack scotch sparse
+	superlu taucs tbb test threads tvmet yaml zlib X
+"
+
+# TODO: fix export cmake function for tests
+RESTRICT="test"
+
+RDEPEND="
+	!dev-cpp/kokkos
+	dev-libs/boost:=
+	sys-libs/binutils-libs:=
+	virtual/blas
+	virtual/lapack
+	virtual/mpi
+	adolc? ( sci-libs/adolc )
+	arprec? ( sci-libs/arprec )
+	clp? ( sci-libs/coinor-clp )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
+	eigen? ( dev-cpp/eigen:3 )
+	glpk? ( sci-mathematics/glpk )
+	gtest? ( dev-cpp/gtest )
+	hdf5? ( sci-libs/hdf5:=[mpi] )
+	hypre? ( sci-libs/hypre:= )
+	hwloc? ( sys-apps/hwloc:= )
+	matio? ( sci-libs/matio )
+	mkl? ( sci-libs/mkl )
+	metis? ( sci-libs/metis )
+	mumps? ( sci-libs/mumps )
+	netcdf? ( sci-libs/netcdf:= )
+	petsc? ( sci-mathematics/petsc )
+	qd? ( sci-libs/qd )
+	scalapack? ( sci-libs/scalapack )
+	scotch? ( sci-libs/scotch:= )
+	sparse? ( sci-libs/cxsparse sci-libs/umfpack )
+	superlu? ( sci-libs/superlu:= )
+	taucs? ( sci-libs/taucs )
+	tbb? ( dev-cpp/tbb:= )
+	tvmet? ( dev-libs/tvmet )
+	yaml? ( dev-cpp/yaml-cpp:= )
+	zlib? ( sys-libs/zlib )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}"
+
+PATCHES=(
+	"${WORKDIR}"/patches
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+trilinos_conf() {
+	local dirs libs d
+	for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
+		dirs="${dirs};${d:2}"
+	done
+	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
+	for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
+		libs="${libs};${d:2}"
+	done
+	[[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
+	dirs=""
+	for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
+		dirs="${dirs};${d:2}"
+	done
+	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
+}
+
+#
+# The following packages are currently disabled:
+#  - Adelus/Zadelus due to underlinkage.
+#  - Moertel due to underlinkage
+#  - SEACAS is incompatible with netcdf, see
+#    https://github.com/trilinos/Trilinos/tree/master/packages/seacas#netcdf
+#
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
+		-DCMAKE_SKIP_INSTALL_RPATH=ON
+		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
+		-DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
+		-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
+		-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
+		-DTrilinos_ENABLE_ALL_PACKAGES="$(usex all-packages)"
+		-DTrilinos_ENABLE_Adelus=OFF
+		-DTrilinos_ENABLE_Moertel=OFF
+		-DTrilinos_ENABLE_PyTrilinos=OFF
+		-DTrilinos_ENABLE_SEACAS=OFF
+		-DTrilinos_ENABLE_Amesos=ON
+		-DTrilinos_ENABLE_AztecOO=ON
+		-DTrilinos_ENABLE_COMPLEX_DOUBLE=ON
+		-DTrilinos_ENABLE_COMPLEX_FLOAT=ON
+		-DTrilinos_ENABLE_EpetraExt=ON
+		-DTrilinos_ENABLE_Epetra=ON
+		-DTrilinos_ENABLE_Ifpack=ON
+		-DTrilinos_ENABLE_ML=ON
+		-DTrilinos_ENABLE_MueLu=ON
+		-DTrilinos_ENABLE_OpenMP="$(usex openmp)"
+		-DTrilinos_ENABLE_ROL=ON
+		-DTrilinos_ENABLE_Sacado=ON
+		-DTrilinos_ENABLE_Teuchos=ON
+		-DTrilinos_ENABLE_Tpetra=ON
+		-DTrilinos_ENABLE_Zoltan=ON
+		-DTrilinos_ENABLE_TESTS="$(usex test)"
+		-DTPL_ENABLE_BinUtils=ON
+		-DTPL_ENABLE_BLAS=ON
+		-DTPL_ENABLE_LAPACK=ON
+		-DTPL_ENABLE_MPI=ON
+		-DTPL_ENABLE_ADOLC="$(usex adolc)"
+		-DTPL_ENABLE_AMD="$(usex sparse)"
+		-DTPL_ENABLE_ARPREC="$(usex arprec)"
+		-DTPL_ENABLE_BLACS="$(usex scalapack)"
+		-DTPL_ENABLE_BoostLib=ON
+		-DTPL_ENABLE_Boost=ON
+		-DTPL_ENABLE_Clp="$(usex clp)"
+		-DTPL_ENABLE_CSparse="$(usex sparse)"
+		-DTPL_ENABLE_CUDA="$(usex cuda)"
+		-DTPL_ENABLE_CUSPARSE="$(usex cuda)"
+		-DTPL_ENABLE_Eigen="$(usex eigen)"
+		-DTPL_ENABLE_GLPK="$(usex glpk)"
+		-DTPL_ENABLE_gtest="$(usex gtest)"
+		-DTPL_ENABLE_HDF5="$(usex hdf5)"
+		-DTPL_ENABLE_HWLOC="$(usex hwloc)"
+		-DTPL_ENABLE_HYPRE="$(usex hypre)"
+		-DTPL_ENABLE_Matio="$(usex matio)"
+		-DTPL_ENABLE_METIS="$(usex metis)"
+		-DTPL_ENABLE_MKL="$(usex mkl)"
+		-DTPL_ENABLE_MUMPS="$(usex mumps)"
+		-DTPL_ENABLE_Netcdf="$(usex netcdf)"
+		-DTPL_ENABLE_PARDISO_MKL="$(usex mkl)"
+		-DTPL_ENABLE_PETSC="$(usex petsc)"
+		-DTPL_ENABLE_Pthread="$(usex threads)"
+		-DTPL_ENABLE_QD="$(usex qd)"
+		-DTPL_ENABLE_SCALAPACK="$(usex scalapack)"
+		-DTPL_ENABLE_Scotch="$(usex scotch)"
+		-DTPL_ENABLE_SuperLU="$(usex superlu)"
+		-DTPL_ENABLE_TAUCS="$(usex taucs)"
+		-DTPL_ENABLE_TBB="$(usex tbb)"
+		-DTPL_ENABLE_Thrust="$(usex cuda)"
+		-DTPL_ENABLE_TVMET="$(usex tvmet)"
+		-DTPL_ENABLE_UMFPACK="$(usex sparse)"
+		-DTPL_ENABLE_X11="$(usex X)"
+		-DTPL_ENABLE_yaml-cpp="$(usex yaml)"
+		-DTPL_ENABLE_Zlib="$(usex zlib)"
+	)
+
+	#
+	# Make sure some critical configuration options are always set
+	# correctly independently of what Trilinos dependency resolver thinks
+	# it should be doing.
+	#
+	local mycmakeargs+=(
+		-DAmesos2_ENABLE_LAPACK=ON
+		-DAmesos2_ENABLE_MUMPS=OFF
+		-DTpetra_INST_SERIAL=ON
+	)
+
+	use eigen && \
+		mycmakeargs+=(
+		-DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3"
+	)
+	use hypre && \
+		mycmakeargs+=(
+		-DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre"
+	)
+	use scotch && \
+		mycmakeargs+=(
+		-DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch"
+	)
+
+	# cxsparse is a rewrite of csparse + extras
+	use sparse && \
+		mycmakeargs+=(
+		-DCSparse_LIBRARY_NAMES="cxsparse"
+	)
+
+	# mandatory blas and lapack
+	trilinos_conf blas BLAS
+	trilinos_conf lapack LAPACK
+	use superlu && trilinos_conf superlu SuperLU
+	use metis && trilinos_conf metis METIS
+
+	# blacs library is included in scalapack these days
+	if use scalapack; then
+		trilinos_conf scalapack SCALAPACK
+		mycmakeargs+=(
+			-DBLACS_LIBRARY_NAMES="scalapack"
+			-DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs"
+		)
+	fi
+
+	#
+	# Make sure we use the compiler wrappers in order to build trilinos.
+	#
+	[ ! -z "${CC}"] && export OMPI_CC="${CC}" MPICH_CC="${CC}" && tc-export OMPI_CC MPICH_CC
+	[ ! -z "${CXX}"] && export OMPI_CXX="${CXX}" MPICH_CXX="${CXX}" && tc-export OMPI_CXX MPICH_CXX
+	export CC=mpicc CXX=mpicxx && tc-export CC CXX
+
+	# Trilinos needs a custom build type:
+	local CMAKE_BUILD_TYPE=Release
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# Clean up the mess:
+	mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
+	mv "${ED}/usr/$(get_libdir)"/trilinos/cmake/* "${ED}/usr/$(get_libdir)"/cmake || die "mv failed"
+	rmdir "${ED}/usr/$(get_libdir)/trilinos/cmake" || die "rmdir failed"
+
+	#
+	# register $(get_libdir)/trilinos in LDPATH so that the dynamic linker
+	# has a chance to pick up the libraries...
+	#
+	cat >> "${T}"/99trilinos <<- EOF
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos"
+	PATH="${EPREFIX}/usr/$(get_libdir)/trilinos/bin"
+	EOF
+	doenvd "${T}"/99trilinos
+}
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index c2ab330f934f..bbe8e0705f22 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -3,6 +3,7 @@ AUX vtk-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch 1529
 AUX vtk-9.0.1-limits-include-gcc11.patch 2654 BLAKE2B 69eae5782234e46c2a38dbc3bf3d01082518314c62742996b953a6b17ceca9d85ca9a83a907c6820210bc0ff406640476dcafc1a533d90071e1c0517a06cc938 SHA512 ef16b3dea49f29d537bfbef26e62f91e59056288eac5c0c41191fee6c2181336dcceaa27b84a541c442d986b8ce1cdf3a9effdedcab1e1a1e242efad34954d00
 AUX vtk-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch 4152 BLAKE2B 7f757ed934e5684bdbe17e6214ac1ab55b024359cb3a4819ea11c086bbb5abcafc787fd37433cb1cae77d9284aa206b43fb5dc8fe5b8923c4d1944c4fc39d748 SHA512 dfe9c8651fc6b6e5c5c8aa81b0821fd5ceee73c728bee5add29cd28b2c19fd79dbe9f14124f789eb647975693679b80d7219ac0a3189b5b78c2818d5055a4b7b
 AUX vtk-9.1.0-adjust-to-find-binaries.patch 998 BLAKE2B 2e2338aa0e918173776a6684ae344d8b75eac8bd514d38e7e1ba5ebfeede9b170f6ab76a2d2c003448673bfbf8c3a1aea58659580aa5e85cb0c5f0d1921233a1 SHA512 259953569d3e03b920783c882ee201b8eeb8c796103bbae25f2915084c26707b9d85e886874b61264da885506ee269edf839ea2da24aa5640ea46aeb8e6dbf5a
+AUX vtk-9.1.0-avoid-naming-collision-with-netcdf-4.9.0.patch 1020 BLAKE2B 96a8bcba9bc8d10fa3a929b988d936fc95e53e47621d5bcbf872aded3aefb8f40f1a4bef74b6f14f27d18e336bfa9c755c6a6d4235d347f97fb21b021149e0ce SHA512 caddb5f15f665748f652d7036798fe4d060d772473f52350bf2db6f3b468bd56011ad34c78306a57469ef4ad6943d7ed0b60762b3c43b54f98258d0d3639fd5e
 DIST VTK-9.0.3.tar.gz 34684378 BLAKE2B 6862ab2df95bbefe9d3970757af6521cfa874476f6ee8e64c4e6e279f2e0cbb8a8299bc3b0b8bb9b7254d01a169644e7927b67b11b2ce934ddc87bce0a9e4c26 SHA512 00528011f9206444d09fc6cea05c46930745bb70ea02be6244ab3eb510ae82af772157c025157b1761dc4c6a9ab538b57f814c03a708f30aa3598a421fdc6ae2
 DIST VTK-9.1.0.tar.gz 47871165 BLAKE2B 68cebc0879737a519b53e73f198356208b047c301d38ee2d62b9a14539cdb9aa76bd7174baa29592c7b1cfd1cc9700d01e98519a207d67a232d16ad37295ac31 SHA512 b2c4be8795fa082e0776e6ffdb9a3fd88dbb235841a8369a34ebe26cf4c5fcb1610fcca987be314510629da3edc74ee76c0ce2cc88d5ef4b099ac550ac892b0a
 DIST VTKData-9.0.3.tar.gz 413854066 BLAKE2B 84c2fa0ae5df8567cc06022262fe3ea1202c553168757c94aa4a0a258360deccdf349d474c2f6585fc2054ee8e0468df4c80ec835cecf6b2391efa639f479eaa SHA512 28ab2ecb32860d820f736e9ceb4345bcd03471f0a35b90f8c9ccbe05454f7a95a4de3c99bae2f4b9db87a27ef8fe50159cd283f5e921f4e6e69b06a50a0570c6
@@ -13,6 +14,7 @@ DIST VTKLargeData-9.1.0.tar.gz 247517666 BLAKE2B 1b47829ad51f246ff26c8b6d16c9fa4
 DIST VTKLargeDataFiles-9.1.0.tar.gz 247504557 BLAKE2B a05892347a1a5cf5cb0df3f1c1d94efcdb68c28bcd0391617602565fddc4277ac44accec6f1b3ae2822a860f3d5f5642a56e36171b5d81bef137561182051d08 SHA512 10abc287256c7ec5fb7114f4054eda5cde1b75a8d2bbe70375fb96d31b7c4164be936489ce2fc9b5c33225f494d9b7f5f7bed648828661b17d6f66acb70eeddc
 DIST vtkDocHtml-9.0.3.tar.gz 132650096 BLAKE2B 45fc1a6942df3e79e500a552c3b3cda2099b9451191559d471e3a2e785a8c52b2c6273cfd2cc4a3f3f65582e607d9414475f58d243fde96a4f985bed479e53db SHA512 9b5fef43f3c2b92aa1fe6a9ba9458d6677874b09b167654db7f26df6feffdc34ed1a8fb4e59d64b75625063a774af77fe57f275903602a5f7daa74e1a2e71800
 DIST vtkDocHtml-9.1.0.tar.gz 152767166 BLAKE2B 9163b6b1bf55810a310ca8bc211e067827b1f9907efd2a378363d8e6296d4bf07b25371b66c00cab3576fb06f0cb63fdf2ffea044033e2c42e9087819a3736ba SHA512 036daba5eb6503b5eb3e9323a4ab3ea0f27c09d8fef411dd2ed154c24d5a37d9f19d57db07576c8af404bfdb7178e95b137a3c27bfedb3f9cb72c04f717da80a
-EBUILD vtk-9.0.3-r4.ebuild 14383 BLAKE2B 42e0a6bcc242fe05f0cf68bb2abcfb015eb97c3f8eb538e52c4dda965889ba3c14e12bd0fa15d18c3bdd8ea2600266777cce12ea9c40e77d80d85346f07c9821 SHA512 8cceabff7535339811fc9a02925dc437d1460311b32a6354227d1190bba4b7261c452cc44fd0b74f70bbf8970d59c04fec578dfb5619c2b3bfa90e92bb3d9973
-EBUILD vtk-9.1.0.ebuild 16427 BLAKE2B 7f616c51f2ed60d12f46003d64e6ae228db8c567e50fc05305fd688aa6a62669c620c762dbf3eaafc62492e64cbea10deeaca505bca1578916639607f5eaa059 SHA512 8a344d6651b4b1b4f9fc01decd63e7a2f602c3bcdf27c23ffd7cea8c506385ad7d5c6a8ddb0c9b7b0fa08cae7988cc095149800d63adc2650b4ec3881e3d6f69
+EBUILD vtk-9.0.3-r4.ebuild 14382 BLAKE2B 34a32bf6f86e429c81c97196e7d03061e16c165ea034498bbd8c3e4f64ea13f31443949c39adebe643cfa60d38a66a9d393a7a0b3497168b2ef0f1d832d77150 SHA512 2b927abdebb0ec745d8d84a1bd380e199ec45837cc11c7bb0a30962bbc8a73f3ef08b37d7ebcc4e3f2ec409873252c121bfae849d1e7bf039c4c65ed1272c064
+EBUILD vtk-9.0.3-r5.ebuild 14400 BLAKE2B 0d63f7c28132d1486ac3b14b680d7cf730ec1f4572105870fa3d52096982a9dbe4d05b3955b9f4d0114dae5668698a398619bc38bd27fe02e22ca90e2a2f0e1d SHA512 146892890bf9b28dd2d5a00e3ac406814439d87ab4803014a56fce3281b124c48b02e19492a56aa474a4f0f175e39355dc17f437a23603901b04db1cf88c117b
+EBUILD vtk-9.1.0-r2.ebuild 16506 BLAKE2B 2d062d78c6857dacd0ded4d7fd7a2a0f6544d0572646a6f68f8701e42ebeb6efbb965eb02521fd9b49ec269ea3715e6c6bcf6c22050f8e0620d15f236ba2e5c6 SHA512 5dad4530e8821ecc0b68b9420025a8c18b0c865683092d2d8dd16ef87d9c6cc4bcf31002186535d79cff939afbef26841719c310177c06411d31c1761b67b50b
 MISC metadata.xml 1349 BLAKE2B 778c471328fddbece653650c6a54b002dc9a48f5de3eb391bd0a84c9e0720ab1b2715b8013af55e60aac11a244090fc6e1d152c57a2c7f16b0b5306043e71731 SHA512 f55cac1ad724a7440bae4e7c364d3869ba25e4668463d0757ca8eb14469b539471c2bd31bb2e874c3a7982df490d9fc1c43c8d854dd4c511d0bde43ec0dc4a0c
diff --git a/sci-libs/vtk/files/vtk-9.1.0-avoid-naming-collision-with-netcdf-4.9.0.patch b/sci-libs/vtk/files/vtk-9.1.0-avoid-naming-collision-with-netcdf-4.9.0.patch
new file mode 100644
index 000000000000..7549c240ee51
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-9.1.0-avoid-naming-collision-with-netcdf-4.9.0.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/851594
+
+From b155e9716a1cf4a03948c01f49c4097e466da4f0 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 20 Jun 2022 07:07:19 +0200
+Subject: [PATCH] avoid naming collision with netcdf-4.9.0
+
+The identifier has already been #defined with netcdf-4.9.0. To avoid
+conflicts guard the declaration.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c
++++ b/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c
+@@ -1770,7 +1770,9 @@ void ex__compress_variable(int exoid, int varid, int type)
+         */
+ 
+         /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */
++#ifndef NC_SZIP_NN
+         const int NC_SZIP_NN = 32;      /* Selects nearest neighbor coding method for szip. */
++#endif
+         /* Even and between 4 and 32; typical values are 8, 10, 16, 32 */
+         const int SZIP_PIXELS_PER_BLOCK =
+             file->compression_level == 0 ? 32 : file->compression_level;
+-- 
+2.35.1
+
diff --git a/sci-libs/vtk/vtk-9.0.3-r4.ebuild b/sci-libs/vtk/vtk-9.0.3-r4.ebuild
index 0848a5f8b4e5..df05ef18cb21 100644
--- a/sci-libs/vtk/vtk-9.0.3-r4.ebuild
+++ b/sci-libs/vtk/vtk-9.0.3-r4.ebuild
@@ -31,7 +31,7 @@ S="${WORKDIR}/VTK-${PV}"
 
 LICENSE="BSD LGPL-2"
 SLOT="0/${MY_PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 # Note: external xdmf2 has no recognized target
 IUSE="+X all-modules boost cuda doc examples ffmpeg gdal imaging java
 	+json kits mpi mysql odbc offscreen openmp pegtl postgres python
diff --git a/sci-libs/vtk/vtk-9.0.3-r5.ebuild b/sci-libs/vtk/vtk-9.0.3-r5.ebuild
new file mode 100644
index 000000000000..efc32fbb2b46
--- /dev/null
+++ b/sci-libs/vtk/vtk-9.0.3-r5.ebuild
@@ -0,0 +1,551 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO:
+# - add USE flag for remote modules? Those modules can be downloaded
+#	properly before building.
+
+PYTHON_COMPAT=( python3_{8..10} )
+WEBAPP_OPTIONAL=yes
+WEBAPP_MANUAL_SLOT=yes
+
+inherit check-reqs cmake cuda flag-o-matic java-pkg-opt-2 python-single-r1 toolchain-funcs virtualx webapp
+
+# Short package version
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="The Visualization Toolkit"
+HOMEPAGE="https://www.vtk.org/"
+SRC_URI="
+	https://www.vtk.org/files/release/${MY_PV}/VTK-${PV}.tar.gz
+	https://www.vtk.org/files/release/${MY_PV}/VTKData-${PV}.tar.gz
+	doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${PV}.tar.gz )
+	examples? ( https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz )
+	test? (
+		https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${PV}.tar.gz
+	)
+"
+S="${WORKDIR}/VTK-${PV}"
+
+LICENSE="BSD LGPL-2"
+SLOT="0/${MY_PV}"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+# Note: external xdmf2 has no recognized target
+IUSE="+X all-modules boost cuda doc examples ffmpeg gdal imaging java
+	+json kits mpi mysql odbc offscreen openmp pegtl postgres python
+	qt5 +rendering tbb theora tk video_cards_nvidia views web"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	all-modules? ( boost ffmpeg gdal imaging mysql odbc postgres qt5 rendering theora views )
+	cuda? ( X video_cards_nvidia )
+	java? ( rendering )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( X rendering )
+	tk? ( X rendering python )
+	web? ( python )
+	^^ ( X offscreen )
+"
+
+RDEPEND="
+	app-arch/lz4
+	app-arch/xz-utils
+	dev-db/sqlite
+	dev-cpp/eigen[cuda?,openmp?]
+	dev-libs/double-conversion:=
+	dev-libs/expat
+	dev-libs/icu:=
+	dev-libs/libxml2:2
+	dev-libs/pugixml
+	media-libs/freetype
+	media-libs/libogg
+	media-libs/libpng
+	media-libs/libtheora
+	media-libs/tiff
+	<sci-libs/hdf5-1.12:=[mpi=]
+	sci-libs/kissfft[openmp?]
+	sci-libs/netcdf:=[mpi=]
+	sys-libs/zlib
+	media-libs/libjpeg-turbo
+	all-modules? ( sci-geosciences/liblas[gdal] )
+	boost? ( dev-libs/boost:=[mpi?] )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	ffmpeg? ( media-video/ffmpeg:= )
+	gdal? ( sci-libs/gdal:= )
+	java? ( >=virtual/jdk-1.8:* )
+	json? ( dev-libs/jsoncpp:= )
+	mpi? (
+		sci-libs/h5part
+		sys-cluster/openmpi[cxx,romio]
+	)
+	mysql? ( dev-db/mariadb-connector-c )
+	odbc? ( dev-db/unixODBC )
+	offscreen? ( media-libs/mesa[osmesa] )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtsql:5
+		dev-qt/qtwidgets:5
+	)
+	rendering? (
+		media-libs/freeglut
+		media-libs/glew:=
+		<sci-libs/proj-8:=
+		virtual/opengl
+		x11-libs/gl2ps
+	)
+	tbb? ( <dev-cpp/tbb-2021:= )
+	tk? ( dev-lang/tk:= )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+	views? (
+		x11-libs/libICE
+		x11-libs/libXext
+	)
+	web? ( ${WEBAPP_DEPEND} )
+	python? (
+		$(python_gen_cond_dep '
+			boost? ( dev-libs/boost:=[mpi?,python?,${PYTHON_USEDEP}] )
+			mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
+		')
+		gdal? ( sci-libs/gdal:=[python?,${PYTHON_SINGLE_USEDEP}] )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/jsoncpp
+	dev-libs/utfcpp
+	pegtl? ( <dev-libs/pegtl-3 )
+"
+BDEPEND="
+	mpi? ( app-admin/chrpath )
+	openmp? (
+		|| (
+			sys-devel/gcc[openmp(+)]
+			sys-devel/clang-runtime[openmp(+)]
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.0.1-0001-fix-kepler-compute_arch-if-CUDA-toolkit-11-is-used.patch
+	"${FILESDIR}"/${PN}-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
+	"${FILESDIR}"/${PN}-9.0.1-limits-include-gcc11.patch
+	"${FILESDIR}"/${P}-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch
+)
+
+DOCS=( CONTRIBUTING.md README.md )
+
+CHECKREQS_DISK_BUILD="3G"
+
+pkg_pretend() {
+	if use examples; then
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	if use cuda; then
+		# NOTE: This should actually equal to (number of build jobs)*7G,
+		# as any of the cuda compile tasks can take up 7G!
+		# 10.2 GiB install directory, 6.4 GiB build directory with max. USE flags
+		CHECKREQS_MEMORY="7G"
+		CHECKREQS_DISK_BUILD="14G"
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_setup() {
+	if use examples; then
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	if use cuda; then
+		CHECKREQS_MEMORY="7G"
+		CHECKREQS_DISK_BUILD="14G"
+	fi
+	check-reqs_pkg_setup
+
+	use java && java-pkg-opt-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+	use web && webapp_pkg_setup
+}
+
+src_prepare() {
+	# If we have system libraries available use these and delete
+	# the respecting files in ${S}/ThirdParty to save some space.
+	# Note: libharu is omitted: vtk needs an updated version (2.4.0)
+	# Note: no valid xdmf2 targets are found for system xdmf2
+	# Note: no valid target found for h5part and mpi4py
+	# TODO: diy2 exodusII h5part libharu verdict vpic vtkm xdmf2 xdmf3 zfp
+	local -a DROPS=( doubleconversion eigen expat freetype gl2ps glew
+		hdf5 jpeg jsoncpp libproj libxml2 lz4 lzma netcdf ogg png pugixml
+		sqlite theora tiff utf8 zlib )
+	use pegtl && DROPS+=( pegtl )
+
+	local x
+	for x in ${DROPS[@]}; do
+		ebegin "Dropping bundled ${x}"
+		rm -r ThirdParty/${x}/vtk${x} || die
+		eend $?
+	done
+	unset x
+
+	if use doc; then
+		einfo "Removing .md5 files from documents."
+		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
+		sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
+			-i Utilities/Doxygen/CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+
+	if use cuda; then
+		cuda_add_sandbox -w
+		cuda_src_prepare
+	fi
+
+	if use test; then
+		ebegin "Copying data files to ${BUILD_DIR}"
+		mkdir -p "${BUILD_DIR}/ExternalData" || die
+		pushd "${BUILD_DIR}/ExternalData" >/dev/null || die
+		ln -sf ../../VTK-${PV}/.ExternalData/README.rst . || die
+		ln -sf ../../VTK-${PV}/.ExternalData/SHA512 . || die
+		popd >/dev/null || die
+		eend "$?"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+# TODO: defaults for some variables to consider as USE flags
+#		-DVTK_ANDROID_BUILD=OFF
+#		-DVTK_BUILD_COMPILE_TOOLS_ONLY=OFF
+#		-DVTK_ENABLE_LOGGING=ON
+#		-DVTK_ENABLE_REMOTE_MODULES=ON
+#		-DVTK_INSTALL_SDK=ON
+#		-DVTK_IOS_BUILD=OFF
+#		-DVTK_LEGACY_REMOVE=OFF
+#		-DVTK_LEGACY_SILENT=OFF
+#		-DVTK_WHEEL_BUILD=OFF
+
+		-DVTK_BUILD_ALL_MODULES=$(usex all-modules ON OFF)
+		# we use the pre-built documentation and install these with USE=doc
+		-DVTK_BUILD_DOCUMENTATION=OFF
+		-DVTK_BUILD_EXAMPLES=$(usex examples ON OFF)
+
+		-DVTK_ENABLE_KITS=$(usex kits ON OFF)
+		# default to ON: USE flag for this?
+		-DVTK_ENABLE_REMOTE_MODULES=OFF
+
+		-DVTK_DATA_STORE="${S}/.ExternalData"
+
+		# Use upstream default, where USE flags are not given.
+		# Passing "DONT_WANT" will restrict building of modules from
+		# those groups and will severly limit the built libraries.
+		# Exceptions are MPI, where the default is "DONT_WANT" and
+		# StandAlone using "WANT".
+		-DVTK_GROUP_ENABLE_Imaging=$(usex imaging "WANT" "DEFAULT")
+		-DVTK_GROUP_ENABLE_Qt=$(usex qt5 "WANT" "DEFAULT")
+		-DVTK_GROUP_ENABLE_Rendering=$(usex rendering "WANT" "DEFAULT")
+		-DVTK_GROUP_ENABLE_StandAlone="WANT"
+		-DVTK_GROUP_ENABLE_Views=$(usex views "WANT" "DEFAULT")
+		-DVTK_GROUP_ENABLE_Web=$(usex web "WANT" "DEFAULT")
+
+		-DVTK_MODULE_ENABLE_VTK_vtkm="WANT"
+		-DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKm="WANT"
+
+		-DVTK_PYTHON_VERSION="3"
+		-DVTK_RELOCATABLE_INSTALL=ON
+
+		-DVTK_USE_CUDA=$(usex cuda ON OFF)
+		# use system libraries where possible
+		-DVTK_USE_EXTERNAL=ON
+		-DVTK_USE_MPI=$(usex mpi ON OFF)
+		-DVTK_USE_TK=$(usex tk ON OFF)
+		-DVTK_USE_X=$(usex X ON OFF)
+
+		-DVTK_VERSIONED_INSTALL=ON
+
+		-DVTK_WRAP_JAVA=$(usex java ON OFF)
+		-DVTK_WRAP_PYTHON=$(usex python ON OFF)
+	)
+
+	if use examples || use test; then
+		mycmakeargs+=( -DVTK_USE_LARGE_DATA=ON )
+	fi
+
+	if ! use java && ! use python; then
+		# defaults to ON
+		mycmakeargs+=( -DVTK_ENABLE_WRAPPING=OFF )
+	fi
+
+	if use boost; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_InfovisBoost="WANT"
+			-DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms="WANT"
+		)
+	fi
+
+	if use cuda; then
+		local cuda_arch=
+		case ${VTK_CUDA_ARCH:-native} in
+			# we ignore fermi arch, because current nvidia-cuda-toolkit-11*
+			# no longer supports it
+			kepler|maxwell|pascal|volta|turing|ampere|all)
+				cuda_arch=${VTK_CUDA_ARCH}
+				;;
+			native)
+				ewarn "If auto detection fails for you, please try and export the"
+				ewarn "VTK_CUDA_ARCH environment variable to one of the common arch"
+				ewarn "names: kepler, maxwell, pascal, volta, turing, ampere or all."
+				cuda_arch=native
+				;;
+			*)
+				eerror "Please properly set the VTK_CUDA_ARCH environment variable to"
+				eerror "one of: kepler, maxwell, pascal, volta, turing, ampere, all"
+				die "Invalid CUDA architecture given: '${VTK_CUDA_ARCH}'!"
+				;;
+		esac
+		ewarn "Using CUDA architecture '${cuda_arch}'"
+
+		mycmakeargs+=( -DVTKm_CUDA_Architecture=${cuda_arch} )
+	fi
+
+	if use ffmpeg; then
+		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOFFMPEG="WANT" )
+	fi
+
+	if use gdal; then
+		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GeovisGDAL="WANT" )
+	fi
+
+	if use java; then
+		mycmakeargs+=(
+			-DCMAKE_INSTALL_JARDIR="share/${PN}"
+			-DVTK_ENABLE_WRAPPING=ON
+		)
+	fi
+
+	if use json; then
+		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOGeoJSON="WANT" )
+	fi
+
+	if use mpi; then
+		mycmakeargs+=(
+			-DVTK_GROUP_ENABLE_MPI="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOH5part="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOParallel="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOParallelXML="WANT"
+			-DVTK_MODULE_ENABLE_VTK_ParallelMPI="WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingParallel="WANT"
+			-DVTK_MODULE_ENABLE_VTK_h5part="WANT"
+			-DVTKm_ENABLE_MPI=ON
+		)
+		if use python; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py="WANT" )
+		fi
+	fi
+
+	if use mysql; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_IOMySQL="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOSQL="WANT"
+		)
+	fi
+
+	if use odbc; then
+		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOODBC="WANT" )
+	fi
+
+	if use offscreen; then
+		mycmakeargs+=(
+			-DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=ON
+			-DVTK_DEFAULT_RENDER_WINDOW_HEADLESS=ON
+			-DVTK_OPENGL_HAS_OSMESA=ON
+		)
+	fi
+
+	if use openmp; then
+		if use tbb; then
+			einfo "NOTE: You have specified both openmp and tbb USE flags."
+			einfo "NOTE: Tbb will take precedence. Disabling OpenMP"
+			# Sequential is default SMP implementation, nothing special to do
+		else
+			mycmakeargs+=(
+				-DVTK_SMP_IMPLEMENTATION_TYPE="OpenMP"
+				-DVTKm_ENABLE_OPENMP=ON
+			)
+		fi
+	fi
+
+	if use pegtl; then
+		mycmakeargs+=( -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=ON )
+	else
+		mycmakeargs+=( -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=OFF )
+	fi
+
+	if use postgres; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_IOPostgreSQL="WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOSQL="WANT"
+		)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DVTK_ENABLE_WRAPPING=ON
+			-DPython3_EXECUTABLE="${PYTHON}"
+			-DVTK_PYTHON_SITE_PACKAGES_SUFFIX="lib/${EPYTHON}/site-packages"
+		)
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQt="WANT" )
+		if use mysql || use postgres; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="WANT" )
+		fi
+		if use rendering; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingQt="WANT" )
+		fi
+		if use views; then
+			mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsQt="WANT" )
+		fi
+	fi
+
+	if use rendering || use web || use all-modules; then
+		# needs patched version
+		mycmakeargs+=( -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=OFF )
+	fi
+
+	if use rendering; then
+		mycmakeargs+=(
+			-DVTK_MODULE_ENABLE_VTK_IOExportGL2PS="WANT"
+			-DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=ON
+			-DVTK_MODULE_USE_EXTERNAL_VTK_glew=ON
+			-DVTK_MODULE_USE_EXTERNAL_VTK_libproj=ON
+		)
+	fi
+
+	if use tbb; then
+		mycmakeargs+=(
+			-DVTK_SMP_IMPLEMENTATION_TYPE="TBB"
+			-DVTKm_ENABLE_TBB=ON
+		)
+	fi
+
+	if use test; then
+		ewarn "Testing requires VTK_FORBID_DOWNLOADS=OFF by upstream."
+		ewarn "Care has been taken to pre-download all required files."
+		ewarn "In case you find missing files, please inform me."
+		mycmakeargs+=(
+			-DVTK_BUILD_TESTING=ON
+			-DVTK_DATA_EXCLUDE_FROM_ALL=ON
+			-DVTK_FORBID_DOWNLOADS=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DVTK_BUILD_TESTING=OFF
+			-DVTK_FORBID_DOWNLOADS=ON
+		)
+	fi
+
+	if use theora; then
+		mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOOggTheora="WANT" )
+	fi
+
+	if use all-modules; then
+		mycmakeargs+=(
+			-DVTK_ENABLE_OSPRAY=OFF
+			-DVTK_MODULE_ENABLE_VTK_DomainsMicroscopy="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOADIOS2="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_IOPDAL="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_MomentInvariants="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_PoissonReconstruction="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_Powercrust="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_RenderingOpenVR="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_SignedTensor="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_SplineDrivenImageSlicer="DONT_WANT"
+			-DVTK_MODULE_ENABLE_VTK_vtkDICOM="DONT_WANT"
+			-DVTK_MODULE_USE_EXTERNAL_vtkkissfft=ON
+		)
+	fi
+
+	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+	if use mpi; then
+		export CC=mpicc
+		export CXX=mpicxx
+		export FC=mpif90
+		export F90=mpif90
+		export F77=mpif77
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	nonfatal virtx cmake_src_test
+}
+
+src_install() {
+	use web && webapp_src_preinst
+
+	# Stop web page images from being compressed
+	if use doc; then
+		HTML_DOCS=( "${WORKDIR}/html/." )
+	fi
+
+	cmake_src_install
+
+	use java && java-pkg_regjar "${ED}"/usr/share/${PN}/${PN}.jar
+
+	# install examples
+	if use examples; then
+		einfo "Installing examples"
+		mv -v {E,e}xamples || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+
+		einfo "Installing datafiles"
+		insinto /usr/share/${PN}/data
+		doins -r "${S}/.ExternalData"
+	fi
+
+	# with MPI runpath's are not deleted properly
+	if use mpi; then
+		chrpath -d "${ED}"/usr/$(get_libdir)/*.so.${PV} || die
+	fi
+
+	use python && python_optimize
+
+	# environment
+	cat >> "${T}"/40${PN} <<- EOF || die
+		VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
+		VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}
+		VTKHOME=${EPREFIX}/usr
+		EOF
+	doenvd "${T}"/40${PN}
+
+	use web && webapp_src_install
+
+	# Temporary!
+	# Avoid collision with paraview.
+	# bug #793221
+	rm -rf "${ED}"/usr/share/vtkm-1.5/VTKm{LICENSE.txt,README.md} || die
+}
+
+# webapp.eclass exports these but we want it optional #534036
+pkg_postinst() {
+	use web && webapp_pkg_postinst
+
+	if use examples; then
+		einfo "You can get more and updated examples at"
+		einfo "https://kitware.github.io/vtk-examples/site/"
+	fi
+}
+
+pkg_prerm() {
+	use web && webapp_pkg_prerm
+}
diff --git a/sci-libs/vtk/vtk-9.1.0.ebuild b/sci-libs/vtk/vtk-9.1.0-r2.ebuild
index 9a6ebbdaac51..1e80b96b80b4 100644
--- a/sci-libs/vtk/vtk-9.1.0.ebuild
+++ b/sci-libs/vtk/vtk-9.1.0-r2.ebuild
@@ -71,10 +71,10 @@ RDEPEND="
 	media-libs/libpng:=
 	media-libs/libtheora
 	media-libs/tiff
-	<sci-libs/hdf5-1.12:=[mpi=]
+	sci-libs/hdf5:=[mpi=]
 	sci-libs/netcdf:=[mpi=]
 	sys-libs/zlib
-	virtual/jpeg
+	media-libs/libjpeg-turbo
 	all-modules? ( sci-geosciences/liblas[gdal] )
 	boost? ( dev-libs/boost:=[mpi?] )
 	cuda? ( dev-util/nvidia-cuda-toolkit:= )
@@ -114,13 +114,13 @@ RDEPEND="
 		x11-libs/libXext
 	)
 	web? ( ${WEBAPP_DEPEND} )
-	$(python_gen_cond_dep '
-		python? (
+	python? (
+		$(python_gen_cond_dep '
 			boost? ( dev-libs/boost:=[mpi?,python?,${PYTHON_USEDEP}] )
-			gdal? ( sci-libs/gdal:=[python?,${PYTHON_USEDEP}] )
 			mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
-		)
-	')
+		')
+		gdal? ( sci-libs/gdal:=[python?,${PYTHON_SINGLE_USEDEP}] )
+	)
 "
 
 DEPEND="
@@ -144,6 +144,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-8.2.0-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch
 	"${FILESDIR}"/${PN}-9.0.3-IO-FFMPEG-support-FFmpeg-5.0-API-changes.patch
 	"${FILESDIR}"/${P}-adjust-to-find-binaries.patch
+	"${FILESDIR}"/${P}-avoid-naming-collision-with-netcdf-4.9.0.patch
 )
 
 DOCS=( CONTRIBUTING.md README.md )
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /sci-libs
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)