gentoo auto-resync : 24:12:2024 - 06:30:57

7 files changed, 4 insertions, 45 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index b27e436ebe78..a1a7d18f0c9f 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 5dd3a286ad50..53e92f8d0443 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -2,11 +2,8 @@ AUX caffe2-2.4.0-cpp-httplib.patch 414 BLAKE2B fabe646c86f4c6736600fa44733ab6ea2
 AUX caffe2-2.4.0-cstdint.patch 263 BLAKE2B 52705466cc1f170f7c6f6ef2474fd92b294e8a07e6ab640804efa38e7e0526a72e7ff51c3b214662cc586eac7118b768b1a40df62a133834d617d5c8f7a712db SHA512 22f3c024ca11fe4483263956825f8190245c61eb6f200d1466a734a927729a0e3bc244d77050c85403b469ea647046941b5ba42e59c4f6410f8c8fa192de4268
 AUX caffe2-2.4.0-libfmt-11.patch 1560 BLAKE2B 816201b6abc3ad4c4924c649905068306f3a0c674eab36fb6a6772b84d2bf0806dd55d586d6873952b0eac56afae00513966071a380b9e60eff3c668e6aec737 SHA512 acdc879f2ed8ae546a6ce4db1b63faba3b6672374c61940d58e0c2b747c4b0d8d38fb34a2e66f3805f9f328fd4e0115dd705b541871b2fd99a2782756ca583e5
 AUX caffe2-2.5.1-cudnn_include_fix.patch 587 BLAKE2B 8ffeb9080ee77b953e7a77c9bea9af8c078adf147c314e07cf40d6f9ce1c988ac201e282ffd67a29703ced5885329d44be013c54cf3ba870c009aed40e65fefc SHA512 b37427e35d8147e603331eb344a3542ed31d0b133df3c7ce10ebecec93b1d09d040f77c33f23f70e9835db10fa209c0318b89b70b3b91263655d160ed737d6f3
-AUX caffe2-2.5.1-exclude-aotriton.patch 1107 BLAKE2B d1e0289c6e937b9f6611b1ffd5eb8398594839f8c7edd8be99be4b29d33b0466dbf9cc16c6eaaf6d71e3defd217651516272d7791a318c0afd7c15b162a4b5e9 SHA512 24079cc24361d07170276ea7e9771ec8e00ab849d42344a33d1eb3885bc963b21a9a5bc0f56a5a22b3896253010f0d6c14aa4dbeff3f9adb4bd3d20769eafb81
-AUX caffe2-2.5.1-fix-functorch-install.patch 448 BLAKE2B f8b0ebfe0cdb8318bc376d8afb2ece66ac6ef23e7f57f9f0371aa99c55fd6663f34392c5c696333144e6523f5ceada4fe4978b0db68db5e8ab5d761e42cbdfe9 SHA512 3cc38769df9f5d96b108c0235bd7a5346f591bd826d8156fb0bdf3735e147fa541f7df4baeb72af6f3509cf3bcbd640889c6f4ed2c98c5be12e28c3a88042287
 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
diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-exclude-aotriton.patch b/sci-libs/caffe2/files/caffe2-2.5.1-exclude-aotriton.patch
deleted file mode 100644
index 340d6e45c95a..000000000000
--- a/sci-libs/caffe2/files/caffe2-2.5.1-exclude-aotriton.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Disables aotriton download when both USE_FLASH_ATTENTION and USE_MEM_EFF_ATTENTION cmake flags are OFF
-Backports upstream PR to 2.3.0: https://github.com/pytorch/pytorch/pull/130197
---- a/aten/src/ATen/native/transformers/cuda/sdp_utils.cpp
-+++ b/aten/src/ATen/native/transformers/cuda/sdp_utils.cpp
-@@ -659,7 +659,7 @@ bool can_use_mem_efficient_attention(sdp_params const& params, bool debug) {
-       array_of<at::ScalarType>(at::kHalf, at::kFloat, at::kBFloat16);
-   constexpr auto less_than_sm80_mem_efficient_dtypes =
-       array_of<at::ScalarType>(at::kHalf, at::kFloat);
--#ifdef USE_ROCM
-+#if defined(USE_ROCM) && defined(USE_MEM_EFF_ATTENTION)
-   constexpr auto aotriton_mem_efficient_dtypes =
-       array_of<at::ScalarType>(at::kHalf, at::kFloat, at::kBFloat16);
- #endif
-@@ -709,7 +709,7 @@ bool can_use_mem_efficient_attention(sdp_params const& params, bool debug) {
-     }
-   }
- 
--#ifdef USE_ROCM
-+#if defined(USE_ROCM) && defined(USE_MEM_EFF_ATTENTION)
-   return check_tensor_dtype(params, aotriton_mem_efficient_dtypes, debug);
- #else
-   auto dprop = at::cuda::getCurrentDeviceProperties();
diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-fix-functorch-install.patch b/sci-libs/caffe2/files/caffe2-2.5.1-fix-functorch-install.patch
deleted file mode 100644
index ffce0028a556..000000000000
--- a/sci-libs/caffe2/files/caffe2-2.5.1-fix-functorch-install.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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 "${CMAKE_INSTALL_LIBDIR}")
diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-install-dirs.patch b/sci-libs/caffe2/files/caffe2-2.5.1-install-dirs.patch
deleted file mode 100644
index e99b7e59cb5b..000000000000
--- a/sci-libs/caffe2/files/caffe2-2.5.1-install-dirs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/c10/CMakeLists.txt
-+++ b/c10/CMakeLists.txt
-@@ -162,7 +162,7 @@ if(NOT BUILD_LIBTORCHLESS)
-   # Note: for now, we will put all export path into one single Caffe2Targets group
-   # to deal with the cmake deployment need. Inside the Caffe2Targets set, the
-   # individual libraries like libc10.so and libcaffe2.so are still self-contained.
--  install(TARGETS c10 EXPORT Caffe2Targets DESTINATION lib)
-+  install(TARGETS c10 EXPORT Caffe2Targets DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
- 
- install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest
index 8ae14bfd34e8..585e3f4d296f 100644
--- a/sci-libs/med/Manifest
+++ b/sci-libs/med/Manifest
@@ -5,5 +5,5 @@ AUX med-4.1.0-0003-build-against-hdf5-1.14.patch 4749 BLAKE2B 2968edac958b96a66c
 DIST med-4.1.1.tar.gz 50506725 BLAKE2B fb9bc3239c18c53fa42c5dd1101559746e8d38db2a3cb5fb47d1bf0cb578facc4ab95409af8524f5c20251848842cc1a331f6a816ce0754e9a6c95f507174ed1 SHA512 8917e7ecfe30e1259b0927c8e1c3d6efd86ed2386813f6d90217bd95589199478e587f0815031ab65cacf7901a30b77a6307414f9073caffe6e7f013e710d768
 EBUILD med-4.1.1-r1.ebuild 3420 BLAKE2B 57dd4c3ffd7c3d9cd7413252ae04a58f0cbe86223e7bca74eafc4caf808c7c194232ada980d652528f727e19a9a12a8e9d098d805d00d7b63169d30b05113de1 SHA512 30c185c5e7b88b8756af77c207138900745e7906721ab9fe675f663c01670754774ce34f366dc154bc128803f614453d1c448ea828f06d03320c39c8f2a31a2d
 EBUILD med-4.1.1-r3.ebuild 3187 BLAKE2B a0507b98b5f91eca0fad6a99f85e1ca886248deeacc00f6174774fc3d8fe3b5345fb7a7e3e43c05c56604e7aa6e5b20feed3dcf4cf91ca5c02785da2e26f4c07 SHA512 ead43d7ba64af6ee56ea6060294f194939d5311790e5b326b2c4f4d1ae54980e848c3812c8b341523a807afd6e2f7615ac2b2b456d15461004a927f420a2870d
-EBUILD med-4.1.1-r4.ebuild 3252 BLAKE2B eff71ed92899dfdc8434e0dd9c0bab6cc1c8f41b54dfb7c735a53e3e6ce837a7c5029f74c187bd9b3bd007628b24e28482db451115eaf6fecf061b742ebe8b13 SHA512 a825b4327303a4132a21a2689b6c8ed69f67426a2b797a8134460114a8360d45018c2f7d383c0922b031970eb424efa72a4417c1a72c8258cfeb8a86d3807814
+EBUILD med-4.1.1-r4.ebuild 3294 BLAKE2B e83528ccf87e99a460b4901ad48bd52a55ef5b281e8323bfb713e52c5a63c95615673d3875e73e13343b306e6d39c05d634f5aaf89a26ec7b303ee14f12cc6b3 SHA512 343f4ab9c74a6b2193135a6d5db9f72e08d52584187abe566dafac119fd07b00794bd5abff81569aa22ca0badba157f8e4e3ff42058312938468f99e4d3e5b58
 MISC metadata.xml 636 BLAKE2B de5e1c1d3f715459d5ca0945d0d795c1c549e6e20c27283140190bdc24289f4ccc0c12940e00aa689b90fd9af53749f0eabab44cecaf6815ef37adc1795f43e9 SHA512 60a3c3afd0db34569993b73d795830d86eb51778f9a7f0375d0b196c6f0862ca10a77c4c33ad2c906c56c6715be6f4452b61ffab5a25c254e480e50b64c021e4
diff --git a/sci-libs/med/med-4.1.1-r4.ebuild b/sci-libs/med/med-4.1.1-r4.ebuild
index ce0d521ecfd1..2b8c3a7cf96c 100644
--- a/sci-libs/med/med-4.1.1-r4.ebuild
+++ b/sci-libs/med/med-4.1.1-r4.ebuild
@@ -63,6 +63,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug #943874
+	append-cflags -std=gnu17
+
 	local mycmakeargs=(
 		# as indicated in the CMakeLists.txt, the shipped documentation is generated by a custom doxygen,
 		# so let's avoid rebuilding it because it will be different