13 files changed, 17 insertions, 446 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index aec45a72f108..919c484c884f 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 637ff46d96cb..704de9050f3e 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -8,10 +8,8 @@ AUX caffe2-2.5.1-newfix-functorch-install.patch 441 BLAKE2B 0caa9e43432aecba83e3
 AUX caffe2-2.5.1-unbundle_fmt.patch 499 BLAKE2B 06550f8e7ae3a932a585f8abe7653ac0b574d9ce1160c190a39f96b7d76e3a9e7a4e62b9e5e967e5884d0e38668f60af7737ea3c715d718deb7a634de98ccebd SHA512 afcb5f1123cbe5eeebdb2c5e312e37956dbc33a926cf379f531896f2c75fbb4b4dfa2c9d276a98bbad51bc587886bb572c3221be06e5116443c8ab44e1d12da5
 AUX caffe2-2.5.1-unbundle_kineto.patch 830 BLAKE2B 80c9ebc30d0ca3b964141a5d9a7cb3662e6dc8472454ceabc2725f47277211cd495c4146dc9c2046cc5c5505909cf4e30c780685fceebdb05319aba5c4366346 SHA512 9645b11b5395f7a4626f17edae22c718c73d2e2f3de56e98653932a3c66f417942d54fd1dadc99112337c11513ac707a96d0caac4bf3d100db8f7079609b9b68
 DIST caffe2-patches-20240809.tar.gz 15242 BLAKE2B 77503c61487e7d85cca5afcab9a6e638f9833a70861845638cf1b62bc492d7b6650e6db81d53ebb2f39c6313509250d339f725f04d03ec6dd23dd0cf70843d8c SHA512 74b3b0b6671b655ecac93f7436c4ed7cb0157a83aafbf6afcc0811e11cef341cd8f638db1a111bcbb01e1a6dd4daf3a36b96d7a8ce90f04c2fa091bd6e3a142b
-DIST pytorch-2.4.0.tar.gz 115031093 BLAKE2B d206477963977011627df284efa01482fbf57e9fcb5f58f51d679c742b8e5dde6aa6affd8745ab817fcd09477d129a81e74e07be576b5d3585eaca1c735b8e01 SHA512 804d25944035f33de6591fd942fbda44d3de037717a4397d38a97474b01775d30eaf93d16dd708a832c0119050d24d73b90990fd3e3773be79d26ada25244d22
 DIST pytorch-2.4.1.tar.gz 115029469 BLAKE2B c2909ff27d527bc57cba56b780d3b8cd07a043ab045caa6c6b27857a16f9ad10aaab2116b26226b1e46ee08ffb44007965d914464418e4ae14ca48c3f3f383bb SHA512 7e9b4485e242eaf0d648765c6621d73d95e7107b766646a098175436d1ab2e2b864badd0757a3bab6b7c318233f2120bad9ac07b39bb9e357897919580c87631
 DIST pytorch-2.5.1.tar.gz 116091366 BLAKE2B 7838b17562b94ffc7d798031348689db607dd5eae2a3c35be365972e2b52a2c1b12067068d5aca5ab00cf0977d9c2c3c9ae5337d69534c864c732e6256cbeef6 SHA512 a913a466324a65fa3d79c5e9ad4d605fc7976f0134fda2f81aaa3cea29d56926604999b8a238759646d211e63b47bbb446cdffa86ca8defd8159f11e30301289
-EBUILD caffe2-2.4.0-r1.ebuild 8334 BLAKE2B d867632884fad33fb7c19344574ce30e70651474650b2f5a6e79576a7338e501989bc4628c1a04f2b2ebf3a611226df68892abdabf856ab74e67df85db74a9f0 SHA512 52e8c0e3535a1a8b90cce9143f4ff8da398de9119d2f23ffeeb0a419dadc29dae68f5e993b1a854066f63ed4809a41a98f098447e318252ff316e70fc6498b32
 EBUILD caffe2-2.4.1-r4.ebuild 8557 BLAKE2B 2cefd7d0c818fb431b3eb6bc2be0a1b225790271b1108169256f8dccac99707fac3d36dc98b7e19a688c66053627d0a222d67e7f65eb6a600ed251677df5490a SHA512 ded17bc1e912f4691bfeee75c66676d331d03c21fe9c9c7416c874ef435e624bdc6109c128f0b5dbe9a5a5be81e648767c6020cd570b94e74f47061e5839f9b3
 EBUILD caffe2-2.5.1-r7.ebuild 8710 BLAKE2B 425e59df62e884643f9ea7024f942b6fd42948d4fb9d8e446dbba3c920d6f8efad2e78bd7a7ff54c04b08483dcb00572596a848f36d22dbdb0e1c6723e05cfec SHA512 3f056ebc8db1501e210f96a075286b788916de89099b3f2ded0e124220848dc6268ba5f1702e81b0c373f944ec53e0494ce862940b0bfa76925ef7ef55d8b678
 MISC metadata.xml 1081 BLAKE2B 57800165612fd555263cab4cf0bb0521acd7d41f0023da501a50ccc5a479d25ad7087661a6eec500333c3cf9cc3a85d7be8e9385869c14d92f351d8d9df68556 SHA512 71cc785a5b1688b6a0ac971d31d5fa85bef86966aa80009c34e97caa385c81a7c2fb64ae34d0a39c21548d8238efd008da24bd838a47886bfa3f0d952246b76e
diff --git a/sci-libs/caffe2/caffe2-2.4.0-r1.ebuild b/sci-libs/caffe2/caffe2-2.4.0-r1.ebuild
deleted file mode 100644
index c705aa0bac11..000000000000
--- a/sci-libs/caffe2/caffe2-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-ROCM_VERSION=6.1
-inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
-
-MYPN=pytorch
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="A deep learning framework"
-HOMEPAGE="https://pytorch.org/"
-SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${MYP}.tar.gz
-	https://dev.gentoo.org/~tupone/distfiles/${PN}-patches-20240809.tar.gz"
-
-S="${WORKDIR}"/${MYP}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda distributed fbgemm flash gloo mkl mpi nnpack +numpy onednn openblas opencl openmp qnnpack rocm xnnpack"
-RESTRICT="test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	mpi? ( distributed )
-	gloo? ( distributed )
-	?? ( cuda rocm )
-	rocm? (
-		|| ( ${ROCM_REQUIRED_USE} )
-		!flash
-	)
-"
-
-# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-cpp/gflags:=
-	>=dev-cpp/glog-0.5.0
-	dev-libs/cpuinfo
-	dev-libs/libfmt
-	dev-cpp/opentelemetry-cpp
-	dev-libs/protobuf:=
-	dev-libs/pthreadpool
-	dev-libs/sleef
-	virtual/lapack
-	sci-libs/onnx
-	sci-libs/foxi
-	cuda? (
-		dev-libs/cudnn
-		>=dev-libs/cudnn-frontend-1.0.3:0/8
-		<dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler]
-	)
-	fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 )
-	gloo? ( sci-libs/gloo[cuda?] )
-	mpi? ( virtual/mpi )
-	nnpack? ( sci-libs/NNPACK )
-	numpy? ( $(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-		') )
-	onednn? ( dev-libs/oneDNN )
-	opencl? ( virtual/opencl )
-	qnnpack? (
-		!sci-libs/QNNPACK
-		dev-cpp/gemmlowp
-	)
-	rocm? (
-		=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}]
-
-		=sci-libs/hipBLASLt-6.1*
-		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?]
-		dev-cpp/cpp-httplib
-	)
-	xnnpack? ( >=sci-libs/XNNPACK-2024.02.29 )
-	mkl? ( sci-libs/mkl )
-	openblas? ( sci-libs/openblas )
-"
-DEPEND="
-	${RDEPEND}
-	cuda? ( <=dev-libs/cutlass-3.4.1 )
-	onednn? ( sci-libs/ideep )
-	dev-libs/psimd
-	dev-libs/FP16
-	dev-libs/FXdiv
-	dev-libs/pocketfft
-	dev-libs/flatbuffers
-	>=sci-libs/kineto-0.4.0_p20240525
-	$(python_gen_cond_dep '
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	')
-"
-
-PATCHES=(
-	../patches/${PN}-2.4.0-gentoo.patch
-	../patches/${PN}-2.4.0-install-dirs.patch
-	../patches/${PN}-1.12.0-glog-0.6.0.patch
-	../patches/${PN}-1.13.1-tensorpipe.patch
-	../patches/${PN}-2.3.0-cudnn_include_fix.patch
-	../patches/${PN}-2.1.2-fix-rpath.patch
-	../patches/${PN}-2.4.0-fix-openmp-link.patch
-	../patches/${PN}-2.4.0-rocm-fix-std-cpp17.patch
-	../patches/${PN}-2.2.2-musl.patch
-	../patches/${PN}-2.4.0-exclude-aotriton.patch
-	../patches/${PN}-2.3.0-fix-rocm-gcc14-clamp.patch
-	../patches/${PN}-2.3.0-fix-libcpp.patch
-	"${FILESDIR}"/${PN}-2.4.0-libfmt-11.patch
-	"${FILESDIR}"/${P}-cpp-httplib.patch
-	"${FILESDIR}"/${P}-cstdint.patch
-)
-
-src_prepare() {
-	filter-lto #bug 862672
-	sed -i \
-		-e "/third_party\/gloo/d" \
-		cmake/Dependencies.cmake \
-		|| die
-	cmake_src_prepare
-	pushd torch/csrc/jit/serialization || die
-	flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
-	popd
-	# prefixify the hardcoded paths, after all patches are applied
-	hprefixify \
-		aten/CMakeLists.txt \
-		caffe2/CMakeLists.txt \
-		cmake/Metal.cmake \
-		cmake/Modules/*.cmake \
-		cmake/Modules_CUDA_fix/FindCUDNN.cmake \
-		cmake/Modules_CUDA_fix/upstream/FindCUDA/make2cmake.cmake \
-		cmake/Modules_CUDA_fix/upstream/FindPackageHandleStandardArgs.cmake \
-		cmake/public/LoadHIP.cmake \
-		cmake/public/cuda.cmake \
-		cmake/Dependencies.cmake \
-		torch/CMakeLists.txt \
-		CMakeLists.txt
-
-	if use rocm; then
-		sed -e "s:/opt/rocm:/usr:" \
-			-e "s:lib/cmake:$(get_libdir)/cmake:g" \
-			-e "s/HIP 1.0/HIP 1.0 REQUIRED/" \
-			-i cmake/public/LoadHIP.cmake || die
-
-		ebegin "HIPifying cuda sources"
-		${EPYTHON} tools/amd_build/build_amd.py || die
-		eend $?
-	fi
-}
-
-src_configure() {
-	if use cuda && [[ -z ${TORCH_CUDA_ARCH_LIST} ]]; then
-		ewarn "WARNING: caffe2 is being built with its default CUDA compute capabilities: 3.5 and 7.0."
-		ewarn "These may not be optimal for your GPU."
-		ewarn ""
-		ewarn "To configure caffe2 with the CUDA compute capability that is optimal for your GPU,"
-		ewarn "set TORCH_CUDA_ARCH_LIST in your make.conf, and re-emerge caffe2."
-		ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TORCH_CUDA_ARCH_LIST=7.5 3.5"
-		ewarn "For a Maxwell model GPU, an example value would be: TORCH_CUDA_ARCH_LIST=Maxwell"
-		ewarn ""
-		ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus"
-		ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'"
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_CUSTOM_PROTOBUF=OFF
-		-DBUILD_SHARED_LIBS=ON
-
-		-DUSE_CCACHE=OFF
-		-DUSE_CUDA=$(usex cuda)
-		-DUSE_DISTRIBUTED=$(usex distributed)
-		-DUSE_MPI=$(usex mpi)
-		-DUSE_FAKELOWP=OFF
-		-DUSE_FBGEMM=$(usex fbgemm)
-		-DUSE_FLASH_ATTENTION=$(usex flash)
-		-DUSE_MEM_EFF_ATTENTION=OFF
-		-DUSE_GFLAGS=ON
-		-DUSE_GLOG=ON
-		-DUSE_GLOO=$(usex gloo)
-		-DUSE_KINETO=OFF # TODO
-		-DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
-		-DUSE_MKLDNN=$(usex onednn)
-		-DUSE_NNPACK=$(usex nnpack)
-		-DUSE_XNNPACK=$(usex xnnpack)
-		-DUSE_SYSTEM_XNNPACK=$(usex xnnpack)
-		-DUSE_TENSORPIPE=$(usex distributed)
-		-DUSE_PYTORCH_QNNPACK=$(usex qnnpack)
-		-DUSE_NUMPY=$(usex numpy)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_ROCM=$(usex rocm)
-		-DUSE_SYSTEM_CPUINFO=ON
-		-DUSE_SYSTEM_PYBIND11=ON
-		-DUSE_UCC=OFF
-		-DUSE_VALGRIND=OFF
-		-DPython_EXECUTABLE="${PYTHON}"
-		-DUSE_ITT=OFF
-		-DUSE_SYSTEM_PTHREADPOOL=ON
-		-DUSE_SYSTEM_PSIMD=ON
-		-DUSE_SYSTEM_FXDIV=ON
-		-DUSE_SYSTEM_FP16=ON
-		-DUSE_SYSTEM_GLOO=ON
-		-DUSE_SYSTEM_ONNX=ON
-		-DUSE_SYSTEM_SLEEF=ON
-		-DUSE_PYTORCH_METAL=OFF
-		-DUSE_XPU=OFF
-
-		-Wno-dev
-		-DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
-		-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
-	)
-
-	if use mkl; then
-		mycmakeargs+=(-DBLAS=MKL)
-	elif use openblas; then
-		mycmakeargs+=(-DBLAS=OpenBLAS)
-	else
-		mycmakeargs+=(-DBLAS=Generic -DBLAS_LIBRARIES=)
-	fi
-
-	if use cuda; then
-		addpredict "/dev/nvidiactl" # bug 867706
-		addpredict "/dev/char"
-		addpredict "/proc/self/task" # bug 926116
-
-		mycmakeargs+=(
-			-DUSE_CUDNN=ON
-			-DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
-			-DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library
-			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
-		)
-	elif use rocm; then
-		export PYTORCH_ROCM_ARCH="$(get_amdgpu_flags)"
-
-		mycmakeargs+=(
-			-DUSE_NCCL=ON
-			-DUSE_SYSTEM_NCCL=ON
-		)
-
-		# ROCm libraries produce too much warnings
-		append-cxxflags -Wno-deprecated-declarations -Wno-unused-result
-
-		if tc-is-clang; then
-			# fix mangling in LLVM: https://github.com/llvm/llvm-project/issues/85656
-			append-cxxflags -fclang-abi-compat=17
-		fi
-	fi
-
-	if use onednn; then
-		mycmakeargs+=(
-			-DUSE_MKLDNN=ON
-			-DMKLDNN_FOUND=ON
-			-DMKLDNN_LIBRARIES=dnnl
-			-DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl"
-		)
-	fi
-
-	cmake_src_configure
-
-	# do not rerun cmake and the build process in src_install
-	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto "/var/lib/${PN}"
-	doins "${BUILD_DIR}"/CMakeCache.txt
-
-	rm -rf python
-	mkdir -p python/torch/include || die
-	mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
-	cp torch/version.py python/torch/ || die
-	python_domodule python/caffe2
-	python_domodule python/torch
-	ln -s ../../../../../include/torch \
-		"${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
-}
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index aab1cb78c74c..bba6be3448f6 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -3,7 +3,7 @@ DIST libqalculate-5.4.0.1.tar.gz 2203512 BLAKE2B ccecbfdb9dc026f00bc072124d9582b
 DIST libqalculate-5.4.0.tar.gz 2720059 BLAKE2B e6ec9536a8b0ed3769c2a013bd267ca8202f58ebf54cd4c629d0d993cede797f2f547d02da50ced4ce94d41bbb8d54db9b4136451e960340c6bcd03c040080d6 SHA512 0539fe8053c903653b72716d0f7e5bc17d2ba954854d61f51bf62f2d9b6a02d3160be6a9f0208c67960ae5f9d831cc29eae4e80438cae482e6fb97e7686207e4
 DIST libqalculate-5.5.0.tar.gz 2209195 BLAKE2B 64781eeb1ad06bb25ac604fce10fb6a158e5f704ad311d52d0b3494ddf4f96d6240795b9f1d25aaf415b4e06f9916af12ca3db71d6b97c00f07fd0e31ebc6036 SHA512 c19dd210c03eb3a2966937dafade9f15e5289a04b5c498180b3bff37e202b6707e1942e02dd76fd4f461d5f80bd7ab7b99ba7802916b7ed6a25d1e59b16472e7
 EBUILD libqalculate-5.3.0-r1.ebuild 2024 BLAKE2B 0d97cc798bca2a1be1a0f9476fc0bfed859eeef6a91a14f97bce3d73d7a9264fb2b5aa5fd7bc8abbb446bc328477c9568de8a1a5d9d41229fb165be5be3109fb SHA512 209f7f45bd48e5465bf8baf0148b5a743501f38231111053ca368432ed5c96ea39559fa4a015b9aa44a0eed55c8a2dac5a8e5473ff763c289ea3d833b7dc8188
-EBUILD libqalculate-5.4.0.1.ebuild 2056 BLAKE2B 6f01029b711744bf58a543b7bc91b73028342accb6f4e58ba3f09e5fa76ed22289039421c7efa9d278b9dedcc0c8862996bd480d9f10d87dd2c80fe4e125c045 SHA512 5a535a7d86a567d15b5ea3311a6944eb977cb9aec9437f3c5e02aa50b5113a64e73f08d4a59406cbd557cdc451ba6b962359941c5ad3175d8ee07f5edf1c1c17
+EBUILD libqalculate-5.4.0.1.ebuild 2055 BLAKE2B 3e06de568764eb87ba1c6583e9488afc6c55363f97887f6e174e1dca34d98ab1941658652d6026da35a6fc0e1abec25123d09d05f94d273852e1d5fbd64c9512 SHA512 390a56f0437e02f8249316ec7e121705269fd594f08f01b0b5b73ac2d3d8c490396b6cde5c148ec47935f605203960e8582cf5305e452f3ac2ea8548799f4ea7
 EBUILD libqalculate-5.4.0.ebuild 2030 BLAKE2B a8c68135617a95f870d188bdf5d6930ba0e6f88797e61109fb4767e31555a1ea10e8f34cd630ebc4b03ef9c43db4667786d48babdff704b37eaac80c5c7ca8a5 SHA512 dfeaeb60112fc043b0dadb7d01cae32033973809283019d4f77e41514eb8776bc3354380818175e54f72cb4c21e0ce6f106279220e7e91e3d0bc772b094e8e0c
 EBUILD libqalculate-5.5.0.ebuild 2061 BLAKE2B 15cffc65c467b5e4d59dedc3edcba449772cc7b9c81e49e973929bd851dede7ddd6ec3cf81ac8702eec71627be86512401d2483ee02453ec5fe0104d3b6d2a81 SHA512 14d9d6980d19264b3451f488e25256b5206aaf703d69a01828e24bc69dc3c017b8decaaac0ff27d2922bf55d1e526615d3590f810efd037e3a7b3df63a216211
 MISC metadata.xml 807 BLAKE2B 84adb8d9b92f233d93cc630d9dbf89630a9ca1ea839f0d7d5100763c9c6e4a7065753bfe55f013e6aa99370822b4d638e7e788c8cb7bd30cae4b7bed2d7befd9 SHA512 d96812e36a70e9c1a776fe5882e1ded9fe2e7a3d1406a619202af25fc0d20180ed3209ed6df79e147697e450edb42cfcc6f38ee99ecec4e1513949b92576b4fd
diff --git a/sci-libs/libqalculate/libqalculate-5.4.0.1.ebuild b/sci-libs/libqalculate/libqalculate-5.4.0.1.ebuild
index 707abba2c637..b9213fc29c4d 100644
--- a/sci-libs/libqalculate/libqalculate-5.4.0.1.ebuild
+++ b/sci-libs/libqalculate/libqalculate-5.4.0.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/"${PN}-${MY_PV}"
 LICENSE="GPL-2+"
 # SONAME changes pretty often on bumps. Check!
 SLOT="0/23.3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl icu gnuplot +hardened readline test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/openlibm/Manifest b/sci-libs/openlibm/Manifest
index c731515b9cd5..70f76615b44e 100644
--- a/sci-libs/openlibm/Manifest
+++ b/sci-libs/openlibm/Manifest
@@ -1,9 +1,5 @@
 AUX openlibm-0.8.3-fix-loong-riscv-fenv.patch 749 BLAKE2B 27f062b7bc9212a487812efc923fd584a03d0641fb81f6b4b683b161c6f3e1c255b5141c63418f9e0be96250d5cda09fae5ebf611aeaf79562d32cb0c266bbee SHA512 d0290460c8fb444496ef3978eb77bdf691df380d4e11080fffb7060b5e2b7ab4da287b424eda4fef7f719b53d24d244c128f4c118deb4e07f1a00f6b32d46474
 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 908 BLAKE2B f966b0c1ce4c6437061fc01caf15c79634350222865e7bea12da31897805bb56d50c43a75fa63060bf0a369b2c4ff394ce559ae0a26a171f9279859662ec0e8c SHA512 a62983295d2e90209e97b311e95d67e93bb2203d66bb9d9b1ba5aa00c034ab4b082bd34dd1fa25b5b2c9abfcbfed98938bf22aa278cfd3e494e17a02716f8f4d
-EBUILD openlibm-0.8.3.ebuild 1263 BLAKE2B a0fc12c11c9485f8f61e8bf1ec4461a3ed922a75556a9e6fc51f2a6104da9411558d758af20e005aa93e06ac87e3d0d7458edc6c8eee7cfefc2e7162f6879f6c SHA512 733c1aedccd1ae1f0d0f85dad82f71ad42464b8b8167d97286912cebe0155b36bcb7104dfb1bf0cff99d85a0c90e0bd649d0b90fbcdcff594a9caa0b293ba91c
+EBUILD openlibm-0.8.3.ebuild 1290 BLAKE2B 64e7e67d8d687976432c8db26602ad09000d6e977fc078b7d90872763ef230b61cc5e23ec14b6f23ec73760b75d9336a25069a198da38428d00fbfe5a078fd4a SHA512 91b3a823f24dc61fdd46682425297b8f03a43a4268373d0e329ebae8b6fb75f459e8a590f222ea4c66f68ce2feef75f682bc1ab0db5dfe9c46356812dc1c9717
 MISC metadata.xml 785 BLAKE2B 160415de6f1dd61dfe42488a2aaf716bb6ecb00396ae541c8b385116fb0b5017bc546fdcdd6394ce5c547cd85e7ccf94b7996128355ce3fa9fc7b17478c2949d SHA512 cdc602bce059702ad03d57a67ad9e2897fdcf999fd2d664e76293ddd22741817a042abafd6603c424839780d30b647a82901c468a5d55dc1794fdafd2a281b8c
diff --git a/sci-libs/openlibm/openlibm-0.7.5.ebuild b/sci-libs/openlibm/openlibm-0.7.5.ebuild
deleted file mode 100644
index ca3ab8af5117..000000000000
--- a/sci-libs/openlibm/openlibm-0.7.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+"
-# See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-src_prepare() {
-	default
-	sed -e "/^OLM_LIBS :=/s/^/#/" \
-		-e "/install: /s/install-static//" \
-	-i Makefile || die
-}
-
-src_configure() {
-	tc-export CC CXX FC AR LD
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" install
-	dodoc README.md
-}
diff --git a/sci-libs/openlibm/openlibm-0.8.0.ebuild b/sci-libs/openlibm/openlibm-0.8.0.ebuild
deleted file mode 100644
index df09fa8e2592..000000000000
--- a/sci-libs/openlibm/openlibm-0.8.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 ~s390 ~x86 ~amd64-linux ~x86-linux"
-
-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_configure() {
-	tc-export CC CXX FC AR LD
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" install
-	dodoc README.md
-}
diff --git a/sci-libs/openlibm/openlibm-0.8.3.ebuild b/sci-libs/openlibm/openlibm-0.8.3.ebuild
index c7e00790e40a..1e78e2465e90 100644
--- a/sci-libs/openlibm/openlibm-0.8.3.ebuild
+++ b/sci-libs/openlibm/openlibm-0.8.3.ebuild
@@ -33,6 +33,7 @@ src_compile() {
 	case "${ARCH}" in
 		loong) export ARCH=loongarch64 ;;
 		riscv) export ARCH=riscv64 ;;
+		x86) export ARCH=i387 ;;
 	esac
 
 	emake \
diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest
index 3222de0be27b..7d8931405653 100644
--- a/sci-libs/pytorch/Manifest
+++ b/sci-libs/pytorch/Manifest
@@ -6,10 +6,8 @@ AUX pytorch-2.4.0-global-dlopen.patch 887 BLAKE2B 044e7708619070f93b1157a0c4e560
 AUX pytorch-2.4.0-torch_shm_manager.patch 367 BLAKE2B f03c002cbd50fb959dfc3ccf89cb8aa9fe6e001ff2cb47bee45cde28cac262e20df1d06f396776ce069f0a9e92cd370c96788db0aa5d1b9d9f3bc1832701502a SHA512 94f095908385b3058863d05a78a0e243f8614bbde406d457e50bdba574a8e1911b77790a0806f705644dc0c0ae235888314ea4a31aed7c0eb8ddfb29ff42636e
 AUX pytorch-2.5.1-dontbuildagain.patch 420 BLAKE2B 42935902e5cb98d5d013fd4e409107c7fa95b91a09ee34723b67dbee37eed4575bb008de0aaab4d00b36bb19d87b4d6855829498fe5b7de95e47b4d536edc71c SHA512 e78b572110ff62d7d90ecd8dfb3f9f6a72c05e5190991ee8084107bbe11f0fe4f85d6fa440b2b4d3ce5e2611685e6e6f35d4fb026eef43131e3e4e60dba53bcf
 AUX pytorch-2.5.1-setup.patch 437 BLAKE2B 4107ad2dfde10b25e7422f65c7f87833bb662958eb3fca3ac0c1a5c2e203f7186c31142ac6cdf2a10009a95408e45caaa09fd85a5cc35ee6c9106f8c630a8beb SHA512 a51b3840763f960c1c63df0181c2d35747697a57e11bb08681acf21af06b64d2fca45f6bb3647034d20860e497cab53cec9bd2b5719c5c5aab7bf01080da9103
-DIST pytorch-2.4.0.tar.gz 115031093 BLAKE2B d206477963977011627df284efa01482fbf57e9fcb5f58f51d679c742b8e5dde6aa6affd8745ab817fcd09477d129a81e74e07be576b5d3585eaca1c735b8e01 SHA512 804d25944035f33de6591fd942fbda44d3de037717a4397d38a97474b01775d30eaf93d16dd708a832c0119050d24d73b90990fd3e3773be79d26ada25244d22
 DIST pytorch-2.4.1.tar.gz 115029469 BLAKE2B c2909ff27d527bc57cba56b780d3b8cd07a043ab045caa6c6b27857a16f9ad10aaab2116b26226b1e46ee08ffb44007965d914464418e4ae14ca48c3f3f383bb SHA512 7e9b4485e242eaf0d648765c6621d73d95e7107b766646a098175436d1ab2e2b864badd0757a3bab6b7c318233f2120bad9ac07b39bb9e357897919580c87631
 DIST pytorch-2.5.1.tar.gz 116091366 BLAKE2B 7838b17562b94ffc7d798031348689db607dd5eae2a3c35be365972e2b52a2c1b12067068d5aca5ab00cf0977d9c2c3c9ae5337d69534c864c732e6256cbeef6 SHA512 a913a466324a65fa3d79c5e9ad4d605fc7976f0134fda2f81aaa3cea29d56926604999b8a238759646d211e63b47bbb446cdffa86ca8defd8159f11e30301289
-EBUILD pytorch-2.4.0.ebuild 1616 BLAKE2B 6d2b4012e2ee45eff08e7d38cd6f8177b94ae556337cde21fe5352aca2bbfeecda582159f45bb947d96775468aed2617eaf28cdc4d42e0e0d2cb2c662dbe70ed SHA512 a0ea63813cac1cdc2d23f99982574786417b8f9a829f7166be2b33eb9b2f7dcb20a174ca2a70bc7e887d415efea361a7491c1642b3bbeb68446a8cbee4ed4a1c
 EBUILD pytorch-2.4.1.ebuild 1616 BLAKE2B 6d2b4012e2ee45eff08e7d38cd6f8177b94ae556337cde21fe5352aca2bbfeecda582159f45bb947d96775468aed2617eaf28cdc4d42e0e0d2cb2c662dbe70ed SHA512 a0ea63813cac1cdc2d23f99982574786417b8f9a829f7166be2b33eb9b2f7dcb20a174ca2a70bc7e887d415efea361a7491c1642b3bbeb68446a8cbee4ed4a1c
 EBUILD pytorch-2.5.1-r1.ebuild 1484 BLAKE2B c7a2ffa0e2da094a4563aff1017b6a30ad2255a660ca7e6a52e7b4ab0265376507f569babaa0dec4af45cc7658f1fcfdaeda82fba4cb63ed6ef1e42627acc5ce SHA512 69b7f6ee48639a45b4662a9f315f168aa2994085e997c710d1a89a79e8055d77e388d2b7339c30bae14bc27c46433c5df85fcc624eabaa6fb53617125a695e91
 MISC metadata.xml 328 BLAKE2B f49c6d62ac88dfffe497ed05b1f727941a94acb87a809611dda8aedbd87508fdfdf94ec0e025cac2a649b0881b600236289943b4be0f6ca44fc105b6d8fbe97c SHA512 16c29d2c1177a89026235191ea3e33870c2e6b63f029b7febd4dbd2e99f598fab4b4fd2fa7a801ffd88393663a00752300e6e2cc847a83690b715bcc481d9dc2
diff --git a/sci-libs/pytorch/pytorch-2.4.0.ebuild b/sci-libs/pytorch/pytorch-2.4.0.ebuild
deleted file mode 100644
index 31e3b0439a9d..000000000000
--- a/sci-libs/pytorch/pytorch-2.4.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_EXT=1
-inherit distutils-r1 prefix
-
-DESCRIPTION="Tensors and Dynamic neural networks in Python"
-HOMEPAGE="https://pytorch.org/"
-SRC_URI="https://github.com/pytorch/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="test"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RDEPEND="
-	${PYTHON_DEPS}
-	~sci-libs/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		dev-python/sympy[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	')
-"
-
-src_prepare() {
-	eapply \
-		"${FILESDIR}"/${PN}-2.4.0-dontbuildagain.patch \
-		"${FILESDIR}"/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch \
-		"${FILESDIR}"/${PN}-2.4.0-global-dlopen.patch \
-		"${FILESDIR}"/pytorch-2.4.0-torch_shm_manager.patch \
-		"${FILESDIR}"/${PN}-1.13.0-setup.patch \
-		"${FILESDIR}"/${PN}-2.2.1-emptyso.patch \
-
-	# Set build dir for pytorch's setup
-	sed -i \
-		-e "/BUILD_DIR/s|build|/var/lib/caffe2/|" \
-		tools/setup_helpers/env.py \
-		|| die
-	distutils-r1_src_prepare
-
-	hprefixify tools/setup_helpers/env.py
-}
-
-python_compile() {
-	PYTORCH_BUILD_VERSION=${PV} \
-	PYTORCH_BUILD_NUMBER=0 \
-	USE_SYSTEM_LIBS=ON \
-	CMAKE_BUILD_DIR="${BUILD_DIR}" \
-	distutils-r1_python_compile develop sdist
-}
-
-python_install() {
-	USE_SYSTEM_LIBS=ON distutils-r1_python_install
-}
diff --git a/sci-libs/torchvision/Manifest b/sci-libs/torchvision/Manifest
index 62201c9e7f35..6e9f2d7f3f10 100644
--- a/sci-libs/torchvision/Manifest
+++ b/sci-libs/torchvision/Manifest
@@ -1,4 +1,4 @@
-AUX torchvision-0.20.0-gentoo.patch 398 BLAKE2B 5dd989583e352dcad7bc5efe0c9c70fd5d4a81a2ba37fd282a698e110c546b63309853b80a2a6cf20845de95dc5a653484dc353a9ce24f5ca15700bed6bdc5d7 SHA512 be9d7512eef42e68f2de3011423b272dc07a2e20d5c4fd5f4231a55747d283834cb1bf3f806f6baaff2f1af80d999c15256966fbd8e00c10bf7ac56c01b8ada2
+AUX torchvision-0.20.0-gentoo.patch 520 BLAKE2B 2312d5fcc51047e229481e58793919e1167a5c41757028b85978512f76977861ae360bf66c071f21c5bab46cff42aeb76383a94e90bbc61ac4c767224738e3de SHA512 815118c9b440f91bf77be55dc12e7c71346fbf8b11d4291cabe57e5a7cf8822c31427f096335b812b857ce87da2b407189477550da3894d4bf2dc0886291d40d
 DIST torchvision-0.20.0.tar.gz 13149734 BLAKE2B 49493f2b088305f2d4a7502201c233304dc149dc96f4da2a3e93341e2d4e094fc6cdbc7c0d60cf25b97e698120065378408b557b2b0237d6afda7d1ed534487d SHA512 1db98fcc0ef4c018cd00a2c540bc60a47dd3b161f5128337e4a2f0bcce792273b9902108dc01e7d091a3331d9e35f8ab53503cbdba3f2a3cb3865471e7f63baf
 EBUILD torchvision-0.20.0.ebuild 2123 BLAKE2B c0bf80ad7e21fb3ceafb7daf3d1828772393c1b77b456029ca4c5d1c9bb2cd27bd776edaf366a03bc84e954455511165b05f365c875ccc5f11b56eb0237a0446 SHA512 97589f5e6a08f6cf83de4cf91984add39c816548e2bbfef5db22cc44256858581c65ddf236520b2ce44129b1c3e5766da0bf98fa66bb08b69d964a348dafb7f2
 MISC metadata.xml 327 BLAKE2B e101d8dc63891696a8a17c908253b6302aeb9623b57cc67ad051e9f7df0fb693fe5360e8b41127eba78584c99caf105e5a1f5a76fad74a435dab99808a73d9eb SHA512 6e3d0588c3724fa18573df4001c81e40eb6fb93bb2254f8d03d8e9a908fbf89b8d734ed0f6549e2a4460f905c2daabfe125137e1f39cd4b6830ef2369f4ee91a
diff --git a/sci-libs/torchvision/files/torchvision-0.20.0-gentoo.patch b/sci-libs/torchvision/files/torchvision-0.20.0-gentoo.patch
index a622e41ec1ea..2633660cafa5 100644
--- a/sci-libs/torchvision/files/torchvision-0.20.0-gentoo.patch
+++ b/sci-libs/torchvision/files/torchvision-0.20.0-gentoo.patch
@@ -1,11 +1,19 @@
---- a/setup.py	2025-02-21 22:49:07.255937371 +0100
-+++ b/setup.py	2025-02-21 22:49:20.372975254 +0100
-@@ -127,7 +127,7 @@
+--- a/setup.py	2025-02-22 16:44:42.102439182 +0100
++++ b/setup.py	2025-02-22 16:46:52.393841294 +0100
+@@ -6,6 +6,7 @@
+ import subprocess
+ import sys
+ import warnings
++import shlex
+ from pathlib import Path
+ 
+ import torch
+@@ -127,7 +128,7 @@
              if NVCC_FLAGS is None:
                  nvcc_flags = []
              else:
 -                nvcc_flags = nvcc_flags.split(" ")
-+                nvcc_flags = NVCC_FLAGS.split(" ")
++                nvcc_flags = shlex.split(NVCC_FLAGS)
          extra_compile_args["nvcc"] = nvcc_flags
  
      if sys.platform == "win32":