gentoo auto-resync : 07:08:2024 - 12:37:20

82 files changed, 1996 insertions, 1435 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 3104858501aa..bf21af175448 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 57fe08eee51b..45c169a56210 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -3,4 +3,4 @@ DIST armadillo-12.4.0.tar.xz 6803968 BLAKE2B ca45b2284b5a31c745b2ad924235af24f85
 DIST armadillo-12.8.2.tar.xz 6996368 BLAKE2B 63876486dcd72359b243a2ae217de751a9033c7f3e6c8599ba195b52fb493dbc4b6ec7f804916d40cef0c726d3ad42752a5cfb6fd3919935cbdf20e59488e474 SHA512 33bfe6f1fae2ef18ec3286742264dedd67730e47b5187568cb2fbe951286a5a8534a4b577894cc44415887241a46afb25b3fcf2b249ef15f9b71045e98fd0132
 EBUILD armadillo-12.4.0-r1.ebuild 3294 BLAKE2B ce1fc43065ec5fefd359aa10d1200e8a6cd3eaa8a638338f6e1a2c663968a2d40af7f185bffd591331c2609527b56466626cdccb8f2439a469163ef159691cb9 SHA512 7e73bad5eb4eb99c6eb0c69c78ed0a8fe5c58655213fab4c418c77261840086418b44f2b1a0c663070e3b8e1f7e7291c887ea5a2d77ad77ad7fa90f14bdceeb9
 EBUILD armadillo-12.8.2.ebuild 3296 BLAKE2B e161d17708dd03a41aca4003d0af3e258c455315d462cb0d0b598613b1821f8cae38e944bf8b824a49341d00dd8305500f7a676c237a12bd7c1e0eab39fb5f3a SHA512 bdd184b59a8e506620ca9ab359e6f02d09948120a88bf3243264f78679963df6f6917d0c0877408a4ceae9014994da6732d88b3f668070a32667413f7d27cc74
-MISC metadata.xml 1456 BLAKE2B 52019d7f250025250936fe57ef43e3f1d999eb3eb88949606f6c14e33b99615d3cf33e1073215b805259f2118f571052d40558ee60bddff524475b721b040a37 SHA512 be4692d066e500becba90262b74f17dc97d3c32248bf91aee1ffe2321a0611968855e8806da51f61b5f7e1e32efb541895b29630a302f756ea338aa62cf819c0
+MISC metadata.xml 1525 BLAKE2B 3d1af2e67d98a9597d1b5dc6e49693a9712cb7c2d6712ae8e54635cd729504496dd65082528a5132907493a41b06be7bb83b93d3145831b978a315baef5b0a58 SHA512 2731e9bdc333b5d2867083f163dbcc54670a3a35ab1643fb63fa52732ed7fe5d4511330c5242eafd4f5bc111050482c836ce653ebc55d2c688f4cae5d29efa93
diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
index 08c60223686b..206c77590ec9 100644
--- a/sci-libs/armadillo/metadata.xml
+++ b/sci-libs/armadillo/metadata.xml
@@ -34,5 +34,6 @@
   </use>
   <upstream>
     <remote-id type="sourceforge">arma</remote-id>
+    <remote-id type="gitlab">conradsnicta/armadillo-code</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest
index 5f68dcd06051..4cda34da9815 100644
--- a/sci-libs/atlas/Manifest
+++ b/sci-libs/atlas/Manifest
@@ -1,6 +1,12 @@
 AUX atlas-3.10.2-format-security.patch 8872 BLAKE2B 146136803b7c62f40847e6dbc3acc9422c5fda23383c0fb672b7bb34581898c852756992905d28f7ad1321cefd3ac027958e77971501030157d8e4e1f04d29c2 SHA512 151add96a1e34f99eb37d83e31018797a5737cf9e1ffb9d2fa459f9811dabae1e8fada3a8790618fd24abc7a43255b3694d4f3b9775d3478f1ffe4bc9c314252
 AUX atlas-3.10.2-x32-support.patch 3410 BLAKE2B ba2f45ef71805d51aef7280876a825f522ac7eaa6210d1283be3a8a62cf2a0511003c9127393360a43010d29e86467f1c8bbf3be2bebaa37123313a77268e113 SHA512 ba30f795031457a4416978fadd76870aa09fa7af93f10bc5f0258a44d98151fa37c72813a999048927fc9a521e52d2eb9f01b4f7423baa4d0bad099eb0ee06cb
+AUX atlas-3.10.3-fix-ancient-c.patch 8185 BLAKE2B cf8e922aa19276162e19ca671acbe9e5e469d5a8520ddc01fd24d269535c31afd0da98465f835ba5726865b97f34f7c5b39ea65008f3e0ef4b42f6311620ccbf SHA512 c8b423eebaeb42130f61f622e8d0bf5555b5560cf1e859a1b1b7781ff042d1570425a44df48d5826a4ef7f99e6ad47c88231471ef68eba0e67de8d88058a7ec4
 DIST atlas3.10.2.tar.bz2 4904923 BLAKE2B e2fb0d307907549644cb678c32c4befce7ce6809c348a11fa6084e17d696da8681b3388dd63d8bdee6040999d9ab38a75f1788b42640121a536eb5f13e6f8939 SHA512 9fe04cfa1f89449db047d1a4659a656964d13117c783cbbe43344eb32555736f037d9cd30c5ae1514c08ad5b8949a3982d7fe102d707ddb62288e76b2607fbb1
+DIST atlas3.10.3.tar.bz2 5156852 BLAKE2B cd3880a6d0c43b5840d4da26ac996cc9fe7615fc996229193ef1f936daa2c54c5465643def19f59dd5c481c447176e2ba3cf85d38c0b5008c2dc1bc18be0e65b SHA512 bf17306f09f2aa973cb776e2c9eacfb2409ad4d95d19802e1c4e0597d0a099fccdb5eaafe273c2682a41e41a3c6fabc8bbba4ce03180cffea40ede5df1d1f56e
+DIST atlas3.11.41.tar.bz2 6644195 BLAKE2B c046725f1a8978e345cb59026b93029483ecdfa0151256cca5dcdd337ced2a63819c19319795b663cd12180e8be0db475a3d1c1a5d76296ef333f99887d9e44a SHA512 06306c588505dcf22a1afa0f57d85b0008728deb5876e66b2710fee29712b979aa63eafc9142be2372b9895ba594cc5aba230aa3d1ddc95932af1e585478204d
+DIST lapack-3.12.0.tar.gz 7933607 BLAKE2B dafb1f9a717f2cbc00a26f8cff2c7a1ebb720714fe6d7bd5fabb511a2f4af317165814340864c9d601e4e16c7762f643fbbafc058170ebcdc6529a9b4f2d70b6 SHA512 f8f3c733a0221be0b3f5618235408ac59cbd4e5f1c4eab5f509b831a6ec6a9ef14b8849aa6ea10810df1aff90186ca454d15e9438d1dd271c2449d42d3da9dda
 DIST lapack-3.6.0.tgz 6792324 BLAKE2B 438f3376b63b38ef0fe70f6becac847816f3a11c01f5ab237dc0d941792ceb54dbd2f8dc22d56286f5dab3499289ed94e67521ea951a98973c9640abc294ad6c SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8
-EBUILD atlas-3.10.2.ebuild 5628 BLAKE2B 665ae5186574dad553800439446f63785df44977e94f10246c7913f4c16c650065771ab590f538ac5515ce986a29a3f40a57f363820ced5001b77aa4375fd084 SHA512 c01abb2b0af5f728a4a70de22862eaf58731fdafa3afcc3286cc73fb2d22e463967b8263ea977db4ca41173be84771ee57e7dd473a08d4ad651513d2e85cdcd7
+EBUILD atlas-3.10.2-r1.ebuild 5560 BLAKE2B 9502f57aac61fb78938406066ba56b61458f48c4bcc651ce605581bb16da29df245819a7f807b0863b190fc5e232ecdcb879e41eb98c8b1bccad332b6d5d2663 SHA512 324d20f0a666f3ee3a60a1c3a00831a141998c63e5cfe41f1750f1a3a67d0f987bb65cc22dbc638bd3a13c597c1fc66e1f04ebe9d5f69b61ab3a33f9dc24be43
+EBUILD atlas-3.10.3.ebuild 5891 BLAKE2B 3b9b82639d95f5031a67692177cbe789796dd9c7ffa2aad9d3e53078472fa13288462261e1b602474ad2d738cc4c6bf32ade3472c30b32026a12d59f7aa4b999 SHA512 9a27623f377b84b57dd36a0f093ba5ca0db996ee78255066b3f5e77184ca294e73f770a895ebc9b64407f99438a0bfa8ec65d8543a04c409de1637fa430d7902
+EBUILD atlas-3.11.41.ebuild 5887 BLAKE2B c91954f3843f50d532b90756dbf2ba436ead1d07e6066a01b5b4b2b8a20dfab4bdb6cfd1de98c3209285ccc871aa2fa7981c6eb199c08a429631e69917d9b0c3 SHA512 d890c1ab87bdca5014220d4558238877c3f191abf58c02e06eaec390f2327094e7bf7b1106f1257228fd26db14f3da40f01b09b34b7a2dee968202a8f8f90f59
 MISC metadata.xml 935 BLAKE2B cf5e711f899988c36d4ffc63997c963a4ee30e7ac57de0415424e32699379d6595ac9e52cca8760f2b49af527d01b6a4e28bccdb762e5f9c220ae4da99899879 SHA512 5cb05a261bedbd08274d72ea3a4c2843fc39c0ca27d2b8e144310035feab40ec3abfd07438db062bc4c5fc7306be27ceb0fe97d1d24c68bea56683ceb55e7b9b
diff --git a/sci-libs/atlas/atlas-3.10.2.ebuild b/sci-libs/atlas/atlas-3.10.2-r1.ebuild
index 43582741de1a..88ac1701512c 100644
--- a/sci-libs/atlas/atlas-3.10.2.ebuild
+++ b/sci-libs/atlas/atlas-3.10.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 FORTRAN_NEEDED=fortran
 
-inherit fortran-2 toolchain-funcs versionator
+inherit fortran-2 toolchain-funcs
 
 LAPACKP=lapack-3.6.0.tgz
 
@@ -13,17 +13,13 @@ DESCRIPTION="Automatically Tuned Linear Algebra Software"
 HOMEPAGE="https://math-atlas.sourceforge.net"
 SRC_URI="https://downloads.sourceforge.net/math-atlas/${PN}${PV}.tar.bz2
 	fortran? ( lapack? ( http://www.netlib.org/lapack/${LAPACKP} ) )"
+S="${WORKDIR}/ATLAS"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran generic lapack static-libs threads"
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/ATLAS"
-
 PATCHES=(
 	"${FILESDIR}/${P}-x32-support.patch"
 	"${FILESDIR}/${P}-format-security.patch"
@@ -48,9 +44,9 @@ src_configure() {
 	[[ ${mycc} == *gcc* ]] && mycc=gcc
 	atlas_configure() {
 		local myconf=(
-			--prefix="${ED}/usr"
-			--libdir="${ED}/usr/$(get_libdir)"
-			--incdir="${ED}/usr/include"
+			--prefix="/usr"
+			--libdir="/usr/$(get_libdir)"
+			--incdir="/usr/include"
 			--cc="$(tc-getCC)"
 			"-D c -DWALL"
 			"-C acg '${mycc}'"
@@ -143,7 +139,7 @@ src_test() {
 atlas_install_libs() {
 	local libname=$(basename ${1%.*})
 	einfo "Installing ${libname}"
-	local soname=${libname}.so.$(get_major_version)
+	local soname=${libname}.so.$(ver_cut 1)
 	shift
 	pushd "${S}_shared"/lib > /dev/null
 	${LINK:-$(tc-getCC)} ${LDFLAGS} -shared -Wl,-soname=${soname} \
diff --git a/sci-libs/atlas/atlas-3.10.3.ebuild b/sci-libs/atlas/atlas-3.10.3.ebuild
new file mode 100644
index 000000000000..aa0e6a6826fb
--- /dev/null
+++ b/sci-libs/atlas/atlas-3.10.3.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 toolchain-funcs
+
+LAPACKPV=3.12.0
+
+DESCRIPTION="Automatically Tuned Linear Algebra Software"
+HOMEPAGE="https://math-atlas.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/math-atlas/${PN}${PV}.tar.bz2
+	fortran? ( lapack? (
+		https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v${LAPACKPV}.tar.gz
+		-> lapack-${LAPACKPV}.tar.gz
+	) )
+"
+S="${WORKDIR}/ATLAS"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fortran generic lapack static-libs threads"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.10.2-x32-support.patch"
+	"${FILESDIR}/${PN}-3.10.2-format-security.patch"
+	"${FILESDIR}/${PN}-3.10.3-fix-ancient-c.patch"
+)
+
+pkg_setup() {
+	local _cpufreq
+	for _cpufreq in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do
+		if [[ -f ${_cpufreq} ]]; then
+			if ! grep -q performance "${_cpufreq}"; then
+				echo 2> /dev/null performance > "${_cpufreq}" || \
+					die "${PN} needs all cpu set to performance"
+			fi
+		fi
+	done
+	use fortran && fortran-2_pkg_setup
+}
+
+src_configure() {
+	# hack needed to trick the flaky gcc detection
+	local mycc
+	mycc="$(type -P "$(tc-getCC)")"
+	[[ ${mycc} == *gcc* ]] && mycc=gcc
+	atlas_configure() {
+		local myconf=(
+			--cripple-atlas-performance
+			--prefix="/usr"
+			--libdir="/usr/$(get_libdir)"
+			--incdir="/usr/include"
+			--cc="$(tc-getCC)"
+			"-D c -DWALL"
+			"-C acg '${mycc}'"
+			"-F acg '${CFLAGS}'"
+			"-Ss pmake '\$(MAKE) ${MAKEOPTS}'"
+		)
+
+		# OpenMP shown to decreased performance over POSIX threads
+		# (at least in 3.9.x, see atlas-dev mailing list)
+		if use threads; then
+			if use generic; then # 2 threads is most generic
+				myconf+=( "-t 2" "-Si omp 0" )
+			else
+				myconf+=( "-t -1" "-Si omp 0" )
+			fi
+		else
+			myconf+=( "-t  0" "-Si omp 0" )
+		fi
+
+		if use amd64 || use ppc64 || use sparc; then
+			if [[ ${ABI} = amd64 ]] || [[ ${ABI} = ppc64 ]] || [[ ${ABI} = sparc64 ]] ; then
+				myconf+=( "-b 64" )
+			elif [[ ${ABI} = x86 ]] || [[ ${ABI} = ppc ]] || [[ ${ABI} = sparc32 ]] ; then
+				myconf+=( "-b 32" )
+			elif [[ ${ABI} = x32 ]] ; then
+				myconf+=( "-b 48" )
+			else
+				myconf+=( "-b 64" )
+			fi
+		elif use ppc || use x86; then
+			myconf+=( "-b 32" )
+		elif use ia64; then
+			myconf+=( "-b 64" )
+		fi
+		if use fortran; then
+			myconf+=(
+				"-C if '$(type -P "$(tc-getFC)")'"
+				"-F if '${FFLAGS}'"
+			)
+			if use lapack; then
+				myconf+=(
+					"-Si latune 1"
+					"--with-netlib-lapack-tarfile=${DISTDIR}/lapack-${LAPACKPV}.tar.gz"
+				)
+			else
+				myconf+=( "-Si latune 0" )
+			fi
+		else
+			myconf+=( "-Si latune 0" "--nof77" )
+		fi
+		# generic stuff found by make make xprint_enums in atlas build dir
+		# basically assuming sse2+sse1 and 2 threads max
+		use generic && use x86   && myconf+=( "-V 384 -A 13")
+		use generic && use amd64 && myconf+=( "-V 384 -A 24")
+
+		local confdir="${S}_${1}"; shift
+		myconf+=( $@ )
+		mkdir "${confdir}" || die
+		cd "${confdir}" || die
+		# for debugging
+		echo "${myconf[@]}" > myconf.out
+		"${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed"
+	}
+
+	atlas_configure shared "-Fa alg -fPIC" ${EXTRA_ECONF}
+	use static-libs && atlas_configure static ${EXTRA_ECONF}
+}
+
+src_compile() {
+	atlas_compile() {
+		pushd "${S}_${1}" > /dev/null || die
+		# atlas does its own parallel builds
+		emake -j1 build
+		cd lib || die
+		emake libclapack.a
+		[[ -e libptcblas.a ]] && emake libptclapack.a
+		popd > /dev/null || die
+	}
+
+	atlas_compile shared
+	use static-libs && atlas_compile static
+}
+
+src_test() {
+	cd "${S}_shared" || die
+	emake -j1 check time
+}
+
+# transform a static archive into a shared library and install them
+# atlas_install_libs <mylib.a> [extra link flags]
+atlas_install_libs() {
+	local libname soname
+	libname=$(basename "${1%.*}")
+	einfo "Installing ${libname}"
+	soname=${libname}.so.$(ver_cut 1)
+	shift
+	pushd "${S}_shared"/lib > /dev/null || die
+	${LINK:-$(tc-getCC)} ${LDFLAGS} -shared "-Wl,-soname=${soname}" \
+		-Wl,--whole-archive "${libname}.a" -Wl,--no-whole-archive \
+		$@ -o "${soname}" || die "Creating ${soname} failed"
+	dolib.so "${soname}"
+	ln -s "${soname}" "${soname%.*}"
+	dosym "${soname}" "/usr/$(get_libdir)/${soname%.*}"
+	popd > /dev/null || die
+	use static-libs && dolib.a "${S}_static/lib/${libname}.a"
+}
+
+src_install() {
+	cd "${S}_shared/lib" || die
+	# rename to avoid collision with other packages
+	local l
+	for l in {,c}{blas,lapack}; do
+		if [[ -e lib${l}.a ]]; then
+			mv lib{,atl}"${l}.a"
+			use static-libs && mv "${S}"_static/lib/lib{,atl}"${l}.a"
+		fi
+	done
+
+	[[ -e libptcblas.a ]] && PTLIBS="-lpthread"
+
+	# atlas
+	atlas_install_libs libatlas.a -lm "${PTLIBS}"
+
+	# cblas
+	atlas_install_libs libatlcblas.a -lm -L. -latlas
+
+	# cblas threaded
+	[[ -e libptcblas.a ]] && \
+		atlas_install_libs libptcblas.a -lm -L. -latlas "${PTLIBS}"
+
+	if use lapack; then
+		# clapack
+		atlas_install_libs libatlclapack.a -lm -L. -latlas -latlcblas
+
+		# clapack threaded
+		[[ -e libptclapack.a ]] && \
+			atlas_install_libs libptclapack.a -lm -L. -latlas -lptcblas "${PTLIBS}"
+	fi
+
+	if use fortran; then
+		LINK=$(tc-getF77)
+
+		# blas
+		atlas_install_libs libf77blas.a -lm -L. -latlas
+
+		# blas threaded
+		[[ -e libptf77blas.a ]] && \
+			atlas_install_libs libptf77blas.a -lm -L. -latlas "${PTLIBS}"
+
+		if use lapack; then
+			# lapack
+			atlas_install_libs libatllapack.a \
+				-lm -L. -latlas -latlcblas -lf77blas
+			# lapack threaded
+			[[ -e libptlapack.a ]] && \
+				atlas_install_libs libptlapack.a -lm -L. -latlas -lptcblas -lptf77blas "${PTLIBS}"
+		fi
+	fi
+
+	cd "${S}" || die
+	insinto "/usr/include/${PN}"
+	doins include/*.h
+
+	cd "${S}/doc" || die
+	dodoc INDEX.txt AtlasCredits.txt ChangeLog
+	use doc && dodoc atlas*pdf cblas.pdf cblasqref.pdf
+	use doc && use fortran && dodoc f77blas*pdf
+	use doc && use fortran && use lapack && dodoc -- *lapack*pdf
+}
diff --git a/sci-libs/atlas/atlas-3.11.41.ebuild b/sci-libs/atlas/atlas-3.11.41.ebuild
new file mode 100644
index 000000000000..f4a8920320ab
--- /dev/null
+++ b/sci-libs/atlas/atlas-3.11.41.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 toolchain-funcs
+
+LAPACKPV=3.12.0
+
+DESCRIPTION="Automatically Tuned Linear Algebra Software"
+HOMEPAGE="https://math-atlas.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/math-atlas/${PN}${PV}.tar.bz2
+	fortran? ( lapack? (
+		https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v${LAPACKPV}.tar.gz
+		-> lapack-${LAPACKPV}.tar.gz
+	) )
+"
+S="${WORKDIR}/ATLAS"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fortran generic lapack static-libs threads"
+
+PATCHES=(
+	# TODO These don't apply, find out why
+	# "${FILESDIR}/${PN}-3.10.2-x32-support.patch"
+	# "${FILESDIR}/${PN}-3.10.2-format-security.patch"
+)
+
+pkg_setup() {
+	local _cpufreq
+	for _cpufreq in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do
+		if [[ -f ${_cpufreq} ]]; then
+			if ! grep -q performance "${_cpufreq}"; then
+				echo 2> /dev/null performance > "${_cpufreq}" || \
+					die "${PN} needs all cpu set to performance"
+			fi
+		fi
+	done
+	use fortran && fortran-2_pkg_setup
+}
+
+src_configure() {
+	# hack needed to trick the flaky gcc detection
+	local mycc
+	mycc="$(type -P "$(tc-getCC)")"
+	[[ ${mycc} == *gcc* ]] && mycc=gcc
+	atlas_configure() {
+		local myconf=(
+			--cripple-atlas-performance
+			--prefix="/usr"
+			--libdir="/usr/$(get_libdir)"
+			--incdir="/usr/include"
+			--cc="$(tc-getCC)"
+			"-D c -DWALL"
+			"-C acg '${mycc}'"
+			"-F acg '${CFLAGS}'"
+			"-Ss pmake '\$(MAKE) ${MAKEOPTS}'"
+		)
+
+		# OpenMP shown to decreased performance over POSIX threads
+		# (at least in 3.9.x, see atlas-dev mailing list)
+		if use threads; then
+			if use generic; then # 2 threads is most generic
+				myconf+=( "-t 2" "-Si omp 0" )
+			else
+				myconf+=( "-t -1" "-Si omp 0" )
+			fi
+		else
+			myconf+=( "-t  0" "-Si omp 0" )
+		fi
+
+		if use amd64 || use ppc64 || use sparc; then
+			if [[ ${ABI} = amd64 ]] || [[ ${ABI} = ppc64 ]] || [[ ${ABI} = sparc64 ]] ; then
+				myconf+=( "-b 64" )
+			elif [[ ${ABI} = x86 ]] || [[ ${ABI} = ppc ]] || [[ ${ABI} = sparc32 ]] ; then
+				myconf+=( "-b 32" )
+			elif [[ ${ABI} = x32 ]] ; then
+				myconf+=( "-b 48" )
+			else
+				myconf+=( "-b 64" )
+			fi
+		elif use ppc || use x86; then
+			myconf+=( "-b 32" )
+		elif use ia64; then
+			myconf+=( "-b 64" )
+		fi
+		if use fortran; then
+			myconf+=(
+				"-C if '$(type -P "$(tc-getFC)")'"
+				"-F if '${FFLAGS}'"
+			)
+			if use lapack; then
+				myconf+=(
+					"-Si latune 1"
+					"--with-netlib-lapack-tarfile=${DISTDIR}/lapack-${LAPACKPV}.tar.gz"
+				)
+			else
+				myconf+=( "-Si latune 0" )
+			fi
+		else
+			myconf+=( "-Si latune 0" "--nof77" )
+		fi
+		# generic stuff found by make make xprint_enums in atlas build dir
+		# basically assuming sse2+sse1 and 2 threads max
+		use generic && use x86   && myconf+=( "-V 384 -A 13")
+		use generic && use amd64 && myconf+=( "-V 384 -A 24")
+
+		local confdir="${S}_${1}"; shift
+		myconf+=( $@ )
+		mkdir "${confdir}" || die
+		cd "${confdir}" || die
+		# for debugging
+		echo "${myconf[@]}" > myconf.out
+		"${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed"
+	}
+
+	atlas_configure shared "-Fa alg -fPIC" ${EXTRA_ECONF}
+	use static-libs && atlas_configure static ${EXTRA_ECONF}
+}
+
+src_compile() {
+	atlas_compile() {
+		pushd "${S}_${1}" > /dev/null || die
+		# atlas does its own parallel builds
+		emake -j1 build
+		cd lib || die
+		emake libclapack.a
+		[[ -e libptcblas.a ]] && emake libptclapack.a
+		popd > /dev/null || die
+	}
+
+	atlas_compile shared
+	use static-libs && atlas_compile static
+}
+
+src_test() {
+	cd "${S}_shared" || die
+	emake -j1 check time
+}
+
+# transform a static archive into a shared library and install them
+# atlas_install_libs <mylib.a> [extra link flags]
+atlas_install_libs() {
+	local libname soname
+	libname=$(basename "${1%.*}")
+	einfo "Installing ${libname}"
+	soname=${libname}.so.$(ver_cut 1)
+	shift
+	pushd "${S}_shared"/lib > /dev/null || die
+	${LINK:-$(tc-getCC)} ${LDFLAGS} -shared "-Wl,-soname=${soname}" \
+		-Wl,--whole-archive "${libname}.a" -Wl,--no-whole-archive \
+		$@ -o "${soname}" || die "Creating ${soname} failed"
+	dolib.so "${soname}"
+	ln -s "${soname}" "${soname%.*}"
+	dosym "${soname}" "/usr/$(get_libdir)/${soname%.*}"
+	popd > /dev/null || die
+	use static-libs && dolib.a "${S}_static/lib/${libname}.a"
+}
+
+src_install() {
+	cd "${S}_shared/lib" || die
+	# rename to avoid collision with other packages
+	local l
+	for l in {,c}{blas,lapack}; do
+		if [[ -e lib${l}.a ]]; then
+			mv lib{,atl}"${l}.a"
+			use static-libs && mv "${S}"_static/lib/lib{,atl}"${l}.a"
+		fi
+	done
+
+	[[ -e libptcblas.a ]] && PTLIBS="-lpthread"
+
+	# atlas
+	atlas_install_libs libatlas.a -lm "${PTLIBS}"
+
+	# cblas
+	atlas_install_libs libatlcblas.a -lm -L. -latlas
+
+	# cblas threaded
+	[[ -e libptcblas.a ]] && \
+		atlas_install_libs libptcblas.a -lm -L. -latlas "${PTLIBS}"
+
+	if use lapack; then
+		# clapack
+		atlas_install_libs libatlclapack.a -lm -L. -latlas -latlcblas
+
+		# clapack threaded
+		[[ -e libptclapack.a ]] && \
+			atlas_install_libs libptclapack.a -lm -L. -latlas -lptcblas "${PTLIBS}"
+	fi
+
+	if use fortran; then
+		LINK=$(tc-getF77)
+
+		# blas
+		atlas_install_libs libf77blas.a -lm -L. -latlas
+
+		# blas threaded
+		[[ -e libptf77blas.a ]] && \
+			atlas_install_libs libptf77blas.a -lm -L. -latlas "${PTLIBS}"
+
+		if use lapack; then
+			# lapack
+			atlas_install_libs libatllapack.a \
+				-lm -L. -latlas -latlcblas -lf77blas
+			# lapack threaded
+			[[ -e libptlapack.a ]] && \
+				atlas_install_libs libptlapack.a -lm -L. -latlas -lptcblas -lptf77blas "${PTLIBS}"
+		fi
+	fi
+
+	cd "${S}" || die
+	insinto "/usr/include/${PN}"
+	doins include/*.h
+
+	cd "${S}/doc" || die
+	dodoc INDEX.txt AtlasCredits.txt ChangeLog
+	use doc && dodoc atlas*pdf cblas.pdf cblasqref.pdf
+	use doc && use fortran && dodoc f77blas*pdf
+	use doc && use fortran && use lapack && dodoc -- *lapack*pdf
+}
diff --git a/sci-libs/atlas/files/atlas-3.10.3-fix-ancient-c.patch b/sci-libs/atlas/files/atlas-3.10.3-fix-ancient-c.patch
new file mode 100644
index 000000000000..5a8a257a1a9b
--- /dev/null
+++ b/sci-libs/atlas/files/atlas-3.10.3-fix-ancient-c.patch
@@ -0,0 +1,297 @@
+From 3d330dc50a608581c81d269b661af0c938155428 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Fri, 26 Jul 2024 00:10:33 +0200
+Subject: [PATCH 1/5] main must return int
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+--- a/CONFIG/src/backend/archinfo_aix.c
++++ b/CONFIG/src/backend/archinfo_aix.c
+@@ -180,7 +180,7 @@ int ProbeThrottle()
+    return(iret);
+ }
+ 
+-main(int nargs, char **args)
++int main(int nargs, char **args)
+ {
+    int flags, CacheLevel, ncpu, mhz, bits, sure;
+    enum MACHTYPE arch=MACHOther;
+--- a/CONFIG/src/backend/archinfo_freebsd.c
++++ b/CONFIG/src/backend/archinfo_freebsd.c
+@@ -243,7 +243,7 @@ int ProbeThrottle()
+    return(iret);
+ }
+ 
+-main(int nargs, char **args)
++int main(int nargs, char **args)
+ {
+    int flags, CacheLevel, ncpu, mhz, bits, sure;
+    enum MACHTYPE arch=MACHOther;
+--- a/CONFIG/src/backend/archinfo_irix.c
++++ b/CONFIG/src/backend/archinfo_irix.c
+@@ -198,7 +198,7 @@ int ProbeThrottle()
+    return(iret);
+ }
+ 
+-main(int nargs, char **args)
++int main(int nargs, char **args)
+ {
+    int flags, CacheLevel, ncpu, mhz, bits, sure;
+    enum MACHTYPE arch=MACHOther;
+--- a/CONFIG/src/backend/archinfo_linux.c
++++ b/CONFIG/src/backend/archinfo_linux.c
+@@ -571,7 +571,7 @@ int ProbeThrottle()
+    return(iret);
+ }
+ 
+-main(int nargs, char **args)
++int main(int nargs, char **args)
+ {
+    int flags, CacheLevel, ncpu, mhz, bits, sure;
+    enum MACHTYPE arch=MACHOther;
+--- a/CONFIG/src/backend/archinfo_sfu.c
++++ b/CONFIG/src/backend/archinfo_sfu.c
+@@ -151,7 +151,7 @@ int ProbeThrottle()
+    return(iret);
+ }
+ 
+-main(int nargs, char **args)
++int main(int nargs, char **args)
+ {
+    int flags, CacheLevel, ncpu, mhz, bits, sure;
+    enum MACHTYPE arch=MACHOther;
+--- a/CONFIG/src/backend/archinfo_sunos.c
++++ b/CONFIG/src/backend/archinfo_sunos.c
+@@ -212,7 +212,7 @@ int ProbeThrottle()
+    return(iret);
+ }
+ 
+-main(int nargs, char **args)
++int main(int nargs, char **args)
+ {
+    int flags, CacheLevel, ncpu, mhz, bits, sure;
+    enum MACHTYPE arch=MACHOther;
+--- a/CONFIG/src/backend/archinfo_win.c
++++ b/CONFIG/src/backend/archinfo_win.c
+@@ -221,7 +221,7 @@ int ProbeThrottle()
+    return(iret);
+ }
+ 
+-main(int nargs, char **args)
++int main(int nargs, char **args)
+ {
+    int flags, CacheLevel, ncpu, mhz, bits, sure;
+    enum MACHTYPE arch=MACHOther;
+--- a/CONFIG/src/backend/archinfo_x86.c
++++ b/CONFIG/src/backend/archinfo_x86.c
+@@ -460,7 +460,7 @@ int GetFlags(int nargs, char **args, int *CacheLevel)
+    return(flag);
+ }
+ 
+-main(int nargs, char **args)
++int main(int nargs, char **args)
+ {
+    int ierr, x86_64, flags, CacheLevel;
+    unsigned family, model;
+--- a/bin/extract.c
++++ b/bin/extract.c
+@@ -3904,7 +3904,7 @@ void HandleLine(EXTENV *EE, char *line)
+ }
+ 
+ 
+-main(int nargs, char *args[])
++int main(int nargs, char *args[])
+ {
+    char line[LNLEN], *path;
+    int i;
+--- a/bin/gpmmtst.c
++++ b/bin/gpmmtst.c
+@@ -783,11 +783,11 @@ void GetFlags(int nargs, char *args[], int *TEST,
+       #endif
+    }
+ }
+-___main(){}
+-__main(){}
+-MAIN__(){}
+-_MAIN_(){}
+-main(int nargs, char *args[])
++int ___main(){}
++int __main(){}
++int MAIN__(){}
++int _MAIN_(){}
++int main(int nargs, char *args[])
+ /*
+  *  tst <tst> <# TA> <TA's> <# TB's> <TB's> <M0> <MN> <incM> <N0> <NN> <incN>
+  *      <K0> <KN> <incK> <# alphas> <alphas> <# betas> <betas>
+--- a/bin/invtst.c
++++ b/bin/invtst.c
+@@ -743,7 +743,7 @@ void GetFlags(int nargs, char **args, int *MFLOP, int *CacheSize, TYPE *thresh,
+    }
+ }
+ 
+-main(int nargs, char **args)
++int main(int nargs, char **args)
+ {
+    int MFLOP, CacheSize, ldagap, nord, nuplo, N0, NN, incN;
+    enum TEST_UPLO *Uplo;
+--- a/bin/llttst.c
++++ b/bin/llttst.c
+@@ -538,7 +538,7 @@ void GetFlags(int nargs, char **args, int *MFLOP, int *CacheSize, TYPE *thresh,
+    }
+ }
+ 
+-main(int nargs, char **args)
++int main(int nargs, char **args)
+ {
+    int MFLOP, CacheSize, ldagap, nuplo, N0, NN, incN;
+    TYPE thresh;
+--- a/bin/lutst.c
++++ b/bin/lutst.c
+@@ -476,7 +476,7 @@ void GetFlags(int nargs, char **args, int *MFLOP, int *CacheSize, TYPE *thresh,
+    if (*M0 == -1) *M0 = *MN = *incM = *MisN = 1;
+ }
+ 
+-main(int nargs, char **args)
++int main(int nargs, char **args)
+ {
+    int MFLOP, CacheSize, LdaIsM, MisN, NisM, M0, MN, incM, N0, NN, incN;
+    int norders;
+--- a/bin/slvtst.c
++++ b/bin/slvtst.c
+@@ -743,7 +743,7 @@ static int DoAllTests(int nrep, int N0, int NN, int incN, int R0, int RN,
+    else fprintf(stdout, "\n%d TESTS RUN, %d FAILED!!\n\n", i, ierr);
+    return(ierr);
+ }
+-main(int nargs, char **args)
++int main(int nargs, char **args)
+ {
+    int ierr, N0, NN, incN, R0, RN, incR, ldagap, ldbgap, nord, nuplo;
+    int CS, MFLOP, QR, nrep;
+--- a/bin/uumtst.c
++++ b/bin/uumtst.c
+@@ -566,7 +566,7 @@ void GetFlags(int nargs, char **args, int *MFLOP, int *CacheSize, TYPE *thresh,
+    }
+ }
+ 
+-main(int nargs, char **args)
++int main(int nargs, char **args)
+ {
+    int MFLOP, CacheSize, ldagap, nuplo, N0, NN, incN;
+    TYPE thresh;
+--- a/lib/qr.c
++++ b/lib/qr.c
+@@ -5,7 +5,7 @@
+ #elif defined(UpCase)
+    #define dgeqrf_ DGEQRF
+ #endif
+-main(int nargs, char **args)
++int main(int nargs, char **args)
+ {
+    extern void dgeqrf_(F77_INTEGER*,F77_INTEGER*,double*,F77_INTEGER*,
+                        double*,double*,F77_INTEGER*,F77_INTEGER*);
+--- a/lib/test_dynlink.c
++++ b/lib/test_dynlink.c
+@@ -1,6 +1,6 @@
+ #include <cblas.h>
+ #include <clapack.h>
+-main(int nargs, char **args)
++int main(int nargs, char **args)
+ {
+    double A[1]={1.0}, b[1]={1.0};
+    int ipiv[1];
+--- a/tune/sysinfo/masrch.c
++++ b/tune/sysinfo/masrch.c
+@@ -169,7 +169,7 @@ int FindMflop
+    return(mf);
+ }
+ 
+-FindNreg
++int FindNreg
+ (
+    char pre,   /* precision: s,d,q */
+    int fmf,    /* number of mflops to force timer on */
+-- 
+2.45.2
+
+
+From 537f1afe821d5bad24fe401c8cb1294f2235f5b7 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Fri, 26 Jul 2024 00:11:42 +0200
+Subject: [PATCH 2/5] add missing function declarations
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+--- a/CONFIG/include/atlconf_misc.h
++++ b/CONFIG/include/atlconf_misc.h
+@@ -41,6 +41,8 @@ char *NameWithoutPath(char *file);
+ char *GetPathWithoutName(char *file);
+ void GetGccVers(char *gcc, int *comp, int *major, int *minor, int *patch);
+ int CompIsGcc(char *comp);
++int CompIsClang(char *comp);
++int CompIsMinGW(char *comp);
+ int CompIsAppleGcc(char *comp);
+ int CompIsMIPSpro(char *comp);
+ int CompIsPathScale(char *comp);
+-- 
+2.45.2
+
+
+From 975b10d484ec2c18fcc3eccbdf30fd166f2072c3 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Fri, 26 Jul 2024 00:11:49 +0200
+Subject: [PATCH 3/5] fix typo osnam -> osname
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+--- a/CONFIG/src/probe_arch.c
++++ b/CONFIG/src/probe_arch.c
+@@ -198,7 +198,7 @@ int ConfirmPtrbits(enum OSTYPE OS0, enum ASMDIA asmd0, char *targ0,
+ /*
+  * Try OS-specific probe, compiling with -m64 (assumes gcc workalike)
+  */
+-   i = 1 + strlen(frm) + strlen(osnam) + strlen(osnam[OS]) +
++   i = 1 + strlen(frm) + strlen(osname) + strlen(osnam[OS]) +
+        strlen(ASMNAM[asmd]) + strlen(flag) + strlen(targ) + strlen(find);
+    cmnd = malloc(i*sizeof(char));
+    assert(cmnd);
+-- 
+2.45.2
+
+
+From 550c8ff309c6896635bc86001af6dbecbf043d51 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Fri, 26 Jul 2024 00:15:08 +0200
+Subject: [PATCH 4/5] use long long in format string
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+--- a/bin/atlas_install.c
++++ b/bin/atlas_install.c
+@@ -278,7 +278,7 @@ long long GetFirstLongHex(char *ln)
+    {
+       if (isxdigit(ln[i]))
+       {
+-         sscanf(ln+i, "%lx", &iret);
++         sscanf(ln+i, "%llx", &iret);
+          break;
+       }
+    }
+-- 
+2.45.2
+
+
+From 9a9d7f5f83ea6235ee8e40d49b93545bb3c5b7c2 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Fri, 26 Jul 2024 00:16:03 +0200
+Subject: [PATCH 5/5] add missing string.h include
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+--- a/bin/qrtst.c
++++ b/bin/qrtst.c
+@@ -41,6 +41,7 @@
+ #ifndef TimeF77
+    #include "clapack.h"
+ #endif
++#include <string.h>
+ 
+ #ifdef ATL_FULL_LAPACK
+    #include "atlas_C2Flapack.h"
+-- 
+2.45.2
+
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 79cf2c8c93df..22ad33c0966d 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -10,11 +10,16 @@ AUX caffe2-2.2.1-gentoo.patch 6765 BLAKE2B 924338e5823825d18220c33e9168f96b59873
 AUX caffe2-2.2.2-musl.patch 363 BLAKE2B 9c62b8d93b430cec9d0e739802d5938933109369c003eda74fe1242d5bb61c50c70dd1cc52aa56d6b79c08f55328b991c8fafce60fa94d9377e84ddf14ab8d4a SHA512 2568001959399d76ce8a45e08dd54c0b297fc02a856b4d8a4003aa4dc12f5ded3e821022214df4997d4bd9de7515e0d2ebe2e465dca574b773155b8f9f5080f8
 AUX caffe2-2.3.0-CMakeFix.patch 519 BLAKE2B 0249b7c31cea647a0c82d94cd99fac3415cbd357aacde4d0cc0e5b936c27dc96afcbecdb9ae55ee464080603c9c71f6c995166ae7045e19e9d874dcf688b4a0a SHA512 a8c5200abf4f059a2c43a2fa0b2a639dde60cbf48f6bb461c133e02b7986e8bc9bb98c4a1c51478308ac13b886691c89debf0b762fc821cd52500f5648c3bd39
 AUX caffe2-2.3.0-cudnn_include_fix.patch 587 BLAKE2B 8ffeb9080ee77b953e7a77c9bea9af8c078adf147c314e07cf40d6f9ce1c988ac201e282ffd67a29703ced5885329d44be013c54cf3ba870c009aed40e65fefc SHA512 b37427e35d8147e603331eb344a3542ed31d0b133df3c7ce10ebecec93b1d09d040f77c33f23f70e9835db10fa209c0318b89b70b3b91263655d160ed737d6f3
+AUX caffe2-2.3.0-exclude-aotriton.patch 1380 BLAKE2B 603b6be7d093726a4ebb2f23b3413f6bdc360232614fddb2a1bf73d3f311d5476127340b084796213f1091eed7b8733dbc129df213f7e0eb9d1bb04e0541995a SHA512 173297bba5287ba7ffd0e6f61364f747fcf98a66990b69f1d234e41dc23ae4f645d4c00759a92bf624a691a0d16cbd1e52c45aeace1c19c06ff7f8e676d67df7
+AUX caffe2-2.3.0-fix-gcc-clang-abi-compat.patch 822 BLAKE2B ca2ad94c4293e120fa93cc535f295dee07da9cd3d98c10af57688a04daede8bb2e17dc7f91e88c937215866e1c65ea1f0a6c20fac02c00626a6ad3d2255089b7 SHA512 149ae161f0224d3500ae928a4077ae625bbc76853f1049c441ea12bf44ae95a18ba57aeba9b879df0a944fc88151290b49e7323e954d32eaf0ec0e520b77ad47
+AUX caffe2-2.3.0-fix-libcpp.patch 1281 BLAKE2B 67943ec6e79327c854ebcd3538f68dd2866530f8799399605a288b21477a3ea9673ad85469d04510347736d656135f7cec90a3254ea0e7572dde3e5be948b6a2 SHA512 b92b80b341dadd43a6a8d75a14a2e5325a2bbbacbb55c960f1c55b50a87e0a5f9298e9cf4faeb3b2684985d6fb439a5f8b908c0227cbf2baed9c9f5b29aa3d48
+AUX caffe2-2.3.0-fix-rocm-gcc14-clamp.patch 1009 BLAKE2B ad27422dfc7be2720b972e1bbc417874a1060d2cbd5edb0acf166a7437963702b830766950db33381d6f32c6f95a001d8424ece73f70603fae8bf5f50b2ba255 SHA512 67f26127632cfca91389fdc60cea4d31a9b259e5547ccd6778bfc98a19bdd7b632ec17abbe888842ff613430c49aac37e18aca441335a947f973fd9d978ac3fe
+AUX caffe2-2.3.0-optional-hipblaslt.patch 10001 BLAKE2B a73913a9d82acfb780ad95fc1aabef1dfbd20243a8caef7136dbdad72a120c8778348d82e25d9171453e159580caf1ec5fdaa9bdbef4a09981721579e50f6b21 SHA512 222d33a3253d35c64dc151d12a42a9a0d4edca7fe60e1bb9b0c43df07292a9a061b2259a5696b4d568db265b0df4f065b3ee54672481c788ce1e2b0ae01b8488
 AUX caffe2-2.3.0-rocm-fix-std-cpp17.patch 3378 BLAKE2B 9e88fa1bf68c397c8122ea5b3504a22b3f6ef92c77dad8bd84ee03b4f75792b0e1281d8b1aa981ad1bf65060179fa08ef14e776e82abdec9147dfbb3bf37a7ae SHA512 7797a140abf736f2a4628cd727cf0c58ed39c9764b9ce3b67d17fc0c9b9965e647266c815e5322f96f807680120e25ccdbbc66b66c7c6cf84edb811330ad452c
 DIST pytorch-2.2.2.tar.gz 116367503 BLAKE2B 0be22f2ec4b9aac6f5e976664cae01facf07929a32565cd57d7cc5b2d9888e9ae71ca301853752fe8f31d174d04c9974eb9ed2f3d452360a50ccf024f200726a SHA512 7990e0f9484038c3458c0bda2c863bf2b19e56edab81fc5938c6e0f08b17558287f853bb67350e8cca8f42bec0f1d4ba0e94e50a145db8da44bdd4bd703d91d0
 DIST pytorch-2.3.0.tar.gz 117029829 BLAKE2B 8f9c0d71ee0a9219b495eddccdcc65107f7ad537c43c68100b229f3d27b0e6c01ccb1659c7fffc356a48d80f2adc0a10361305dc8f1df20446de837d380f89f6 SHA512 67f7e9a096c3ffb952206ebf9105bedebb68c24ad82456083adf1d1d210437fcaa9dd52b68484cfc97d408c9eebc9541c76868c34a7c9982494dc3f424cfb07c
 DIST pytorch-2.3.1.tar.gz 117035696 BLAKE2B d419d7fa1342f1fb317ffce09ec9dc1447414627cc83d36578fe60f68c283c620b2b4d49f414cd206d537b90b16432a06cd1941662720db05d5e2b6c493325f5 SHA512 e1bcae44f9939fc7ccb1360a9b1970d92426f25e5de73e36964df3dd15ad5d8d9f5bd2f9a7dda6b8f64e2bba3674005bd869f542489cc442ad0125a02676f587
 EBUILD caffe2-2.2.2-r1.ebuild 7452 BLAKE2B 31ef525960d7c3866580985f9ba9736e5419f17c2a63251b8c4fe961a6789a33dee746b14b12fa331c8c20a6c821565b92dd2cb7c6cdd61678bba7ddf5fc7400 SHA512 f232d901c08e3fefd0d6260d07915786747df8f83269c3980c16112c968114c3cdb7daccd8132a6a3850a266a04b38f6df6d2b1f1bc35f473fb9a58d5fff3452
-EBUILD caffe2-2.3.0-r3.ebuild 7542 BLAKE2B 6b230db4d2a033b5078e8c61e40955a0981aa3b6b06734145e4bec8f78719329a3825218045a8f57efce9bfddad7b252ee4447d82cc0637db8656d5f8178b9cc SHA512 d3861111081d26a883790e7a5097ddf77ef2e491eb4471a3cc95d25e659ad8c283c22bda5674cb09d575768da5b6a401ea5347febd4f194dbedd4196d1ac628d
-EBUILD caffe2-2.3.1.ebuild 7563 BLAKE2B 17433295ef6aaf94567a5261e9df6a2b5aeac0b2c18eb4c45375ed828cbba7ac874811c0da8ca51de84482d5e4b62b48ccecd8924ad42c72a1320ff8b3b715c6 SHA512 c6868b614f7a9c3847e32ba054d821e96486d57cdf1d4597d3a6bb6f9045bd19fa65d5462af31c471eafddd4d5e72278d68de59c21cb21ab17df381fd181fe10
+EBUILD caffe2-2.3.0-r3.ebuild 8441 BLAKE2B 7b7c44a04e072fbf4bcc4fabf470b5256b85b36bb5035a56ceef65843dcaa1eec1eb3cdf9246cf3c672b6d3f4885816a037ef875f77bbf38f9d5a0fafda7981c SHA512 34306a2af160fef5ad902d116da044e96d4eaafd46b8ea511f7b04ef590ccdace7deabeb8905a5b69d9e1a21fc58ab038356d4542dd378c21078a75d08c188ca
+EBUILD caffe2-2.3.1.ebuild 8462 BLAKE2B 1c079bd3119ad0acd224a99cc029ba1e8d557065bbd2cfa30670f6f3720072520a072d0abed1e21f41781581f0b6711e809581fe01e363b613e2b82e38635d94 SHA512 591bee9c3a6beaa9f1687881381692bd7de32a6203d924d36ab89c2fc7de754fd7a5a4056e0e19f293aa836975d1d9321ee5997939270ff10df41fd31e5c9157
 MISC metadata.xml 1225 BLAKE2B ab7fb0bf8b2d37ddaa1a9ecc815eb094e85465d20d3a30af081b42e0b60ade9858d0053b101ba0e7750a90cb48b5b79db9bdc2729bf66d0420732489da62fe54 SHA512 dfb58597fb4bcdd7df0fcc3f2514518e118e8fc9b1cd24868aab60c32a62ff419b8b72a7c294925eff4c8871cc8df606af7fa60bfa99901091d8195101ee1153
diff --git a/sci-libs/caffe2/caffe2-2.3.0-r3.ebuild b/sci-libs/caffe2/caffe2-2.3.0-r3.ebuild
index c01e904d8eb0..666800d8f4b6 100644
--- a/sci-libs/caffe2/caffe2-2.3.0-r3.ebuild
+++ b/sci-libs/caffe2/caffe2-2.3.0-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-ROCM_VERSION=5.7
+ROCM_VERSION=6.1
 inherit python-single-r1 cmake cuda flag-o-matic prefix rocm
 
 MYPN=pytorch
@@ -65,18 +65,23 @@ RDEPEND="
 	opencv? ( media-libs/opencv:= )
 	qnnpack? ( sci-libs/QNNPACK )
 	rocm? (
-		>=dev-util/hip-5.7
-		>=dev-libs/rccl-5.7[${ROCM_USEDEP}]
-		>=sci-libs/rocThrust-5.7[${ROCM_USEDEP}]
-		>=sci-libs/rocPRIM-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipBLAS-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipFFT-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipSPARSE-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipRAND-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipCUB-5.7[${ROCM_USEDEP}]
-		>=sci-libs/hipSOLVER-5.7[${ROCM_USEDEP}]
-		>=sci-libs/miopen-5.7[${ROCM_USEDEP}]
-		>=dev-util/roctracer-5.7[${ROCM_USEDEP}]
+		=dev-util/hip-6.1*
+		=dev-libs/rccl-6.1*[${ROCM_USEDEP}]
+		=sci-libs/rocThrust-6.1*[${ROCM_USEDEP}]
+		=sci-libs/rocPRIM-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipBLAS-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipFFT-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipSPARSE-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipRAND-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipCUB-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipSOLVER-6.1*[${ROCM_USEDEP}]
+		=sci-libs/miopen-6.1*[${ROCM_USEDEP}]
+		=dev-util/roctracer-6.1*[${ROCM_USEDEP}]
+
+		amdgpu_targets_gfx90a? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx90a] )
+		amdgpu_targets_gfx940? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx940] )
+		amdgpu_targets_gfx941? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx941] )
+		amdgpu_targets_gfx942? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx942] )
 	)
 	distributed? ( sci-libs/tensorpipe[cuda?] )
 	xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
@@ -111,6 +116,11 @@ PATCHES=(
 	"${FILESDIR}"/${P}-rocm-fix-std-cpp17.patch
 	"${FILESDIR}"/${PN}-2.2.2-musl.patch
 	"${FILESDIR}"/${P}-CMakeFix.patch
+	"${FILESDIR}"/${PN}-2.3.0-exclude-aotriton.patch
+	"${FILESDIR}"/${PN}-2.3.0-fix-rocm-gcc14-clamp.patch
+	"${FILESDIR}"/${PN}-2.3.0-optional-hipblaslt.patch
+	"${FILESDIR}"/${PN}-2.3.0-fix-libcpp.patch
+	"${FILESDIR}"/${PN}-2.3.0-fix-gcc-clang-abi-compat.patch
 )
 
 src_prepare() {
@@ -235,11 +245,20 @@ src_configure() {
 		)
 	elif use rocm; then
 		export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)"
+		local use_hipblaslt="OFF"
+		if use amdgpu_targets_gfx90a || use amdgpu_targets_gfx940 || use amdgpu_targets_gfx941 \
+			|| use amdgpu_targets_gfx942; then
+			use_hipblaslt="ON"
+		fi
 
 		mycmakeargs+=(
 			-DUSE_NCCL=ON
 			-DUSE_SYSTEM_NCCL=ON
+			-DUSE_HIPBLASLT=${use_hipblaslt}
 		)
+
+		# ROCm libraries produce too much warnings
+		append-cxxflags -Wno-deprecated-declarations -Wno-unused-result
 	fi
 
 	if use onednn; then
diff --git a/sci-libs/caffe2/caffe2-2.3.1.ebuild b/sci-libs/caffe2/caffe2-2.3.1.ebuild
index 51bab7c5dac7..ee1da28aa12f 100644
--- a/sci-libs/caffe2/caffe2-2.3.1.ebuild
+++ b/sci-libs/caffe2/caffe2-2.3.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-ROCM_VERSION=5.7
+ROCM_VERSION=6.1
 inherit python-single-r1 cmake cuda flag-o-matic prefix rocm
 
 MYPN=pytorch
@@ -65,18 +65,23 @@ RDEPEND="
 	opencv? ( media-libs/opencv:= )
 	qnnpack? ( sci-libs/QNNPACK )
 	rocm? (
-		=dev-util/hip-5.7*
-		=dev-libs/rccl-5.7*[${ROCM_USEDEP}]
-		=sci-libs/rocThrust-5.7*[${ROCM_USEDEP}]
-		=sci-libs/rocPRIM-5.7*[${ROCM_USEDEP}]
-		=sci-libs/hipBLAS-5.7*[${ROCM_USEDEP}]
-		=sci-libs/hipFFT-5.7*[${ROCM_USEDEP}]
-		=sci-libs/hipSPARSE-5.7*[${ROCM_USEDEP}]
-		=sci-libs/hipRAND-5.7*[${ROCM_USEDEP}]
-		=sci-libs/hipCUB-5.7*[${ROCM_USEDEP}]
-		=sci-libs/hipSOLVER-5.7*[${ROCM_USEDEP}]
-		=sci-libs/miopen-5.7*[${ROCM_USEDEP}]
-		=dev-util/roctracer-5.7*[${ROCM_USEDEP}]
+		=dev-util/hip-6.1*
+		=dev-libs/rccl-6.1*[${ROCM_USEDEP}]
+		=sci-libs/rocThrust-6.1*[${ROCM_USEDEP}]
+		=sci-libs/rocPRIM-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipBLAS-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipFFT-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipSPARSE-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipRAND-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipCUB-6.1*[${ROCM_USEDEP}]
+		=sci-libs/hipSOLVER-6.1*[${ROCM_USEDEP}]
+		=sci-libs/miopen-6.1*[${ROCM_USEDEP}]
+		=dev-util/roctracer-6.1*[${ROCM_USEDEP}]
+
+		amdgpu_targets_gfx90a? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx90a] )
+		amdgpu_targets_gfx940? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx940] )
+		amdgpu_targets_gfx941? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx941] )
+		amdgpu_targets_gfx942? ( =sci-libs/hipBLASLt-6.1*[amdgpu_targets_gfx942] )
 	)
 	distributed? ( sci-libs/tensorpipe[cuda?] )
 	xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
@@ -111,6 +116,11 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.0-rocm-fix-std-cpp17.patch
 	"${FILESDIR}"/${PN}-2.2.2-musl.patch
 	"${FILESDIR}"/${PN}-2.3.0-CMakeFix.patch
+	"${FILESDIR}"/${PN}-2.3.0-exclude-aotriton.patch
+	"${FILESDIR}"/${PN}-2.3.0-fix-rocm-gcc14-clamp.patch
+	"${FILESDIR}"/${PN}-2.3.0-optional-hipblaslt.patch
+	"${FILESDIR}"/${PN}-2.3.0-fix-libcpp.patch
+	"${FILESDIR}"/${PN}-2.3.0-fix-gcc-clang-abi-compat.patch
 )
 
 src_prepare() {
@@ -235,11 +245,20 @@ src_configure() {
 		)
 	elif use rocm; then
 		export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)"
+		local use_hipblaslt="OFF"
+		if use amdgpu_targets_gfx90a || use amdgpu_targets_gfx940 || use amdgpu_targets_gfx941 \
+			|| use amdgpu_targets_gfx942; then
+			use_hipblaslt="ON"
+		fi
 
 		mycmakeargs+=(
 			-DUSE_NCCL=ON
 			-DUSE_SYSTEM_NCCL=ON
+			-DUSE_HIPBLASLT=${use_hipblaslt}
 		)
+
+		# ROCm libraries produce too much warnings
+		append-cxxflags -Wno-deprecated-declarations -Wno-unused-result
 	fi
 
 	if use onednn; then
diff --git a/sci-libs/caffe2/files/caffe2-2.3.0-exclude-aotriton.patch b/sci-libs/caffe2/files/caffe2-2.3.0-exclude-aotriton.patch
new file mode 100644
index 000000000000..2c65987acd85
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-2.3.0-exclude-aotriton.patch
@@ -0,0 +1,35 @@
+Disables aotriton download when both USE_FLASH_ATTENTION and USE_MEM_EFF_ATTENTION cmake flags are OFF
+Backports upstream PR to 2.3.0: https://github.com/pytorch/pytorch/pull/130197
+--- a/cmake/Dependencies.cmake
++++ b/cmake/Dependencies.cmake
+@@ -1334,7 +1334,9 @@ if(USE_ROCM)
+       message(STATUS "Disabling Kernel Assert for ROCm")
+     endif()
+ 
+-    include(${CMAKE_CURRENT_LIST_DIR}/External/aotriton.cmake)
++    if(USE_FLASH_ATTENTION)
++      include(${CMAKE_CURRENT_LIST_DIR}/External/aotriton.cmake)
++    endif()
+     if(USE_CUDA)
+       caffe2_update_option(USE_MEM_EFF_ATTENTION OFF)
+     endif()
+--- a/aten/src/ATen/native/transformers/cuda/sdp_utils.cpp
++++ b/aten/src/ATen/native/transformers/cuda/sdp_utils.cpp
+@@ -21,7 +21,7 @@
+ #include <cmath>
+ #include <functional>
+ 
+-#if USE_ROCM
++#if defined(USE_ROCM) && defined(USE_FLASH_ATTENTION)
+ #include <aotriton/flash.h>
+ #endif
+ 
+@@ -186,7 +186,7 @@ bool check_flash_attention_hardware_support(sdp_params const& params, bool debug
+   // Check that the gpu is capable of running flash attention
+   using sm80 = SMVersion<8, 0>;
+   using sm90 = SMVersion<9, 0>;
+-#if USE_ROCM
++#if defined(USE_ROCM) && defined(USE_FLASH_ATTENTION)
+   auto stream = at::cuda::getCurrentCUDAStream().stream();
+   if (hipSuccess != aotriton::v2::flash::check_gpu(stream)) {
+       auto dprops = at::cuda::getCurrentDeviceProperties();
diff --git a/sci-libs/caffe2/files/caffe2-2.3.0-fix-gcc-clang-abi-compat.patch b/sci-libs/caffe2/files/caffe2-2.3.0-fix-gcc-clang-abi-compat.patch
new file mode 100644
index 000000000000..a6f981b7e054
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-2.3.0-fix-gcc-clang-abi-compat.patch
@@ -0,0 +1,17 @@
+
+When gcc builds libtorch_cpu.so and hipcc (clang-18) build libtorch_hip.so,
+resulting binary fails in runtime due to different mangling.
+Related issue in LLVM: https://github.com/llvm/llvm-project/issues/85656
+Fixed in pytorch-2.4.0 in https://github.com/pytorch/pytorch/commit/a89f442f0b103fa6f38103784a2dfedbd147f863
+--- a/cmake/Dependencies.cmake
++++ b/cmake/Dependencies.cmake
+@@ -1314,6 +1314,9 @@ if(USE_ROCM)
+        list(APPEND HIP_HIPCC_FLAGS -fdebug-info-for-profiling)
+     endif(CMAKE_BUILD_TYPE MATCHES Debug)
+ 
++    # needed for compat with newer versions of hip-clang that introduced C++20 mangling rules
++    list(APPEND HIP_HIPCC_FLAGS -fclang-abi-compat=17)
++
+     set(HIP_CLANG_FLAGS ${HIP_CXX_FLAGS})
+     # Ask hcc to generate device code during compilation so we can use
+     # host linker to link.
diff --git a/sci-libs/caffe2/files/caffe2-2.3.0-fix-libcpp.patch b/sci-libs/caffe2/files/caffe2-2.3.0-fix-libcpp.patch
new file mode 100644
index 000000000000..75808fd7ec50
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-2.3.0-fix-libcpp.patch
@@ -0,0 +1,24 @@
+Workaround for libc++ issue https://github.com/llvm/llvm-project/issues/100802
+"reference to __host__ function 'memcpy' in __device__ function"
+--- a/c10/util/Half.h
++++ b/c10/util/Half.h
+@@ -227,7 +227,7 @@ C10_HOST_DEVICE inline float fp16_ieee_to_fp32_value(uint16_t h) {
+   // const float exp_scale = 0x1.0p-112f;
+   constexpr uint32_t scale_bits = (uint32_t)15 << 23;
+   float exp_scale_val = 0;
+-  std::memcpy(&exp_scale_val, &scale_bits, sizeof(exp_scale_val));
++  memcpy(&exp_scale_val, &scale_bits, sizeof(exp_scale_val));
+   const float exp_scale = exp_scale_val;
+   const float normalized_value =
+       fp32_from_bits((two_w >> 4) + exp_offset) * exp_scale;
+@@ -298,8 +298,8 @@ inline uint16_t fp16_ieee_from_fp32_value(float f) {
+   constexpr uint32_t scale_to_inf_bits = (uint32_t)239 << 23;
+   constexpr uint32_t scale_to_zero_bits = (uint32_t)17 << 23;
+   float scale_to_inf_val = 0, scale_to_zero_val = 0;
+-  std::memcpy(&scale_to_inf_val, &scale_to_inf_bits, sizeof(scale_to_inf_val));
+-  std::memcpy(
++  memcpy(&scale_to_inf_val, &scale_to_inf_bits, sizeof(scale_to_inf_val));
++  memcpy(
+       &scale_to_zero_val, &scale_to_zero_bits, sizeof(scale_to_zero_val));
+   const float scale_to_inf = scale_to_inf_val;
+   const float scale_to_zero = scale_to_zero_val;
diff --git a/sci-libs/caffe2/files/caffe2-2.3.0-fix-rocm-gcc14-clamp.patch b/sci-libs/caffe2/files/caffe2-2.3.0-fix-rocm-gcc14-clamp.patch
new file mode 100644
index 000000000000..81ae075c67cc
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-2.3.0-fix-rocm-gcc14-clamp.patch
@@ -0,0 +1,18 @@
+Fix hip compilation with gcc-14
+Upstream commit: https://github.com/pytorch/pytorch/commit/8c2c3a03fb87c3568a22362d83b00d82b9fb3db2
+--- a/aten/src/ATen/native/cuda/IndexKernel.cu
++++ b/aten/src/ATen/native/cuda/IndexKernel.cu
+@@ -259,7 +259,13 @@ void index_put_kernel_quantized_cuda(TensorIterator& iter, const IntArrayRef ind
+ 
+     gpu_index_kernel(iter, index_size, index_stride, [inv_scale, zero_point, qmin, qmax]C10_DEVICE(char* const out_data, const char* const in_data, const int64_t offset) {
+       int64_t qvalue = static_cast<int64_t>(zero_point + nearbyintf(*(float*)in_data * inv_scale));
++      // See https://github.com/pytorch/pytorch/issues/127666
++      // hip-clang std::clamp __glibcxx_assert_fail host function when building on Fedora40/gcc14
++#ifndef USE_ROCM
+       qvalue = std::clamp(qvalue, qmin, qmax);
++#else
++      qvalue = (qvalue < qmin) ? qmin : (qmax < qvalue) ? qmax : qvalue;
++#endif
+       *(scalar_t*)(out_data + offset) = static_cast<scalar_t>(qvalue);
+     });
+   });
diff --git a/sci-libs/caffe2/files/caffe2-2.3.0-optional-hipblaslt.patch b/sci-libs/caffe2/files/caffe2-2.3.0-optional-hipblaslt.patch
new file mode 100644
index 000000000000..dc544255c2bd
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-2.3.0-optional-hipblaslt.patch
@@ -0,0 +1,235 @@
+Makes hipblaslt optional to simplify build for non-datacenter GPUs.
+Based on https://github.com/pytorch/pytorch/pull/120551 with added USE_HIPBLASLT cmake option.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -225,6 +225,9 @@ option(USE_FAKELOWP "Use FakeLowp operators" OFF)
+ option(USE_FFMPEG "Use ffmpeg" OFF)
+ option(USE_GFLAGS "Use GFLAGS" OFF)
+ option(USE_GLOG "Use GLOG" OFF)
++cmake_dependent_option(
++    USE_HIPBLASLT "Use hipBLASLt" ON
++    "USE_ROCM" OFF)
+ option(USE_LEVELDB "Use LEVELDB" OFF)
+ option(USE_LITE_PROTO "Use lite protobuf instead of full." OFF)
+ option(USE_LMDB "Use LMDB" OFF)
+--- a/aten/src/ATen/cuda/CUDABlas.cpp
++++ b/aten/src/ATen/cuda/CUDABlas.cpp
+@@ -14,7 +14,7 @@
+ #include <c10/util/irange.h>
+ 
+ #ifdef USE_ROCM
+-#if ROCM_VERSION >= 60000
++#ifdef USE_HIPBLASLT
+ #include <hipblaslt/hipblaslt-ext.hpp>
+ #endif
+ // until hipblas has an API to accept flags, we must use rocblas here
+@@ -781,7 +781,7 @@ void gemm<at::BFloat16>(CUDABLAS_GEMM_ARGTYPES(at::BFloat16)) {
+   }
+ }
+ 
+-#if (!defined(USE_ROCM) && !defined(_MSC_VER)) || (defined(USE_ROCM) && ROCM_VERSION >= 50700)
++#if (!defined(USE_ROCM) && !defined(_MSC_VER)) || (defined(USE_ROCM) && defined(USE_HIPBLASLT))
+ 
+ #if defined(USE_ROCM) && ROCM_VERSION >= 50700 && ROCM_VERSION < 60000
+ // only for rocm 5.7 where we first supported hipblaslt, it was difficult
+@@ -912,6 +912,7 @@ class CuBlasLtMatmulPreference : public CuBlasLtDescriptor<
+ };
+ } // namespace
+ 
++#if (!defined(USE_ROCM) && !defined(_MSC_VER)) || (defined(USE_ROCM) && defined(USE_HIPBLASLT))
+ template <typename Dtype>
+ void gemm_and_bias(
+     bool transpose_mat1,
+@@ -1124,7 +1125,7 @@ template void gemm_and_bias(
+     at::BFloat16* result_ptr,
+     int64_t result_ld,
+     GEMMAndBiasActivationEpilogue activation);
+-
++#endif
+ void scaled_gemm(
+     char transa,
+     char transb,
+--- a/aten/src/ATen/cuda/CUDABlas.h
++++ b/aten/src/ATen/cuda/CUDABlas.h
+@@ -82,7 +82,7 @@ void gemm_internal<at::Half>(CUDABLAS_GEMM_ARGTYPES(at::Half));
+ template <>
+ void gemm_internal<at::BFloat16>(CUDABLAS_GEMM_ARGTYPES(at::BFloat16));
+ 
+-#if (!defined(USE_ROCM) && !defined(_MSC_VER)) || (defined(USE_ROCM) && ROCM_VERSION >= 50700)
++#if (!defined(USE_ROCM) && !defined(_MSC_VER)) || (defined(USE_ROCM) && defined(USE_HIPBLASLT))
+ enum GEMMAndBiasActivationEpilogue {
+   None,
+   RELU,
+--- a/aten/src/ATen/cuda/CUDAContextLight.h
++++ b/aten/src/ATen/cuda/CUDAContextLight.h
+@@ -9,7 +9,7 @@
+ 
+ // cublasLT was introduced in CUDA 10.1 but we enable only for 11.1 that also
+ // added bf16 support
+-#if (!defined(USE_ROCM) && !defined(_MSC_VER)) || (defined(USE_ROCM) && ROCM_VERSION >= 50700)
++#if (!defined(USE_ROCM) && !defined(_MSC_VER)) || (defined(USE_ROCM) && defined(USE_HIPBLASLT))
+ #include <cublasLt.h>
+ #endif
+ 
+@@ -82,7 +82,7 @@ TORCH_CUDA_CPP_API c10::Allocator* getCUDADeviceAllocator();
+ /* Handles */
+ TORCH_CUDA_CPP_API cusparseHandle_t getCurrentCUDASparseHandle();
+ TORCH_CUDA_CPP_API cublasHandle_t getCurrentCUDABlasHandle();
+-#if (!defined(USE_ROCM) && !defined(_MSC_VER)) || (defined(USE_ROCM) && ROCM_VERSION >= 50700)
++#if (!defined(USE_ROCM) && !defined(_MSC_VER)) || (defined(USE_ROCM) && defined(USE_HIPBLASLT))
+ TORCH_CUDA_CPP_API cublasLtHandle_t getCurrentCUDABlasLtHandle();
+ #endif
+ 
+--- a/aten/src/ATen/cuda/CublasHandlePool.cpp
++++ b/aten/src/ATen/cuda/CublasHandlePool.cpp
+@@ -29,7 +29,7 @@ namespace at::cuda {
+ 
+ namespace {
+ 
+-#if defined(USE_ROCM) && ROCM_VERSION >= 50700
++#if defined(USE_ROCM) && defined(USE_HIPBLASLT)
+ void createCublasLtHandle(cublasLtHandle_t *handle) {
+   TORCH_CUDABLAS_CHECK(cublasLtCreate(handle));
+ }
+@@ -190,7 +190,7 @@ cublasHandle_t getCurrentCUDABlasHandle() {
+   return handle;
+ }
+ 
+-#if (!defined(USE_ROCM) && !defined(_MSC_VER)) || (defined(USE_ROCM) && ROCM_VERSION >= 50700)
++#if (!defined(USE_ROCM) && !defined(_MSC_VER)) || (defined(USE_ROCM) && defined(USE_HIPBLASLT))
+ cublasLtHandle_t getCurrentCUDABlasLtHandle() {
+ #ifdef USE_ROCM
+   c10::DeviceIndex device = 0;
+--- a/aten/src/ATen/cuda/tunable/TunableGemm.h
++++ b/aten/src/ATen/cuda/tunable/TunableGemm.h
+@@ -11,7 +11,7 @@
+ 
+ #include <ATen/cuda/tunable/GemmCommon.h>
+ #ifdef USE_ROCM
+-#if ROCM_VERSION >= 50700
++#ifdef USE_HIPBLASLT
+ #include <ATen/cuda/tunable/GemmHipblaslt.h>
+ #endif
+ #include <ATen/cuda/tunable/GemmRocblas.h>
+@@ -166,7 +166,7 @@ class GemmTunableOp : public TunableOp<GemmParams<T>, StreamTimer> {
+     }
+ #endif
+ 
+-#if defined(USE_ROCM) && ROCM_VERSION >= 50700
++#if defined(USE_ROCM) && defined(USE_HIPBLASLT)
+     static const char *env = std::getenv("PYTORCH_TUNABLEOP_HIPBLASLT_ENABLED");
+     if (env == nullptr || strcmp(env, "1") == 0) {
+       // disallow tuning of hipblaslt with c10::complex
+@@ -240,7 +240,7 @@ class GemmStridedBatchedTunableOp : public TunableOp<GemmStridedBatchedParams<T>
+     }
+ #endif
+ 
+-#if defined(USE_ROCM) && ROCM_VERSION >= 50700
++#if defined(USE_ROCM) && defined(USE_HIPBLASLT)
+     static const char *env = std::getenv("PYTORCH_TUNABLEOP_HIPBLASLT_ENABLED");
+     if (env == nullptr || strcmp(env, "1") == 0) {
+       // disallow tuning of hipblaslt with c10::complex
+--- a/aten/src/ATen/native/cuda/Blas.cpp
++++ b/aten/src/ATen/native/cuda/Blas.cpp
+@@ -155,7 +155,7 @@ enum class Activation {
+   GELU,
+ };
+ 
+-#if (!defined(USE_ROCM) && !defined(_MSC_VER)) || (defined(USE_ROCM) && ROCM_VERSION >= 50700)
++#if (!defined(USE_ROCM) && !defined(_MSC_VER)) || (defined(USE_ROCM) && defined(USE_HIPBLASLT))
+ cuda::blas::GEMMAndBiasActivationEpilogue activation_to_gemm_and_blas_arg(Activation a) {
+   switch (a) {
+     case Activation::None:
+@@ -193,6 +193,7 @@ static bool getDisableAddmmCudaLt() {
+ 
+ #ifdef USE_ROCM
+ static bool isSupportedHipLtROCmArch(int index) {
++#if defined(USE_HIPBLASLT)
+     hipDeviceProp_t* prop = at::cuda::getDeviceProperties(index);
+     std::string device_arch = prop->gcnArchName;
+     static const std::vector<std::string> archs = {"gfx90a", "gfx940", "gfx941", "gfx942"};
+@@ -203,6 +204,7 @@ static bool isSupportedHipLtROCmArch(int index) {
+         }
+     }
+     TORCH_CHECK(false, "Attempting to use hipBLASLt on a unsupported architecture!");
++#endif
+     return false;
+ }
+ #endif
+@@ -228,7 +230,7 @@ Tensor& addmm_out_cuda_impl(Tensor& result, const Tensor& self, const Tensor& ma
+   at::ScalarType scalar_type = self.scalar_type();
+   c10::MaybeOwned<Tensor> self_;
+   if (&result != &self) {
+-#if (defined(CUDA_VERSION) && CUDA_VERSION >= 11040 && !defined(_MSC_VER)) || defined(USE_ROCM) && ROCM_VERSION >= 50700
++#if (defined(CUDA_VERSION) && CUDA_VERSION >= 11040 && !defined(_MSC_VER)) || defined(USE_ROCM) && defined(USE_HIPBLASLT)
+     // Strangely, if mat2 has only 1 row or column, we get
+     // CUBLAS_STATUS_INVALID_VALUE error from cublasLtMatmulAlgoGetHeuristic.
+     // self.dim() == 1 && result.dim() == 2 && self.sizes()[0] == mat2_sizes[1]
+@@ -271,7 +273,7 @@ Tensor& addmm_out_cuda_impl(Tensor& result, const Tensor& self, const Tensor& ma
+     }
+     self__sizes = self_->sizes();
+   } else {
+-#if defined(USE_ROCM) && ROCM_VERSION >= 50700
++#if defined(USE_ROCM) && defined(USE_HIPBLASLT)
+     useLtInterface = !disable_addmm_cuda_lt &&
+         result.dim() == 2 && result.is_contiguous() &&
+         isSupportedHipLtROCmArch(self.device().index()) &&
+@@ -322,7 +324,7 @@ Tensor& addmm_out_cuda_impl(Tensor& result, const Tensor& self, const Tensor& ma
+ 
+   TORCH_INTERNAL_ASSERT_DEBUG_ONLY(!args.result->is_conj());
+ 
+-#if (!defined(USE_ROCM) && !defined(_MSC_VER)) || (defined(USE_ROCM) && ROCM_VERSION >= 50700)
++#if (!defined(USE_ROCM) && !defined(_MSC_VER)) || (defined(USE_ROCM) && defined(USE_HIPBLASLT))
+   if (useLtInterface) {
+     AT_DISPATCH_FLOATING_TYPES_AND2(
+         at::ScalarType::Half,
+@@ -876,7 +878,7 @@ _scaled_mm_out_cuda(const Tensor& mat1, const Tensor& mat2,
+   at::native::resize_output(out, {mat1_sizes[0], mat2_sizes[1]});
+   at::native::resize_output(amax, {});
+ 
+-#if !defined(USE_ROCM) && !defined(_MSC_VER) || (defined(USE_ROCM) && ROCM_VERSION >= 60000)
++#if !defined(USE_ROCM) && !defined(_MSC_VER) || (defined(USE_ROCM) && defined(USE_HIPBLASLT))
+   cublasCommonArgs args(mat1, mat2, out);
+   const auto out_dtype_ = args.result->scalar_type();
+   TORCH_CHECK(args.transa == 't' && args.transb == 'n', "Only multiplication of row-major and column-major matrices is supported by cuBLASLt");
+@@ -906,7 +908,7 @@ _scaled_mm_out_cuda(const Tensor& mat1, const Tensor& mat2,
+   TORCH_CHECK(false, "_scaled_mm_out_cuda is not compiled for this platform.");
+ #endif
+ 
+-#if defined(USE_ROCM) && ROCM_VERSION >= 60000
++#if defined(USE_ROCM) && defined(USE_HIPBLASLT)
+   // rocm's hipblaslt does not yet support amax, so calculate separately
+   auto out_float32 = out.to(kFloat);
+   out_float32.abs_();
+--- a/cmake/Dependencies.cmake
++++ b/cmake/Dependencies.cmake
+@@ -1282,6 +1282,9 @@ if(USE_ROCM)
+     if(ROCM_VERSION_DEV VERSION_GREATER_EQUAL "6.0.0")
+       list(APPEND HIP_CXX_FLAGS -DHIPBLAS_V2)
+     endif()
++    if(hipblast_FOUND)
++      list(APPEND HIP_CXX_FLAGS -DHIPBLASLT)
++    endif()
+     if(HIPBLASLT_CUSTOM_DATA_TYPE)
+       list(APPEND HIP_CXX_FLAGS -DHIPBLASLT_CUSTOM_DATA_TYPE)
+     endif()
+--- a/cmake/public/LoadHIP.cmake
++++ b/cmake/public/LoadHIP.cmake
+@@ -155,7 +155,7 @@ if(HIP_FOUND)
+   find_package_and_print_version(hiprand REQUIRED)
+   find_package_and_print_version(rocblas REQUIRED)
+   find_package_and_print_version(hipblas REQUIRED)
+-  if(ROCM_VERSION_DEV VERSION_GREATER_EQUAL "5.7.0")
++  if(ROCM_VERSION_DEV VERSION_GREATER_EQUAL "5.7.0" AND USE_HIPBLASLT)
+     find_package_and_print_version(hipblaslt REQUIRED)
+   endif()
+   find_package_and_print_version(miopen REQUIRED)
+@@ -191,7 +191,7 @@ if(HIP_FOUND)
+   # roctx is part of roctracer
+   find_library(ROCM_ROCTX_LIB roctx64 HINTS ${ROCM_PATH}/lib)
+ 
+-  if(ROCM_VERSION_DEV VERSION_GREATER_EQUAL "5.7.0")
++  if(hipblastlt_FOUND)
+     # check whether hipblaslt is using its own datatype
+     set(file "${PROJECT_BINARY_DIR}/hipblaslt_test_data_type.cc")
+     file(WRITE ${file} ""
diff --git a/sci-libs/cdf/Manifest b/sci-libs/cdf/Manifest
index 1b47783b15ef..f6de40e133c4 100644
--- a/sci-libs/cdf/Manifest
+++ b/sci-libs/cdf/Manifest
@@ -1,15 +1,5 @@
 AUX 50cdf 124 BLAKE2B 93acfc3dd493c8518497ed7dafa35cc61f66501bd9d7c4db1f4072cdda9742f2927b5f388dde26d33e76d4d33405a8a92fbf133a1ed729ce8cba21458f552123 SHA512 4fe515d03379f2b6e1723c771f73e65be9f67365a46e75dbeb3358bbdc6f3446b91efd989363bf229b7ae93a446ddedeefd883a0d59d28c1480a10a8994eeadc
-AUX cdf-3.8.0-respect-flags.patch 3080 BLAKE2B 1a89fef44861e1954d42fa68f8dc9398299656eaa08686ea07577e329c70f28ea5967079a94819c8f8b4d99369ec8041fa37443a9be0d3e580fe396dacb1b3fd SHA512 7d6dd822f81a2d80b73cc55b76b46c0016ab1dc4c754a90b57c2d2c99912c045853cf132d7c26dbfe804fc4cc908647ad7832b3048edfe5b2b4e735b23499953
 AUX cdf-3.9.0-respect-flags.patch 2704 BLAKE2B befb5b5bdfe01334ccce346f15fa079505a4c544f38cad26ea36e8e18db2ed55a08602d2a4798be1ac2feaa6fa3806aac590e4f2f551736371bff8973957565c SHA512 d51dea20c4f708aa3a4d77147cef50c8d1e572088ffa2e8a9323d3b31915a77760a0dd3e04d161b29859b734424ad34616277ad8fdf032ce1a50d843058c20c2
-DIST cdf380crm.pdf 2671048 BLAKE2B 2605d6465c744b57f11d08605aa888ead724b7553a0efd8830dae759eb54c6d0df807cca1c6611fd40b4c5eb9327fbfcd66f0f7cf82b69bf7619385928ebc6dd SHA512 fc1eef589ff0f3cd989d8743cc1d6cfeb5946cf9ae8e4a328ba746b33fe0f6a286cf7b7b7e7cab5e0231bef566c03d7b68afe6c0879e5fb32fc1e6c980f7e081
-DIST cdf380csrm.pdf 2409166 BLAKE2B 7e97e61865531b788553ca9747513ec32bc5e1a743e10e5bad5f62980a883d00cfeede975b83826ad72327071062080cd1db611fd40c4e5b3d22caf7d4dd3d0f SHA512 d669f032722e270d3f16f8d9a8920d4536430bd83a509591cf82b447770d16a9c6d9aba17e096f78445c4f0b7f4ab85082cf2480bc9384b46677a2325be0f163
-DIST cdf380frm.pdf 2570409 BLAKE2B c8fb1444c7e02297af0c3bffbf58c048077e0d69c4aca8cb3e48331f496dba1551289d2e2b95f9f2d9fabe8048bd56f73a72bab58a52772cae22f184a6b39745 SHA512 de90e4893b976ab9e77f1e9512b2f310b043b8dc921ca43cf1d37e767bf5cbae5d06f91388ff5f4fb1258db5a1149712fa9a5dbc1c2d18f78705021fc31087bb
-DIST cdf380prm.pdf 1521804 BLAKE2B 4afa792f3b5f2bda7e896e10ccb6b2b073e127fca9ece229bb3dbe3b8e8920ef5b8cce5a45a15fa648525c8241fbcc678c8eea0a32a3dabad4cd3b9e959e0913 SHA512 413ce06f36d151cc5380884111376fb54108fcf692ac56ed4d96204f56d4d434ca695d42114e1e89626288802cb4d5d48097664e8e0411a041950aff8199fea0
-DIST cdf380ug.pdf 1716882 BLAKE2B e36f0a9624756d6d5bf71fcc0958d33d060b7f32dd7bbb93fcf6a58a33a5154017fd0ba8a598fe652919785398d306e84fe7a89b5c4aa0d305ee0bc2fbf20b8f SHA512 f2e865b55d293a17a5d85c36e04d14050b7f17adc97dfc284d95db36ae1b94678e31b107cbab32ad690630bbde0f3f0caf558ecdb4e1d0e60cd5f53b30faa0fc
-DIST cdf380vbrm.pdf 2260048 BLAKE2B 30abdf365763df753569289a74013033e0dc56c3ce0a787bcdb9d179d334f4cb79f2b5c6d98427ab9a6451b44e333f48932c152674ce7c9229291b3b714e0f70 SHA512 8552d1f1a83a0f327bc20e8dc03f8728aad132e5765084839ee02900d19c93f9c7f67a1e3f4429cc01d51d75ab00b666d18a247522da2b4fda529cf6333889b5
-DIST cdf38_0-dist-cdf.tar.gz 1251571 BLAKE2B d51463fcf196e0c35617b93725104b34a9047ee7ef22d5d5b7ed9ed5816903e435f130b8ebb0d75e0f05c4908b71de3a4c9bab910a9472b3111be22f659e1bc8 SHA512 cc13358ddd5dfa90731ec6d9da0985697ff9e297be0bc03d8132761d479f5ff062c822085d3141a2fa4320ccd7d1b59064fc236f143a00f24b22c6edf0f618ce
-DIST cdf38_0-dist-java.tar.gz 1007414 BLAKE2B 64fb991d937e9242d42a9b6524facff35acefe4fb2279b92942faf6a9403fae98c3a6b8e9881a916e8669ead5bca4a404dbc250d3a95be26cbe761b6dfa48227 SHA512 12b4d98561f4c07ef4837daa0fc90e1d1cb78622b3837d3cdc30643eae3e9f1ffe50dfa22e8be56615aa4cf4b983df6bde2d1c9fbe2115142d9fdfa653bee2be
-DIST cdf38ifd.pdf 881707 BLAKE2B b80e15e631eb5025317d324893c16838b3a44218cf2c592692eff4d0b778494f2555cf79d2d35b54d66606a82c3835ad896fe809ef363f85ab8261879bf55167 SHA512 2dd3ff5867f5faba3502f877057e9d3110e7be03219dcf5aa657c6685e4a63f847b3d3fbea8d201ae5601a78773c636799cc1ab53e77e12d0ffd5c543322340c
 DIST cdf390crm.pdf 2029732 BLAKE2B 011652b3c55910dea6c4e7b47e003335826e3471bfab41e27a1baf44397b4efd684f75b8e09018279cf9ee53f3d3de65a8c5905769e04aa93b893bbc470117a8 SHA512 b1b60c0b77bece7f0f722505bff1abba1798a220627216f04c84163a3efb51fdd31bc3abe2f8dacd0bb31e6aee585301939d38dc9353fda0535475ba973593be
 DIST cdf390csrm.pdf 1865382 BLAKE2B 83bc066468867b946e3962f1c4b2717f218ea2b92100b43ff18457c1759e2bd71028919aa6403030b840aaa5709a0fafa3e5e6a8843df52e44b3ff335e44dff0 SHA512 f614e1cea672c69eb08e0559e6d1b743f1eaf4f20c1e9dda8ca372ece3040676ba312b5800640b6f202aa9cc45b90e3ce9fbf07fcf621ed8591cbcbfc4e42a24
 DIST cdf390frm.pdf 1896169 BLAKE2B 26cafadaaaf861a4556d54c2fcd09f74c763a8d56e170a75b1247ac700c4082b1d09c446568e814b8b126b5ca2c4d1d0c3cc658ceb49fa6823fcbfe6db7326b2 SHA512 a696a1a774d31f1b023e15d9d510baa7407ea0f6a76bd065bb7c69bb85a3ea5aff6999949a6ed8ce21c418928eca6d90d22e0439ab959f3c1d2b7b9f0a33878e
@@ -19,6 +9,5 @@ DIST cdf390vbrm.pdf 1729074 BLAKE2B d30d177202b516891dba0cb99113d6d19af41d950384
 DIST cdf39_0-dist-cdf.tar.gz 1290187 BLAKE2B 03f7c7840c44514046df0d63ff6086be7263858f90225debfb8a4fe6c4d6e5b03c95faa2762f76e2ffc198ac77359b3494520258ec17678746fd7f619e362853 SHA512 e054b763d86c09c53375ef60a8690f43fcb106be1dc6fd907763379db1ab4c9677692671a63da74d955aec8ce3f866f420ddc7217a59ed68e51c4623562af387
 DIST cdf39_0-dist-java.tar.gz 1162924 BLAKE2B 4e6416ec5a2a2eede428fa00906ca0e42460916506e7b2075d622e322ffe53e337a77bf81aa871e1559fb6b9339f2f49e365ca835874e060da33cd7c68e45177 SHA512 860468257c70bd6cb9592f40e495b5efb9092fc6fa3ab68c2fdc729c46d9ea4f0499a0b29904fe9c1ae07c13958e551b4e5cc8b9b71c2401ca833f2020073606
 DIST cdf39ifd.pdf 656522 BLAKE2B 2ec3831f27e92fcec8191bedb1617c9f590b726732e02dd8ca317b814c369b46d50dd19e7bfc81df233e1e32ca6fb8191bf7e075ce67dda1ddd50645d5fc754b SHA512 f4de5bea46b7d1ea2621b9fa0ac1ab0f9904ada9a1625ce613f6fdb68ad25ca52398cbf75bb27902e54ba5ee7820f3ea1a563c655186047b8954cb53b4cd8197
-EBUILD cdf-3.8.0-r1.ebuild 3370 BLAKE2B 228ec6a849cae4a6a62fdb595e6746cb2c75ccc6bee68f0446afc3ab53180dc6bcdaa726523e9cbb8518cbedf961433f9d3eb8753b2c6b26a7ff625b16c68436 SHA512 a1cbb2e8f50281ba4155b03d5b802823210229e7d00a184d0f1fb5bc055133d9e4c5ee2cdb2da191ca4bc076dbbbd7f224e26f84616f070fd33cc70d23bff16d
-EBUILD cdf-3.9.0.ebuild 3635 BLAKE2B bd77f0d52b94bc14b866fcfe92a33cd16e38db6ee4411628235d7f54588a39f15aed3bc378a58faceebeb36f03ae7c41ee091efdc06bdb06e2e5b36b44ef9124 SHA512 d7ffd82cbc1d75d049f4ee61615a2f346348268d4ec4768e98414eae0e6d1e330a079a4b5794017b49b7fdbd7a49e5f6bac2d4c8bfba565a3a45a164911324e5
+EBUILD cdf-3.9.0.ebuild 3634 BLAKE2B f590834974d3f8b37b47ca030c0d15316afff4b2a54818ca146a2e6bdd56fe1c54ec660a969b12e01f941c83a480953c1f0b5b75da38d52c253e677f0b449b46 SHA512 2d4eb742c28a1bf825b1dca32935554caa08dea4bc0aec8988a83b3f3247e0c9f4512ea1066dfe89932215511999101b1b9692b61a969e45a4b6c94ece281f3e
 MISC metadata.xml 1050 BLAKE2B fb46e44a9381f11bbb49a6d0429b7906026f68812064c2f6bf57d1445ed98c640659563cd323e5a6d22897a0a07af3ab60e23082d080111094ba607c97049e8b SHA512 e4e6c6a12b6fb7f12c165726c8238276e14b5873b6d476ae84935e6ba5c903b4214190ad778918d538825ff04280c174e2629e8e5b8424413085431eb7d449d0
diff --git a/sci-libs/cdf/cdf-3.8.0-r1.ebuild b/sci-libs/cdf/cdf-3.8.0-r1.ebuild
deleted file mode 100644
index 7a705868953c..000000000000
--- a/sci-libs/cdf/cdf-3.8.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic java-pkg-opt-2 multilib toolchain-funcs
-
-MY_DP="${PN}$(ver_cut 1)$(ver_cut 2)"
-MY_P="${MY_DP}_$(ver_cut 3)"
-
-DESCRIPTION="Common Data Format I/O library for multi-dimensional data sets"
-HOMEPAGE="https://cdf.gsfc.nasa.gov"
-SRC_BASE="https://spdf.gsfc.nasa.gov/pub/software/${PN}/dist/${MY_P}/unix/"
-
-SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz
-	java? ( ${SRC_BASE}/${MY_P}-dist-java.tar.gz )
-	doc? (
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ifd.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0crm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0csrm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0frm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0prm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0ug.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}0vbrm.pdf
-	)"
-
-LICENSE="CDF"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples java ncurses static-libs"
-RESTRICT="bindist"
-
-RDEPEND="
-	java? ( >=virtual/jre-1.8:= )
-	ncurses? ( sys-libs/ncurses:0= )
-"
-DEPEND="
-	${RDEPEND}
-	ncurses? ( virtual/pkgconfig )
-"
-
-S="${WORKDIR}/${MY_P}-dist"
-
-# respect cflags, ldflags, soname
-PATCHES=(
-	"${FILESDIR}"/${P}-respect-flags.patch
-)
-
-src_prepare() {
-	default
-
-	# use proper lib dir
-	sed -i \
-		-e "s:\$(INSTALLDIR)/lib:\$(INSTALLDIR)/$(get_libdir):g" \
-		Makefile || die "sed failed"
-}
-
-src_compile() {
-	# Reported upstream by email in 2024-03-22 (bug #862675)
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	PV_SO=${PV:0:1}
-	emake \
-		OS=linux \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		ENV=gnu \
-		SHARED=yes \
-		SHAREDEXT_linux=so.${PV_SO} \
-		CURSESLIB_linux_gnu="$(usex ncurses "$($(tc-getPKG_CONFIG) --libs ncurses)" "")" \
-		CURSES=$(usex ncurses) \
-		${myconf} \
-		all
-
-	if use java; then
-		export CDF_BASE="${S}"
-		export CDF_LIB="${S}/src/lib"
-		cd cdfjava/jni
-		$(tc-getCC) \
-			${CFLAGS} -fPIC \
-			-I${CDF_BASE}/src/include \
-			-I$(java-config -O)/include \
-			-I$(java-config -O)/include/linux \
-			-c cdfNativeLibrary.c \
-			-o cdfNativeLibrary.o \
-			|| die "compiling java lib failed"
-		$(tc-getCC) \
-			${LDFLAGS} \
-			-shared cdfNativeLibrary.o \
-			-Wl,-soname=libcdfNativeLibrary.so.${PV_SO} \
-			-L${CDF_LIB} -lcdf -lm \
-			-o libcdfNativeLibrary.so.${PV_SO} \
-			|| die "linking java lib failed"
-	fi
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	dodir /usr/bin /usr/$(get_libdir)
-	# -j1 (fragile non-autotooled make)
-	emake -j1 \
-		INSTALLDIR="${ED}/usr" \
-		SHAREDEXT=so.${PV_SO} \
-		install
-	dosym libcdf.so.${PV_SO} /usr/$(get_libdir)/libcdf.so
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/libcdf.a
-	dodoc Release.notes CHANGES.txt Welcome.txt
-	doenvd "${FILESDIR}"/50cdf
-
-	if use doc; then
-		dodoc "${DISTDIR}"/${MY_DP}{0{crm,csrm,frm,prm,ug,vbrm},ifd}.pdf
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc samples/*
-	fi
-
-	if use java; then
-		cd cdfjava || die
-		dolib.so jni/libcdfNativeLibrary.so.${PV_SO}
-		dosym libcdfNativeLibrary.so.${PV_SO} \
-			/usr/$(get_libdir)/libcdfNativeLibrary.so
-		java-pkg_dojar */*.jar
-		if use examples; then
-			docinto examples/java
-			dodoc examples/*
-		fi
-	fi
-
-	# move this to a better location
-	dodir "/usr/share/${PF}"
-	mv "${ED}/usr/CDFLeapSeconds.txt" "${ED}/usr/share/${PF}/" || die
-}
diff --git a/sci-libs/cdf/cdf-3.9.0.ebuild b/sci-libs/cdf/cdf-3.9.0.ebuild
index 041ee9765e53..9c0cc7667b48 100644
--- a/sci-libs/cdf/cdf-3.9.0.ebuild
+++ b/sci-libs/cdf/cdf-3.9.0.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}-dist"
 
 LICENSE="CDF"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples java ncurses static-libs"
 RESTRICT="bindist"
 
diff --git a/sci-libs/cdf/files/cdf-3.8.0-respect-flags.patch b/sci-libs/cdf/files/cdf-3.8.0-respect-flags.patch
deleted file mode 100644
index 8ffd226a1ed1..000000000000
--- a/sci-libs/cdf/files/cdf-3.8.0-respect-flags.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 9857fa9..6dc0953 100644
---- a/Makefile
-+++ b/Makefile
-@@ -896,7 +896,7 @@ install.tools: create.bin copy.tools
- install.help_: create.help copy.help
- 
- install.lib: create.lib copy.lib.a
--	@if [ -f $(LIBsrcDIR)/libcdf.so ] ; then \
-+	@if [ -f $(LIBsrcDIR)/libcdf.$(SHAREDEXT) ] ; then \
- 	   $(MAKE) MAKE=$(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
- 	 else \
- 	   $(NULL) ; \
-@@ -1010,10 +1010,10 @@ copy.include:
- 	      cp $(INCsrcDIR)/cdfconfig.h $(INSTALLDIR)/include
- 
- copy.lib.so:
--	@echo cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
--	      cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib/libcdf.$(VERSION).so
--	      rm -f $(INSTALLDIR)/lib/libcdf.so
--	      cd $(INSTALLDIR)/lib && ln -s libcdf.$(VERSION).so libcdf.so
-+	@echo cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
-+	      cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib/libcdf.$(VERSION).so
-+	      rm -f $(INSTALLDIR)/lib/libcdf.$(SHAREDEXT)
-+	      cd $(INSTALLDIR)/lib && ln -s libcdf.$(VERSION).so libcdf.$(SHAREDEXT)
- 
- copy.lib.sl:
- 	@echo cp $(LIBsrcDIR)/libcdf.sl $(INSTALLDIR)/lib
-diff --git a/src/lib/Makefile b/src/lib/Makefile
-index 2017c46..b666ce3 100644
---- a/src/lib/Makefile
-+++ b/src/lib/Makefile
-@@ -62,9 +62,9 @@ AR=ar
- RANLIBcmd=ranlib
- MACos=Darwin
- 
--CFLAGS=$(COPTIONS) $(PIC) -I$(INCLUDEcdf) -I$(ZlibDIR)
-+CFLAGS+=$(COPTIONS) $(PIC) -I$(INCLUDEcdf) -I$(ZlibDIR)
- CFLAGS2=-DZ_PREFIX
--LDFLAGS=$(LDOPTIONS)
-+LDFLAGS+=$(LDOPTIONS)
- ARFLAGS=$(AROPTIONS)
- ZLIB=zlib
- 
-@@ -120,13 +120,13 @@ ranlib.yes:
- 
- shared.yes: libcdf.$(SHAREDEXT)
- 
--libcdf.so \
-+libcdf.$(SHAREDEXT) \
- libcdf.dylib \
- libcdf.dll \
- libcdf.sl: $(OBJs)
- 	@if [ -f $@ ] ; then rm $@ ; else $(NULL) ; fi
--	@echo $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
--	      $(LD) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
-+	@echo $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libcdf.$(SHAREDEXT) -o $@ $(OBJs) $(SYSLIBS)
-+	      $(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libcdf.$(SHAREDEXT) -o $@ $(OBJs) $(SYSLIBS)
- #	@if [ $(MACVERSION) -gt 0 ]; then \
- #	  rm -f $(MACLIB)/$@; \
- #	  cp $@ $(MACLIB)/libcdf.$(VERSION).dylib; \
-@@ -134,8 +134,8 @@ libcdf.sl: $(OBJs)
- #	fi
- 
- libcdf.o: $(OBJs)
--	@echo $(CC) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
--	      $(CC) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
-+	@echo $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
-+	      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJs) $(SYSLIBS)
- 
- .c.o:
- 	@if [ "$<" = "cdfgzip.c" ] || [ "$<" = "cdfgzip64.c" ] ; then \
-diff --git a/src/tools/Makefile b/src/tools/Makefile
-index bac4ca0..ef44264 100644
---- a/src/tools/Makefile
-+++ b/src/tools/Makefile
-@@ -33,7 +33,7 @@
- SHELL=/bin/sh
- 
- CURSES=yes
--CCx=gcc
-+CCx=$(CC)
- COPTIONS=-I/usr/include/ncurses -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -O2
- COPTIONSld=
- SYSLIBS=-lgcc
-@@ -43,8 +43,8 @@ MAKE=make
- INCLUDEcdf= ../include
- 
- CC=$(CCx)
--CFLAGS=$(COPTIONS) -I$(INCLUDEcdf)
--CFLAGSld=$(COPTIONSld)
-+CFLAGS+=$(COPTIONS) -I$(INCLUDEcdf)
-+CFLAGSld=$(COPTIONSld) $(LDFLAGS)
- 
- WHICHOS=$(shell uname -a | cut -f1 -d" ")
- ifeq ("$(WHICHOS)","Darwin")
diff --git a/sci-libs/clblas/Manifest b/sci-libs/clblas/Manifest
index a86ef536b490..c6055fe29fb4 100644
--- a/sci-libs/clblas/Manifest
+++ b/sci-libs/clblas/Manifest
@@ -6,5 +6,5 @@ AUX clblas-2.12-reproducible-build.patch 669 BLAKE2B fb51f4ef1658becfa3e4e2e01af
 AUX clblas-2.12-use-boost-dynamic-libs.patch 597 BLAKE2B c65bfa09a6636041ef1816dc55c0a0874f747d49eb1ea5934dca5080dd86215ea40933cd156c2015eb73ba31a0c563343adf7048ac0eed03abfb3edbbeac6b46 SHA512 d32230ea4a707a78fd0e7d081176ee3d3cf814c749ae3eee4d4c1be8e08687eee458e1d538874ce47537a32832adaace8bf8918bf3ec37a3b63dcc35ce7f68d4
 AUX clblas-2.12-use-system-mathjax.patch 765 BLAKE2B ced4d5efddcaae15a5844bb2b2cdf32f03f117d394ee9daeffa5c4f0bc10310e7898a2c305774970263cc9e1d3d7e247d23cf477dea906d64af45395d6770807 SHA512 156a0a664bbab80a17f3032c759656769eee36db0a93e4fd4a983eb584ef56d2023aef37b565c8cf81adb507f00f6b83ca9d31ace66c620f2279ca82aa512744
 DIST clblas-2.12.tar.gz 1157445 BLAKE2B 27352a7775db94808ce21f2b4a39fe505d4f37be4305dc7fb5a4068a86d3f51a9e4863931f634150762b31256f9f7e8e5d0d8b70f404b5a9ddb8a489b800aea6 SHA512 5d9b0c58adde69e83d95e9c713e0cdc5f64785fe7e05553a14c57fa483c4ef39e9dc780c26880a7f15924967d5ce4ea29035c29d63eac7ee5a2ae5ddacac2b72
-EBUILD clblas-2.12-r2.ebuild 1993 BLAKE2B ac8ed52611244a1086ea5ea17fb817d026346f94ac3ecdc62ea536fc7ec2c2d88911094be0c1387a6d09fb936d6943f4819aa23cb61637bc5e48aa551db018bc SHA512 1d9930dfc0f5252b0dfa2912a85bb43285e3af69db604c9e58556212ecfd2385ddf03a453426839b8e94484bd96a1d562a180fa13ee6cf6d1cfaef62cff2c36a
+EBUILD clblas-2.12-r2.ebuild 1994 BLAKE2B 08b70f63c8ae94ba8927b4c04961bba17278f9094e10b8ed0c23ad995c728dc6511c687be89dff54398c838340f137ea9d8d36accb2abeb268fa72061c2bd08c SHA512 dbc9481249a64fb8d880d68aed47fcb7f48e70884d4a601fa4d58f01e239d08d67716d4c6d2429fc587853543075fdb4cb83fea15c3dda2853d82f9d4b142be2
 MISC metadata.xml 1030 BLAKE2B ab71e8e4f7afd42ee2b257d4c693a93f21161013a5a41626155866a4b02e50f321900ae5ae9f6a0e53faac7c5aed5d7593b765c28794f2d2e083870b01bb5207 SHA512 9dcb1147165ba6a8917256872552e9e2f7f1fdc3a504a9783f65a93436cfe4a53e99bea7197102ffdae1fd722c7b04f3fc9f3916fef14737719559a0a49b820e
diff --git a/sci-libs/clblas/clblas-2.12-r2.ebuild b/sci-libs/clblas/clblas-2.12-r2.ebuild
index 654c43bcf00f..72bfd21c224c 100644
--- a/sci-libs/clblas/clblas-2.12-r2.ebuild
+++ b/sci-libs/clblas/clblas-2.12-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DOCS_BUILDER="doxygen"
 DOCS_DEPEND="<dev-libs/mathjax-3"
 DOCS_CONFIG_NAME="clBLAS.doxy"
diff --git a/sci-libs/coinor-os/Manifest b/sci-libs/coinor-os/Manifest
deleted file mode 100644
index 6c9c8de196bd..000000000000
--- a/sci-libs/coinor-os/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX coinor-os-2.10.1-fix-c++14.patch 4301 BLAKE2B c2bdef9b3bb9e5b8b8d5a9a93abaf71bfe71fd73fe33407f1860e5a350fd51885d35570b1f515826226470f169fa7d5e5976af71226b042841776938d1030983 SHA512 03f53d5a72ad7eef7305fcbd8ee7c07469c418f0e351b7bd84ccba5be0a0395aa5843d84fc7575f5a489a4632dafb651669ef56e760be4c50e69f6c45e24d96e
-DIST OS-2.10.1.tgz 37106742 BLAKE2B 6cf206489e4a63c33a1610ca12d59fcb6607d58a053411d0f9cfa6896e85be82ec18387ffc2e8aae3bbff3326574e0938fdfae1ba96c3862c366d343149f559c SHA512 bfc0af075e0db2160db694ec1e6f69c36cd52b29449fcbd689c809db01a9cf5f6a8a59edb7fb7269db5757faa14da5cd9fef34dffc73de7b2953b35fc2b710f0
-EBUILD coinor-os-2.10.1.ebuild 1406 BLAKE2B 90a9cca0ea2b46d7501cf671d3c80510d781a3b018ea37cc1a5daa7ec1a7e566d9a475baa0e7cca23e09e33c8ee47e6d5e575a6c5dcd4bd1dbca3b5988fcb9f0 SHA512 0ccc1855a212a9901ab2b6644697b9725066b2ea1877f6e38b044d5608a004f286742ab6c4285488c61b98b94b2e3cf9aed65558c71a13038b737fd6962071ca
-MISC metadata.xml 549 BLAKE2B f55d4702c3de238bd0d4cce5f38318ece8d3d862f94cd38dacd6a922a7373d9697552b8c740b9cf2fef4166db29448ac3ed3e6d94ce5a17f99db2d550c57e5a2 SHA512 224196b29600d09e1f9110ac7777f82d2d6fdcc6be81af738f46ff88115c8d498382de9c4d67b5ecf22b33a5559305156774e96b8b60d1ecffc8d2f292326e80
diff --git a/sci-libs/coinor-os/coinor-os-2.10.1.ebuild b/sci-libs/coinor-os/coinor-os-2.10.1.ebuild
deleted file mode 100644
index ab0da7313b7b..000000000000
--- a/sci-libs/coinor-os/coinor-os-2.10.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-MY_PN=OS
-
-DESCRIPTION="COIN-OR Optimization Services"
-HOMEPAGE="https://projects.coin-or.org/OS/"
-SRC_URI="http://www.coin-or.org/download/source/${MY_PN}/${MY_PN}-${PV}.tgz"
-S="${WORKDIR}/${MY_PN}-${PV}/${MY_PN}"
-
-LICENSE="EPL-1.0"
-SLOT="0/6"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sci-libs/coinor-bcp:=
-	sci-libs/coinor-bonmin:=
-	sci-libs/coinor-couenne:=
-	sci-libs/coinor-clp:=
-	sci-libs/coinor-dylp:=
-	sci-libs/coinor-symphony:=
-	sci-libs/coinor-utils:=
-	sci-libs/coinor-vol:=
-	sci-libs/ipopt:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/doxygen[dot] )
-	test? ( sci-libs/coinor-sample )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10.1-fix-c++14.patch"
-)
-
-src_prepare() {
-	default
-
-	# needed for the --with-coin-instdir
-	dodir /usr
-}
-
-src_configure() {
-	append-cppflags -DNDEBUG
-
-	# Can be dropped > 2.10.3 as patches landed upstream but don't
-	# apply cleanly to 2.10.1.
-	# bug #808793
-	append-cxxflags -std=c++14
-
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		--enable-dependency-linking \
-		--with-coin-instdir="${ED%/}"/usr
-}
-
-src_install() {
-	default
-	use doc && dodoc doc/*.pdf
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/coinor-os/files/coinor-os-2.10.1-fix-c++14.patch b/sci-libs/coinor-os/files/coinor-os-2.10.1-fix-c++14.patch
deleted file mode 100644
index a788646abfe1..000000000000
--- a/sci-libs/coinor-os/files/coinor-os-2.10.1-fix-c++14.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Fix building with C++14, which errors out due to bool -> T* conversions
-and changed semantics caught by -Werror=terminate.
-
-See also: https://bugs.gentoo.org/show_bug.cgi?id=594180
-Patch partially taken from: https://projects.coin-or.org/OS/changeset/5137/
-
---- a/src/OSCommonInterfaces/OSInstance.cpp
-+++ b/src/OSCommonInterfaces/OSInstance.cpp
-@@ -165,6 +165,9 @@
- }

- 

- OSInstance::~OSInstance()

-+#if __cplusplus >= 201103L

-+    noexcept(false)

-+#endif

- {

-     std::ostringstream outStr;

- 

---- a/src/OSCommonInterfaces/OSInstance.h
-+++ b/src/OSCommonInterfaces/OSInstance.h
-@@ -2267,7 +2267,11 @@
-     OSInstance();

- 

-     /** The OSInstance class destructor */

--    ~OSInstance();

-+    ~OSInstance()

-+#if __cplusplus >= 201103L

-+    noexcept(false)

-+#endif

-+    ;

- 

-     /** the instanceHeader is implemented as a general file header object 

-      *  to allow sharing of classes between schemas 

---- a/src/OSCommonInterfaces/OSMatrix.cpp
-+++ b/src/OSCommonInterfaces/OSMatrix.cpp
-@@ -2297,7 +2297,7 @@
- 
-     if (!processBlocks(rowPartition, rowPartitionSize,
-                        colPartition, colPartitionSize, false, symmetry))
--       return false;
-+       return NULL;
-     return ExpandedMatrixByBlocks.back();
- }// end of MatrixType::getBlocks
- 
---- a/src/OSParsers/OSParseosil.tab.cpp
-+++ b/src/OSParsers/OSParseosil.tab.cpp
-@@ -180,7 +180,7 @@
- 
- #define GETATTRIBUTETEXT  	\
- 	for(; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ; \
--	if( *ch != '=') {  osilerror_wrapper( ch, osillineno, "found an attribute not defined"); return false;}  \
-+	if( *ch != '=') {  osilerror_wrapper( ch, osillineno, "found an attribute not defined"); return NULL;}  \
- 	ch++; \
- 	for(; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ;	\
- 	if(*ch == '\"'){ \
-@@ -196,7 +196,7 @@
- 	        *p = ch; \
- 	        for( ; *ch != '\''; ch++); \
- 	    } \
--	    else {  osilerror_wrapper( ch, osillineno,"missing quote on attribute"); return false;} \
-+	    else {  osilerror_wrapper( ch, osillineno,"missing quote on attribute"); return NULL;} \
- 	}\
- 	numChar = ch - *p; \
- 	attText = new char[numChar + 1]; \
-@@ -11070,7 +11070,7 @@
-     // eat the white space
-     for( ; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ;
-     for(i = 0; sizeOf[i]  == *ch; i++, ch++);
--    if(i != 6) {  osilerror_wrapper( ch,osillineno,"incorrect sizeOf attribute in <base64BinaryData> element"); return false;}    
-+    if(i != 6) {  osilerror_wrapper( ch,osillineno,"incorrect sizeOf attribute in <base64BinaryData> element"); return NULL;}    
-     // ch should be pointing to the first character after sizeOf
-     GETATTRIBUTETEXT;
-     ch++;
-@@ -11080,7 +11080,7 @@
-     // eat the white space
-     for( ; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ;
-     // better have an > sign or not valid
--    if(*ch != '>' ) {  osilerror_wrapper( ch,osillineno,"<base64BinaryData> element does not have a proper closing >"); return false;}
-+    if(*ch != '>' ) {  osilerror_wrapper( ch,osillineno,"<base64BinaryData> element does not have a proper closing >"); return NULL;}
-     ch++;
-     // we are now pointing start of the data
-     const char *b64textstart = ch;
-@@ -11089,7 +11089,7 @@
-     const char *b64textend = ch;
-     // we should be pointing to </base64BinaryData>
-     for(i = 0; endBase64BinaryData[i]  == *ch; i++, ch++);
--    if(i != 18) { osilerror_wrapper( ch,osillineno," problem with <base64BinaryData> element"); return false;}
-+    if(i != 18) { osilerror_wrapper( ch,osillineno," problem with <base64BinaryData> element"); return NULL;}
-     int b64len = b64textend - b64textstart;
-     b64string = new char[ b64len + 1]; 
-     for(ki = 0; ki < b64len; ki++) b64string[ki] = b64textstart[ ki]; 
-@@ -11097,7 +11097,7 @@
-     // burn the white space
-     for( ; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ;
-     // better have an > sign or not valid
--    if(*ch != '>' ) {  osilerror_wrapper( ch,osillineno,"</base64BinaryData> element does not have a proper closing >"); return false;}
-+    if(*ch != '>' ) {  osilerror_wrapper( ch,osillineno,"</base64BinaryData> element does not have a proper closing >"); return NULL;}
-     ch++;
-     for( ; ISWHITESPACE( *ch) || isnewline( *ch, osillineno); ch++ ) ;
-     *p = ch;
diff --git a/sci-libs/coinor-os/metadata.xml b/sci-libs/coinor-os/metadata.xml
deleted file mode 100644
index ba6fc02b9b6f..000000000000
--- a/sci-libs/coinor-os/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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 lang="en">
-		The objective of Optimization Services (OS) is to provide a set of
-		standards for representing optimization instances, results, solver
-		options, and communication between clients and solvers in a
-		distributed environment using Web Services.
-	</longdescription>
-</pkgmetadata>
diff --git a/sci-libs/dlib/Manifest b/sci-libs/dlib/Manifest
index 47a9d130c938..aa69dda4258e 100644
--- a/sci-libs/dlib/Manifest
+++ b/sci-libs/dlib/Manifest
@@ -1,5 +1,3 @@
 DIST dlib-19.24.2.tar.gz 22252165 BLAKE2B cd6a911e16d9ff6cf94a4334e84983a9c48da42e3f696de20fb28a5bba9720507ec19ddc984bb753288f86359a1c19cdf15ed29f18c43769a1c17d3177d8dedf SHA512 a38a3079c169b16d81d7aca9fc294bcd63bd2dc1a21573f9141ca310542da3629b6523fa6f348be8b41bf5b478c0846a13a4c3fee77f1ac38dfbfc4a01effb57
-DIST dlib-19.24.tar.gz 10863367 BLAKE2B eda85c6ec38fcf212754aae2cdb68539425028735b5148a2f6668ac19f2583129585a7101b74fe202fbfa3d3d2f09e533805a82f8291540919a7eb11483812e8 SHA512 f6ef2fec0977782cdcc15c6340bd91e3471294332de391405f14d86e9fd0cfcc8195fbf5b702f8d269a90b06db23a8134d112ed3fcfb780ff0433d988c41d199
-EBUILD dlib-19.24.2.ebuild 2513 BLAKE2B a593d1d7842022e8b58650a1cfd9ed8b0bcd3b4c8e058e3846cf43fac4bce02664a6914274f783b49ad455edefa6eb066eb073d998d1f86b6ab5ae9aa91426b4 SHA512 45a7c8e72572a336d874cabd125695028c369dedee5974b73ae3f7285e789c43f1e02f09b93548d40786b83f80ededa1dee6ebabed1cdf858dab376407b15ac2
-EBUILD dlib-19.24.ebuild 2513 BLAKE2B 8faf0274b9ef05963a34b12c2bd47fdf89999d0af7cde697ad671b5de39b565a0b23ca555c1824575781e6bd2cf9fe2cbe8e55673e74ecc14e67ec5ab768b342 SHA512 d3934515077f1d3810bf7dbec5c37b480c615ce24075ef0048c3076eeaf1122d32f1d241620f77231c2fc6c508bb074b9bf886055e639a77298060b3c8eb7b6a
+EBUILD dlib-19.24.2.ebuild 2530 BLAKE2B 6bd30eae48a08ba1626a021766104f476d7e566f24efb93d236ca8a4413577406b29a811d97f49064fef96e9fbf8d63d82df30b4c8284ca35e16caecf8336d59 SHA512 69ec18776c92dc7d8bff65adc33624dd6b0f5fcef6ad30d9681838b02a5b67bd60f07689ddd5b6f3a093f324af4f321e25e96e20b6bacf17121d985531c759d9
 MISC metadata.xml 1003 BLAKE2B 3c4e623c6abbd4d1ec8a9402009b2d01e6edb547bfd24f03c27853d0386170833553feecc7b0f6b751a3ad4e52f0575a4a87fbcf801a0952fc3d4e5c77645a43 SHA512 2c59cabd74e9433b9b31b96d1f476c2c9200cce51960c09de5ebd7aabbfe4cff1f4449a6a9ecaaf1907f58dd12c04039a9f58f69f2d036bc18bf82b4438cbc01
diff --git a/sci-libs/dlib/dlib-19.24.2.ebuild b/sci-libs/dlib/dlib-19.24.2.ebuild
index dd936a0dc155..f7967da999d3 100644
--- a/sci-libs/dlib/dlib-19.24.2.ebuild
+++ b/sci-libs/dlib/dlib-19.24.2.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
 inherit cmake cuda distutils-r1
 
diff --git a/sci-libs/dlib/dlib-19.24.ebuild b/sci-libs/dlib/dlib-19.24.ebuild
deleted file mode 100644
index 7390b5b72a3d..000000000000
--- a/sci-libs/dlib/dlib-19.24.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=1
-inherit cmake cuda distutils-r1
-
-DESCRIPTION="Numerical and networking C++ library"
-HOMEPAGE="http://dlib.net/"
-SRC_URI="https://github.com/davisking/dlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cblas cuda debug examples gif jpeg lapack mkl png python sqlite test X cpu_flags_x86_avx cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
-REQUIRED_USE="python? ( png ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# doc needs a bunch of deps not in portage
-RDEPEND="
-	cblas? ( virtual/cblas )
-	cuda? ( dev-libs/cudnn:= )
-	gif? ( media-libs/giflib:= )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	png? ( media-libs/libpng:0= )
-	python? ( ${PYTHON_DEPS} )
-	sqlite? ( dev-db/sqlite:3 )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	python? (
-		${DISTUTILS_DEPS}
-		test? (
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-DOCS=( docs/README.txt )
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-	cmake_src_prepare
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDLIB_ENABLE_ASSERTS=$(usex debug)
-		-DDLIB_ENABLE_STACK_TRACE=$(usex debug)
-		-DDLIB_GIF_SUPPORT=$(usex gif)
-		-DDLIB_JPEG_SUPPORT=$(usex jpeg)
-		-DDLIB_PNG_SUPPORT=$(usex png)
-		-DDLIB_LINK_WITH_SQLITE3=$(usex sqlite)
-		-DDLIB_NO_GUI_SUPPORT=$(usex X OFF ON)
-		-DDLIB_USE_BLAS=$(usex cblas)
-		-DDLIB_USE_CUDA=$(usex cuda)
-		-DDLIB_USE_LAPACK=$(usex lapack)
-		-DUSE_AVX_INSTRUCTIONS=$(usex cpu_flags_x86_avx)
-		-DUSE_SSE2_INSTRUCTIONS=$(usex cpu_flags_x86_sse2)
-		-DUSE_SSE4_INSTRUCTIONS=$(usex cpu_flags_x86_sse4_1)
-	)
-	cmake_src_configure
-	use python && distutils-r1_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use python && distutils-r1_src_compile
-}
-
-src_test() {
-	(
-		local BUILD_DIR="${BUILD_DIR}"/dlib/test
-		mkdir -p "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" >/dev/null || die
-
-		local CMAKE_USE_DIR="${S}"/dlib/test
-		cmake_src_configure
-		cmake_build
-
-		./dtest --runall || die "Tests failed"
-	)
-
-	use python && distutils-r1_src_test
-}
-
-python_test() {
-	epytest
-}
-
-src_install() {
-	cmake_src_install
-	use python && distutils-r1_src_install
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 38a4b78b01a9..9e5b48788342 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -9,5 +9,5 @@ EBUILD geos-3.11.0.ebuild 935 BLAKE2B a054f82c6d3e44245c0ba284e3134dcbbe139ae2a6
 EBUILD geos-3.11.1.ebuild 986 BLAKE2B f6956a71348a995d08bf40be451c341b0403cbb81499aa447e9929a1e1417ed2dcca293ba78915fd2097b1528273224b7abcd0cb516820150c14af664a78cc7f SHA512 e23f87064e8336ea774dab0af267500d6263c5641d10ef0e86dc97b0e9ff57d30e8ed8701aba19b992f10ff78803a244de1c3c41405001889a6573b734aa1f90
 EBUILD geos-3.11.2.ebuild 1101 BLAKE2B 83257453288cc6420aed5bf1d9559351175841b1d3748fac3132b511d2a92041ae06d66d36d5beb55f995561a1c6e56e71095ae62df1d6260f4ecb49227dfe64 SHA512 396911db1b815fe83a4176fcdac0b64d46345116bee84d539a18f4382f9fbcd45975b5b42be45eda40017421612a978c7483cbf26a7aeae67bf08684ec8532c4
 EBUILD geos-3.12.0.ebuild 1059 BLAKE2B 69f2ca6137771ef8fdb3bc41476fefd0a0fda8306e7c14aad4b3d2957787dfadb1a23678cd0145143ac2db0db087310c4a099eb6db67d8ddf50f6ccdb080684e SHA512 bb3f4b542f7f673844823052ede3b42c0d3f8dd94b557adf8713dc35e6636554dae00fbaba19fcd71795cb053d0b0974c998bdb2d5211165547da11377670101
-EBUILD geos-3.12.1.ebuild 1059 BLAKE2B 69f2ca6137771ef8fdb3bc41476fefd0a0fda8306e7c14aad4b3d2957787dfadb1a23678cd0145143ac2db0db087310c4a099eb6db67d8ddf50f6ccdb080684e SHA512 bb3f4b542f7f673844823052ede3b42c0d3f8dd94b557adf8713dc35e6636554dae00fbaba19fcd71795cb053d0b0974c998bdb2d5211165547da11377670101
+EBUILD geos-3.12.1.ebuild 1055 BLAKE2B 9d174c0caadfaa1ae157e41e9357bc7c35876797bf885faf5512cfe6636e58d1ab452501ce63386c83f41cb97a063b1c1406f98b3f637f5e6c4ce14d8790e5c8 SHA512 ad925ea7b20df070d2798a4ea5ed5dabea06dd25633ab4e5e9779d9aaf5a064b75ea77917d1006b901ef1bc726899b010f377dc9a194f43315859ab16f8560c9
 MISC metadata.xml 990 BLAKE2B 7ad10fb1fcd8f933626c7a4d943070e147e6ff7776c4c57960cb42433c102036fdd724fd7288ea40aafe99c3255490fe304bfc4932e0c866349a38703c3990eb SHA512 1a2e4778017e909088675a9fc4e27e5b4e4aee4ec82708dd9ad9e3abfc8ce44f68bc19e70ab9de7543caf8379b151c40a2cdbe5e3a599216b201ef2fae8d4452
diff --git a/sci-libs/geos/geos-3.12.1.ebuild b/sci-libs/geos/geos-3.12.1.ebuild
index 71105c249023..5513f40dd523 100644
--- a/sci-libs/geos/geos-3.12.1.ebuild
+++ b/sci-libs/geos/geos-3.12.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/ginkgo/Manifest b/sci-libs/ginkgo/Manifest
index f817a18c8c0e..691c3bc4d6a1 100644
--- a/sci-libs/ginkgo/Manifest
+++ b/sci-libs/ginkgo/Manifest
@@ -4,7 +4,7 @@ AUX ginkgo-1.8.0-disable_automagic_dependencies.patch 784 BLAKE2B 30ae35f0adec6a
 DIST ginkgo-1.4.0.tar.gz 2574052 BLAKE2B 99677d9d75831991cac40312095d32c44bef18cd05b120d80fdb9e64ea6dc15796c09b26f35dc8230db6b55c7be4dd76efd6d1cd8ca13c83e1f3087550db0dca SHA512 9bfcb2c415c7a1a70cf8e49f20adf62d02cab83bb23b6fcecfeaeeb322b2d4e1ad8d8fa6582735073753f9a05eac8688b9bd1ff1d4203957c1a80702d117e807
 DIST ginkgo-1.6.0.tar.gz 12788830 BLAKE2B c452e20eddb3673b5863106d8a8d42aab253cb5a17cf0445194903ebadcffe53ef0df6b5f26e2602e137faaa4a23dddd0b192f3453b4bd440907385fc09d004a SHA512 507a17bc9ad010c235c4ae49ac4bef3f4d5b65b4ea02bfa5cad5ea578fa65d28f564d1faf0a1f5618a6e72d744217f58bdff68c5f1fffc9cfb484800f7f84c50
 DIST ginkgo-1.8.0.tar.gz 13140660 BLAKE2B 4b1800566ec2852b3dd7e58b01ec58e2cab45b55134fdf3d478832435c40b45320dc066d281a07127d1fc42e57c6f3d99440209d2286adc1294e44a1f660ad36 SHA512 9d121a5eec9f5d17d1bd4b8924ebb32985a68e8087addc7385b619e365ed260a40ab73eb7a8a16f46a590d3162a78c9311ff41dd3dc74a9117a61e0445d96c52
-EBUILD ginkgo-1.4.0-r3.ebuild 1267 BLAKE2B 509ac83701e30924c09f1ff6b4c56e6c2ebebec69e8debc96fbaafa3110a6cc81437f81ad20d77ef7b9cf6341be87e82bcea20fd0191b6baf5c8f32909eca037 SHA512 1801ec71a30814acd8e521e313a722ce472edffb20d10cd627093360ab62b9ee10d09e27dd4ffdeff0bd8f153e636d9fad45268a262e1619d3def6cd952e7965
-EBUILD ginkgo-1.6.0.ebuild 1381 BLAKE2B 303537467c4e8e92c0c0bc92d327eed70174486ed27c01ddc879557c619a0bb9cae4ef252736ac99cc597df3ee1ad98804d5e122b9690fa808b5307a7b46c978 SHA512 c79400621aa3b8db866017e8814d85a9107fe10e7ae620238227216b7baee16bc38e6540d7d907879c1c249b7afb6bd40fd13d58e9312fc391e1884e95e52d58
-EBUILD ginkgo-1.8.0.ebuild 1337 BLAKE2B 57a133ffa7187422448f9d44923a51592f37e18cce870810224e92eae165983e03e4b2c7d91e7dfc10577b336c3d833edef1f4db726edecc64ad2e251bcd4c52 SHA512 34a3467578595494834097d89d7cb7f4b4d02ffa2cbec1d86dd996df17a0f1eddefed3a409d6e2d7f846b6a2dd12fea3e4c91a419ebc398a6ab328d4f640d6f7
+EBUILD ginkgo-1.4.0-r3.ebuild 1309 BLAKE2B 8936697638a5b469146128bc8feff5ec68a373970ee7590dab160e9dbc45f344355b6a925fece27619b13c8ed73bc7a0934686343052897136adbc4c29f0be4a SHA512 8f72990eec34f0b916994086328f72ec3bb5c96ffaa307569bc459c6fb9a945331221005e1b4af125f6e5728c43100fd234c2e624cc5328dc753b2fbac393c87
+EBUILD ginkgo-1.6.0.ebuild 1423 BLAKE2B 0af51aca71d86f7daf683b27858f1478af5783403730b936026e83fea23599deca195f97fed110486d9539ce498909e945db2401ca7c940299a453582028e787 SHA512 2c63ea02cab0e157bf7e96b99a2b28b712bd510c72d6ad60541c3dbdee63a6f95c6bcc41a88de82a52230d52fc14468ccb57bff9b671e1536a2271c85d81dbbc
+EBUILD ginkgo-1.8.0.ebuild 1379 BLAKE2B 85e487eb78a3034988d8a94cecf31849858ec2ea3fada99c1c5e53dea4e2c41f4425ed524092677120f39f8f65be3956ac696c6fa5816512b749105b7e9b765e SHA512 fcf98f693cc9b86f2fd473b462608579b3188a136b26ad7cf438f472e4a057f9cb330d55709d7cfc03079203d259fa3dc48c396f39465681557c861e40d42385
 MISC metadata.xml 892 BLAKE2B cedbb29c9e43c4b94baff1c5c7f657e9120792fe5faf0b4dab621b17579c6c82ccc3c07ee216bf45cc83b12d44fdcedaaf0736b56611b6abcb114224c2070856 SHA512 2051aabc0746015724bb7bf3f9be42097990b5a7d2657f51f8ed448e2b7f8f6ac27be208d33f133bf1098f2785b4b1b6eac27244e05337e4b80ffdfda10ec664
diff --git a/sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild b/sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild
index abd270c911c4..0a4e3d5aea71 100644
--- a/sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild
+++ b/sci-libs/ginkgo/ginkgo-1.4.0-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake toolchain-funcs
+inherit cmake flag-o-matic toolchain-funcs
 
 DESCRIPTION="Numerical linear algebra software package"
 HOMEPAGE="https://ginkgo-project.github.io/"
@@ -34,16 +34,15 @@ pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
-src_prepare() {
-	sed -i \
-		-e "s#\"lib\"#\"$(get_libdir)\"#g" \
-		-e "s#\"lib/#\"$(get_libdir)/#g" \
-		cmake/install_helpers.cmake || die "sed failed"
-
-	cmake_src_prepare
-}
-
 src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/862705
+	# https://github.com/ginkgo-project/ginkgo/issues/1657
+	#
+	# Do not trust it with LTO either.
+	append-flags -fno-strict-aliasing
+	filter-lto
+
 	local mycmakeargs=(
 		-DGINKGO_DEVEL_TOOLS=OFF
 		-DGINKGO_BUILD_TESTS=OFF
diff --git a/sci-libs/ginkgo/ginkgo-1.6.0.ebuild b/sci-libs/ginkgo/ginkgo-1.6.0.ebuild
index 4cceeb06c5b6..c08e881a46e3 100644
--- a/sci-libs/ginkgo/ginkgo-1.6.0.ebuild
+++ b/sci-libs/ginkgo/ginkgo-1.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake toolchain-funcs
+inherit cmake flag-o-matic toolchain-funcs
 
 DESCRIPTION="Numerical linear algebra software package"
 HOMEPAGE="https://ginkgo-project.github.io/"
@@ -39,16 +39,15 @@ pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
-src_prepare() {
-	sed -i \
-		-e "s#\"lib\"#\"$(get_libdir)\"#g" \
-		-e "s#\"lib/#\"$(get_libdir)/#g" \
-		cmake/install_helpers.cmake || die "sed failed"
-
-	cmake_src_prepare
-}
-
 src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/862705
+	# https://github.com/ginkgo-project/ginkgo/issues/1657
+	#
+	# Do not trust it with LTO either.
+	append-flags -fno-strict-aliasing
+	filter-lto
+
 	local mycmakeargs=(
 		-DGINKGO_DEVEL_TOOLS=OFF
 		-DGINKGO_BUILD_TESTS=OFF
diff --git a/sci-libs/ginkgo/ginkgo-1.8.0.ebuild b/sci-libs/ginkgo/ginkgo-1.8.0.ebuild
index 5b507b79f030..028c8cdc3a77 100644
--- a/sci-libs/ginkgo/ginkgo-1.8.0.ebuild
+++ b/sci-libs/ginkgo/ginkgo-1.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake toolchain-funcs
+inherit cmake flag-o-matic toolchain-funcs
 
 DESCRIPTION="Numerical linear algebra software package"
 HOMEPAGE="https://ginkgo-project.github.io/"
@@ -38,16 +38,15 @@ pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
-src_prepare() {
-	sed -i \
-		-e "s#\"lib\"#\"$(get_libdir)\"#g" \
-		-e "s#\"lib/#\"$(get_libdir)/#g" \
-		cmake/install_helpers.cmake || die "sed failed"
-
-	cmake_src_prepare
-}
-
 src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/862705
+	# https://github.com/ginkgo-project/ginkgo/issues/1657
+	#
+	# Do not trust it with LTO either.
+	append-flags -fno-strict-aliasing
+	filter-lto
+
 	local mycmakeargs=(
 		-DGINKGO_DEVEL_TOOLS=OFF
 		-DGINKGO_BUILD_TESTS=OFF
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 306fb6709bbe..330e8eedaec8 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -2,6 +2,6 @@ AUX gsl-2.7.1-configure-clang16.patch 806 BLAKE2B 5b3552d9ad70de9100a77cdf822fc6
 AUX gsl-2.7.1-test-tolerance.patch 1700 BLAKE2B 5964fe42d8238dbb4d508f5bdce6246311d403fcbdaf44c1f691e94d26cdfb8e8370df5f9fb2ae5a4b212f67954c553a089020e9846cced321ba8b1157182a84 SHA512 9acaf4690418e0dd87ced481d696f1034d74b09d851241ac21895740330dd8f3d237f0526476923af7f7d9fb852c09f0c64d78f98b277fd134d0ac2bf34b8afd
 DIST gsl-2.7-cblas.patch.bz2 12073 BLAKE2B 71f2bdafdb1f42ca5c3515f8e39266242185218495705018d88e523be9bc776b39749156500cdc5746a16e481e9cfe2b79660e250eb1a70f3b18819d16fe11c5 SHA512 5b9b2a798079610d7d4981b83672cc978ed44b66aaf6e671794685f10bd4069764bb358870019dc0eec1e251639cde12aaa3598cae0e2fc050ea39c79435fe2f
 DIST gsl-2.7.1.tar.gz 7509209 BLAKE2B dd216c2fdb536e57b6e29613e46e1a05183fd18c47434039caac68fefffc0390cfe2f21eb117347d4bbdf9004de837ef2db02c17c01eaea4b615e3e45a4fd90f SHA512 3300a748b63b583374701d5ae2a9db7349d0de51061a9f98e7c145b2f7de9710b3ad58b3318d0be2a9a287ace4cc5735bb9348cdf48075b98c1f6cc1029df131
-EBUILD gsl-2.7.1-r2.ebuild 1348 BLAKE2B 4a22ec3920aa67b3bdabf0ccba5d7bda8a3d99bdebe5a0888c644d282ce34096d26a159dfec002b0758d4887cff44ba9d2be2d00f5d616418ee521b5e0d80445 SHA512 d11fc8e417cbccc36d48c7460cb8331e74dba8cefa31495ca95bea13939569925f3536a6feb4e17bf35f1c5ddd04ac1b608cadf489624c190af7fb31526026cf
-EBUILD gsl-2.7.1-r3.ebuild 1403 BLAKE2B aadafa4820e042c9267291be517eda6367fa7be97e84b84b7c1fd21af9aa3f53ff6e009982858cd7f189ab98c4319ca8df965d9f8ebcf8f2909c74b0194def68 SHA512 b1b4e516c49fef9249843ac85546fe83c0a9492c0a3e3240bf538a3b2f41a83ee730a533a29a3668ee8113161012f8d1ffc87a6ceaa0b2fcbacade8fdcd06b40
+EBUILD gsl-2.7.1-r2.ebuild 1467 BLAKE2B d7b73dfc183cddeeadbf0c61ebc6976f64bd605795762f213367d6fe584fc3c4da4664857c4253c2ff12a46e4cbbe36569b47cca24b5497113a43c7c5cb0f780 SHA512 55cf47befd8f6d1d57fa0e87b7c28021621e9cb2b275deeb035084c692eea89bdb6e025f4b2e08403a782627e87f94fda6fcd4d19fde055f4ca9c0cf3b4c161e
+EBUILD gsl-2.7.1-r3.ebuild 1522 BLAKE2B ed3eed60f8a658b1c9108660530836887e3394f171b24057aba98a3053fd77c1ea382dd3dab28bc7387441ad3bd97209f40113c3156f81a1b0196c7e40a1209b SHA512 6e53def8d071726f1481ee5e112d69776a66ae3f4d97703fc8f773821016872df1093e4be404b437043efe888261170f50bf7efda37aa88ef038fc791c4e9480
 MISC metadata.xml 1339 BLAKE2B 65c2b4eb597ccc4fe4ffb92d37e5800af6f9136fb3186bef0167d52584565faca0778ef775c0e736508cdf8eb480d26bc9a74dc799f37ff6fcd2131410f1660c SHA512 f8201bb6adb83ba875315a2201a97e1653d08665f5889d3fde83cb7ff196ae9f904372552d980b5e3c210e5aa855915827c1af32255539cab236e2b938d39888
diff --git a/sci-libs/gsl/gsl-2.7.1-r2.ebuild b/sci-libs/gsl/gsl-2.7.1-r2.ebuild
index 62c11d0d8578..ddc7239a72ce 100644
--- a/sci-libs/gsl/gsl-2.7.1-r2.ebuild
+++ b/sci-libs/gsl/gsl-2.7.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,6 +36,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/927585
+	#
+	# Testsuite issue. Seems fixed in 2.8.
+	filter-lto
+
 	filter-flags -ffast-math
 
 	if use cblas-external; then
diff --git a/sci-libs/gsl/gsl-2.7.1-r3.ebuild b/sci-libs/gsl/gsl-2.7.1-r3.ebuild
index 81205249e873..e3b8d92fe484 100644
--- a/sci-libs/gsl/gsl-2.7.1-r3.ebuild
+++ b/sci-libs/gsl/gsl-2.7.1-r3.ebuild
@@ -37,6 +37,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/927585
+	#
+	# Testsuite issue. Seems fixed in 2.8.
+	filter-lto
+
 	filter-flags -ffast-math
 
 	if use cblas-external; then
diff --git a/sci-libs/h5hut/Manifest b/sci-libs/h5hut/Manifest
deleted file mode 100644
index 92e352ab909d..000000000000
--- a/sci-libs/h5hut/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX h5hut-1.99.13-autotools.patch 2809 BLAKE2B de8b47ec4dd418cd3c6e5c7670c11fb913c40d92a6ad9dbd75125443e5e827fecb4d21b5551f69355c5da6acb2159a095f448c2e063ac5014138de3321b830f8 SHA512 05200ef8073c1c39e322015e9d4b9764c470336f704c8f86e056d1936de669f256c64baf94307d84f4574d1204f914abffa9b134942e354f474c51dc0b78c05c
-AUX h5hut-1.99.13-mpio.patch 574 BLAKE2B 063729a01cd992fab481871210e0f6c63f2b93cd8f41e7ee11d84e2572e46945b1934a52514376700c4f4e25b142279591698f53067b9398f1290113be5e3399 SHA512 9335f2d84c4353123e1c1af5f82a729322cacd6f0bfa95ccbe042b76693f035c5b2860d788d31063299e3705addd6160b4b985be88beba341bee56a397387919
-DIST H5hut-1.99.13.tar.gz 3029357 BLAKE2B 555d1f89ff60fbd72763026643ae76d5f68bb9d76bfd2fb29d846e3c777184db3be1bae98763ae683e72566e2624678118eea0da8d0bc1e57b84fd0b4777abe7 SHA512 c2590795c45ecf5e642308f5b36c4e573fdcbb6e985f5867c13fd9e1f0ddd9b48fbc423ad0165b8f047256e42a1eb54d508c9322a593bcfad3a2769547d2887a
-EBUILD h5hut-1.99.13-r1.ebuild 790 BLAKE2B 09575e246784c9824cf00cc85660544a9c6edfe280677bdaae9531491a793e0af2e2dfdfc146dd90417a32d1c7c60dfbea4af05d2c469db8625b7428446dd558 SHA512 5541f0e4b059dfb8e77b0aface99028545b5e89459784186de315fd3b4866c9021ece71f6df28ba83ca1168a6aa8aa9eb23c95f8e24064d02edb528085a469f5
-MISC metadata.xml 254 BLAKE2B b855316ec6a32691e84730979c9a077765d46802f09c19f3a06f2cddf677674c9a2ea24c9b57a0fc6344d7f70276ca507a68f5fa690555360665ac494fca54c2 SHA512 5f6faacd216c7ece09e847c09115add5261e7a899e0b0c9304f2ee72e2d0ad208338939e4e37946008bdc81fbbacf415fb220c5c1f9832b17f18c6778d0c0368
diff --git a/sci-libs/h5hut/files/h5hut-1.99.13-autotools.patch b/sci-libs/h5hut/files/h5hut-1.99.13-autotools.patch
deleted file mode 100644
index 262aa61461a3..000000000000
--- a/sci-libs/h5hut/files/h5hut-1.99.13-autotools.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Naur H5hut-1.99.13.orig/src/Fortran/Makefile.am H5hut-1.99.13/src/Fortran/Makefile.am
---- H5hut-1.99.13.orig/src/Fortran/Makefile.am	2017-07-02 16:46:44.899690038 -0600
-+++ H5hut-1.99.13/src/Fortran/Makefile.am	2017-07-02 16:53:46.414587073 -0600
-@@ -49,9 +49,6 @@
- 	awk '/INTEGER\*8 :: /{print "\t" $$0}' $^ >$@
- 	awk '/PARAMETER /{print "\t" $$0}' $^ >> $@
- 	awk '/INTEGER\*8 FUNCTION/{print "\t" $$1 " " $$3}' $^ >>$@
--
--all-local: $(top_srcdir)/src/include/H5hutF.h
--	$(INSTALL) -m644 .libs/libH5hutF.a $(top_srcdir)/src/lib
- endif
- 
- clean: clean-am
-diff -Naur H5hut-1.99.13.orig/src/h5core/Makefile.am H5hut-1.99.13/src/h5core/Makefile.am
---- H5hut-1.99.13.orig/src/h5core/Makefile.am	2017-07-02 16:46:44.899690038 -0600
-+++ H5hut-1.99.13/src/h5core/Makefile.am	2017-07-02 16:58:03.017839542 -0600
-@@ -89,15 +89,10 @@
- 
- libH5hut_la_LDFLAGS = -version-info 2:0:0
- 
--all-local:
--	$(INSTALL) -m0755 -d $(top_builddir)/src/lib
--	$(INSTALL) -m644 .libs/libH5hut.a $(top_builddir)/src/lib
--
- install-exec-local:
- 	@$(INSTALL) -d $(DESTDIR)$(includedir)/h5core
- 	@$(INSTALL) -m644 $(top_srcdir)/src/include/h5core/*.h $(DESTDIR)$(includedir)/h5core/
- 
- clean-local:
--	$(RM) -f $(top_srcdir)/src/lib/libH5hut.*
- 	$(RM) -f *~
- 
-diff -Naur H5hut-1.99.13.orig/test/Makefile.am H5hut-1.99.13/test/Makefile.am
---- H5hut-1.99.13.orig/test/Makefile.am	2017-07-02 16:46:44.919690283 -0600
-+++ H5hut-1.99.13/test/Makefile.am	2017-07-02 16:58:01.297818301 -0600
-@@ -1,10 +1,9 @@
- # test level Makefile.am
- 
- AM_CPPFLAGS += -I$(top_srcdir)/src/include
--AM_LDFLAGS += -L${abs_top_builddir}/src/lib
- 
- LDADD =
--LDADD += -lH5hut
-+LDADD += ../src/h5core/libH5hut.la
- 
- noinst_PROGRAMS =
- 
-diff -Naur H5hut-1.99.13.orig/tools/Makefile.am H5hut-1.99.13/tools/Makefile.am
---- H5hut-1.99.13.orig/tools/Makefile.am	2017-07-02 16:46:44.919690283 -0600
-+++ H5hut-1.99.13/tools/Makefile.am	2017-07-02 16:59:30.228916458 -0600
-@@ -8,10 +8,9 @@
- 
- AM_CPPFLAGS += -I${abs_top_builddir}/src/include -Wno-deprecated
- FFLAGS += -cpp $(AM_CPPFLAGS)
--AM_LDFLAGS += -L${abs_top_builddir}/src/lib
- 
- LDADD =
--LDADD += -lH5hut
-+LDADD += ../src/h5core/libH5hut.la
- 
- if ENABLE_C
- EXTRA_SCRIPTS = # h5hutcc
-diff -Naur H5hut-1.99.13.orig/tools/vtk2h5grid/Makefile.am H5hut-1.99.13/tools/vtk2h5grid/Makefile.am
---- H5hut-1.99.13.orig/tools/vtk2h5grid/Makefile.am	2017-07-02 16:46:44.919690283 -0600
-+++ H5hut-1.99.13/tools/vtk2h5grid/Makefile.am	2017-07-02 16:58:58.978530564 -0600
-@@ -1,10 +1,9 @@
- AM_CPPFLAGS = -I${abs_top_srcdir}/src/include -Wno-deprecated
- FFLAGS += -cpp $(AM_CPPFLAGS)
--LDFLAGS += -L${abs_top_builddir}/src/lib
- 
- LDADD = 
- 
--LDADD += -lH5hut -lvtkIO -lvtkFiltering -lvtkCommon -lvtksys -lpthread -ldl
-+LDADD += ../src/h5core/libH5hut.la -lvtkIO -lvtkFiltering -lvtkCommon -lvtksys -lpthread -ldl
- 
- 
- bin_PROGRAMS = 
diff --git a/sci-libs/h5hut/files/h5hut-1.99.13-mpio.patch b/sci-libs/h5hut/files/h5hut-1.99.13-mpio.patch
deleted file mode 100644
index a94c8e59000f..000000000000
--- a/sci-libs/h5hut/files/h5hut-1.99.13-mpio.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur H5hut-1.99.13.orig/src/h5core/h5_hdf5_private.h H5hut-1.99.13/src/h5core/h5_hdf5_private.h
---- H5hut-1.99.13.orig/src/h5core/h5_hdf5_private.h	2017-07-02 16:46:44.899690038 -0600
-+++ H5hut-1.99.13/src/h5core/h5_hdf5_private.h	2017-07-02 16:47:16.550080867 -0600
-@@ -934,7 +934,7 @@
- 	HDF5_WRAPPER_ENTER (h5_err_t,
- 			    "fapl_id=%d, comm=..., use_gpfs=%d",
- 			    fapl_id, (int)use_gpfs);
--	if ( H5Pset_fapl_mpiposix (fapl_id, comm, use_gpfs) < 0)
-+	if ( H5Pset_fapl_mpio (fapl_id, comm, use_gpfs) < 0)
- 		HDF5_WRAPPER_LEAVE (
- 			h5_error (
- 				H5_ERR_HDF5,
diff --git a/sci-libs/h5hut/h5hut-1.99.13-r1.ebuild b/sci-libs/h5hut/h5hut-1.99.13-r1.ebuild
deleted file mode 100644
index 8401f6468846..000000000000
--- a/sci-libs/h5hut/h5hut-1.99.13-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P="${P^h}"
-DESCRIPTION="High-Performance I/O Library for Particle-based Simulations"
-HOMEPAGE="http://www-vis.lbl.gov/Research/H5hut/"
-SRC_URI="https://amas.psi.ch/H5hut/raw-attachment/wiki/DownloadSources/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# < dep on hdf5 because of bug #809221
-# Needs a proper fix.
-DEPEND="
-	virtual/mpi
-	<sci-libs/hdf5-1.12[mpi]
-	"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-mpio.patch"
-	"${FILESDIR}/${P}-autotools.patch"
-	)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-parallel --enable-shared --disable-static CC=mpicc CXX=mpicxx
-}
diff --git a/sci-libs/h5hut/metadata.xml b/sci-libs/h5hut/metadata.xml
deleted file mode 100644
index c0cd18916a93..000000000000
--- a/sci-libs/h5hut/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-</pkgmetadata>
diff --git a/sci-libs/ignition-math/Manifest b/sci-libs/ignition-math/Manifest
index 549616234f28..d85bc1755ee8 100644
--- a/sci-libs/ignition-math/Manifest
+++ b/sci-libs/ignition-math/Manifest
@@ -1,5 +1,3 @@
-DIST ignition-math6_6.14.0.tar.gz 628564 BLAKE2B 6206f1f35472bf51a8a3bdb8fae26d9879044ea856abd8bcce2cfb5bf16d2638816b3fff7e451c165fec8b2ba82db083d78306d5441c4db3def14b08ddad7556 SHA512 ad95160cc1cd137779b9da589c47994d04f829af10865071e9ead4d55c4399d04d5398287d3b294e3f67230205656e1fe243129673e1f8e73f62f3933c314802
 DIST ignition-math6_6.15.1.tar.gz 632975 BLAKE2B 94a300b56a74a0c44da9ec74861fce7946e50d5a16bd56b383bfbd63e9d6f285bd803da6528d899711b74002cce1a8c95cc7c82580aa391794dd0d9fd63ae96f SHA512 569fb37be4b42f170189de680beb71c6274e2a48d02f77d6a9d675ca9901be32df7af6b86f69916ff96b4f7065f8f1d4a9fb3ef81c2b7f5fc3f325e17279edba
-EBUILD ignition-math-6.14.0.ebuild 602 BLAKE2B 652f682ff71254785da587999a2ffaad4a07129c557fa40f9be0d4a4a405c1dbd4bae2826d2d265e16c4c9e4c543700a4d014b032aea5ad2d85532b37817c826 SHA512 06e90b5c83ba8e10f45df3817f4f81ea0223fad79cd6e9a9a62b89b500e677756148013bf6b929df70c23da9ae01dcb0696023e50819d59d59b376b55bb4caa5
 EBUILD ignition-math-6.15.1.ebuild 602 BLAKE2B 652f682ff71254785da587999a2ffaad4a07129c557fa40f9be0d4a4a405c1dbd4bae2826d2d265e16c4c9e4c543700a4d014b032aea5ad2d85532b37817c826 SHA512 06e90b5c83ba8e10f45df3817f4f81ea0223fad79cd6e9a9a62b89b500e677756148013bf6b929df70c23da9ae01dcb0696023e50819d59d59b376b55bb4caa5
 MISC metadata.xml 343 BLAKE2B bb5108d0bcc5fe3831a10464432ac25c55c222e552e3c263e03f0a31e506c1de87343bfa99e88eca81f4b46c5ce49439c72b2272d4fdeb86183dff93d9420cb3 SHA512 b15e2a7b1584b98b9611ec8e75846e58fcba9e3f93547f473b43328499ca47695a1d1430ad0e77c319d40c50eccddfeed36771710b794d1116fa0d15e530e386
diff --git a/sci-libs/ignition-math/ignition-math-6.14.0.ebuild b/sci-libs/ignition-math/ignition-math-6.14.0.ebuild
deleted file mode 100644
index eb0f9750bfd7..000000000000
--- a/sci-libs/ignition-math/ignition-math-6.14.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-inherit cmake vcs-snapshot
-
-DESCRIPTION="A small, fast, and high performance math library for robot applications"
-HOMEPAGE="https://github.com/ignitionrobotics/ign-math"
-SRC_URI="https://github.com/ignitionrobotics/ign-math/archive/${PN}6_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="6/6"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3
-	dev-build/ignition-cmake:2"
-BDEPEND="
-	dev-build/ignition-cmake:2"
-
-S="${WORKDIR}/${PN}6_${PV}"
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index ae55bd52ae20..0c0e55d92266 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,3 +1,5 @@
 DIST indilib-2.0.8.tar.gz 2851129 BLAKE2B 061ed06bbb122e5579d881ff76d84e6629045eb9972da68fb0c66554f453e7a0660c0017858b8626af70a114bf099c3f7397c6789f41ed99335bde0de767fb95 SHA512 a9b4c5efe9841c024a7ccc271b2de6626ee442d3543f621822522950cc7549def9de111e66e6d183e0a63bead6d1e211fa6025463f9ca4bad30b7a457c5f66b9
-EBUILD indilib-2.0.8.ebuild 1897 BLAKE2B 8a544c9f323b97ebe1d615c585ab38fb832299b0dccbe2b1c1e72b9486328840add58ba72c7efe098e2c62c82441e9c376e47ccce3d33adbb8a73d3b91dfaaef SHA512 7a2ad54c7624ec6dd798d3b54e092b289365b5719d77577362f92801f9a059de00f1360c49b215853321b4c846947a23da879142c596f5f68a2aabb5da28dc21
+DIST indilib-2.0.9.tar.gz 2894181 BLAKE2B 888209ce864ee324c842b1847c4f2c9b279a614b81be66597cc194cd7d67327565a1cd30b2c22b76c467ba513d1d61215bdf91161a634421ed36737b4256340b SHA512 b5e1ef58c2139bd5dd79e72d9d25d5c0730f29dff2db0001db5b1d0eff029f60f714c13e14e820f5ccfa8ab6cba25f4cd16e699f9842fa722ef961d00fc8c4a4
+EBUILD indilib-2.0.8.ebuild 1775 BLAKE2B 301589c8be496391d5dbe326f71246e275383bf1c3beef2cd663621364b256fbbae489dc9bae5286cf3fde301ed74b65e025a52ab98523f235d979fe8c96f297 SHA512 10e2de746c8a61ef3a7ddea8c0c0a03fb368bc12165eb0c1a37f635dc5737e198163f0c415298b8e1f065676ff58fc7ad475db0597293e6e3710db82fd59ae5b
+EBUILD indilib-2.0.9.ebuild 1776 BLAKE2B 06fddaa942b71ff3e6aee230a5de2a8427461cbff115a23a5ec5e1fa42112106b9f2c95ceed7cc83b88d3a4b9cb34fe617096379590b85a98f11c7bbd71d7288 SHA512 99543b62d875a26ecfd01bdf8b725cea186be31eb73b847f417c5515ec828cf04aac8677522e82446736f3e403b379dbd3c0e7348fee9a886bfd8e22cde11a3d
 MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f
diff --git a/sci-libs/indilib/indilib-2.0.8.ebuild b/sci-libs/indilib/indilib-2.0.8.ebuild
index 77b317737296..0cfc49a84aa4 100644
--- a/sci-libs/indilib/indilib-2.0.8.ebuild
+++ b/sci-libs/indilib/indilib-2.0.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic udev
+inherit cmake udev
 
 DESCRIPTION="INDI Astronomical Control Protocol library"
 HOMEPAGE="https://www.indilib.org/"
@@ -43,11 +43,6 @@ DEPEND="${RDEPEND}
 "
 
 src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/878525
-	# https://github.com/indilib/indi/issues/2023
-	filter-lto
-
 	local mycmakeargs=(
 		-DINDI_SYSTEM_HTTPLIB=ON
 		-DINDI_SYSTEM_JSONLIB=ON
diff --git a/sci-libs/indilib/indilib-2.0.9.ebuild b/sci-libs/indilib/indilib-2.0.9.ebuild
new file mode 100644
index 000000000000..5550e43e5885
--- /dev/null
+++ b/sci-libs/indilib/indilib-2.0.9.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2024 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="
+	dev-cpp/cpp-httplib:=
+	dev-cpp/nlohmann_json
+	dev-libs/libev
+	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/libusb:1
+	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_SYSTEM_HTTPLIB=ON
+		-DINDI_SYSTEM_JSONLIB=ON
+		-DINDI_BUILD_QT5_CLIENT=OFF
+		-DINDI_BUILD_SHARED=ON
+		-DINDI_BUILD_STATIC=OFF
+		-DINDI_BUILD_XISF=OFF # not packaged
+		-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_INTEGTESTS=$(usex test)
+		-DINDI_BUILD_WEBSOCKET=$(usex websocket)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Unit tests
+	BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
+
+	# Integration tests
+	# They fail in parallel because they try to bind to the same port more
+	# than once.
+	BUILD_DIR="${BUILD_DIR}"/integs cmake_src_test -j1
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sci-libs/libnova/Manifest b/sci-libs/libnova/Manifest
index b4ba0e78018b..0e781eebc0e5 100644
--- a/sci-libs/libnova/Manifest
+++ b/sci-libs/libnova/Manifest
@@ -1,4 +1,6 @@
+AUX libnova-0.16.0-cflags.patch 440 BLAKE2B dd10b9adf008c2de9e10f4348e47a3b345afbb529a0ebc1be0859a90f363e126691c8962445f2bd8ff1ddd26dbe051f583ba66a2010bb90353b1746d082e4586 SHA512 487f89469e8ac30128ee24fb5ae58ed6d72ae525257006d92fbfb29d7b430773cd7b32e03c626d0469e687bc85edea7e222a3ae17710244e906836f605420f35
+AUX libnova-0.16.0-gcc14.patch 546 BLAKE2B ddabf173961a400abbd7926699669acdcb8839205c8977933375b03296d8b81d167271896cf1e4b5d16e1aa3b15c12fd632fc5bbb21eba34e85b7247c834c8dd SHA512 0fef4bc6c191fb0de5f7754d05b5da536c7529f89055d705d0fd062d3b8c243c820a79ad6aa5d8023a6145952240ce7bdab12ad1d587c261d60bbc3ebb01c697
 AUX libnova-0.16.0-slibtool.patch 577 BLAKE2B 333476b9d79c82a62e3387f15658ac522a2747b71727372a4dae3d0fdc307897c78aa5309026a9ee773cfe00364aaf4c056e2cf121717d37c495eace03fd8839 SHA512 1057249337cee731109835744424f88b99a9357342e3c2023a156d543eb2568048a0db23c4e86d51cb0d416a2dc94954b2bfa7fc4a3bcc0ae64629249a971f70
 DIST libnova-0.16.0.tar.xz 909212 BLAKE2B ae7efef8295dafd3715c37506d7403fc38a951c9a7c43e41e3c6ca3c922243a396052bbb71f07901bbd3aae2b2bee183efbd9e3e9c50dce72379f6ced80d5701 SHA512 f1c33421b7f09097223afe1bd5c31fa9a4591e4c965ba8a5ae1f164367717aa03986970ffe9c01e400b27aea43843fbb67cfbfe6ef44ec2c519f524aab9ea86f
-EBUILD libnova-0.16.0.ebuild 913 BLAKE2B 0de79d09afd6131cef0f2f3be9bfe50b958ede56b08c155dd0cf3c3a10d8ab298a560127eade980a229cbe5fcaa6e7199ca1183534bbad35e089a4f36538aa54 SHA512 972223a3db550a4dd72b406ff18ff524e579734ee0e2d1fa22bd252bdbf0cade0cc0a3852339aaad2bfd2f918c2ea45b7c4ba27898a94911213534a986427784
+EBUILD libnova-0.16.0.ebuild 947 BLAKE2B 997d3189c40ac2a40a7e07fadc1ca1167e066cb9cb77842cc7d884a6cc548a3c63210022c845ba3404433526b028161794313f31302b5d0bb40f42a8646cae66 SHA512 a7007113161b9cd8d3483c62a59ad1e7a04542fbd25a5377c8020873346d7f2ccaa1a76d28db51b75ab7e8723ee09a15add2055873ecee20baaa1432f8e39a06
 MISC metadata.xml 640 BLAKE2B d8db8975700f5d7c96c3844120efc66ba262a2d121f62479b7552e31f46358036cfd4e8a7b91decc899036c4719b5d3c2f8c0aa0427f0252481a635daec5b215 SHA512 3193ac9e5621ea1b142ceea70cc9192d77ba694a217fa734d2521549acde8149fdaf231f1cf5befd72a203893d36ed707b88a664b054bbdf2c47a3fd82bd64fa
diff --git a/sci-libs/libnova/files/libnova-0.16.0-cflags.patch b/sci-libs/libnova/files/libnova-0.16.0-cflags.patch
new file mode 100644
index 000000000000..fcb06a9360c9
--- /dev/null
+++ b/sci-libs/libnova/files/libnova-0.16.0-cflags.patch
@@ -0,0 +1,23 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -Wall -O3 $(AVX_CFLAGS)
++AM_CFLAGS = $(AVX_CFLAGS)
+ 
+ SUBDIRS = libnova elp
+ 
+--- a/src/elp/Makefile.am
++++ b/src/elp/Makefile.am
+@@ -1,6 +1,6 @@
+ noinst_LTLIBRARIES = libelp.la
+ 
+-AM_CFLAGS = -I ../ -Wall -O3 $(AVX_CFLAGS)
++AM_CFLAGS = -I ../ $(AVX_CFLAGS)
+ 
+ libelp_la_SOURCES = \
+ 	elp1.c \
+-- 
+2.45.2
+
diff --git a/sci-libs/libnova/files/libnova-0.16.0-gcc14.patch b/sci-libs/libnova/files/libnova-0.16.0-gcc14.patch
new file mode 100644
index 000000000000..330952d058bf
--- /dev/null
+++ b/sci-libs/libnova/files/libnova-0.16.0-gcc14.patch
@@ -0,0 +1,24 @@
+From 1be82238860bba941b1b16c6f31763577a17b8af Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 6 Aug 2024 21:49:52 +0200
+Subject: Fix build with >=GCC-14
+
+---
+ src/parallax.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/parallax.c b/src/parallax.c
+index 733e26c..0c11f04 100644
+--- a/src/parallax.c
++++ b/src/parallax.c
+@@ -17,6 +17,7 @@
+  */
+ 
+ #include <math.h>
++#include <libnova/earth.h>
+ #include <libnova/parallax.h>
+ #include <libnova/utility.h>
+ #include <libnova/sidereal_time.h>
+-- 
+2.45.2
+
diff --git a/sci-libs/libnova/libnova-0.16.0.ebuild b/sci-libs/libnova/libnova-0.16.0.ebuild
index bc3ef11b3d3a..c590ea70af79 100644
--- a/sci-libs/libnova/libnova-0.16.0.ebuild
+++ b/sci-libs/libnova/libnova-0.16.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -16,17 +16,17 @@ IUSE="doc examples"
 
 BDEPEND="doc? ( app-text/doxygen )"
 
-PATCHES=( "${FILESDIR}"/${P}-slibtool.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-slibtool.patch
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-gcc14.patch # bug 886455
+)
 
 src_prepare() {
 	default
 	eautoreconf
 }
 
-src_configure() {
-	econf --disable-static
-}
-
 src_compile() {
 	default
 	use doc && emake -C doc doc
diff --git a/sci-libs/libsemigroups/Manifest b/sci-libs/libsemigroups/Manifest
index 9a458c501bde..48f6080f91d0 100644
--- a/sci-libs/libsemigroups/Manifest
+++ b/sci-libs/libsemigroups/Manifest
@@ -1,3 +1,4 @@
+AUX libsemigroups-2.7.3-gcc-15-buildfix.patch 954 BLAKE2B d165a52b019293f0a074f2737ae3d224cb6cec8b5b9327932b2eda59fac1f6534b5ba374e97f09a25fbf8b0e9fb51e7c34b6e618570c9dafce04d7e7fc8d0aa9 SHA512 fe210da5c4ad00681ad941ec1add9ef67877a705694914f081f0262e23ec5aa7b5fb7e461f9e5925bc7b59dd19f88cec5ec17160f5bea0a0a4480845078d3eae
 DIST libsemigroups-2.7.3.tar.gz 2543883 BLAKE2B 02700cb9f132d7121ce42f978e9a1c01ed9f1957fab0da45c60837240639f7a049d3b7e1f9b989be71de8b85a669b475733aeb0e96760eda846b50db903da895 SHA512 001cfdfc55ee9a0bb3fe0914229905083e8eaaec682952bb23b2dc44680631909478bf32e67e93488a7347bfb674305b0cc3b713afa9bce1997a0b1a5693ad36
-EBUILD libsemigroups-2.7.3.ebuild 639 BLAKE2B 2f2553604dacfe5f91e99410653cc1ec0e4450d1a2689a6191bcfe9b8f1a2a4860091b6557479fc09bc95b8e5c62e5bd28672cc6b5400f94cfeb336cbb94397f SHA512 06aba928b8ef6e31393d1dcd62bffaad106eed4f2eef667d8b9cc1b021419b4817bc9de85843b7af2aea7d625d263c1ca408e2fe65eed974bc8cdd3afe371807
+EBUILD libsemigroups-2.7.3-r1.ebuild 693 BLAKE2B 3ecf9bdffd8f043bfc840ba21fd27df66dd638f19e335509bc35394034173562a801adc77f11405ca215fd76ffd0de67147391b3018028ca6043d95556d8ee11 SHA512 aeb03139c64253b3a1092b91ab10b59748de3739f31be6f16227151d42cd7446cb8d826a4ec1a673d27de57e4bd8d924f5457e47444f81a5dacadd6c53945815
 MISC metadata.xml 2022 BLAKE2B 2d0c1fffcd43538e90c4fe0933b937b72819c7c407a93398e5c0dd27f0c812d06d627a5718cab39b70d16aae6688b1428a4bb474225194268121d93d9bbef190 SHA512 750a0cb255d9ee40cb99c25d5ca76531413227b428b5aa97a12ed9b65313fa3afbe5ccf7acc8990e791fd8e7d1e749df30daf407d78620908e38a3d7880a0143
diff --git a/sci-libs/libsemigroups/files/libsemigroups-2.7.3-gcc-15-buildfix.patch b/sci-libs/libsemigroups/files/libsemigroups-2.7.3-gcc-15-buildfix.patch
new file mode 100644
index 000000000000..40214b18b9ad
--- /dev/null
+++ b/sci-libs/libsemigroups/files/libsemigroups-2.7.3-gcc-15-buildfix.patch
@@ -0,0 +1,22 @@
+From b7a413284e408280336ee681dd031877d779d0ea Mon Sep 17 00:00:00 2001
+From: "James D. Mitchell" <jdm3@st-andrews.ac.uk>
+Date: Mon, 29 Jul 2024 11:13:32 +0100
+Subject: [PATCH] sims: fix issue 557
+
+---
+ include/libsemigroups/sims1.tpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/libsemigroups/sims1.tpp b/include/libsemigroups/sims1.tpp
+index bc8bda372..698845222 100644
+--- a/include/libsemigroups/sims1.tpp
++++ b/include/libsemigroups/sims1.tpp
+@@ -619,7 +619,7 @@ namespace libsemigroups {
+   typename Sims1<T>::iterator_base&
+   Sims1<T>::iterator_base::operator=(Sims1<T>::iterator_base&& that) {
+     _extra           = std::move(that._extra);
+-    _longs           = std::move(that.long_rules());
++    _longs           = std::move(that._longs);
+     _max_num_classes = std::move(that._max_num_classes);
+     _min_target_node = std::move(that._min_target_node);
+     _felsch_graph    = std::move(that._felsch_graph);
diff --git a/sci-libs/libsemigroups/libsemigroups-2.7.3.ebuild b/sci-libs/libsemigroups/libsemigroups-2.7.3-r1.ebuild
index 04bbfd48d7b9..15fff4b3b57d 100644
--- a/sci-libs/libsemigroups/libsemigroups-2.7.3.ebuild
+++ b/sci-libs/libsemigroups/libsemigroups-2.7.3-r1.ebuild
@@ -13,6 +13,8 @@ SLOT="0/2"
 KEYWORDS="~amd64 ~x86"
 IUSE="cpu_flags_x86_popcnt"
 
+PATCHES=( "${FILESDIR}/${P}-gcc-15-buildfix.patch" )
+
 src_configure() {
 	econf \
 		$(use_enable cpu_flags_x86_popcnt popcnt) \
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index fe535a9505ea..86861b23c126 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -1,8 +1,6 @@
-AUX libsvm-3.25-makefile.patch 1563 BLAKE2B ed88feaf7f2b6ce51b39f7ed875c6ab880a6e323a610d4f3a01b5830bc79e4bdb98a322fe1d150c3d4abd5f80761241ea81e4ac398dce0cfe307f8729793b999 SHA512 5d37a6298586273e772d0f249f876a31b39895a3394ea470626ea845ac28bad4c0a552b88bc1c3103331c72590e7c485b042c329d58384c3a7337e0d6da6d07d
 AUX libsvm-3.25-openmp.patch 864 BLAKE2B ef67a094c7cd3cafa3c998caa78bd226d83e462e358caa4cf15382087962b1eb9214553ae560d7c13812178d5f9a528764589c9f805b479a4931f7f94f9b4fdc SHA512 60250a325b6d22a1d8404f1b1d8ecd1b47e28003982c8f851107598b0553125afefb9b0a2b2e940761646152c05d6fdcd438994cdc991c2bffe10a9d87923b04
+AUX libsvm-3.30-javaMakefile.patch 390 BLAKE2B e51552651a9efb66b1f1b5d2533f5829e721bb61f334a0723ef74da0b185c1551d5b29a6808b99045df0863d5cc8c7ddc12c17ad8356aa7217490ff33bcc4285 SHA512 be2fa7de2a111ac3c5f7ee8cac51c4d5db1a5e251baadb27a3f37869b5597c02eef10717a53a0d404fc3c3cf50ee95ff8e06d1f748af97321d604649142333b3
 AUX libsvm-3.30-makefile.patch 1443 BLAKE2B 3b8009da6985170045b0d5d319869d89126c9577fa92aaf97bba76b94f4210bb6a40c1629354f30bbc93984a408e121341f9c00a37f824ea367475b2a86849b2 SHA512 a28ac993ea9746a5eb569161d8974108b5b758b4f181f5ce9891a15dd3e1b67dc8f57f934852d8c6660f4ca5be875e70e7064bf0e449e78c6a79cc0e72a75485
-DIST libsvm-3.25.tar.gz 892471 BLAKE2B a80b7192981811f57446a966c911a07a2de17042e67faa26451c23129dafeac642596a619731b57a27d9845f904e2e4c5c11ae8aa3006fa49e2f62d7cec4cca2 SHA512 91afbcfd204f5fc9c367df446550cecaf01d5e34770fa10fc6bb02277d79b756393f7d057290df0f72fc941faaf0f4c84a863a3bf9d8628eeff1f99b6bc57a98
 DIST libsvm-3.3.tar.gz 910001 BLAKE2B 69364210998e496e333c6a87a66ad3f1515f2b3e98fe7bc579e8aee6d4df0473a4282f979d4f7d1729ce7080fd8b009ce830caab0ac37b57fafff0d2686e86e0 SHA512 705cdebffce0d9ea053cf51b2bfd46303d306b7a2c34ee46065f19e1227459fbdbe6fde6e4769935a0c225da831ec137fb9c0c28fbc2efa06724a94bdd76500d
-EBUILD libsvm-3.25-r1.ebuild 2507 BLAKE2B 71108ec61dee425d3b6cd863cf908567f2946283e2437dcfb921e9a451bccacc409e93a028505fbec0aec4a623a6d5ffd05eef281d7ce7e9cb08c0c47ef8045c SHA512 83f3ca9e203a31bcaa73dc11483197e121e9b1974e7c3f4f37e5ce917c1535547605c91917b3a413d56d6ade0ba07a02e1c495c1b55464273c59a1c5a4c24f8a
-EBUILD libsvm-3.30.ebuild 2533 BLAKE2B da60a97837ffa44a59cb0ba428afedb4885e3d48a46631e123ecfd2ea5b2cd177701e42480ff851f1685e7c36368ada948546480c8194c0684267cf20bb3633a SHA512 3bbc1d7dc94cec88f7853200a055947d900eeb6bfbeb65d197d0bf93be471ea9684d629d3779e5daf9e788786d9028e1d6411025475794ec35ff0bdfbcca5c18
+EBUILD libsvm-3.30.ebuild 2463 BLAKE2B 8610bbac395bef87efe21371b2ec2914436ff1d898964e3952e98089a4c68a29e0fc6d7092b21cbeb6bfcc7a8fad061f53d1043507c631b0c865b896b2768e48 SHA512 6cc4f3d959945cc42512aa6b6a76fde2a8a9b2a312786b874a6d8d22c791c8d9f53333ca7c407c9b2a3632d897f669a66b915391f54ce7d63f9e82e14cb2a4b1
 MISC metadata.xml 816 BLAKE2B 59108eaf569019b5adde56aa0197503346d53d3ab07285c65768e4663f8aec41d441c1c8b894ddd4cf86f16d40784800918345a15cd48b8bc6f3fcf1da8dc08b SHA512 8a6fe72c2ad1f017e36bef14eed3d61909395bd2aaa13c561d7818942099f3b20fe020b5548053758c30ec7ba09c0e4f7238c6906452ad6c3f049a857cf8eac6
diff --git a/sci-libs/libsvm/files/libsvm-3.25-makefile.patch b/sci-libs/libsvm/files/libsvm-3.25-makefile.patch
deleted file mode 100644
index ea48368b27a5..000000000000
--- a/sci-libs/libsvm/files/libsvm-3.25-makefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-* respect CFLAGS and CXXFLAGS from user
-* compile with CC for C and CXX for C++ files
-* propagate and respect user's LDFLAGS
-* PIC only used for the library
-* link the shared version library
-
---- a/Makefile
-+++ b/Makefile
-@@ -1,9 +1,10 @@
--CXX ?= g++
--CFLAGS = -Wall -Wconversion -O3 -fPIC
-+CFLAGS ?= -Wall -Wconversion
-+CXXFLAGS ?= $(CFLAGS)
- SHVER = 2
- OS = $(shell uname)
-+PICFLAGS ?= -fPIC
- 
--all: svm-train svm-predict svm-scale
-+all: svm-train svm-predict svm-scale lib
- 
- lib: svm.o
- 	if [ "$(OS)" = "Darwin" ]; then \
-@@ -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) $(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
--	$(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
--svm-train: svm-train.c svm.o
--	$(CXX) $(CFLAGS) svm-train.c svm.o -o svm-train -lm
--svm-scale: svm-scale.c
--	$(CXX) $(CFLAGS) svm-scale.c -o svm-scale
- svm.o: svm.cpp svm.h
--	$(CXX) $(CFLAGS) -c svm.cpp
-+	$(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/libsvm-3.30-javaMakefile.patch b/sci-libs/libsvm/files/libsvm-3.30-javaMakefile.patch
new file mode 100644
index 000000000000..a134ca1a44b1
--- /dev/null
+++ b/sci-libs/libsvm/files/libsvm-3.30-javaMakefile.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/936550
+
+--- a/java/Makefile
++++ b/java/Makefile
+@@ -4,8 +4,6 @@ FILES = libsvm/svm.class libsvm/svm_model.class libsvm/svm_node.class \
+ 		libsvm/svm_print_interface.class \
+ 		svm_train.class svm_predict.class svm_toy.class svm_scale.class
+ 
+-#JAVAC = jikes
+-JAVAC_FLAGS = -target 1.7 -source 1.7
+ JAVAC = javac
+ # JAVAC_FLAGS =
+ export CLASSPATH := .:$(CLASSPATH)
diff --git a/sci-libs/libsvm/libsvm-3.25-r1.ebuild b/sci-libs/libsvm/libsvm-3.25-r1.ebuild
deleted file mode 100644
index 43c67613dec8..000000000000
--- a/sci-libs/libsvm/libsvm-3.25-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit flag-o-matic java-pkg-opt-2 python-r1 toolchain-funcs
-
-DESCRIPTION="Library for Support Vector Machines"
-HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/libsvm/"
-SRC_URI="https://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="java openmp python tools"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	java? ( >=virtual/jdk-1.8:* )
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	java? ( >=virtual/jre-1.8:* )
-	python? ( ${PYTHON_DEPS} )
-	tools? ( sci-visualization/gnuplot )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.25-openmp.patch
-	"${FILESDIR}"/${PN}-3.25-makefile.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	sed -i -e "s@\.\./@${EPREFIX}/usr/bin/@g" tools/*.py \
-		|| die "Failed to fix paths in python files"
-	sed -i -e "s|./grid.py|${EPREFIX}/usr/bin/svm-grid|g" tools/*.py \
-		|| die "Failed to fix paths for svm-grid"
-	sed -i -e 's/grid.py/svm-grid/g' tools/grid.py \
-		|| die "Failed to rename grid.py to svm-grid"
-
-	if use java; then
-		local JAVAC_FLAGS="$(java-pkg_javac-args)"
-		sed -i \
-			-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
-}
-
-src_compile() {
-	default
-	use java && emake -C java
-}
-
-src_install() {
-	dobin svm-train svm-predict svm-scale
-	dolib.so *.so*
-	doheader svm.h
-
-	DOCS=( README )
-
-	if use tools; then
-		local t
-		for t in tools/*.py; do
-			python_foreach_impl python_newscript ${t} svm-$(basename ${t} .py)
-		done
-
-		mv tools/README{,.tools} || die
-		DOCS+=( tools/README.tools )
-
-		docinto examples
-		dodoc heart_scale
-		dodoc -r svm-toy
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use python ; then
-		installation() {
-			touch python/__init__.py || die
-			python_moduleinto libsvm
-			python_domodule python/*.py
-		}
-		python_foreach_impl installation
-
-		mv python/README{,.python} || die
-		DOCS+=( python/README.python )
-	fi
-
-	HTML_DOCS=( FAQ.html )
-	if use java; then
-		java-pkg_dojar java/libsvm.jar
-		HTML_DOCS+=( java/test_applet.html )
-	fi
-
-	einstalldocs
-}
diff --git a/sci-libs/libsvm/libsvm-3.30.ebuild b/sci-libs/libsvm/libsvm-3.30.ebuild
index e94e47acd243..d1fdc3096fce 100644
--- a/sci-libs/libsvm/libsvm-3.30.ebuild
+++ b/sci-libs/libsvm/libsvm-3.30.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit java-pkg-opt-2 python-r1 toolchain-funcs
 
@@ -31,6 +31,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.25-openmp.patch
 	"${FILESDIR}"/${PN}-3.30-makefile.patch
+	"${FILESDIR}"/${PN}-3.30-javaMakefile.patch
 )
 
 pkg_pretend() {
@@ -43,6 +44,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
+	java-pkg_clean
 
 	sed -i -e "s@\.\./@${EPREFIX}/usr/bin/@g" tools/*.py \
 		|| die "Failed to fix paths in python files"
@@ -50,16 +52,10 @@ src_prepare() {
 		|| die "Failed to fix paths for svm-grid"
 	sed -i -e 's/grid.py/svm-grid/g' tools/grid.py \
 		|| die "Failed to rename grid.py to svm-grid"
-
-	if use java; then
-		local JAVAC_FLAGS="$(java-pkg_javac-args)"
-		sed -i \
-			-e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \
-			java/Makefile || die "Failed to fix java makefile"
-	fi
 }
 
 src_configure() {
+	use java && export JAVAC_FLAGS="$(java-pkg_javac-args)"
 	if use openmp; then
 		export OPENMP_CFLAGS="-fopenmp -DOPENMP"
 		export OPENMP_LIBS="-fopenmp"
diff --git a/sci-libs/minuit/Manifest b/sci-libs/minuit/Manifest
deleted file mode 100644
index 51a24aacbbdf..000000000000
--- a/sci-libs/minuit/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX minuit-5.27.02-asneeded.patch 1180 BLAKE2B b79677b75e4544ec3c154f149820a1ca0d26343982d21644f04ac9863290c66d4b8e6929dfa2bc49073e7ca7baef6b68a87bff4336c5dfdfd070e3bf3c169f7c SHA512 d5be2d60a39f3b7b2bf1afbf29a3fbc2d6d559c2be38141dc4871809a45b53ffbdbc12e39c6f887811c447b0e6c5ef47a32e4976cb78fa00d1b92b3ba3dd0e9a
-DIST minuit-5.34.14.tar.gz 510005 BLAKE2B fbaba3d57198983c603cf03ebc6f07b6b32cab77b2833f2fa2dfe1fda7275863abb3966b535381edb4b3d9dbe181fb8255e08700ac443ea82debdf0bc20917b3 SHA512 96e520e0f9454f57a9529662612f444f60bcf63d21b7950b832cf3c670ee407ae78c9ffaf34eee728c0b68a4e39c347ea69121b4a51f1b2d33fd2176db88f720
-DIST mntutorial.pdf 263735 BLAKE2B f68b91bb2450371b52726974e7678fd7983f92dddf2ccde802a8081892804d5983302dcebbd05e70b94590436839613e5e4a81d035d5b208cc17efa4427cc863 SHA512 27d6fdc85fa190cd8e4e22d9ccac543005878718e24ececfbc1236266f50759390daf7ff50859dcfae18562a655955846460a56deeb4d44f23e77a629b1cddb1
-DIST mnusersguide.pdf 260072 BLAKE2B 750492928d27f85329b185c95043113363f270f0946d8e8b06ef167df6c8068f0fd8149f20d65066ecd6304a1ad4e86eea7d4b7988e0c0d7131ae26fcadf7a0c SHA512 6ed46923a798de7b1e5d9eb556684ece53fb85b57b18f4fd847de9f83251461fa69f841418272337e5284e061760c96798913b3f8e1d718a35a86f6e702d269b
-EBUILD minuit-5.34.14.ebuild 1521 BLAKE2B 33d6d4a7f5beb18f35c777ecae46faa2a5774cf2cd769dc5b20541ddde66bf47d4259f5efa122bf74eec77f4700ac94f7e8e2d27c9a3f0933788395936cd7475 SHA512 d09f360e2687c57ecd06783fede6b483f8abc1073bd6e9eb0007bddeab1d9040ad41711cc413f7703ba0ab11fc2ae1d0ddad2d1d01af951ed2785df31567ae2c
-MISC metadata.xml 624 BLAKE2B ed0b866f028dd0a957fb8e6db3a27cbd33fc2297c38ba152880a8dc39615b9418e338453a195172f94ea770c11c8d3c25688655c3efcd1512fe1aee0c4d883fd SHA512 2ca873197975adf6fa54b0c8c72df8b252d91a82b3603fe4ec2c142c6ab89aff64186f5b0d2c3c68d8944fc60297106389d2eae2b89d5916f3194039d23a5dbc
diff --git a/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch b/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch
deleted file mode 100644
index e808a928f5e6..000000000000
--- a/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-This OpenMP library finding code is from ImageMagick's configure.ac
-
-http://bugs.gentoo.org/314095
-
---- a/configure.in
-+++ b/configure.in
-@@ -44,6 +44,20 @@
- CFLAGS="$CFLAGS $OPENMP_CFLAGS"
- CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
- 
-+dnl Find OpenMP library
-+GOMP_LIBS=''
-+if test "$enable_openmp" != 'no'; then
-+  if test "${GCC}" = "yes"; then
-+    AC_CHECK_LIB(gomp,GOMP_parallel_start,GOMP_LIBS="-lgomp",,)  # gcc
-+  else
-+    AC_CHECK_LIB(mtsk,sunw_mp_register_warn,GOMP_LIBS="-lmtsk",,)  # solaris cc
-+    AC_CHECK_LIB(xlsmp,_xlsmpFlush,GOMP_LIBS="-lxlsmp",,)  # AIX xlc
-+    AC_CHECK_LIB(mp,mp_destroy,GOMP_LIBS="-lmp",,)  # SGI IRIX 6.5 MIPSpro C/C++
-+  fi
-+  LIBS="$GOMP_LIBS $LIBS"
-+fi
-+AC_SUBST(GOMP_LIBS)
-+
- dnl files to be generated 
- AC_OUTPUT(Makefile inc/Makefile inc/Minuit2/Makefile inc/Math/Makefile src/Makefile 
-   doc/Doxyfile doc/Makefile test/Makefile test/MnSim/Makefile 
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -9,6 +9,8 @@
- # The convenience library to be built.
- lib_LTLIBRARIES = libMinuit2.la
- 
-+libMinuit2_la_LIBADD = $(GOMP_LIBS)
-+
- libMinuit2_la_SOURCES =				\
-          AnalyticalGradientCalculator.cxx	\
-          BasicMinimumError.cxx			\
diff --git a/sci-libs/minuit/metadata.xml b/sci-libs/minuit/metadata.xml
deleted file mode 100644
index f49fa95c6887..000000000000
--- a/sci-libs/minuit/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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 lang="en">
-		Minuit provides a C++ library for non-linear optimization,
-		and parameter error estimation. Widely used in High Energy Physics,
-		originally as a fortran library, it has been entirely re-written from
-		scratch in C++. It is now included in ROOT-5 and higher.
-		This is the stand-alone version, quick to build and use.
-	</longdescription>
-</pkgmetadata>
diff --git a/sci-libs/minuit/minuit-5.34.14.ebuild b/sci-libs/minuit/minuit-5.34.14.ebuild
deleted file mode 100644
index 108fecfc27e7..000000000000
--- a/sci-libs/minuit/minuit-5.34.14.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A C++ physics analysis tool for function minimization"
-HOMEPAGE="https://seal.web.cern.ch/seal/snapshot/work-packages/mathlibs/minuit/"
-SRC_URI="
-	http://www.cern.ch/mathlibs/sw/${PV//./_}/${PN^}2/${PN^}2-5.34.14.tar.gz -> ${P}.tar.gz
-	doc? (
-		http://seal.cern.ch/documents/minuit/mnusersguide.pdf
-		http://seal.cern.ch/documents/minuit/mntutorial.pdf
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc openmp static-libs"
-
-DEPEND="doc? ( app-text/doxygen )"
-RDEPEND=""
-
-S="${WORKDIR}/${PN^}2-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.27.02-asneeded.patch )
-
-src_prepare() {
-	default
-	rm config/m4/ac_openmp.m4 || die
-	mv configure.{in,ac} || die
-
-	AT_M4DIR="config/m4" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable openmp)
-}
-
-src_compile() {
-	default
-	use doc && emake docs
-}
-
-src_test() {
-	emake check
-
-	cd test/MnTutorial || die
-	local t
-	for t in test_*; do
-			./${t} || die "${t} failed"
-	done
-}
-
-src_install() {
-	if use doc; then
-		# remove doxygen junk
-		find doc/html \( -iname '*.map' -o -iname '*.md5' \) -delete || die
-		HTML_DOCS=( doc/html/. )
-		dodoc "${DISTDIR}"/mn{usersguide,tutorial}.pdf
-	fi
-	default
-
-	docinto examples
-	dodoc test/MnTutorial/*.{h,cxx}
-	docompress -x /usr/share/doc/${PF}/examples
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 2804ece35f2a..d5a7d20905b9 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -10,14 +10,19 @@ AUX mkl-static-lp64-iomp.pc 342 BLAKE2B eddd6bba13426762a47a306469613e2010f5882b
 AUX mkl-static-lp64-seq.pc 331 BLAKE2B 5c234425fff2462f668fc8dd681a9c3d6d1c4e39f73ec4e5cb984eeeede1f84907ffcba3066b81912b7e8712d2dc154af5703d19d085b0f5a5fa3ab0290f2457 SHA512 b828a7513a491e852c65922159333418be026497d4b0b8b456607463af8b0d71da910e0eb4cd915f5a7eb1d0ff959c87bfc443df352f1f84ce9006530dd0af7f
 DIST intel-oneapi-mkl-2022.2.1-2022.2.1-16993_amd64.deb 202488238 BLAKE2B 9bea2cb85aebaa99eac17563e35e4a33e564e58b3e797ce97c140ee510870d7bccd5ffc138eea86a3c25de988a39b5ed06182cb87f103fd8c2dc772d1bd50b81 SHA512 21f2c8b9608fc942821624132aa905f2ec0863f6af9b8a02c166f88b41620ea4e66d1e6551f5da53e727103e9035f28018b12ee3bee33c76ea10be6a68c82748
 DIST intel-oneapi-mkl-2023.0.0-2023.0.0-25398_amd64.deb 188781126 BLAKE2B f4db4f0e8111a01c697e656de30579c22cba3c34816c8399b1b4cffde33f4b636e837f6eceddc659c5c1d4f38984dec110e7362bb3d91eb521f1cfede64d399a SHA512 7f53a93151e5754219d3fa70722918c26f8f90b040f2587f85ce7e8dc1f73dadba5d138e01e67db4b9c76602d6e8502aa92645a0d10ddbcf5854bb85fcd2dbe6
+DIST intel-oneapi-mkl-2023.1.0-2023.1.0-46342_amd64.deb 181631354 BLAKE2B cd1380fd40505ebbd018e76f6727498ade9e63fd4db4167d38ada8819d264f01883afb00d6d3acd15981134f8c899f293afab9129637c359ba2e0b3cfa2e35ef SHA512 fcbe42bbd3446c7ac5d6986506e44976c8bd0e365ed829f20cc7662388bdd1c09ca1927bde49f8449539faa42eedbfbb7793603354fbfcd5cdc32e0e2564b4bf
 DIST intel-oneapi-mkl-common-2022.2.1-2022.2.1-16993_all.deb 23890 BLAKE2B 0287ac646a19e8a33b25cbef006cb98c410872fff2294a15d4e35dd55fc037b523c1923d99d2445a1959b6515ef4b6fdfa7243338c2d194b3c4bf4548949216c SHA512 362640c14713bc8186ea712bb6720311cce1dae6e775d7aade4c613a7a5708224507ff4fefa1081165fa366840f94f8ae73ee345699a4fee5cf7cd7607d9f94e
 DIST intel-oneapi-mkl-common-2023.0.0-2023.0.0-25398_all.deb 23930 BLAKE2B d4ea741816edbc69962cd3ac40bacfd200924212da47f30353ee60ef7ddad6a17453e51681e974cdc8f18355c538f1f3305e36a469860dc125f3c21e65fa0861 SHA512 3c190353b19ed32c13e702f45f453c37d62815aef306dc3bcf88faa20b5afe322c577e9129eafe2d1ace0238fde8d1f8fed04fcadd0ed2d6c43f8e5c46a76ce6
+DIST intel-oneapi-mkl-common-2023.1.0-2023.1.0-46342_all.deb 23886 BLAKE2B d166a924baa6014ae82fb4954c7a79eb3d854f7158ecf969f0a52f809ca8df863c9cec6c75e92b7122137e691c0d2bc71f4ed67006725af1ff9c6e66fed4625e SHA512 c51723be1522e9b1dcb41d30e46c9c1314a68f8cd76ee984c4b12e8206872d41360a9a28e89835225427f4ab2e637e4847fceaf6492cb18b18b22f32d124988d
 DIST intel-oneapi-mkl-common-devel-2022.2.1-2022.2.1-16993_all.deb 4688928 BLAKE2B 545641f68ba7b835859092242a60e065dd7bae8e538b27afaa1f7b266c6ce9aa5c0777b6ced7b8f3a35b70dbe6c6cbfad1db7c370a7a4f4478c8f23b4075bfd5 SHA512 275f267cf103b92ed0bdf56fdd55aee7c5ba5f42d2f7507abe1219aba72f325b9386c8e203a04d4a91020598d0d9cc82b0fc7abe22491c1103f44f3a31d42b2a
 DIST intel-oneapi-mkl-common-devel-2023.0.0-2023.0.0-25398_all.deb 4584320 BLAKE2B 4b172c61def3834d6c9c2ab82345c96fb474839af1abf56da280230fb69e4e01ebeabf5e9bed1dc394bc813595f3f6d0c104e9e7457de2366e17c6e83ce014b0 SHA512 9f300fd9950c734b10e846ccf21ff579dd761158c6e74f33acb77a8f636956c789f67b6757d9ff5e6ae7292782782556b158b413535b39fd39b80a45c634a017
+DIST intel-oneapi-mkl-common-devel-2023.1.0-2023.1.0-46342_all.deb 4661052 BLAKE2B 4cd1504982ce103a0654223e34e3c61fdb0b8759120cb8efb9750e5e0a728ea33b5c34d237bee07591ae32976ea96fa447b745a297061c54e6285a48dcdbec42 SHA512 877c758cc79d4b6239a0cf57b363f7a869b0794caf80f72eeeae9252544d8c2bafabd9f356f1b43839560d394218652e86a7983f30879523009bc144e5b2e814
 DIST intel-oneapi-mkl-devel-2022.2.1-2022.2.1-16993_amd64.deb 183600754 BLAKE2B 94373a9d71625f71fb406d302eabed7800dc1b0e0ffef6268bf93abdccb8da4adb87643ebe73cd187fe1432b43e6de4eee4b716bb67a483c862e1beef0db486a SHA512 a259580266798e16b6fe6195cfacb1cdd9ae519c86945e7df29b7eff344fbfb238b0126231a99d2190cdbdba6340dce3f40574f443efd09b4955c86260d331da
 DIST intel-oneapi-mkl-devel-2023.0.0-2023.0.0-25398_amd64.deb 171354314 BLAKE2B 27ddc4f1fe09d688e2593e30d1de49505ccf5ac3d8ce50105f29ed451cf402df064419e3795b7f7aeed499fb6fd3191cce0099fa85a20fe90e06cc82415b1c79 SHA512 2688e1ca91bfce33026fd5853d04aa510318d2e6f154755afa2103ba797119b0e2c19718e1180b96fce89d704b9b8d5d3995788320296861b498e18420470572
+DIST intel-oneapi-mkl-devel-2023.1.0-2023.1.0-46342_amd64.deb 171338710 BLAKE2B 7f804f88e88c1bc28c0b2470a703815e33e44fe6e4dacd179095c430a46db34f97f863b3169b96e74f67e14c285f3adf99ff04c60c40e495e17f2a947fc03387 SHA512 1ef5cb3a161b3d2fcf6c1e4a13e696abc8756a9d05723fd7d9c514bf2469f787e9e56f8696fbad25d3102a6d84063fc61daae6b514188c021f5e6b00d67a8dd9
 DIST mkl-2020.4.304.tar.gz 549319314 BLAKE2B 9ffdb0dc87c9fba1f003961f09cabef7376bd3d10e98085900c863383f0eb1e026f0f804390b2edf4e29d5b0b685af7b74092a7cb5cc871ca656462cec9487e4 SHA512 9c4ff7710484a1c0dd3e6ba7401eb6cb599f771651006b6a570c45b9abf1f43e8e400940d859a656c6892aa81e634c4d74eefe88e8287fdbb19a513f332326b7
 EBUILD mkl-2020.4.304.ebuild 6674 BLAKE2B abe1ed5d32ba1114aee0aa33c4b0259f1ce6f241dbfc146f344903ea5d815e81b4059a54df0ab2b934b3dd672f1471666565989981ed54bbf15283411e7bd8c1 SHA512 3deaa4858df6b8ddb58755ddcbfd62d11ea98af5b38597cfa916b80cf59b23fe043dd667b9b6c2f1d458545579002f07d375a484e0896aa7f6ef5572021baeae
 EBUILD mkl-2022.2.1.16993-r1.ebuild 4912 BLAKE2B dacb260aa27721d07f0090366aa7f1472d44e4bbcd805261fbc3ee19c4532d2d407d9c6beb02beab5b8075105cb2ac463fe3fd40e79438cbb924e4aec97c4797 SHA512 ef77d05f773bda971ba5e299caa8341d7dfbd510579f8bc28e1bd169da93f71fbee8bc192237be84598d32dcf17e4ba08d944d00936d04e84bcdd1dc64aeae77
 EBUILD mkl-2023.0.0.25398.ebuild 4950 BLAKE2B c3cacb5731d55a6233fe86d5751f459edc863c546b2944421a3dac97d60eff57bcde0873e1abb265385322434d45cfca93090d07a09c4b9d92ec6b38753d51cb SHA512 a9b6aeaf662d778fab1aeb92457e57f500982e2ed327f9ed3ce6e8921e7b0e1e48493a5b682b0502501fc2743b4b369c64dfbafd4959436e3716d868a936b1f7
+EBUILD mkl-2023.1.0.46342.ebuild 4959 BLAKE2B e593f91855284957f30740de013957844a223965b96ceacd4a0adc80d6fd0872bfd100c82bb66ffb6bfb402e014ac73e8d9a440d10f3ea72fb854e0c0b4d58c8 SHA512 11025d5133313e4e3f964cdae993b3bffd20a6937b08b0b09eea9fbaeea51b81bc1bef6b58c6bdc2cee6ba7c9eed49baa154383e639a22f286c0d3341e8bb08c
 MISC metadata.xml 799 BLAKE2B 98a214e275d4d4930086f0dd1695c4d5dfd44da3399f77cc1f839e403423050c6d20f7b38892bd9ff96e5e8578a4c83ff8979e6505dfb67417c6dbb40fe59500 SHA512 3b609c66ec90f057cb16c6721e6a5bfd6a3522a1ff2bba47e2a77212e26f06fb850be8b178a0a2020f751882ddd32fda082879c7f5a9b008c041ce493f55d28a
diff --git a/sci-libs/mkl/mkl-2023.1.0.46342.ebuild b/sci-libs/mkl/mkl-2023.1.0.46342.ebuild
new file mode 100644
index 000000000000..973afe5ca76e
--- /dev/null
+++ b/sci-libs/mkl/mkl-2023.1.0.46342.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+DESCRIPTION="Intel Math Kernel Library"
+HOMEPAGE="https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html"
+SRC_URI="
+	https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_amd64.deb
+	https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-devel-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_amd64.deb
+	https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-common-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_all.deb
+	https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-${PN}-common-devel-$(ver_cut 1-3)-$(ver_cut 1-3)-$(ver_cut 4)_all.deb
+"
+S="${WORKDIR}"
+
+LICENSE="ISSL"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="strip"
+
+# MKL uses Intel/LLVM OpenMP by default.
+# One can change the threadding layer to "gnu" or "tbb"
+# through the MKL_THREADING_LAYER env var.
+RDEPEND="
+	app-eselect/eselect-blas
+	app-eselect/eselect-lapack
+	dev-cpp/tbb
+	dev-libs/opencl-icd-loader
+	sys-cluster/mpich[fortran]
+	sys-libs/libomp
+"
+# bug #801460
+BDEPEND="
+	app-arch/xz-utils[extra-filters]
+	app-eselect/eselect-blas
+	app-eselect/eselect-lapack
+"
+
+QA_PREBUILT="*"
+QA_TEXTRELS="*"
+QA_SONAME="*"
+
+src_prepare() {
+	default
+	# Drop conda stuff
+	rm -r opt/intel/oneapi/conda_channel || die
+}
+
+src_install() {
+	# Symlink pkgconfig and cmake files
+	pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/pkgconfig" || die
+	for file in *.pc; do
+		dosym "../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/pkgconfig/${file}" "/usr/share/pkgconfig/${file}"
+	done
+	popd || die
+	pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/cmake/mkl" || die
+	for file in *.cmake; do
+		dosym "../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/cmake/mkl/${file}" "/usr/$(get_libdir)/cmake/mkl/${file}"
+	done
+	popd || die
+
+	# Symlink files in locale directory
+	pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/locale/en_US" || die
+	for file in *; do
+		dosym "../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/locale/en_US/${file}" "/usr/share/locale/en_US/${file}"
+	done
+	popd || die
+
+	# Move everything over to the image directory
+	mv "${S}/"* "${ED}" || die
+
+	# Create convenience symlink that does not include the version number
+	dosym "$(ver_cut 1-3)" /opt/intel/oneapi/mkl/latest
+
+	dodir /usr/$(get_libdir)/blas/mkl
+	dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libblas.so
+	dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libblas.so.3
+	dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libcblas.so
+	dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libcblas.so.3
+	dodir /usr/$(get_libdir)/lapack/mkl
+	dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapack.so
+	dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapack.so.3
+	dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapacke.so
+	dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/lapack/mkl/liblapacke.so.3
+
+	newenvd - "70intel-mkl" <<-_EOF_
+		MKLROOT="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)"
+		PATH="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)/bin/intel64"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)/bin/intel64"
+		LDPATH="${EPREFIX}/opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64"
+	_EOF_
+}
+
+pkg_postinst() {
+	local libdir=$(get_libdir) me="mkl"
+
+	# check blas
+	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
+	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
+		eselect blas set ${libdir} ${me}
+		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+	else
+		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
+		elog "To use blas [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect blas set ${libdir} ${me}"
+	fi
+
+	# check lapack
+	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
+	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
+	if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
+		eselect lapack set ${libdir} ${me}
+		elog "Current eselect: LAPACK ($libdir) -> [${current_blas}]."
+	else
+		elog "Current eselect: LAPACK ($libdir) -> [${current_blas}]."
+		elog "To use lapack [${me}] implementation, you have to issue (as root):"
+		elog "\t eselect lapack set ${libdir} ${me}"
+	fi
+}
+
+pkg_postrm() {
+	eselect blas validate
+	eselect lapack validate
+}
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index abec6675028b..55b921410e2d 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,5 +1,5 @@
 AUX netcdf-4.7.4-big-endian-test.patch 689 BLAKE2B ab28269ee5922816e7ef7834dddec974c98951a41c0025041f9ee67d92c7bfe57887f5ac8d8beb2426e2c095fc06cf4b29046a9b29873b125d681b169c9613b6 SHA512 72575f890615a05a6f1beeebfd3edcd367fe148be017a32847b0a7db96c594e6bb5d01acd865257b25410e0a22699b1beef2c54748ccb09ea5e41009f4e0f9ee
 DIST netcdf-c-4.9.2.tar.gz 7142536 BLAKE2B b24135070d2f1f0b53fe738f8839039547eceba16d36905bb8cd7be983ce0c1127b7b01ae37dbde50087aa82fd56f00fab9bfa75c7d94fd4478031bb8a6da247 SHA512 7a96bcf673d5a9e1537d660aaf085a1dfaefc7dfb0fc96358462d92e7bbfe541184583681797e6a54d11b8588504b7d8a9b0b9bd850eecd02ed73aa2eb5ffa0d
-EBUILD netcdf-4.9.2-r1.ebuild 2581 BLAKE2B 4b867ebfdad081fa37b066cb6c5cb027a44b26ff99c4020f6f8e68988c6b359134210db5decc8541de1d4bab3211dec3bd06c33983cc3be44e52d4ec2328b7e2 SHA512 d9c83ea652c8596cd96a11d08e72f95a4ced271e5b274f2743d53ba72014558b9d9895bed0e53f2dabaa6ea0555071b7a6cecf4e8f058a9730c96f7e2295dbad
+EBUILD netcdf-4.9.2-r1.ebuild 2580 BLAKE2B ea72380f73e38805a163e8596ac9d7509ee624bd8fd57273129d2d4f6b3da9442902b0f594a5fcc603d42a4a391830859b583b9de7f60cb463360a5b2849d0f4 SHA512 108f46f7e579f4404dddc3d928d8a331752028027831b14ef4f7ffe2abefb065876e7ded299ed36d3de8c84d510ed85d120b7456b1efb20001c52b7142cdfefd
 EBUILD netcdf-4.9.2.ebuild 1654 BLAKE2B 659bd08ff2776a86da5b6496cf9fc92e5b0bf8bd356f56dcfd6d1ea8ee5b6bf8bd2c51c19ccd035415b43c29bd5ddd3a41a5602a920252347e6abc1b196166b5 SHA512 a4ed28c724d7b6242fb2a48ebc667a5a4fc8ce57bf38ace9986a73fb9e32d5ba30c61f0bf66eca47cc839d2ed25af5b2d11553a47648f56d5d87ee43da90499d
 MISC metadata.xml 1131 BLAKE2B 2578a44e7142d8d072820f31db58de4e5550e4e9d1b3fb7d420f7d41d810580b98757d7fead672e28ea615820fa3e7f27738fe6a04c4201250596f8b37533271 SHA512 77b14836750cc93bbc38613c00ef125ebc89705bcc29b68823675662fdaeb1ddb43d6c0023a71920e23e458bd10c55e89248676fa7994d6d15992c9fdc2bce38
diff --git a/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild b/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild
index 45758fb6ef38..56d9ef1d3d0e 100644
--- a/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild
+++ b/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-c-${PV}
 LICENSE="UCAR-Unidata"
 # SONAME of libnetcdf.so
 SLOT="0/19"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 -riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="blosc bzip2 +dap doc examples hdf +hdf5 mpi szip test zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/onnx/Manifest b/sci-libs/onnx/Manifest
index 6978beae5e2f..ffa69d160e36 100644
--- a/sci-libs/onnx/Manifest
+++ b/sci-libs/onnx/Manifest
@@ -1,4 +1,6 @@
 AUX onnx-1.15.0-hidden.patch 511 BLAKE2B 857a4ff9597a25430e2236c2d9de47c1203e630a4adfe8e4cdb72ddfb928f0327e2a625ad91e936e4d3f71bc4aa135bbd15abcf348958238075d356d47d3291b SHA512 a4dbcbae79af1ef1edc8ec8aa27eb0303c1a52baf7db74e70f2d1e6a35db7d5ed2205f7f10f34fdcd3ac536b029edf749b9eb8f7926ac2b620ac7a4b59884182
 DIST onnx-1.16.0.tar.gz 12428161 BLAKE2B b0d16212c527078fcbe46af8efaf8bfccb0a22825cfee3c88728314599bc90f5b43ae407cc9ec10300ed19367dff769a5d6ba29d2faa61fd8e27029e2d64e83a SHA512 ef641447d8d6c4ed9f083793fe14a8568d6aa7b9b7e7b859a4082e9b892acd801230da2027d097ceaa0d68bbd37b2422b89bb7d1d55d5c3b5955c0f9c7c657c5
+DIST onnx-1.16.1.tar.gz 12428832 BLAKE2B 15a7db2fa263914957c671bd8e94eb8b80afeba0b396e8b54f8fb2deda2965885055efae7a6f6e402eb085b5795025020f650132023ba3d4df1f395d99ec353c SHA512 0ae1b36563ddeaa9947bf452eb20b83174e4c2bc4696b61768f096c401666323343fac0f699f756da99d3c29df15a0bd78fe3fa51da15f133617d7310c5b28d4
 EBUILD onnx-1.16.0-r1.ebuild 1472 BLAKE2B 9ad73dba0ab42f4befaea9e49b497fae33b642ee350e3612bd830e4ab9e30452a82905f8fd9cb6bfde28663b2c173b1b8cea93e38cde264d99d259bd7fb82868 SHA512 3e7f0caae489f2cd95db713f5d30de754069679dbb8fdd7d1ce3ae7d1a031cb041b507acaeb1dd1322fc45405ef0588a1aad13f140b5ba1b472035b71824296f
+EBUILD onnx-1.16.1.ebuild 1472 BLAKE2B 9ad73dba0ab42f4befaea9e49b497fae33b642ee350e3612bd830e4ab9e30452a82905f8fd9cb6bfde28663b2c173b1b8cea93e38cde264d99d259bd7fb82868 SHA512 3e7f0caae489f2cd95db713f5d30de754069679dbb8fdd7d1ce3ae7d1a031cb041b507acaeb1dd1322fc45405ef0588a1aad13f140b5ba1b472035b71824296f
 MISC metadata.xml 404 BLAKE2B 363f1790f0dd2eace0368d7eb1875c166ba6dd0b2514232050f2f1813ccba854b4f8e58e22a329792126188f06d21bf87436c1dcc10d68b018f7abc8eb8ec3e9 SHA512 6a80de77d763a261cafee9cd69337de5282fa39772a1d2a82c3d954d29221596036346339926a124f9df9b261050d17b58d004cdd01ff2f57347379e9df2e45f
diff --git a/sci-libs/onnx/onnx-1.16.1.ebuild b/sci-libs/onnx/onnx-1.16.1.ebuild
new file mode 100644
index 000000000000..16f073d9b4d3
--- /dev/null
+++ b/sci-libs/onnx/onnx-1.16.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{10..12} )
+inherit distutils-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 ~riscv"
+IUSE="disableStaticReg"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-libs/protobuf:=
+"
+DEPEND="${RDEPEND}
+	dev-cpp/abseil-cpp"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-1.15.0-hidden.patch
+	cmake_src_prepare
+	distutils-r1_src_prepare
+}
+
+python_configure_all()
+{
+	mycmakeargs=(
+		-DONNX_USE_PROTOBUF_SHARED_LIBS=ON
+		-DONNX_USE_LITE_PROTO=ON
+		-DONNX_BUILD_SHARED_LIBS=ON
+		-DONNX_DISABLE_STATIC_REGISTRATION=$(usex disableStaticReg ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_configure() {
+	distutils-r1_src_configure
+}
+
+src_compile() {
+	mycmakeargs=(
+		-DONNX_USE_PROTOBUF_SHARED_LIBS=ON
+		-DONNX_USE_LITE_PROTO=ON
+		-DONNX_BUILD_SHARED_LIBS=ON
+		-DONNX_DISABLE_STATIC_REGISTRATION=$(usex disableStaticReg ON OFF)
+	)
+	CMAKE_ARGS="${mycmakeargs[@]}" distutils-r1_src_compile
+}
+
+python_compile_all() {
+	cmake_src_compile
+}
+
+python_install_all() {
+	cmake_src_install
+	distutils-r1_python_install_all
+}
+
+src_install() {
+	distutils-r1_src_install
+}
diff --git a/sci-libs/openlibm/Manifest b/sci-libs/openlibm/Manifest
index 4d0281f1047a..ada134ecc10f 100644
--- a/sci-libs/openlibm/Manifest
+++ b/sci-libs/openlibm/Manifest
@@ -1,5 +1,8 @@
+AUX openlibm-0.8.3-stack-protection.patch 2065 BLAKE2B 213710329df83d08798cea61d952e6ced7218bad7e80eb9ee8004ccbfaf85a27fc70fb1ac4f6f5b313b47453be1197567296c8cca23fcd65ad037599ff0b17a7 SHA512 7e750cdb2fe9871b1e83291ffac5d255a73f2f577b05f3a3dcb35ee919c38fa26980416d38352805b1b32f91de3b7bcba8fab0f0757bb506786ddbdeb4429739
 DIST openlibm-0.7.5.tar.gz 366889 BLAKE2B cd892965122237783cc288e57c965ae56d26fdcce93d89dd764ba659d292ade20baa754af303f04b831902f62f95388e2e7e11c050a0712a235bbc5793f2a9c4 SHA512 fe5797f49e9f9ac70485c53c6096ac273c33c7b44fbb694788717f0e427fe9a8e121939c4c1334f2d20f2fe1f440d952cc20cbdd49717996a2fb9a1045b05799
 DIST openlibm-0.8.0.tar.gz 367130 BLAKE2B e516fee18203040b8f3cdffab10c4ca22df638551b420ec7e679ff373221973a013c93520b29395c61c8ef0f0f6c87516c1d4a9885c3bbb5e8cae8900efee6ea SHA512 336dfac1fd4ab6ce256aa0129a211c3556eac46d2e775e5cec9626dc5bbcb4d5e65c86617d72e531694e8c8e6320a0fabc76600a02b0ac9f1d652774d0a94440
+DIST openlibm-0.8.3.tar.gz 374991 BLAKE2B 91474b5c9480753dafb2f85521a8909eaa00febc871bd71d6ffecfd1001200ce66c66c43f4f5738215f04bc109035dcceb2a9f6319e8b9405e6cab65e802aafb SHA512 1c6969e6e3117ddc066697318e43cf42d170750cb85cbed6013eb29d7513d5998eeffbff4a658d222cf637977cb7dca34b7a15814f8870f4e36e880673d757c0
 EBUILD openlibm-0.7.5.ebuild 820 BLAKE2B de0436b2b7598936c32951ad3063a4eea11d4f34f16abb30c675d387948cd44eb832c25b7ae6004bba879061d56fd97684761a06eb47619c7d408b0f1384a7d4 SHA512 3d96a505d1f15647ab229e5ef1f1e60f1b1ff9cdb063af2bc20e07b6eee49d76ac2e61939f2f948e311fef034af7c42c75b465110ef748dd770aefcc343d3862
-EBUILD openlibm-0.8.0.ebuild 890 BLAKE2B 452fc8fa61be18602db28ae60890f7aa87066b8f545255eb7560293349107dbe649846876758d82e1c8b553cfb8bf05d20c0cbba60f64f19933a36e2901a72e4 SHA512 6681605b4ba916b934be47c37cdfab8e80896212a6dcf8d26423ddbdaac6c0cd90270fd8f6631a8fdfb545fd198130d81eb6ac045a2e55f567746f2273985cbc
+EBUILD openlibm-0.8.0.ebuild 908 BLAKE2B f966b0c1ce4c6437061fc01caf15c79634350222865e7bea12da31897805bb56d50c43a75fa63060bf0a369b2c4ff394ce559ae0a26a171f9279859662ec0e8c SHA512 a62983295d2e90209e97b311e95d67e93bb2203d66bb9d9b1ba5aa00c034ab4b082bd34dd1fa25b5b2c9abfcbfed98938bf22aa278cfd3e494e17a02716f8f4d
+EBUILD openlibm-0.8.3.ebuild 1129 BLAKE2B 601582977548fd2517cd5908dedfb30d02d4b8358fb9e0ae4250b7e6e9ed46ad6bb7b1d55de3cd37926f702bef0231ff598b818f6ebb6842813161178ba192ae SHA512 8a98ad2018d53ec3b041f5da181ca353ffc59c51792ea7a102fdbd6b26e296e99d22e8c85aeacf044c2fc3031e7b949a22fb5779cbc29fa1fc3edd3a7b7b7d02
 MISC metadata.xml 785 BLAKE2B 160415de6f1dd61dfe42488a2aaf716bb6ecb00396ae541c8b385116fb0b5017bc546fdcdd6394ce5c547cd85e7ccf94b7996128355ce3fa9fc7b17478c2949d SHA512 cdc602bce059702ad03d57a67ad9e2897fdcf999fd2d664e76293ddd22741817a042abafd6603c424839780d30b647a82901c468a5d55dc1794fdafd2a281b8c
diff --git a/sci-libs/openlibm/files/openlibm-0.8.3-stack-protection.patch b/sci-libs/openlibm/files/openlibm-0.8.3-stack-protection.patch
new file mode 100644
index 000000000000..91e28b238624
--- /dev/null
+++ b/sci-libs/openlibm/files/openlibm-0.8.3-stack-protection.patch
@@ -0,0 +1,73 @@
+# https://github.com/JuliaMath/openlibm/pull/307
+From 435459ec45b368e618578d2a526edd0c51709ad1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakov=20Smoli=C4=87?= <jsmolic@gentoo.org>
+Date: Mon, 5 Aug 2024 00:02:28 +0200
+Subject: [PATCH] Add stack markings for GNU to fmod assembly files
+
+This adds stack markings to the missing fmod .S files, otherwise the
+final libopenlibm object file gets marked with an executable stack.
+
+Output when compiling from source on Gentoo Linux:
+
+```
+ * QA Notice: The following files contain writable and executable sections
+ *  Files with such sections will not work properly (or at all!) on some
+ *  architectures/operating systems.  A bug should be filed at
+ *  https://bugs.gentoo.org/ to make sure the issue is fixed.
+ *  For more information, see:
+ *
+ *    https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart
+ *
+ *  Please include the following list of files in your report:
+ *  Note: Bugs should be filed for the respective maintainers
+ *  of the package in question and not hardened@gentoo.org.
+ * RWX --- --- usr/lib64/libopenlibm.so.4.0
+```
+---
+ amd64/e_fmod.S  | 5 +++++
+ amd64/e_fmodf.S | 5 +++++
+ amd64/e_fmodl.S | 5 +++++
+ 3 files changed, 15 insertions(+)
+
+diff --git a/amd64/e_fmod.S b/amd64/e_fmod.S
+index 37cae39..d2c8ecd 100644
+--- a/amd64/e_fmod.S
++++ b/amd64/e_fmod.S
+@@ -49,3 +49,8 @@ ENTRY(fmod)
+ 	fstp	%st
+ 	ret
+ END(fmod)
++
++/* Enable stack protection */
++#if defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff --git a/amd64/e_fmodf.S b/amd64/e_fmodf.S
+index 197892e..b045e73 100644
+--- a/amd64/e_fmodf.S
++++ b/amd64/e_fmodf.S
+@@ -19,3 +19,8 @@ ENTRY(fmodf)
+ 	fstp	%st
+ 	ret
+ END(fmodf)
++
++/* Enable stack protection */
++#if defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff --git a/amd64/e_fmodl.S b/amd64/e_fmodl.S
+index 64be92f..cab539d 100644
+--- a/amd64/e_fmodl.S
++++ b/amd64/e_fmodl.S
+@@ -45,3 +45,8 @@ ENTRY(fmodl)
+ 	fstp	%st(1)
+ 	ret
+ END(fmodl)
++
++/* Enable stack protection */
++#if defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+-- 
+2.44.2
+
diff --git a/sci-libs/openlibm/openlibm-0.8.0.ebuild b/sci-libs/openlibm/openlibm-0.8.0.ebuild
index 3d2362897851..df09fa8e2592 100644
--- a/sci-libs/openlibm/openlibm-0.8.0.ebuild
+++ b/sci-libs/openlibm/openlibm-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ IUSE="static-libs"
 LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+"
 # See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm
 SLOT="0/4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
 
 src_prepare() {
 	default
diff --git a/sci-libs/openlibm/openlibm-0.8.3.ebuild b/sci-libs/openlibm/openlibm-0.8.3.ebuild
new file mode 100644
index 000000000000..1751c8a9d1f2
--- /dev/null
+++ b/sci-libs/openlibm/openlibm-0.8.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="High quality system independent, open source libm"
+HOMEPAGE="https://github.com/JuliaLang/openlibm"
+SRC_URI="https://github.com/JuliaMath/openlibm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="static-libs"
+LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+"
+# See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm
+SLOT="0/4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-stack-protection.patch
+)
+
+src_prepare() {
+	default
+	sed -e "/^OLM_LIBS :=/s/^/#/" -i Makefile || die
+	if ! use static-libs ; then
+		sed -e "/install: /s/install-static//" -i Makefile || die
+	fi
+}
+
+src_compile() {
+	# Build system uses the riscv64 arch variable
+	use riscv && export ARCH=riscv64
+
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		FC="$(tc-getFC)" \
+		AR="$(tc-getAR)" \
+		LD="$(tc-getLD)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+		libdir="${EPREFIX}/usr/$(get_libdir)" install
+	dodoc README.md
+}
diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest
index fcee52f1d4eb..9d181f66c9bc 100644
--- a/sci-libs/pastix/Manifest
+++ b/sci-libs/pastix/Manifest
@@ -1,11 +1,8 @@
-AUX pastix-5.2.3-MPI-3.0.patch 5490 BLAKE2B 8e77cbdbf0857909d6e70570fe27cfeb977e7d3380298ad30e42c8194dc79241e16cb378d2a8da065dd142704530289d6508f87800e171bd6865877d802584cf SHA512 bd142ea25596d28d4962154fd24a4d66b4ab0cc2de9e662ad89e56695ca3e078d79848757efa2f02a3e1920c133d0c9d0b697efd5d9aef3008e07b3c91b16289
 AUX pastix-6.0.3-cmake-examples-optional.patch 5248 BLAKE2B eb6e08274d2bbac53c4fe02497880f61a83eb357dc95ec6ea1049322556010a0e5514d8c6d0f273b00b7b46047394edf2108ee14ef0cde65f99ebe1eb2160786 SHA512 00c214c45cf4a1c06ca4dcf3cffde9915de67f2656b0712ca23f6ff2c4aa29845f37fd7940d011fbbba170d3a47b6d74ec6cb165474c2eb30a292374e0d52953
 AUX pastix-6.0.3-cmake-installdirs.patch 13450 BLAKE2B 9c7535b4074496a97d0673fad73e7729f34c71ad992441fa2dbc1d8801b6cf1d74773872b71fad5dec8f21ac26065abf0e7de12cbec2c9a52098be6368dd7b31 SHA512 89de15236d23fb8e7f9d064789e2a6314a615803a41deeb08f22f4ee5aea92263da939ce967310fd93a5cd89051c0f0a0d3df71b0ea4968cefbec3c5cf5185fe
 AUX pastix-6.0.3-cmake-python-optional.patch 1861 BLAKE2B 5097879c1481ce7514903a182007d0d87a9e59a350f72ebba21b5719e893308617416c3661058744f7a83009cb6c7d8949ba6e57966e0a798aa4b1c96aa1f928 SHA512 ecff70d902a4424b4ee996b563e54b7190ee1d3324ef7079fafdef2f23abbc9a18899f827156ed4145a3d977f5b6c980acafb96f479be693b6658f7d21e5cced
 AUX pastix-6.0.3-cmake-spm-project.patch 319 BLAKE2B 11d63d28bb5e843571306321a0c3153eac0cfa5150918db2ae019d8defda1689dd41d584bbd866f4016f3f98102c61a4bb5a18419f88bfc197cd3659afb95311 SHA512 58aebfea042443daf75fb155c39d44e5a2d4ffdc27043b66a6c6089613363b0613ab8ac9e11cde1b749e87ec160aaa0355a0c3a2bb01fbedb43c4d28951e7747
 AUX pastix-6.0.3-multiple-coeftabMemory.patch 260 BLAKE2B 968d32d2994afca84fcee7bc4b93aa7cf77dda2d66c2617095ee191572fb9c37d631e83954efdb53aba0997b426f85a6529d40a3c8f85f62de684548cc760447 SHA512 2f73d7f2ebbc92b46f13e0bed42ed76fd6831af5706988e5111971adb3ba46d8bca9fd563f40cb8a10fae1a65e180c2f1866b51ab0c4c95ef801c590513301f2
 DIST pastix-6.0.3.tar.gz 1793579 BLAKE2B 9e0ee71c80b2c93c6762c1a824b2e1262fd1a9f406194fb99eeecbfc172cf82f497d23a541b56c44e5487c3c228cab781f47f683ee04c6cdf426da6126750a69 SHA512 5bf8dfa6ed02ee7e236c63e21c80bd45af807b465b21a8c0520b1328e179095f1416f925be9f8b5ec0e8078ca9bc4398bf0d091fdc8e9ea51b9af12a06d9a544
-DIST pastix_5.2.3.tar.bz2 2246903 BLAKE2B b13cb31bbc2aeb122e932b2a934598ec975a55f327483bf1383280976584858426c56982f6980b52f32f04e05c6e6c8de1cf35e378e61a7be9dddb705b1c033a SHA512 69acffac1be8c756886783c2a6307269ab4d14abfc4a77268b3d14995e53b16084c298446812484233d9d52c317490d6ad67788166adf367075e6c8442147b95
-EBUILD pastix-5.2.3.ebuild 3456 BLAKE2B e9e4935b9eb71023e9a747542fdcd3013c22eea43bc4d6ff0382418da05fe5b352d55be3d517514a1e2abbf46168fb741f9c42ed6d64e5446d6dc77dcd513260 SHA512 4759301acea56b4197dbd098878909521cc9336c0406a4dc0929d5bf4c9c428cbca65016d6c4fa7a340dd46a76cc1b75d4f7881b82ec2ab493f237e67354abd0
-EBUILD pastix-6.0.3.ebuild 2448 BLAKE2B 04f269eb2926adaea198382188b0d8eeef9dab4d6b4a7283ee551cc3c784039ad5a659f52e488ae9ac2bde3f262c16f4301c355c81837cc5f52bae76aff164e7 SHA512 b5b3a23aa9c88638562af1c4373ca478dd7aa28a121b97f1f77504a0e1c17a7461baadf92a0bd2bc3d71931d5ac4d7f590de2dc0f60eaea432a65c903dbe4c88
+EBUILD pastix-6.0.3.ebuild 2448 BLAKE2B 8d8e566725bb16d679c646e4fe82cd61dbfbe26cbd7be81ac36cade527762aba89a9b75daf836e8a32bb143c8d20828d367391815995d7d20ed0f49b8173aee3 SHA512 f447c38370e2ca95d70186fb5787cc2f2982b55d2b000943a4f98ec04d0f3bed9376cbff8bedd7ee7c162e7f10c69d0eb70fab20bf4c94a562b685916e240ad7
 MISC metadata.xml 1318 BLAKE2B fbb4b85fdfda84ea9b836c615710c7edab402a579945cdda7e2df80bfc5f0c68065509de5ddf19ce3cb164c12f1adee899b73167f074294797482eb208f0949a SHA512 ba29b7c771890999442726d6863e86c12e9994bb020d4b5ee81638fa079a05985e4f721436362c4b48aab901f6414e92a713b594178ec93682134356dac08a55
diff --git a/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch b/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch
deleted file mode 100644
index d86ec5b78416..000000000000
--- a/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-https://bugs.gentoo.org/692742
-rename MPI 1.0 to 3.0+ functions:
-- MPI_Address -> MPI_Get_address
-- MPI_Type_struct -> MPI_Type_create_struct
-
---- a/common/src/nompi.h
-+++ b/common/src/nompi.h
-@@ -127,9 +127,9 @@
- #define MPI_Start(request)
- #define MPI_Startall(count, array_of_requests)
- #define MPI_Type_contiguous(count, oldtype, newtype)
--#define MPI_Type_struct(count, array_of_blocklengths, array_of_displacement, \
-+#define MPI_Type_create_struct(count, array_of_blocklengths, array_of_displacement, \
-                         oldtype, newtype)
--#define MPI_Address(location, newtype)
-+#define MPI_Get_address(location, newtype)
- #define MPI_Type_commit(datatype)
- #define MPI_Type_free(datatype)
- #define MPI_Request_free(request)
---- a/sopalin/src/sopalin_sendrecv.c
-+++ b/sopalin/src/sopalin_sendrecv.c
-@@ -1300,10 +1300,10 @@
-   thread_data->gtaboffs[packnbr]   = FANIN_INFOTAB(t);
-   thread_data->gtaboffs[packnbr+1] = FANIN_COEFTAB(t);
- #else /* NO_MPI_TYPE */
--  CALL_MPI MPI_Address(FANIN_INFOTAB(t),&(thread_data->gtaboffs[packnbr]));
--  TEST_MPI("MPI_Address");
--  CALL_MPI MPI_Address(FANIN_COEFTAB(t),&(thread_data->gtaboffs[packnbr+1]));
--  TEST_MPI("MPI_Address");
-+  CALL_MPI MPI_Get_address(FANIN_INFOTAB(t),&(thread_data->gtaboffs[packnbr]));
-+  TEST_MPI("MPI_Get_address");
-+  CALL_MPI MPI_Get_address(FANIN_COEFTAB(t),&(thread_data->gtaboffs[packnbr+1]));
-+  TEST_MPI("MPI_Get_address");
- #endif /* NO_MPI_TYPE */
- 
-   /* Add other contribution for the same task */
-@@ -1410,12 +1410,12 @@
-           thread_data->gtaboffs[packnbr]   = FANIN_INFOTAB(t);
-           thread_data->gtaboffs[packnbr+1] = FANIN_COEFTAB(t);
- #else /* NO_MPI_TYPE */
--          CALL_MPI MPI_Address(FANIN_INFOTAB(t),
-+          CALL_MPI MPI_Get_address(FANIN_INFOTAB(t),
-                                &(thread_data->gtaboffs[packnbr]));
--          TEST_MPI("MPI_Address");
--          CALL_MPI MPI_Address(FANIN_COEFTAB(t),
-+          TEST_MPI("MPI_Get_address");
-+          CALL_MPI MPI_Get_address(FANIN_COEFTAB(t),
-                                &(thread_data->gtaboffs[packnbr+1]));
--          TEST_MPI("MPI_Address");
-+          TEST_MPI("MPI_Get_address");
- #endif /* NO_MPI_TYPE */
- 
-           if (queueSize(sendqueue))
-@@ -1508,10 +1508,10 @@
-   TEST_MPI("MPI_Rsend");
- #  endif
- #else /* NO_MPI_TYPE */
--  CALL_MPI MPI_Type_struct(2*(packnbr/2+1), thread_data->gtabsize,
-+  CALL_MPI MPI_Type_create_struct(2*(packnbr/2+1), thread_data->gtabsize,
-                            thread_data->gtaboffs,
-                            thread_data->gtabtype, &newtype);
--  TEST_MPI("MPI_Type_struct");
-+  TEST_MPI("MPI_Type_create_struct");
-   CALL_MPI MPI_Type_commit(&newtype);
-   TEST_MPI("MPI_Type_commit");
- #  ifdef TEST_ISEND
-@@ -1602,15 +1602,15 @@
-               (long)me, (unsigned int)(intptr_t)BTAG_COEFTAB(t));
- 
- #ifndef NO_MPI_TYPE
--  CALL_MPI MPI_Address(BTAG_BTAGTAB(t),&(taboffs[0]));
--  TEST_MPI("MPI_Address");
--  CALL_MPI MPI_Address(BTAG_BCOFTAB(t),&(taboffs[1]));
--  TEST_MPI("MPI_Address");
--  CALL_MPI MPI_Address((void *)BTAG_COEFTAB(t),&(taboffs[2]));
--  TEST_MPI("MPI_Address");
-+  CALL_MPI MPI_Get_address(BTAG_BTAGTAB(t),&(taboffs[0]));
-+  TEST_MPI("MPI_Get_address");
-+  CALL_MPI MPI_Get_address(BTAG_BCOFTAB(t),&(taboffs[1]));
-+  TEST_MPI("MPI_Get_address");
-+  CALL_MPI MPI_Get_address((void *)BTAG_COEFTAB(t),&(taboffs[2]));
-+  TEST_MPI("MPI_Get_address");
- 
--  CALL_MPI MPI_Type_struct(3,tabsize,taboffs,tabtype,&newtype);
--  TEST_MPI("MPI_Type_struct");
-+  CALL_MPI MPI_Type_create_struct(3,tabsize,taboffs,tabtype,&newtype);
-+  TEST_MPI("MPI_Type_create_struct");
- 
-   CALL_MPI MPI_Type_commit(&newtype);
-   TEST_MPI("MPI_Type_commit");
---- a/sopalin/src/updo_sendrecv.c
-+++ b/sopalin/src/updo_sendrecv.c
-@@ -347,12 +347,12 @@
-   tabtype[0] = COMM_INT;
-   tabtype[1] = COMM_FLOAT;
- 
--  CALL_MPI MPI_Address(infotab,&(taboffs[0]));
--  TEST_MPI("MPI_Address");
--  CALL_MPI MPI_Address(FANIN_COEFTAB(SOLV_FTGTIND(j)),&(taboffs[1]));
--  TEST_MPI("MPI_Address");
--  CALL_MPI MPI_Type_struct(2,tabsize,taboffs,tabtype,&newtype);
--  TEST_MPI("MPI_Type_struct");
-+  CALL_MPI MPI_Get_address(infotab,&(taboffs[0]));
-+  TEST_MPI("MPI_Get_address");
-+  CALL_MPI MPI_Get_address(FANIN_COEFTAB(SOLV_FTGTIND(j)),&(taboffs[1]));
-+  TEST_MPI("MPI_Get_address");
-+  CALL_MPI MPI_Type_create_struct(2,tabsize,taboffs,tabtype,&newtype);
-+  TEST_MPI("MPI_Type_create_struct");
-   CALL_MPI MPI_Type_commit(&newtype);
-   TEST_MPI("MPI_Type_commit");
- #  endif /* NO_MPI_TYPE */
-@@ -974,8 +974,8 @@
- 
-   tabtype[0] = COMM_INT;
- 
--  CALL_MPI MPI_Address(infotab,&(taboffs[0]));
--  TEST_MPI("MPI_Address");
-+  CALL_MPI MPI_Get_address(infotab,&(taboffs[0]));
-+  TEST_MPI("MPI_Get_address");
- 
-   /* If schur, send empty data */
-   if ((sopalin_data->sopar->iparm[IPARM_SCHUR] == API_YES &&
-@@ -988,12 +988,12 @@
-     for (iter=1; iter<UPDOWN_SM2XNBR+1; iter++) {
-       tabsize[iter] = size;
-       tabtype[iter] = COMM_FLOAT;
--      CALL_MPI MPI_Address(gb+((iter-1)*UPDOWN_SM2XSZE),&(taboffs[iter]));
--      TEST_MPI("MPI_Address");
-+      CALL_MPI MPI_Get_address(gb+((iter-1)*UPDOWN_SM2XSZE),&(taboffs[iter]));
-+      TEST_MPI("MPI_Get_address");
-     }
-   }
--  CALL_MPI MPI_Type_struct(UPDOWN_SM2XNBR+1,tabsize,taboffs,tabtype,&newtype);
--  TEST_MPI("MPI_Type_struct");
-+  CALL_MPI MPI_Type_create_struct(UPDOWN_SM2XNBR+1,tabsize,taboffs,tabtype,&newtype);
-+  TEST_MPI("MPI_Type_create_struct");
-   CALL_MPI MPI_Type_commit(&newtype);
-   TEST_MPI("MPI_Type_commit");
- 
diff --git a/sci-libs/pastix/pastix-5.2.3.ebuild b/sci-libs/pastix/pastix-5.2.3.ebuild
deleted file mode 100644
index 4b0bafedefaf..000000000000
--- a/sci-libs/pastix/pastix-5.2.3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fortran-2 toolchain-funcs
-
-# TODO:
-# testing: emake examples?
-# better doc instalation and building
-# pypastix (separate package?)
-# multilib with eselect?
-# static libs building without pic
-# metis?
-
-# package id: change every version, see the link on inriaforge
-PID=218
-DESCRIPTION="Parallel solver for very large sparse linear systems"
-HOMEPAGE="https://solverstack.gitlabpages.inria.fr/pastix/ https://gitlab.inria.fr/solverstack/pastix"
-SRC_URI="https://gforge.inria.fr/frs/download.php/latestfile/${PID}/${PN}_${PV}.tar.bz2"
-S="${WORKDIR}/${PN}_${PV}/src"
-
-LICENSE="CeCILL-C"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc int64 mpi +smp starpu static-libs"
-
-RDEPEND="
-	sci-libs/scotch:0=[int64?,mpi?]
-	sys-apps/hwloc:0=
-	virtual/blas
-	mpi? ( virtual/mpi )
-	starpu? ( dev-libs/starpu:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-MPI-3.0.patch )
-
-src_prepare() {
-	default
-	sed -e 's/^\(HOSTARCH\s*=\).*/\1 ${HOST}/' \
-		-e "s:^\(CCPROG\s*=\).*:\1 $(tc-getCC):" \
-		-e "s:^\(CFPROG\s*=\).*:\1 $(tc-getFC):" \
-		-e "s:^\(CF90PROG\s*=\).*:\1 $(tc-getFC):" \
-		-e "s:^\(ARPROG\s*=\).*:\1 $(tc-getAR):" \
-		-e "s:^\(CCFOPT\s*=\).*:\1 ${FFLAGS}:" \
-		-e "s:^\(CCFDEB\s*=\).*:\1 ${FFLAGS}:" \
-		-e 's:^\(EXTRALIB\s*=\).*:\1 -lm -lrt:' \
-		-e "s:^#\s*\(ROOT\s*=\).*:\1 \$(DESTDIR)${EPREFIX}/usr:" \
-		-e 's:^#\s*\(INCLUDEDIR\s*=\).*:\1 $(ROOT)/include:' \
-		-e 's:^#\s*\(BINDIR\s*=\).*:\1 $(ROOT)/bin:' \
-		-e "s:^#\s*\(LIBDIR\s*=\).*:\1 \$(ROOT)/$(get_libdir):" \
-		-e 's:^#\s*\(SHARED\s*=\).*:\1 1:' \
-		-e 's:^#\s*\(SOEXT\s*=\).*:\1 .so:' \
-		-e '/fPIC/s/^#//g' \
-		-e "s:^#\s*\(SHARED_FLAGS\s*=.*\):\1 ${LDFLAGS}:" \
-		-e "s:pkg-config:$(tc-getPKG_CONFIG):g" \
-		-e "s:^\(BLASLIB\s*=\).*:\1 $($(tc-getPKG_CONFIG) --libs blas):" \
-		-e "s:^\s*\(HWLOC_HOME\s*?=\).*:\1 ${EPREFIX}/usr:" \
-		-e "s:-I\$(HWLOC_INC):$($(tc-getPKG_CONFIG) --cflags hwloc):" \
-		-e "s:-L\$(HWLOC_LIB) -lhwloc:$($(tc-getPKG_CONFIG) --libs hwloc):" \
-		-e "s:^\s*\(SCOTCH_HOME\s*?=\).*:\1 ${EPREFIX}/usr:" \
-		-e "s:^\s*\(SCOTCH_INC\s*?=.*\):\1/scotch:" \
-		-e "s:^\s*\(SCOTCH_LIB\s*?=.*\)lib:\1$(get_libdir):" \
-		config/LINUX-GNU.in > config.in || die
-	sed -e 's/__SO_NAME__,$@/__SO_NAME__,$(notdir $@)/g' -i Makefile || die
-}
-
-src_configure() {
-	if use amd64; then
-		sed -e 's/^\(VERSIONBIT\s*=\).*/\1 _64bit/' \
-			-i config.in || die
-	fi
-
-	if use int64; then
-		sed -e '/VERSIONINT.*_int64/s/#//' \
-			-e '/CCTYPES.*INTSSIZE64/s/#//' \
-			-i config.in || die
-	fi
-
-	if ! use mpi; then
-		sed -e '/VERSIONMPI.*_nompi/s/#//' \
-			-e '/CCTYPES.*NOMPI/s/#//' \
-			-e '/MPCCPROG\s*= $(CCPROG)/s/#//' \
-			-e '/MCFPROG\s*= $(CFPROG)/s/#//' \
-			-e 's/-DDISTRIBUTED//' \
-			-e 's/-lptscotch/-lscotch/g' \
-			-i config.in || die
-	fi
-
-	if ! use smp; then
-		sed -e '/VERSIONSMP.*_nosmp/s/#//' \
-			-e '/CCTYPES.*NOSMP/s/#//' \
-			-i config.in || die
-	fi
-
-	if use starpu; then
-		sed -e '/libstarpu/s/#//g' -i config.in || die
-	fi
-}
-
-src_compile() {
-	emake all drivers
-}
-
-src_test() {
-	# both test and tests targets are defined and do not work
-	emake examples
-	echo
-}
-
-src_install() {
-	default
-	sed -e "s:${D}::g" -i "${ED}"/usr/bin/pastix-conf || die
-	# quick and dirty (static libs should really be built without pic)
-	cd .. || die
-	dodoc README.txt doc/refcard/refcard.pdf
-}
diff --git a/sci-libs/pastix/pastix-6.0.3.ebuild b/sci-libs/pastix/pastix-6.0.3.ebuild
index f8535d36390e..ad6337f2a1d9 100644
--- a/sci-libs/pastix/pastix-6.0.3.ebuild
+++ b/sci-libs/pastix/pastix-6.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake fortran-2 python-single-r1
 
diff --git a/sci-libs/trilinos/Manifest b/sci-libs/trilinos/Manifest
index 8f5317b430ae..f18876d396ed 100644
--- a/sci-libs/trilinos/Manifest
+++ b/sci-libs/trilinos/Manifest
@@ -1,7 +1,9 @@
 DIST trilinos-14.4.0.tar.gz 188325969 BLAKE2B 909e3ebe229d035263d835e0d68977516d2a5df168785021fe300f7904e149586a82a6dba271cc1472455472397ee5467443244fb68fb27c00cf4e9b3d10a282 SHA512 497fc4fb4ab4338fffef7111635f3dc3b12cb7302bc3f56bafb5cc75b7c68e94cc22fcacd9dd625803a0f38e4fbce5105cab61df76e033a4581568c36a53fe8a
 DIST trilinos-15.0.0.tar.gz 182971338 BLAKE2B 0e459b9d070085a2a5bf06de8274ceec628f8913ab87c87a9502baf8065bfdabeca827ea9fa0f274c163bff1e7dc252eabf79ca250c0470d1da5e13492287d28 SHA512 a364e67686cdd4e1e34aa0e14b6cc051ed21a72b63719c47260d7839d47590b9e652be76cb9d61e513c7933b965fc8141c3ff898167e22353b33c9491a525c84
 DIST trilinos-15.1.1.tar.gz 183340366 BLAKE2B 4d1184fac143ae2b2950d0bf35bae8f813436f894734e5a9aa96d7622ed265cc41a04001a846437a1d1921258c20ae165e9e55f1754241541bde7136c08a6e5c SHA512 5a1a7d321dd3b47fafe0422884d1a7bf6731d5ee806a4fd1bf31f179ca5d6f4290cda4515d0d7786024ea15c17e88422a9518370c5cfb32b4b44761de232e0de
+DIST trilinos-16.0.0.tar.gz 198059287 BLAKE2B b23389d6aa49e34b87f614e9c4a835b224bcd4054028b106c94358a4125a5544df2013ce3560a56e76d68e900df613d7ae002fea0dacd8bd93ea002a4db7d53b SHA512 ed8b9f6ec8d35879f28f066685f70c492ee83ffdc42cfed75750216c0c689c81b00355520a7db441e56d83a6a153b0dbe4f8422d163a942cdcc6786235f64688
 EBUILD trilinos-14.4.0.ebuild 7704 BLAKE2B 09d8d1e38b6459d95710939ae94cf4fba101299478fb30fa2802d4a211863e78dd68483486a4c22e3fb245a9cc2c8bbf85c2213be2140e2eaf2e9fcffbf9420f SHA512 470f14adfd2fa1028b94a3017304597c2905e34f4e4bfbf3b3bb1458c78120b1a324ce3b20954770e1fcfb48bf50c62452906d12e483c5a9e7e0e46597a8544a
 EBUILD trilinos-15.0.0.ebuild 7434 BLAKE2B 86917d4fb4fe2a29893e39b038c88de90fe4715a9655cfe5bb7d4c4980bd8c808255e6acff557420a7972278605330f6498d62c97e655347ba2f1b0a15bb041b SHA512 6894b7fe8a286040d5cc832c69ddea8b0c9ca1b94c085e4320ff92f32c63b65e869684e934db6a6f9725b1a7b6408faa088ceadfc5dfe9c08a35dd859dc31fb4
 EBUILD trilinos-15.1.1.ebuild 7434 BLAKE2B 86917d4fb4fe2a29893e39b038c88de90fe4715a9655cfe5bb7d4c4980bd8c808255e6acff557420a7972278605330f6498d62c97e655347ba2f1b0a15bb041b SHA512 6894b7fe8a286040d5cc832c69ddea8b0c9ca1b94c085e4320ff92f32c63b65e869684e934db6a6f9725b1a7b6408faa088ceadfc5dfe9c08a35dd859dc31fb4
+EBUILD trilinos-16.0.0.ebuild 7434 BLAKE2B 86917d4fb4fe2a29893e39b038c88de90fe4715a9655cfe5bb7d4c4980bd8c808255e6acff557420a7972278605330f6498d62c97e655347ba2f1b0a15bb041b SHA512 6894b7fe8a286040d5cc832c69ddea8b0c9ca1b94c085e4320ff92f32c63b65e869684e934db6a6f9725b1a7b6408faa088ceadfc5dfe9c08a35dd859dc31fb4
 MISC metadata.xml 2813 BLAKE2B 956cb9f2f1f6061f67d8f02b96498e8b20e9ef5360b9401d42636e25b8e73ea5e8318aa4506fd3af658ab1499870ce101e978bb3198118f54cc75f42f4ca1374 SHA512 9e183b59a017f0f741f0687bf3422e81b41b419bcf2d4e777f262c0cbd3e08ae5ddfca443530d4ea7879f8df9772b4657cb93112c56beed901b2e0fd0201f919
diff --git a/sci-libs/trilinos/trilinos-16.0.0.ebuild b/sci-libs/trilinos/trilinos-16.0.0.ebuild
new file mode 100644
index 000000000000..6cbf380341aa
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-16.0.0.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake flag-o-matic 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"
+
+S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+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"
+
+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}" )
+}
+
+src_configure() {
+	# Trilinos is a massive C++ project. Fixing all of the lto warnings and
+	# making safe for lto compilation/linking will be a massive
+	# undertaking. Thus, simply filter lto flags. bug #862987
+	filter-lto
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
+		-DCMAKE_SKIP_RPATH=ON
+		-DCMAKE_SKIP_INSTALL_RPATH=ON
+		-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_PyTrilinos=OFF
+		-DTrilinos_ENABLE_Amesos=ON
+		-DTrilinos_ENABLE_AztecOO=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:
+
+	# Let us move the bin directory out of the way to avoid potential
+	# clashes due to very generically named binaries such as
+	# »nvcc_wrapper«, etc.
+	mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
+
+	# Move the cmake directory to the right location:
+	mkdir -p "${ED}/usr/$(get_libdir)"/cmake
+	mv "${ED}/usr/$(get_libdir)"/trilinos/cmake/* "${ED}/usr/$(get_libdir)"/cmake || die "mv failed"
+	# Fix up include paths:
+	sed -i -e 's#external_packages#trilinos/external_packages#g' \
+		"${ED}/usr/$(get_libdir)"/cmake/**/*.cmake || die "sed 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, also add Trilinos' binaries ot
+	# the PATH environment variable.
+	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/xylib/Manifest b/sci-libs/xylib/Manifest
index d1c72a95cdbd..c3555c38ab02 100644
--- a/sci-libs/xylib/Manifest
+++ b/sci-libs/xylib/Manifest
@@ -1,4 +1,3 @@
 DIST xylib-1.6.tar.bz2 370765 BLAKE2B 76eb968f06a6a015ed7a29a493d888642767cda103733498b8706c973498aa4ac8576716b06f6eae8d95a1f625e9cd91ab02cfd53146d976e32fc9295f3c502f SHA512 9861cbf03f8b921a93a2d32a529ff94d77723e2510cd61096b4b85f91af4be6330ed82e8da94bc45dbca7f9814077360d1dae204315b28c2b6d85e3d2c7f6696
 EBUILD xylib-1.6-r1.ebuild 889 BLAKE2B f6c61f229c9468a8d80f52191ba7557c5c0073e30e375f8354f8e4f75db5ae46dc8ae4d3da0f69d869f5252dca15bc4c397402bfe2467917d5271e16f274bbe3 SHA512 bb95791cb9944f9d72f30af29dd3be046311ca1f0213006088b16b5e02e65c8a6eb946dad871740117af81a6e41a1df35b2d99bc92342f293fad087c063e7a5a
-EBUILD xylib-1.6.ebuild 807 BLAKE2B e15510175a2dd0013cadda8239039b4ac9a791265142f47f4be44b6538c0499256b5101ea96563cc1c2458a1ca3548b808909f213233bdac1c82df1f9618c574 SHA512 4c09b69be3205c1924a8cef18f4a5ca8fe5cfd73c2e83eb5d795f1c1b36117b2a50e5de8d64de73ccfdc31f7bb544906d645bc816b3669637432725c0d738950
 MISC metadata.xml 623 BLAKE2B 09bb7a7f0228b82b17350ba2e3a205e46f81b2e2301071a94c4cc14c57d81468be59f5c2d1ac0df466624a888ec64c6f447d36f4fa6b2ec5efea183fb939d937 SHA512 a1557a7bece9e3c1ef5928cece1b094f2bb95938dd1663c5dc13f02779174766563223c84b8cf6a1e6f9cf7e0a325ff02a639cf778843b4b1ae25ea748053c28
diff --git a/sci-libs/xylib/xylib-1.6.ebuild b/sci-libs/xylib/xylib-1.6.ebuild
deleted file mode 100644
index 49e226d26949..000000000000
--- a/sci-libs/xylib/xylib-1.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER=3.0-gtk3
-
-inherit wxwidgets
-
-DESCRIPTION="Experimental x-y data reading library"
-HOMEPAGE="https://github.com/wojdyr/xylib"
-SRC_URI="https://github.com/wojdyr/xylib/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gui zlib"
-
-RDEPEND="
-	bzip2? ( app-arch/bzip2 )
-	gui? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	zlib? ( sys-libs/zlib )"
-DEPEND="
-	${RDEPEND}
-	dev-libs/boost"
-
-src_configure() {
-	use gui && setup-wxwidgets
-
-	econf \
-		--disable-static \
-		$(use_with bzip2 bzlib) \
-		$(use_with gui) \
-		$(use_with zlib)
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}