gentoo auto-resync : 11:12:2024 - 02:01:11

3 files changed, 11 insertions, 4 deletions

diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index efd3fad16b5e..1eb44df131b8 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -7,6 +7,7 @@ AUX caffe2-2.5.1-fix-functorch-install.patch 448 BLAKE2B f8b0ebfe0cdb8318bc376d8
 AUX caffe2-2.5.1-gentoo.patch 5181 BLAKE2B 146e49ea90dbdd3bfb12a8f1b135b9ac8ed849c408a81081a5308c8dd761e1b3a8e714b905c2b88a785f436123347899b7a72eccacc2fbc54d9efad2d1dc3550 SHA512 885e79edc67d7eff1e895bdd3589704220714b6024635444dac1452e41a947c2b2a4a33866acbfc19af66d42f340038395aeb53d1477294712578e4bdbe06673
 AUX caffe2-2.5.1-glog-0.6.0.patch 959 BLAKE2B eb0c18a34a2c5a1b68a420b9001eac5c8ff65ef9ca9ea1e5ad93ecef3cbaa595808105bbf6c8d3dcb9047559d23bc0398cda5922fb41e29a7588644c90c90fd8 SHA512 5873f11930ae5947c7dfbb19d0377d5535e395fcc1ab213e3c65c77b2e3bd911efc11cde2ca3e7134e9e7798ca7a483910113f331c0a23b73a5546aaaded40c5
 AUX caffe2-2.5.1-install-dirs.patch 542 BLAKE2B 7a96287f826a44c7a1eee3f44516c5e4e3011a5ddf864aeb7c4ae9a363d89d393fec4c2c86677c2cd3cc38c345323eba3d6b4c9d6686ee13e16a1c4acbdc1f18 SHA512 79de43b4bdcf1cb609bf953f3d698a38231a76f299296b1cc131639f6b0e1d29f634ac9c6858d52742e988c94d39cb5a3daa1bf36d6dc1bf6a1354ca055e5edf
+AUX caffe2-2.5.1-newfix-functorch-install.patch 441 BLAKE2B 0caa9e43432aecba83e3ae1cc2974d8eeb9262c8547bd1a72b0651b80a5057adb0d2bbbd2f77b773fe1036bd933dadb9f4a40e886e363f5d0a961ace69e6d16a SHA512 b8b9262db9e76768e8a114857d9bfcae67528568b5e3b90a0330dc246329439da56600689a289e9bb8aee06bd5a9708bdc2b49f79abc139aaec2778b6d68458b
 AUX caffe2-2.5.1-unbundle_fmt.patch 499 BLAKE2B 06550f8e7ae3a932a585f8abe7653ac0b574d9ce1160c190a39f96b7d76e3a9e7a4e62b9e5e967e5884d0e38668f60af7737ea3c715d718deb7a634de98ccebd SHA512 afcb5f1123cbe5eeebdb2c5e312e37956dbc33a926cf379f531896f2c75fbb4b4dfa2c9d276a98bbad51bc587886bb572c3221be06e5116443c8ab44e1d12da5
 AUX caffe2-2.5.1-unbundle_kineto.patch 830 BLAKE2B 80c9ebc30d0ca3b964141a5d9a7cb3662e6dc8472454ceabc2725f47277211cd495c4146dc9c2046cc5c5505909cf4e30c780685fceebdb05319aba5c4366346 SHA512 9645b11b5395f7a4626f17edae22c718c73d2e2f3de56e98653932a3c66f417942d54fd1dadc99112337c11513ac707a96d0caac4bf3d100db8f7079609b9b68
 DIST caffe2-patches-20240809.tar.gz 15242 BLAKE2B 77503c61487e7d85cca5afcab9a6e638f9833a70861845638cf1b62bc492d7b6650e6db81d53ebb2f39c6313509250d339f725f04d03ec6dd23dd0cf70843d8c SHA512 74b3b0b6671b655ecac93f7436c4ed7cb0157a83aafbf6afcc0811e11cef341cd8f638db1a111bcbb01e1a6dd4daf3a36b96d7a8ce90f04c2fa091bd6e3a142b
@@ -15,5 +16,5 @@ DIST pytorch-2.4.1.tar.gz 115029469 BLAKE2B c2909ff27d527bc57cba56b780d3b8cd07a0
 DIST pytorch-2.5.1.tar.gz 116091366 BLAKE2B 7838b17562b94ffc7d798031348689db607dd5eae2a3c35be365972e2b52a2c1b12067068d5aca5ab00cf0977d9c2c3c9ae5337d69534c864c732e6256cbeef6 SHA512 a913a466324a65fa3d79c5e9ad4d605fc7976f0134fda2f81aaa3cea29d56926604999b8a238759646d211e63b47bbb446cdffa86ca8defd8159f11e30301289
 EBUILD caffe2-2.4.0-r1.ebuild 8334 BLAKE2B d867632884fad33fb7c19344574ce30e70651474650b2f5a6e79576a7338e501989bc4628c1a04f2b2ebf3a611226df68892abdabf856ab74e67df85db74a9f0 SHA512 52e8c0e3535a1a8b90cce9143f4ff8da398de9119d2f23ffeeb0a419dadc29dae68f5e993b1a854066f63ed4809a41a98f098447e318252ff316e70fc6498b32
 EBUILD caffe2-2.4.1-r4.ebuild 8557 BLAKE2B 2cefd7d0c818fb431b3eb6bc2be0a1b225790271b1108169256f8dccac99707fac3d36dc98b7e19a688c66053627d0a222d67e7f65eb6a600ed251677df5490a SHA512 ded17bc1e912f4691bfeee75c66676d331d03c21fe9c9c7416c874ef435e624bdc6109c128f0b5dbe9a5a5be81e648767c6020cd570b94e74f47061e5839f9b3
-EBUILD caffe2-2.5.1-r5.ebuild 8621 BLAKE2B cfb136392f069316ae4f020360022f7560a12d9965efcd0ccae86aaab2e72cc33af60b1a5faf14550e41adc77b0a840e761563c23adeea6bbc1ce8e95af7ea9f SHA512 c1cff4b536f2de013c727d02c1795dc4825b8deac6e847ea70973da63cf9a9913459935c1e65186ccc702f455f7a266574ab8bed2d8e86ae4ed933895cfa8c0b
+EBUILD caffe2-2.5.1-r5.ebuild 8560 BLAKE2B 44dd033db92d6c2ba8f14e81423c0edcd54fa2e96bc3060626bbcd623b4e03ad942861779ee113eec0f56962f3d9cfe60b479f5023de54a5c3f88560dd9a4db7 SHA512 952bec6d94e235f9915b875950cd1f170ed5a259d41ff58ccc827c2ebfedfecb943bf230795a4f02536547f8b48c7b1869e66680479d4dc9569e09719914a2c7
 MISC metadata.xml 1081 BLAKE2B 57800165612fd555263cab4cf0bb0521acd7d41f0023da501a50ccc5a479d25ad7087661a6eec500333c3cf9cc3a85d7be8e9385869c14d92f351d8d9df68556 SHA512 71cc785a5b1688b6a0ac971d31d5fa85bef86966aa80009c34e97caa385c81a7c2fb64ae34d0a39c21548d8238efd008da24bd838a47886bfa3f0d952246b76e
diff --git a/sci-libs/caffe2/caffe2-2.5.1-r5.ebuild b/sci-libs/caffe2/caffe2-2.5.1-r5.ebuild
index a6ed84f182da..8f23871b42b1 100644
--- a/sci-libs/caffe2/caffe2-2.5.1-r5.ebuild
+++ b/sci-libs/caffe2/caffe2-2.5.1-r5.ebuild
@@ -119,6 +119,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${PN}-2.4.0-cpp-httplib.patch
 	"${FILESDIR}"/${P}-glog-0.6.0.patch
+	"${FILESDIR}"/${P}-newfix-functorch-install.patch
 )
 
 src_prepare() {
@@ -295,9 +296,6 @@ src_install() {
 	# Used by pytorch ebuild
 	insinto "/var/lib/${PN}"
 	doins "${BUILD_DIR}"/CMakeCache.txt
-	mv "${D}${S}"/functorch/functorch.so \
-		"${D}"/var/lib/${PN}/functorch.so || die
-	rm -r "${D}"/var/tmp || die
 	dostrip -x /var/lib/${PN}/functorch.so
 
 	rm -rf python
diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-newfix-functorch-install.patch b/sci-libs/caffe2/files/caffe2-2.5.1-newfix-functorch-install.patch
new file mode 100644
index 000000000000..499a3c74c87f
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-2.5.1-newfix-functorch-install.patch
@@ -0,0 +1,8 @@
+--- a/functorch/CMakeLists.txt	2024-11-10 11:18:29.151992840 +0100
++++ b/functorch/CMakeLists.txt	2024-11-10 11:20:19.642389982 +0100
+@@ -42,4 +42,4 @@
+ if(NOT ${TORCH_PYTHON_LINK_FLAGS} STREQUAL "")
+   set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS ${TORCH_PYTHON_LINK_FLAGS})
+ endif()
+-install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}")
++install(TARGETS ${PROJECT_NAME} DESTINATION "/var/lib/caffe2/")