gentoo auto-resync : 22:03:2025 - 00:31:29

4 files changed, 10 insertions, 18 deletions

diff --git a/sci-ml/caffe2/Manifest b/sci-ml/caffe2/Manifest
index d6abebf5c38e..97bab7181020 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-r4.ebuild 8493 BLAKE2B 0e87ccde293ada0765a76580c82a8a9011eae0e554765347b2911f660587895758af79d774439f630806c4644f0e7f74f256b3efc3a6de94d049e46d0031d71b SHA512 28ee9b684719bace598d99f2fa532f91fe7e33882a2f2df4ba649fb000242c4bd09cb360c887da04e22c099c501effef3adab6f3fc299291e821888e797e4dc2
-EBUILD caffe2-2.5.1-r8.ebuild 8902 BLAKE2B db406a189c77b077fd6bb331284ef8b98f5d24b750984e463f602ce65e6c29fe9d9de24d6a4aa01f8096c683d34d82a024fd90f470c15cab347535d5fb9def08 SHA512 959b42ba518e247571caa6569f21a89e2125b8d407120bcc0a7c37fc4832115bcf13496c86b454745d4ea4352c4ba9938ab5b31f460804c28ee8ab65cb6761e0
-EBUILD caffe2-2.6.0.ebuild 8925 BLAKE2B 375aee7e8530bb662910afd62aaa07b629c6a0d78079cd13ae7f5630d90db2dda5fbf1d9e09837df5745d77b5fc06f1bfc74daf2e5eaeb8d81baab3936e64e95 SHA512 fa0e70ef18600cf84832f7b20f63aa5671c1861406c70ecdb8f5f6fe50897e88be47694e6c7a5e7de621238d5b0b26d1d6240ae24d8ccf9dc8222d94b44e8b1b
+EBUILD caffe2-2.4.1-r4.ebuild 8492 BLAKE2B e4257c78992a7ac8357680d92e9a4c3b16051cb65fee7f448b21f4e6021fe75ca48b2aea3daac71ecbfde05cac2e483936604c5368441faf8636427f9300ae23 SHA512 d3fe259671860c4e016df511c7f435976e1657edcc8d00604c0ef69938db37c7cc5740af0b1d900078f38411d66adb86d3437480829a7c7f5df0fe3103f28e5f
+EBUILD caffe2-2.5.1-r8.ebuild 8780 BLAKE2B 39ce8543430b3fe5a96891fda0436b39b61cec5bfdb894fc86aee1278a5c7156506b1248feba429f6baedfecf2b136fb8b866985fb16d33846dd28b230a9b8fc SHA512 6a3dd782cd391b44de628e7b81355f4130442645cef8bff967809ebc18d91ed3e1e907ff8eeb74e44d8c7ed03f4f3ccb3eb1b6ccd2fa20e1b48982a916fb0dce
+EBUILD caffe2-2.6.0.ebuild 8803 BLAKE2B a9d8962e14032b2cd2fd0b5cad31fb7ea12e01206bd0712c7df565dea332df37d14f1644c7cb9617f4514324ccecd255a83974214119058505d7ba55e83ce175 SHA512 42a27fd86eb829077a453ae2a30fc5908587928a8d402f73651740258d42c29163a6f9dc6e46eedb75810c4653366e5e214eb9a599bf36943f47ab73cc8de24a
 MISC metadata.xml 1228 BLAKE2B 29fa99ccc009ae8ac209cf0a85a8c87992d10301837f44478b4fe60445dbf261cf1c3869cc6e173944b9c98608fcf32a379c766bf7e53267c90fd71e51e1f9a0 SHA512 06d89ac1b62bf215d56ac67408f6027849f3a1948f1a40013aa989f9d879eb9aa9156d9c336cc83d2bb3795271c11d39d34919f749d83dbfbf48cc2d6aa8545e
diff --git a/sci-ml/caffe2/caffe2-2.4.1-r4.ebuild b/sci-ml/caffe2/caffe2-2.4.1-r4.ebuild
index 9fb7f21f1712..59a3e991b4fd 100644
--- a/sci-ml/caffe2/caffe2-2.4.1-r4.ebuild
+++ b/sci-ml/caffe2/caffe2-2.4.1-r4.ebuild
@@ -67,7 +67,7 @@ RDEPEND="
 	opencl? ( virtual/opencl )
 	qnnpack? (
 		!sci-libs/QNNPACK
-		dev-cpp/gemmlowp
+		sci-ml/gemmlowp
 	)
 	rocm? (
 		=dev-util/hip-6.1*
diff --git a/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild b/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild
index 902bee88e3f5..d62de604417b 100644
--- a/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild
+++ b/sci-ml/caffe2/caffe2-2.5.1-r8.ebuild
@@ -65,7 +65,7 @@ RDEPEND="
 	opencl? ( virtual/opencl )
 	qnnpack? (
 		!sci-libs/QNNPACK
-		dev-cpp/gemmlowp
+		sci-ml/gemmlowp
 	)
 	rocm? (
 		=dev-util/hip-6.1*
@@ -151,10 +151,6 @@ src_prepare() {
 		c10/hip/CMakeLists.txt \
 		|| die
 	sed -i \
-		-e 's:pocketfft_hdronly.h:pocketfft/pocketfft_hdronly.h:' \
-		aten/src/ATen/native/mkl/SpectralOps.cpp \
-		die
-	sed -i \
 		-e '/Using pocketfft in directory:/d' \
 		cmake/Dependencies.cmake \
 		|| die
@@ -327,9 +323,9 @@ src_install() {
 	ln -s ../../../../../include/torch \
 		"${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
 
-	mv "${D}"/usr/bin/torch_shm_manager \
+	mv "${ED}"/usr/bin/torch_shm_manager \
 		"${D}"/$(python_get_sitedir)/torch/bin/ || die
 
-	mv "${D}"/usr/$(get_libdir)/libtorch_global_deps.so \
+	mv "${ED}"/usr/$(get_libdir)/libtorch_global_deps.so \
 		"${D}"/$(python_get_sitedir)/torch/lib/ || die
 }
diff --git a/sci-ml/caffe2/caffe2-2.6.0.ebuild b/sci-ml/caffe2/caffe2-2.6.0.ebuild
index 1cd499d32116..16bd774af57d 100644
--- a/sci-ml/caffe2/caffe2-2.6.0.ebuild
+++ b/sci-ml/caffe2/caffe2-2.6.0.ebuild
@@ -65,7 +65,7 @@ RDEPEND="
 	opencl? ( virtual/opencl )
 	qnnpack? (
 		!sci-libs/QNNPACK
-		dev-cpp/gemmlowp
+		sci-ml/gemmlowp
 	)
 	rocm? (
 		=dev-util/hip-6.1*
@@ -151,10 +151,6 @@ src_prepare() {
 		c10/hip/CMakeLists.txt \
 		|| die
 	sed -i \
-		-e 's:pocketfft_hdronly.h:pocketfft/pocketfft_hdronly.h:' \
-		aten/src/ATen/native/mkl/SpectralOps.cpp \
-		die
-	sed -i \
 		-e '/Using pocketfft in directory:/d' \
 		cmake/Dependencies.cmake \
 		|| die
@@ -327,9 +323,9 @@ src_install() {
 	ln -s ../../../../../include/torch \
 		"${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
 
-	mv "${D}"/usr/bin/torch_shm_manager \
+	mv "${ED}"/usr/bin/torch_shm_manager \
 		"${D}"/$(python_get_sitedir)/torch/bin/ || die
 
-	mv "${D}"/usr/$(get_libdir)/libtorch_global_deps.so \
+	mv "${ED}"/usr/$(get_libdir)/libtorch_global_deps.so \
 		"${D}"/$(python_get_sitedir)/torch/lib/ || die
 }