gentoo auto-resync : 27:06:2024 - 07:59:39

author: V3n3RiX <venerix@koprulu.sector> 2024-06-27 07:59:40 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2024-06-27 07:59:40 +0100
commit: d2ed973482fdd800013658e83a61709b29e0a80f (patch)
tree: 57ea7666a57b5a05a4c8866e4915e90b4a6e7c94 /dev-libs
parent: 9f6a82a85d400d6ae7de04c43cee88dbc6bc4da0 (diff)
69 files changed, 1484 insertions, 589 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 2dbb916ce830..971b52fa6580 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/cxxopts/Manifest b/dev-libs/cxxopts/Manifest
index b06d3a5bf227..133a971897a7 100644
--- a/dev-libs/cxxopts/Manifest
+++ b/dev-libs/cxxopts/Manifest
@@ -1,5 +1,5 @@
 DIST cxxopts-3.0.0.tar.gz 97020 BLAKE2B 129b055dd03ce9e4a146d36587063f7155b47456d81e395ae6eeab8012e8d6cfcb410c305353f2ac2ec66a2f3e8d6169e1a0d27c53dcb35388b967d3c9cc86f1 SHA512 239479a3b35ddef6fc380ac9371e1cf7e3aea066f03e1ea538151fa2fff4296838daa976d55e988d8f87f40c0ae027767bcb214754177499413af1081315565c
 DIST cxxopts-3.2.0.tar.gz 160534 BLAKE2B b6fead8930e83b4af089631e584bec0777da2e7b58aeb5e44b03a1655795dd3aff3923a245699e936bef7e0e871da2c86dd5639d44a839f1ac305a694e811feb SHA512 7265de66b92591255488d01bc26ca874423c75223e2e157a99f14fdd3e92e8d2669b72732acac3ce835190f1a09c13a994c480f0513f229eba8aa008e3d98955
-EBUILD cxxopts-3.0.0-r1.ebuild 809 BLAKE2B 5291c3ac55e5ac860b8e19d25db868437c0fd4d535d7825cdf5e142f484e0fdc44753ff120f5c8ff8d2f126ebe58e88d02013d6224cc8583621cebdad7195301 SHA512 194ff3f680004ef541a556843487b69886caffe0a2579257bbffe27c4cf8161cddb2bb4b48564b79c307c3726a971013ba559742695ac9e995a48c8e54de78f5
+EBUILD cxxopts-3.0.0-r1.ebuild 807 BLAKE2B 7c74339991bdadd2381aaa7021a2495c314306edbafba07d87e3276b65ae3921c67a9ea661afd4e35d2048b4a64c473f8ad158f4604ac05288601fdd96b7caa1 SHA512 343454fa9133e0fb11c59123c2824f2d5f72117d7a48c34b8333ea5f187a3b07d3f819f9e23c8cb8c3eccd04fba2242e44c73421501fa90b13ee07086ccd0b1b
 EBUILD cxxopts-3.2.0-r1.ebuild 806 BLAKE2B e5d51cd222768601d22986fec35febabfb735b103a9659dcad88cf6cbcc494e7b138b06d1ec0d305135e1d88246edf4a0a068f46cbdedd7b1aa374c6dc5f689a SHA512 d5c810a90c8f9849aa5970798ce449bdbdff68f63aa4a901b93b00600bbce1714ec37f5f5377191d79e4e3769941779a78ce0fa015f1f3d00d6c806042a51b5b
 MISC metadata.xml 332 BLAKE2B e47af6e92da0d3bccbcda0d260bd264ce18f6473bbb217009f37d783a6df95c43ab1d7d786e28fe9e22a2105bcaa2c1b0045cc0977f87e5ecd9abe89b5a2fc34 SHA512 bc33deaa248a2e0fe36a64c173ed808ab02e2b894897b74afc369be5e0bbc09e60da8e278bb78ee38c7a2e40b1c9caed4668b259ab31b9ecc988d95fe5e725ef
diff --git a/dev-libs/cxxopts/cxxopts-3.0.0-r1.ebuild b/dev-libs/cxxopts/cxxopts-3.0.0-r1.ebuild
index dfcdc30a3aac..c00948527a8b 100644
--- a/dev-libs/cxxopts/cxxopts-3.0.0-r1.ebuild
+++ b/dev-libs/cxxopts/cxxopts-3.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jarro2783/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
 IUSE="icu test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/half/Manifest b/dev-libs/half/Manifest
index c2ccd9098b0a..4a8a4a17a18a 100644
--- a/dev-libs/half/Manifest
+++ b/dev-libs/half/Manifest
@@ -1,3 +1,3 @@
 DIST half-1.12.0.tar.gz 108704 BLAKE2B f0084f380b10485b30da3ff38c5e3098044cc21fe00b084b2b9dd69b9a5c06b2ddedae1cefa61197d74a14552da2e5648db3e3108044b5fc5f7975fa1e10c6d4 SHA512 152f9c08a4493662aed96ddce5d45ece94836727766a66060640f8f1f43ee6ecdb174e7e17421ba83f2a01ba836bb1cba9fe60d83aea517f4772b9038173274b
-EBUILD half-1.12.0.ebuild 408 BLAKE2B 7fc14f4d670525c623c553df33ac5601e8856a0774038d6b01b35a2a98c8f6c7bf3ed007e3fd27ea1311eced1d038308b28fdf5c1b083eb33f125461739f06cf SHA512 a0cc47409428a44014412c242901b10242bf7797eec1ef2ff80429243f4270d9c9414664900c2b9c2a3f01222a76db0711af15ac34f4b2fc6ea7f4dca2d4de8b
-MISC metadata.xml 531 BLAKE2B d345c2e820c5e68b97f02466447c07b4acf27583437e0be4a963f451353be1fa0f74e9fdd48865899e7e9a1d727a7bf72fa325b4917a436aae9f9d5a24368c9b SHA512 ca50773676dae704acabbde3fe93c37390a3d0a4619382b38fa24a85bd76c3e359411b248fcf6c512fb38cb617a00a868772fc28750f95bc308b43ebdad44fb6
+EBUILD half-1.12.0-r1.ebuild 405 BLAKE2B 65d5dc58dd6d497ab6ac57f5699437c26ec4e9e4a0db138cfb46555ecc98303e2d47436ad515f2c73020f0dc138b70f86350cb6f959cacfa6dff3d4fe46b87db SHA512 4ce181805921c4525015e6aca7395c2185acbc78cf31432cffff9763d8e524105cdc5923612f70bf92f3dbfa7494ccd28849fb78dc9004d4434e7de6ad157588
+MISC metadata.xml 644 BLAKE2B 1b9ec536ba3d78644b7867edc8012e300a395e53ae5fcec6f340f5cd4028448ffb6d1bd71ab692b795bb741d881ce2e6212827174c3f9bb71eb5f7151fc3ee06 SHA512 97ce68025483dd7922b9297d5e7190d89d3f4ad4509f5d6d4a979883185c890d8440635990759c06c9867e54bebc6d93351d8499ab57cc5a3ec4f203de186299
diff --git a/dev-libs/half/half-1.12.0-r1.ebuild b/dev-libs/half/half-1.12.0-r1.ebuild
new file mode 100644
index 000000000000..ce8d4509174c
--- /dev/null
+++ b/dev-libs/half/half-1.12.0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Half-precision floating-point library"
+HOMEPAGE="https://github.com/ROCm/half"
+SRC_URI="https://github.com/ROCm/half/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64"
+
+src_install() {
+	insinto /usr/include/half
+	doins include/half.hpp
+}
diff --git a/dev-libs/half/half-1.12.0.ebuild b/dev-libs/half/half-1.12.0.ebuild
deleted file mode 100644
index ac2051bdc10b..000000000000
--- a/dev-libs/half/half-1.12.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Half-precision floating-point library"
-HOMEPAGE="http://half.sourceforge.net/"
-SRC_URI="https://github.com/ROCmSoftwarePlatform/half/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0/$(ver_cut 1)"
-
-src_install() {
-	cd include || die
-	doheader half.hpp
-}
diff --git a/dev-libs/half/metadata.xml b/dev-libs/half/metadata.xml
index b71bc2af0234..64e8126aa406 100644
--- a/dev-libs/half/metadata.xml
+++ b/dev-libs/half/metadata.xml
@@ -12,6 +12,10 @@
     <email>xgreenlandforwyy@gmail.com</email>
     <name>Yiyang Wu</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ROCm/half</remote-id>
   </upstream>
diff --git a/dev-libs/hipother/Manifest b/dev-libs/hipother/Manifest
new file mode 100644
index 000000000000..6a8285991c7c
--- /dev/null
+++ b/dev-libs/hipother/Manifest
@@ -0,0 +1,3 @@
+DIST hipother-6.1.1.tar.gz 33496 BLAKE2B 026967cb298a888df441d543d70478836036b81dc26c8284410076daf18eb28dc42f7d4b6aaf2bfaa8b6c957ada8244afc0e7c40882c0370bc2b6a0ae94ffaf8 SHA512 ca4d5df9e3138e845be051aace8fb02d84b879439e6bc9ca1551853f80f54b554b9cad1a91c6c114160b21d3ca62fa47a88e32efe60c0f475ff8b56f7f18b5d4
+EBUILD hipother-6.1.1.ebuild 495 BLAKE2B 2131b211dca3d8f641f53046c0277401bcc36cdb14188601fc1f679857c99f1c7db0800a3b6887bb0f04ea9028b919e3adc8e90c085512366944009b8f62d76a SHA512 9caed4e1aa97ea5ffebe59afc8a66437f880b4edf6d6454380b5dd8e8e960d26579bb1646c5b28bc7951c83338a036ce89dcc7c9853e19f062fa6f6438a8e9fb
+MISC metadata.xml 415 BLAKE2B 20cf4a7c600ec912dbc5e93a8908f17cb463c3ab4d661023ff6b771f6d97308b075b5bd52e4bdf9d4ed7fb6c1d570c59decc410dba3310ce78f623c5938f5174 SHA512 6020bf53a35b25587f80d0aa10f4d2c047c13726171b570efd56e282387adfd84443fd5e565603fa96e0c64a965151a4afcdeb19c3903b4ec3949739a4c887e7
diff --git a/dev-libs/hipother/hipother-6.1.1.ebuild b/dev-libs/hipother/hipother-6.1.1.ebuild
new file mode 100644
index 000000000000..d842c224a91d
--- /dev/null
+++ b/dev-libs/hipother/hipother-6.1.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="ROCclr runtime implementation for non-AMD HIP platforms, like NVIDIA"
+HOMEPAGE="https://github.com/ROCm/hipother"
+SRC_URI="https://github.com/ROCm/hipother/archive/refs/tags/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/hipother-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+src_install() {
+	insinto /usr/include
+	doins -r hipnv/include/hip
+}
diff --git a/dev-libs/hipother/metadata.xml b/dev-libs/hipother/metadata.xml
new file mode 100644
index 000000000000..9d92b0b0e73f
--- /dev/null
+++ b/dev-libs/hipother/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCm/hipother</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 604b6fbb2433..dd63ec8403c9 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -4,20 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659
 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447
 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
-DIST llvm-project-18.1.7.src.tar.xz 132063384 BLAKE2B b8c37bd131fb5f3131bfab4fbad7aa811079ca10723faa14779253bc62b1ee08d4e04650e1da883297ed88a62d518b868a1f13cf57d03233254fd01209da5c02 SHA512 0f67818267803aca9d2bc9eb89335ee6dc56269e8066a0f8a48c4a959e8805dbf6bc839b9f96a92f86ee50d72e7cc326ffe18febb5eb06751ab54a217c0221c8
-DIST llvm-project-18.1.7.src.tar.xz.sig 566 BLAKE2B 9ae6d80eba5309ce3d5cba580df57c28dbcf429266b2ced622465e34ab2a7ae0f100d1e89c73a44abccd95a3367979344450fd53fb6a2baa029b929d3f13eee3 SHA512 7e5601e35f4fcaa4ed042638ae5a4fb90714c9dce58aa3f98e965568660b88294185621a4eb5547de262dca8a96f620db3f94932bb1776661e345dbe1266315c
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
 DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
-DIST llvm-project-5aabbf0602c48b67bb89fd37f95bf97c95ded488.tar.gz 212582616 BLAKE2B 78522148bb4993bd26b16f1e3f44c2baf617705667c7fb104edc844c4330017166c783adae2f0215ca7463c05d1eef30fdf02b13241a9497aaede36bb8580a26 SHA512 104e0b5b4f34102f2da03cd54fe9bf5f7fb6efb3a9745d8ec85caa5f92189fde4a5c02c327243d87ff5c7d24b3790fcabdf0ef7144e79e15765785ca72dd3841
-DIST llvm-project-cddb9ce04e68d876de895d39d60b6af34d569012.tar.gz 213219536 BLAKE2B 5aba2c1dd19d73a8691590873f1697fa32adeab7f84d1d5636e211071e64bfa5d28a49ea9cfdba5fbae77c9520c2103a9f1544d669c7948a318636557f45f6ee SHA512 69ed25a0565c61cd4eb512e95b0fd2d2a3a09dbad73e7186d7fb1764193b06e522572eafb271d21469a4bfb133a62efe65e5ccd20cf05af8b43c52e195d477a9
 EBUILD libclc-15.0.7.ebuild 1668 BLAKE2B ac2bd589fb3c29662799f97b1f649fd22b1b7ce5701879815bc01a05ae88421a830a6a3507b4dead181f24eb4e45c451e8ea1ebbdac2a2de51ddbc3cd9f53c66 SHA512 a3e39fbaddb322360f6362ef21713f375d04e02b2b9a3d43a3d47b26d5d43643a8c654181aef9518aee5f9805d09c446bbbf13342b74f09622e5e1b0c59470b1
 EBUILD libclc-16.0.6.ebuild 1665 BLAKE2B 27ffe7083936c466a749550797d109c7a48fc6aaf110977c53ae2d4c5edd558c958a4981020b2c74c6b0c47aeee184edc6e1f192da93f57972fe9cc9abfaa762 SHA512 5007264c688588ec9fd7e74e88a1c1810be2602b744a64d8927275bc8ceaf278d9598222c5d2e3d3fa64504364625b03951752ef7221fd1bf16cc26fbd54ad80
 EBUILD libclc-17.0.6.ebuild 1749 BLAKE2B 0b083103fc48654357f621bd3c40002fe9030598a4873519b186b601cd75cc1555a3930f26fe884c1970ddf5728c9a7dffc08e97ebdb151e55b80b204d327a4e SHA512 2509e6ff63a86ba1ceef095fab34b49642b7e6866111c289c124bb7ef9d4bad8f07c4927b45994555386536975c8a4c56401860dca25f2ef2014d9153abb4c8f
-EBUILD libclc-18.1.7.ebuild 1305 BLAKE2B 1fbb9db126a81d0cea598e600f7d29fd6a717fed77b09d10a475930e59717f36368588db190e1d56f33c81e7e4336b58725e9da910ef4c51c5f39a7d34bc0a90 SHA512 a90b45f9d8a039781f4d740dc8f6c3bc55187d97e59a97121101a7456a152cc287990207b1b3e690f1009cff65becb12348a0b2d36a33a981a72ad63cf64a217
 EBUILD libclc-18.1.8.ebuild 1305 BLAKE2B 1fbb9db126a81d0cea598e600f7d29fd6a717fed77b09d10a475930e59717f36368588db190e1d56f33c81e7e4336b58725e9da910ef4c51c5f39a7d34bc0a90 SHA512 a90b45f9d8a039781f4d740dc8f6c3bc55187d97e59a97121101a7456a152cc287990207b1b3e690f1009cff65becb12348a0b2d36a33a981a72ad63cf64a217
 EBUILD libclc-19.0.0.9999.ebuild 1268 BLAKE2B bcf40564f542b2f2c4eaf493e74226472d1a3d151293a1c09ab4940aa7296018eb237e6254d545a850b2e3ad2f1b0a838dc3f04114c13bb947a8d33cdcba8ee3 SHA512 5bcb5ca819b48dc4b24d5ff0689a19c1d897a560fa89fd761d19cca65e46d185d51ec2745f5091fa9383974e0506fe303d6bdc95327a3be154192d580f92c431
-EBUILD libclc-19.0.0_pre20240608.ebuild 1268 BLAKE2B bcf40564f542b2f2c4eaf493e74226472d1a3d151293a1c09ab4940aa7296018eb237e6254d545a850b2e3ad2f1b0a838dc3f04114c13bb947a8d33cdcba8ee3 SHA512 5bcb5ca819b48dc4b24d5ff0689a19c1d897a560fa89fd761d19cca65e46d185d51ec2745f5091fa9383974e0506fe303d6bdc95327a3be154192d580f92c431
-EBUILD libclc-19.0.0_pre20240615.ebuild 1268 BLAKE2B bcf40564f542b2f2c4eaf493e74226472d1a3d151293a1c09ab4940aa7296018eb237e6254d545a850b2e3ad2f1b0a838dc3f04114c13bb947a8d33cdcba8ee3 SHA512 5bcb5ca819b48dc4b24d5ff0689a19c1d897a560fa89fd761d19cca65e46d185d51ec2745f5091fa9383974e0506fe303d6bdc95327a3be154192d580f92c431
 EBUILD libclc-19.0.0_pre20240623.ebuild 1268 BLAKE2B bcf40564f542b2f2c4eaf493e74226472d1a3d151293a1c09ab4940aa7296018eb237e6254d545a850b2e3ad2f1b0a838dc3f04114c13bb947a8d33cdcba8ee3 SHA512 5bcb5ca819b48dc4b24d5ff0689a19c1d897a560fa89fd761d19cca65e46d185d51ec2745f5091fa9383974e0506fe303d6bdc95327a3be154192d580f92c431
 MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5
diff --git a/dev-libs/libclc/libclc-18.1.7.ebuild b/dev-libs/libclc/libclc-18.1.7.ebuild
deleted file mode 100644
index 369d04fb2877..000000000000
--- a/dev-libs/libclc/libclc-18.1.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {17..18} )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake llvm.org llvm-r1 python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
-	')
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libclc/libclc-19.0.0_pre20240608.ebuild b/dev-libs/libclc/libclc-19.0.0_pre20240608.ebuild
deleted file mode 100644
index 2b8c5e63c257..000000000000
--- a/dev-libs/libclc/libclc-19.0.0_pre20240608.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {17..18} )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake llvm.org llvm-r1 python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
-	')
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libclc/libclc-19.0.0_pre20240615.ebuild b/dev-libs/libclc/libclc-19.0.0_pre20240615.ebuild
deleted file mode 100644
index 2b8c5e63c257..000000000000
--- a/dev-libs/libclc/libclc-19.0.0_pre20240615.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {17..18} )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake llvm.org llvm-r1 python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		spirv? ( dev-util/spirv-llvm-translator:${LLVM_SLOT} )
-	')
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-pkg_setup() {
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
index 1c16ead6b63f..bf5a6f7fd9a4 100644
--- a/dev-libs/rccl/Manifest
+++ b/dev-libs/rccl/Manifest
@@ -1,8 +1,11 @@
 AUX rccl-5.0.2-change_install_location.patch 936 BLAKE2B bd9feabfdeb0e6098e25baca8dd20a512b8761ab6d5b7ee4e723c268dec9b7200d125d4cb36fe540aedca396da51c094123f778d695f644788804e2f890d0697 SHA512 0fb0fadef6137d1a60dff8ae7e44df5a0769ea7142e182b86d2e4acee5a76397424b67ee73f25697494ad5d6e6ef60b71e889208775e6abf6f05f1c0d1b4b2b0
 AUX rccl-5.1.3-remove-chrpath.patch 1852 BLAKE2B 255a295ffe34301c3926fbff412bef9ef7e6625a69a7e3dba2e3c7cc281640f3e4bc30dbaa25c916edf71f6b23e801e9f56a6c06cdb9221f470881a9d1291793 SHA512 05fc9c20c76195f45daba5c4a3612a6d2572ba1ae0028a0710c8c92e55f7c70b03ab7722363942d05d8e3c89a40edaa0364c0aff64f9d712e0739954650a6bae
 AUX rccl-5.7.1-remove-chrpath.patch 592 BLAKE2B 8510698259154be9138c136c87c3650276140ac500a235049cdd1f8ea9dcc969ac6cd16b13ce628c448f1d5aa8c49818c455e761e96c24a0abc3aa0d3d431320 SHA512 7df69e5293edb3021f57caf9fa6ec12fd3c6a2841f62de4d6358092ec8f5c11f18d2f6434704e64c225327b3a55a4e64710cb07a82ebee103e4faa3865baa72d
+AUX rccl-6.0.2-fix-version-check.patch 552 BLAKE2B fb1230b262a959c783e6f796e83621c3b32f69cc81ab94c07a9596a8fa37bf2d496aebfe4bec97adf2873d3dc946e690d64f51b4d578528470436b9949cfa432 SHA512 efd6343ffd9b5dee9152787f993621e7bbd5a6d46d4b33d1c0c47ded4fd1a5da9dc753c956c646f48bde5dd6b61876a633d89810ba33861734ec2b2c0040d0ec
 DIST rccl-5.1.3.tar.gz 908274 BLAKE2B 46bff7b6e3d60d5884ccd7e19c54b2f47f90a337a8fdc6dca1a3cfee147e3652e1f912642cc134d4a82bf8daabd9f1391edff139d0517ab1078bd3d9650481d7 SHA512 20deb27c7ef3e6b6b73409950ac0d51286b4634f7002ce36a9a02cdd1d5b1f2db51f6decf773af83364c94f58cc96837da25299f5f5494fc15d8559a1b3c7fcc
 DIST rccl-5.7.1.tar.gz 1425561 BLAKE2B 852c111ad806d5c99f48b3c65c8cf37315c68b969f9544bfa14c1faf1d5557edcc57cdc21705ced6ded4a0288d42b1076e65fb67b3f89b4fa78cfba9d317b23e SHA512 5913b8ff67fa787714713b7d5b571374898be740d56c77db9f04fe7a3e6ca74023fa930a3494d8a6f984ac9e68ee318343835e110049d08700fe773376618af4
+DIST rccl-6.1.1.tar.gz 1679144 BLAKE2B 371d64691dc74f875c49e14df8f3f2d8b9c607376e6c5a889bd2bdb50607e88715d6d75ffed4ba3184a5b9b241cb37b8501e927a5f495632212909e410102490 SHA512 6c6376dd822182bcf28f573c0f3b5c7e52f94f4b670ee7c88519232f51b443d52cd37cbe6c41b5b6e9cb0b93c1124246a989f6e6a2ae74935134135585118002
 EBUILD rccl-5.1.3.ebuild 1091 BLAKE2B 0506cc6607a280c97d934ba9037289f8c06678efe6bd4f5c0501d855b1e765181c1273e4918cfed72a19e235ad5b182eb901eb97401419d57319282ef4134e07 SHA512 c3be588fe12ef890fd74ee6bd6a09ba1f0b461a7daef14efa9ebabdcea7f1b9a3bb1389e3eed8856c231b0bf05674939f952ebcd0f522fcbe6284d4aa2e8f583
-EBUILD rccl-5.7.1.ebuild 1810 BLAKE2B 8f08a567c56700655ea81daafeccee8a26ba708868365555b2418bce01055fdceb621edc67ba33dcc7565fba35c4057c86e1edf978f2bae66d4e508d95ffc1b1 SHA512 754c0a63fec1d87d50f499cc0ae18b32165572a694e7318203887648ce8e4baf9c4ada4a05c9ed9eaa87f8d159ebf27d4e9da51bbacac188fd7f6cd52b06e68d
-MISC metadata.xml 598 BLAKE2B bda73827e412b7addb0788cb2bd769138f8872f9be48abc482a455dd88de8bcccce6687041e15d27d79301459cb8455c773447d6cab64fef97ccdaa60c929c90 SHA512 66d6c53cb8f15c595d3c3a2de8eece79460cf0f4c0f5c0a082539a409aadd17f05f5b5561c7d65864db60b56117270c2c36e1ad547a91495f6628bf04f78d015
+EBUILD rccl-5.7.1.ebuild 1836 BLAKE2B 3286a92c9d08f9e0baac3ad3fbf0a9782109788b999bab8ac4864fa0ab47a6fcd53a73eee2d34a7cb5400998e60f246ec64df6f4a3f8bb07c38405e7f0b4417b SHA512 dd4dfeecdd908eeddba9d0450eba831ccc4778accbcab6023d4d47bac218d2e5d92a967744796b7c8854a579c5df16d8253795dd294183b2054dcf725a0372ae
+EBUILD rccl-6.1.1.ebuild 1605 BLAKE2B c819ea45053d9a2a46396b2c280e24620947addb1a3074c63c364c3b3669cdfd7d7995a7cf401eda8b3d296fa4529cf0a1b367ff58d24eae2746424f4cd4e209 SHA512 9238cf17ea6c21de22babd70d9639fdc20b4446cb3d5f6faf8dd6795cd5b0ef37db92b7e300df9977c788355ba8a9a603bf12db7fb8a476065559fa5074fb800
+MISC metadata.xml 695 BLAKE2B 7d52b2606665aebfade0d15c339f04fe9ac743d1ef402437adefa6a1ab710ae8e0367172cfa3bae8876609d40d26356cc9a93f555fd28f887cff957e38192416 SHA512 6b1d2a88fb7f88bc2bd1fd7126ba33a7d63b6e323cf43072a6c56fad3a5b8cde4262bc7ed7c9485a650544d562377b146d52088e2ecdd8c0e65d0b91addea57c
diff --git a/dev-libs/rccl/files/rccl-6.0.2-fix-version-check.patch b/dev-libs/rccl/files/rccl-6.0.2-fix-version-check.patch
new file mode 100644
index 000000000000..feff936129a2
--- /dev/null
+++ b/dev-libs/rccl/files/rccl-6.0.2-fix-version-check.patch
@@ -0,0 +1,15 @@
+There is no /usr/.info/version file in Gentoo
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -120,10 +120,7 @@ execute_process(
+ message(STATUS "hipcc version:    ${hipcc_version_string}")
+ 
+ ## Check for ROCm version
+-execute_process(
+-  COMMAND         bash "-c" "cat ${ROCM_PATH}/.info/version"
+-  OUTPUT_VARIABLE rocm_version_string
+-)
++set(rocm_version_string "@rocm_version@")
+ string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" rocm_version_matches ${rocm_version_string})
+ if (rocm_version_matches)
+     set(ROCM_MAJOR_VERSION ${CMAKE_MATCH_1})
diff --git a/dev-libs/rccl/metadata.xml b/dev-libs/rccl/metadata.xml
index 70bb629584c9..6ce4f3700a3d 100644
--- a/dev-libs/rccl/metadata.xml
+++ b/dev-libs/rccl/metadata.xml
@@ -13,7 +13,11 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCm-Developer-Tools/rccl</remote-id>
+    <remote-id type="github">ROCm/rccl</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-libs/rccl/rccl-5.7.1.ebuild b/dev-libs/rccl/rccl-5.7.1.ebuild
index 1ebf9619a55b..846a21c20ca0 100644
--- a/dev-libs/rccl/rccl-5.7.1.ebuild
+++ b/dev-libs/rccl/rccl-5.7.1.ebuild
@@ -66,7 +66,8 @@ src_configure() {
 }
 
 src_test() {
-	CHECK_AMDGPU
+	check_amdgpu
+	cd "${BUILD_DIR}" || die
 	LD_LIBRARY_PATH="${BUILD_DIR}" edob test/rccl-UnitTests
 }
 
diff --git a/dev-libs/rccl/rccl-6.1.1.ebuild b/dev-libs/rccl/rccl-6.1.1.ebuild
new file mode 100644
index 000000000000..35783657a50d
--- /dev/null
+++ b/dev-libs/rccl/rccl-6.1.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake edo rocm flag-o-matic
+
+DESCRIPTION="ROCm Communication Collectives Library (RCCL)"
+HOMEPAGE="https://github.com/ROCm/rccl"
+SRC_URI="https://github.com/ROCm/rccl/archive/rocm-${PV}.tar.gz -> rccl-${PV}.tar.gz"
+S="${WORKDIR}/rccl-rocm-${PV}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	=dev-util/hip-6*
+	dev-util/rocm-smi:${SLOT}"
+DEPEND="${RDEPEND}
+	sys-libs/binutils-libs"
+BDEPEND="
+	>=dev-build/cmake-3.22
+	>=dev-build/rocm-cmake-5.7.1
+	dev-util/hipify-clang:${SLOT}
+	test? ( dev-cpp/gtest )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.0.2-fix-version-check.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# https://reviews.llvm.org/D69582 - clang does not support parallel jobs
+	sed 's/-parallel-jobs=[0-9][0-9]//g' -i CMakeLists.txt || die
+
+	# https://github.com/ROCm/rccl/issues/958 - fix AMDGPU_TARGETS
+	sed '/set(AMDGPU_TARGETS/s/ FORCE//' -i CMakeLists.txt || die
+
+	# complete fix-version-check patch
+	sed "s/@rocm_version@/${PV}/" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	# https://github.com/llvm/llvm-project/issues/71711 - fix issue of clang
+	append-ldflags -Wl,-z,noexecstack
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_TESTS=$(usex test ON OFF)
+		-DROCM_SYMLINK_LIBS=OFF
+		-Wno-dev
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}" || die
+	LD_LIBRARY_PATH="${BUILD_DIR}" edob test/rccl-UnitTests
+}
diff --git a/dev-libs/rocdbgapi/Manifest b/dev-libs/rocdbgapi/Manifest
new file mode 100644
index 000000000000..f884c00ddde6
--- /dev/null
+++ b/dev-libs/rocdbgapi/Manifest
@@ -0,0 +1,5 @@
+DIST rocdbgapi-5.7.1.tar.gz 251913 BLAKE2B 96dc859937fdde75a3d68368b29efdd14711e256c7d3c60cd40b128e9a0c066f108c02f7d47d9d64d7ca485e85e9d56d48cac6c67088fc3fbafe44d1d23a7ce2 SHA512 e30cf6062b07ced7de1660398cd84d104e632907cfaf9bc05d29289a81a977c2272b69ff0810db201675f9d7e8476b4451c988ad9da0a13eee01fffdde839d26
+DIST rocdbgapi-6.1.1.tar.gz 254274 BLAKE2B 1621dc715e2540578126ff2fa6dc30dc9db711689e82b5c750dd203aafa091c00f897425a372d4617bec25eddb7b9a44105e8c9b46eb660e197602ede2beecba SHA512 d613e633e27ad9f582b9612d7d088c3ea465c29d6520e94b4821e0340c736e556dcd4a89f8027701097ee4e2d8b55640a232d484f9fa26f8a9165c648f8af219
+EBUILD rocdbgapi-5.7.1.ebuild 1198 BLAKE2B 228aab82524870227733d7aeb6428de6d97974ce35ba94026766413dae743a80837fddac66984f21d36fd3dc35ed592eb44d41ad3e47ea809b0bc88604fb4a74 SHA512 6f8871f8dfced05905b9e9acc84fcf0bdb9ccc4cae9c96c61aedbf7818b4943fe94696f96ba8dba99f00e24986d1fbef923b2fd7b9744f6e890eace7a659b118
+EBUILD rocdbgapi-6.1.1.ebuild 1325 BLAKE2B b9c0086ce53a33a0280195fcbebe6bd9f030bd9390f73e4dc215bd7013c29985df13a268241da1db239262c102c4ccd32fc4de43b4d96bfe26b5e96fd5aa058c SHA512 fa6a2476f939534ed7ef4862c13e2d87967902822cd666c52c54e582d050af3a0eb3311f3888649abbdddc562698996dee4e534761cc1ccbbf83023ff1c9d81f
+MISC metadata.xml 499 BLAKE2B bf9cb4f91d5c6160bce2f5df41177fc18b153cd8c8c6a13384c68fddb4a9a6011eb0d40339af7f1d9c01200af57ee431d9193f68ed9724549445ec908ff07796 SHA512 7ed8d2bcb55b46e57cdbea6c4e6242ab5f660c7b1537c9ddfeb0c426495bc4c5e7e78b54bf66940d582c42913a1b3d36c5fc821abd7da666c782c141c001b355
diff --git a/dev-libs/rocdbgapi/metadata.xml b/dev-libs/rocdbgapi/metadata.xml
new file mode 100644
index 000000000000..696fb60c236e
--- /dev/null
+++ b/dev-libs/rocdbgapi/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+      <email>lockalsash@gmail.com</email>
+      <name>Sv. Lockal</name>
+    </maintainer>
+    <maintainer type="project" proxied="proxy">
+      <email>proxy-maint@gentoo.org</email>
+      <name>Proxy Maintainers</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">ROCm/ROCdbgapi</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/dev-libs/rocdbgapi/rocdbgapi-5.7.1.ebuild b/dev-libs/rocdbgapi/rocdbgapi-5.7.1.ebuild
new file mode 100644
index 000000000000..3573342f8b6f
--- /dev/null
+++ b/dev-libs/rocdbgapi/rocdbgapi-5.7.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="AMD Debugger API"
+HOMEPAGE="https://github.com/ROCm/ROCdbgapi"
+SRC_URI="https://github.com/ROCm/ROCdbgapi/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		app-text/doxygen[dot]
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-plaingeneric
+	)
+"
+RDEPEND="
+	dev-libs/rocm-comgr:${SLOT}
+	dev-libs/rocr-runtime:${SLOT}
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/ROCdbgapi-rocm-${PV}"
+
+src_prepare() {
+	sed -e "s/-Werror//" \
+		-e "s/if(DOXYGEN_FOUND)/if(WITH_DOCS AND DOXYGEN_FOUND)/" \
+		-e "s:\${CMAKE_INSTALL_DATADIR}/html/amd-dbgapi:\${CMAKE_INSTALL_DOCDIR}/html:" \
+		-i CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_DOCS=$(usex doc ON OFF)
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove unneeded copy
+	rm -r "${ED}/usr/share/doc/${PF}-asan" || die
+}
diff --git a/dev-libs/rocdbgapi/rocdbgapi-6.1.1.ebuild b/dev-libs/rocdbgapi/rocdbgapi-6.1.1.ebuild
new file mode 100644
index 000000000000..eff59469418f
--- /dev/null
+++ b/dev-libs/rocdbgapi/rocdbgapi-6.1.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="AMD Debugger API"
+HOMEPAGE="https://github.com/ROCm/ROCdbgapi"
+SRC_URI="https://github.com/ROCm/ROCdbgapi/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/ROCdbgapi-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		app-text/doxygen[dot]
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-plaingeneric
+	)
+"
+RDEPEND="
+	dev-libs/rocm-comgr:${SLOT}
+	dev-libs/rocr-runtime:${SLOT}
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "s/-Werror//" \
+		-e "s/if(DOXYGEN_FOUND)/if(WITH_DOCS AND DOXYGEN_FOUND)/" \
+		-e "s:\${CMAKE_INSTALL_DATADIR}/html/amd-dbgapi:\${CMAKE_INSTALL_DOCDIR}/html:" \
+		-i CMakeLists.txt || die
+
+	# Clang 19 detects error
+	# https://github.com/ROCm/ROCdbgapi/issues/12
+	sed -e "s/->n_next/->m_next/g" -i src/utils.h || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_DOCS=$(usex doc ON OFF)
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove unneeded copy
+	rm -r "${ED}/usr/share/doc/${PF}-asan" || die
+}
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index 78045596bbf7..5792dd8a6a5b 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -26,16 +26,21 @@ AUX rocm-comgr-5.7.0-symbolizer.patch 1503 BLAKE2B fa8071ad2bbcd0ab4e6f05260617c
 AUX rocm-comgr-5.7.1-correct-license-install-dir.patch 549 BLAKE2B c45452d4af4718aca315862064596347f5caa9301a02fb14228daa72fee70d7452d3f24ee7dfc9247433388655ec7cccf3168eeea17ce425bd2090230e57e451 SHA512 8a49aec20da6c35989fbafc985b9c3bc21f20b711e2bd6921b67542f83cf07557afffefc9dafa860eefea5db17203d7a064755059e6e16d2c083b09ef01e9a22
 AUX rocm-comgr-5.7.1-fix-tests-rocm-path.patch 651 BLAKE2B bddf164466fcd2d9066f9dba6cd557b6afa4023af60b21e0fa15729fae193b78f4632f5bb3fd7cdfa05a97b0179d63cd2d1baad00858da3a90ec76a7c0d65a88 SHA512 29a4b9bde355b2c8e776a2e11515576da28ca7895c2ca910482a758cba1b80fa034fb6a6d729d1730f8658e1c01ba8fe39dac88f190edcd7733969f6f85b5456
 AUX rocm-comgr-5.7.1-fix-tests.patch 1733 BLAKE2B 0b92d01929fd0376ef33dfca3dd2e43956a3652c9c653b3e30ddb3d7487caf8858367447270328c2ff6d9963d786c8ae50cc21efc90e9a9594bb9f50ecec5667 SHA512 181074ecd0a76f6dfabf476bbe98e399caec4e8b3dd04b01318dbfa34253ee5c27f28296f1f07801960b5b3abab1d07dac18e8e61d1e30971520c7df77364607
+AUX rocm-comgr-6.0.0-extend-isa-compatibility-check.patch 6555 BLAKE2B 5ef7b96754749b0dd0d1b18dbdc3377d51e87dde560d4c4ba2f9f521b62a46de4c8329c8a40316efa59d66c916872308504e5bc82d322de399438442016af392 SHA512 736365c111853d28e8d3277946abf50d97b76900f833d2d66e36830d57d6cfb3346d628a6ed5c21d560ca992f716d3fe38b72eef0f53f30c162dc3fa95985fec
+AUX rocm-comgr-6.1.0-dont-add-nogpulib.patch 1020 BLAKE2B e99408ab32428b7a320d10f3431f8328865c345366610f2e76588ed04cab088702fa0cd4dcdb5ac5c608d50d1c8d1ffafe93e415c0c7a23c3f63254a2952672d SHA512 b5d42c366b1efefe264ee4ce4b20b925a82131f2e7ca57c736f868fdf823d2d93f0d69381c5258faee668f5e12c7ef0e6a6781972b876a303b825c32953459b9
+AUX rocm-comgr-6.1.0-enforce-oop-compiler.patch 996 BLAKE2B c4c0bfe9bf55f2f4e8661f01ed1b2ec03f4c07691facad063cc03bda2599fcc94648549a829694b7e5f6d4b82d42f7c92e1ce8cea9e934f37b62f7beda4dd48f SHA512 97f850115b8cdd2c5a2091ca26cc40b9e13cfa86a7980f7730c55932b6db254580f86f267ce7a2b3af739210db55faa29e06e57bdbc11eaa9cfa08d3e4929ea9
+AUX rocm-comgr-6.1.0-fix-comgr-default-flags.patch 1967 BLAKE2B c71628e83827738d2458a69a27fb44fbcba44ca6633e9a6856406627b0b4451b996876cc8e86c46382f40006efe472488d2b81ed3571d48e18505eb4fe9b673a SHA512 c85715e427a10f92eb91d6cdb7bd4b455371694b1a87429978e82b9f5127e37710558795541a616395e29735ac57325f3c094ba8c40badb6612aea6865ac4ffa
+AUX rocm-comgr-6.1.0-llvm-18-compat.patch 2990 BLAKE2B cf3c2ca3933ad714de6d98404a9d97bcca98ba7536228ad7e1396c0e4a8cc6b88b7bba12857e599f96d9fde3d37033a9a9c7c123c230d4af3b5d942206af0941 SHA512 f36e2d6b16f78e93a8291f914d122dfd917aeb0d09e1545f44cb16ab0f064710d450b4e7aa24b6b2ee374c29821d464f878efcc1660e00456118c839e89b31a0
+DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B 3ef0b6e3c47c66fd80289373e6ff8aaff44751f9b380addfae73a18dc388093c0535f230b0cc7528724bc43f6992e2ae6decd3d0d3c700893ca95a6166b7b8dc SHA512 e320d4eeaa6f61ed1cdbf653d67fe887d3ce9dc0d6743b4713502e1cb5318ab8afbe1ee71f8cba07635c54ce532df6683de40ade0e5be4a52e50ce25a9b70818
 DIST rocm-comgr-5.1.3.tar.gz 117155 BLAKE2B 40e415c4c7ae3e709dd50981299291f0fc1133f35310b4c86a86847d3bce5fd7685a3f4480f8f156873ca922921c1d4e1cb620fd33bd5cdc87f155af839f2bbe SHA512 5927250f5e03c32b7f270a1dbfe5221d349dfe32aba34143040da53d4e7eb83faa3073a43edabcff13e1fc977bc17088404523f2ab2ea95e207d2c00beb4249b
 DIST rocm-comgr-5.3.3.tar.gz 120414 BLAKE2B 29b9d466d74ef94165a2b9bea35eac4616f6b2fc529cdac3c830ee7dc08f219cb9e5d4f081658881c76633f12eaebb74d1a2ea30a76652231b8ee516f9988db1 SHA512 ba7b1ef214e3624168e438ed7fd94291a07508fe89d178c0b158bf22e0998d5a8e4d8f0a7f08f05ac108ef65f725db5764fd66353a85bc25000e572a4fdcb61f
 DIST rocm-comgr-5.4.3.tar.gz 120461 BLAKE2B c4eb79dd5a72a2b18e16841fc8cb9a3a33efb0c7b04a7585df9672d682bba6fa826ab8b37dba5febca3b8c5ee5aca30d8546e1fa69e77671e5c750e2a8c1f12f SHA512 1a25af99a0166d70ca6dc5df5a667068eaf583dccd74bbb18a2a5de3c1b769e0c1eb9a0c539e0cd88bc50bbbe53214a1d1b23fbdfd6fc5b6507c44da259815c4
 DIST rocm-comgr-5.5.1.tar.gz 127475 BLAKE2B dbcb6729b27c0b4a4be37f5e462d96b10c15a6a3b540a81a74a648fc45dc727ea5706db1a0f4583a31ac4cb5c9f0d9f4e258fa5ac792b327f4cb1dfe6d585937 SHA512 09174ef2ad21f62b197e439bb5b04a365233c360c57cc2ccf0ea3d53edfa8880dff4f127c6d6c1d430b63b6f7ea666705b14cadc2bccb89c0fefed943b0cf1c7
 DIST rocm-comgr-5.7.1.tar.gz 137923 BLAKE2B e215f51137fd0c4b67e85496bf289dc0afde6ebc9efb9416f5fc4cf312b2be9be26da35cb70965bf4857a0f1434d750bcc03ce83095173098487ef7805948735 SHA512 cdd2609b858d9503c30122a2d328d36baa8a930a05bcb6c38e30723909c492b4d47eaaf4884dbb7aa82053e7cda6c22ee1aa16fc5ba266e272d98ff772c5079d
-DIST rocm-comgr-6.0.0.tar.gz 142129 BLAKE2B 65d00a79ead48872e3b94e5239a07c476288c611aa3ce2311a345bec5f7d277dc67910fa5f4ef000a5e94e6bed148baa4b1c7fe2b1cfaae2cc39555d716668d5 SHA512 877d2042bdafa6b503ee8f24d3a9c4ac9e001a7884211df47b2237d8a5ead66ced0f352c7b76d96190cd407461f5434fb1a5a4508067e432eb93c0f2fd066053
 EBUILD rocm-comgr-5.1.3-r3.ebuild 2051 BLAKE2B 98d8ad8164c8a401961a9abb1a973e1123a049c4a3949114f3493d36f02cd5f2048554828cf5838c00c47a128e21420ba7cf6c3de29086b918e56c5fe79410f7 SHA512 8341569140712543b778a771a381933a9cd14c0a5dcf3393e196d0121eb14a01614bf2080df2cd1f5a51b5bb3f5fb55dae9b7bddc4954900a64d5af0443e3a0f
 EBUILD rocm-comgr-5.3.3-r2.ebuild 1943 BLAKE2B e286731895a9cb985eef52ab23fea988d11fc4294fc65c91b9dc81ec5af8c5a747ae699a6af878436e8260c77e94402593fccae9dd8fdd65f05c3da27087b82f SHA512 fd5a47cb1eb354078c9aa4f5fc27d05629a7f40984e9f166a36a5d47faf8ccf3321d8a326145e192c25cc685ed041e9c756b7e57598902acc07c743ea0c7cc3c
 EBUILD rocm-comgr-5.4.3-r1.ebuild 1892 BLAKE2B 3225c9fc2eb31f8810e1072ccf20681987ed6d8072f7bb0a1d661ab2eb327ad30afa0a6fd8f8299bd626f34cffd25e9f15d42a5e7fb6ac62f314755ce1ca3116 SHA512 265cd1523b8dc85a875a008cb8a2b6b3098cc07277199c3cccb749f4a30d22d8e71eefba1474aad18034b13002d734b46cec614f1fe56e67c4482dbeb8bc0079
 EBUILD rocm-comgr-5.5.1.ebuild 2022 BLAKE2B 7bc047bb17510907af10ce3763ccc6bd52d1bccb4264bd920936dd76d9e7040565b041ed4f6422ca858a40f8c1f073a8bcec5d9b93bea947e72aa48091cf3f6a SHA512 31024125b88958a422fec60cb35eb2aa7f3c9ec0862c2f218f8b6c7ce1ccc3515f3976de53d79715c6e3bcbb3fccc6ee4347013e711379702c88b1ebdee894bf
 EBUILD rocm-comgr-5.7.1.ebuild 2027 BLAKE2B 681d9335d5117a6db725a36f9d56b41c5987db306baacccfb7f31dcf3166ab6fba4c469c78f754a90385b53a827ca41100fa8428b5b6ab41e84e03b178f33f9f SHA512 49f0471a685b324bcef68ac534e76d4d44ec60abadc6ebfc293afb5bb457235a949c5213f2f0d21dfe25d33e5f366bb219a83c10a80dc99e50627af79be65406
-EBUILD rocm-comgr-6.0.0.ebuild 1951 BLAKE2B 7129f908ca36c54c3ffc69be5f4b58b55308d5a76dc9d1a1095379098d215726a4be033f28c27ec9938054d13f6c8e853206939717691c419654666ad5807efa SHA512 d470c4e665f0d0259fd508304d8770f3243ea721f4259a4267970d48ed08f6163e61e7f02caae553f29d110b24f3a0a61b7fce1c1e529f00af5ef5e41bf2e746
-MISC metadata.xml 526 BLAKE2B d2c4b5c4210cd4ae436bc205ec6c6d0e2690edc99250e508b64f3abbf0f7b4a61b27cb627d9453ff6432cd683fb7f51460b4e821ce7614880e68854121297db5 SHA512 5cf80a58a6791b404d33577fa1cd199791ad4348d0e18d2ba9d8e1665cfc5a19c7d37cfe265c77c060bc886f24ce28b592c6b7d541531faaf62e5440b732d2e7
+EBUILD rocm-comgr-6.1.1.ebuild 2403 BLAKE2B 1fa1bbbd80818a96d66418a1e5c575daa77055b4dd39f82579c6e902bbbff8e61158683ea1e449c2e831f0f367fcfcc6ff81c732221470c3f4915daf0717d70e SHA512 f28526ae247fb2161a2e6732817d49c5577fdda3ade0cc5498f3b17ed2c50666c4f7f7a342bdd595c01e4ba7c80d725fb32ee69d2ae63d6d48f0bf32f7be1fb9
+MISC metadata.xml 638 BLAKE2B d2396daa1a9e505ff3fc3b7a2465f4ca5c933ac8609c08732513c30ebb715f244681075b8b415b75a0d0c330144cb6fab483e6b4231b1144c3bf3bc5091693f3 SHA512 da41a365f6d75e8feabed3a54ca117a8406cabec215137751280ab5985ab86e178a14183e804af220b49b83d4084489c1ec1dd1d543aaa585d910b6636b866c4
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.0.0-extend-isa-compatibility-check.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.0.0-extend-isa-compatibility-check.patch
new file mode 100644
index 000000000000..e65400c792e4
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-6.0.0-extend-isa-compatibility-check.patch
@@ -0,0 +1,204 @@
+Load kernels when compatible by ISA, e. g. if AMDGPU_TARGETS is set
+to gfx1030 and some application was started on gfx1036, it loads gfx1030 kernel.
+
+Based on Debian patch by Cordell Bloor <cgmb@slerp.xyz>
+https://salsa.debian.org/rocm-team/rocm-hipamd/-/blob/master/debian/patches/0026-extend-hip-isa-compatibility-check.patch
+--- comgr.orig/src/comgr-metadata.cpp
++++ comgr/src/comgr-metadata.cpp
+@@ -923,23 +923,86 @@ static constexpr const char *CLANG_OFFLOAD_BUNDLER_MAGIC =
+ static constexpr size_t OffloadBundleMagicLen =
+     strLiteralLength(CLANG_OFFLOAD_BUNDLER_MAGIC);
+ 
+-bool isCompatibleIsaName(StringRef IsaName, StringRef CodeObjectIsaName) {
++struct GfxPattern {
++  std::string root;
++  std::string suffixes;
++};
++
++static bool matches(const GfxPattern& p, StringRef 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(StringRef processor) {
++  return matches(GfxPattern{"gfx90", "029c"}, processor);
++}
++
++static bool isGfx900SupersetProcessor(StringRef processor) {
++  return matches(GfxPattern{"gfx90", "0269c"}, processor);
++}
++
++static bool isGfx1030EquivalentProcessor(StringRef processor) {
++  return matches(GfxPattern{"gfx103", "0123456"}, processor);
++}
++
++static bool isGfx1010EquivalentProcessor(StringRef processor) {
++  return matches(GfxPattern{"gfx101", "0"}, processor);
++}
++
++static bool isGfx1010SupersetProcessor(StringRef 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(StringRef CodeObjectProcessor,
++                                          StringRef AgentProcessor) {
++  if (CodeObjectProcessor == AgentProcessor) {
++    return CS_PROCESSOR_MATCH;
++  }
++
++  bool compatible = false;
++  if (isGfx900SupersetProcessor(AgentProcessor)) {
++    compatible = isGfx900EquivalentProcessor(CodeObjectProcessor);
++  } else if (isGfx1010SupersetProcessor(AgentProcessor)) {
++    compatible = isGfx1010EquivalentProcessor(CodeObjectProcessor);
++  } else if (isGfx1030EquivalentProcessor(AgentProcessor)) {
++    compatible = isGfx1030EquivalentProcessor(CodeObjectProcessor);
++  }
++
++  return compatible ? CS_PROCESSOR_COMPATIBLE : CS_INCOMPATIBLE;
++}
++
++static int getCompatiblityScore(StringRef IsaName, StringRef CodeObjectIsaName) {
+   if (IsaName == CodeObjectIsaName) {
+-    return true;
++    return CS_EXACT_MATCH;
+   }
+ 
+   TargetIdentifier CodeObjectIdent;
+   if (parseTargetIdentifier(CodeObjectIsaName, CodeObjectIdent)) {
+-    return false;
++    return CS_INCOMPATIBLE;
+   }
+ 
+   TargetIdentifier IsaIdent;
+   if (parseTargetIdentifier(IsaName, IsaIdent)) {
+-    return false;
++    return CS_INCOMPATIBLE;
+   }
+ 
+-  if (CodeObjectIdent.Processor != IsaIdent.Processor) {
+-    return false;
++  int ProcessorScore = getProcessorCompatibilityScore(CodeObjectIdent.Processor, IsaIdent.Processor);
++  if (ProcessorScore == CS_INCOMPATIBLE) {
++    return CS_INCOMPATIBLE;
+   }
+ 
+   char CodeObjectXnack = ' ', CodeObjectSramecc = ' ';
+@@ -963,18 +1026,23 @@ bool isCompatibleIsaName(StringRef IsaName, StringRef CodeObjectIsaName) {
+     }
+   }
+ 
++  int XnackBonus = 0;
+   if (CodeObjectXnack != ' ') {
+     if (CodeObjectXnack != IsaXnack) {
+-      return false;
++      return CS_INCOMPATIBLE;
+     }
++    XnackBonus = CS_XNACK_SPECIALIZED;
+   }
+ 
++  int SrameccBonus = 0;
+   if (CodeObjectSramecc != ' ') {
+     if (CodeObjectSramecc != IsaSramecc) {
+-      return false;
++      return CS_INCOMPATIBLE;
+     }
++    SrameccBonus = CS_SRAM_ECC_SPECIALIZED;
+   }
+-  return true;
++
++  return ProcessorScore + XnackBonus + SrameccBonus;
+ }
+ 
+ amd_comgr_status_t
+@@ -992,14 +1060,21 @@ lookUpCodeObjectInSharedObject(DataObject *DataP,
+     return Status;
+   }
+ 
++  int MaxScore = 0;
++  unsigned MaxScoreItem;
+   for (unsigned J = 0; J < QueryListSize; J++) {
+-    if (isCompatibleIsaName(QueryList[J].isa, IsaName)) {
+-      QueryList[J].offset = 0;
+-      QueryList[J].size = DataP->Size;
+-      break;
++    int Score = getCompatiblityScore(QueryList[J].isa, IsaName);
++    if (Score > MaxScore) {
++      MaxScore = Score;
++      MaxScoreItem = J;
+     }
+   }
+ 
++  if (MaxScore) {
++    QueryList[MaxScoreItem].offset = 0;
++    QueryList[MaxScoreItem].size = DataP->Size;
++  }
++
+   return AMD_COMGR_STATUS_SUCCESS;
+ }
+ 
+@@ -1011,7 +1086,6 @@ amd_comgr_status_t lookUpCodeObject(DataObject *DataP,
+     return lookUpCodeObjectInSharedObject(DataP, QueryList, QueryListSize);
+   }
+ 
+-  int Seen = 0;
+   BinaryStreamReader Reader(StringRef(DataP->Data, DataP->Size),
+                             support::little);
+ 
+@@ -1037,6 +1111,8 @@ amd_comgr_status_t lookUpCodeObject(DataObject *DataP,
+     QueryList[I].size = 0;
+   }
+ 
++  std::vector<int> QueryListScores(QueryListSize);
++
+   // For each code object, extract BundleEntryID information, and check that
+   // against each ISA in the QueryList
+   for (uint64_t I = 0; I < NumOfCodeObjects; I++) {
+@@ -1069,28 +1145,22 @@ amd_comgr_status_t lookUpCodeObject(DataObject *DataP,
+     }
+ 
+     for (unsigned J = 0; J < QueryListSize; J++) {
+-      // If this QueryList item has already been found to be compatible with
++      // If this QueryList item has exact match with
+       // another BundleEntryID, no need to check against the current
+       // BundleEntryID
+-      if (QueryList[J].size != 0) {
++      if (QueryListScores[J] == CS_EXACT_MATCH) {
+         continue;
+       }
+ 
+       // If the QueryList Isa is compatible with the BundleEntryID, set the
+       // QueryList offset/size to this BundleEntryID
+-      if (isCompatibleIsaName(QueryList[J].isa, OffloadAndTargetId.second)) {
++      int Score = getCompatiblityScore(QueryList[J].isa, OffloadAndTargetId.second);
++      if (Score > QueryListScores[J]) {
++        QueryListScores[J] = Score;
+         QueryList[J].offset = BundleEntryCodeObjectOffset;
+         QueryList[J].size = BundleEntryCodeObjectSize;
+-        Seen++;
+-        break;
+       }
+     }
+-
+-    // Stop iterating over BundleEntryIDs once we have populated the entire
+-    // QueryList
+-    if (Seen == (int) QueryListSize) {
+-      break;
+-    }
+   }
+ 
+   return AMD_COMGR_STATUS_SUCCESS;
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-dont-add-nogpulib.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-dont-add-nogpulib.patch
new file mode 100644
index 000000000000..526318f5bbd9
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-dont-add-nogpulib.patch
@@ -0,0 +1,31 @@
+From 179ec2e67bf882c6bccb27f81db3d80f7eb9946e Mon Sep 17 00:00:00 2001
+From: Jacob Lambert <jacob.lambert@amd.com>
+Date: Fri, 12 Apr 2024 13:56:42 -0700
+Subject: [PATCH] [Comgr] Don't add -nogpulib option for assembley action
+
+We can omit setting -nogpulib even without a -rocm-path=. option
+when calling the assembly action. This avoids the following warning:
+
+warning: argument unused during compilation: '-nogpulib'
+Change-Id: I66d512befbafd9382f050c45a0d3950985e8ae38
+---
+ amd/comgr/src/comgr-compiler.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/comgr-compiler.cpp b/src/comgr-compiler.cpp
+index 143ab4e4f3db..21b233fa94b2 100644
+--- a/src/comgr-compiler.cpp
++++ b/src/comgr-compiler.cpp
+@@ -1758,6 +1758,9 @@ amd_comgr_status_t AMDGPUCompiler::assembleToRelocatable() {
+   Args.push_back("-x");
+   Args.push_back("assembler");
+ 
++  // -nogpulib option not needed for assembling to relocatable
++  NoGpuLib = false;
++
+   return processFiles(AMD_COMGR_DATA_KIND_RELOCATABLE, ".o");
+ }
+ 
+-- 
+2.44.0
+
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-enforce-oop-compiler.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-enforce-oop-compiler.patch
new file mode 100644
index 000000000000..99cbf2f22ce6
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-enforce-oop-compiler.patch
@@ -0,0 +1,26 @@
+In-process compilation breaks compile_source_to_executable test, as it attempts to
+build .so as fatbin, and some options does not work with unpatched LLVM.
+--- a/src/comgr-compiler.cpp
++++ b/src/comgr-compiler.cpp
+@@ -1226,10 +1226,7 @@ amd_comgr_status_t AMDGPUCompiler::compileToFatBin() {
+     return AMD_COMGR_STATUS_ERROR_INVALID_ARGUMENT;
+   }
+ 
+-  // This is a workaround to support HIP OOP Fatbin Compilation
+-  CompileOOP = true;
+   auto Status = processFiles(AMD_COMGR_DATA_KIND_FATBIN, ".fatbin");
+-  CompileOOP = false;
+ 
+   return Status;
+ }
+--- a/src/comgr-compiler.h
++++ b/src/comgr-compiler.h
+@@ -102,7 +102,7 @@ class AMDGPUCompiler {
+   std::string ClangIncludePath;
+   std::string ClangIncludePath2;
+   /// Perform out-of-process compilation.
+-  bool CompileOOP = false;
++  bool CompileOOP = true;
+   /// Precompiled header file paths.
+   llvm::SmallVector<llvm::SmallString<128>, 2> PrecompiledHeaders;
+   /// Arguments common to all driver invocations in the current action.
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-fix-comgr-default-flags.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-fix-comgr-default-flags.patch
new file mode 100644
index 000000000000..d885da08ddae
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-fix-comgr-default-flags.patch
@@ -0,0 +1,51 @@
+Remove HIP/ROCM includes ("-isystem /usr/include"), as they break inclusion of <math.h>.
+Add inclusion of Clang resource dir (e.g. /usr/lib/clang/17), as it is used in hip runtime like that.
+Remove hardcoded target to fix HIP on musl.
+
+Issues:
+* https://github.com/ROCm/clr/issues/82
+* https://github.com/ROCm/llvm-project/issues/92
+--- a/src/comgr-compiler.cpp
++++ b/src/comgr-compiler.cpp
+@@ -1028,9 +1028,8 @@ AMDGPUCompiler::addTargetIdentifierFlags(llvm::StringRef IdentStr,
+ }
+ 
+ amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() {
+-  HIPIncludePath = (Twine(env::getHIPPath()) + "/include").str();
+-  // HIP headers depend on hsa.h which is in ROCM_DIR/include.
+-  ROCMIncludePath = (Twine(env::getROCMPath()) + "/include").str();
++  // Allow to include <include/cuda_wrappers/algorithm> (used in some hip files)
++  ClangIncludePath = @CLANG_RESOURCE_DIR@;
+ 
+   Args.push_back("-x");
+ 
+@@ -1051,13 +1050,9 @@ amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() {
+   case AMD_COMGR_LANGUAGE_HIP:
+     Args.push_back("hip");
+     Args.push_back("-std=c++11");
+-    Args.push_back("-target");
+-    Args.push_back("x86_64-unknown-linux-gnu");
+     Args.push_back("--cuda-device-only");
+     Args.push_back("-isystem");
+-    Args.push_back(ROCMIncludePath.c_str());
+-    Args.push_back("-isystem");
+-    Args.push_back(HIPIncludePath.c_str());
++    Args.push_back(ClangIncludePath.c_str());
+     break;
+   default:
+     return AMD_COMGR_STATUS_ERROR_INVALID_ARGUMENT;
+--- a/src/comgr-compiler.h
++++ b/src/comgr-compiler.h
+@@ -95,12 +95,7 @@ class AMDGPUCompiler {
+   /// User supplied target GPU Arch.
+   std::string GPUArch;
+   std::string OffloadArch;
+-  /// ROCM include Path
+-  std::string ROCMIncludePath;
+-  /// HIP and Clang Include Paths
+-  std::string HIPIncludePath;
+   std::string ClangIncludePath;
+-  std::string ClangIncludePath2;
+   /// Perform out-of-process compilation.
+   bool CompileOOP = false;
+   /// Precompiled header file paths.
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-llvm-18-compat.patch b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-llvm-18-compat.patch
new file mode 100644
index 000000000000..df008e4230d7
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-6.1.0-llvm-18-compat.patch
@@ -0,0 +1,79 @@
+ROCm 6.0.0 and 6.0.2 releases use mix between LLVM 17 and 18
+forked as https://github.com/RadeonOpenCompute/llvm-project
+which makes some libraries compatible with LLVM 17,
+while other require LLVM 18.
+
+Backports:
+* https://github.com/ROCm/llvm-project/commit/6cbc4dc91dfeb1cf2295cb350866e0b3a07dfee4
+* https://github.com/ROCm/llvm-project/commit/179ec2e67bf882c6bccb27f81db3d80f7eb9946e
+* https://github.com/ROCm/llvm-project/commit/ee123c3d1706bc4346511b1a9032020782576350
+--- a/src/comgr-compiler.cpp
++++ b/src/comgr-compiler.cpp
+@@ -205,7 +205,11 @@ bool AssemblerInvocation::createFromArgs(AssemblerInvocation &Opts,
+   // Parse the arguments.
+   const OptTable &OptTbl = getDriverOptTable();
+ 
++#if LLVM_VERSION_MAJOR == 17
+   const unsigned IncludedFlagsBitmask = options::CC1AsOption;
++#else
++  llvm::opt::Visibility IncludedFlagsBitmask(options::CC1AsOption);
++#endif
+   unsigned MissingArgIndex, MissingArgCount;
+   InputArgList Args = OptTbl.ParseArgs(Argv, MissingArgIndex, MissingArgCount,
+                                        IncludedFlagsBitmask);
+@@ -1041,11 +1045,15 @@ amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() {
+     Args.push_back("cl");
+     Args.push_back("-std=cl1.2");
+     Args.push_back("-cl-no-stdinc");
++    Args.push_back("-mllvm");
++    Args.push_back("-amdgpu-internalize-symbols");
+     break;
+   case AMD_COMGR_LANGUAGE_OPENCL_2_0:
+     Args.push_back("cl");
+     Args.push_back("-std=cl2.0");
+     Args.push_back("-cl-no-stdinc");
++    Args.push_back("-mllvm");
++    Args.push_back("-amdgpu-internalize-symbols");
+     break;
+   case AMD_COMGR_LANGUAGE_HIP:
+     Args.push_back("hip");
+@@ -1605,6 +1613,9 @@ amd_comgr_status_t AMDGPUCompiler::assembleToRelocatable() {
+   Args.push_back("-x");
+   Args.push_back("assembler");
+ 
++  // -nogpulib option not needed for assembling to relocatable
++  NoGpuLib = false;
++
+   return processFiles(AMD_COMGR_DATA_KIND_RELOCATABLE, ".o");
+ }
+ 
+--- a/src/comgr-metadata.cpp
++++ b/src/comgr-metadata.cpp
+@@ -1087,7 +1087,12 @@ amd_comgr_status_t lookUpCodeObject(DataObject *DataP,
+   }
+ 
+   BinaryStreamReader Reader(StringRef(DataP->Data, DataP->Size),
+-                            support::little);
++#if LLVM_VERSION_MAJOR == 17
++                            support::little
++#else
++                            llvm::endianness::little
++#endif
++                            );
+ 
+   StringRef Magic;
+   if (auto EC = Reader.readFixedString(Magic, OffloadBundleMagicLen)) {
+--- a/test/compile_log_remarks_test.c
++++ b/test/compile_log_remarks_test.c
+@@ -107,7 +107,11 @@ int main(int argc, char *argv[]) {
+              AMD_COMGR_DATA_KIND_SOURCE, 1);
+ 
+   checkLogs("AMD_COMGR_ACTION_CODEGEN_BC_TO_ASSEMBLY", DataSetAsm,
++#if LLVM_VERSION_MAJOR == 17
+             "remark: <unknown>:0:0: 8 stack bytes in function "
++#else
++            "remark: <unknown>:0:0: 8 stack bytes in function 'f' "
++#endif
+             "[-Rpass-analysis=prologepilog]");
+ 
+   Status = amd_comgr_destroy_data_set(DataSetCl);
diff --git a/dev-libs/rocm-comgr/metadata.xml b/dev-libs/rocm-comgr/metadata.xml
index c0566e4b512e..0fea85b33c9c 100644
--- a/dev-libs/rocm-comgr/metadata.xml
+++ b/dev-libs/rocm-comgr/metadata.xml
@@ -9,7 +9,11 @@
         <email>xgreenlandforwyy@gmail.com</email>
         <name>Yiyang Wu</name>
     </maintainer>
+    <maintainer type="person">
+        <email>lockalsash@gmail.com</email>
+        <name>Sv. Lockal</name>
+    </maintainer>
     <upstream>
-        <remote-id type="github">RadeonOpenCompute/ROCm-CompilerSupport</remote-id>
+        <remote-id type="github">ROCm/ROCm-CompilerSupport</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.0.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.0.0.ebuild
deleted file mode 100644
index ff181f1b4615..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-6.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake llvm prefix
-
-LLVM_MAX_SLOT=17
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/lib/comgr"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr"
-	KEYWORDS="~amd64"
-fi
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.1.3-rocm-path.patch"
-	"${FILESDIR}/0001-Specify-clang-exe-path-in-Driver-Creation.patch"
-	"${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch"
-	"${FILESDIR}/${PN}-5.7.0-optional.patch"
-	"${FILESDIR}/${PN}-5.7.0-lld.patch"
-	"${FILESDIR}/${PN}-5.7.0-disassembly.patch"
-	"${FILESDIR}/${PN}-5.7.0-metadata.patch"
-	"${FILESDIR}/${PN}-5.7.0-symbolizer.patch"
-	"${FILESDIR}/${PN}-5.7.1-fix-tests.patch"
-	"${FILESDIR}/${PN}-5.7.1-correct-license-install-dir.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	sys-devel/clang:${LLVM_MAX_SLOT}=
-	sys-devel/clang-runtime:=
-	sys-devel/lld:${LLVM_MAX_SLOT}="
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=Release
-
-src_prepare() {
-	sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die
-	sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix ${LLVM_MAX_SLOT})\")," -i src/comgr-env.cpp || die
-	eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch)
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DCMAKE_STRIP=""  # disable stripping defined at lib/comgr/CMakeLists.txt:58
-		-DBUILD_TESTING=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild
new file mode 100644
index 000000000000..a2492992ceed
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-6.1.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 )
+
+inherit cmake llvm-r1 prefix
+
+MY_P=llvm-project-rocm-${PV}
+components=( "amd/comgr" )
+
+DESCRIPTION="Radeon Open Compute Code Object Manager"
+HOMEPAGE="https://github.com/ROCm/ROCm-CompilerSupport"
+SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}/${components[0]}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.1.3-rocm-path.patch"
+	"${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch"
+	"${FILESDIR}/${PN}-5.7.1-correct-license-install-dir.patch"
+	"${FILESDIR}/${PN}-6.0.0-extend-isa-compatibility-check.patch"
+	"${FILESDIR}/${PN}-6.1.0-llvm-18-compat.patch"
+	"${FILESDIR}/${PN}-6.1.0-enforce-oop-compiler.patch"
+	"${FILESDIR}/${PN}-6.1.0-fix-comgr-default-flags.patch"
+	"${FILESDIR}/${PN}-6.1.0-dont-add-nogpulib.patch"
+)
+
+RDEPEND=">=dev-libs/rocm-device-libs-${PV}
+	sys-devel/clang-runtime:=
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+		sys-devel/lld:${LLVM_SLOT}=
+	')
+	dev-util/hipcc:${SLOT}
+"
+DEPEND="${RDEPEND}"
+
+CMAKE_BUILD_TYPE=Release
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		git-r3_fetch
+		git-r3_checkout '' . '' "${components[@]}"
+	else
+		archive="${MY_P}.tar.gz"
+		ebegin "Unpacking from ${archive}"
+		tar -x -z -o \
+			-f "${DISTDIR}/${archive}" \
+			"${components[@]/#/${MY_P}/}" || die
+		eend ${?}
+	fi
+}
+
+src_prepare() {
+	sed '/sys::path::append(HIPPath/s,"hip","",' -i src/comgr-env.cpp || die
+	sed "/return LLVMPath;/s,LLVMPath,llvm::SmallString<128>(\"$(get_llvm_prefix)\")," -i src/comgr-env.cpp || die
+	eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0-rocm_path.patch)
+
+	cmake_src_prepare
+
+	# Replace @CLANG_RESOURCE_DIR@ in patches
+	local CLANG_RESOURCE_DIR="$("$(get_llvm_prefix)"/bin/clang -print-resource-dir)"
+	sed "s,@CLANG_RESOURCE_DIR@,\"${CLANG_RESOURCE_DIR}\"," -i src/comgr-compiler.cpp || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="$(get_llvm_prefix)"
+		-DCMAKE_STRIP=""  # disable stripping defined at lib/comgr/CMakeLists.txt:58
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local CMAKE_SKIP_TESTS=(
+		comgr_nested_kernel_test # See https://github.com/ROCm/llvm-project/issues/35
+	)
+	cmake_src_test
+}
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index b0997dfcbeeb..09eeb44805e7 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,17 +1,23 @@
 AUX rocm-device-libs-5.1.3-llvm-link.patch 694 BLAKE2B a67a1207bb23ceaa304f2fd59000a14a8bd232fd6eaf3510370f148b0bd18630ec4309a3d2ee2c5b8045114841a0548e840601abb153fb4adfc1209dd16b0509 SHA512 75f6fb5f3aab7f7951d110b9097a1521adb261f286b5e04867fd2753bbfcc29987440fd929c9dac0ac90fde98616ce7693c2b5041d4d07c437087ee17303a22e
 AUX rocm-device-libs-5.1.3-test-bitcode-dir.patch 1181 BLAKE2B 0358dfc81ed98acd2a2bb399b7d8aa72c2a0bf20da3c45ad02d5e1c46df7f98bc18efe28867725e0fc1df041c1f1147bc25a2a5aa67b18f53d859dbf66aa71c7 SHA512 a0ffdda4ab42978f3b09bab424f91267bfc267f751d489aaee9c6eb3979ae5efd8130129e4b476fdcfbc73b779d9aad79fda60a8f7a64e8a5b35516d8fe6979f
 AUX rocm-device-libs-5.4.3-Revert-Update-counters-for-gfx11.patch 6801 BLAKE2B ae3be5c1d8a7a84e8ddee2471628804365dd1d9b1ae3aa981b5e47015b82c115d5da5ea6fedcacc3ccf11c768af8130375493fdbcc9a53567e633cc57e7e750e SHA512 c28a08253025b150523282231c64e5d310206e6e406efdc2a0f39ce69b2f1663fed6991e27b2124eb3434c51efb8d172eceb752f366bc2aab7b3eb63ad9dfa35
+AUX rocm-device-libs-5.5.0-test-bitcode-dir.patch 1838 BLAKE2B f1fa6e0b69b5e4e6634cb92c7b9ad1f9621a1b639d27d8e4d15ceeeb79ba58cfc8a7bb17f354995d8e4e88b5a74aa09354b0b986c6e802b1d4eb58ba3905f1e5 SHA512 115b5ec119400e6cbc6293d3819bb1dbd67455c60ed7b8c63443603a1748c954e558d3ffcabe76c232f742ce52d6df9b3c647ce1289a78226fd1507e6497793d
 AUX rocm-device-libs-5.5.1-fix-llvm-link.patch 681 BLAKE2B 1f28e1c92295caec2b50d576830ba896b82c92fe93db9243e4f397c9fde2de090e3f7f8c13ec8a0371d95978807642b433f4dc8b1644595da7f7576fe6b12a35 SHA512 6205cdb17692b4ebbce9f6a0e910c50ed9bd628d1863716f98e87857002399a3edbec3b9c50291c453262d0c169ed62ada5889fb1c735af04fd97623514e1fb2
+AUX rocm-device-libs-5.5.1-remove-gfx700-tests.patch 975 BLAKE2B 7b35ce4d8db4374e532bb3b77cb26d944d36b992b4649351de75084d5914a91becb17159328c9dd325043a1add1418b64b14be9e8e93a009140668cbbf8e7b88 SHA512 08e473c0067e2567d7ccb85eb8e333653e150a9fbca87b51d47f552baec60952a9a9fcbf1b26ad54f3560d8c87eede04f2b6801812f2f080ee61b3600bfa2fee
+AUX rocm-device-libs-6.0.0-add-gws-attribute.patch 581 BLAKE2B 40a8b66e44109a0d32c69ee76078c6ae8e45c52b1c3b8fb510040d8c616fbb552c0bfe77d5406a4a632cc0aca112292df2a720a5aba6fde63ad6853af613b565 SHA512 36b8851722e1fdc20de4ebc5875111017c0c80ba34263526f1228d3eb8fbb80ff6b458fecd665be9121a7c083f827343833481c53b221050446486139efdee40
+AUX rocm-device-libs-6.1.0-fix-llvm-link.patch 1089 BLAKE2B c14aa8fe06d351ba5ec75ae78a4fdd6a8c06bc4a2fff64214f2c28e538d33a07ad986743b5f7278fbaf771841766a368f44a0da17815461891fc09de81346842 SHA512 7ff795ff0db46331c001e5bb7cc7c0e671038f41596d0c3ed6da817146d169d9577c238cb2ecca3998e8a21fff0840e81760f3dd549dfaf1dbcb89ef8d9340a7
+AUX rocm-device-libs-6.1.0-fix-test-failures.patch 3232 BLAKE2B ae76a41e48192bc5cc940a7769b9f264cda742eab52870eeba730403440aa52580dde5d3c735e79e261c6d0b7a5ddac96dc590e547f7fbe1a3f369d08ab38229 SHA512 10905ddca80c6013561849920382f9716ad7d72080241a84aca568dd4ae43845e22627d309f6423f994f068dd64af1db52d64896aa66a79e4c803c093d44dcda
+AUX rocm-device-libs-6.1.0-fix-test-failures2.patch 1492 BLAKE2B a75aa720c1573111280c6fc07c2f5fef4b152116081b6c9eb25844efa9412680c6301f6e3150bd0334265ff76db38ace8a21a9abd6db42692387f04b1d5534d1 SHA512 b265327fa21ecbabbaca2270d8a7022ca46f2890b597683b827848a3d503d26ac7eeb1edb292387694730f6e86dc46a69209d8266ea7aa156266e96052a198ed
+DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B 3ef0b6e3c47c66fd80289373e6ff8aaff44751f9b380addfae73a18dc388093c0535f230b0cc7528724bc43f6992e2ae6decd3d0d3c700893ca95a6166b7b8dc SHA512 e320d4eeaa6f61ed1cdbf653d67fe887d3ce9dc0d6743b4713502e1cb5318ab8afbe1ee71f8cba07635c54ce532df6683de40ade0e5be4a52e50ce25a9b70818
 DIST rocm-device-libs-5.1.3.tar.gz 242862 BLAKE2B 68d66de897f461e9f876de5fe2214803d4c00665651dea6af0952f0ce579c6704a5ec41b08971fa613ade309a0a85cb611b56b592dc2a25e247183e634ea3378 SHA512 cc3dfb8d4b4841ba777355c537175259d0019159ff462358320674b85082cccd99f6462f60fee66228ddfb88fade043445c1bac62504aa1462ba61b7e2751de7
 DIST rocm-device-libs-5.3.3.tar.gz 245690 BLAKE2B 475c0d818b8b0f090a8daeca2910cd4002e4cdf505d020327f46eb5f864a26937a6a3dfe4ff7b188ebda0f936b1c396f2163bb27b9e2a62c5976e60fa60856ac SHA512 8f6f2fc1534e348e02ba30a25cfc6017f8eab768968b5d0344a5ea7d65c4f0a874072f9e53919c74545814330602ef7c190753c7ff019137230e02f58a5d3a5d
 DIST rocm-device-libs-5.4.3.tar.gz 246095 BLAKE2B eb749346c96d465a5f22831968ccbd71f02749e6aa0d9c2becc0f378641ca0f65c1a131bfd3ed226f838b4208091fcc920b1e31b427adbd69a42881898668e6a SHA512 67b904363a3cff6c15bbd032cbc72cb5cd5f82acaa68c74391dbcf415266e8f35486a496b69b69e1fc0721e0e4e21fb6a6b9c180a46cb59cdcf53916be846ca4
 DIST rocm-device-libs-5.5.1.tar.gz 245900 BLAKE2B f713b1f12c7be33a4854d79791f592b8e89e2bc463769ec8cdd807483f0e5ca93d7fc852b6cf41d5ad0401d07adc97de9fb1fa54b77af83f665e282d6c0a43e7 SHA512 0138ddc94ce4a81202bdafccbbecef8145c6ddf82c3a14d92bb80b2bed3d3b73898f84279cef89110c50a9cc51e32de1323cc11a1f97c5da4f7f843b393425d0
 DIST rocm-device-libs-5.7.1.tar.gz 248357 BLAKE2B 829704382e9420ad79724a250ccfd65278eb697498805297d1a52b8ea35dbff46e11514b681243d61bfac05b8a9734f0cf22d721603e48fe2f9864368222b0bc SHA512 8755d0584fa3b8239f5642b4fb8f5e8dea20bbaca2ff8883894d3583913e9a1fd1552492b36e8ceff092f795783b734e68b002ee0c93711dccdf8e72c528c27c
-DIST rocm-device-libs-6.0.0.tar.gz 248509 BLAKE2B 797a612f4b36b83643b15711bec32c1ceac73103b51d42abb890a241b8224b7c6de33bf88a9c6620db2af9be4641fc709b9610515203177482422c97d5b01044 SHA512 e9f2d7e86ec4cbcd0f471bf45d056c4a9272ee0ec3286a9aa42e819fa5d3ce52c9b12e9a4f575c409fe9b46253b8910f49d5ba0bae3694f8c38970658a19f706
 EBUILD rocm-device-libs-5.1.3-r1.ebuild 1184 BLAKE2B bef07c38844eb218c333cf2fb0014881aff83837092dc62aa29d4971e9782da6a38a7db2dd599f6c8aff0c2bd60c94550d72300d8ee2a6db4ea2688820035803 SHA512 814009470618c7cea132ba28d3aa27eda6a55d65646efa54fc3ce0aa11e247af147f175956d2f7466474d891dd5aef80fe9adcc6bf871352d6f7c20c7f802832
 EBUILD rocm-device-libs-5.3.3.ebuild 1184 BLAKE2B bef07c38844eb218c333cf2fb0014881aff83837092dc62aa29d4971e9782da6a38a7db2dd599f6c8aff0c2bd60c94550d72300d8ee2a6db4ea2688820035803 SHA512 814009470618c7cea132ba28d3aa27eda6a55d65646efa54fc3ce0aa11e247af147f175956d2f7466474d891dd5aef80fe9adcc6bf871352d6f7c20c7f802832
 EBUILD rocm-device-libs-5.4.3.ebuild 1250 BLAKE2B 6013dd693a8120b5eeac654c9bad195428c34059eaef1bd40eaaf856f2edf331d8a3726fa46c077fe0aa62919f3ba68f518cfd9441d23020a06c293cd45f1042 SHA512 df101563920183c6a255f1461e718e28a01b4db355e3807c5a3e7b948627337950105deb7f77a857d489d9591c959909ad1e1957e4f21e3dffba08ee14514469
 EBUILD rocm-device-libs-5.5.1.ebuild 1206 BLAKE2B 4e40b4f468a1f3f2bba04aff69de95796f4df079c737b17812a979531a70d62da394655e00d1956d2dd55248141b255a293c1e19fd189e0df3e168f2da9d4d1c SHA512 98a5d239e61f5690bed1af56f8d38f9e188d2f9a3e5c0409dab1afeda7b825b114037e5319daf650ba75916a15c16fef8bb3e61c63ef60255bfea95b4d34d44d
-EBUILD rocm-device-libs-5.7.1.ebuild 1200 BLAKE2B 73f4e2b7ddddec268593e20bd756deefeb6e6e4267a1598f7b705fc20614ef586124300a354253dedc3c21ebabc0824b0bfb393f73ed54130aa9ca27b72b9938 SHA512 8b07f529c2aed33a05675aa4d4f645f97da18bd3eaa8140535e1719fa130aa944ff81491bbd69a3815a448ca418a8270ef3a5ebc3fa6a4ebfce9dc3436ea3585
-EBUILD rocm-device-libs-6.0.0.ebuild 1218 BLAKE2B e05478acbc494ce5d28ffa6bbe8a17d9d81ae604216c2a0b7cfce92a0f1f1a221aa54f595c5f89ac106c3955f1361c0b64ceb2bfac8d7a449320f34abf179b12 SHA512 64744c196cfd11252431571ad77aca587fb94d9b7b3bbbd07b9b4082e0701227d3247c8d8f42158d92cdce2d632e5a1372bb18b4df04ddfa81cd3bba8a4bbf55
-MISC metadata.xml 378 BLAKE2B d4defdfb2ce3bab811d9c2ac75b92b7892d46d87dad9f89c26cde140b3b167b43bf4022128dee45e063e332d6dfafc3ee8d78b0112909a7ce2d4a4a44c6cfa14 SHA512 0732d51019f0d27ffb1ffea32d76cad8a6d82927cb8788ff983cdb8dcc472015dbe36ba568bda7459d0b32837e89e1a32064ab7dfcefd2b88458cbb4438f452a
+EBUILD rocm-device-libs-5.7.1.ebuild 1455 BLAKE2B 3185873cbed4c601d4d3b6b9142376a0af8c3d89718bf8e7a06215cfd9c25cefd956607f557cf721a3f9b68289b91212889d23888bffda7daf8d0c29b596c258 SHA512 f7db2da2818b9eaa4930dfac02e660e98a2b7dc5e326e1fde78acc98d5723a436052a628cf20254e5295a334980c9d350047503cb262ee4c9820d5ef889d170c
+EBUILD rocm-device-libs-6.1.1.ebuild 2249 BLAKE2B 0e118c5e35b8788affc6b20cbe2fd8473eeb8e1593c4e8b8a986cfcfe373cfdea367c267b0e4339dcb72759dadf75e742ddd696296576c7c61169c41f16440d0 SHA512 8a6a155224f845936279a0c33548d13253c66c9bc0c0b99399a82c69b611cebb76e2eea131dbcf74b6e6792e42c103f4e6f32582a2af25ccbd0567ec94ce6bea
+MISC metadata.xml 486 BLAKE2B 39c4a21b96ad471942a38d1c46b2600e3544729a87cd01c79606d495c595f271d5c04621ec581d2322686aca56de5d7c4b2b0d6125fc8db15b1236b2c093c8c9 SHA512 1a7d6570a687bb55877c6a5d9cbd7dc30a72ec0613b84e33be0982ff46b8d80d89e502e50364afdcc1022d7620fc10317a411b27c255caeafa2b45a85a43fd8c
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.0-test-bitcode-dir.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.0-test-bitcode-dir.patch
new file mode 100644
index 000000000000..2a307786edd5
--- /dev/null
+++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.0-test-bitcode-dir.patch
@@ -0,0 +1,37 @@
+`--rocm-device-lib-path` is needed to execute the tests because they are not
+installed to system yet
+===================================================================
+--- ROCm-Device-Libs-rocm-6.0.0.orig/test/compile/CMakeLists.txt
++++ ROCm-Device-Libs-rocm-6.0.0/test/compile/CMakeLists.txt
+@@ -30,6 +30,7 @@ function(add_compile_test test_name func
+      -DFILECHECK_BIN=${FILECHECK_BIN}
+      -DOUTPUT_FILE=output.${name}.${test_cpu}.s
+      -DINPUT_FILE=${CMAKE_CURRENT_SOURCE_DIR}/${func_name}.cl
++     -DAMDGCN_BITCODES=${PROJECT_BINARY_DIR}/lib/amdgcn/bitcode
+      -DTEST_CPU=${test_cpu}
+      -DEXTRA_CHECK_PREFIX=${extra_check_prefixes}
+      -P ${script})
+Index: ROCm-Device-Libs-rocm-6.0.0/test/compile/RunConstantFoldTest.cmake
+===================================================================
+--- ROCm-Device-Libs-rocm-6.0.0.orig/test/compile/RunConstantFoldTest.cmake
++++ ROCm-Device-Libs-rocm-6.0.0/test/compile/RunConstantFoldTest.cmake
+@@ -16,6 +16,7 @@ execute_process(COMMAND
+   -target amdgcn-amd-amdhsa -mcpu=${TEST_CPU}
+   -Xclang -finclude-default-header
+   --rocm-path=${BINARY_DIR}
++  --rocm-device-lib-path=${AMDGCN_BITCODES}
+   -mllvm -amdgpu-simplify-libcall=0
+   -o ${OUTPUT_FILE} ${INPUT_FILE}
+   RESULT_VARIABLE CLANG_RESULT
+Index: ROCm-Device-Libs-rocm-6.0.0/test/compile/RunCompileTest.cmake
+===================================================================
+--- ROCm-Device-Libs-rocm-6.0.0.orig/test/compile/RunCompileTest.cmake
++++ ROCm-Device-Libs-rocm-6.0.0/test/compile/RunCompileTest.cmake
+@@ -16,6 +16,7 @@ execute_process(COMMAND
+   -target amdgcn-amd-amdhsa -mcpu=${TEST_CPU}
+   -Xclang -finclude-default-header
+   --rocm-path=${BINARY_DIR}
++  --rocm-device-lib-path=${AMDGCN_BITCODES}
+   -mllvm -amdgpu-simplify-libcall=0
+   -o ${OUTPUT_FILE} ${INPUT_FILE}
+   RESULT_VARIABLE CLANG_RESULT
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.1-remove-gfx700-tests.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.1-remove-gfx700-tests.patch
new file mode 100644
index 000000000000..0fb5e44e218c
--- /dev/null
+++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.1-remove-gfx700-tests.patch
@@ -0,0 +1,34 @@
+https://github.com/ROCm/ROCm-Device-Libs/issues/86
+https://github.com/ROCm/ROCm-Device-Libs/pull/89
+From 936a78464491c95c7cfffde08491bfe1a48c7177 Mon Sep 17 00:00:00 2001
+From: Brian Sumner <brian.sumner@amd.com>
+Date: Tue, 9 May 2023 07:55:03 -0700
+Subject: [PATCH] Remove gfx700 from tests
+
+Change-Id: I23d6639cb7c04246cc5be86d6e172e32546b3b90
+---
+ test/compile/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/compile/CMakeLists.txt b/test/compile/CMakeLists.txt
+index 9af0b1a..a789222 100644
+--- a/test/compile/CMakeLists.txt
++++ b/test/compile/CMakeLists.txt
+@@ -54,12 +54,12 @@ foreach(gpu gfx900 gfx1030)
+   add_constant_fold_test(lgamma_r ${gpu})
+ endforeach()
+ 
+-foreach(gpu gfx700 gfx803)
++foreach(gpu gfx803)
+   add_isa_test(asin ${gpu})
+   add_isa_test(atan2 ${gpu})
+   add_isa_test(atan2pi ${gpu})
+ endforeach()
+ 
+-foreach(gpu gfx600 gfx700)
++foreach(gpu gfx600)
+   add_isa_test(frexp ${gpu})
+ endforeach()
+-- 
+2.41.0
+
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-6.0.0-add-gws-attribute.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.0.0-add-gws-attribute.patch
new file mode 100644
index 000000000000..1aaecbb0c1e6
--- /dev/null
+++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.0.0-add-gws-attribute.patch
@@ -0,0 +1,22 @@
+Fix compatilibity with Clang-18
+https://github.com/ROCm/ROCm-Device-Libs/issues/96
+
+Backports https://github.com/ROCm/llvm-project/commit/688c78d85caf499957db175811f8b00c7c818f83
+--- a/ockl/src/cg.cl
++++ b/ockl/src/cg.cl
+@@ -84,13 +84,13 @@ multi_grid_sync(__global struct mg_sync *s, uint members)
+     }
+ }
+ 
+-void
++__attribute__((target("gws"))) void
+ __ockl_gws_init(uint nwm1, uint rid)
+ {
+     __builtin_amdgcn_ds_gws_init(nwm1, rid);
+ }
+ 
+-void
++__attribute__((target("gws"))) void
+ __ockl_gws_barrier(uint nwm1, uint rid)
+ {
+     __builtin_amdgcn_ds_gws_barrier(nwm1, rid);
+\ No newline at end of file
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-6.1.0-fix-llvm-link.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.1.0-fix-llvm-link.patch
new file mode 100644
index 000000000000..7a08dc4a1d0d
--- /dev/null
+++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.1.0-fix-llvm-link.patch
@@ -0,0 +1,28 @@
+https://github.com/ROCm/llvm-project/pull/68
+From 1c7e7f872980a5b15fb3d85f8780e78ce3b715b1 Mon Sep 17 00:00:00 2001
+From: Selene <lixueying@mail.bnu.edu.cn>
+Date: Wed, 1 May 2024 17:38:33 +0800
+Subject: [PATCH] Allow link to llvm shared library for current distros
+
+---
+ amd/device-libs/utils/prepare-builtins/CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/amd/device-libs/utils/prepare-builtins/CMakeLists.txt b/amd/device-libs/utils/prepare-builtins/CMakeLists.txt
+index 63661962860a..079dc08e3419 100644
+--- a/utils/prepare-builtins/CMakeLists.txt
++++ b/utils/prepare-builtins/CMakeLists.txt
+@@ -26,5 +26,9 @@ set_target_properties(prepare-builtins PROPERTIES
+   CXX_STANDARD_REQUIRED Yes
+   CXX_EXTENSIONS No)
+ llvm_update_compile_flags(prepare-builtins)
+-llvm_map_components_to_libnames(llvm_libs support core bitreader bitwriter)
++if (LLVM_LINK_LLVM_DYLIB)
++  set(llvm_libs LLVM)
++else()
++  llvm_map_components_to_libnames(llvm_libs support core bitreader bitwriter)
++endif()
+ target_link_libraries(prepare-builtins ${llvm_libs})
+-- 
+2.44.0
+
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-6.1.0-fix-test-failures.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.1.0-fix-test-failures.patch
new file mode 100644
index 000000000000..856b5cf7e392
--- /dev/null
+++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.1.0-fix-test-failures.patch
@@ -0,0 +1,64 @@
+Modified from https://github.com/ROCm/llvm-project/commit/7c2188cbc193f2b4dd5394f17404b44340001f30.patch
+From 7c2188cbc193f2b4dd5394f17404b44340001f30 Mon Sep 17 00:00:00 2001
+From: Matt Arsenault <Matthew.Arsenault@amd.com>
+Date: Thu, 4 Jan 2024 19:34:47 +0700
+Subject: [PATCH] device-libs: Fix input file path test failures
+
+The test file input paths broke with the move to the mono-repo. Some of
+the constant folding values are host dependent, so update the values to
+what works for me now. Not really sure what else I can do about these.
+
+Change-Id: Ic764f637bb9532fcede9bfb9ce3886a2b7d467d8
+---
+ amd/device-libs/test/compile/frexp.cl       | 10 ++++++----
+ amd/device-libs/test/compile/lgamma_r.cl    |  2 +-
+ 3 files changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/test/compile/frexp.cl b/test/compile/frexp.cl
+index 780c541500021b..b3181ce87db711 100644
+--- a/test/compile/frexp.cl
++++ b/test/compile/frexp.cl
+@@ -5,11 +5,11 @@
+ // later.
+ 
+ // GCN-LABEL: {{^}}test_frexp_f32:
+-// GFX600-DAG: s_movk_i32 [[CLASS_MASK:s[0-9]+]], 0x1f8
++// GFX600-DAG: s_mov_b32 [[INF:s[0-9]+]], 0x7f80000
+ // GFX600-DAG: v_frexp_mant_f32{{(_e32)?}} [[MANT:v[0-9]+]], [[SRC:v[0-9]+]]
+ // GFX600-DAG: v_frexp_exp_i32_f32{{(_e32)?}} [[EXP:v[0-9]+]], [[SRC:v[0-9]+]]
+ 
+-// GFX600-DAG: v_cmp_class_f32{{(_e64)?}} [[CMP:(vcc|s{{\[[0-9]+:[0-9]+\]}})]], [[SRC]], [[CLASS_MASK]]
++// GFX600-DAG: v_cmp_lt_f32{{(_e64)?}} [[CMP:(vcc|s{{\[[0-9]+:[0-9]+\]}})]], |[[SRC]]|, [[INF]]
+ 
+ // GFX600-DAG: v_cndmask_b32{{(_e32)?|(e64)?}} v{{[0-9]+}}, [[SRC]], [[MANT]], [[CMP]]
+ // GFX600-DAG: v_cndmask_b32{{(_e32)?|(e64)?}} v{{[0-9]+}}, 0, [[EXP]], [[CMP]]
+@@ -30,12 +30,14 @@ kernel void test_frexp_f32(global float* restrict out0,
+ }
+ 
+ // GCN-LABEL: {{^}}test_frexp_f64:
++// GFX600: s_mov_b32 s{{[0-9]+}}, 0{{$}}
+ 
+-// GFX600-DAG: s_movk_i32 [[CLASS_MASK:s[0-9]+]], 0x1f8
++// GFX600-DAG: s_mov_b32 s[[INF_LO:[0-9]+]], 0{{$}}
++// GFX600-DAG: s_mov_b32 s[[INF_HI:[0-9]+]], 0x7ff00000{{$}}
+ // GFX600-DAG: v_frexp_mant_f64{{(_e32)?}} v{{\[}}[[MANT_LO:[0-9]+]]:[[MANT_HI:[0-9]+]]{{\]}}, [[SRC:v\[[0-9]+:[0-9]+\]]]
+ // GFX600-DAG: v_frexp_exp_i32_f64{{(_e32)?}} [[EXP:v[0-9]+]], [[SRC:v\[[0-9]+:[0-9]+\]]]
+ 
+-// GFX600-DAG: v_cmp_class_f64{{(_e64)?}} [[CMP:(vcc|s{{\[[0-9]+:[0-9]+\]}})]], [[SRC]], [[CLASS_MASK]]
++// GFX600-DAG: v_cmp_lt_f64{{(_e64)?}} [[CMP:(vcc|s{{\[[0-9]+:[0-9]+\]}})]], |[[SRC]]|, s{{\[}}[[INF_LO]]:[[INF_HI]]{{\]}}
+ 
+ // GFX600-DAG: v_cndmask_b32{{(_e32)?|(e64)?}} v{{[0-9]+}}, v{{[0-9]+}}, v[[MANT_LO]], [[CMP]]
+ // GFX600-DAG: v_cndmask_b32{{(_e32)?|(e64)?}} v{{[0-9]+}}, v{{[0-9]+}}, v[[MANT_HI]], [[CMP]]
+diff --git a/test/compile/lgamma_r.cl b/test/compile/lgamma_r.cl
+index 1e1984226cd55c..56d1ba15f761f2 100644
+--- a/test/compile/lgamma_r.cl
++++ b/test/compile/lgamma_r.cl
+@@ -66,7 +66,7 @@ kernel void constant_fold_lgamma_r_f32(volatile global float* out,
+     out[0] = test_lgamma_r(0x1.0p-127f, sign_out);
+ 
+     // CONSTANTFOLD-NEXT: store volatile i32 1,
+-    // CONSTANTFOLD-NEXT: store volatile float 0x419DE28040000000,
++    // CONSTANTFOLD-NEXT: store volatile float 0x419DE28060000000,
+     out[0] = test_lgamma_r(nextafter(0x1.0p+23f, __builtin_inff()), sign_out);
+ 
+     // CONSTANTFOLD-NEXT: store volatile i32 1,
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-6.1.0-fix-test-failures2.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.1.0-fix-test-failures2.patch
new file mode 100644
index 000000000000..c0559e9468f6
--- /dev/null
+++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-6.1.0-fix-test-failures2.patch
@@ -0,0 +1,44 @@
+Modified from https://github.com/ROCm/llvm-project/commit/794ebeffcafbf6f4d86cb1bfd7a5a0d1d30f1fc7
+From 794ebeffcafbf6f4d86cb1bfd7a5a0d1d30f1fc7 Mon Sep 17 00:00:00 2001
+From: Matt Arsenault <Matthew.Arsenault@amd.com>
+Date: Thu, 4 Jan 2024 20:40:30 +0700
+Subject: [PATCH] device-libs: Fix native_rsqrt test failures for f16-as-f32
+ case
+
+At some point the code quality regressed for these.
+
+Change-Id: Ib5c4c1d093a6056dd6213ed6eaf157ad806101fb
+---
+ amd/device-libs/test/compile/native_rsqrt.cl | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/test/compile/native_rsqrt.cl b/test/compile/native_rsqrt.cl
+index 94ef375e4d522f..291cc6f32c3351 100644
+--- a/test/compile/native_rsqrt.cl
++++ b/test/compile/native_rsqrt.cl
+@@ -6,16 +6,21 @@
+ 
+ half __ocml_native_rsqrt_f16(half);
+ 
+-// GCN: {{^}}test_native_rsqrt_f16:
+-// GFX600: v_rsq_f32
+-// GFX700: v_rsq_f32
++// FIXME: Promoted case using full expansion
++// GCN-LABEL: {{^}}test_native_rsqrt_f16:
++// GFX600: v_sqrt_f32
++// GFX600: v_rcp_f32
++
++// GFX700: v_sqrt_f32
++// GFX700: v_rcp_f32
++
+ // GFX803: v_rsq_f16
+ kernel void test_native_rsqrt_f16(global half* restrict out, global half* restrict in) {
+     int id = get_local_id(0);
+     out[id] = __ocml_native_rsqrt_f16(in[id]);
+ }
+ 
+-// GCN: {{^}}test_native_rsqrt_f32:
++// GCN-LABEL: {{^}}test_native_rsqrt_f32:
+ // GCN: v_rsq_f32
+ kernel void test_native_rsqrt_f32(global float* restrict out, global float* restrict in) {
+     int id = get_local_id(0);
diff --git a/dev-libs/rocm-device-libs/metadata.xml b/dev-libs/rocm-device-libs/metadata.xml
index c47f589544e4..cbbf3a273306 100644
--- a/dev-libs/rocm-device-libs/metadata.xml
+++ b/dev-libs/rocm-device-libs/metadata.xml
@@ -5,7 +5,11 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
+    <maintainer type="person">
+      <email>lockalsash@gmail.com</email>
+      <name>Sv. Lockal</name>
+    </maintainer>
     <upstream>
-        <remote-id type="github">RadeonOpenCompute/ROCm-Device-Libs</remote-id>
+        <remote-id type="github">ROCm/ROCm-Device-Libs</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-5.7.1.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-5.7.1.ebuild
index 56af5a5be6b3..f86b432e076a 100644
--- a/dev-libs/rocm-device-libs/rocm-device-libs-5.7.1.ebuild
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-5.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,3 +47,10 @@ src_configure() {
 	)
 	cmake_src_configure
 }
+
+src_install() {
+	cmake_src_install
+	local CLANG_EXE="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/clang"
+	local bitcodedir="$("${CLANG_EXE}" -print-resource-dir)/$(get_libdir)/amdgcn/bitcode"
+	dosym -r "/usr/lib/amdgcn/bitcode" "${bitcodedir#${EPREFIX}}"
+}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-6.0.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-6.0.0.ebuild
deleted file mode 100644
index 09ca777faf52..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-6.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-RESTRICT="strip"
-
-inherit cmake llvm
-
-LLVM_MAX_SLOT=17
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Device Libraries"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-devel/clang:${LLVM_MAX_SLOT}"
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.5.1-fix-llvm-link.patch"
-	)
-
-src_prepare() {
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-		-DLLVM_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-6.1.1.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-6.1.1.ebuild
new file mode 100644
index 000000000000..04fd989b95cb
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-6.1.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 )
+inherit cmake llvm-r1
+
+MY_P=llvm-project-rocm-${PV}
+components=( "amd/device-libs" )
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ROCm/llvm-project"
+	inherit git-r3
+	S="${WORKDIR}/${P}/${components[0]}"
+else
+	SRC_URI="https://github.com/ROCm/llvm-project/archive/rocm-${PV}.tar.gz -> ${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}/${components[0]}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/ROCm/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-build/rocm-cmake
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}
+		sys-devel/lld:${LLVM_SLOT}
+	')
+"
+
+CMAKE_BUILD_TYPE=Release
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.5.0-test-bitcode-dir.patch"
+	"${FILESDIR}/${PN}-6.1.0-fix-llvm-link.patch"
+	"${FILESDIR}/${PN}-6.0.0-add-gws-attribute.patch"
+	"${FILESDIR}/${PN}-6.1.0-fix-test-failures.patch"
+	"${FILESDIR}/${PN}-6.1.0-fix-test-failures2.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		git-r3_fetch
+		git-r3_checkout '' . '' "${components[@]}"
+	else
+		archive="${MY_P}.tar.gz"
+		ebegin "Unpacking from ${archive}"
+		tar -x -z -o \
+			-f "${DISTDIR}/${archive}" \
+			"${components[@]/#/${MY_P}/}" || die
+		eend ${?}
+	fi
+}
+
+src_prepare() {
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="$(get_llvm_prefix)"
+	)
+	# do not trust CMake with autoselecting Clang, as it autoselects the latest one
+	# producing too modern LLVM bitcode and causing linker errors in other packages
+	CC="$(get_llvm_prefix)/bin/clang" CXX="$(get_llvm_prefix)/bin/clang++" cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	local CLANG_EXE="$(get_llvm_prefix)/bin/clang"
+	# install symlink, so that clang won't ask for "--rocm-device-lib-path" flag anymore
+	local bitcodedir="$("${CLANG_EXE}" -print-resource-dir)/$(get_libdir)/amdgcn/bitcode"
+	dosym -r "/usr/lib/amdgcn/bitcode" "${bitcodedir#${EPREFIX}}"
+}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index e17c2ec9074e..9779389a02c6 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -9,7 +9,7 @@ DIST rocclr-5.3.3.tar.gz 625944 BLAKE2B 0cdbc1415a355e1d56628834846aaa8587c9827e
 DIST rocclr-5.4.3.tar.gz 640557 BLAKE2B 9ab91bab7ffb06c9c0d1c2ae79533fccc597071dda289ac375e32eb2965c638a7029951d2a49d46eeead9d7d242fe3a0cedb3e444d877af1bbf0e2d801c91e11 SHA512 c1d1a2ca08c2d762a221c04d394469aa7aff46086151333b145e0db9a7c7eb3dbbf8b9693e50d816aa9a13c16b4ebacf5ff3d5d8ff3393a8a764728ef5172d3a
 DIST rocclr-5.5.1.tar.gz 634330 BLAKE2B e6383a6b6b09f274a944d66effd345e38a191ec73ee5c5240f8ec8bb62a4df97b80835ce57f8f78c3834602b9da425b49289b5c7cd7e4c7071147ff409c6a6c9 SHA512 4c12011d22a4f14d9e93250b2a38716eb973139afa1adbbbd51c0e0ed13c0b7c1f45a37c71ef937c5fdabf09e928d7913ca3332fc61b7a2c10d21421306a228f
 DIST rocm-clr-5.7.1.tar.gz 2008647 BLAKE2B 3db0760d6f83504e60caf88a2dd5e0bc02c7db9d6f263ad0eb2cfc79aa0f88a3699c412844a0158a796d9d02e79660287e791edad787d814eefffea4fd2298b4 SHA512 d79323481d82fc02c12a32cdcc0d14437d512af023e7737db0387b7eecb27fe6e4ae7c71d6adce57932a04bb24c880440d9dc10aeb5af11a4f2ca64d44330965
-DIST rocm-clr-6.0.0.tar.gz 1983453 BLAKE2B 2cf6ec7c3b0ec5dedeea94ff54af30662b781fc2eee22e3315094af61dc9d331eba33c1d9d463295848c5724e515a3137f9b189c1261273afad1a5f9d32226c2 SHA512 12e77a121150d8c25121b98bd7c6233c2568f9f4130bdbe6bc3ab225f14b8bea6a6bdc4ed497c0f999d3d3daabdca0de8caaa1b69911c11974b5d6f951734433
+DIST rocm-clr-6.1.1.tar.gz 2031034 BLAKE2B b0485bb015d31986f4988d1db0c029c826856e50b5bb1b58fac2097c14b3966668f1b8d41ec198889e27ac860497a8b3c081ec31d52390d5c9ff5db092bf7cce SHA512 86925e8b9a9e77b06a57daefbc7279887b4ef7c6a79c3717bc2f2d3bf29926281c60063fd17e21c65d7def520d9f579bf88f69051d053a38750ba968f69ca3fc
 DIST rocm-opencl-runtime-5.1.3.tar.gz 1004765 BLAKE2B 64d9b42026d2be1d0e4aa666785699f6b4ec0584a927904a94bf830883050943503f8bdd7c97438a2fb11c71686a330d526f633959916c5c6c8da2e037841e79 SHA512 b83c3ae0bfad80f867bacce36710a8964f6dd7e64bf50da3ec6ce842217d6de63299d9ceaab9dc25a22252484520a85d02859809463dad5dda9b1f00a86863e0
 DIST rocm-opencl-runtime-5.3.3.tar.gz 1007773 BLAKE2B a3f600a68183337f92b152a123241cb7025889cca2ef6814d9d5b5a2146a78703b171d20bcb432bc7a2cdd1f24ad349408c17816b25a66702e9f0f5345af9082 SHA512 391f0f244b7f02972df8cada821e69ee8d81d96b9cff3c14f1d0838da583d8fb136ec4bd5ee820f6dd261968e9eef5e9a5b10b7bb76b1b64625c399d79bcb03f
 DIST rocm-opencl-runtime-5.4.3.tar.gz 1005268 BLAKE2B f9398e4c2b0f045f1b5d8df9f31b7f2bef6a9201885aa6ee5fc5d71632cfde26a078d9a5ea38c3da12d3c187faf04c7bdcf1a8ecb9927cdba56b1efdfcdc44ee SHA512 f65d4622ce8721a6b91ab5b5b306d142ba507d3e631ac3ab0b76c5bc6d8d18455e02debd954c82e7eb609f232b509f1ec1a013dc2fad467c2c2ad31fdf15755d
@@ -19,6 +19,5 @@ EBUILD rocm-opencl-runtime-5.3.3-r1.ebuild 3630 BLAKE2B cdafd2367c4b222a43b434e8
 EBUILD rocm-opencl-runtime-5.4.3-r1.ebuild 4031 BLAKE2B c952245f6f6ad1910facd33a82d25b77f2b20cbbdf4c05ca7ce735ab913fc49bdc5cdc1e8fc7f944cc5574331305e2d96cbb9bccd17a7ec28c042d9bec91499c SHA512 2cf80ae9fa5dba61936216fe87274998deefa70d0f20613ad0bf048e29f35eb37f525f1682024a85ab4a4acd79b8d75ad586008c5032dc527b293e79d3bc6a01
 EBUILD rocm-opencl-runtime-5.5.1.ebuild 4002 BLAKE2B e784debbe6ca533290ca801cf965087e7e01d39c84a65ad2a738a672f3d330c7a28cc13fd5a8d6cbcc9520c9543cce9b762d480b6f3f4173006301c293af013b SHA512 38940e4b6d028fc8e713ec1641824776d0fab540f3e9e3011f6b377caf82a9b4d13ccd897605c01557975c1ec4f89285e944cee6b67bdbe56ddc300284d2df55
 EBUILD rocm-opencl-runtime-5.7.1-r1.ebuild 3119 BLAKE2B 672082b1bea0f6cd45f8c37181e731d60dec3844fa0a31aca555b7c6e154d4981d33d1140fc83b3f8c6fbc46b7a13b88c76278ea0c04463eb0f2b398a60b3bbf SHA512 7d12f85d62bfb48df3f7c0d705e5411dad21ffa71964f19b09f2623aa836ecd91fedb28ad1ee5790ca5c538139e6790b2154c66dccc67687decdd3fb62d92b18
-EBUILD rocm-opencl-runtime-6.0.0.ebuild 3119 BLAKE2B 272dfd88268d3457367bf9f19e4622949ceb41b1f20c9504545e1638331ece944aaec9b4eb60f9afd1bbdd409252be70d291fbccd351c2296dbaf08a7094201a SHA512 3cedae3db98286f85dcdb3db35bdfcc7f6ac8702471d4cd7115bc6672a2623924a0aba6fec1e528fb184b91e1bad99dfa6511739c54ebc7699be76f5563c756e
-EBUILD rocm-opencl-runtime-9999.ebuild 4098 BLAKE2B dbeebfc8fe71bb84507cb8f021deda11c4d3027ed4f21f4bed3f92c732e5d7122a44a42e4d25c8b2df59ec94a825654d508ca3f02559827ab1db2472b6240c9c SHA512 8ede58974bf967eb569621aed33dbc0d974247059818f72195affb645ca1d8e642f6605eaeb345604c0376df9eabe84402cc5d1e8e53feb74c7d8d337fa44579
+EBUILD rocm-opencl-runtime-6.1.1.ebuild 2695 BLAKE2B 2e2241518863f36222e755d61f8e5c25510c5a5250458fce110d5830898a36ae3e97a20fce61382d7ebf39346dee705b673dd0c1e4390e3ee44f7c23eff4d1b7 SHA512 edfb87e56c042000e41480771186a8e536e35a58cb2e57ef71f3d118501dcc85eb1025eba6a6af0b25d9c896329aa832d56f9b1037031c4279e5f21367dfa81b
 MISC metadata.xml 525 BLAKE2B 9af34c6be2bb5ff304e4d01810b810eb8a0639d1972325fad3b81c93aa4d060cbebddc9c06da702dd80f9aa98549720cf2bc674d5b11ef6f99ed30efe50d2110 SHA512 c50670dde49ec0d9d3acca19d37842ecf567429f455e1b37c5181e5d4361d829eff0980ba35096ef42c0789f8904d52425faf4a2aabf641142722957b626378d
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.0.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.1.1.ebuild
index b6912994ddb7..465e3a2ddc66 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.0.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.1.1.ebuild
@@ -9,19 +9,12 @@ inherit cmake edo flag-o-matic rocm
 DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
 HOMEPAGE="https://github.com/ROCm-Developer-Tools/clr"
 
-#if [[ ${PV} == *9999 ]] ; then
-#	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-#	EGIT_CLR_REPO_URI="https://github.com/ROCm-Developer-Tools/ROCclr"
-#	inherit git-r3
-#	S="${WORKDIR}/${P}"
-#else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz"
-	S="${WORKDIR}/clr-rocm-${PV}/"
-#fi
+SRC_URI="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz"
+S="${WORKDIR}/clr-rocm-${PV}/"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
@@ -34,18 +27,7 @@ DEPEND="${RDEPEND}"
 BDEPEND=">=dev-build/rocm-cmake-5.3
 	media-libs/glew
 	test? ( >=x11-apps/mesa-progs-8.5.0[X] )
-	"
-
-src_unpack () {
-if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-OB		git-r3_checkout
-		git-r3_fetch "${EGIT_CLR_REPO_URI}"
-		git-r3_checkout "${EGIT_CLR_REPO_URI}" "${CLR_S}"
-	else
-		default
-	fi
-}
+"
 
 src_configure() {
 	# -Werror=strict-aliasing
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-9999.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-9999.ebuild
deleted file mode 100644
index 1ca30c8a10ae..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-9999.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake edo flag-o-matic
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-	EGIT_CLR_REPO_URI="https://github.com/ROCm-Developer-Tools/ROCclr"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> rocclr-${PV}.tar.gz
-	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
-	S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-fi
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/rocr-runtime-5.3
-	>=dev-libs/rocm-comgr-5.3
-	>=dev-libs/rocm-device-libs-5.3
-	>=virtual/opencl-3
-	media-libs/mesa[-opencl]"
-DEPEND="${RDEPEND}
-	dev-util/opencl-headers"
-BDEPEND=">=dev-build/rocm-cmake-5.3
-	media-libs/glew
-	test? ( >=x11-apps/mesa-progs-8.5.0[X] )
-	"
-
-CLR_S="${WORKDIR}/ROCclr-rocm-${PV}"
-
-src_unpack () {
-if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-		git-r3_fetch "${EGIT_CLR_REPO_URI}"
-		git-r3_checkout "${EGIT_CLR_REPO_URI}" "${CLR_S}"
-	else
-		default
-	fi
-}
-src_prepare() {
-	cmake_src_prepare
-
-	pushd ${CLR_S} || die
-	# Bug #753377
-	# patch re-enables accidentally disabled gfx800 family
-	eapply "${FILESDIR}/${PN}-5.0.2-enable-gfx800.patch"
-	popd || die
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/856088
-	# https://github.com/ROCm/clr/issues/64
-	#
-	# Do not trust it for LTO either
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	# Fix ld.lld linker error: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/155
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
-	append-cflags -fcommon
-
-	local mycmakeargs=(
-		-Wno-dev
-		-DROCCLR_PATH="${CLR_S}"
-		-DAMD_OPENCL_PATH="${S}"
-		-DROCM_PATH="${EPREFIX}/usr"
-		-DBUILD_TESTS=$(usex test ON OFF)
-		-DEMU_ENV=ON
-		-DBUILD_ICD=OFF
-		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors
-	doins config/amdocl64.icd
-
-	cd "${BUILD_DIR}" || die
-	insinto /usr/lib64
-	doins amdocl/libamdocl64.so
-	doins tools/cltrace/libcltrace.so
-}
-
-# Copied from rocm.eclass. This ebuild does not need amdgpu_targets
-# USE_EXPANDS, so it should not inherit rocm.eclass; it only uses the
-# check_amdgpu function in src_test. Rename it to check-amdgpu to avoid
-# pkgcheck warning.
-check-amdgpu() {
-	for device in /dev/kfd /dev/dri/render*; do
-		addwrite ${device}
-		if [[ ! -r ${device} || ! -w ${device} ]]; then
-			eerror "Cannot read or write ${device}!"
-			eerror "Make sure it is present and check the permission."
-			ewarn "By default render group have access to it. Check if portage user is in render group."
-			die "${device} inaccessible"
-		fi
-	done
-}
-
-src_test() {
-	check-amdgpu
-	cd "${BUILD_DIR}"/tests/ocltst || die
-	export OCL_ICD_FILENAMES="${BUILD_DIR}"/amdocl/libamdocl64.so
-	local instruction1="Please start an X server using amdgpu driver (not Xvfb!),"
-	local instruction2="and export OCLGL_DISPLAY=\${DISPLAY} OCLGL_XAUTHORITY=\${XAUTHORITY} before reruning the test."
-	if [[ -n ${OCLGL_DISPLAY+x} ]]; then
-		export DISPLAY=${OCLGL_DISPLAY}
-		export XAUTHORITY=${OCLGL_XAUTHORITY}
-		ebegin "Running oclgl test under DISPLAY ${OCLGL_DISPLAY}"
-		if ! glxinfo | grep "OpenGL vendor string: AMD"; then
-			ewarn "${instruction1}"
-			ewarn "${instruction2}"
-			die "This display does not have AMD OpenGL vendor!"
-		fi
-		./ocltst -m $(realpath liboclgl.so) -A ogl.exclude
-		eend $? || die "oclgl test failed"
-	else
-		ewarn "${instruction1}"
-		ewarn "${instruction2}"
-		die "\${OCLGL_DISPLAY} not set."
-	fi
-	edob ./ocltst -m $(realpath liboclruntime.so) -A oclruntime.exclude
-	edob ./ocltst -m $(realpath liboclperf.so) -A oclperf.exclude
-}
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index f14730bad1d0..9de4a07a416a 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,17 +1,19 @@
 AUX rocr-runtime-4.3.0_no-aqlprofiler.patch 1084 BLAKE2B dfc2b9bbea0360fdbbd04988f0dbed76e53d8d9f9d2a5217f154e02e39f7b78f3408edb0204a93b6b4e927103b2c041788bd6befb8475d3f4e333bdc6ad19a0d SHA512 f90b92eb547640bc8cf71d042f12a55504371e4c3e624b02435c026e7ae9d5885e23a2be3a0f5c443fc502b3a1c8a03fdb5efabaeaabe8be33a28aab3ac9d9ca
 AUX rocr-runtime-5.0.1-cmake-install-paths.patch 2744 BLAKE2B fbbecdefbfabcbe4cd7f029e10d6abed94b492f94157839336adf83e98efe5c0e93dbb20856ca6adab32cb315bbd7b6c397c8fc48b66ea784cdbb3becb5f718e SHA512 db7ee8b87b526991a62c3cbfd385e85d27e05ba9a7f4726e8060d7ad29917e154bdcd0715e61a08210dad4b6112c731dfcab9e9f7e809b74da2f74c62a1eab72
-AUX rocr-runtime-5.7.1-extend-isa-compatibility-check.patch 3006 BLAKE2B 91de5e4c427678aa8623c1663dd044a2fde1f46ff450d167f516fb618ccdfe71713f3309146766350de171b43ecdab82fa7cc89ccf9bf2481b7f0c6e724fa8dc SHA512 2646741d75829ca22a142f520635586312884617e1747e53b9fa1e0f226e5ab7353b99c905a8cc0d6eda9bd74fb763b5e38e66e1ca342375444744393268c18a
-AUX rocr-runtime-5.7.1-musl.patch 3609 BLAKE2B 563a831a23f8d9515cca9cafc67355e631714c1f3f1eb02de02dd463db3da29cf75b055a8d3cb123a50039540941739e77a16dbdf8d16253785bec31e1577ad5 SHA512 99939293225a1015c280bbf1a01ea8e4cf53c2370ad940fa3b73c87ba84f87d24cd635e7dec4b5b6c28e25adc5ff6ccd7bee4ddec53e6b10c21bc7d9ae6bf73d
+AUX rocr-runtime-5.7.1-extend-isa-compatibility-check.patch 3003 BLAKE2B 203b65af267302440a9814c458296e969aab41ae4e83945e34a814037f66e620c9070721df288f25e93b0267b2e17d2d6e710c4b0ba741b83692ce65fdbd90b0 SHA512 5e0ffccce059ca79426ad1082d63c1687a22830fd919b5b643ea0d733b11040c0484f5f95f052cd7832d87c836eec97f362e79b60021dc8e833855785734a2cb
+AUX rocr-runtime-5.7.1-musl.patch 3923 BLAKE2B 9cc1abc84be25fe6432c50c227ce65f11526b0c53ee3f08aea79f4d14679943a6a68b55e56c1f14a75ed9c43d3e2dac21b3cfdfe8dc44bc0e21bd6e09b79fa1c SHA512 b44d292bc6dd1178bbc7885812db22cc96fc9e05509f175b59bc7d453dee5d58bfe45073f86f2496322a24cbd2986972f80b6495947dfcaa6838641a36690df8
+AUX rocr-runtime-6.1.0-ld-lld.patch 561 BLAKE2B 93ec03a4d758791ab0a88f9d80cf1f522681cf3d0cf4f020aa1014848dc607045b628d275a25bf9830c3f1a19342ae96b9bb026ae7a9513d5ba193774526c29a SHA512 83ebcac0ada1b8406a2f7277be5f3db0c71777009cfc8996c6f9317deb1f3846a25387a956f45c6aedcb8ef04cda0814ec7c6dcf1b369cb98f9ba8f3e774022d
+AUX rocr-runtime-6.1.0-musl.patch 3589 BLAKE2B b690a5c63ccd7056e8fc6699d0905933b55fac3d1015fa486cacf5713d43386d57131efdf8ab6b04625b11548e0e2d831a2ee83a3c65f71cc6353e456e98d223 SHA512 bb947984e747a9b772700934be3047e906f19469459f250986a36bf0fd7f0e3acbaaa9961fc18ceef13655070affb8dc4642b4957556b9941084348d9c62e0df
 DIST rocr-runtime-5.1.3.tar.gz 720567 BLAKE2B bdf2d258ec607ffc69264d48ce82c36787757b7809397d643a24abaa852f3cc217a57210fba760d4d11ef8ce2922dc1ef275d3b47a4bebc5c7b204bbbb5b7c66 SHA512 d47523ea2fe32fee832ca19b56a091f52e16b366db1c571f87e5599514b826376d49281e79ff0936dcaf7349f9becbc8ae9b3e9472a9c3e14b62a3f98d541b35
 DIST rocr-runtime-5.3.3.tar.gz 809871 BLAKE2B 1a44e88c34fcebcea3351de812f2ac64a7b151303c5bfc4066920755c185731388afff89c705afee6010d262f68358a20b1c0197e8f23c22ab24409eb55fde0a SHA512 27efe57954575549703b31c4a632548bf3d82df0f01d5f15485d0bda7efa6ec2ad0a4a8710b8f240ff57296eb62d3796926e32d16dfe448b188d8264fde0ef8b
 DIST rocr-runtime-5.4.3.tar.gz 811062 BLAKE2B 4ee8ef49cdac7f6918db3aa96089852847d093aacc11ed7e7157a6eb512cf36a3d37396670c14ea24b16b1127c4547977390694d05bc6006ac48b40e707d6dae SHA512 29f13a1b16ef457071cc050227d57cda92992f416ebc074f8cd5a856d9bd76fd34ab2ccb53c21c3d798165282d44bba287ef44a9d1da327ee198e1facc77a4db
 DIST rocr-runtime-5.5.1.tar.gz 816175 BLAKE2B e588d98cbd0d9a753b950ba676d6cddeed8cd094f346b2f67a761ac2d760ba28e27d5baceecf13fff53c114bb8412c8a4d892886c304d36181d5b0b020b8088a SHA512 1cae2ae4f30a248fa27622ed8b77ce112b80aed9bc1b8fc4372143d4ef241f47295a77f9e978be1332f48c06a7cbcdfd478dbc8464028cb761480049ab2413fb
 DIST rocr-runtime-5.7.1.tar.gz 832009 BLAKE2B 67e4a64ee03b1f6edc43923c7ac44113ab58f78b032dc0a01952b2dd5b2ca37404044811effb9c8d83002ac4ea344a5d95ac62f3c66012bff2884ef55285cdb5 SHA512 a6547a104303032244d17b662a3eda48039732c215debb6178c0af8842c01c60f80989793420c101bd554e58332d215205da0c228dfc25538c56499f47dc6832
-DIST rocr-runtime-6.0.0.tar.gz 851206 BLAKE2B f45f72719e4146fc5c6755b34625de60900a84a7f97fc559d641409edbbda73132c9cf784d59c4ccfdc3f0a1902e379db68d565f92420a8128a04483c50831dd SHA512 18d79436a93b9f57ffa0d4db670e0f2b05c5b9826c9323c7c2f8c856f650a10e5c4b7f6e55e2750156f3859a289617ac40128cfb6fe25de918ee5d8e4b6a8095
-EBUILD rocr-runtime-5.1.3-r1.ebuild 1489 BLAKE2B bddcaa60234f530822d4f96ea90c4c178f91af3933c70fad0269287ba97d0a6243626dd88e2d31c62ac3dda7e6bc8abaf50836357d2d512befbbd0a0f2aaf112 SHA512 7a84de93ae70e158d7bb09318c38cc5e4251f5831ab07f0f022b35de87d2140e03f5ce8decc5aa80e67a0c436131753577aa52d1d7c62f0e419e3307e45b63e9
-EBUILD rocr-runtime-5.3.3-r1.ebuild 1305 BLAKE2B c0da341c96374676aeca634dfca42bbacb095b9dede470e5afec2f50f8b4889c09dca7ffed0d4ca6b99540cc306a1b97277fae53414dbb4861c5dd4b99e6b8c1 SHA512 b9e9874db0b956d9a987daf5c26aed6a283b2dd6b26998cc5e24488c223f61e9d73e35a5aa06a5f35e28ab48bfc4e7c1674175a90b29d98d7f1413f7e5d34a1d
-EBUILD rocr-runtime-5.4.3-r1.ebuild 1516 BLAKE2B e979a0fe77e9c811e7c24e1b357b3544e4439dcdda4c0b4e1817f2d628225a98ce6dd92f00b3b450169fe46f8e8c2d234c075d3a2134e1b78972a396c332eb40 SHA512 3b798668c823764eb2755ef934c36270f9f0a6d0403a2a81962280716ef02892d07c48e306b117ec8c15cf43f92ac998af2fa9deb30390360efefa30c2810128
-EBUILD rocr-runtime-5.5.1.ebuild 1305 BLAKE2B 53721d8a44f2325720ed0f096329a43f54128237ce9d6e1fed5bb2a14f64254d94cbea9f53539874f3b1b2360c8aa70187138eecff0d77f1a36f5fa884615225 SHA512 fc2317d2a91429d53cd1ecca30e455938850a512350538e8f4fbf8fecd7cb45055c82b65f7f62115040185e3689da83b36182b23f2096bea663cd23de525b270
-EBUILD rocr-runtime-5.7.1-r2.ebuild 1566 BLAKE2B b19f33db23b17d8719535781ebb933774b041bc79b13dc3c25c4f7f51c1ed159ba86d11c38c4ddbabeaa0b4020836354625b59d067cb914d8d64fc4d7844813b SHA512 8c9da7d2551cc54b6f5f12b53ed79d05076f99a0ad38a2ad5c07401b6894ca5a5fbb582d81a55498ab8527baa48b3bdab48628fef30ca977e690c2a00f25379d
-EBUILD rocr-runtime-6.0.0-r1.ebuild 1502 BLAKE2B 7d6bf1797f9b65251fc83789530b0e79875fc7f36e787c07c7b1f7d531821ced17eca651e8b98d55759411fc1b851a8506022cbcd5ba2664e865e7464f05a1f5 SHA512 d3b8b6b5dbcc8c86e145d1e8644d636e3d7263ec5546fdc0dd220c5883dbf17582bbdb8e405baf7ba8de52de0210a92f443c813ff10e8dda0d59b9b820b768ee
-MISC metadata.xml 515 BLAKE2B ccb566413bfb5e7027d1596b040f6c957dc8d58fc413859c4a08fbd484ab16d536948bcf24cdd1edd5bdc8a4951b5abe6adbb3da6fde37e5a9ba1bdcfd312827 SHA512 6d0f0ab69b8f04a9106d71003f17c00e693b42c03aa5c430ebb03f7ffb3ecb8f4b10128fd22462692b97870c23e85aa3f037433fa65c55a342d64038f0db5a93
+DIST rocr-runtime-6.1.1.tar.gz 903611 BLAKE2B 175e7267bfd9d70fb805135e765004cf2b43b2d66354f0cef857d417c8dac4ce7638ec1b90a1088324aa5f90ed8354c66b56846115368d68d622a215350d84dd SHA512 5e6e28dee29ef9df9d617f56038b2e52022738d5510833cd8e1738defe1049d0a957db4d9f63bbf55d8efca3a4ea349b95919dd1b6b35b9814ebba575a67af57
+EBUILD rocr-runtime-5.1.3-r1.ebuild 1522 BLAKE2B 2c1cada684235b8df5607ed5b231893ee8dea67c17b9c09d621a1da5c0f6109c025c7269aefedfcb645c978d8e875747b515e009f2c1a11942baa25ac5477fa5 SHA512 975e107ce7a8f3ce69bbc1e62758b8bed1fb985e83ec3513d0487b39062f11cc2cdcd3303e19ed8bce079b3eea24d05ac6dc7bc9761e304ecd8d5eca1a4d5149
+EBUILD rocr-runtime-5.3.3-r1.ebuild 1338 BLAKE2B ea4f2e9ec203d60464f9e54333f65f966cb3e60a9b075d94b68d28d6dec85935d6af65021ce33091f56d474d677509b34e90fa8f8eae0b7e6f590eb9c8155f87 SHA512 33317cb38c39421d1974c38b70c9b58c89dd602f4ed7a80585e2df08cad93cca7b9911bfd7207eabf995a52ebb9b647ee0c9d9f423eb8da4b09e5dd02c754039
+EBUILD rocr-runtime-5.4.3-r1.ebuild 1549 BLAKE2B 331d55c9204f77774d8bee7ea056367273ba3e3867b0ff8b0eb305dd2915d217c92d4d0183dca2df1848df15bd629542a9b893ffecee045ce8222dc141d7b962 SHA512 778832bcce9185113430aa17254245f193f1689c786f3cd0268104ea09b0b743722524750292f9c61ada4813e816039bddb92971598f02d361748bd5a270030f
+EBUILD rocr-runtime-5.5.1.ebuild 1338 BLAKE2B a65351876e310dd37f23b266836da7673659949d8c820c8d984b25d78d056aee519ac33bd6845dc47dd5bf53d95159086cb356d9d87f8b9f87c5b638c8939572 SHA512 f9087802ec8154d8f741c90a7fe554996531d721b140daaddc7708a533b8a3f3e23bd44edba8c81079e5981017a610442ef367444dbaebf7a522230675c023cf
+EBUILD rocr-runtime-5.7.1-r3.ebuild 1599 BLAKE2B 888ada488412b30170e5c00bf923ffd8bf6645819a323018bd7774b812ec4cee8b594fd9fdd8ff5b0e71cfd7c90ce9fa8e59fd5ab509c5115f1a0dc7cf5caa63 SHA512 5264f4a2759114e385d02199c47eb0c6d394f49cd51360a2ce5e9c69b98a22846771936f2b776acf50d9ece8c2464e75d8c2bed8587a172471427040caed7bf1
+EBUILD rocr-runtime-6.1.1.ebuild 1533 BLAKE2B 9ac67c36b8972c18566f3f891dd65f82627742597e8413d10c050a6a7516c99868a96a51138a039493f358db38d62c974661ec07b9e9acd45ce0e50b37f21eb3 SHA512 d35642542d43cb8f626ef318fde7b915f7cc60e43250fb96dd3b07557496f14e066586539a53ff4c9ec1bb85215b0ad4ae9f6eb5eead1f7ed384daddb0a17a92
+MISC metadata.xml 623 BLAKE2B bc808d06e4dd8c715a0abde57dba1fa02d563bed034e9cd4a8f50d78ed478ec1545aa0b42f6521ffa5c1ea57d456984c51af0cab39055201c4c04a4b46acc100 SHA512 d83b1e22d012536236067ac241b4b94f479e0adcd14a9e5647571f0550352e8d348965103183d51576e11414bb85714ded4222bfbb2a6464841b45e7644e8c2b
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-extend-isa-compatibility-check.patch b/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-extend-isa-compatibility-check.patch
index b12352e40c92..f0106abd6652 100644
--- a/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-extend-isa-compatibility-check.patch
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-extend-isa-compatibility-check.patch
@@ -45,7 +45,7 @@ https://salsa.debian.org/rocm-team/rocr-runtime/-/blob/master/debian/patches/000
 +        }
 +      } else if (code_object_isa.GetMajorVersion() == 10) {
 +        if (code_object_isa.GetMinorVersion() == 1) {
-+          const std::array<int32_t, 2> gfx1010_equivalent = { 0, 2 };
++          const std::array<int32_t, 1> gfx1010_equivalent = { 0 };
 +          const std::array<int32_t, 4> gfx1010_superset = { 0, 1, 2, 3 };
 +          if (Contains(gfx1010_equivalent, code_object_isa.GetStepping()) &&
 +              Contains(gfx1010_superset, agent_isa.GetStepping())) {
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-musl.patch b/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-musl.patch
index 0e8e53209738..13d731adb3a2 100644
--- a/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-musl.patch
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-5.7.1-musl.patch
@@ -23,6 +23,17 @@ Bug: https://github.com/ROCm/ROCR-Runtime/issues/181
  }
  
  hsa_signal_value_t BusyWaitSignal::LoadRelaxed() {
+--- a/core/runtime/hsa.cpp
++++ b/core/runtime/hsa.cpp
+@@ -155,7 +155,7 @@ template <class T> struct ValidityError<const T*> {
+ 
+ template <class T>
+ static __forceinline bool IsValid(T* ptr) {
+-  return (ptr == NULL) ? NULL : ptr->IsValid();
++  return (ptr == NULL) ? false : ptr->IsValid();
+ }
+ 
+ namespace AMD {
 --- a/core/util/lnx/os_linux.cpp
 +++ b/core/util/lnx/os_linux.cpp
 @@ -111,9 +111,12 @@ class os_thread {
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-6.1.0-ld-lld.patch b/dev-libs/rocr-runtime/files/rocr-runtime-6.1.0-ld-lld.patch
new file mode 100644
index 000000000000..fb5d3d341967
--- /dev/null
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-6.1.0-ld-lld.patch
@@ -0,0 +1,17 @@
+Fix "symbol not defined" when linking with ld.lld >= 17
+https://github.com/ROCm/ROCR-Runtime/issues/204
+--- a/hsacore.so.def
++++ b/hsacore.so.def
+@@ -246,12 +246,6 @@ global:
+ 	hsa_amd_vmem_retain_alloc_handle;
+ 	hsa_amd_vmem_get_alloc_properties_from_handle;
+ 	hsa_amd_agent_set_async_scratch_limit;
+-	hsa_tools_scratch_event_alloc_start;
+-	hsa_tools_scratch_event_alloc_end;
+-	hsa_tools_scratch_event_free_start;
+-	hsa_tools_scratch_event_free_end;
+-	hsa_tools_scratch_event_async_reclaim_start;
+-	hsa_tools_scratch_event_async_reclaim_end;
+ 
+ local:
+     *;
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-6.1.0-musl.patch b/dev-libs/rocr-runtime/files/rocr-runtime-6.1.0-musl.patch
new file mode 100644
index 000000000000..7554c8c79ec1
--- /dev/null
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-6.1.0-musl.patch
@@ -0,0 +1,106 @@
+Fix compilation and symbol search with musl.
+
+Bug: https://github.com/ROCm/ROCR-Runtime/issues/181
+--- src.orig/core/inc/checked.h
++++ src/core/inc/checked.h
+@@ -58,7 +58,7 @@ template <uint64_t code, bool multiProce
+   Check(const Check&) { object_ = uintptr_t(this) ^ uintptr_t(code); }
+   Check(Check&&) { object_ = uintptr_t(this) ^ uintptr_t(code); }
+ 
+-  ~Check() { object_ = NULL; }
++  ~Check() { object_ = uintptr_t(NULL); }
+ 
+   const Check& operator=(Check&& rhs) { return *this; }
+   const Check& operator=(const Check& rhs) { return *this; }
+--- src.orig/core/runtime/default_signal.cpp
++++ src/core/runtime/default_signal.cpp
+@@ -57,7 +57,7 @@ int BusyWaitSignal::rtti_id_ = 0;
+ BusyWaitSignal::BusyWaitSignal(SharedSignal* abi_block, bool enableIPC)
+     : Signal(abi_block, enableIPC) {
+   signal_.kind = AMD_SIGNAL_KIND_USER;
+-  signal_.event_mailbox_ptr = NULL;
++  signal_.event_mailbox_ptr = uint64_t(NULL);
+ }
+ 
+ hsa_signal_value_t BusyWaitSignal::LoadRelaxed() {
+--- src.orig/core/util/lnx/os_linux.cpp
++++ src/core/util/lnx/os_linux.cpp
+@@ -130,9 +130,12 @@ class os_thread {
+       }
+     }
+ 
++    int cores = 0;
++    cpu_set_t* cpuset = nullptr;
++
+     if (core::Runtime::runtime_singleton_->flag().override_cpu_affinity()) {
+-      int cores = get_nprocs_conf();
+-      cpu_set_t* cpuset = CPU_ALLOC(cores);
++      cores = get_nprocs_conf();
++      cpuset = CPU_ALLOC(cores);
+       if (cpuset == nullptr) {
+         fprintf(stderr, "CPU_ALLOC failed: %s\n", strerror(errno));
+         return;
+@@ -642,11 +645,13 @@ SharedMutex CreateSharedMutex() {
+     fprintf(stderr, "rw lock attribute init failed: %s\n", strerror(err));
+     return nullptr;
+   }
++#if defined(__GLIBC__)
+   err = pthread_rwlockattr_setkind_np(&attrib, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
+   if (err != 0) {
+     fprintf(stderr, "Set rw lock attribute failure: %s\n", strerror(err));
+     return nullptr;
+   }
++#endif
+ 
+   pthread_rwlock_t* lock = new pthread_rwlock_t;
+   err = pthread_rwlock_init(lock, &attrib);
+--- src.orig/core/util/utils.h
++++ src/core/util/utils.h
+@@ -74,7 +74,7 @@ static __forceinline void* _aligned_mall
+   return aligned_alloc(alignment, size);
+ #else
+   void *mem = NULL;
+-  if (NULL != posix_memalign(&mem, alignment, size))
++  if (0 != posix_memalign(&mem, alignment, size))
+     return NULL;
+   return mem;
+ #endif
+--- src.orig/image/util.h
++++ src/image/util.h
+@@ -99,7 +99,7 @@ static __forceinline void* _aligned_mall
+   return aligned_alloc(alignment, size);
+ #else
+   void* mem = NULL;
+-  if (NULL != posix_memalign(&mem, alignment, size)) return NULL;
++  if (0 != posix_memalign(&mem, alignment, size)) return NULL;
+   return mem;
+ #endif
+ }
+--- src.orig/core/util/lnx/os_linux.cpp
++++ src/core/util/lnx/os_linux.cpp
+@@ -65,6 +65,16 @@
+ #include <cpuid.h>
+ #endif
+ 
++/*
++ * d_un.d_ptr is relative on non glibc systems
++ * elf(5) documents it this way, glibc diverts from this documentation
++ */
++#ifdef __GLIBC__
++#define ABS_ADDR(base, ptr) (ptr)
++#else
++#define ABS_ADDR(base, ptr) ((base) + (ptr))
++#endif
++
+ namespace rocr {
+ namespace os {
+ 
+@@ -299,7 +309,7 @@ static int callback(struct dl_phdr_info* info, size_t size, void* data) {
+         for (int j = 0;; j++) {
+           if (dyn_section[j].d_tag == DT_NULL) break;
+ 
+-          if (dyn_section[j].d_tag == DT_STRTAB) strings = (char*)(dyn_section[j].d_un.d_ptr);
++          if (dyn_section[j].d_tag == DT_STRTAB) strings = (char*)ABS_ADDR(info->dlpi_addr, dyn_section[j].d_un.d_ptr);
+ 
+           if (dyn_section[j].d_tag == DT_STRSZ) limit = dyn_section[j].d_un.d_val;
+         }
diff --git a/dev-libs/rocr-runtime/metadata.xml b/dev-libs/rocr-runtime/metadata.xml
index 0e418bcc9837..5f0e6d6b486e 100644
--- a/dev-libs/rocr-runtime/metadata.xml
+++ b/dev-libs/rocr-runtime/metadata.xml
@@ -9,7 +9,11 @@
         <email>gentoo@holzke.net</email>
         <name>Wilfried Holzke</name>
     </maintainer>
+    <maintainer type="person">
+      <email>lockalsash@gmail.com</email>
+      <name>Sv. Lockal</name>
+    </maintainer>
     <upstream>
-        <remote-id type="github">RadeonOpenCompute/ROCR-Runtime</remote-id>
+        <remote-id type="github">ROCm/ROCR-Runtime</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-libs/rocr-runtime/rocr-runtime-5.1.3-r1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-5.1.3-r1.ebuild
index e7a6b4f59310..c6ead573fcf6 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-5.1.3-r1.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-5.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,6 +32,7 @@ RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
 	>=dev-libs/rocm-device-libs-${PV}
+	<=dev-libs/rocm-device-libs-6.0
 	sys-devel/clang
 	sys-devel/lld"
 BDEPEND="app-editors/vim-core"
diff --git a/dev-libs/rocr-runtime/rocr-runtime-5.3.3-r1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-5.3.3-r1.ebuild
index 2f9c72c2c2f0..50f9fd7ddbc1 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-5.3.3-r1.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-5.3.3-r1.ebuild
@@ -32,6 +32,7 @@ RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
 	>=dev-libs/rocm-device-libs-${PV}
+	<=dev-libs/rocm-device-libs-6.0
 	sys-devel/clang
 	sys-devel/lld"
 BDEPEND="app-editors/vim-core"
diff --git a/dev-libs/rocr-runtime/rocr-runtime-5.4.3-r1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-5.4.3-r1.ebuild
index 5ee12fb5d5ba..7e8bc2bfae70 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-5.4.3-r1.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-5.4.3-r1.ebuild
@@ -32,6 +32,7 @@ RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
 	>=dev-libs/rocm-device-libs-${PV}
+	<=dev-libs/rocm-device-libs-6.0
 	sys-devel/clang
 	sys-devel/lld"
 BDEPEND="app-editors/vim-core"
diff --git a/dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild
index 36f37da462ab..2ba50c9ad4d9 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild
@@ -32,6 +32,7 @@ RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
 	>=dev-libs/rocm-device-libs-${PV}
+	<=dev-libs/rocm-device-libs-6.0
 	sys-devel/clang
 	sys-devel/lld"
 BDEPEND="app-editors/vim-core"
diff --git a/dev-libs/rocr-runtime/rocr-runtime-5.7.1-r2.ebuild b/dev-libs/rocr-runtime/rocr-runtime-5.7.1-r3.ebuild
index b22b60ffa24f..57ea514d66ad 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-5.7.1-r2.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-5.7.1-r3.ebuild
@@ -34,6 +34,7 @@ COMMON_DEPEND="dev-libs/elfutils
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
 	>=dev-libs/rocm-device-libs-${PV}
+	<=dev-libs/rocm-device-libs-6.0
 	sys-devel/clang:${LLVM_MAX_SLOT}=
 	sys-devel/lld:${LLVM_MAX_SLOT}="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/rocr-runtime/rocr-runtime-6.0.0-r1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-6.1.1.ebuild
index 374dcec97554..06778711004a 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-6.0.0-r1.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-6.1.1.ebuild
@@ -3,25 +3,27 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic llvm
+LLVM_COMPAT=( 18 )
 
-LLVM_MAX_SLOT=17
+inherit cmake flag-o-matic llvm-r1
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
+	EGIT_REPO_URI="https://github.com/ROCm/ROCR-Runtime/"
 	inherit git-r3
 	S="${WORKDIR}/${P}/src"
 else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/ROCm/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src"
 	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Radeon Open Compute Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
+HOMEPAGE="https://github.com/ROCm/ROCR-Runtime"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.3.0_no-aqlprofiler.patch"
-	"${FILESDIR}/${PN}-5.7.1-musl.patch"
+	"${FILESDIR}/${PN}-5.7.1-extend-isa-compatibility-check.patch"
+	"${FILESDIR}/${PN}-6.1.0-musl.patch"
+	"${FILESDIR}/${PN}-6.1.0-ld-lld.patch"
 )
 
 LICENSE="MIT"
@@ -33,8 +35,11 @@ COMMON_DEPEND="dev-libs/elfutils
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
 	>=dev-libs/rocm-device-libs-${PV}
-	sys-devel/clang:${LLVM_MAX_SLOT}=
-	sys-devel/lld:${LLVM_MAX_SLOT}="
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+		sys-devel/lld:${LLVM_SLOT}=
+	')
+"
 RDEPEND="${DEPEND}"
 BDEPEND="app-editors/vim-core"
 	# vim-core is needed for "xxd"
@@ -53,6 +58,5 @@ src_configure() {
 	filter-lto
 
 	use debug || append-cxxflags "-DNDEBUG"
-	local mycmakeargs=( -DINCLUDE_PATH_COMPATIBILITY=OFF )
 	cmake_src_configure
 }
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index 997768492e70..bd29fcff0219 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -1,16 +1,19 @@
+AUX kfdtest-6.1.0-libpath.patch 431 BLAKE2B ba078dda302bddc7431ce8016271d895e0104f3779681ec2d89756f2b43679a7085bd9477868283b127ebed8a40dcf406f8c2a70369e470ebd52d6affd9a3e9f SHA512 b86538013763552963b7667657a3b2d0c946d5b989bf73523308c191b48902deda6c7a097dbc53851e979fcd72e150dc38ded0ed9c1e22f16e1466becb456217
+AUX kfdtest-6.1.0-linklibLLVM.patch 1087 BLAKE2B d0d8bea523995a1bd82f813e09958875806eabba78c54daf299df9cc129fd043377241896ce5e829676c6ba2fe3055b0eebb76478b6c9c80d8f76ebfb745159b SHA512 3c5ed615c2e3a6abc45fb931f25596d6d5d83de096f1057f24cdac2d7efbbfea58d369eb0b1eefa93fa67efb46600d8df20be4924efac3a73cd8fcec1cbcd491
+AUX kfdtest-6.1.0-skipIPCtest.patch 955 BLAKE2B af2c2f59acf24415746bf6d4179589b7c2e3e4c6292fccd2b2ebd9400f76543da8cc6d963a5e0fb62c407710d9c39fcd8f5a7d086eeb57a3c34ce8048a1e3bbe SHA512 286b0226a2e75de5a2d882c85bd9a4e5014683a5a95c11a9ee9d06f075af1ce15b276e570d2bd02e3ba9a572ae8f8bbea2fbeda9804312218cc2f34ccb636b58
 AUX roct-thunk-interface-5.7.0-functions.patch 335 BLAKE2B 590ee1b8f412836c9fae0e10d7acd91842f6dd9aa87dd40a7a8ea48596dc2a1aabf2dea69cc2924fa0b4467d8238bde42c58ac95415fc0324133ea4389f413a8 SHA512 a1961fb2d0636bdb1720abdf433ef4d0f5f69f48784efc45ed77dc8cdd7bc2433dc9aaec0ef9105db12e4d6a8a57d50ee1ffa7b0d42990be1d88ff668f7b15ba
 AUX roct-thunk-interface-5.7.1-musl.patch 1878 BLAKE2B c2103b5b8d76e3a637b79bb701308d7c1b2f6def76206e5a1e3841c12e92bec19a6e9a596238709ee4413072530dd984f7910be6bfc394622b34a93ad5cf1c9e SHA512 b5da199e15eb01a087bbc3600a7df5971029594a778ebfc71185320a662f0681a65fd55ad71ba3089e6a72745dfa1de5f637cb96fe8ab3510869e9fb272f5819
-AUX roct-thunk-interface-6.0.0-functions.patch 309 BLAKE2B 98644ddc99416d99da0c671e4b70607cb360831fd0f2a64f38e6f2f2c008d9c6b2fa24a1ac525cbbbdffabf918eaf84ce0c10db7a383e05ac30f6e999c6913f4 SHA512 136b42cac9dfb209594b6b88c4abd501e98d48dca1bd573443e414ab7098cfcac3789cecb3b625e8ed91d0d15fe1ef13668bf4da9f89d808838de9d348eba99f
+AUX roct-thunk-interface-6.1.0-visibility.patch 868 BLAKE2B d32fcc6a230af549b73db30183fcb2339fcd3bc68dfbf1f7dce0e35361a674f77cba58ef485c3212de43e95c5eabf517386c6b7a289e57ed38b5d6e21e191939 SHA512 6c540e70c53a602477943ff9a26d5eab3d02d8a3c8577b1e39d5baf5a3703de70073e1d0db5083d03460bdd1e2d2fff2cf6356e57d7e392ce4d4dac6bae74900
 DIST roct-thunk-interface-5.1.3.tar.gz 3178689 BLAKE2B c46af7bc60772beaa9a214a86a634290cfd7952589f70736c0c2544c0459eb4fdcc65030d897dbb67bfbaae545f529ac647397df3fcfeddeb5d5e05a283cfd6b SHA512 746a04e667ce242160d6e2519594fc93b205520dae28678859fbd40c3c641082aa6219c04c8e2b58289763a5244dd6336b56c2e2016ba671c5e5a6fb9ca5caea
 DIST roct-thunk-interface-5.3.3.tar.gz 646773 BLAKE2B 48632cad576ceccede0ee62663f226cbedba8374d8962028fd729a7b8e7eb75bebcb2f8ce06a838de15a388caea3d6dcb150db80f8d45a91675997b4f80625e6 SHA512 4a8730d16a0d240a43d5e22092325b0731d133733af0aac6c6893763d1ffb1a04a0c045d988835079581e097fc7c9e383f41ba84daa105c032d3a653b6b2c6b0
 DIST roct-thunk-interface-5.4.3.tar.gz 648897 BLAKE2B 9eefc5f417280a98c7c6b6d611d0d87fa52abca94f67bf5ecc10d84bb86433b5ff502f76aa6724245c7cf9d82b5c16c10943275e8d41f0053484765df5a901db SHA512 1787526515ec708edc398cdba308a8dfa32c2579524a6856a6f336cb7bfee8f9a00d67f1b489993c7454d1d88885032ce85ac752b4a15aaedef910f147aed3b5
 DIST roct-thunk-interface-5.5.1.tar.gz 649617 BLAKE2B 54ecae486e5d8b99363947a93b38bb80f6b129bbacc1b3152d58e44cf093e44254075cdc49f6d0f474a04c5e2a1f3945399a744892ac1e5c1fb3ff38fd02370c SHA512 359ce5c7d8fce1f6100aac236efd24d35ce8098732bf89225e7c07a4731452388b5213eda8767a8d7723afa2041033bbcb287dcb00e88a0df9494acf70f8ebaf
 DIST roct-thunk-interface-5.7.1.tar.gz 665529 BLAKE2B 407601d45976ad66e85999c53bcaa62fefa2ea823e1d3296a9aabe8b6a9c915776344de4499fcf6f9ee80193201308b27b387a7225aca5d2cc7e294143eefacd SHA512 c0dc449c8b713ac543f6cd6c876ea0f160dcb1a5c4a52a2b1364fcae0039e9fe195e4223a2644d7d3a7fbc2a48166e798d15b9088e2097b65974e2ba5e48bdcf
-DIST roct-thunk-interface-6.0.0.tar.gz 665726 BLAKE2B 634165c1dce2d4e2f635688ea54c0eb3dd0cf0a0ae84fbbf22f07f62675ad77daea168b16c73e7b4912a46b8507d414119310f31bf110475e27d4629209067d9 SHA512 136a512273823738a3a85330158099b33084018485c94cb20244d61b5f6932949d32eba1fe77512b0933f0269da2f5bcec4cef5b503dc810140a9c080cf65e0f
+DIST roct-thunk-interface-6.1.1.tar.gz 666377 BLAKE2B b30d733fb769f7169e97b8a28eaa61c84205aec06b55d662d24f159a3c84190f3252f090413769e56eb621abc789fae521cb7b26d7cdac952ff1e4e120707bc9 SHA512 2c579606d2ced9f8b5e32841db745819771b7d6ce0cef90b818e3710470e30c7715540125d99ed5ea13c4e672d5af6d8ad2dd5975ef76cab7ba993d86cf74eb4
 EBUILD roct-thunk-interface-5.1.3.ebuild 1107 BLAKE2B c8d1aad9be55420235043628caa570cfa5f9164c6a3d20c7d90a6cac385ad2c886c44a89f2d9181742f9c284067b0d0b078fb2ea04e44ac9f1a145505f4b9971 SHA512 08bce5619f4e5e163b23928c0088e7f022d0f9f95bfba4b4e237a74ade30a327bf3cf954590f9d788ab7a16dd4f90ff53bd3e87011866af1d68a200bbeeceb7f
 EBUILD roct-thunk-interface-5.3.3.ebuild 1107 BLAKE2B c8d1aad9be55420235043628caa570cfa5f9164c6a3d20c7d90a6cac385ad2c886c44a89f2d9181742f9c284067b0d0b078fb2ea04e44ac9f1a145505f4b9971 SHA512 08bce5619f4e5e163b23928c0088e7f022d0f9f95bfba4b4e237a74ade30a327bf3cf954590f9d788ab7a16dd4f90ff53bd3e87011866af1d68a200bbeeceb7f
 EBUILD roct-thunk-interface-5.4.3.ebuild 1107 BLAKE2B c5523fd9ba5475faf5b8bb4ea35a100f4049a8b008c3dec048e03b8e14b394f28b8b5515f7b93c94774c75304e2df7ef745e9538eae5309c6faa569748d32551 SHA512 dfc0e032b61667c9171900f36bc7f18df0e67635e8988d91a8041c298053d9c977adf123af2326e7986bbe00f45ea3ec3e3630ff0993279cfd7becbb5492fc36
 EBUILD roct-thunk-interface-5.5.1.ebuild 1055 BLAKE2B a2341ff457f5ee2754ee8cb63a68b90ee67074946d39ab064fa8838b8fa5d0239f330b2751d233c3038b3988a40486d9df7715df0fd26a6677c5789982679c1f SHA512 49819d214fde8e77f8ca051d9dc44af03472a17e0509aa92812a416bff9008577d3a5bbf96fed12315ce3bd1655641f71ac721d2440b7031927e883475c648fe
 EBUILD roct-thunk-interface-5.7.1-r1.ebuild 1149 BLAKE2B 31bacc1a1123eac6afe14c9dacf150cf64c8ac85b46e7f4ad386b9e3d8b06b6a2264210f021123218c42c74c87a849f34327baeb648ffd5269276f31302a7151 SHA512 f58abcb15dcbf13d0ef5c148430e2de70345831ad693fa2c2fca2e586e5625a8252c6a57f9ec0d2a75c4f92ba7267acffd985cbc91d8ba157a3e13a952fecf76
-EBUILD roct-thunk-interface-6.0.0-r1.ebuild 1149 BLAKE2B 6b2697ae965530cee6d036a370376ded734acadf93970bb4ef6636cbb0245b122e5153a462496395fad1d41daf1e4901c5c21b5464824e81a249997ab61a79e2 SHA512 249cc0a47b0cd2c59c5c2e4e946973154b18aaf9d9c2ac4c68dcd08b4b289080e52baaa2290f60c5ae29dbf3f4256f56e4b35a3f267514e06403914b994a97e9
-MISC metadata.xml 674 BLAKE2B ceb6cc04ddd9f957a765c89bfe83de382412c5d04bce87e3fa9c0fdfe72fa2d24e597aa47287488463fa34d85a91556d2b7ea073b19c341a48045c9e7f51f9f3 SHA512 8cb0feb4d6ea9d3de4a45a9be0de498b5ebb36a779af03e58f5c04593082e5bd618614c1daf2707f3bb1de019bf88292605669e2be48d9bede6e708c39aae7e2
+EBUILD roct-thunk-interface-6.1.1.ebuild 1865 BLAKE2B dea59c6a6f34bded83edffaebdbea338857050ec782c87a29e0bcab40a20782f383f029b782776ab4f8e11c8e56e6d41a62ef88485be281cc442239d7af2abef SHA512 bc61c903a352b5ea1a5f453fe0aa37361e028af2b277bce9a300a52dbd34aa3dd26ae9a9286acf4e569a4175ebdccaf98cf215a20ae9a039e1343a7cf81d8a84
+MISC metadata.xml 661 BLAKE2B c019c853506c550339b18a7f1ab57fd5f2876309823bab923ef07f7f997d820c2664ae5c0c1d2e29c2ccdf613f96cdaf85d92a3734aeb105c392847aed73c76b SHA512 194cdad18f2be9fb4d895ff75b4ce9c6a59443caad443061ea70a8cc4778ec13ca35273c8018ac1d00c7ecd146302ee4bf856ad653a174a1ad281d235b6e12e9
diff --git a/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-libpath.patch b/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-libpath.patch
new file mode 100644
index 000000000000..1d7d73ad7a8a
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-libpath.patch
@@ -0,0 +1,13 @@
+The built hsakmt library is right under BUILD_DIR, not BUILD_DIR/lib
+===================================================================
+--- a/tests/kfdtest/CMakeLists.txt
++++ b./tests/kfdtest/CMakeLists.txt
+@@ -117,7 +117,7 @@ else()
+ endif()
+ 
+ if( DEFINED LIBHSAKMT_PATH )
+-    set ( HSAKMT_LIBRARY_DIRS ${LIBHSAKMT_PATH}/lib )
++    set ( HSAKMT_LIBRARY_DIRS ${LIBHSAKMT_PATH}/ )
+     set ( HSAKMT_LIBRARIES hsakmt )
+ endif()
+ 
diff --git a/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-linklibLLVM.patch b/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-linklibLLVM.patch
new file mode 100644
index 000000000000..61d8b99bf335
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-linklibLLVM.patch
@@ -0,0 +1,31 @@
+https://github.com/ROCm/ROCT-Thunk-Interface/pull/102
+From 6d7d48bb6843405aac2777388edf4c7c2a6f9dc3 Mon Sep 17 00:00:00 2001
+From: Yiyang Wu <xgreenlandforwyy@gmail.com>
+Date: Tue, 30 Apr 2024 13:35:08 +0800
+Subject: [PATCH] Allow linking libLLVM dynamic library rather than separate
+ components
+
+---
+ tests/kfdtest/CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tests/kfdtest/CMakeLists.txt b/tests/kfdtest/CMakeLists.txt
+index 9d1172e..ccad7f4 100644
+--- a/tests/kfdtest/CMakeLists.txt
++++ b/tests/kfdtest/CMakeLists.txt
+@@ -154,7 +154,11 @@ include_directories(${LLVM_INCLUDE_DIRS})
+ separate_arguments(LLVM_DEFINITIONS_LIST NATIVE_COMMAND ${LLVM_DEFINITIONS})
+ add_definitions(${LLVM_DEFINITIONS_LIST})
+ 
+-llvm_map_components_to_libnames(llvm_libs AMDGPUAsmParser Core Support)
++if (LLVM_LINK_LLVM_DYLIB)
++  set(llvm_libs LLVM)
++else()
++  llvm_map_components_to_libnames(llvm_libs AMDGPUAsmParser Core Support)
++endif()
+ 
+ include_directories(${PROJECT_SOURCE_DIR}/gtest-1.6.0)
+ include_directories(${PROJECT_SOURCE_DIR}/include)
+-- 
+2.44.0
+
diff --git a/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-skipIPCtest.patch b/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-skipIPCtest.patch
new file mode 100644
index 000000000000..cca728dad601
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/kfdtest-6.1.0-skipIPCtest.patch
@@ -0,0 +1,20 @@
+Issue: https://github.com/ROCm/ROCT-Thunk-Interface/issues/103
+===================================================================
+--- ROCT-Thunk-Interface-rocm-6.1.1.orig/tests/kfdtest/scripts/kfdtest.exclude
++++ ROCT-Thunk-Interface-rocm-6.1.1/tests/kfdtest/scripts/kfdtest.exclude
+@@ -63,6 +63,7 @@ PERMANENT_BLACKLIST_ALL_ASICS=\
+ # failures can be found
+ # NOTE: If you update this alphabetical listing, add the corresponding JIRA ticket for reference
+ #
++# KFDIPCTest.BasicTest are not compatible with upstream amdgpu kernel module
+ # KFDQMTest.GPUDoorbellWrite fails intermittently (KFD-318)
+ # KFDQMTest.mGPUShareBO (KFD-334)
+ # KFDHWSTest.* (SWDEV-193035)
+@@ -72,6 +73,7 @@ PERMANENT_BLACKLIST_ALL_ASICS=\
+ # KFDDBGTest.SuspendQueues (SWDEV-417850)
+ # KFDDBGTest.HitAddressWatch (SWDEV-420281)
+ TEMPORARY_BLACKLIST_ALL_ASICS=\
++"KFDIPCTest.BasicTest:"\
+ "KFDQMTest.GPUDoorbellWrite:"\
+ "KFDQMTest.mGPUShareBO:"\
+ "KFDQMTest.SdmaEventInterrupt:"\
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.0.0-functions.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.0.0-functions.patch
deleted file mode 100644
index cbea737c4b4c..000000000000
--- a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.0.0-functions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/libhsakmt.ver b/src/libhsakmt.ver
-index 15c2916..c04cefe 100644
---- a/src/libhsakmt.ver
-+++ b/src/libhsakmt.ver
-@@ -81,6 +81,7 @@ hsaKmtWaitOnEvent_Ext;
- hsaKmtWaitOnMultipleEvents_Ext;
- hsaKmtReplaceAsanHeaderPage;
- hsaKmtReturnAsanHeaderPage;
-+hsaKmtGetAMDGPUDeviceHandle;
- 
- local: *;
- };
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.1.0-visibility.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.1.0-visibility.patch
new file mode 100644
index 000000000000..d907d2f13e41
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-6.1.0-visibility.patch
@@ -0,0 +1,26 @@
+https://github.com/ROCm/ROCT-Thunk-Interface/pull/102
+From 8385d8795b994f31e00e651dc4f41e18d82ff968 Mon Sep 17 00:00:00 2001
+From: Yiyang Wu <xgreenlandforwyy@gmail.com>
+Date: Tue, 30 Apr 2024 15:07:12 +0800
+Subject: [PATCH] hsaKmtCheckRuntimeDebugSupport should be visible for kfdtest
+
+---
+ src/debug.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/debug.c b/src/debug.c
+index 932e829..67c32c8 100644
+--- a/src/debug.c
++++ b/src/debug.c
+@@ -268,7 +268,7 @@ HSAKMT_STATUS HSAKMTAPI hsaKmtDbgAddressWatch(HSAuint32 NodeId,
+ #define HSA_RUNTIME_ENABLE_MAX_MAJOR   1
+ #define HSA_RUNTIME_ENABLE_MIN_MINOR   13
+ 
+-HSAKMT_STATUS hsaKmtCheckRuntimeDebugSupport(void) {
++HSAKMT_STATUS HSAKMTAPI hsaKmtCheckRuntimeDebugSupport(void) {
+ 	HsaNodeProperties node = {0};
+ 	HsaSystemProperties props = {0};
+ 	HsaVersionInfo versionInfo = {0};
+-- 
+2.44.0
+
diff --git a/dev-libs/roct-thunk-interface/metadata.xml b/dev-libs/roct-thunk-interface/metadata.xml
index 9af2c0cba14b..67fd1c7363cb 100644
--- a/dev-libs/roct-thunk-interface/metadata.xml
+++ b/dev-libs/roct-thunk-interface/metadata.xml
@@ -14,6 +14,6 @@
         <name>Proxy Maintainers</name>
     </maintainer>
     <upstream>
-        <remote-id type="github">RadeonOpenCompute/ROCT-Thunk-Interface</remote-id>
+        <remote-id type="github">ROCm/ROCT-Thunk-Interface</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-6.0.0-r1.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.0.0-r1.ebuild
deleted file mode 100644
index eb0384989522..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-6.0.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Thunk Interface"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl"
-DEPEND="${RDEPEND}"
-BDEPEND="x11-libs/libdrm[video_cards_amdgpu]"
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.0.0-functions.patch"
-	"${FILESDIR}/${PN}-5.7.1-musl.patch"
-)
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-6.1.1.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.1.1.ebuild
new file mode 100644
index 000000000000..8f599ac5ce48
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-6.1.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_SKIP_GLOBALS=1
+inherit cmake linux-info rocm
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ROCm/ROCT-Thunk-Interface/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ROCm/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/ROCm/ROCT-Thunk-Interface"
+CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl
+	x11-libs/libdrm[video_cards_amdgpu]"
+DEPEND="${RDEPEND}
+	test? ( sys-devel/llvm
+	dev-cpp/gtest )"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CMAKE_BUILD_TYPE=Release
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7.1-musl.patch"
+	"${FILESDIR}/${PN}-6.1.0-visibility.patch"
+	"${FILESDIR}/kfdtest-6.1.0-linklibLLVM.patch"
+	"${FILESDIR}/kfdtest-6.1.0-libpath.patch"
+	"${FILESDIR}/kfdtest-6.1.0-skipIPCtest.patch"
+)
+
+test_wrapper() {
+	local S="$1"
+	shift 1
+	local CMAKE_USE_DIR="${S}"
+	local BUILD_DIR="${S}_build"
+	cd "${S}" || die
+	$@
+}
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
+	)
+	cmake_src_configure
+
+	if use test; then
+		export LIBHSAKMT_PATH="${BUILD_DIR}"
+		test_wrapper "${S}/tests/kfdtest" cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+	if use test; then
+		LIBRARY_PATH="${BUILD_DIR}" test_wrapper "${S}/tests/kfdtest" cmake_src_compile
+	fi
+}
+
+src_test() {
+	check_amdgpu
+	TESTDIR="${S}/tests/kfdtest_build/"
+	cd "${TESTDIR}" || die
+	PATH="${PATH}:${TESTDIR}" ./run_kfdtest.sh
+}
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index e8498268c87b..83137560cd86 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -10,7 +10,7 @@ DIST simdjson-3.9.3.gh.tar.gz 2643869 BLAKE2B f2e0f8d13a234c7ee639a57333b66a4643
 DIST simdjson-3.9.4.gh.tar.gz 2646588 BLAKE2B c0f0e5d6af2342d338ea7fbe033af2715e4317cd81818fca9dfcc04cb25ffe1eb08683f04d43162305d317178b14ed5f78e8ffa115ed02c7af41b8646c4eae76 SHA512 6fa940ad60b7560d1865806195428ae17f0daf19de803bdb7bd93b0704490994ec3cddc09c9d91f2e70036c6cb34153cdc5c998e7ebee2e4504f6a23944e25c1
 DIST simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 EBUILD simdjson-3.6.3.ebuild 2332 BLAKE2B cfb050fa5fe9a2b74827ef1a9efe5405adb332236b293f021b9a0f85da76b5b2101ac0d561a1d5651112df08b96630048e9a5f08d5473bcd66e871fd69026f20 SHA512 7abbfc31053a3f54a0fe59db9d94572567408c3425a7cea0d9c22b6da78dc4112d63ff5d7f188b8b52605aa9cb5f89ccb7c0367f9235c77e9cc5c1615404d704
-EBUILD simdjson-3.9.1.ebuild 2385 BLAKE2B f9be2e9c133672fbf90a45604999b4252b727b25fa6621766670b8ecf5e506b94f387b89c713099603d1ac9ad00697240cc92c824f0d7f6a41a9033541804a79 SHA512 86f6968c66f014facdbf3897f963b8ecf3c975403c66d797d5a1d83881f2b489c135336654ec0e153ec3820939c7a460789bc93d7e91995171315d0e5adc45d9
+EBUILD simdjson-3.9.1.ebuild 2383 BLAKE2B 37f1d129e44f955d3566d83f9bd2ec4227cc3949dad9bec06459ab0152629b28a73e60607de0b623aabcc01ed563226db995b7704070be9f2f0ef8af8f01fdf3 SHA512 6b23fb1013dd34c6e6314f53710a1f12abe1bd7869d628e8080490f1b31a40aed78cafd03102c21e87da5762ebc918d0c13f351dc73427e7d34977ae28e13b74
 EBUILD simdjson-3.9.3.ebuild 2386 BLAKE2B b72abcecbd25a448b0e11dda74dde6a698d23bf3f5ee00ca494f1d335706199eaea0522934d59eb1b0c36c372d44100defe689d0600b506dc2944d46a912fca9 SHA512 564dfc942f35b143da0077ea107119ebbb7ccb68ebd370eb0e8173da54dc5aad817c482ddb326ebe242d057f95dd2b58edb1c98f5d24cde3260e1e4a9fcc8f52
 EBUILD simdjson-3.9.4.ebuild 2386 BLAKE2B b72abcecbd25a448b0e11dda74dde6a698d23bf3f5ee00ca494f1d335706199eaea0522934d59eb1b0c36c372d44100defe689d0600b506dc2944d46a912fca9 SHA512 564dfc942f35b143da0077ea107119ebbb7ccb68ebd370eb0e8173da54dc5aad817c482ddb326ebe242d057f95dd2b58edb1c98f5d24cde3260e1e4a9fcc8f52
 MISC metadata.xml 417 BLAKE2B fa60b19f3372b1794fa5d83a0767e1eaed6569bf314cd74bb14baee7aee454c83ae0268cebd46bee877dd46472e735ee23136983f991d63d7ff3d64f0b7bb258 SHA512 a3afde0d4740ffc6e8f26c5d937d141bdec24f59082a89232962e1d75513a51cb050d1b93b439450051f05281f206e06a5052f67037d685a95ee4e28e7ece113
diff --git a/dev-libs/simdjson/simdjson-3.9.1.ebuild b/dev-libs/simdjson/simdjson-3.9.1.ebuild
index 03dcee295b1f..0702c1b700bf 100644
--- a/dev-libs/simdjson/simdjson-3.9.1.ebuild
+++ b/dev-libs/simdjson/simdjson-3.9.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
 SLOT="0/22"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
 IUSE="+all-impls test tools"
 
 BDEPEND="
author	V3n3RiX <venerix@koprulu.sector>	2024-06-27 07:59:40 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2024-06-27 07:59:40 +0100
commit	d2ed973482fdd800013658e83a61709b29e0a80f (patch)
tree	57ea7666a57b5a05a4c8866e4915e90b4a6e7c94 /dev-libs
parent	9f6a82a85d400d6ae7de04c43cee88dbc6bc4da0 (diff)