gentoo auto-resync : 22:09:2022 - 17:28:08

3 files changed, 2 insertions, 176 deletions

diff --git a/sci-libs/rocSOLVER/Manifest b/sci-libs/rocSOLVER/Manifest
index 97a7b82843f2..555e5ebf92b3 100644
--- a/sci-libs/rocSOLVER/Manifest
+++ b/sci-libs/rocSOLVER/Manifest
@@ -1,11 +1,10 @@
 AUX rocSOLVER-4.2.0-add-stdint-header.patch 475 BLAKE2B 268a1813d4e26dbaaa2360d0a187ce2a1448da075ae5f98a4a829c979411ab7e0c06f150ddcb445c9b295268a1e9f1770adbe7e68a1c3f84edde3c3477a57610 SHA512 ede56f9579e655ddd098ca9006612537f8ed61dc585274afe6b2b0bdee875431b62e0c6da6bc01e2cabeeb5244a91bb1e00b442bb549c075a286eefd8d9edc09
 AUX rocSOLVER-4.3.0-link-blas.patch 604 BLAKE2B 863c1807d281e219b429a58c9e9e582a346e72be6004fb3f5a818479ae02b4efd896873f7c689084eefc50c331d8734c5dbf2dcb9e9756a54ce092e5ace22da5 SHA512 413692c2a7e40cb3bb169eef078fc4caa0ebaba760f535fb27afafcc49713fae26c9ca5c82793c54d4e07ccafe43a0d7d65b7e76d0207bdd20a5581bd71216d9
 AUX rocSOLVER-5.0.2-libfmt8.patch 7493 BLAKE2B 0327f78dd94f0102a5c4aabf13cab2ec6adaec3efee82acdb24d223b56a58bece34b505b9fdb2964ffa6f3f574730c2e74110e12e198fe26bc682ea294038749 SHA512 124dd445e188475777e3dee017f7380675594717b1e58458397780dc5c32ee8221935234954554510bd169af10a3bdb4fef0674bf93030081c5c12c1f3061a13
-AUX rocSOLVER-5.1.3-libfmt8.patch 7493 BLAKE2B 0327f78dd94f0102a5c4aabf13cab2ec6adaec3efee82acdb24d223b56a58bece34b505b9fdb2964ffa6f3f574730c2e74110e12e198fe26bc682ea294038749 SHA512 124dd445e188475777e3dee017f7380675594717b1e58458397780dc5c32ee8221935234954554510bd169af10a3bdb4fef0674bf93030081c5c12c1f3061a13
 DIST rocSOLVER-4.3.0.tar.gz 454249 BLAKE2B 727ae416d85c5a19983257d2a0b01836013c1d69cddf3334b2c1b808b96b401db938b46b7ecf1e7faf26ff555374d1d3abed74abbe7be47110a36b44019469ee SHA512 2910e1cfad4d17a2877e2ae572d80179b84903c632652571c01bd12856c92c22e073ea1005ed9aac04244b4c502a7e0c18d96445e57658ae8eb5b320bada549b
 DIST rocSOLVER-5.0.2.tar.gz 530085 BLAKE2B f3c3594b5ee2703424da289cc0c520a589da28f9d3f4c04d81cace35a4f77f3ca79ff9a1e7139d83d7a2ae1907083aded99b5d9fbe216d81b225dc1b9fc4105b SHA512 ab349044aba0c1b6b7d0019d15f2bdf068805d2da73790f424ae90835f2d7dd4137d0a641d8edbf98fcb190989f0d0fa57dfc448a376a19e21fd62940046b3a1
 DIST rocSOLVER-5.1.3.tar.gz 545627 BLAKE2B 2cca24a1310efba7f8c66d1614fb50704221ebc8aa50d6aba11083baf9a7427575642fd28218ce80f8a7b83d3406348c2dd18373fb32e533509d01d37cf06927 SHA512 38e7a4ed6b67e83960ad3416d1008f82f895d19dc85427cd6f9c76f00b1ce18f78a4dd73d1ab53ffe81588890cd5545315029e903e2e09b85d6cfb854d405753
 EBUILD rocSOLVER-4.3.0-r1.ebuild 1924 BLAKE2B 4d9f6af3842357336ef725b2185d329352a6f2a27bf6743b4389d21f7fc3271e41bd2f557a511004352218b2976731198ee28724a236277a64026bd44070d29a SHA512 e3ed8a7da1454a3f0f2822bbd921521a37401c84adf337f8b1379bf0fa7dc75a3947410c040ac0fcbe16684aec67bf9a5c4e3edd059e85e6e431cf99fb6e66b8
 EBUILD rocSOLVER-5.0.2.ebuild 1951 BLAKE2B 43fc670d8de93b8d5ee43d5ab4fed4d6744c9ff331f1a0fca4832ce4cb9505c96dd5d4b2450a441d9328876d383fb14ceb20acfaab6f728365f2230234d073c5 SHA512 65ef60715df10da01845bf2adaaf749466d23b391cbff93dadaa9f0963fc545defc45cb0455ba3ac79a270748795a6f650cd885c4ec37acca49542fb394c9ebd
-EBUILD rocSOLVER-5.1.3.ebuild 1943 BLAKE2B 4f455f8a6629bc42716d1d825c7471e3f358db78d83b1d04d6dddd93bf85c804720fb01ea34ba240e5a86c7c4b062d59911ff366b1653781c9cef20d8ed0f312 SHA512 cb7d90943ffa8a02a86e854063131d759c014aae075ec3638f634e6bc0c0c1451fbd6bb347f1c1136d025a746ad88d9ceb8321454cff03e427ea1a7341fb5097
+EBUILD rocSOLVER-5.1.3.ebuild 1950 BLAKE2B 0c2142709be8d8db1e3d0a3c080aeaf5f1feed16bcfdbf24dcecd3787b0364c6fa5cbd8c15d502e867bccfd7d892d16a17b4e91de1a06efee4fc86f15e0470fb SHA512 bb7b3a3894b236f7b8d49001477b83d32a4d8da69ef51fb408451ab98a5f59bf6788e0aff07f00ab2891d88d5baedce4af93f9c372d7e9bd2265dd3163e81eb5
 MISC metadata.xml 662 BLAKE2B 6dc116ac630fbd30c5f6c18d716bcd12bc994bfa0b2aea4eacf65e31507c24bb1eeed55942ee8e0b5bed8e361d28950d433c13136771673308dbf96906e270c9 SHA512 cc5cc6401303169dd423234615b748b38a58191b058befe0f40e8b8996fe50b3554b99a14f2f63c3596227aab43558f23c64ddce88172157366cc78d4aeefb56
diff --git a/sci-libs/rocSOLVER/files/rocSOLVER-5.1.3-libfmt8.patch b/sci-libs/rocSOLVER/files/rocSOLVER-5.1.3-libfmt8.patch
deleted file mode 100644
index 3f2c0553689b..000000000000
--- a/sci-libs/rocSOLVER/files/rocSOLVER-5.1.3-libfmt8.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-Backported from upstream to fix dev-cpp/libfmt-8 compatibility
-
-remove changes of CHANGELOG.md from original git commit
-
-From 2bbfb8976f6e4d667499c77e41a6433850063e88 Mon Sep 17 00:00:00 2001
-From: Cory Bloor <Cordell.Bloor@amd.com>
-Date: Tue, 8 Feb 2022 23:53:57 -0700
-Subject: [PATCH] Fix compatibility with fmt v8.1 (#371)
-
-* Make rocsolver_logvalue fmt specializations const
-
-This allows for compile-time format string processing in fmt v8.0.
-
-* Fix compatibility with fmt v7.1
-
-* Update CHANGELOG.md
----
- CHANGELOG.md                               |  2 ++
- library/src/include/rocsolver_logvalue.hpp | 38 +++++++++++++---------
- 2 files changed, 25 insertions(+), 15 deletions(-)
-
-diff --git a/library/src/include/rocsolver_logvalue.hpp b/library/src/include/rocsolver_logvalue.hpp
-index 199f8d57d..9b3791031 100644
---- a/library/src/include/rocsolver_logvalue.hpp
-+++ b/library/src/include/rocsolver_logvalue.hpp
-@@ -1,5 +1,5 @@
- /* ************************************************************************
-- * Copyright (c) 2021 Advanced Micro Devices, Inc.
-+ * Copyright (c) 2021-2022 Advanced Micro Devices, Inc.
-  * ************************************************************************ */
- 
- #pragma once
-@@ -8,6 +8,14 @@
- 
- #include "rocsolver_datatype2string.hpp"
- 
-+/* The format function for user-defined types cannot be const before fmt v8.0
-+   but must be const in fmt v8.1 if the type is used in a tuple. */
-+#if FMT_VERSION < 80000
-+#define ROCSOLVER_FMT_CONST
-+#else
-+#define ROCSOLVER_FMT_CONST const
-+#endif
-+
- /***************************************************************************
-  * Wrapper for types passed to logger, so we can more easily adjust the
-  * default way of printing built-in types without doing it globally. (e.g.
-@@ -37,7 +45,7 @@ template <typename T>
- struct formatter<rocsolver_logvalue<T>> : formatter<T>
- {
-     template <typename FormatCtx>
--    auto format(rocsolver_logvalue<T> wrapper, FormatCtx& ctx)
-+    auto format(rocsolver_logvalue<T> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
-     {
-         return formatter<T>::format(wrapper.value, ctx);
-     }
-@@ -49,7 +57,7 @@ template <>
- struct formatter<rocsolver_logvalue<bool>> : formatter<char>
- {
-     template <typename FormatCtx>
--    auto format(rocsolver_logvalue<bool> wrapper, FormatCtx& ctx)
-+    auto format(rocsolver_logvalue<bool> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
-     {
-         return formatter<char>::format(wrapper.value ? '1' : '0', ctx);
-     }
-@@ -58,7 +66,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_operation>> : formatter<char>
- {
-     template <typename FormatCtx>
--    auto format(rocsolver_logvalue<rocblas_operation> wrapper, FormatCtx& ctx)
-+    auto format(rocsolver_logvalue<rocblas_operation> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
-     {
-         return formatter<char>::format(rocblas2char_operation(wrapper.value), ctx);
-     }
-@@ -67,7 +75,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_fill>> : formatter<char>
- {
-     template <typename FormatCtx>
--    auto format(rocsolver_logvalue<rocblas_fill> wrapper, FormatCtx& ctx)
-+    auto format(rocsolver_logvalue<rocblas_fill> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
-     {
-         return formatter<char>::format(rocblas2char_fill(wrapper.value), ctx);
-     }
-@@ -76,7 +84,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_diagonal>> : formatter<char>
- {
-     template <typename FormatCtx>
--    auto format(rocsolver_logvalue<rocblas_diagonal> wrapper, FormatCtx& ctx)
-+    auto format(rocsolver_logvalue<rocblas_diagonal> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
-     {
-         return formatter<char>::format(rocblas2char_diagonal(wrapper.value), ctx);
-     }
-@@ -85,7 +93,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_side>> : formatter<char>
- {
-     template <typename FormatCtx>
--    auto format(rocsolver_logvalue<rocblas_side> wrapper, FormatCtx& ctx)
-+    auto format(rocsolver_logvalue<rocblas_side> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
-     {
-         return formatter<char>::format(rocblas2char_side(wrapper.value), ctx);
-     }
-@@ -94,7 +102,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_direct>> : formatter<char>
- {
-     template <typename FormatCtx>
--    auto format(rocsolver_logvalue<rocblas_direct> wrapper, FormatCtx& ctx)
-+    auto format(rocsolver_logvalue<rocblas_direct> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
-     {
-         return formatter<char>::format(rocblas2char_direct(wrapper.value), ctx);
-     }
-@@ -104,7 +112,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_storev>> : formatter<char>
- {
-     template <typename FormatCtx>
--    auto format(rocsolver_logvalue<rocblas_storev> wrapper, FormatCtx& ctx)
-+    auto format(rocsolver_logvalue<rocblas_storev> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
-     {
-         return formatter<char>::format(rocblas2char_storev(wrapper.value), ctx);
-     }
-@@ -113,7 +121,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_workmode>> : formatter<char>
- {
-     template <typename FormatCtx>
--    auto format(rocsolver_logvalue<rocblas_workmode> wrapper, FormatCtx& ctx)
-+    auto format(rocsolver_logvalue<rocblas_workmode> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
-     {
-         return formatter<char>::format(rocblas2char_workmode(wrapper.value), ctx);
-     }
-@@ -122,7 +130,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_svect>> : formatter<char>
- {
-     template <typename FormatCtx>
--    auto format(rocsolver_logvalue<rocblas_svect> wrapper, FormatCtx& ctx)
-+    auto format(rocsolver_logvalue<rocblas_svect> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
-     {
-         return formatter<char>::format(rocblas2char_svect(wrapper.value), ctx);
-     }
-@@ -131,7 +139,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_evect>> : formatter<char>
- {
-     template <typename FormatCtx>
--    auto format(rocsolver_logvalue<rocblas_evect> wrapper, FormatCtx& ctx)
-+    auto format(rocsolver_logvalue<rocblas_evect> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
-     {
-         return formatter<char>::format(rocblas2char_evect(wrapper.value), ctx);
-     }
-@@ -140,7 +148,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_eform>> : formatter<char>
- {
-     template <typename FormatCtx>
--    auto format(rocsolver_logvalue<rocblas_eform> wrapper, FormatCtx& ctx)
-+    auto format(rocsolver_logvalue<rocblas_eform> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
-     {
-         return formatter<char>::format(rocblas2char_eform(wrapper.value), ctx);
-     }
-@@ -149,7 +157,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_datatype>> : formatter<string_view>
- {
-     template <typename FormatCtx>
--    auto format(rocsolver_logvalue<rocblas_datatype> wrapper, FormatCtx& ctx)
-+    auto format(rocsolver_logvalue<rocblas_datatype> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
-     {
-         return formatter<string_view>::format(rocblas2string_datatype(wrapper.value), ctx);
-     }
-@@ -158,7 +166,7 @@ template <>
- struct formatter<rocsolver_logvalue<rocblas_initialization>> : formatter<string_view>
- {
-     template <typename FormatCtx>
--    auto format(rocsolver_logvalue<rocblas_initialization> wrapper, FormatCtx& ctx)
-+    auto format(rocsolver_logvalue<rocblas_initialization> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST
-     {
-         return formatter<string_view>::format(rocblas2string_initialization(wrapper.value), ctx);
-     }
diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild b/sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild
index 77092f820467..e2db9aba2a19 100644
--- a/sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild
+++ b/sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild
@@ -29,7 +29,7 @@ BDEPEND="test? ( dev-cpp/gtest
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.2.0-add-stdint-header.patch"
-	"${FILESDIR}/${P}-libfmt8.patch"
+	"${FILESDIR}/${PN}-5.0.2-libfmt8.patch"
 )
 
 RESTRICT="!test? ( test )"