gentoo auto-resync : 24:03:2025 - 00:31:53

19 files changed, 43 insertions, 43 deletions

diff --git a/sci-ml/Manifest.gz b/sci-ml/Manifest.gz
index f4a71db5b38e..c3eeb256488c 100644
--- a/sci-ml/Manifest.gz
+++ b/sci-ml/Manifest.gz
diff --git a/sci-ml/accelerate/Manifest b/sci-ml/accelerate/Manifest
index b3e27121cb90..b259de850602 100644
--- a/sci-ml/accelerate/Manifest
+++ b/sci-ml/accelerate/Manifest
@@ -1,3 +1,3 @@
 DIST accelerate-1.5.2.gh.tar.gz 765155 BLAKE2B 4ae488772251b0f00ff4e195001299fbc22dd12b9625547fbfb952b92a2c4c2a2ea9e1ac976e25b6a1d74ce4bfca4d0398362dfe30cbb266f297539ce790fc1c SHA512 aebdc3963fbc4d331bc8ed37b8769d13ec09cfe1f6b1607c83e2cc92903ef4e5ab6d3be5eb6e1007f3efa1a06e80e7a2d152e3180f2613baebcf1f787ac53139
-EBUILD accelerate-1.5.2.ebuild 1248 BLAKE2B 7c9b6def3abd904edf64ebe3bf3297df4e4a7f9b5e44eab82181e59bcd0fce66b9cf7d652bf940c7ddecf966d18cdf67a85e8a651a8754da235737bf7b53b76e SHA512 493829281c7102226e0026d84d0fe7fcc6688653b324b272ff15fa23043d598fbfbe51518e04b8a8945b0cd96b375150e1d4c622f2ad1ed03e2e1434f3648a4a
+EBUILD accelerate-1.5.2-r2.ebuild 1248 BLAKE2B 7c9b6def3abd904edf64ebe3bf3297df4e4a7f9b5e44eab82181e59bcd0fce66b9cf7d652bf940c7ddecf966d18cdf67a85e8a651a8754da235737bf7b53b76e SHA512 493829281c7102226e0026d84d0fe7fcc6688653b324b272ff15fa23043d598fbfbe51518e04b8a8945b0cd96b375150e1d4c622f2ad1ed03e2e1434f3648a4a
 MISC metadata.xml 335 BLAKE2B 06a96188c26e286e81590830a24987e0029dec21d88d4f9c6262fdddc4953f9dfedf0d7f66385e9a1e1465b2f32fc09cee72b52516a77e2ff4e24fa5fa380c6a SHA512 4762cebead407dcd66c274ff1abdd056fb1f14dc54603d476e22c462c9bcff8ab6b42baf9d00a6b937b4d36112112671aeddd1f493b7202fb02158d32817882a
diff --git a/sci-ml/accelerate/accelerate-1.5.2.ebuild b/sci-ml/accelerate/accelerate-1.5.2-r2.ebuild
index e8ef0adaf4d4..e8ef0adaf4d4 100644
--- a/sci-ml/accelerate/accelerate-1.5.2.ebuild
+++ b/sci-ml/accelerate/accelerate-1.5.2-r2.ebuild
diff --git a/sci-ml/caffe2/Manifest b/sci-ml/caffe2/Manifest
index d7864d9f40e1..aa6422f563b1 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-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
+EBUILD caffe2-2.4.1-r6.ebuild 8556 BLAKE2B 77f1809c8ec73b36e16a8c2939bcafb83a995f8074c163e224f0b02230f6c9cde73c2c11aa07b44f4b670b4472c6ba4157262dd14743cad385187bc4145f5af9 SHA512 7747b9ad89f065af36e5d191f24525748a4c6ea020848b0d64f5699e8f9192699ec523708ea6bc52e1973c5792e65330ba7d27e3a0c88d0990094feda9e9a46d
+EBUILD caffe2-2.5.1-r10.ebuild 8866 BLAKE2B bcc3af372f8ab5969903c32bf15cc619d700776133cfa20e723fe126435505e73fcf48985c338c3055b5a206f776fe5744a73441308114356f35e566aae56b28 SHA512 e175f3741c80e0181ec03952dfac7bcfad808275c60d01f18a46073300d575b31f7b161eb715db22a00e8bb13e37c68051e487982a8f020d63da342da24ff56e
+EBUILD caffe2-2.6.0-r2.ebuild 8889 BLAKE2B 0ccf998a778c69efb005967a5ed6110c34ab263e42f5d969fb4bbbed611209ae1c9191df8c47b53c7c194b2612ce86229456dc4fc6383779a8736e4499056bfa SHA512 d5f19c8f8742b0bfacef9656b9ead6bdaf1185360467d6b83cd1bc7e26db2e3e2c925131850a7f2b9bf3b1fadc081e9d6047ae3b86aeacecc689377fe62edca8
 MISC metadata.xml 1228 BLAKE2B 29fa99ccc009ae8ac209cf0a85a8c87992d10301837f44478b4fe60445dbf261cf1c3869cc6e173944b9c98608fcf32a379c766bf7e53267c90fd71e51e1f9a0 SHA512 06d89ac1b62bf215d56ac67408f6027849f3a1948f1a40013aa989f9d879eb9aa9156d9c336cc83d2bb3795271c11d39d34919f749d83dbfbf48cc2d6aa8545e
diff --git a/sci-ml/caffe2/caffe2-2.4.1-r5.ebuild b/sci-ml/caffe2/caffe2-2.4.1-r6.ebuild
index fef92ded7db4..bc95abbd3fca 100644
--- a/sci-ml/caffe2/caffe2-2.4.1-r5.ebuild
+++ b/sci-ml/caffe2/caffe2-2.4.1-r6.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 ROCM_VERSION=6.1
-inherit python-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
+inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
 
 MYPN=pytorch
 MYP=${MYPN}-${PV}
@@ -104,11 +104,13 @@ DEPEND="
 	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/pybind11[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	')
 	cuda? ( <=dev-libs/cutlass-3.4.1 )
 	onednn? ( sci-ml/ideep )
 "
@@ -275,7 +277,6 @@ src_configure() {
 		)
 	fi
 
-	python_setup
 	cmake_src_configure
 
 	# do not rerun cmake and the build process in src_install
@@ -300,5 +301,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_foreach_impl python_install
+	python_install
 }
diff --git a/sci-ml/caffe2/caffe2-2.5.1-r9.ebuild b/sci-ml/caffe2/caffe2-2.5.1-r10.ebuild
index 43cefe46218d..02c57f637949 100644
--- a/sci-ml/caffe2/caffe2-2.5.1-r9.ebuild
+++ b/sci-ml/caffe2/caffe2-2.5.1-r10.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 ROCM_VERSION=6.1
-inherit python-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
+inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
 
 MYPN=pytorch
 MYP=${MYPN}-${PV}
@@ -102,11 +102,13 @@ DEPEND="
 	dev-libs/FXdiv
 	dev-libs/pocketfft
 	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/pybind11[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	')
 	cuda? ( <=dev-libs/cutlass-3.4.1 )
 	onednn? ( sci-ml/ideep )
 	qnnpack? ( dev-libs/clog )
@@ -292,7 +294,6 @@ src_configure() {
 		)
 	fi
 
-	python_setup
 	cmake_src_configure
 }
 
@@ -326,5 +327,5 @@ src_install() {
 	rm -rf python
 	mkdir -p python/torch || die
 	cp torch/version.py python/torch/ || die
-	python_foreach_impl python_install
+	python_install
 }
diff --git a/sci-ml/caffe2/caffe2-2.6.0-r1.ebuild b/sci-ml/caffe2/caffe2-2.6.0-r2.ebuild
index f6fef0622eea..b9747ad9eed4 100644
--- a/sci-ml/caffe2/caffe2-2.6.0-r1.ebuild
+++ b/sci-ml/caffe2/caffe2-2.6.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 ROCM_VERSION=6.1
-inherit python-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
+inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs
 
 MYPN=pytorch
 MYP=${MYPN}-${PV}
@@ -102,11 +102,13 @@ DEPEND="
 	dev-libs/FXdiv
 	dev-libs/pocketfft
 	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/pybind11[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	')
 	cuda? ( <=dev-libs/cutlass-3.4.1 )
 	onednn? ( sci-ml/ideep )
 	qnnpack? ( dev-libs/clog )
@@ -292,7 +294,6 @@ src_configure() {
 		)
 	fi
 
-	python_setup
 	cmake_src_configure
 }
 
@@ -326,5 +327,5 @@ src_install() {
 	rm -rf python
 	mkdir -p python/torch || die
 	cp torch/version.py python/torch/ || die
-	python_foreach_impl python_install
+	python_install
 }
diff --git a/sci-ml/datasets/Manifest b/sci-ml/datasets/Manifest
index 7544b26ee81f..43f2adfe2432 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-r3.ebuild 7912 BLAKE2B bed9f652d028e6a7bde172d6c06f3ec6c600b80b127472688616c843d85996085702386aad3d8e8005ce52bac9e040be4a0bc8cc44d6c178aad28aa8b14d7c99 SHA512 919dcc8ad4aee371db1587f720680dae72ce09de57c5d0ed4706650d357d92a51c883871b01d1d4dd4758e88a89ef7a7227f9359cbf4e9a42aa852d8b34a2e6e
+EBUILD datasets-2.21.0-r5.ebuild 7918 BLAKE2B 70dd0e2163e4410d4ca9ea107e9b08566928c3ccdf5d4d7cde52bffea0f734e8e4424db33510f6567632bded1c7f1799507c2581a8caab2faa3b9dad55e7130e SHA512 7f8cb8d5ecfae17077a94656a7b40a10cf657b991cc4d60302bb0b9cf3691dc5aa8088642e61d2ea91013ecdd4766d6470cd3d9104b51f5d585d385df7955314
 MISC metadata.xml 379 BLAKE2B 48ebb9e7bfa8b58b0d15b82c4146def465e08cf3212ab4af04129d09c153b67b00d0fa05b94d6af54f643ec3a202f2335d3254b966f49d1394d3c7b9e5da56a5 SHA512 99560decfaa0e438980f372d99257695e9ca9585167d9aba091e0b775c2f8384657ddc017841c8f06f8b568017a54fb9e31da736f3c875da717e154cdce876d1
diff --git a/sci-ml/datasets/datasets-2.21.0-r3.ebuild b/sci-ml/datasets/datasets-2.21.0-r5.ebuild
index 187cf2641545..7d13d51dcea0 100644
--- a/sci-ml/datasets/datasets-2.21.0-r3.ebuild
+++ b/sci-ml/datasets/datasets-2.21.0-r5.ebuild
@@ -21,6 +21,7 @@ IUSE="test"
 
 RDEPEND="
 	${PYTHON_DEPS}
+	sci-ml/caffe2[${PYTHON_SINGLE_USEDEP},numpy]
 	sci-ml/pytorch[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/aiohttp[${PYTHON_USEDEP}]
@@ -36,7 +37,6 @@ 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 5617f1f3ddee..01de53b072f1 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-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
+EBUILD pytorch-2.4.1-r3.ebuild 1612 BLAKE2B f1ec65d1b0bd32516a5ecd6ce762eb0888499c4af9e5ca0d174be2d958b406ac00b7135b68632cb7c7824522a2b4954ff1771f92f18223d3440c62daf6572788 SHA512 0f74180fe88b7f0f5440e5f5fa2e3b24e65965d0454bb76f5fa84fbb675dbcf515e0670cbad2749e5b6a76b0042d5280ee49fe7e7114d626a6a100df99e2e431
+EBUILD pytorch-2.5.1-r4.ebuild 1467 BLAKE2B a18550e5d679fbb00fbea15c36d9333db9cf96e7b60d96dbb72fab648a67b86bc2a6b028dad56564b5f259623e81abba15bd302226dd6c37ed9cb1141998be2b SHA512 5be9ecd5a7f8aa6093f91ac31e64348d4d04c9f1597991d8f6ff707023715cbdcae4dc62d9a94eeb30a98e651741d64b4b7763c9d12faba7f439a713b0c1187f
+EBUILD pytorch-2.6.0-r3.ebuild 1428 BLAKE2B 9847ea4da9647a2813191b0c0ce394872e4922fa6ce3852051593014bef8a15b621d64d46616eb9cb245cb510852ccad32cd37d6744874c7b8b043766e740675 SHA512 0fe2d12da69df83fa843ead0f05d27a6b0db12e4cbf7c548d8b8e075704e98a4212a26e6a3e2c62299d72d73a201bffe9119361334da5f6a7491ac2910d962c9
 MISC metadata.xml 516 BLAKE2B 91217d92fb2a588197740116e4d60d2429c1e4dc21845605bcaba4f6f5c941d27024175eae9cbd3dd89deb30496fb3d56f2a771f115887548e4a81b1947837d4 SHA512 85e43fc8be4da3677d1bfadaaeb8d23a17277fa4a684e89f5d8da0279f6b2d9744716ca82d7fe5e070b163de4d153e4d0c433b2d5ef9b609b7b9b53d57e32906
diff --git a/sci-ml/pytorch/pytorch-2.4.1-r1.ebuild b/sci-ml/pytorch/pytorch-2.4.1-r3.ebuild
index e3357c048f0b..9071008bf955 100644
--- a/sci-ml/pytorch/pytorch-2.4.1-r1.ebuild
+++ b/sci-ml/pytorch/pytorch-2.4.1-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_EXT=1
 inherit distutils-r1 prefix
@@ -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/sympy[${PYTHON_USEDEP}]
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		~sci-ml/caffe2-2.4.1[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}
@@ -41,7 +41,7 @@ src_prepare() {
 		"${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 \
+		"${FILESDIR}"/${PN}-2.2.1-emptyso.patch
 
 	# Set build dir for pytorch's setup
 	sed -i \
diff --git a/sci-ml/pytorch/pytorch-2.5.1-r2.ebuild b/sci-ml/pytorch/pytorch-2.5.1-r4.ebuild
index 32e2d690bc95..026615ba5bb8 100644
--- a/sci-ml/pytorch/pytorch-2.5.1-r2.ebuild
+++ b/sci-ml/pytorch/pytorch-2.5.1-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_EXT=1
 inherit distutils-r1 prefix
@@ -22,11 +22,10 @@ RESTRICT="test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RDEPEND="
 	${PYTHON_DEPS}
-	>=sci-ml/caffe2-2.5.1-r5
+	~sci-ml/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
 		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-r1.ebuild b/sci-ml/pytorch/pytorch-2.6.0-r3.ebuild
index e2561c190f30..27391724320e 100644
--- a/sci-ml/pytorch/pytorch-2.6.0-r1.ebuild
+++ b/sci-ml/pytorch/pytorch-2.6.0-r3.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/sympy[${PYTHON_USEDEP}]
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		~sci-ml/caffe2-2.6.0[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}
diff --git a/sci-ml/sentencepiece/Manifest b/sci-ml/sentencepiece/Manifest
index 302bfb3dca6b..cf18fd18c05c 100644
--- a/sci-ml/sentencepiece/Manifest
+++ b/sci-ml/sentencepiece/Manifest
@@ -1,4 +1,4 @@
 AUX sentencepiece-0.2.0-gcc15.patch 314 BLAKE2B befcc8bea7b4b9ca518218ecc8cea1857a8e21d123a8e45b14f392effb94537f55e60f8fa5aa13e659d9b8315177b6ddb0558c8577d2838d0c475f1c107e7e21 SHA512 f21684bbeaa91d09f188c72302120a23f02e02fd551a61b47907c0a732b31980ee896625c0dc1101cb571ccc294f7f3e3d39ff45cfced24486bb6a4e8adaa6a8
 DIST sentencepiece-0.2.0.tar.gz 11980811 BLAKE2B adf28a66de3f6995d31c3b9be6a324614b95f20fe07ea33dd914bcd9d33d123dfee69f80ef7b2a70c3c23700534916caf57ac877e55e5c9d0d671d37372e0aed SHA512 b4214f5bfbe2a0757794c792e87e7c53fda7e65b2511b37fc757f280bf9287ba59b5d630801e17de6058f8292a3c6433211917324cb3446a212a51735402e614
-EBUILD sentencepiece-0.2.0.ebuild 1009 BLAKE2B 6b45412a91597ded814d15fba07e48f9e81beadcea3a16cbda39d076bc852414a0a72db5095854b1d426f335328587539244257fb98b36b3929abd7a5be5f222 SHA512 2cfb44711e9017b2c2ec016f31885fed8588d38d892dc401337e80c0f09ec184a30f6ad173366dce7bd7d8f153364813847762f54496824fda096987a6623612
+EBUILD sentencepiece-0.2.0-r1.ebuild 1011 BLAKE2B bff042d00ecf80d22963a018c416016e239fabef2ebb67351b641b94f80ecb7c7565639f524bd967a6252c6473a79f2e841abe8307f11e9ef6adecc2670202cc SHA512 bc3b3bfa82d70ff0af4b412321a0ab54a0e766f9520197490ffa46d06510c02eab1d2fbaf44a48a486094b2a8b9184a181808a7abb35df96821c01eccf6869c3
 MISC metadata.xml 333 BLAKE2B 03fe2156a6c7e3c777d32eaad0116b47c67929331f479a91eed112aae5740160be79048c0488f124824e079b7e8316efd8b20b27c0f37e99b3fa47fe1c7abcb9 SHA512 b0b545f7110d19388c741d11ec2225526b73f359b50ad9e77757dd741138376f68b18b2130e78c172de2b95c4803b66c7179d6ced8c06d2ddd828fb0262b2c38
diff --git a/sci-ml/sentencepiece/sentencepiece-0.2.0.ebuild b/sci-ml/sentencepiece/sentencepiece-0.2.0-r1.ebuild
index 70d70daf2bb2..478b86dc42bd 100644
--- a/sci-ml/sentencepiece/sentencepiece-0.2.0.ebuild
+++ b/sci-ml/sentencepiece/sentencepiece-0.2.0-r1.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 	dev-cpp/abseil-cpp
-	dev-libs/protobuf
+	dev-libs/protobuf:=
 	dev-util/google-perftools
 "
 DEPEND="${RDEPEND}
diff --git a/sci-ml/torchvision/Manifest b/sci-ml/torchvision/Manifest
index 3972fd5045ea..c94acaa02077 100644
--- a/sci-ml/torchvision/Manifest
+++ b/sci-ml/torchvision/Manifest
@@ -1,4 +1,4 @@
 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 2119 BLAKE2B be649da32535f0cb9afe51d8a633dbde9eb3d7338789fff7908a2b7ae664906c60429be1ba4dce0fd34b10061b112f743436b33e31cc0a8f85409c410f326e88 SHA512 096310ff3136de29a448b9fc1fcb8dc184b934d97c8a52427f6a293a7b7ac02cb609d82dfd4546d2748289592f275b027b82e56f0e82d76e808b9198853df5fb
+EBUILD torchvision-0.20.0-r2.ebuild 2119 BLAKE2B 1f3e26f1d4c00fd60fbeb7e754ac120ba0cdcf1a70cd6c3f4ea82a119bcf8c1f7cf6c472a3faff7892153fadfe4e93311b44ede6aaf61fc1e56f01a1e36988d8 SHA512 628d1686e4713a0b72784abb2c371748639b67628b0209742529b91c4adb1defee4fc7b27390cb6f52a9980ecc72ea464a57d97584aa0e48d0051bb9777b156a
 MISC metadata.xml 327 BLAKE2B e101d8dc63891696a8a17c908253b6302aeb9623b57cc67ad051e9f7df0fb693fe5360e8b41127eba78584c99caf105e5a1f5a76fad74a435dab99808a73d9eb SHA512 6e3d0588c3724fa18573df4001c81e40eb6fb93bb2254f8d03d8e9a908fbf89b8d734ed0f6549e2a4460f905c2daabfe125137e1f39cd4b6830ef2369f4ee91a
diff --git a/sci-ml/torchvision/torchvision-0.20.0.ebuild b/sci-ml/torchvision/torchvision-0.20.0-r2.ebuild
index 1839680abc83..42234dc97efa 100644
--- a/sci-ml/torchvision/torchvision-0.20.0.ebuild
+++ b/sci-ml/torchvision/torchvision-0.20.0-r2.ebuild
@@ -22,8 +22,8 @@ KEYWORDS="~amd64"
 IUSE="cuda"
 
 RDEPEND="
-	=sci-ml/pytorch-2.5*[${PYTHON_SINGLE_USEDEP}]
 	=sci-ml/caffe2-2.5*[cuda?]
+	=sci-ml/pytorch-2.5*[${PYTHON_SINGLE_USEDEP}]
 	dev-python/numpy
 	dev-python/pillow
 	media-libs/libjpeg-turbo:=
diff --git a/sci-ml/transformers/Manifest b/sci-ml/transformers/Manifest
index dd34824f6b1c..29962157beae 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-r3.ebuild 4995 BLAKE2B a8eb5cff3225cf3bf64242c0c18e420ad8c1abbe07e4b8027e1fe7d6b83baa8af485ff8e2f672dad5d6f52e656d09f97ee54c22442467cdb8d876cd00bbea29a SHA512 7ad408df467e6dc534d217fbe89e7fa17d554840432fb4f09e36cefb0641757099048a1d02cae0ca6747aa561cb461aadb93b93f7220ee9fb0c185cb860c1d3a
+EBUILD transformers-4.49.0-r5.ebuild 4986 BLAKE2B c395452d4d5d0fe80e49426bd799614cd4d9e71eeffce61cd1d0bd4f6c8579ceae614358eb8fb04d2713b800c3139273f0e885e9e7802e567c1902e9da1f1240 SHA512 ddef6be13cea4499ea7f23185f46d508121c9dfe74a1a13c28777639e34e7a6c1ef6898ffa257a324a83205689c9aad3ca71aad7dcb5737030df9c8bc5b9fc6b
 MISC metadata.xml 446 BLAKE2B e8865e42c4d09715f4ea763b4c1c23d23f69d4095cfc56fe47b2e117c9ff51cba42eb112d159ad3932c7e1c43671156e1ce67ef6bc667e2f40810dc8f010f11e SHA512 2b9b2456c699b53dd0412237f6a687c4c5a1b3edeca3120e946ae6c78b455539c036cba120e61d7e7b254a929667335582c9f16ecc5d2ab90ef8ce92c69a6e40
diff --git a/sci-ml/transformers/transformers-4.49.0-r3.ebuild b/sci-ml/transformers/transformers-4.49.0-r5.ebuild
index 459836a29059..6ad1bdce5a43 100644
--- a/sci-ml/transformers/transformers-4.49.0-r3.ebuild
+++ b/sci-ml/transformers/transformers-4.49.0-r5.ebuild
@@ -34,13 +34,11 @@ 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}]
+		sci-ml/caffe2[${PYTHON_SINGLE_USEDEP}]
+		sci-ml/pytorch[${PYTHON_SINGLE_USEDEP}]
 	)
 "
 BDEPEND="