gentoo auto-resync : 30:06:2024 - 08:00:50

16 files changed, 14 insertions, 524 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a787062fd616..b25976f4dc79 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
index 9579ca8ea457..4014aa34e3fd 100644
--- a/dev-util/hip/Manifest
+++ b/dev-util/hip/Manifest
@@ -31,9 +31,6 @@ AUX hip-5.7.1-extend-isa-compatibility-check.patch 9039 BLAKE2B d1c80da9ca584aa4
 AUX hip-5.7.1-fix-mmap-oom-check.patch 1317 BLAKE2B d1e9db74bb815cd9194b47688bb125630a8baf8c3df14e454b2f8c59303c136c6c69b7ca89fddabb2533bfa034c984d88ec276851daf2241d9abeda7f5a50f87 SHA512 b6a5d7b861fe4138c72f91b765df822cce00fda94d3b8b85c0a40c3697455b018256f37317adf714280aa387ebe5da14a092ab69e375e8a804f01243837f7b60
 AUX hip-5.7.1-fix-unaligned-access.patch 3011 BLAKE2B d8a6a130edcf51c40e88250508ff3db13f134fb3833d1eadfac32dfdee09c7635091b1f32ed640bcba0c5ca2b745c401183ee8adaa392977ecece12a03450f9e SHA512 f9b85117927d18921d939daa73d2d97477bb49eb6ff7e496f9b110b8e70e00734b698517ae4235a03c560bdfc3618367d7eb2970c9d90dc2bcf07e2ab803d994
 AUX hip-5.7.1-no_asan_doc.patch 817 BLAKE2B 4bc80470f9cb476289086ae561560bb54fcdd9d1e66ef420dc60f129f29b0de02025be0ed2a7bfd2143b9bc0b456a354abc574dcbff509872a35e2e0c06f7760 SHA512 10a97524acce0c45c8edeccd11b64445f6edeb380e8262e1fc63163c4758efd731af36701dae1c9988264e8ce10971c9b3959ea881e81646994c779a96d10bb9
-AUX hip-6.0.2-install.patch 993 BLAKE2B e54542801197ad33e3feee0896401acec60190e95ec09ede70b357f5af550255dc4f08e75279d21e3932d7be6b7e0c0b5cd86f8ca235f463135d42699855f4d9 SHA512 a3d772d60d3842a91796f32d8bad3289eee8f878bcedb6c064df43f514ed102729f8f7ed62fc1d8b3f73dd969e5368a86b847b0858d296da916ac424ef593059
-AUX hip-6.1.0-extend-isa-compatibility-check-v2.patch 1323 BLAKE2B 1af3ebf4c9c328a89a6b7440acd744955078b1a35c90d7476905417398e05848435776ba954184e37a943d2ff31d10aa3116ce00eed754574bf843a16cd0da1c SHA512 19c93c98ea3bc6fbff309ff02424355e482ea584266adf4322bd46d55a2f6f0196fd02eae843c08080d01a6afc1cf94e1bed3905881a67df9f3c3b0d8b17c464
-AUX hip-6.1.0-extend-isa-compatibility-check.patch 9037 BLAKE2B d9dceb54665816468971e8ee1ae9e749df48f60be0cd9a131259179f4b5cc8e465a27971906f2d990e73ad00f278e9736cba9941686ecb604ca8820e82e2ac94 SHA512 18bd5365774694619d8601dc6ed40517cc77f4dcdd124ef59f486416c4f6c08586adece94bd175ef33109744de84a11e78a34b4e07425a2616cbf68ef1c1bf49
 AUX hip-6.1.0-install.patch 937 BLAKE2B a694b8d4fd433ed788e97df09ed26a58305944b63f1f88948b0ff47f9f60f96236bda072917d279d263d02059aaab0e3d2282feb0cee02a7da86e9f016a091f0 SHA512 62a38326021bb1b81a43cf26336528dd1cb30ac90d41c5a3ab9a2d8996090cb8677fc163d156785347f0cb893c84b7166b698b801e1d52449fdb3ee01e75483b
 AUX hip-6.1.1-fix-musl.patch 566 BLAKE2B ca84d7a1c38b6ae3e7dedbda8cafa0ad5bf31165c3a7b5af8a1a9714d871eeedb64bd6e6c71960e65ee3f7bed2bdf302d07e7c33e225102123d8516018391430 SHA512 e224e84b6eb4b43fd79e5172ad4882d1862d7a50fcb7ed60afc58148a399a96fafaf14477ed31d503f3ecb4c93ba2b58bdcad3c6dce7afab61ee7a8e60d3f65e
 AUX hip-test-5.7.0-rocm_agent_enumerator-location.patch 651 BLAKE2B 237ae5e71c9a6c565680c4fb07ece160f6bc635d25c77a20f3da54b92fcead95c0f6871f53a58a1e9b26b1d5fef3372ebc547638ba2fba43621c2867d276e75a SHA512 79d3cb277c41a84e6db70b28ad465067403f27d1f54adcbcd3e3501fc08c29f2aafc60fa2e6e78794eed95987352aa7ae844fbd55abc1abe0be8ff1879ed7d8f
diff --git a/dev-util/hip/files/hip-6.0.2-install.patch b/dev-util/hip/files/hip-6.0.2-install.patch
deleted file mode 100644
index e2fc3a8852cb..000000000000
--- a/dev-util/hip/files/hip-6.0.2-install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt
-index 7ad30019d..e79ea0714 100755
---- a/hipamd/CMakeLists.txt
-+++ b/hipamd/CMakeLists.txt
-@@ -398,18 +398,7 @@ if (NOT ${HIPCC_BIN_DIR} STREQUAL "")
-       set(hipcc_bin ${hipcc_bin}.exe)
-       set(hipconfig_bin ${hipconfig_bin}.exe)
-     endif()
--    if(EXISTS ${hipcc_bin} AND EXISTS ${hipconfig_bin})
--      install(PROGRAMS ${hipcc_bin} DESTINATION bin)
--      install(PROGRAMS ${hipconfig_bin} DESTINATION bin)
--    endif()
-   endif()
--  install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc DESTINATION bin)
--  install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig DESTINATION bin)
--  install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.pl DESTINATION bin)
--  install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.pl DESTINATION bin)
--  install(PROGRAMS ${HIPCC_BIN_DIR}/hipvars.pm DESTINATION bin)
--  install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin)
--  install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin)
- endif()
- 
- #############################
diff --git a/dev-util/hip/files/hip-6.1.0-extend-isa-compatibility-check-v2.patch b/dev-util/hip/files/hip-6.1.0-extend-isa-compatibility-check-v2.patch
deleted file mode 100644
index d6e95c994c8f..000000000000
--- a/dev-util/hip/files/hip-6.1.0-extend-isa-compatibility-check-v2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e188c092a987c45caf2ea4651686ea631ca47c3d Mon Sep 17 00:00:00 2001
-From: Paul Zander <negril.nx+gentoo@gmail.com>
-Date: Tue, 25 Jun 2024 15:22:33 +0200
-Subject: [PATCH] prepare usage of old patch
-
-Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
----
- hipamd/src/hip_code_object.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hipamd/src/hip_code_object.cpp b/hipamd/src/hip_code_object.cpp
-index 6b3a6d0..fef89df 100644
---- a/hipamd/src/hip_code_object.cpp
-+++ b/hipamd/src/hip_code_object.cpp
-@@ -410,7 +410,7 @@ static bool isCodeObjectCompatibleWithDevice(std::string co_triple_target_id,
-   if (co_triple_target_id == agent_triple_target_id) return true;
- 
-   // Parse code object triple target id
--  if (!consume(co_triple_target_id, std::string(kAmdgcnTargetTriple) + '-')) {
-+  if (!consume(co_triple_target_id, std::string(AMDGCN_TARGET_TRIPLE) + '-')) {
-     return false;
-   }
- 
-@@ -423,7 +423,7 @@ static bool isCodeObjectCompatibleWithDevice(std::string co_triple_target_id,
-   if (!co_triple_target_id.empty()) return false;
- 
-   // Parse agent isa triple target id
--  if (!consume(agent_triple_target_id, std::string(kAmdgcnTargetTriple) + '-')) {
-+  if (!consume(agent_triple_target_id, std::string(AMDGCN_TARGET_TRIPLE) + '-')) {
-     return false;
-   }
- 
--- 
-2.45.2
-
diff --git a/dev-util/hip/files/hip-6.1.0-extend-isa-compatibility-check.patch b/dev-util/hip/files/hip-6.1.0-extend-isa-compatibility-check.patch
deleted file mode 100644
index 40ccf6fdc089..000000000000
--- a/dev-util/hip/files/hip-6.1.0-extend-isa-compatibility-check.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-Combined with matching changes within rocr-runtime ebuild, this patch allows
-to load compatible kernels whenever possible.
-For example if AMDGPU_TARGETS is set to gfx1030 and some application
-was started on gfx1036, it loads gfx1030 kernel.
-
-Author: Cordell Bloor <cgmb@slerp.xyz>
-https://salsa.debian.org/rocm-team/rocm-hipamd/-/blob/master/debian/patches/0025-improve-rocclr-isa-compatibility-check.patch
-https://salsa.debian.org/rocm-team/rocm-hipamd/-/blob/master/debian/patches/0026-extend-hip-isa-compatibility-check.patch
---- a/hipamd/src/hip_code_object.cpp
-+++ b/hipamd/src/hip_code_object.cpp
-@@ -390,47 +390,123 @@ static bool getTripleTargetID(std::string bundled_co_entry_id, const void* code_
-   return true;
- }
- 
--static bool isCodeObjectCompatibleWithDevice(std::string co_triple_target_id,
--                                             std::string agent_triple_target_id) {
-+struct GfxPattern {
-+  std::string root;
-+  std::string suffixes;
-+};
-+
-+static bool matches(const GfxPattern& p, const std::string& s) {
-+  if (p.root.size() + 1 != s.size()) {
-+    return false;
-+  }
-+  if (0 != std::memcmp(p.root.data(), s.data(), p.root.size())) {
-+    return false;
-+  }
-+  return p.suffixes.find(s[p.root.size()]) != std::string::npos;
-+}
-+
-+static bool isGfx900EquivalentProcessor(const std::string& processor) {
-+  return matches(GfxPattern{"gfx90", "029c"}, processor);
-+}
-+
-+static bool isGfx900SupersetProcessor(const std::string& processor) {
-+  return matches(GfxPattern{"gfx90", "0269c"}, processor);
-+}
-+
-+static bool isGfx1030EquivalentProcessor(const std::string& processor) {
-+  return matches(GfxPattern{"gfx103", "0123456"}, processor);
-+}
-+
-+static bool isGfx1010EquivalentProcessor(const std::string& processor) {
-+  return matches(GfxPattern{"gfx101", "0"}, processor);
-+}
-+
-+static bool isGfx1010SupersetProcessor(const std::string& processor) {
-+  return matches(GfxPattern{"gfx101", "0123"}, processor);
-+}
-+
-+enum CompatibilityScore {
-+  CS_EXACT_MATCH           = 1 << 4,
-+  CS_PROCESSOR_MATCH       = 1 << 3,
-+  CS_PROCESSOR_COMPATIBLE  = 1 << 2,
-+  CS_XNACK_SPECIALIZED     = 1 << 1,
-+  CS_SRAM_ECC_SPECIALIZED  = 1 << 0,
-+  CS_INCOMPATIBLE          = 0,
-+};
-+
-+static int getProcessorCompatibilityScore(const std::string& co_processor,
-+                                          const std::string& agent_processor) {
-+  if (co_processor == agent_processor)
-+    return CS_PROCESSOR_MATCH;
-+
-+  if (isGfx900SupersetProcessor(agent_processor))
-+    return isGfx900EquivalentProcessor(co_processor) ? CS_PROCESSOR_COMPATIBLE : CS_INCOMPATIBLE;
-+
-+  if (isGfx1010SupersetProcessor(agent_processor))
-+    return isGfx1010EquivalentProcessor(co_processor) ? CS_PROCESSOR_COMPATIBLE : CS_INCOMPATIBLE;
-+
-+  if (isGfx1030EquivalentProcessor(agent_processor))
-+    return isGfx1030EquivalentProcessor(co_processor) ? CS_PROCESSOR_COMPATIBLE : CS_INCOMPATIBLE;
-+
-+  return CS_INCOMPATIBLE;
-+}
-+
-+static int getCompatiblityScore(std::string co_triple_target_id,
-+                                std::string agent_triple_target_id) {
-   // Primitive Check
--  if (co_triple_target_id == agent_triple_target_id) return true;
-+  if (co_triple_target_id == agent_triple_target_id) return CS_EXACT_MATCH;
- 
-   // Parse code object triple target id
-   if (!consume(co_triple_target_id, std::string(kAmdgcnTargetTriple) + '-')) {
--    return false;
-+    return CS_INCOMPATIBLE;
-   }
- 
-   std::string co_processor;
-   char co_sram_ecc, co_xnack;
-   if (!getTargetIDValue(co_triple_target_id, co_processor, co_sram_ecc, co_xnack)) {
--    return false;
-+    return CS_INCOMPATIBLE;
-   }
- 
--  if (!co_triple_target_id.empty()) return false;
-+  if (!co_triple_target_id.empty()) return CS_INCOMPATIBLE;
- 
-   // Parse agent isa triple target id
-   if (!consume(agent_triple_target_id, std::string(kAmdgcnTargetTriple) + '-')) {
--    return false;
-+    return CS_INCOMPATIBLE;
-   }
- 
-   std::string agent_isa_processor;
-   char isa_sram_ecc, isa_xnack;
-   if (!getTargetIDValue(agent_triple_target_id, agent_isa_processor, isa_sram_ecc, isa_xnack)) {
--    return false;
-+    return CS_INCOMPATIBLE;
-   }
- 
--  if (!agent_triple_target_id.empty()) return false;
-+  if (!agent_triple_target_id.empty()) return CS_INCOMPATIBLE;
- 
-   // Check for compatibility
--  if (agent_isa_processor != co_processor) return false;
--  if (co_sram_ecc != ' ') {
--    if (co_sram_ecc != isa_sram_ecc) return false;
-+  int processor_score = getProcessorCompatibilityScore(co_processor, agent_isa_processor);
-+  if (processor_score == CS_INCOMPATIBLE) {
-+    return CS_INCOMPATIBLE;
-   }
--  if (co_xnack != ' ') {
--    if (co_xnack != isa_xnack) return false;
-+
-+  int xnack_bonus;
-+  if (co_xnack == ' ') {
-+    xnack_bonus = 0;
-+  } else if (co_xnack == isa_xnack) {
-+    xnack_bonus = CS_XNACK_SPECIALIZED;
-+  } else {
-+    return CS_INCOMPATIBLE;
-   }
- 
--  return true;
-+  int sram_ecc_bonus;
-+  if (co_sram_ecc == ' ') {
-+    sram_ecc_bonus = 0;
-+  } else if (co_sram_ecc == isa_sram_ecc) {
-+    sram_ecc_bonus = CS_SRAM_ECC_SPECIALIZED;
-+  } else {
-+    return CS_INCOMPATIBLE;
-+  }
-+
-+  return processor_score + xnack_bonus + sram_ecc_bonus;
- }
- 
- // This will be moved to COMGR eventually
-@@ -483,6 +559,7 @@ hipError_t CodeObject::extractCodeObjectFromFatBinary(
-   for (size_t i = 0; i < agent_triple_target_ids.size(); i++) {
-     code_objs.push_back(std::make_pair(nullptr, 0));
-   }
-+  std::vector<int> compatibility_score(agent_triple_target_ids.size());
- 
-   const auto obheader = reinterpret_cast<const __ClangOffloadBundleHeader*>(data);
-   const auto* desc = &obheader->desc[0];
-@@ -495,17 +572,19 @@ hipError_t CodeObject::extractCodeObjectFromFatBinary(
-         reinterpret_cast<const void*>(reinterpret_cast<uintptr_t>(obheader) + desc->offset);
-     const size_t image_size = desc->size;
- 
--    if (num_code_objs == 0) break;
-     std::string bundleEntryId{desc->bundleEntryId, desc->bundleEntryIdSize};
- 
-     std::string co_triple_target_id;
-     if (!getTripleTargetID(bundleEntryId, image, co_triple_target_id)) continue;
- 
-     for (size_t dev = 0; dev < agent_triple_target_ids.size(); ++dev) {
--      if (code_objs[dev].first) continue;
--      if (isCodeObjectCompatibleWithDevice(co_triple_target_id, agent_triple_target_ids[dev])) {
-+      if (compatibility_score[dev] >= CS_PROCESSOR_MATCH) continue;
-+      int score = getCompatiblityScore(co_triple_target_id, agent_triple_target_ids[dev]);
-+      if (score > compatibility_score[dev]) {
-+        compatibility_score[dev] = score;
-+        if (!code_objs[dev].first)
-+          --num_code_objs;
-         code_objs[dev] = std::make_pair(image, image_size);
--        --num_code_objs;
-       }
-     }
-   }
---- a/rocclr/device/device.cpp
-+++ b/rocclr/device/device.cpp
-@@ -232,10 +232,49 @@ std::string Isa::isaName() const {
-   return std::string(hsaIsaNamePrefix) + targetId();
- }
- 
-+template <class T, std::size_t N>
-+static bool Contains(const std::array<T, N>& arr, const T& value) {
-+  return std::find(std::begin(arr), std::end(arr), value) != std::end(arr);
-+}
-+
-+static bool IsVersionCompatible(const Isa &codeObjectIsa,
-+                                const Isa &agentIsa) {
-+  if (codeObjectIsa.versionMajor() == agentIsa.versionMajor() &&
-+      codeObjectIsa.versionMinor() == agentIsa.versionMinor()) {
-+
-+    if (codeObjectIsa.versionStepping() == agentIsa.versionStepping()) {
-+      return true; // exact match
-+    }
-+
-+    // The code object and the agent may sometimes be compatible if
-+    // they differ only by stepping version.
-+    if (codeObjectIsa.versionMajor() == 9 &&
-+        codeObjectIsa.versionMinor() == 0) {
-+      const std::array<uint32_t, 4> gfx900_equivalent = { 0, 2, 9, 12 };
-+      const std::array<uint32_t, 5> gfx900_superset = { 0, 2, 6, 9, 12 };
-+      if (Contains(gfx900_equivalent, codeObjectIsa.versionStepping()) &&
-+          Contains(gfx900_superset, agentIsa.versionStepping())) {
-+        return true; // gfx900 compatible object and agent
-+      }
-+    } else if (codeObjectIsa.versionMajor() == 10) {
-+      if (codeObjectIsa.versionMinor() == 1) {
-+        const std::array<uint32_t, 1> gfx1010_equivalent = { 0 };
-+        const std::array<uint32_t, 4> gfx1010_superset = { 0, 1, 2, 3 };
-+        if (Contains(gfx1010_equivalent, codeObjectIsa.versionStepping()) &&
-+            Contains(gfx1010_superset, agentIsa.versionStepping())) {
-+          return true; // gfx1010 compatible object and agent
-+        }
-+      } else if (codeObjectIsa.versionMinor() == 3) {
-+        return true; // gfx1030 compatible object and agent
-+      }
-+    }
-+  }
-+
-+  return false;
-+}
-+
- bool Isa::isCompatible(const Isa &codeObjectIsa, const Isa &agentIsa) {
--  if (codeObjectIsa.versionMajor() != agentIsa.versionMajor() ||
--      codeObjectIsa.versionMinor() != agentIsa.versionMinor() ||
--      codeObjectIsa.versionStepping() != agentIsa.versionStepping())
-+  if (!IsVersionCompatible(codeObjectIsa, agentIsa))
-     return false;
- 
-   assert(codeObjectIsa.isSrameccSupported() == agentIsa.isSrameccSupported() &&
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index e16ab4d33ea8..13d1544cad69 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -593,5 +593,5 @@ DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554
 DIST zip-0.6.6.crate 65789 BLAKE2B acefc076297468d72cb20d8c6234fe5406875056fbf78fc0eac3ac430af78f320ed839f8683bd96fa1a03c457d6ac568d42bd703a902bc37bd126791d8b4c709 SHA512 affd46c17ceaa0545a155250dfd16756f8706dda43bae8a322ec0481dbfb41e4cf3166bf9662fc139ef9d0ab3b0f9f158535b21d2a61b21d38b8b2407813eeef
 EBUILD maturin-1.4.0.ebuild 11593 BLAKE2B 3939475a135f1c8a560096d63810d655d9b42bce081b8d2d2c996ded19a5cb7fc40ffe0fc60df2559df82a8a970932ae6f36f020800e985613ad3fb94a6d8eca SHA512 5dccb635a419d1bedcbbd1d2966b960303f85214e93b4b800bd3dea5fc341bfc7213feae75f4c8fe20c82f4306a6765c1a53037665708572a5729a588c17d96c
 EBUILD maturin-1.5.1-r1.ebuild 11457 BLAKE2B 04171cda81800715013926ca89acb26712ab737abde39058e4237f20bc34ce3efc371ce03c142490cc879ba166c87bc0fd55f21489e27745a23a8b50f4702d7c SHA512 d159e0f5c4058b3d6e1e935dab549ef2f94f372c5263742c57be916efaeea1128d1abc7a7695e2177656847b2adf167c08e4fd03b2f02e797b6d2b212ba52bef
-EBUILD maturin-1.6.0.ebuild 11897 BLAKE2B b9f82500dec31fcc8150674d6b1c5893b343c7cafe40d99d7699b639572959ea726eaec9c4987d3228d0a4a7846d49e61842dee398a0a1c0237434128dc2f36e SHA512 be0cd3c6462b79b4a6b39e036905b1406b3cc3be79a2bbd0a4d3a1d8492eb9d82121602ed7af721966ea387da41dc821a5bed6f1a33c3ab22a1870e326eb8cd8
+EBUILD maturin-1.6.0.ebuild 11894 BLAKE2B a83f3b5a869bdb200ae829a159ebfac1fa81991c8377c883b73845bf2cc29067579cfda7bd92b3a268ebda4976f21b0d5d3b363710473f344e8f5abddd0f0531 SHA512 026c58f5c71be00dabdcc537d90a2ca752656bb89ae96aaf75f2a98e8bea296298cb8b6c8dedb66ed2550ead870abfd0fca2de319c3d0e4ec1dea900b7897653
 MISC metadata.xml 431 BLAKE2B 15731479f56d8b819c60e8e5541d3c4720462c5a90b199b803097b208432b18cc0143f8cbee471ce81ffeb8b54846fdb61fad083e7507f4f6c3630ac628546ed SHA512 7431db948fd5ab520fb6cae76c7e7dbb2c7aef907d7cde21189d1bb17c686cca7f69a0b84470b1c5d90f672e80d30fbb56f37beec1da04ebfdf025015c099ae7
diff --git a/dev-util/maturin/maturin-1.6.0.ebuild b/dev-util/maturin/maturin-1.6.0.ebuild
index 13a38fc10e8b..212a68c816c4 100644
--- a/dev-util/maturin/maturin-1.6.0.ebuild
+++ b/dev-util/maturin/maturin-1.6.0.ebuild
@@ -451,7 +451,7 @@ LICENSE+="
 	Unicode-DFS-2016
 " # crates
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc +ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index 0ea7c677da77..91ed22d1a6aa 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -1,7 +1,4 @@
-AUX rocminfo-5.1.3-detect-builtin-amdgpu.patch 1720 BLAKE2B 990b0bfd101fbe41e7dfda85f88d18763371f7c9cdc46ac10a5c695c45d8e29c08f1444b44524ba0917489b89d4906498c81e9e8d805f5ab9b98e2160a394799 SHA512 c193cc7f72df6cc8d5118f1f55ae184f8d80083aee255efb64762b4f0cc00f2c8973515617630dd8267dc1053cac4d1773683870563c29000eb4fd32a7f54e78
-AUX rocminfo-5.5.1-detect-builtin-amdgpu.patch 3763 BLAKE2B 8d37239cb8e9964bef2e22ea2e1ccfab53cd10247e4a04b4f7ec03c18fa3b1ad2b734169f277fad2cb8d951bee82d71f42ca97c3bd514edd44a65e78a0b82856 SHA512 5b9b4682ac1babe92ce5d86d9a2f2b62a556dbe804da53de2f34af36806b7ba8b53ba1d1eb0b2c446fb834bb91f46d06401f2f79e10f61f7b7b6cc1cf8846d25
 AUX rocminfo-6.0.0-detect-builtin-amdgpu.patch 1004 BLAKE2B b75f82db423455391951e6477e7b5a2e63f39f5e8b8eeb88e1ebd7047267defdfd806de7b3b6289106dd70472f63f121426b8528e62cb2ee79d743d66d60529b SHA512 22507911ca38b5147db58c020caf5859e6782211d363059c3e15334348950a921ee00110fa7e16ba9315625eced32b1191ce2f51eb0c97e5c59a9f6c83a541f5
-AUX rocminfo-6.0.0-python-3-12-support.patch 1333 BLAKE2B df3d2a7f338327ac3fbe08820fef1b2f40bdc14aca7091313eb354f2f2bc41373fb67b765554df6939ef5f32fb7fe3cd6c295b4e381917117074ce3f9066b44a SHA512 9bbec362a3c8435a58be53500048ebb0458bff46b3793b9b21019e8994528afd703431bf6ce189a045afdef3941b14d143b2bfb38e50a26f3be16a448c3f6fef
 AUX rocminfo-6.0.0_python-3.12.patch 3102 BLAKE2B b11743bceb52b280835eccfe23815541f702c205d62c8e08b1a2a72e5d68882f16689b517f8733738657cef7fab7c933886168d3c9260567400827409856cb06 SHA512 59cca81b13fb3a01a7fbb5e9abf838571cd2ce09ea14e5bb1a72447b6450681dfc58d79cc524e9ffca03c9f4f23fd0cc524bf272fffeb5bc3cd0d70d5358e207
 DIST rocminfo-5.7.1.tar.gz 17302 BLAKE2B 395c695ed0b79c771c4240310c457aec893ffd889ddd551866753d2a0c8d4e98399672d74a7114a89faf8b1960dd54fbb0425ea00f7d15e5c740e33ce4046d0b SHA512 38726bc52bd045b6281cccd702706fd6ea5b57cdc421ad23106d5447a002f4b530e8d4e4430d2bb8eb30803af3bacdaf34646a965cea26f42d726bf7f6aafbab
 DIST rocminfo-6.1.1.tar.gz 17740 BLAKE2B 6331054e1c8a59f2d4246c3fcb999afc28a8cabea9d5faf2b95d767f7153ab0930a633ee630cabc4472413a8a54fd9ef798516baa77e94aabda7687a36bf312f SHA512 d2982874ad09bfbe15418a88c2d3360f9bce262674d50f5858a08e52dd266e255f95116c85e069d7e8d28cb323164fb6999c5834163105f33e0c773aede4efdf
diff --git a/dev-util/rocminfo/files/rocminfo-5.1.3-detect-builtin-amdgpu.patch b/dev-util/rocminfo/files/rocminfo-5.1.3-detect-builtin-amdgpu.patch
deleted file mode 100644
index 5d0b2ed284bd..000000000000
--- a/dev-util/rocminfo/files/rocminfo-5.1.3-detect-builtin-amdgpu.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-/sys/module/amdgpu instead of lsmod for builtin amdgpu kernel module
-
-https://github.com/RadeonOpenCompute/rocminfo/pull/43
-https://github.com/RadeonOpenCompute/rocminfo/issues/42
-From ea4f017ed035928b1970e2589b02ec9b348c863e Mon Sep 17 00:00:00 2001
-From: YiyangWu <xgreenlandforwyy@gmail.com>
-Date: Wed, 18 Aug 2021 21:05:20 +0800
-Subject: [PATCH] Check /sys/module/amdgpu for ROCk instead of lsmod
-
-Closes: #42
-
-Signed-off-by: YiyangWu <xgreenlandforwyy@gmail.com>
----
- rocminfo.cc | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/rocminfo.cc b/rocminfo.cc
-index 871f406..58c847d 100755
---- a/rocminfo.cc
-+++ b/rocminfo.cc
-@@ -995,6 +995,8 @@ AcquireAndDisplayAgentInfo(hsa_agent_t agent, void* data) {
-   err = AcquireAgentInfo(agent, &agent_i);
-   RET_IF_HSA_ERR(err);
- 
-+  std::string ind(kIndentSize, ' ');
-+
-   printLabel("*******", true);
-   std::string agent_ind("Agent ");
-   agent_ind += std::to_string(*agent_number).c_str();
-@@ -1031,16 +1033,16 @@ AcquireAndDisplayAgentInfo(hsa_agent_t agent, void* data) {
- 
- int CheckInitialState(void) {
-   // Check kernel module for ROCk is loaded
--  FILE *fd = popen("lsmod | grep amdgpu", "r");
--  char buf[16];
--  if (fread (buf, 1, sizeof (buf), fd) == 0) {
-+  int module_dir;
-+  module_dir = open("/sys/module/amdgpu", O_DIRECTORY);
-+  if (module_dir < 0) {
-     printf("%sROCk module is NOT loaded, possibly no GPU devices%s\n",
-                                                           COL_RED, COL_RESET);
-     return -1;
-   } else {
-     printf("%sROCk module is loaded%s\n", COL_WHT, COL_RESET);
-+	close(module_dir);
-   }
--  pclose(fd);
- 
-   // Check if user belongs to the group for /dev/kfd (e.g. "video" or
-   // "render")
diff --git a/dev-util/rocminfo/files/rocminfo-5.5.1-detect-builtin-amdgpu.patch b/dev-util/rocminfo/files/rocminfo-5.5.1-detect-builtin-amdgpu.patch
deleted file mode 100644
index dd1aefe4df4f..000000000000
--- a/dev-util/rocminfo/files/rocminfo-5.5.1-detect-builtin-amdgpu.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 3a4d533a1e2a179ad873c480dc4a42ea23681263 Mon Sep 17 00:00:00 2001
-From: Mike Li <Tianxinmike.Li@amd.com>
-Date: Wed, 17 Aug 2022 11:44:09 -0400
-Subject: [PATCH 1/2] Check permission and handle PermissionError exception
-
-Signed-off-by: Mike Li <Tianxinmike.Li@amd.com>
-Change-Id: If7cb8464d0b761e4be45c85eb7147ceed609da61
----
- rocm_agent_enumerator | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/rocm_agent_enumerator b/rocm_agent_enumerator
-index 6264a5f..ceb9e11 100755
---- a/rocm_agent_enumerator
-+++ b/rocm_agent_enumerator
-@@ -195,10 +195,15 @@ def readFromKFD():
-       node_path = os.path.join(topology_dir, node)
-       if os.path.isdir(node_path):
-         prop_path = node_path + '/properties'
--        if os.path.isfile(prop_path):
-+        if os.path.isfile(prop_path) and os.access(prop_path, os.R_OK):
-           target_search_term = re.compile("gfx_target_version.+")
-           with open(prop_path) as f:
--            line = f.readline()
-+            try:
-+              line = f.readline()
-+            except PermissionError:
-+              # We may have a subsystem (e.g. scheduler) limiting device visibility which
-+              # could cause a permission error.
-+              line = ''
-             while line != '' :
-               search_result = target_search_term.search(line)
-               if search_result is not None:
-
-From 94b4b3f0a66eb70912177ca7076b4267f8b5449b Mon Sep 17 00:00:00 2001
-From: Johannes Dieterich <johannes.dieterich@amd.com>
-Date: Mon, 21 Nov 2022 18:09:55 +0000
-Subject: [PATCH 2/2] Fix rocminfo when run within docker environments
-
-Currently, rocminfo will fail when executed inside a docker container
-due to being unable to lsmod inside docker. This has impacts on
-rocprofiler use.
-
-Fix this behavior by querying initstate of the amdgpu module from
-/sys/module/amdgpu instead. If initstate is marked "live" everything if
-fine - error out with either "not loaded" (initstate file does not
-exist) or "not live" (initstate file does not contain "live" string).
-
-Change-Id: I6f2e9655942fd4cf840fd3f56b7d69e893fa84d7
----
- rocminfo.cc | 30 ++++++++++++++++++++++++------
- 1 file changed, 24 insertions(+), 6 deletions(-)
-
-diff --git a/rocminfo.cc b/rocminfo.cc
-index 0842d57..8ed9111 100755
---- a/rocminfo.cc
-+++ b/rocminfo.cc
-@@ -51,6 +51,7 @@
- #include <unistd.h>
- #include <pwd.h>
- 
-+#include <fstream>
- #include <vector>
- #include <string>
- #include <sstream>
-@@ -1039,16 +1040,33 @@ AcquireAndDisplayAgentInfo(hsa_agent_t agent, void* data) {
- 
- int CheckInitialState(void) {
-   // Check kernel module for ROCk is loaded
--  FILE *fd = popen("lsmod | grep amdgpu", "r");
--  char buf[16];
--  if (fread (buf, 1, sizeof (buf), fd) == 0) {
-+
-+  std::ifstream amdgpu_initstate("/sys/module/amdgpu/initstate");
-+  if (amdgpu_initstate){
-+    std::stringstream buffer;
-+    buffer << amdgpu_initstate.rdbuf();
-+    amdgpu_initstate.close();
-+
-+    std::string line;
-+    bool is_live = false;
-+    while (std::getline(buffer, line)){
-+      if (line.find( "live" ) != std::string::npos){
-+        is_live = true;
-+        break;
-+      }
-+    }
-+    if (is_live){
-+      printf("%sROCk module is loaded%s\n", COL_WHT, COL_RESET);
-+    } else {
-+      printf("%sROCk module is NOT live, possibly no GPU devices%s\n",
-+                                                          COL_RED, COL_RESET);
-+      return -1;
-+    }
-+  } else {
-     printf("%sROCk module is NOT loaded, possibly no GPU devices%s\n",
-                                                           COL_RED, COL_RESET);
-     return -1;
--  } else {
--    printf("%sROCk module is loaded%s\n", COL_WHT, COL_RESET);
-   }
--  pclose(fd);
- 
-   // Check if user belongs to the group for /dev/kfd (e.g. "video" or
-   // "render")
diff --git a/dev-util/rocminfo/files/rocminfo-6.0.0-python-3-12-support.patch b/dev-util/rocminfo/files/rocminfo-6.0.0-python-3-12-support.patch
deleted file mode 100644
index 2b14e42e4705..000000000000
--- a/dev-util/rocminfo/files/rocminfo-6.0.0-python-3-12-support.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Fix "SyntaxWarning: invalid escape sequence" SyntaxWarning in python 3.12+
-Bug: https://github.com/ROCm/rocminfo/issues/69
---- a/rocm_agent_enumerator
-+++ b/rocm_agent_enumerator
-@@ -92,7 +92,7 @@ def getGCNISA(line, match_from_beginning = False):
-    return result.group(0)
-  return None
- 
--@staticVars(search_name=re.compile("gfx[0-9a-fA-F]+(:[-+:\w]+)?"))
-+@staticVars(search_name=re.compile(r"gfx[0-9a-fA-F]+(:[-+:\w]+)?"))
- def getGCNArchName(line):
-  result = getGCNArchName.search_name.search(line)
- 
-@@ -149,9 +149,9 @@ def readFromROCMINFO(search_arch_name = False):
- 
-   # search AMDGCN gfx ISA
-   if search_arch_name is True:
--    line_search_term = re.compile("\A\s+Name:\s+(amdgcn-amd-amdhsa--gfx\d+)")
-+    line_search_term = re.compile(r"\A\s+Name:\s+(amdgcn-amd-amdhsa--gfx\d+)")
-   else:
--    line_search_term = re.compile("\A\s+Name:\s+(gfx\d+)")
-+    line_search_term = re.compile(r"\A\s+Name:\s+(gfx\d+)")
-   for line in rocminfo_output:
-     if line_search_term.match(line) is not None:
-       if search_arch_name is True:
-@@ -172,7 +172,7 @@ def readFromLSPCI():
-   except:
-     lspci_output = []
- 
--  target_search_term = re.compile("1002:\w+")
-+  target_search_term = re.compile(r"1002:\w+")
-   for line in lspci_output:
-     search_result = target_search_term.search(line)
-     if search_result is not None:
diff --git a/dev-util/ruff/Manifest b/dev-util/ruff/Manifest
index c14a7fdc798f..fb6ac1ce05ae 100644
--- a/dev-util/ruff/Manifest
+++ b/dev-util/ruff/Manifest
@@ -385,5 +385,5 @@ DIST zstd-0.11.2+zstd.1.5.2.crate 28987 BLAKE2B e04fe25ec6661819efeca08698c20792
 DIST zstd-safe-5.0.2+zstd.1.5.2.crate 17273 BLAKE2B 74dc561046f9bc595c58b62bc6ff291325bc23fd06a1249148426bb853271393eab5121d2e1e29e433eff562c9eab72c1be265f3fe3bf14cc35d4a741db03c38 SHA512 03a6f07ada211fd6c364f03d06acff705fa5b08129aa09c29ad310f05b233553f8ea697e504470d4c104bd947f5d4102328c4df0df5e1da6d8e537f51451a014
 DIST zstd-sys-2.0.11+zstd.1.5.6.crate 749078 BLAKE2B 6be19b2ea22e557a6b38bdb37c97817eb0a112fe9ad3626e822485a96f04087a79726b872d819ac05517dde56fb5eadd8f1e6885d356526c34635547bfe762d3 SHA512 37081282feffee1e78ddd8992ad5d8b2179ed7ec1be340d0cef0ce0aeea4aaa57850050f4b896d02875f0dec04ac1c20d9aa392f01b12e49ed885f4b8929f48d
 EBUILD ruff-0.4.10.ebuild 9807 BLAKE2B b35c1bfcc8167422ecfcce42d542e9211aeca501442eea3f15f49d5e47058971a4e534171bc3c930eb1ca38973d3b3ce9aa7cfd37317a3c2e82da7819d7519b3 SHA512 6b21705671ede294be09371016b637c5d2963446633e58a924f8ede2815e84600a5132094dd0b083123db4de99af1fa886feb7a7c1e5183bb742cc89ec29d148
-EBUILD ruff-0.5.0.ebuild 9094 BLAKE2B d7ef15d83fceeae60a4ff3f5a12785d7d1913b1ddb97a2b02d49806bb784923e9af059e88e495f2b24bfde075fcd81888346e6df8ae8295e886c94c6faf08c84 SHA512 9614ce20bd97d8f9550554dc31bf6dd04df20d614e074f388992ecd75da964a2a349218e3d7d06b47b334544910e17affc8a0a14527f455a0c6a3b82c9f07550
+EBUILD ruff-0.5.0.ebuild 9145 BLAKE2B b776169d7b3bc01c9e19f97246d22827ff9e55b891771c89a8403d8828e920a11e408ed446c17c26b99b8856162e5dcf8c7062b4fba9fdcabd66ae698d490697 SHA512 de1f258304e7f133a2e086fee4e3c06e07301f7485eefaa590788024f7dde82e00ff3c9bc999bca832f485ec467f684e705c1e0af54190e02c0eb5cf9702f520
 MISC metadata.xml 495 BLAKE2B 629658a629fa030e1a467db90939094be0ab13ff899206f79748ba9dae956abe3d907dd6f0f3eb266dc7381178419d625b550eaba1a23c03af5a00b855a5b637 SHA512 824799ae0854983d65e53ea68de0d411d20aac37a8a8c5b6b0e5252f3128a3e7301f0aa204d5435db7748c83ae8285a08ea385b22864ec479f07c33c6ece6f64
diff --git a/dev-util/ruff/ruff-0.5.0.ebuild b/dev-util/ruff/ruff-0.5.0.ebuild
index 125e0a1c2285..ecb139abcf40 100644
--- a/dev-util/ruff/ruff-0.5.0.ebuild
+++ b/dev-util/ruff/ruff-0.5.0.ebuild
@@ -403,6 +403,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	app-arch/zstd
 "
 
 QA_FLAGS_IGNORED="usr/bin/.*"
@@ -437,6 +438,7 @@ src_compile() {
 }
 
 src_test() {
+	local -x ZSTD_SYS_USE_PKG_CONFIG=1
 	# Gentoo bug #927338
 	if use !elibc_musl && use !elibc_Darwin && use !elibc_bionic; then
 		local -x CARGO_FEATURE_UNPREFIXED_MALLOC_ON_SUPPORTED_PLATFORMS=1
diff --git a/dev-util/yamllint/Manifest b/dev-util/yamllint/Manifest
index 7398790fbc84..071ea3833f33 100644
--- a/dev-util/yamllint/Manifest
+++ b/dev-util/yamllint/Manifest
@@ -1,7 +1,5 @@
 DIST yamllint-1.32.0.tar.gz 130041 BLAKE2B 68dc6fb6b0f030a32d824a09fcb122de6d0f86cfa2b1325161395c7f6277cb074fc2a4c282c56a0bfd598ddf3efd56f4c8dd497546ea75cce5bdb3c7aa5f7431 SHA512 8a7ecb22c5c6705fe85091923b0f1ef9c7df702ad35ffaeb5db94262c32a294c59c9d1a737d6ca280c16a054ad8d3f3210b31acdd69cc73d4fa259c9631cc322
-DIST yamllint-1.33.0.tar.gz 130357 BLAKE2B 9747c6327d5643c250f0824a5dde6290fc8e5ed08b0269e59387cefc7a9b1cf78343574c7ebdecfd0294275a0c837e4ef3e445cb5db7becd65120d3fe860e998 SHA512 99aa8f1a85da891d697c78f998af9bd656759fa218b7c058d6b990b01a6a939d78ecb2938ef5211700e5c5a1b0f884e77ba68510d9e790d7f77e3185e2f4fb52
 DIST yamllint-1.35.1.tar.gz 134583 BLAKE2B 8ab5a1c36aa40133be5f6527ab0c894027d35e608338fe603baf8be6e40de92de09be7558cbfa084be70755771b5b43d9b9765906509358f80578f0db3681be1 SHA512 c174b217da5b1efa56651a29fc92f91699c15d6c3c27f6cd4bd71ea8d55f59748b3006ed73678fa1b635b6d092230d8d5cd56b4bb63894931e7357a2c4f84a98
 EBUILD yamllint-1.32.0.ebuild 564 BLAKE2B d5aea01a12b8e42740ba41392d8e03db8dc7e745ccd0f37bf216ad048b932d00d19746c64a4f86ba26d3236539ba87c5f3020db5a699c485460c9316e0fa4f3c SHA512 714adb9ed88a9c863a8a1181391483c5afe984d9139876b14c2c38b2c2d85f562e13df61c2fda5cb176fa8e1b921d33875f7e8943f6c8a07ad9c6cc1c3217f27
-EBUILD yamllint-1.33.0-r1.ebuild 529 BLAKE2B 0f5f40063e18409a115f1108871dd3d4c0d47540ee281876227bd8ff161375e74835de69aec4e0ce8fc994ec3050314adb168638a97c2a2d69e428745b637d58 SHA512 dfa7028a2e0288dc212e90910d1628356bfb813507c71424d1bcad8a8c9d2c48b022f5c3a23a6ada93cd1cd9ba9b192c09921a5175867ce70505c44a619001c3
 EBUILD yamllint-1.35.1.ebuild 529 BLAKE2B 0f5f40063e18409a115f1108871dd3d4c0d47540ee281876227bd8ff161375e74835de69aec4e0ce8fc994ec3050314adb168638a97c2a2d69e428745b637d58 SHA512 dfa7028a2e0288dc212e90910d1628356bfb813507c71424d1bcad8a8c9d2c48b022f5c3a23a6ada93cd1cd9ba9b192c09921a5175867ce70505c44a619001c3
-MISC metadata.xml 323 BLAKE2B 822c7eb41241f479a9d0406ce60cac9843b1a173b01e1586d256d9afe08fec811baab2304127c8cb7627cef41dd9196a93b991da61f9f3b8d633d4a1d2568760 SHA512 0920a3d0736f0136b4615cfc817a5f373575fe96e65265b846947d5c71a66c6f76fb7fea86f884cfb68652194d86a7a88ee4ba7cab0d237c73d6abc33824029e
+MISC metadata.xml 384 BLAKE2B 8ed125600ffd42cc3e34562b0dc8f72c89e3b3671b77b297434d9be82764008771db124024457b160121a4edf350456161dd58bc2f753d1e54a6782d6bd49c77 SHA512 2979c8ab136f87e4b60377da50f03df3b6abd5454353bc9281c11577e2437190d373e0389b29a50945365922ee0c507a52277680e42cdc5a7fcd955a12827cba
diff --git a/dev-util/yamllint/metadata.xml b/dev-util/yamllint/metadata.xml
index ac42e9da5c46..b24f8c262600 100644
--- a/dev-util/yamllint/metadata.xml
+++ b/dev-util/yamllint/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">yamllint</remote-id>
-		<remote-id type="github">adrienverge/yamllint</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>graaff@gentoo.org</email>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="pypi">yamllint</remote-id>
+    <remote-id type="github">adrienverge/yamllint</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/yamllint/yamllint-1.33.0-r1.ebuild b/dev-util/yamllint/yamllint-1.33.0-r1.ebuild
deleted file mode 100644
index 04ad8f3bce38..000000000000
--- a/dev-util/yamllint/yamllint-1.33.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A linter for YAML files"
-HOMEPAGE="https://pypi.org/project/yamllint/ https://github.com/adrienverge/yamllint/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/pathspec-0.5.3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest