gentoo auto-resync : 14:05:2023 - 10:00:59

11 files changed, 347 insertions, 104 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 460806d40589..6a97f6542a56 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 6f604164504a..363e0c313bd5 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -8,6 +8,8 @@ AUX caffe2-2.0.0-gcc13.patch 1203 BLAKE2B df55608c6019802da32809cb210b60cf0debf3
 AUX caffe2-2.0.0-gentoo.patch 7081 BLAKE2B d2b8d411f6f2c19c5339053accd445606092d15fad78f793c9a2ba708156b9425607324b842bd78402e3a2009756249a13addb75241a593582e2c6711a702d1a SHA512 ff168df38fef53c7afd3abe2064e258248f7293e16f3fca757f714da41a094be18d18a9180759ebafd952896a9d06aa68927ff9215cab904926ba362eef79929
 DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B 75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3 SHA512 f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62
 DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B 6d593a975c0ade714f0b189f7e3c4ff704b9a9a2377b5e441a9cefc202fa22779966d08948e63671912c6ea5a0eee124042155f4f57a654db34e19e42f013cc9 SHA512 4dd76160711c0d87f3026c8b7fa3ed149dd86b8ac0ee9ecea0eaf80d2e6ce8c29368392e77b9466d90b60634087b462b782495997a5d33367cc8ca9fe14c8a14
+DIST pytorch-2.0.1.tar.gz 111335778 BLAKE2B 7a10cc2b2d5e2422aef7e060a0c3a62ca5c7460c6e0b9becade9b98939501975c74ed5a175a653731f43ca824d2c9bd31f41d1f633c2b139779ab23d5331e9ce SHA512 2309a22b3be3ccdb36d8d9781a59a7bdcc2fdb8d95ada205702ec77862480f0cbb12cd5d6b8cd3114d01a6e33b7743d0fe9de93debf37138ca5c14403cdb0c43
 EBUILD caffe2-1.13.1-r6.ebuild 5221 BLAKE2B 64a0309f8601752187205d49629245ae8a3305d9fad0626eff293fa555e50c7c147bfa9879ada2bd0a076e41120a9f5f9667cd784a4a3418cee9a4711eb69b05 SHA512 d1162bb88a1ac0c412cc2fa828521f98be9eda5f55d63f4a5162c727940121db1a7ab8155bd151fe1a2b9985851ff82bb49e3f3e01c4e4f1fdc1f3f4444d56ce
 EBUILD caffe2-2.0.0-r4.ebuild 5292 BLAKE2B f0560c057af3e24e81e4538f4ef6f35eba6b3e70a435c00be0e08aed40e1991997beea05127e195fcefe019147b10ca74c338e3b5a1b8bd61c631b680805a587 SHA512 4556d43911ca5fd8438d603529cf74bde4ec8ac30b9e7a45debab2252a9a8db53dde09b20d1be08a76f90dc783bd70401b1252427da6556d6c3e7d487b656345
+EBUILD caffe2-2.0.1.ebuild 5342 BLAKE2B 0bc2440601faf6f067bf1a4792fe5d7ed944aaa878c30ed58c0c6723d72d11f364954724f1dfc65da7d34b98d1533bc5bbe6ab122c4642e6e5a5609009fb2a6e SHA512 823be596fcdb1e2f07be3a6ee8d8617d5e0ebd60aa644fbdbf375f2a97164a9991d8d12981cbc3f660ee62d2439a5d602066fb5aa2862f9ee3a3bcb8623c3168
 MISC metadata.xml 1161 BLAKE2B af1b8f3ab7789f9aa5f635d5a3f1175bbdd7ccbf68f205bfc2769ccab2cb5c519f6fe62024759eb28f0e1353a04bed3216d222808b9f95100d3e0bb591f1d82b SHA512 1737d3dc8fa7786550930beb067ca4eca173a47095a88450ab5c913d3aed08f51fe21c875f484e5663542471a48ef55878cddc97881ff8be7648987b90b79126
diff --git a/sci-libs/caffe2/caffe2-2.0.1.ebuild b/sci-libs/caffe2/caffe2-2.0.1.ebuild
new file mode 100644
index 000000000000..558e1671f543
--- /dev/null
+++ b/sci-libs/caffe2/caffe2-2.0.1.ebuild
@@ -0,0 +1,196 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit python-single-r1 cmake cuda flag-o-matic
+
+MYPN=pytorch
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="A deep learning framework"
+HOMEPAGE="https://pytorch.org/"
+SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv openmp qnnpack tensorpipe xnnpack"
+RESTRICT="test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	ffmpeg? ( opencv )
+	mpi? ( distributed )
+	tensorpipe? ( distributed )
+	distributed? ( tensorpipe )
+	gloo? ( distributed )
+" # ?? ( cuda rocm )
+
+# 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-libs/protobuf:=
+	dev-libs/pthreadpool
+	dev-libs/sleef
+	sci-libs/lapack
+	>=sci-libs/onnx-1.12.0
+	sci-libs/foxi
+	cuda? (
+		=dev-libs/cudnn-8*
+		dev-libs/cudnn-frontend:0/8
+		<dev-util/nvidia-cuda-toolkit-12:=[profiler]
+	)
+	fbgemm? ( dev-libs/FBGEMM )
+	ffmpeg? ( media-video/ffmpeg:= )
+	gloo? ( sci-libs/gloo[cuda?] )
+	mpi? ( sys-cluster/openmpi )
+	nnpack? ( sci-libs/NNPACK )
+	numpy? ( $(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		') )
+	opencl? ( virtual/opencl )
+	opencv? ( media-libs/opencv:= )
+	qnnpack? ( sci-libs/QNNPACK )
+	tensorpipe? ( sci-libs/tensorpipe )
+	xnnpack? ( >=sci-libs/XNNPACK-2022.12.22 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/eigen
+	cuda? ( dev-libs/cutlass )
+	dev-libs/psimd
+	dev-libs/FP16
+	dev-libs/FXdiv
+	dev-libs/pocketfft
+	dev-libs/flatbuffers
+	sci-libs/kineto
+	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+	')
+"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.0-gentoo.patch
+	"${FILESDIR}"/${PN}-1.13.0-install-dirs.patch
+	"${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch
+	"${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch
+	"${FILESDIR}"/${PN}-2.0.0-gcc13.patch
+	"${FILESDIR}"/${PN}-2.0.0-cudnn_include_fix.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
+}
+
+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_CUDNN=$(usex cuda)
+		-DUSE_FAST_NVCC=$(usex cuda)
+		-DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}"
+		-DBUILD_NVFUSER=OFF
+		-DUSE_DISTRIBUTED=$(usex distributed)
+		-DUSE_MPI=$(usex mpi)
+		-DUSE_FAKELOWP=OFF
+		-DUSE_FBGEMM=$(usex fbgemm)
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_GFLAGS=ON
+		-DUSE_GLOG=ON
+		-DUSE_GLOO=$(usex gloo)
+		-DUSE_KINETO=OFF # TODO
+		-DUSE_LEVELDB=OFF
+		-DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma
+		-DUSE_MKLDNN=OFF
+		-DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library
+		-DUSE_NNPACK=$(usex nnpack)
+		-DUSE_QNNPACK=$(usex qnnpack)
+		-DUSE_XNNPACK=$(usex xnnpack)
+		-DUSE_SYSTEM_XNNPACK=$(usex xnnpack)
+		-DUSE_TENSORPIPE=$(usex tensorpipe)
+		-DUSE_PYTORCH_QNNPACK=OFF
+		-DUSE_NUMPY=$(usex numpy)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_ROCM=OFF # TODO
+		-DUSE_SYSTEM_CPUINFO=ON
+		-DUSE_SYSTEM_PYBIND11=ON
+		-DUSE_UCC=OFF
+		-DUSE_VALGRIND=OFF
+		-DPYBIND11_PYTHON_VERSION="${EPYTHON#python}"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DUSE_ITT=OFF
+		-DBLAS=Eigen # avoid the use of MKL, if found on the system
+		-DUSE_SYSTEM_EIGEN_INSTALL=ON
+		-DUSE_SYSTEM_PTHREADPOOL=ON
+		-DUSE_SYSTEM_FXDIV=ON
+		-DUSE_SYSTEM_FP16=ON
+		-DUSE_SYSTEM_GLOO=ON
+		-DUSE_SYSTEM_ONNX=ON
+		-DUSE_SYSTEM_SLEEF=ON
+
+		-Wno-dev
+		-DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+		-DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+
+	if use cuda; then
+		addpredict "/dev/nvidiactl" # bug 867706
+		addpredict "/dev/char"
+
+		mycmakeargs+=(
+			-DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")"
+		)
+	fi
+	cmake_src_configure
+}
+
+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
+	mv "${ED}"/usr/include/torch python/torch/include || die
+	cp torch/version.py python/torch/ || die
+	rm -rf "${ED}"/var/tmp || die
+	python_domodule python/caffe2
+	python_domodule python/torch
+}
diff --git a/sci-libs/pdal/Manifest b/sci-libs/pdal/Manifest
index 1b5627b09180..81e666ee53df 100644
--- a/sci-libs/pdal/Manifest
+++ b/sci-libs/pdal/Manifest
@@ -1,11 +1,10 @@
+AUX pdal-2.4.3-fix-gcc13.patch 1127 BLAKE2B b5ad3b262c6facc45b87ef821552670bc0fb014d529209b5c8d098a52e9b11b32ba729029d3933288ba94c9ea5dc0b9e3aecbc1f4559c9b53a966c9d75c7c80e SHA512 36e90f203881933cc0f3f4c75758c6ced536f17e0479b265b71b973f050dbd337d81174835ae26aeece7ee195a43bc53aec413bfb26afdb270dfee8e55497ea1
+AUX pdal-2.4.3-fix-gdal37.patch 1499 BLAKE2B e9605af72f80f089aa25f3cba68c36e87a09ecd04152a66df0fa8b41720ece945fa09e53eb8db6d91330980a28edc5355e8cea45ee1304827e1276015cdb242f SHA512 804dbd95396988367a48b79675bc58414c1c819379149091239158c4270d581a58cc088137f80237bf793092adf32b02ee7b83645e101711fa638e3865228ae1
 AUX pdal-2.4.3-fix-test.patch 1168 BLAKE2B a5b532ac015408c60d7f16d9aa325a36f85cd2aff8e028daf837d99c51cc3b39077a0cca81ce4e6664fe9370835e0410fad46c8ac5b36895b4a62b269a59be01 SHA512 5eea4f07c0368000420f7ee12f1bd63661525547b4169e1f3493df02144e6054074072d1ef589651a840e1a6a9a7c4412d5d46d41cc485a2e7835e5cd163b3b1
-AUX pdal-2.5.0-fix-opt-abseil.patch 3875 BLAKE2B c24a2320aab5ccf627bf6bca7b6c18a980c1be0e33ad69c16b1343c619d880d15938896c39c630d7b2103b4eaa9a2445ea0cc550bad93abc6744c129d356600f SHA512 c45040f70a57d3be0f3c739a580d4a72c74d9f219393b17d34608b4318abc72a30cfabd66b518a1dea40b382b9c018816c86f59df2c754a985d99b55cd185787
-DIST PDAL-2.4.0-src.tar.gz 113449697 BLAKE2B 8f774555d32ad4f0afe6dd850e6dcaf33b58c02934207ee2224230af762a7d3062a48909e267abf790a97a1d11788bb7543971c99239e5ae742d7945db09bda5 SHA512 655fadd2b435ed1cb801ba542028bcc15156da9266eedde93b2210dbadbc50d36b0b6a151062113f2adfb68a2938e2b867438a5a94952a7b3e46f59a53b47623
 DIST PDAL-2.4.3-src.tar.gz 100758279 BLAKE2B 7c157bb51416b24bd8896a62e71a186bc9a45b34d5ab58fadbe691cb1abc9595f598fcf92ec528c9103f646c21f940b26fbf199a998e707d17f1527eb2957a85 SHA512 ed342c29d10c0506e1c0f5ee4dba531189000dd0cc6912f681a95b7c56483d6136e515771a174e20906b1cd81dfd101d53be0cbaf200480d81d053d7dec8a386
-DIST PDAL-2.5.0-src.tar.gz 105190336 BLAKE2B 6dc303abdf98c07a64a1709bf6069d003cddffef976874e635caf950a291aa7dbdffa0c374a83678f7661ccccd5dd7b8d16dacfbe53354954265f688bdce1def SHA512 10545ad44efbb7a654d596d4a861a81177d61a602ff8425965def5dd99e1595a7873c741f99eefcd7ae5dc7f438b321b51399db3b33fb8eddf46bec8394472b4
 DIST PDAL-2.5.3-src.tar.bz2 102669314 BLAKE2B 1c6c8406f8de65a04364cc1141be809c00ea716fcfd5578833883357258855b3f7e70ea03c86f487dff0bc98072c29bed45a613c14ace05aef6ae49627b40374 SHA512 f67a303711b7d9e9dc14260afb96d299bcd5327ba0cc947143a583f55bd532a248b131e4602fd37d711ad0084e8601420828dacac40c414b95b8e9f9e8175e1b
-EBUILD pdal-2.4.0-r1.ebuild 1213 BLAKE2B 0d780865c514764e77958ef362dff3c5593148c7f9f6d9af06ba28cf5b778f3cdd3056fbe4a3f0485041339ea9022806bcff4d2a7dff913733e98d436c7452df SHA512 116651a1910b2aa95a02237adfeb66144754e5b2b14c19e440b556f9411bf46f4d946cc813bdfa0651c83ad0cb76377827e4262df29d756db460142e8c6b8bb9
+EBUILD pdal-2.4.3-r1.ebuild 1288 BLAKE2B d12899fc99caf59862b4d2de4a9f8f2331a870d30cbf514899365b7f86c09456d8ec87e104f5d1c3fac323640d2df487a5154728a55479f7a984b1d21029408d SHA512 3586c455e3de041a73b7735a775acf36d9e77224f52557f69858195ac9940c046ba8322639a5cfb1fca77e8d6870cc1a5eb13976c02e53d65af6ca7e1e780f42
 EBUILD pdal-2.4.3.ebuild 1213 BLAKE2B 8c51699183dabfa41c580c864cc463b400daca4ec77b5dd478752f27c2f3a52067e3a9cd024691ec022b34d58ae55ec8e49bb0137c79ad0d0621cf157d05acb6 SHA512 5c5e6d6ad2b1281185a2cb3b222d9c42a0e27d7eb52df42a4f50c86ff874d95914753a0c6a002481e8d05d78d6ee3433368306084af141c4b078785a3dba2bc6
-EBUILD pdal-2.5.0.ebuild 1246 BLAKE2B 2c8b758431ca93f7ac8e6c15b0b7d1e57f51874971500cefb6b0cc980e9db8e624723ce3a2b3b5cd6bc77d877cf141b4432b55def5b65abf22cf3f5918d08f58 SHA512 e2be03299ede2721ee539093c51eb42808e291221ab69d328310f1b9267470d04e620dcbefb7150e60c710bf3108a4c819f0d143a22c4b9aa1e4005105ef79af
+EBUILD pdal-2.5.3-r1.ebuild 1250 BLAKE2B a9688937cc11422115dcc92d000e1351d98c48c26376275300692e40a0293368a94f8386f4e05c23e50e1f8100deaf38a5421494f6e5f6a741a370e538596e02 SHA512 588f59d9be15bab42f029a6f6008d1c687c4d4340a4b0c719ff1bbf80e87d94e676cdc51c0e2fa1da787724f6c8c0ed9e8f6faa5ef695931a1004f376a778b7f
 EBUILD pdal-2.5.3.ebuild 1193 BLAKE2B ce04cb145d337379459bb2892a37c4008fc5688167b520bf983771d92cf64965c3e4d105d5e4c550f8218b63cd7be17f8bd9570ae13d08de19689bc204a0e5f8 SHA512 4baa1a5d153efbf8f8009f2727e74149b9552520b0472320f67461b96954270e73f96b40a54987258df40acd5cb05a53ad1e0f4b557b8d3acfb19e497af9ad8c
 MISC metadata.xml 799 BLAKE2B 44fff88edc36553687a49ecf5113b1f7f3c8d092e82ef4e45f0d96cf53cc619647f45b3d3439a5b98bf43a8965e1b80582e7b074489dcd69f6f3aad9e5c7f59a SHA512 da405bacd840b714fe274fa5ca658f7a51b0078054058dcce46f690b33e641579981739de9511f4a876ff0f88aec5c2dbaa59e4db035eb9a85bdd8e9725bc7c2
diff --git a/sci-libs/pdal/files/pdal-2.4.3-fix-gcc13.patch b/sci-libs/pdal/files/pdal-2.4.3-fix-gcc13.patch
new file mode 100644
index 000000000000..0f72473bfe85
--- /dev/null
+++ b/sci-libs/pdal/files/pdal-2.4.3-fix-gcc13.patch
@@ -0,0 +1,29 @@
+From https://github.com/hobuinc/laz-perf/commit/a7f0f4f5b2ca851079574d47918f4f7abc6cc785 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Tue, 13 Dec 2022 22:06:21 +0000
+Subject: [PATCH] Extractor.hpp: add missing <cstdint> header inclusion (#144)
+
+Without the change build fails on upcomit `gcc-13` as:
+
+    In file included from cpp/lazperf/vlr.cpp:33:
+    cpp/lazperf/Extractor.hpp:185:31: error: 'uint8_t' has not been declared
+      185 |     LeExtractor& operator >> (uint8_t& v)
+          |                               ^~~~~~~
+
+`gcc-13` cleaned header up a bit and `<string>` does not include
+`<cstdint>` implicitly anymore. Let's use it explictly.
+---
+ cpp/lazperf/Extractor.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff -Nru PDAL-2.4.3-src-orig/vendor/lazperf/Extractor.hpp PDAL-2.4.3-src/vendor/lazperf/Extractor.hpp
+--- PDAL-2.4.3-src-orig/vendor/lazperf/Extractor.hpp	2023-05-10 23:13:39.613501276 -0300
++++ PDAL-2.4.3-src/vendor/lazperf/Extractor.hpp	2023-05-10 23:15:41.644241402 -0300
+@@ -34,6 +34,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <cstring>
+ #include <vector>
+ 
diff --git a/sci-libs/pdal/files/pdal-2.4.3-fix-gdal37.patch b/sci-libs/pdal/files/pdal-2.4.3-fix-gdal37.patch
new file mode 100644
index 000000000000..29edb8518b9d
--- /dev/null
+++ b/sci-libs/pdal/files/pdal-2.4.3-fix-gdal37.patch
@@ -0,0 +1,37 @@
+From https://github.com/PDAL/PDAL/commit/516e33ad7f40e54affd5754617fbe26d70ef2dd4
+From: Jorge Gustavo Rocha <jgr@geomaster.pt>
+Date: Thu, 20 Apr 2023 13:11:46 +0100
+Subject: [PATCH] prevent invalid conversion from const compile error (#4030)
+squashed with
+From https://github.com/dg0yt/PDAL/commit/49eb31840dc1c07d6ff235ea292c7c0703f8a884
+From: Kai Pastor <dg0yt@darc.de>
+Date: Fri, 12 May 2023 07:44:59 +0200
+Subject: [PATCH] Don't use const_cast
+
+Amends #4030.
+---
+ pdal/Geometry.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pdal/Geometry.cpp b/pdal/Geometry.cpp
+index 10d185dbe4..8b010d3378 100644
+--- a/pdal/Geometry.cpp
++++ b/pdal/Geometry.cpp
+@@ -153,7 +153,7 @@ Geometry& Geometry::operator=(const Geometry& input)
+ 
+ bool Geometry::srsValid() const
+ {
+-    OGRSpatialReference *srs = m_geom->getSpatialReference();
++    const OGRSpatialReference *srs = m_geom->getSpatialReference();
+     return srs && srs->GetRoot();
+ }
+ 
+@@ -172,7 +172,7 @@ Utils::StatusWithReason Geometry::transform(SpatialReference out)
+         return StatusWithReason(-2,
+             "Geometry::transform() failed.  NULL target SRS.");
+ 
+-    OGRSpatialReference *inSrs = m_geom->getSpatialReference();
++    const OGRSpatialReference *inSrs = m_geom->getSpatialReference();
+     SrsTransform transform(*inSrs, OGRSpatialReference(out.getWKT().data()));
+     if (m_geom->transform(transform.get()) != OGRERR_NONE)
+         return StatusWithReason(-1, "Geometry::transform() failed.");
diff --git a/sci-libs/pdal/files/pdal-2.5.0-fix-opt-abseil.patch b/sci-libs/pdal/files/pdal-2.5.0-fix-opt-abseil.patch
deleted file mode 100644
index 79a0f0d162b0..000000000000
--- a/sci-libs/pdal/files/pdal-2.5.0-fix-opt-abseil.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From: https://github.com/PDAL/PDAL/commit/a3a8d6f1759f848b1ec6f3a2fcb3e6b40f12d892
-From: Howard Butler <hobu.inc@gmail.com>
-Date: Thu, 19 Jan 2023 09:58:47 -0600
-Subject: [PATCH] Make Abseil/re2 an opt-in, not required when Abseil is lazily
- found (#3948)
-
-* address #3944, Abseil/re2 being required. It is now an opt-in
-
-* missing endif()
-
-* WITH_ABSEIL FALSE
----
- cmake/gtest.cmake   | 48 ++++++++++++++++++++++++---------------------
- cmake/options.cmake |  4 ++++
- 2 files changed, 30 insertions(+), 22 deletions(-)
-
-diff --git a/cmake/gtest.cmake b/cmake/gtest.cmake
-index c0a0d44ba5..df230a10b2 100644
---- a/cmake/gtest.cmake
-+++ b/cmake/gtest.cmake
-@@ -4,32 +4,36 @@ if (MSVC)
-     option(gtest_force_shared_crt "Always use shared Visual C++ run-time DLL" ON)
- endif()
- 
--set(GOOGLETEST_VERSION 1.10.0)
-+set(GOOGLETEST_VERSION 1.12.1)
- add_subdirectory(vendor/gtest)
- 
- set(FPHSA_NAME_MISMATCHED 1) # Suppress warnings, see https://cmake.org/cmake/help/v3.17/module/FindPackageHandleStandardArgs.html
--find_package(absl QUIET)
--set(FPHSA_NAME_MISMATCHED 0)
- 
--if (absl_FOUND)
--    find_package(re2 REQUIRED)
- 
--    if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13.0")
--        cmake_policy(SET CMP0079 NEW)
-+if (WITH_ABSEIL)
-+    find_package(absl REQUIRED)
-+    set(FPHSA_NAME_MISMATCHED 0)
-+
-+    if (absl_FOUND)
-+        find_package(re2 REQUIRED)
-+
-+        if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13.0")
-+            cmake_policy(SET CMP0079 NEW)
-+        endif()
-+        target_compile_definitions(gtest PUBLIC GTEST_HAS_ABSL=1)
-+        target_compile_definitions(gtest_main PUBLIC GTEST_HAS_ABSL=1)
-+        target_link_libraries(gtest PRIVATE absl::algorithm
-+                                            absl::base
-+                                            absl::flags
-+                                            absl::flags_internal
-+                                            absl::flags_usage
-+                                            absl::flags_commandlineflag
-+                                            absl::flags_parse
-+                                            absl::debugging
-+                                            absl::numeric
-+                                            absl::strings
-+                                            absl::utility
-+                                            absl::failure_signal_handler)
-+        target_link_libraries(gtest PUBLIC re2::re2)
-     endif()
--    target_compile_definitions(gtest PUBLIC GTEST_HAS_ABSL=1)
--    target_compile_definitions(gtest_main PUBLIC GTEST_HAS_ABSL=1)
--    target_link_libraries(gtest PRIVATE absl::algorithm
--                                        absl::base
--                                        absl::flags
--                                        absl::flags_internal
--                                        absl::flags_usage
--                                        absl::flags_commandlineflag
--                                        absl::flags_parse
--                                        absl::debugging
--                                        absl::numeric
--                                        absl::strings
--                                        absl::utility
--                                        absl::failure_signal_handler)
--    target_link_libraries(gtest PRIVATE re2::re2)
- endif()
-diff --git a/cmake/options.cmake b/cmake/options.cmake
-index 73be6788b2..ca3460e629 100644
---- a/cmake/options.cmake
-+++ b/cmake/options.cmake
-@@ -105,6 +105,10 @@ add_feature_info("Unit tests" WITH_TESTS "PDAL unit tests")
- option(ENABLE_CTEST
-     "Enable CTest to support submissions of results to CDash at http://cdash.org" FALSE)
- 
-+option(WITH_ABSEIL
-+    "Choose if PDAL should be built with Abseil support for testing" FALSE)
-+add_feature_info("Abseil debugging support " WITH_ABSEIL "unit tests")
-+
- #
- # Choose dependent options
- #
diff --git a/sci-libs/pdal/pdal-2.4.0-r1.ebuild b/sci-libs/pdal/pdal-2.4.3-r1.ebuild
index 9501e89eae30..81dd25d4f4bb 100644
--- a/sci-libs/pdal/pdal-2.4.0-r1.ebuild
+++ b/sci-libs/pdal/pdal-2.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/PDAL/PDAL/releases/download/${PV}/PDAL-${PV}-src.tar
 
 LICENSE="BSD"
 SLOT="0/14"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="postgres test"
 RESTRICT="!test? ( test )"
 
@@ -37,6 +37,12 @@ DEPEND="
 
 S="${WORKDIR}/PDAL-${PV}-src"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-test.patch"
+	"${FILESDIR}/${P}-fix-gcc13.patch"
+	"${FILESDIR}/${P}-fix-gdal37.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_PLUGIN_PGPOINTCLOUD="$(usex postgres)"
@@ -48,8 +54,9 @@ src_configure() {
 
 src_test() {
 	local myctestargs=(
-		--exclude-regex '(pgpointcloudtest|pdal_io_bpf_base_test|pdal_io_bpf_zlib_test|pdal_filters_overlay_test|pdal_filters_stats_test|pdal_app_plugin_test|pdal_merge_test|pdal_filters_colorinterp_test|pdal_io_optech_test|pdal_utils_test)'
+		--exclude-regex '(pgpointcloudtest|pdal_io_bpf_base_test|pdal_io_bpf_zlib_test|pdal_filters_overlay_test|pdal_filters_stats_test|pdal_app_plugin_test|pdal_merge_test)'
 		--output-on-failure
+		-j1
 	)
 
 	cmake_src_test
diff --git a/sci-libs/pdal/pdal-2.5.0.ebuild b/sci-libs/pdal/pdal-2.5.3-r1.ebuild
index 04eb190ce7d6..24dfef6f560b 100644
--- a/sci-libs/pdal/pdal-2.5.0.ebuild
+++ b/sci-libs/pdal/pdal-2.5.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit cmake
 
 DESCRIPTION="A C++ library for translating and manipulating point cloud data"
 HOMEPAGE="https://pdal.io/"
-SRC_URI="https://github.com/PDAL/PDAL/releases/download/${PV}/PDAL-${PV}-src.tar.gz"
+SRC_URI="https://github.com/PDAL/PDAL/releases/download/${PV}/PDAL-${PV}-src.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0/15"
@@ -38,7 +38,7 @@ DEPEND="
 S="${WORKDIR}/PDAL-${PV}-src"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-fix-opt-abseil.patch
+	"${FILESDIR}/${PN}-2.4.3-fix-gdal37.patch"
 )
 
 src_configure() {
diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest
index 40d7c19a3858..e7b66cd957ee 100644
--- a/sci-libs/pytorch/Manifest
+++ b/sci-libs/pytorch/Manifest
@@ -8,6 +8,8 @@ AUX pytorch-2.0.0-emptyso.patch 522 BLAKE2B 8c0dd836c19bf64846bc2fc401b917494f01
 AUX pytorch-2.0.0-global-dlopen.patch 834 BLAKE2B da3ddd29124ab345e50acd4b42cb310d75d7c9b13005ee41051a1a2b702958b81677fe4f7e76dcd678dd439c89114de2e568f4330380e6e621d2975957293921 SHA512 fa0156229d7cd20e0f3949913750ecf3d8c2f0e872c8dc272cb0144427e079938588c7d4d3fec087b6cfd7846ed6844fbaa3c5510e9be8890be926ba854f7833
 DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B 75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3 SHA512 f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62
 DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B 6d593a975c0ade714f0b189f7e3c4ff704b9a9a2377b5e441a9cefc202fa22779966d08948e63671912c6ea5a0eee124042155f4f57a654db34e19e42f013cc9 SHA512 4dd76160711c0d87f3026c8b7fa3ed149dd86b8ac0ee9ecea0eaf80d2e6ce8c29368392e77b9466d90b60634087b462b782495997a5d33367cc8ca9fe14c8a14
+DIST pytorch-2.0.1.tar.gz 111335778 BLAKE2B 7a10cc2b2d5e2422aef7e060a0c3a62ca5c7460c6e0b9becade9b98939501975c74ed5a175a653731f43ca824d2c9bd31f41d1f633c2b139779ab23d5331e9ce SHA512 2309a22b3be3ccdb36d8d9781a59a7bdcc2fdb8d95ada205702ec77862480f0cbb12cd5d6b8cd3114d01a6e33b7743d0fe9de93debf37138ca5c14403cdb0c43
 EBUILD pytorch-1.13.1-r2.ebuild 1512 BLAKE2B a83a2846755b3ad3dc62329f77b04e73be1f5a79a3c3e2311a61c0965c50a17a83deac89c22ce26470be415c0c48a760f1b74c207e6864a16aead25e42896867 SHA512 55a6ed013855c4d20fad0bb213e51b2881d0b7c3e456055800b16658f92460d998294148d041dba642a11be1a60d5d830edf8613cc09cdf9ce6eef7ecc809976
 EBUILD pytorch-2.0.0.ebuild 1549 BLAKE2B f347c1bb89ff80f4cec2f6d5ca27134c3936f02d80a285d2df88c7472e62dcdb025f72d7f88820bbda2422dd0810db2b53017fc91fdedd2cbb5a1880f79d0d74 SHA512 19e390bcb88b81d5eda1f143bcadce730e2c02776dbcad4327f36b0b61beb2932973ee6352bddd27da2fd030a8626fb6687abccff0cb503d159019006264f7d3
+EBUILD pytorch-2.0.1.ebuild 1593 BLAKE2B ca17265a2c32f5775289601cfd14730cb77cb819ae40a52011025886b3796d351e03fd58af413355272b4975fb9fef15ad769a6bb5106876e389a539cb5346fb SHA512 dafdc920d72b559d8cd8a77b5a13002e556fe5a85927c7f8233be2da4eb7618da20abe8f65929877f51bb5cbf14671df4de26abbfa50add82a970ad144c4d5fd
 MISC metadata.xml 328 BLAKE2B f49c6d62ac88dfffe497ed05b1f727941a94acb87a809611dda8aedbd87508fdfdf94ec0e025cac2a649b0881b600236289943b4be0f6ca44fc105b6d8fbe97c SHA512 16c29d2c1177a89026235191ea3e33870c2e6b63f029b7febd4dbd2e99f598fab4b4fd2fa7a801ffd88393663a00752300e6e2cc847a83690b715bcc481d9dc2
diff --git a/sci-libs/pytorch/pytorch-2.0.1.ebuild b/sci-libs/pytorch/pytorch-2.0.1.ebuild
new file mode 100644
index 000000000000..b778dcb357c3
--- /dev/null
+++ b/sci-libs/pytorch/pytorch-2.0.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_EXT=1
+inherit distutils-r1
+
+DESCRIPTION="Tensors and Dynamic neural networks in Python"
+HOMEPAGE="https://pytorch.org/"
+SRC_URI="https://github.com/pytorch/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RDEPEND="
+	${PYTHON_DEPS}
+	~sci-libs/caffe2-${PV}[${PYTHON_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}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch \
+		"${FILESDIR}"/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch \
+		"${FILESDIR}"/${PN}-2.0.0-global-dlopen.patch \
+		"${FILESDIR}"/pytorch-1.7.1-torch_shm_manager.patch \
+		"${FILESDIR}"/${PN}-1.13.0-setup.patch \
+		"${FILESDIR}"/${PN}-2.0.0-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
+}
+
+src_compile() {
+	PYTORCH_BUILD_VERSION=${PV} \
+	PYTORCH_BUILD_NUMBER=0 \
+	USE_SYSTEM_LIBS=ON \
+	CMAKE_BUILD_DIR="${BUILD_DIR}" \
+	BUILD_DIR= \
+	distutils-r1_src_compile develop sdist
+}
+
+src_install() {
+	USE_SYSTEM_LIBS=ON distutils-r1_src_install
+}