From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1698472-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 6CB4E158232
	for <garchives@archives.gentoo.org>; Mon,  9 Dec 2024 08:29:23 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id A797DE0BDB;
	Mon,  9 Dec 2024 08:29:22 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 98AB9E0BDB
	for <gentoo-commits@lists.gentoo.org>; Mon,  9 Dec 2024 08:29:21 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id AA343343126
	for <gentoo-commits@lists.gentoo.org>; Mon,  9 Dec 2024 08:29:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C9C5AED
	for <gentoo-commits@lists.gentoo.org>; Mon,  9 Dec 2024 08:29:18 +0000 (UTC)
From: "Alfredo Tupone" <tupone@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" <tupone@gentoo.org>
Message-ID: <1733732731.3c4ac3c3accc78d1b85b785b32c7adbcdf0aa9c0.tupone@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-libs/caffe2/caffe2-2.5.1-r4.ebuild sci-libs/caffe2/caffe2-2.5.1-r5.ebuild
X-VCS-Directories: sci-libs/caffe2/
X-VCS-Committer: tupone
X-VCS-Committer-Name: Alfredo Tupone
X-VCS-Revision: 3c4ac3c3accc78d1b85b785b32c7adbcdf0aa9c0
X-VCS-Branch: master
Date: Mon,  9 Dec 2024 08:29:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: c97b7a9c-1442-46d9-99b6-b1148c9f0a0a
X-Archives-Hash: c44bbad4e935520bad97531b79b4e0c0

commit:     3c4ac3c3accc78d1b85b785b32c7adbcdf0aa9c0
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  9 08:22:33 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Dec  9 08:25:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c4ac3c3

sci-libs/caffe2: save functorch.so for pytorch ebuild

Bug: https://bugs.gentoo.org/943531
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 sci-libs/caffe2/{caffe2-2.5.1-r4.ebuild => caffe2-2.5.1-r5.ebuild} | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sci-libs/caffe2/caffe2-2.5.1-r4.ebuild b/sci-libs/caffe2/caffe2-2.5.1-r5.ebuild
similarity index 97%
rename from sci-libs/caffe2/caffe2-2.5.1-r4.ebuild
rename to 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