gentoo auto-resync : 26:08:2024 - 12:00:09

3 files changed, 47 insertions, 1 deletions

diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index f94847f10d56..8f6ab50abdad 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,3 +1,4 @@
+AUX caffe2-2.4.0-libfmt-11.patch 1560 BLAKE2B 816201b6abc3ad4c4924c649905068306f3a0c674eab36fb6a6772b84d2bf0806dd55d586d6873952b0eac56afae00513966071a380b9e60eff3c668e6aec737 SHA512 acdc879f2ed8ae546a6ce4db1b63faba3b6672374c61940d58e0c2b747c4b0d8d38fb34a2e66f3805f9f328fd4e0115dd705b541871b2fd99a2782756ca583e5
 DIST caffe2-patches-20240809.tar.gz 15242 BLAKE2B 77503c61487e7d85cca5afcab9a6e638f9833a70861845638cf1b62bc492d7b6650e6db81d53ebb2f39c6313509250d339f725f04d03ec6dd23dd0cf70843d8c SHA512 74b3b0b6671b655ecac93f7436c4ed7cb0157a83aafbf6afcc0811e11cef341cd8f638db1a111bcbb01e1a6dd4daf3a36b96d7a8ce90f04c2fa091bd6e3a142b
 DIST pytorch-2.2.2.tar.gz 116367503 BLAKE2B 0be22f2ec4b9aac6f5e976664cae01facf07929a32565cd57d7cc5b2d9888e9ae71ca301853752fe8f31d174d04c9974eb9ed2f3d452360a50ccf024f200726a SHA512 7990e0f9484038c3458c0bda2c863bf2b19e56edab81fc5938c6e0f08b17558287f853bb67350e8cca8f42bec0f1d4ba0e94e50a145db8da44bdd4bd703d91d0
 DIST pytorch-2.3.0.tar.gz 117029829 BLAKE2B 8f9c0d71ee0a9219b495eddccdcc65107f7ad537c43c68100b229f3d27b0e6c01ccb1659c7fffc356a48d80f2adc0a10361305dc8f1df20446de837d380f89f6 SHA512 67f7e9a096c3ffb952206ebf9105bedebb68c24ad82456083adf1d1d210437fcaa9dd52b68484cfc97d408c9eebc9541c76868c34a7c9982494dc3f424cfb07c
@@ -6,5 +7,5 @@ DIST pytorch-2.4.0.tar.gz 115031093 BLAKE2B d206477963977011627df284efa01482fbf5
 EBUILD caffe2-2.2.2-r1.ebuild 7494 BLAKE2B f09d96b6a6ab71366a3b30ac7f8e6d89a20bf6034fb0d055a59f7f1d31f2dd08742307790982ed1f2768305ccea094e5d1655a2ac7d6e91e24b5620c1ed3f0cd SHA512 a10afef393275946a0fa51b2303a1ceaf567e7df30ff96bdf3343d929c575038945f404cd75118d7f40f49ed8d03ef66a2d8a3aef10ede1b4b411f0efee2e56e
 EBUILD caffe2-2.3.0-r3.ebuild 8468 BLAKE2B b3e5d3bdd08fb7c2beabb0de3244b9de125b283ebd2a1d8dbccdc863b912555726eb40649d67af8593eb64dc9e23f9d021174a0868751fb3a5daf26d98884740 SHA512 6123ad17b0b1de6bd8d8ae3a52a7f7205385e3d54faa5f2fdf4006a9255ac69413caf08f4ba2c79679edadbe5c94cb7c187d5b5f2dc3ed6682d7ae601881e86b
 EBUILD caffe2-2.3.1.ebuild 8489 BLAKE2B 64b0ff8a65f46be8d3a80b4b4c47fb513eaaf78208e2d831ced3fcfa27f39cfa89d8648a64dea73a8b516476867f10cd04a4cb1873149659abe6114f88657ef4 SHA512 4bcb6fe1c3ab47879e57a453649866f8e5bf09da7cce6778de909447d6deb0ae0671512a1d182f5e275d246bb05c4553ff95bed490d4fd3f723653feae95b47e
-EBUILD caffe2-2.4.0.ebuild 8194 BLAKE2B 4d5c12021cda76df3c8dab72ad3924b8e1d32f470e9b58df878a7c73f7fb64cb18993445babbbfeda83aabbedcfbf8a34bc08dc85a5766321847adba729584d2 SHA512 7d1fbe08b8077051ed359538a4a726e745fbaf4f4b4323bef566aefa246253b569710d4b87a09d18da50d333a0eff57dc28eea4583b8b17f7ac4a7c622b9587e
+EBUILD caffe2-2.4.0.ebuild 8237 BLAKE2B 5072962bb295d6e0aa63e4e5d2f97c33820c7a70f3c71070df6cdf6a7d1f784f42e87072d6540b5db67ded9d56510731482927ac594246f9808743d7f26c13ce SHA512 d321924fd8794744f173a5571aa4adc59183abc1fb792381e81afc094675a170fe6129378e19da46df14c4638d33b72a18f19e4003918d8d5293188adc802537
 MISC metadata.xml 1225 BLAKE2B ab7fb0bf8b2d37ddaa1a9ecc815eb094e85465d20d3a30af081b42e0b60ade9858d0053b101ba0e7750a90cb48b5b79db9bdc2729bf66d0420732489da62fe54 SHA512 dfb58597fb4bcdd7df0fcc3f2514518e118e8fc9b1cd24868aab60c32a62ff419b8b72a7c294925eff4c8871cc8df606af7fa60bfa99901091d8195101ee1153
diff --git a/sci-libs/caffe2/caffe2-2.4.0.ebuild b/sci-libs/caffe2/caffe2-2.4.0.ebuild
index 524dafcaacef..81a8906ea669 100644
--- a/sci-libs/caffe2/caffe2-2.4.0.ebuild
+++ b/sci-libs/caffe2/caffe2-2.4.0.ebuild
@@ -121,6 +121,7 @@ PATCHES=(
 	../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
 )
 
 src_prepare() {
diff --git a/sci-libs/caffe2/files/caffe2-2.4.0-libfmt-11.patch b/sci-libs/caffe2/files/caffe2-2.4.0-libfmt-11.patch
new file mode 100644
index 000000000000..9f6740a07f1f
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-2.4.0-libfmt-11.patch
@@ -0,0 +1,44 @@
+Fix build against libfmt-11
+
+https://github.com/pytorch/pytorch/commit/83eedf66b9e7f52323d9f45c5dfaa64472452595
+https://github.com/pytorch/pytorch/pull/130628
+
+From 83eedf66b9e7f52323d9f45c5dfaa64472452595 Mon Sep 17 00:00:00 2001
+From: Aaron Gokaslan <aaronGokaslan@gmail.com>
+Date: Tue, 16 Jul 2024 06:12:08 +0000
+Subject: [PATCH] Update libfmt submodule to 11.0.1 (#130628)
+
+Update libfmt to 11.0.1 reopen of https://github.com/pytorch/pytorch/pull/129962. Requires a kineto update and moves fmt::join into a separate include so added it where necessary.
+
+Pull Request resolved: https://github.com/pytorch/pytorch/pull/130628
+Approved by: https://github.com/aaronenyeshi
+--- a/torch/csrc/distributed/c10d/socket.cpp
++++ b/torch/csrc/distributed/c10d/socket.cpp
+@@ -32,6 +32,7 @@ C10_DIAGNOSTIC_PUSH_AND_IGNORED_IF_DEFINED("-Wdeprecated")
+ #include <fmt/chrono.h>
+ C10_DIAGNOSTIC_POP()
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+ 
+ #include <torch/csrc/distributed/c10d/error.h>
+ #include <torch/csrc/distributed/c10d/exception.h>
+--- a/torch/csrc/profiler/standalone/execution_trace_observer.cpp
++++ b/torch/csrc/profiler/standalone/execution_trace_observer.cpp
+@@ -10,6 +10,7 @@
+ #endif // _WIN32
+ 
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+ #include <chrono>
+ #include <cmath>
+ #include <fstream>
+--- a/torch/csrc/profiler/util.cpp
++++ b/torch/csrc/profiler/util.cpp
+@@ -5,6 +5,7 @@
+ #include <c10/util/ArrayRef.h>
+ #include <c10/util/irange.h>
+ #include <fmt/format.h>
++#include <fmt/ranges.h>
+ 
+ #ifdef USE_KINETO
+ #include <libkineto.h>