gentoo auto-resync : 10:12:2024 - 02:01:16

5 files changed, 11 insertions, 3 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index dbf3a641fa98..e79912f5ad07 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 3bb14d24c3f3..efd3fad16b5e 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -15,5 +15,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-r4.ebuild 8491 BLAKE2B 341529948a2f320d05a1125022849c6b2c39f5863ff9f34ac7321d9c2dffd160d4f5aa04ea2896c98760d8f6979d54613c43b7e3c031d07036e6423ee3c54b0a SHA512 7d486008b1288c0a24193eb02fe5e673e05be333832248cb2d3a2e0eb6c39c02ec6c80e3721a988e50bbe53fde8d4aee163b8219574571784a8f88dd153751be
+EBUILD caffe2-2.5.1-r5.ebuild 8621 BLAKE2B cfb136392f069316ae4f020360022f7560a12d9965efcd0ccae86aaab2e72cc33af60b1a5faf14550e41adc77b0a840e761563c23adeea6bbc1ce8e95af7ea9f SHA512 c1cff4b536f2de013c727d02c1795dc4825b8deac6e847ea70973da63cf9a9913459935c1e65186ccc702f455f7a266574ab8bed2d8e86ae4ed933895cfa8c0b
 MISC metadata.xml 1081 BLAKE2B 57800165612fd555263cab4cf0bb0521acd7d41f0023da501a50ccc5a479d25ad7087661a6eec500333c3cf9cc3a85d7be8e9385869c14d92f351d8d9df68556 SHA512 71cc785a5b1688b6a0ac971d31d5fa85bef86966aa80009c34e97caa385c81a7c2fb64ae34d0a39c21548d8238efd008da24bd838a47886bfa3f0d952246b76e
diff --git a/sci-libs/caffe2/caffe2-2.5.1-r4.ebuild b/sci-libs/caffe2/caffe2-2.5.1-r5.ebuild
index c7ce5a4971d9..a6ed84f182da 100644
--- a/sci-libs/caffe2/caffe2-2.5.1-r4.ebuild
+++ b/sci-libs/caffe2/caffe2-2.5.1-r5.ebuild
@@ -115,7 +115,6 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${P}-unbundle_fmt.patch
 	"${FILESDIR}"/${P}-unbundle_kineto.patch
-	"${FILESDIR}"/${P}-fix-functorch-install.patch
 	"${FILESDIR}"/${P}-cudnn_include_fix.patch
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${PN}-2.4.0-cpp-httplib.patch
@@ -293,8 +292,13 @@ src_compile() {
 src_install() {
 	cmake_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
 	mkdir -p python/torch || die
diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest
index 607481bf5d5b..3222de0be27b 100644
--- a/sci-libs/pytorch/Manifest
+++ b/sci-libs/pytorch/Manifest
@@ -11,5 +11,5 @@ DIST pytorch-2.4.1.tar.gz 115029469 BLAKE2B c2909ff27d527bc57cba56b780d3b8cd07a0
 DIST pytorch-2.5.1.tar.gz 116091366 BLAKE2B 7838b17562b94ffc7d798031348689db607dd5eae2a3c35be365972e2b52a2c1b12067068d5aca5ab00cf0977d9c2c3c9ae5337d69534c864c732e6256cbeef6 SHA512 a913a466324a65fa3d79c5e9ad4d605fc7976f0134fda2f81aaa3cea29d56926604999b8a238759646d211e63b47bbb446cdffa86ca8defd8159f11e30301289
 EBUILD pytorch-2.4.0.ebuild 1616 BLAKE2B 6d2b4012e2ee45eff08e7d38cd6f8177b94ae556337cde21fe5352aca2bbfeecda582159f45bb947d96775468aed2617eaf28cdc4d42e0e0d2cb2c662dbe70ed SHA512 a0ea63813cac1cdc2d23f99982574786417b8f9a829f7166be2b33eb9b2f7dcb20a174ca2a70bc7e887d415efea361a7491c1642b3bbeb68446a8cbee4ed4a1c
 EBUILD pytorch-2.4.1.ebuild 1616 BLAKE2B 6d2b4012e2ee45eff08e7d38cd6f8177b94ae556337cde21fe5352aca2bbfeecda582159f45bb947d96775468aed2617eaf28cdc4d42e0e0d2cb2c662dbe70ed SHA512 a0ea63813cac1cdc2d23f99982574786417b8f9a829f7166be2b33eb9b2f7dcb20a174ca2a70bc7e887d415efea361a7491c1642b3bbeb68446a8cbee4ed4a1c
-EBUILD pytorch-2.5.1.ebuild 1361 BLAKE2B 872c4487a7a334606010f2e2fb844841a3f4d150c62a4bbd795c6c745641b8ad9b4aa3c2dea67a557d82cb19ea24bbf5ba97dc5bb402c3b25fba23f10259771e SHA512 0f04fb7e0cb92b34c1a85fd8ee1614739727d33ae70603f4a200ba5cb189eb3d664c71cc17da6c32d59fefe04e8ad2d732ddbaa09bb6ab6500a933dace54251a
+EBUILD pytorch-2.5.1-r1.ebuild 1484 BLAKE2B c7a2ffa0e2da094a4563aff1017b6a30ad2255a660ca7e6a52e7b4ab0265376507f569babaa0dec4af45cc7658f1fcfdaeda82fba4cb63ed6ef1e42627acc5ce SHA512 69b7f6ee48639a45b4662a9f315f168aa2994085e997c710d1a89a79e8055d77e388d2b7339c30bae14bc27c46433c5df85fcc624eabaa6fb53617125a695e91
 MISC metadata.xml 328 BLAKE2B f49c6d62ac88dfffe497ed05b1f727941a94acb87a809611dda8aedbd87508fdfdf94ec0e025cac2a649b0881b600236289943b4be0f6ca44fc105b6d8fbe97c SHA512 16c29d2c1177a89026235191ea3e33870c2e6b63f029b7febd4dbd2e99f598fab4b4fd2fa7a801ffd88393663a00752300e6e2cc847a83690b715bcc481d9dc2
diff --git a/sci-libs/pytorch/pytorch-2.5.1.ebuild b/sci-libs/pytorch/pytorch-2.5.1-r1.ebuild
index 1a5e4c9a039f..e90ea383aecb 100644
--- a/sci-libs/pytorch/pytorch-2.5.1.ebuild
+++ b/sci-libs/pytorch/pytorch-2.5.1-r1.ebuild
@@ -23,6 +23,7 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RDEPEND="
 	${PYTHON_DEPS}
 	~sci-libs/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}]
+	>=sci-libs/caffe2-2.5.1-r5
 	$(python_gen_cond_dep '
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
 		dev-python/sympy[${PYTHON_USEDEP}]
@@ -46,6 +47,9 @@ src_prepare() {
 		|| die
 	distutils-r1_src_prepare
 
+	# Get object file from caffe2
+	cp /var/lib/caffe2/functorch.so functorch/functorch.so || die
+
 	hprefixify tools/setup_helpers/env.py
 }