gentoo auto-resync : 23:03:2025 - 00:31:41

14 files changed, 98 insertions, 85 deletions

diff --git a/sci-ml/Manifest.gz b/sci-ml/Manifest.gz
index 1619bc7ae871..f4a71db5b38e 100644
--- a/sci-ml/Manifest.gz
+++ b/sci-ml/Manifest.gz
diff --git a/sci-ml/caffe2/Manifest b/sci-ml/caffe2/Manifest
index 97bab7181020..d7864d9f40e1 100644
--- a/sci-ml/caffe2/Manifest
+++ b/sci-ml/caffe2/Manifest
@@ -12,7 +12,7 @@ DIST caffe2-patches-20240809.tar.gz 15242 BLAKE2B 77503c61487e7d85cca5afcab9a6e6
 DIST pytorch-2.4.1.tar.gz 115029469 BLAKE2B c2909ff27d527bc57cba56b780d3b8cd07a043ab045caa6c6b27857a16f9ad10aaab2116b26226b1e46ee08ffb44007965d914464418e4ae14ca48c3f3f383bb SHA512 7e9b4485e242eaf0d648765c6621d73d95e7107b766646a098175436d1ab2e2b864badd0757a3bab6b7c318233f2120bad9ac07b39bb9e357897919580c87631
 DIST pytorch-2.5.1.tar.gz 116091366 BLAKE2B 7838b17562b94ffc7d798031348689db607dd5eae2a3c35be365972e2b52a2c1b12067068d5aca5ab00cf0977d9c2c3c9ae5337d69534c864c732e6256cbeef6 SHA512 a913a466324a65fa3d79c5e9ad4d605fc7976f0134fda2f81aaa3cea29d56926604999b8a238759646d211e63b47bbb446cdffa86ca8defd8159f11e30301289
 DIST pytorch-2.6.0.tar.gz 119594438 BLAKE2B 3152eb341cf42295e147e59625beb9c06608aa4b78f9618c1c0024b10c1c767715d07fe8c4be52d029ac47f808cd0d5e65c9530ec90d951a64b993083b4067ad SHA512 a70da80ff09d226085e18228132cf6bb236ad8cc47eed52375d0d2a615f09dd33849da947270b5670c184eab60cb8e2adf11d801babfbda7aa621400501d07b0
-EBUILD caffe2-2.4.1-r4.ebuild 8492 BLAKE2B e4257c78992a7ac8357680d92e9a4c3b16051cb65fee7f448b21f4e6021fe75ca48b2aea3daac71ecbfde05cac2e483936604c5368441faf8636427f9300ae23 SHA512 d3fe259671860c4e016df511c7f435976e1657edcc8d00604c0ef69938db37c7cc5740af0b1d900078f38411d66adb86d3437480829a7c7f5df0fe3103f28e5f
-EBUILD caffe2-2.5.1-r8.ebuild 8780 BLAKE2B 39ce8543430b3fe5a96891fda0436b39b61cec5bfdb894fc86aee1278a5c7156506b1248feba429f6baedfecf2b136fb8b866985fb16d33846dd28b230a9b8fc SHA512 6a3dd782cd391b44de628e7b81355f4130442645cef8bff967809ebc18d91ed3e1e907ff8eeb74e44d8c7ed03f4f3ccb3eb1b6ccd2fa20e1b48982a916fb0dce
-EBUILD caffe2-2.6.0.ebuild 8803 BLAKE2B a9d8962e14032b2cd2fd0b5cad31fb7ea12e01206bd0712c7df565dea332df37d14f1644c7cb9617f4514324ccecd255a83974214119058505d7ba55e83ce175 SHA512 42a27fd86eb829077a453ae2a30fc5908587928a8d402f73651740258d42c29163a6f9dc6e46eedb75810c4653366e5e214eb9a599bf36943f47ab73cc8de24a
+EBUILD caffe2-2.4.1-r5.ebuild 8551 BLAKE2B 5d43307717b3af3aa199b8b74403b23b2f7ff7f7f867a7344cbb0b15b6b692020b1b7d51d41e1d4d6d76eed9b71b5c0b18eed6f3f397dd19cbcf8a98a39e5659 SHA512 27697d1162ba83b0db5ad8149071607d10234a38d0fc27aa72eca775a404b6590d81ddfc5fd7d7ebfd96c2115949d5a4323f3679406b23c79c3ebaee50b318f2
+EBUILD caffe2-2.5.1-r9.ebuild 8861 BLAKE2B fc222b4f9a6e25a63b98872ded5a2a9a5ac5adcab20541ba1f7ae1e0c4845c4894710f2f659e4e63f7f29e166a262ea560dbc9bdb6b6383a5dc62cb7799cc0fd SHA512 d15c58fbc48d69466432e9fe42529640c6f6a94a2004da88e708abde011001bb04a2f9253b70c26146c0b2b3f2270b864b099f7c2f2a332a8630c14d0c0c40a2
+EBUILD caffe2-2.6.0-r1.ebuild 8884 BLAKE2B 3c87ff2e81d44f7bf103bb6538f660c50c2a3207eca72a5ce8abd8e046b5c5dddc23a486fc670701df11f0f781e410aa050821ebe6a8e7c961e18fcd923abca3 SHA512 44219a05050808cd7de8601438218868ebe1cc657775bcaecaf12777ec0fa0d4b2c24e9eeea11422346f9319e14f18d7665090f1655be4c20cebfe177c0b1318
 MISC metadata.xml 1228 BLAKE2B 29fa99ccc009ae8ac209cf0a85a8c87992d10301837f44478b4fe60445dbf261cf1c3869cc6e173944b9c98608fcf32a379c766bf7e53267c90fd71e51e1f9a0 SHA512 06d89ac1b62bf215d56ac67408f6027849f3a1948f1a40013aa989f9d879eb9aa9156d9c336cc83d2bb3795271c11d39d34919f749d83dbfbf48cc2d6aa8545e
diff --git a/sci-ml/caffe2/caffe2-2.4.1-r4.ebuild b/sci-ml/caffe2/caffe2-2.4.1-r5.ebuild
index 59a3e991b4fd..fef92ded7db4 100644
--- a/sci-ml/caffe2/caffe2-2.4.1-r4.ebuild
+++ b/sci-ml/caffe2/caffe2-2.4.1-r5.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 ROCM_VERSION=6.1
-inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
+inherit python-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
 
 MYPN=pytorch
 MYP=${MYPN}-${PV}
@@ -100,19 +100,17 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dev-libs/clog
-	cuda? ( <=dev-libs/cutlass-3.4.1 )
-	onednn? ( sci-ml/ideep )
 	dev-libs/psimd
-	sci-ml/FP16
 	dev-libs/FXdiv
 	dev-libs/pocketfft
 	dev-libs/flatbuffers
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	sci-ml/FP16
 	sci-ml/kineto
-	$(python_gen_cond_dep '
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	')
+	cuda? ( <=dev-libs/cutlass-3.4.1 )
+	onednn? ( sci-ml/ideep )
 "
 
 PATCHES=(
@@ -277,15 +275,24 @@ src_configure() {
 		)
 	fi
 
+	python_setup
 	cmake_src_configure
 
 	# do not rerun cmake and the build process in src_install
 	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
 }
 
+python_install() {
+	python_domodule python/caffe2
+	python_domodule python/torch
+	ln -s ../../../../../include/torch \
+		"${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
+}
+
 src_install() {
 	cmake_src_install
 
+	# Used by pytorch ebuild
 	insinto "/var/lib/${PN}"
 	doins "${BUILD_DIR}"/CMakeCache.txt
 
@@ -293,8 +300,5 @@ src_install() {
 	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
+	python_foreach_impl python_install
 }
diff --git a/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild b/sci-ml/caffe2/caffe2-2.5.1-r9.ebuild
index d62de604417b..43cefe46218d 100644
--- a/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild
+++ b/sci-ml/caffe2/caffe2-2.5.1-r9.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 ROCM_VERSION=6.1
-inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
+inherit python-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
 
 MYPN=pytorch
 MYP=${MYPN}-${PV}
@@ -46,9 +46,9 @@ RDEPEND="
 	dev-libs/protobuf:=
 	dev-libs/pthreadpool
 	dev-libs/sleef
-	virtual/lapack
 	sci-ml/onnx
 	sci-ml/foxi
+	virtual/lapack
 	cuda? (
 		dev-libs/cudnn
 		>=dev-libs/cudnn-frontend-1.0.3:0/8
@@ -98,20 +98,18 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
-	qnnpack? ( dev-libs/clog )
-	cuda? ( <=dev-libs/cutlass-3.4.1 )
-	onednn? ( sci-ml/ideep )
-	dev-libs/psimd
-	sci-ml/FP16
+	dev-libs/flatbuffers
 	dev-libs/FXdiv
 	dev-libs/pocketfft
-	dev-libs/flatbuffers
+	dev-libs/psimd
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	sci-ml/FP16
 	sci-ml/kineto
-	$(python_gen_cond_dep '
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	')
+	cuda? ( <=dev-libs/cutlass-3.4.1 )
+	onednn? ( sci-ml/ideep )
+	qnnpack? ( dev-libs/clog )
 "
 
 PATCHES=(
@@ -294,6 +292,7 @@ src_configure() {
 		)
 	fi
 
+	python_setup
 	cmake_src_configure
 }
 
@@ -303,6 +302,19 @@ src_compile() {
 	cmake_src_compile
 }
 
+python_install() {
+	python_domodule python/torch
+	mkdir "${D}"$(python_get_sitedir)/torch/bin || die
+	mkdir "${D}"$(python_get_sitedir)/torch/lib || die
+	mkdir "${D}"$(python_get_sitedir)/torch/include || die
+	ln -s ../../../../../include/torch \
+		"${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
+	ln -s ../../../../../bin/torch_shm_manager \
+		"${D}"/$(python_get_sitedir)/torch/bin/torch_shm_manager || die
+	ln -s ../../../../../$(get_libdir)/libtorch_global_deps.so \
+		"${D}"/$(python_get_sitedir)/torch/lib/libtorch_global_deps.so || die
+}
+
 src_install() {
 	cmake_src_install
 
@@ -314,18 +326,5 @@ src_install() {
 	rm -rf python
 	mkdir -p python/torch || die
 	cp torch/version.py python/torch/ || die
-	python_domodule python/torch
-
-	mkdir "${D}"$(python_get_sitedir)/torch/bin || die
-	mkdir "${D}"$(python_get_sitedir)/torch/lib || die
-	mkdir "${D}"$(python_get_sitedir)/torch/include || die
-
-	ln -s ../../../../../include/torch \
-		"${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
-
-	mv "${ED}"/usr/bin/torch_shm_manager \
-		"${D}"/$(python_get_sitedir)/torch/bin/ || die
-
-	mv "${ED}"/usr/$(get_libdir)/libtorch_global_deps.so \
-		"${D}"/$(python_get_sitedir)/torch/lib/ || die
+	python_foreach_impl python_install
 }
diff --git a/sci-ml/caffe2/caffe2-2.6.0.ebuild b/sci-ml/caffe2/caffe2-2.6.0-r1.ebuild
index 16bd774af57d..f6fef0622eea 100644
--- a/sci-ml/caffe2/caffe2-2.6.0.ebuild
+++ b/sci-ml/caffe2/caffe2-2.6.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 ROCM_VERSION=6.1
-inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
+inherit python-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
 
 MYPN=pytorch
 MYP=${MYPN}-${PV}
@@ -47,8 +47,8 @@ RDEPEND="
 	dev-libs/pthreadpool
 	dev-libs/sleef
 	virtual/lapack
-	sci-ml/onnx
 	sci-ml/foxi
+	sci-ml/onnx
 	cuda? (
 		dev-libs/cudnn
 		>=dev-libs/cudnn-frontend-1.0.3:0/8
@@ -98,20 +98,18 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
-	qnnpack? ( dev-libs/clog )
-	cuda? ( <=dev-libs/cutlass-3.4.1 )
-	onednn? ( sci-ml/ideep )
-	dev-libs/psimd
-	sci-ml/FP16
+	dev-libs/flatbuffers
 	dev-libs/FXdiv
 	dev-libs/pocketfft
-	dev-libs/flatbuffers
+	dev-libs/psimd
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	sci-ml/FP16
 	sci-ml/kineto
-	$(python_gen_cond_dep '
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	')
+	cuda? ( <=dev-libs/cutlass-3.4.1 )
+	onednn? ( sci-ml/ideep )
+	qnnpack? ( dev-libs/clog )
 "
 
 PATCHES=(
@@ -294,6 +292,7 @@ src_configure() {
 		)
 	fi
 
+	python_setup
 	cmake_src_configure
 }
 
@@ -303,6 +302,19 @@ src_compile() {
 	cmake_src_compile
 }
 
+python_install() {
+	python_domodule python/torch
+	mkdir "${D}"$(python_get_sitedir)/torch/bin || die
+	mkdir "${D}"$(python_get_sitedir)/torch/lib || die
+	mkdir "${D}"$(python_get_sitedir)/torch/include || die
+	ln -s ../../../../../include/torch \
+		"${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
+	ln -s ../../../../../bin/torch_shm_manager \
+		"${D}"/$(python_get_sitedir)/torch/bin/torch_shm_manager || die
+	ln -s ../../../../../$(get_libdir)/libtorch_global_deps.so \
+		"${D}"/$(python_get_sitedir)/torch/lib/libtorch_global_deps.so || die
+}
+
 src_install() {
 	cmake_src_install
 
@@ -314,18 +326,5 @@ src_install() {
 	rm -rf python
 	mkdir -p python/torch || die
 	cp torch/version.py python/torch/ || die
-	python_domodule python/torch
-
-	mkdir "${D}"$(python_get_sitedir)/torch/bin || die
-	mkdir "${D}"$(python_get_sitedir)/torch/lib || die
-	mkdir "${D}"$(python_get_sitedir)/torch/include || die
-
-	ln -s ../../../../../include/torch \
-		"${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
-
-	mv "${ED}"/usr/bin/torch_shm_manager \
-		"${D}"/$(python_get_sitedir)/torch/bin/ || die
-
-	mv "${ED}"/usr/$(get_libdir)/libtorch_global_deps.so \
-		"${D}"/$(python_get_sitedir)/torch/lib/ || die
+	python_foreach_impl python_install
 }
diff --git a/sci-ml/datasets/Manifest b/sci-ml/datasets/Manifest
index 8af64448218c..7544b26ee81f 100644
--- a/sci-ml/datasets/Manifest
+++ b/sci-ml/datasets/Manifest
@@ -1,4 +1,4 @@
 AUX datasets-2.21.0-tests.patch 721 BLAKE2B cf85b02a4eb5da27e52bf819f00e333d6e3fb3fb0b9f7279afff24e3fddf76fcd46cb5e06d29b4780d0ce6b48c9378df301c70f6339e2f2898560219ebab4210 SHA512 43cdc5af6ba3fff3e7641006be6d8e10a5ad00136c1cf137628456019cccbd3d05b888b7eeec1cb8cd42d5ce52091b2a66d32a5b41ff2193658c4257900ea45c
 DIST datasets-2.21.0.gh.tar.gz 2198480 BLAKE2B 41a5e82013d26644db4f52b16728cee31c6ff27995b8a9b2ddef1512fcda5e9386e47f6726303fec64d5ed7e40432583a6ddcc2bdfbb76096dce5f23b0540149 SHA512 f4193e29505300f98ec026b1ed052ffd3d43ae05a9b191bb56105d703ba2e44752e97c0eeb36dd1b2df6499662915591ab850cdec5248af8c7c5b5a003437c5c
-EBUILD datasets-2.21.0-r2.ebuild 7918 BLAKE2B e0cd5a60c225c53d1d1a5eb4a5a4123d22b451598c9b1937eead9e0c02f4ca14209eb686733d5a688c14fb641bfc713dd052af60c0f0e4f7e7d37935a5473d0d SHA512 5b205c0c9ba5f669df4ce267b72cbe571585b050aa889e904bb073060132f8c36311ecc56a7c102e6810b691c30b6737d47fd736d77d18d0306cf496013717dc
+EBUILD datasets-2.21.0-r3.ebuild 7912 BLAKE2B bed9f652d028e6a7bde172d6c06f3ec6c600b80b127472688616c843d85996085702386aad3d8e8005ce52bac9e040be4a0bc8cc44d6c178aad28aa8b14d7c99 SHA512 919dcc8ad4aee371db1587f720680dae72ce09de57c5d0ed4706650d357d92a51c883871b01d1d4dd4758e88a89ef7a7227f9359cbf4e9a42aa852d8b34a2e6e
 MISC metadata.xml 379 BLAKE2B 48ebb9e7bfa8b58b0d15b82c4146def465e08cf3212ab4af04129d09c153b67b00d0fa05b94d6af54f643ec3a202f2335d3254b966f49d1394d3c7b9e5da56a5 SHA512 99560decfaa0e438980f372d99257695e9ca9585167d9aba091e0b775c2f8384657ddc017841c8f06f8b568017a54fb9e31da736f3c875da717e154cdce876d1
diff --git a/sci-ml/datasets/datasets-2.21.0-r2.ebuild b/sci-ml/datasets/datasets-2.21.0-r3.ebuild
index 394b7469aaff..187cf2641545 100644
--- a/sci-ml/datasets/datasets-2.21.0-r2.ebuild
+++ b/sci-ml/datasets/datasets-2.21.0-r3.ebuild
@@ -22,7 +22,6 @@ IUSE="test"
 RDEPEND="
 	${PYTHON_DEPS}
 	sci-ml/pytorch[${PYTHON_SINGLE_USEDEP}]
-	sci-ml/caffe2[${PYTHON_SINGLE_USEDEP},numpy]
 	$(python_gen_cond_dep '
 		dev-python/aiohttp[${PYTHON_USEDEP}]
 		dev-python/dill[${PYTHON_USEDEP}]
@@ -37,6 +36,7 @@ RDEPEND="
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/tqdm[${PYTHON_USEDEP}]
 		dev-python/xxhash[${PYTHON_USEDEP}]
+		sci-ml/caffe2[${PYTHON_USEDEP},numpy]
 		sci-ml/huggingface_hub[${PYTHON_USEDEP}]
 	')
 "
diff --git a/sci-ml/pytorch/Manifest b/sci-ml/pytorch/Manifest
index d988c600da9f..5617f1f3ddee 100644
--- a/sci-ml/pytorch/Manifest
+++ b/sci-ml/pytorch/Manifest
@@ -10,7 +10,7 @@ AUX pytorch-2.6.0-dontbuildagain.patch 757 BLAKE2B 2de63f16f26bdf2df95fc040ab1d6
 DIST pytorch-2.4.1.tar.gz 115029469 BLAKE2B c2909ff27d527bc57cba56b780d3b8cd07a043ab045caa6c6b27857a16f9ad10aaab2116b26226b1e46ee08ffb44007965d914464418e4ae14ca48c3f3f383bb SHA512 7e9b4485e242eaf0d648765c6621d73d95e7107b766646a098175436d1ab2e2b864badd0757a3bab6b7c318233f2120bad9ac07b39bb9e357897919580c87631
 DIST pytorch-2.5.1.tar.gz 116091366 BLAKE2B 7838b17562b94ffc7d798031348689db607dd5eae2a3c35be365972e2b52a2c1b12067068d5aca5ab00cf0977d9c2c3c9ae5337d69534c864c732e6256cbeef6 SHA512 a913a466324a65fa3d79c5e9ad4d605fc7976f0134fda2f81aaa3cea29d56926604999b8a238759646d211e63b47bbb446cdffa86ca8defd8159f11e30301289
 DIST pytorch-2.6.0.tar.gz 119594438 BLAKE2B 3152eb341cf42295e147e59625beb9c06608aa4b78f9618c1c0024b10c1c767715d07fe8c4be52d029ac47f808cd0d5e65c9530ec90d951a64b993083b4067ad SHA512 a70da80ff09d226085e18228132cf6bb236ad8cc47eed52375d0d2a615f09dd33849da947270b5670c184eab60cb8e2adf11d801babfbda7aa621400501d07b0
-EBUILD pytorch-2.4.1.ebuild 1614 BLAKE2B 9501aece8e35294d16c7c2b817c11c700b16e87712009a7a61b53775aad93295cffed37f49059623571733838998581823a1750171a138a84a78b2b0d2cac294 SHA512 9f39da3c85fbaf049b6478335b243fa9bbdf610de19b93f4cbdba148aea06fd7602806ad221ab1a60444596c35450a2d1730a9df8a9de0a22225ae210072d425
-EBUILD pytorch-2.5.1-r1.ebuild 1493 BLAKE2B 39a9495888e73d8f7c0294757dbd7aeb0d657b653274e48e9fa53d2ab92b304f8e0edd9c1e221dcb1e7168464bd71db9ca7166b22350238b7c8bbe3ff15c9070 SHA512 82fb6ecf7f90060d65dd22671c34d78a8a9c28ad271f579bd4acda705c325e00e3ac76966993160ccf7a13ff4be71a40d5fbefd3bb662794e467fe691b6a834f
-EBUILD pytorch-2.6.0.ebuild 1428 BLAKE2B 11e2404722c04e775c5e9c44b5ce76fac5ef48da7c2237ae851aec7e60f8a96e8c7937e9989e09fe1e5d6720209b186fc84271d3e8a778cfda71105240c2741c SHA512 79f39cb5506b3912a861fed8946de29d5f010395a0b8648df88416d49777971d349e9d177cf3d0106b33eeb2cd379971072a51f7e16af1c418f900bfb6c8aa09
+EBUILD pytorch-2.4.1-r1.ebuild 1608 BLAKE2B a9ecee9d959ee2ea5775de0a2853e4df80c1164ab4aea72f3a8172a4ec7bb2473dc5d95236e99a859947680242d4a828d9affa9b7b107f1c0c1ba6379d8984c4 SHA512 a0a822d3011fd95be649738ed2a789fa6e588d7a3190ec8e1e681ab32b6ff6e16d0dc9bc4fdbab160d1110a4693c671ebde2c9e5dbbfea651a85fc6d69306235
+EBUILD pytorch-2.5.1-r2.ebuild 1487 BLAKE2B 3c0f19d6095e9b80939a06e0815430aefa2c5b8a9adc02ee0fb878317608571e4825192e6f9de1ec431fde3928e2c95743b81724ecf7fd703f7d77deaf91d5d7 SHA512 35ea4536c9dbbf57a5b298ed8c33b0c9fcd675e4f193307161ccfe1983244fa0c82b9300d055ffe43f5c56dd13b562675e13b178c447a81e9e73e918058446e5
+EBUILD pytorch-2.6.0-r1.ebuild 1422 BLAKE2B 0c38d36b939df72eb2453f1b3779821c1723f09d997da71ff3309ee03025b9c40ac46e6cac815299207064e29ab2f80d8161113f6f4dd1ceec900fc6faab5971 SHA512 fa0e1390a1d0ec26e8fd88debf4bf562bafdf212b9331cfd8ae70a4c00f5ccc42ddbfed60db7cbe7d37341a10eb2e6c4f066acb7ac557d36d601726206ebd2c8
 MISC metadata.xml 516 BLAKE2B 91217d92fb2a588197740116e4d60d2429c1e4dc21845605bcaba4f6f5c941d27024175eae9cbd3dd89deb30496fb3d56f2a771f115887548e4a81b1947837d4 SHA512 85e43fc8be4da3677d1bfadaaeb8d23a17277fa4a684e89f5d8da0279f6b2d9744716ca82d7fe5e070b163de4d153e4d0c433b2d5ef9b609b7b9b53d57e32906
diff --git a/sci-ml/pytorch/pytorch-2.4.1.ebuild b/sci-ml/pytorch/pytorch-2.4.1-r1.ebuild
index a728bf7bf17c..e3357c048f0b 100644
--- a/sci-ml/pytorch/pytorch-2.4.1.ebuild
+++ b/sci-ml/pytorch/pytorch-2.4.1-r1.ebuild
@@ -22,10 +22,10 @@ RESTRICT="test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RDEPEND="
 	${PYTHON_DEPS}
-	~sci-ml/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
 		dev-python/sympy[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		~sci-ml/caffe2-2.4.1[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}
diff --git a/sci-ml/pytorch/pytorch-2.5.1-r1.ebuild b/sci-ml/pytorch/pytorch-2.5.1-r2.ebuild
index 35dcba8f77d8..32e2d690bc95 100644
--- a/sci-ml/pytorch/pytorch-2.5.1-r1.ebuild
+++ b/sci-ml/pytorch/pytorch-2.5.1-r2.ebuild
@@ -22,11 +22,11 @@ RESTRICT="test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RDEPEND="
 	${PYTHON_DEPS}
-	~sci-ml/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}]
 	>=sci-ml/caffe2-2.5.1-r5
 	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
 		dev-python/sympy[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		~sci-ml/caffe2-2.5.1[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}
diff --git a/sci-ml/pytorch/pytorch-2.6.0.ebuild b/sci-ml/pytorch/pytorch-2.6.0-r1.ebuild
index 2262b315087f..e2561c190f30 100644
--- a/sci-ml/pytorch/pytorch-2.6.0.ebuild
+++ b/sci-ml/pytorch/pytorch-2.6.0-r1.ebuild
@@ -22,10 +22,10 @@ RESTRICT="test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RDEPEND="
 	${PYTHON_DEPS}
-	~sci-ml/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
 		dev-python/sympy[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		~sci-ml/caffe2-2.6.0[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}
diff --git a/sci-ml/transformers/Manifest b/sci-ml/transformers/Manifest
index 088a1633096b..dd34824f6b1c 100644
--- a/sci-ml/transformers/Manifest
+++ b/sci-ml/transformers/Manifest
@@ -3,5 +3,5 @@ DIST transformers-4.48.3.gh.tar.gz 19569408 BLAKE2B 563c93580742ca2357509812292a
 DIST transformers-4.49.0.gh.tar.gz 19922847 BLAKE2B 66d70f417099b46183755bf705c9d2fa522c5e33c508cf5054b9fba260fd0e3011198d3eccae6671bcc02014836e3055712e0462e00551a34c5a89c430116a41 SHA512 72439dd4535a1622d57230a0180d5f3d96a53e450978e7916fb93638d5a1aeb0da775f1f6b189cc8a3be9d1bd557ab70a2ea90455a5b5129d2067b5ec61e49b8
 EBUILD transformers-4.47.1.ebuild 4554 BLAKE2B e773106bf578a05cce42081bdc0f25af3bde4576881b4701243f57ad7b14c2639d66d46d382e6ccabad8ff62e869049d5efc5d105f8cabe1b652cfcaf7e1f677 SHA512 8ed6ec09e0f338f1dcebee1e58919abda71fa1eca7691193c12f39e2df836ad18f476aa8b76e3b836be28a89ced0f1dd191948153123debc41a0dc71d57e55d9
 EBUILD transformers-4.48.3.ebuild 4782 BLAKE2B 85fc6fcd3f17c699f10c15e54dacff1bd011d9b24f7bbfafc36b126761cdcc26958304779c447d43b3be211ee4818f6649038d8ace22cb32d76d0860bf09bd5a SHA512 4db05ed7b436dc97c33dbfd2b256f982ee04a0a13684ba1fc5a7eb602f0986b7b21f3914cbc75a07bfd5b255d67f4014abc798940317e14389e0e3b88f0d19fa
-EBUILD transformers-4.49.0-r1.ebuild 4832 BLAKE2B 979679556dae68b979925fba8393ff2a1b8973612e8277dbdd133744ac335e8e729a85809ee4f5e2e467d00407f7070151daee27fc0a0c0192d128fdf83b96d5 SHA512 e324fd55f4654bb841f3b68f90f7055e3138b22e21db384806e3cd7fa44117fed9974e00b759d023bb67db8f0e05efecdeab2fa2b31817725f1fc93e42715902
-MISC metadata.xml 387 BLAKE2B 3f22d78a1aa32d40204f0c028a564cae5950a3294a7f0ed13c171683a63d2e62892a3740834735a5165745bb477538ac75826fd0c495883bacb32fe22d124621 SHA512 f800c33c27db9b23289e0086f82a80c593b7eeca00cec7bd9c3619e4f074878302c9110117d1a4ddaf789c53a58c4b274d46f4bcea9b8eec477b4fcf8e317a29
+EBUILD transformers-4.49.0-r3.ebuild 4995 BLAKE2B a8eb5cff3225cf3bf64242c0c18e420ad8c1abbe07e4b8027e1fe7d6b83baa8af485ff8e2f672dad5d6f52e656d09f97ee54c22442467cdb8d876cd00bbea29a SHA512 7ad408df467e6dc534d217fbe89e7fa17d554840432fb4f09e36cefb0641757099048a1d02cae0ca6747aa561cb461aadb93b93f7220ee9fb0c185cb860c1d3a
+MISC metadata.xml 446 BLAKE2B e8865e42c4d09715f4ea763b4c1c23d23f69d4095cfc56fe47b2e117c9ff51cba42eb112d159ad3932c7e1c43671156e1ce67ef6bc667e2f40810dc8f010f11e SHA512 2b9b2456c699b53dd0412237f6a687c4c5a1b3edeca3120e946ae6c78b455539c036cba120e61d7e7b254a929667335582c9f16ecc5d2ab90ef8ce92c69a6e40
diff --git a/sci-ml/transformers/metadata.xml b/sci-ml/transformers/metadata.xml
index 9489a5f68f41..fe315dfdbe00 100644
--- a/sci-ml/transformers/metadata.xml
+++ b/sci-ml/transformers/metadata.xml
@@ -5,6 +5,9 @@
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
+	<use>
+		<flag name="torch">Support pytorch</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">huggingface/transformers</remote-id>
 		<remote-id type="pypi">transformers</remote-id>
diff --git a/sci-ml/transformers/transformers-4.49.0-r1.ebuild b/sci-ml/transformers/transformers-4.49.0-r3.ebuild
index a691a7af8f3e..459836a29059 100644
--- a/sci-ml/transformers/transformers-4.49.0-r1.ebuild
+++ b/sci-ml/transformers/transformers-4.49.0-r3.ebuild
@@ -19,6 +19,7 @@ SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="torch"
 RESTRICT="test" # Need network, too long to execute
 
 RDEPEND="
@@ -33,7 +34,14 @@ RDEPEND="
 		dev-python/tqdm[${PYTHON_USEDEP}]
 		>=sci-ml/huggingface_hub-0.26[${PYTHON_USEDEP}]
 		>=sci-ml/safetensors-0.4.1[${PYTHON_USEDEP}]
+		torch? (
+			sci-ml/caffe2[${PYTHON_USEDEP}]
+		)
 	')
+	torch? (
+		sci-ml/pytorch[${PYTHON_SINGLE_USEDEP}]
+		sci-ml/accelerate[${PYTHON_SINGLE_USEDEP}]
+	)
 "
 BDEPEND="
 	$(python_gen_cond_dep '