5 files changed, 24 insertions, 19 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index f00a5d0cbba8..e2b0b5741109 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index efd7900664e6..11de6a38dde1 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -2,5 +2,5 @@ AUX caffe2-1.11.0-gentoo.patch 5245 BLAKE2B 46f70234e3073a99297da4d56281a507a396
 AUX caffe2-1.12.0-glog-0.6.0.patch 959 BLAKE2B eb0c18a34a2c5a1b68a420b9001eac5c8ff65ef9ca9ea1e5ad93ecef3cbaa595808105bbf6c8d3dcb9047559d23bc0398cda5922fb41e29a7588644c90c90fd8 SHA512 5873f11930ae5947c7dfbb19d0377d5535e395fcc1ab213e3c65c77b2e3bd911efc11cde2ca3e7134e9e7798ca7a483910113f331c0a23b73a5546aaaded40c5
 AUX caffe2-1.12.0-install-dirs.patch 6145 BLAKE2B 80ffd3cde9d25951156b1f8b476f19925ec408236c1a9f59205841d82a596fe3de75f896b8d554e091f7b23bf1090a4f7c19d39d5b60924127031da9958ad89c SHA512 37e3e1927a8ada047cee16d4d850433f028ffbe8feaccb91ad329c3ecc7b0a13fe43005e612023f5f90f094e5ed6080c9315d2b63418b118504c0904f4e81c03
 DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7 SHA512 c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7
-EBUILD caffe2-1.12.0.ebuild 4258 BLAKE2B 45e96799704f0dd60faf0bd0a43eba54e56c039a8c5ffc4338806772db9bab97fe4bb402ea5b4a8d9e32a506710a677c395af9b1ccd4546a2942d35ec5eb62ff SHA512 56d31e6e01e87c6043dfca1966a8ab4b91187176da692a94c6d0192e452b0f1397ff94ce6ec2a473527631886e9f87e5c017d03c462b25eb8678987afc83fb4d
+EBUILD caffe2-1.12.0-r1.ebuild 4326 BLAKE2B 33fe8cd04aed161d82b54ecc6e680292ca8652b0295ef631a989e36d4b7bb97efe220d08a955d44cb9c5ffc3cb9ff1cfc4bd3b0299189bc3918a9dd500fbdede SHA512 afd5e4a9109adbcc582a61097e065d82d84ecad5e4ef17e1f0846290b0a1d3e1295c5fab7b732b4534cb0e9cce5ded8c997a70ace4ca924f26320d9ad9cd99f6
 MISC metadata.xml 961 BLAKE2B 7e0924bce6c952cf8b5e997a50e11aad18d572060087ab877d9600399712a6e46f7bee9938aef6b7af142de21046c1cbe541302a68a20072d1040e7b084b202c SHA512 9ff387a4d11eb83799665e38690f0c668ea6147ab92cc8fd68d4fb60590e51863d4530b885f71bd660429c6d38e573a2a7d8fca5e0139b82111ab05cb61b67d9
diff --git a/sci-libs/caffe2/caffe2-1.12.0.ebuild b/sci-libs/caffe2/caffe2-1.12.0-r1.ebuild
index 035c81fabb3a..8f6e1f87386f 100644
--- a/sci-libs/caffe2/caffe2-1.12.0.ebuild
+++ b/sci-libs/caffe2/caffe2-1.12.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit python-r1 cmake flag-o-matic
+inherit python-single-r1 cmake flag-o-matic
 
 MYPN=pytorch
 MYP=${MYPN}-${PV}
@@ -43,7 +43,9 @@ RDEPEND="
 	)
 	ffmpeg? ( media-video/ffmpeg:= )
 	nnpack? ( sci-libs/NNPACK )
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	numpy? ( $(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		') )
 	opencl? ( virtual/opencl )
 	opencv? ( media-libs/opencv:= )
 	qnnpack? ( sci-libs/QNNPACK )
@@ -57,8 +59,10 @@ DEPEND="
 	dev-libs/FXdiv
 	dev-libs/pocketfft
 	dev-libs/flatbuffers
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+	')
 "
 
 S="${WORKDIR}"/${MYP}
@@ -91,7 +95,6 @@ src_configure() {
 		ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'"
 	fi
 
-	python_setup
 	local mycmakeargs=(
 		-DBUILD_CUSTOM_PROTOBUF=OFF
 		-DBUILD_SHARED_LIBS=ON
@@ -144,11 +147,6 @@ src_configure() {
 	cmake_src_configure
 }
 
-python_install() {
-	python_domodule python/caffe2
-	python_domodule python/torch
-}
-
 src_install() {
 	cmake_src_install
 
@@ -156,8 +154,10 @@ src_install() {
 	doins "${BUILD_DIR}"/CMakeCache.txt
 
 	rm -rf python
-	mkdir -p python/torch || die
+	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
-	python_foreach_impl python_install
+	python_domodule python/caffe2
+	python_domodule python/torch
 }
diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest
index bf9858c3d72a..904c31232fe4 100644
--- a/sci-libs/pytorch/Manifest
+++ b/sci-libs/pytorch/Manifest
@@ -4,5 +4,5 @@ AUX pytorch-1.6.0-global-dlopen.patch 592 BLAKE2B a5e3742fcb0cf2286a9406e11bade1
 AUX pytorch-1.7.1-torch_shm_manager.patch 441 BLAKE2B 28b87353a0afa0ef25c8ab00e204998b4fb3472fbbb5bb2b300a3fb22d864846d51ccef652ce331484c7a522f7d74e6674c1ceaf26d0a4956d1c8b57b29a7428 SHA512 08f2e5f35768e70713a1432797d9fbe0b133a80ae7dff2898e4b9b51ab398f88bce90a0698b3c9f77bf8a4c5c054911c22931d0684276a0b6d4f2afb69633088
 AUX pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch 1063 BLAKE2B c93cb4c1ff40ef332cd518474a397e9b61d310f4cbdb8701c18749f103533a69e4a3e892f1e3613113cc97ae320951dacb956025ba6be694c5275448d2af3a78 SHA512 7931a220068a36b15ee0f282161f23422acdbef32990bd1eafeab55e06131748f5b4ad93e6a0dc7a4f92e7ebd0595a97835c768b46dd7139f626df666642ce18
 DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7 SHA512 c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7
-EBUILD pytorch-1.12.0-r1.ebuild 1396 BLAKE2B 4688d9e5f5612a00ed170519a892512fa04bb3c260ebe81e17c16a11f2e37c196ecf62e5fceb084fd125fe88a94bca57887bc2e4c58054b3059bbd1defed8038 SHA512 b0816114c46ca283524818a2a3d328ede71cb61758e709366e6daf14feba17008999e0131bcaf62d0a232e4424b4cf42c8e688c95a19b71e8f742d1fa71217ad
+EBUILD pytorch-1.12.0-r2.ebuild 1492 BLAKE2B d5ed13032869a0140628d5446bc3e797893f98c8aed023bfe2878d37b97e84d3279120e6b7b5733bfedbcdf6b1e7a71fba96c94016bb20b5e4cffc2e630e83b7 SHA512 664cc8d54f2615f624861e7c0bdfeb7e147d251dca1ddc6e724bfcd241408fed3f0066edc3341105cdb2a8ff6ea2257bdd936815e6546f3109532ff71a85ef78
 MISC metadata.xml 328 BLAKE2B f49c6d62ac88dfffe497ed05b1f727941a94acb87a809611dda8aedbd87508fdfdf94ec0e025cac2a649b0881b600236289943b4be0f6ca44fc105b6d8fbe97c SHA512 16c29d2c1177a89026235191ea3e33870c2e6b63f029b7febd4dbd2e99f598fab4b4fd2fa7a801ffd88393663a00752300e6e2cc847a83690b715bcc481d9dc2
diff --git a/sci-libs/pytorch/pytorch-1.12.0-r1.ebuild b/sci-libs/pytorch/pytorch-1.12.0-r2.ebuild
index 02fa58c7ba75..83a4944773f1 100644
--- a/sci-libs/pytorch/pytorch-1.12.0-r1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.12.0-r2.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2022 Gentoo Authors
+# 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_{8,9,10} )
+DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1
 
 DESCRIPTION="Tensors and Dynamic neural networks in Python"
@@ -20,11 +21,15 @@ RESTRICT="test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RDEPEND="
 	${PYTHON_DEPS}
-	~sci-libs/caffe2-${PV}[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	~sci-libs/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	')
 "
 DEPEND="${RDEPEND}
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
 "
 
 src_prepare() {