gentoo auto-resync : 03:09:2023 - 10:18:27

23 files changed, 548 insertions, 0 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index a7a3d9727662..882302412559 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index ac46d9301b97..a9797b502e03 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -1,6 +1,7 @@
 AUX 0001-COMGR-changes-needed-for-upstream-llvm.patch 2391 BLAKE2B 2873fa0aad01ad90c9140e54219e40ada995ed69ae9ebe83d79b8a8e674f23bf63a49457d6795cc78260df63ceed8407512edb205d8a3378a217cd3286c8de1f SHA512 83b1b0b2b2baf2ff36ef2d8aadf4083ba8c83f9df56753850780bbb025fde8f4714ac9437c78116d374577b9183f7c7ac9f3f9215ab576359720905900469789
 AUX 0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch 2249 BLAKE2B 50208a5f2bed91d52eeec4f192cae5fe57d5f43221dd6333ed8e95ac3e0047588952ab2ca2188d4b401354032ddfa24b83a0e8e8e416748249001910abd2ef55 SHA512 cc9a3cab03d0d7c930b667bc61ba0404448d4ac1c3adf708c994c8e0f9d49232edc3beb1209ebe72990e97793f7b34ae4c9f68745343e07f6fa873989c12a14d
 AUX 0001-Specify-clang-exe-path-in-Driver-Creation.patch 2098 BLAKE2B 0bb6902e322ba6354f5cf31b6b7b842d0db43a1f14293edf228c31bb299a336267c573f5ddbc2bacb0525468625b98b260cc81d1cdd7fa43cdf6e484404b3f5b SHA512 26bce5f9fbd964774945e1b056985aead0a9dedb0c85256eb7b9556f5a196cff9aae6441afc9a6f4fe3e7f7178ce4f6032fa7c3b9c7b4dcdacf1d26c0011195c
+AUX 9999-include.patch 280 BLAKE2B 7aaa03a8628350967ee94257fc84f73f97ef673710ed9cbdf851b3a258b5bc9ff5a0dbbb8fc3f79e236ba68da2935c672867d932c7ea5b8cf0dd88addf7854c1 SHA512 69b40ed5cfa018d45f9c76eb85351ef28401be44967f2ecd56ee8a15e7f3f52221636b93c2d3c6cada896562559abb5f8141a33cfb7906b6809490dbbaa3de29
 AUX rocm-comgr-4.5.2-dependencies.patch 1255 BLAKE2B 544a23e8066a2b308e2f90bfaf7e538ebe9b4becd5d84f3c4e8d563c01148e298c556fcec8639861749ba4cf838bf73e98a8231e0d19faeda6ea5d7df8459629 SHA512 4f7be98945217fca917b788f3ac93f9d5356d410d3c17f5fadda753d6bd5121c57ecc2c758c430f6d4a2997bc61b5d54b3b8be6f6af1d575c0190c635cb64426
 AUX rocm-comgr-5.0-rocm_path.patch 419 BLAKE2B 2adfe03cd86d84b1f183689e5feff298860c22b12a87bddf357d746d96f2e4df3de3d01962138e02b7670b28a7884d4b16fe9f52f937a22caf931e74bd46de21 SHA512 1ca24101e3c296127a7b429f0f6b05bbff388a0db2d4ffc3003844353ca43ddf0d95c4f13c902b841d748c19cfa11c39a300786af04919da3919b8aa7724fc1a
 AUX rocm-comgr-5.1.3-Find-CLANG_RESOURCE_DIR.patch 3434 BLAKE2B d5841e32974bb8750ff7d9d32256c13823b26a7d200c603162c66b04dc55ae0e5ee795a449f2e6f35a2bd2efddb5c67b03499d2aa4e441fbe54a5f8178e167a5 SHA512 d0da78fbbbdc9ee3bb4f0d4f98b2321913f9ad197edd1c0128c4785d14134646a5f8b9a1b75e268111dcb4dff872c0b8db398b475fa8b28c83324ae5801bd279
@@ -13,10 +14,17 @@ AUX rocm-comgr-5.3.3-HIPIncludePath-not-needed.patch 632 BLAKE2B ce681da93373691
 AUX rocm-comgr-5.3.3-fix-tests.patch 553 BLAKE2B f4227305c4c2c91d3fd1e9ad7fdc4477132002cd6cde8e7e9abd3f336978ff0ee9560f4f6216498c330c769cc3d65f52c2191d0298f3f82b0693bc4d3c4c0d4f SHA512 e2c6d3a9315469e4e53d0067bfddfe5d014a546b789ba7fd672204d4324c4fb19a4cdcdeb5bc8855e53cd5607e60e31677241993f4de1989aa68ce4ea5943706
 AUX rocm-comgr-5.3.3-fno-stack-protector.patch 546 BLAKE2B 81da0bbc5405433600b60be432997134b4e7369814021e5c3a3bc1b88aec33c891de496f4d2af34c3c46742def8679092c0c6b1680babf58026d5e6e1ede7806 SHA512 f1a8da61c722f9c7ca0ceeab29f1032e5b488223a0c38a118608d75c2e4ab482625fffa75f8c85d1cb8dc9dd3b76ee8405e62405dc6e71ae6521c08acef23026
 AUX rocm-comgr-5.3.3-remove-h-option.patch 2060 BLAKE2B 593c3aebc4c9eeb387bd88ef31dc8e9a40434ef2497ee96f6dcad816a7e098c657987355e82c15566dbc71a168fcc5f584469903d8222d71c63bf68c0ae315e1 SHA512 2364449ed85963adbfa2a80a9a6e15e7a73ae642c17549da02fdc6878d93857d61f18d862cabfb7d56b27b052cb3de8abbc8c9d25a2d3f54288b15a6da293775
+AUX rocm-comgr-5.5.1-fix-tests.patch 567 BLAKE2B 21fc4121c75d6510e5a263388a0129cd9a1a4e4d1c47124774cd4372ad0323349fca303c5dc71d451c0c2fe108b8f176c577c4c4021c84ba2687a3e4d94196eb SHA512 175e27600dac3505bbac14d559dfa44785feae693eeeb658ba99e27db888815fc335b8a648234478adb51ef7cafca0b762e9227ac2c3d601d81b88d9d1f24e41
+AUX rocm-comgr-5.5.1-lld-include.patch 795 BLAKE2B c2e58f098f751c015154c8b9c775a5e2ed9bd84d3ffab3a1d90535ef44ce51542d4bf2a104be464df85e0059543444f69b5e6dc9e55a607f4e1133dae173a6cb SHA512 e223c2d341d05f10868a59856794229b8ec7066de5c264c1b0b014be3eb0c82ee5966c33d2c69b721661b7c51194d02d2afecb49dde4fb542a78c15db0f12780
+AUX rocm-comgr-5.5.1-nullopt.patch 785 BLAKE2B 329f60db229bd8f75821c213b108c2342fc1083e9f82f516c40e96318c36a69de1be9865bf4ef5dc03864fd2646018f2150a04547e4ac60283042f2a3db6ced3 SHA512 f3f08decdca3b8619e724d79e826744c8da19d748b49701a6a221b2762c9a7b5bd882530e1c80ffd19e20a1794d86f9c557ede9a9ce703ca21a2d1739da45b69
+AUX rocm-comgr-5.5.1-opt_mrelax.patch 955 BLAKE2B b68c0681defcc63a09b425af49ceb2bd0ebd70f784014bd9121fea7b00ee090d855c544cee4312cfcbbf86b8205d25d36ac623c741d6dccb537aa27ddb9e584f SHA512 e26d8befea08034a2bfbb4cd13ffd418b95d842b8915ffb6129395ec4ab334917ee5a368e85a09f1bfc2b8021dc293327b2b3f56462267aa5e964e6500348cee
+AUX rocm-comgr-5.5.1-subtargetfeatures.patch 1133 BLAKE2B 6a138bd5abee576c78e005745bb66c2beecb35737c02850f74f7877a9b204c0789d3fbbfd0815502b86602125f32b1b27cf131ffd216ec6a3e064606f8ec1b50 SHA512 0ca10166aa1c13f74a48468547d841fd173319fcaccacba00c7f70f61383095515a57eb5b97707f01d9859667ed2479da8d6f30253c39a8777c76bc1974c77a1
 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
 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
 MISC metadata.xml 526 BLAKE2B d2c4b5c4210cd4ae436bc205ec6c6d0e2690edc99250e508b64f3abbf0f7b4a61b27cb627d9453ff6432cd683fb7f51460b4e821ce7614880e68854121297db5 SHA512 5cf80a58a6791b404d33577fa1cd199791ad4348d0e18d2ba9d8e1665cfc5a19c7d37cfe265c77c060bc886f24ce28b592c6b7d541531faaf62e5440b732d2e7
diff --git a/dev-libs/rocm-comgr/files/9999-include.patch b/dev-libs/rocm-comgr/files/9999-include.patch
new file mode 100644
index 000000000000..58770c819967
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/9999-include.patch
@@ -0,0 +1,10 @@
+--- comgr/src/comgr-env.h.orig	2023-06-07 02:39:28.039489253 +0200
++++ comgr/src/comgr-env.h	2023-06-07 02:39:58.502264137 +0200
+@@ -38,6 +38,7 @@
+ 
+ #include "llvm/ADT/Optional.h"
+ #include "llvm/ADT/StringRef.h"
++#include "llvm/ADT/None.h"
+ 
+ namespace COMGR {
+ namespace env {
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-fix-tests.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-fix-tests.patch
new file mode 100644
index 000000000000..9fd14df196a2
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-fix-tests.patch
@@ -0,0 +1,17 @@
+Vanilla LLVM does not support calling AMDGPU_KERNEL across different sources/bitcodes.
+Without this patch https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/issues/45 occurs.
+Reference: https://github.com/llvm/llvm-project/issues/60313
+===================================================================
+--- comgr.orig/test/source/source1.cl
++++ comgr/test/source/source1.cl
+@@ -35,7 +35,9 @@
+ 
+ #include "include-a.h"
+ 
++void kernel source3(__global int *j) { *j = FOO; }
++
+ void kernel source1(__global int *j) {
+   *j += 2;
+-  source2(j);
++  source3(j);
+ }
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-lld-include.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-lld-include.patch
new file mode 100644
index 000000000000..96df9291eb86
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-lld-include.patch
@@ -0,0 +1,22 @@
+From 271fddf65f43675e675f0cb4e9aaa3d27d34c58a Mon Sep 17 00:00:00 2001
+From: Ron Lieberman <ron.lieberman@amd.com>
+Date: Thu, 29 Dec 2022 05:17:41 -0600
+Subject: [PATCH] [llvm merge] add include of lld/Common/CommonLinkerContext.h
+
+Change-Id: I5767b4c1e683e9df9146804ba23ef3c0c0b6c07a
+---
+ lib/comgr/src/comgr-compiler.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/comgr/src/comgr-compiler.cpp b/lib/comgr/src/comgr-compiler.cpp
+index 2a7362a..bb1c9d3 100644
+--- comgr/src/comgr-compiler.cpp
++++ comgr/src/comgr-compiler.cpp
+@@ -39,6 +39,7 @@
+ #include "comgr-compiler.h"
+ #include "comgr-device-libs.h"
+ #include "comgr-env.h"
++#include "lld/Common/CommonLinkerContext.h"
+ #include "lld/Common/Driver.h"
+ #include "clang/Basic/Version.h"
+ #include "clang/CodeGen/CodeGenAction.h"
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-nullopt.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-nullopt.patch
new file mode 100644
index 000000000000..8bb07b55a3ab
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-nullopt.patch
@@ -0,0 +1,23 @@
+From e1da67c6acb2b0e4a8f9c05c89e3778252ea5aa7 Mon Sep 17 00:00:00 2001
+From: Ron Lieberman <ron.lieberman@amd.com>
+Date: Sat, 17 Dec 2022 19:58:26 -0600
+Subject: [PATCH] None -> std::nullopt
+
+Change-Id: I1cc241aa47de538f9f5b1c12cb5655aca8a4502f
+---
+ lib/comgr/src/comgr-env.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/comgr/src/comgr-env.cpp b/lib/comgr/src/comgr-env.cpp
+index 742f4d4..6ab6f0f 100644
+--- comgr/src/comgr-env.cpp
++++ comgr/src/comgr-env.cpp
+@@ -53,7 +53,7 @@ bool shouldSaveTemps() {
+ Optional<StringRef> getRedirectLogs() {
+   static char *RedirectLogs = getenv("AMD_COMGR_REDIRECT_LOGS");
+   if (!RedirectLogs || StringRef(RedirectLogs) == "0") {
+-    return None;
++    return std::nullopt;
+   }
+   return StringRef(RedirectLogs);
+ }
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-opt_mrelax.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-opt_mrelax.patch
new file mode 100644
index 000000000000..aa3e7c370a53
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-opt_mrelax.patch
@@ -0,0 +1,23 @@
+From b582dfb33fdb51065c22800fe02dd83207185664 Mon Sep 17 00:00:00 2001
+From: Ron Lieberman <ron.lieberman@amd.com>
+Date: Sun, 1 Jan 2023 10:35:49 -0600
+Subject: [PATCH] [llvm] move to inverted OPT_mrelax_relocations_no
+
+Change-Id: I95e48e8acf5b9124d25e5e7b86c418f1a0d9389d
+---
+ lib/comgr/src/comgr-compiler.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/comgr/src/comgr-compiler.cpp b/lib/comgr/src/comgr-compiler.cpp
+index bb1c9d3..95c1bb4 100644
+--- comgr/src/comgr-compiler.cpp
++++ comgr/src/comgr-compiler.cpp
+@@ -259,7 +259,7 @@ bool AssemblerInvocation::createFromArgs(AssemblerInvocation &Opts,
+     }
+   }
+ 
+-  Opts.RelaxELFRelocations = Args.hasArg(OPT_mrelax_relocations);
++  Opts.RelaxELFRelocations = !Args.hasArg(OPT_mrelax_relocations_no);
+   Opts.DwarfVersion = getLastArgIntValue(Args, OPT_dwarf_version_EQ, 2, Diags);
+   Opts.DwarfDebugFlags =
+       std::string(Args.getLastArgValue(OPT_dwarf_debug_flags));
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-subtargetfeatures.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-subtargetfeatures.patch
new file mode 100644
index 000000000000..340df3852fc2
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-subtargetfeatures.patch
@@ -0,0 +1,26 @@
+From 48c682d577a7955256d0bfac5d497b3feebff11c Mon Sep 17 00:00:00 2001
+From: Ron Lieberman <ron.lieberman@amd.com>
+Date: Mon, 16 Jan 2023 14:29:05 -0600
+Subject: [PATCH] [llvm merge] Move to Expected on SubtargetFeatures
+
+Change-Id: I060ceaa2b51eaa6ed1b472ea42c6788b98001088
+---
+ lib/comgr/src/comgr-objdump.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/lib/comgr/src/comgr-objdump.cpp b/lib/comgr/src/comgr-objdump.cpp
+index 86a5d7f..6d20a3c 100644
+--- comgr/src/comgr-objdump.cpp
++++ comgr/src/comgr-objdump.cpp
+@@ -1270,7 +1270,10 @@ void llvm::DisassemHelper::DisassembleObject(const ObjectFile *Obj,
+   const Target *TheTarget = getTarget(Obj);
+ 
+   // Package up features to be passed to target/subtarget
+-  SubtargetFeatures Features = Obj->getFeatures();
++  Expected<SubtargetFeatures> FeaturesValue = Obj->getFeatures();
++  if (!FeaturesValue)
++    WithColor::error(errs(), ToolName) << FeaturesValue.takeError();
++  SubtargetFeatures Features = *FeaturesValue;
+   std::vector<std::string> MAttrs = lld::getMAttrs();
+   if (MAttrs.size()) {
+     for (unsigned I = 0; I != MAttrs.size(); ++I) {
diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.5.1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.5.1.ebuild
new file mode 100644
index 000000000000..e005c30f1efb
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-5.5.1.ebuild
@@ -0,0 +1,64 @@
+# 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=16
+
+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.3.3-HIPIncludePath-not-needed.patch"
+	"${FILESDIR}/${PN}-5.5.1-fix-tests.patch"
+	"${FILESDIR}/${PN}-5.3.3-fno-stack-protector.patch"
+	"${FILESDIR}/${PN}-5.3.3-remove-h-option.patch"
+	"${FILESDIR}/${PN}-5.5.1-nullopt.patch"
+	"${FILESDIR}/${PN}-5.5.1-opt_mrelax.patch"
+	"${FILESDIR}/${PN}-5.5.1-lld-include.patch"
+	"${FILESDIR}/${PN}-5.5.1-subtargetfeatures.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-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index a150a1063115..e78b214bb36e 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,10 +1,14 @@
 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 985 BLAKE2B a47bb820cca7a727453f9888a018065dfe679e7c23cc91f1d1ee3cee21f6c2fb47b23abbaa917ee3ef74d567e0f853efed4522ec1d03d76a5170b7ff018a196c SHA512 39524b263069f86c40051db9cf21ebf78b2a72739e08c0a5564ea352f7206f8b32f4715f1c322a8f8b43dd86cf3c09e0677205bb2ada0775f6b6cc7ec0555f8d
+AUX rocm-device-libs-5.5.1-fix-llvm-link.patch 681 BLAKE2B 1f28e1c92295caec2b50d576830ba896b82c92fe93db9243e4f397c9fde2de090e3f7f8c13ec8a0371d95978807642b433f4dc8b1644595da7f7576fe6b12a35 SHA512 6205cdb17692b4ebbce9f6a0e910c50ed9bd628d1863716f98e87857002399a3edbec3b9c50291c453262d0c169ed62ada5889fb1c735af04fd97623514e1fb2
 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
 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
 MISC metadata.xml 378 BLAKE2B d4defdfb2ce3bab811d9c2ac75b92b7892d46d87dad9f89c26cde140b3b167b43bf4022128dee45e063e332d6dfafc3ee8d78b0112909a7ce2d4a4a44c6cfa14 SHA512 0732d51019f0d27ffb1ffea32d76cad8a6d82927cb8788ff983cdb8dcc472015dbe36ba568bda7459d0b32837e89e1a32064ab7dfcefd2b88458cbb4438f452a
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..79b61d1517e0
--- /dev/null
+++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.0-test-bitcode-dir.patch
@@ -0,0 +1,20 @@
+--- rocm-device-libs.orig/test/compile/CMakeLists.txt	2023-05-02 15:23:15.413157017 -0000
++++ rocm-device-libs/test/compile/CMakeLists.txt	2023-05-02 15:32:10.411515448 -0000
+@@ -30,6 +30,7 @@
+      -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})
+--- rocm-device-libs.orig/test/compile/RunConstantFoldTest.cmake	2023-02-01 15:17:33.000000000 -0000
++++ rocm-device-libs/test/compile/RunConstantFoldTest.cmake	2023-05-02 15:33:44.634752384 -0000
+@@ -16,6 +16,7 @@
+   -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-fix-llvm-link.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.1-fix-llvm-link.patch
new file mode 100644
index 000000000000..f965045b7e7b
--- /dev/null
+++ b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.5.1-fix-llvm-link.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/851702#c4
+Adapt to libLLVM.so instead of the seperated libs
+===================================================================
+--- ROCm-Device-Libs-rocm-5.0.2.orig/utils/prepare-builtins/CMakeLists.txt
++++ ROCm-Device-Libs-rocm-5.0.2/utils/prepare-builtins/CMakeLists.txt
+@@ -26,5 +26,5 @@ set_target_properties(prepare-builtins P
+   CXX_STANDARD_REQUIRED Yes
+   CXX_EXTENSIONS No)
+ llvm_update_compile_flags(prepare-builtins)
+-llvm_map_components_to_libnames(llvm_libs support core bitreader bitwriter)
+-target_link_libraries(prepare-builtins ${llvm_libs})
++llvm_map_components_to_libnames(llvm_libs support)
++target_link_libraries(prepare-builtins LLVM)
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-5.5.1.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-5.5.1.ebuild
new file mode 100644
index 000000000000..6d104bcdde4e
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-5.5.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake llvm
+
+LLVM_MAX_SLOT=16
+
+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.4.3-Revert-Update-counters-for-gfx11.patch"
+	"${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="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index 6eeacfd4fd48..3041fe549052 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -7,11 +7,14 @@ AUX rocm-opencl-runtime-5.3.3-gcc13.patch 791 BLAKE2B 6b284cb6cd9b273ee6d21850f7
 DIST rocclr-5.1.3.tar.gz 618606 BLAKE2B 02b7732ddd03c0883bee49c56466cd21c649159f801bfb2537eea6e640c65613eb57b37d942f465a9deb83d65735f51212dde5e4f77ba8239d1a6b7037e1800c SHA512 89fd2eca39ed84a1cf525b2c606089ef39f64c1f997c4880e10722da6de4864110752640e1508db1aeb9d15c48ba4e6fe5dbe7a9e56718853ece42548028b2ca
 DIST rocclr-5.3.3.tar.gz 625944 BLAKE2B 0cdbc1415a355e1d56628834846aaa8587c9827eeea59f4312b788e868265dcb42197181fd5ef411416da2e11662c7f665f578aa750ab88c3a5405bcc58ee449 SHA512 3f85532cffc09c2ca8e7cd1770263d1c1a38633ed2bc5cfe62072e12a6f8f669db400519950718be31f6b77693d372e2ef905f06c7f02e126aa9ff7d2da97924
 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-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
+DIST rocm-opencl-runtime-5.5.1.tar.gz 991802 BLAKE2B 07d955b4a76b11296259287f5878cadc2438350a3abcdb5bd693c02790ff4c330b1d0a2a87f8de5334b3e3459c26b3fdf695886502ec5d2c373d807c242c8f93 SHA512 06786e818002dc43f64e4b0aaae0a0a2bcdad7acdb4662e1215d43277b107d65fb9a7f7441c31e3378c380cac860b1cd2eaefb5753246beffa4d9c10efced85e
 EBUILD rocm-opencl-runtime-5.1.3.ebuild 3887 BLAKE2B 322c7eb5d35c8d9468da57da8d9b10e449cbaacb08e3c70241ac050f0feefb4a88cbb14921dea89d4d04944ee3c532c83c351e6e85663f1c36e65710d34affa2 SHA512 b17251f136606344e2264a40401ec965fb7a4f54efebe138735a9b9f59be34c99838a43cee070daeea4996051dc30a64b79542c679eed7fce4139849042f0478
 EBUILD rocm-opencl-runtime-5.3.3-r1.ebuild 3464 BLAKE2B bb991c34e75068a9c91c21afcd60e20130c0d056792080bb1b6e16fdc0ca60129f4efc984c3a50dc3435f47fdd126752d762d45e5ee521a61691cdab1881465b SHA512 8606a190d00a3f32145ae43f402e6e034adca05c888fa13e27be4866da3a214f4c79faa5112ed6e0f0e0666f5dff48c285d9fe443c2261d30906430b1388fc3d
 EBUILD rocm-opencl-runtime-5.4.3-r1.ebuild 3865 BLAKE2B d54114f6c6946beae67cd4748a9ae462e9b35de81b4fc6bd59775d6ffa71532eceda9e7e1a9c5a6ba21ccb1ed4f5d7fffa62945647629c6752dc11c2acfc281c SHA512 2aeafd80fdca860d06d296b1da791a61440c698b00cf1e3fb289864e613fc7d26baa2f6b25590d424aa1ea5aaf65f8c3827040029ee0de8e6159f3dd6497e1de
+EBUILD rocm-opencl-runtime-5.5.1.ebuild 3836 BLAKE2B 9780ffdbdf472cb0974dff1df640ee384b190735eca870f84830f6a0b50b942311957aecf4e7a2de5e3bf3dfd0e8cf8ddd41348cc967a84add7bd4ec50245fa2 SHA512 4ff353c488400fbf3cc10deac7117dbf8c95672b03d5e738adb4ad488eb9f26f37f17e22a30bdbc5e1ee2777af3b1ba4cd2c89f56149ec7f28f3dee6bc661119
 EBUILD rocm-opencl-runtime-9999.ebuild 3745 BLAKE2B 91635003fa3f6b7a8a18bf5c784628a920cf293526512df45db5db73d46b478389fb06d186b828e88a61bad93f47b40a75a7f79e6504d36e425f2f9973f663f0 SHA512 d497db6298a1811b43b537d81f780c38d8daa748c674497744327bf7a499854e3317d53a696ba4d6778d9b66fb226be4dcd1d52eba56cb0947e5045caa8a0944
 MISC metadata.xml 525 BLAKE2B 9af34c6be2bb5ff304e4d01810b810eb8a0639d1972325fad3b81c93aa4d060cbebddc9c06da702dd80f9aa98549720cf2bc674d5b11ef6f99ed30efe50d2110 SHA512 c50670dde49ec0d9d3acca19d37842ecf567429f455e1b37c5181e5d4361d829eff0980ba35096ef42c0789f8904d52425faf4a2aabf641142722957b626378d
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.5.1.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.5.1.ebuild
new file mode 100644
index 000000000000..4ee8c36fb4d8
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.5.1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2023 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
+	KEYWORDS="~amd64"
+	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"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/rocm-cmake-5.3
+	media-libs/glew
+	test? ( >=x11-apps/mesa-progs-8.5.0[X] )
+	"
+
+CLR_S="${WORKDIR}/ROCclr-rocm-${PV}"
+PATCHES=( "${FILESDIR}/${PN}-5.3.3-gcc13.patch" )
+
+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"
+	eapply "${FILESDIR}/rocclr-5.3.3-gcc13.patch"
+	popd || die
+}
+
+src_configure() {
+	# 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 de482cb1cc49..99f5c2ab67ed 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -3,7 +3,9 @@ AUX rocr-runtime-5.0.1-cmake-install-paths.patch 2744 BLAKE2B fbbecdefbfabcbe4cd
 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
 EBUILD rocr-runtime-5.1.3-r1.ebuild 1489 BLAKE2B bddcaa60234f530822d4f96ea90c4c178f91af3933c70fad0269287ba97d0a6243626dd88e2d31c62ac3dda7e6bc8abaf50836357d2d512befbbd0a0f2aaf112 SHA512 7a84de93ae70e158d7bb09318c38cc5e4251f5831ab07f0f022b35de87d2140e03f5ce8decc5aa80e67a0c436131753577aa52d1d7c62f0e419e3307e45b63e9
 EBUILD rocr-runtime-5.3.3-r1.ebuild 1556 BLAKE2B 4554d25ea988cb2c4b0520691544525288cb57dbaf53b79e06552f3f3c508f52efb9a796f8f1b4fca6e98984ad56ec6c29f50b1777a7f324d0a870ef911a3773 SHA512 861e2b6f917698fa2a0a6bdcfe988c18a1bd2a7b2f5a036cdf09af161b244534ce0daa596dc2a5073e586132a14fdc58128f867f83adeef31355402de607db30
 EBUILD rocr-runtime-5.4.3-r1.ebuild 1767 BLAKE2B 56cac1aa980f509aace3c24344384375f6896f889d24a48ffed04db8f2e7f6a23bf1f5abb1511f1bc624e6b94e00b1147c8996cbb16cb7a4adde6c5a65eba68b SHA512 f41eb9d3621681723276e569e3d663c9bcff4834127a4f6e346486814f1f4f49a6a5be8f14409ff9514798455f22766a1ed4dc8b6a6ea2d02f2ce8f5de53d6b5
+EBUILD rocr-runtime-5.5.1.ebuild 1767 BLAKE2B d40d4db7f5d5609fc324944e64df866acdde567f5be2f85006ae0c1f56180e5c0c7e4ebcc87e884c5dd824111886b46a72a368eb66e7cb9c694e2d2398182d83 SHA512 c443449775b064e691aaa068903b8fd65e710e447fe88d2a33a7a22e5a2eca22fc1b18985ce8d7c20e49fc6c33fba7fe0fa7ec0ce884c0775f5c53963a12210c
 MISC metadata.xml 515 BLAKE2B ccb566413bfb5e7027d1596b040f6c957dc8d58fc413859c4a08fbd484ab16d536948bcf24cdd1edd5bdc8a4951b5abe6adbb3da6fde37e5a9ba1bdcfd312827 SHA512 6d0f0ab69b8f04a9106d71003f17c00e693b42c03aa5c430ebb03f7ffb3ecb8f4b10128fd22462692b97870c23e85aa3f037433fa65c55a342d64038f0db5a93
diff --git a/dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild
new file mode 100644
index 000000000000..4d026cf3ce50
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic llvm
+
+LLVM_MAX_SLOT=16
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/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"
+	S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
+PATCHES=(
+	"${FILESDIR}/${PN}-4.3.0_no-aqlprofiler.patch"
+)
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="debug"
+
+COMMON_DEPEND="dev-libs/elfutils"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/roct-thunk-interface-${PV}
+	>=dev-libs/rocm-device-libs-${PV}
+	sys-devel/clang
+	sys-devel/lld"
+BDEPEND="app-editors/vim-core"
+	# vim-core is needed for "xxd"
+
+src_prepare() {
+	# ... otherwise system llvm/clang is used ...
+	sed -e "/find_package(Clang REQUIRED HINTS /s:\${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm:$(get_llvm_prefix ${LLVM_MAX_SLOT}):" -i image/blit_src/CMakeLists.txt || die
+
+	# Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
+	sed -e "s:-O2:--rocm-path=${EPREFIX}/usr/lib/ -O2:" -i image/blit_src/CMakeLists.txt || die
+
+	# internal version depends on git being present and random weird magic, otherwise fallback to incoherent default value
+	# fix default value to be more better
+
+	sed -i -e "s:1.7.0:${PV}:" CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	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 2af988a85291..fa0bca019921 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -1,7 +1,9 @@
 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
 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 1107 BLAKE2B c5523fd9ba5475faf5b8bb4ea35a100f4049a8b008c3dec048e03b8e14b394f28b8b5515f7b93c94774c75304e2df7ef745e9538eae5309c6faa569748d32551 SHA512 dfc0e032b61667c9171900f36bc7f18df0e67635e8988d91a8041c298053d9c977adf123af2326e7986bbe00f45ea3ec3e3630ff0993279cfd7becbb5492fc36
 MISC metadata.xml 674 BLAKE2B ceb6cc04ddd9f957a765c89bfe83de382412c5d04bce87e3fa9c0fdfe72fa2d24e597aa47287488463fa34d85a91556d2b7ea073b19c341a48045c9e7f51f9f3 SHA512 8cb0feb4d6ea9d3de4a45a9be0de498b5ebb36a779af03e58f5c04593082e5bd618614c1daf2707f3bb1de019bf88292605669e2be48d9bede6e708c39aae7e2
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-5.5.1.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-5.5.1.ebuild
new file mode 100644
index 000000000000..3f391bf5d5e0
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-5.5.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 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
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+	sed -e "s:ubuntu:gentoo:" -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/tree-sitter-c/Manifest b/dev-libs/tree-sitter-c/Manifest
index ec18e2fa02f2..3af5724dbd4b 100644
--- a/dev-libs/tree-sitter-c/Manifest
+++ b/dev-libs/tree-sitter-c/Manifest
@@ -1,3 +1,5 @@
 DIST tree-sitter-c-0.20.2.tar.gz 249711 BLAKE2B f5f0ef1b15ba0fc216c082c973d6a52e79affb6075bc7fcf04e7ff93209b4624f4e9b414440fe6d20c0ea0bed5f3d96f538237c2fa365b919d6c280f98cc54b4 SHA512 ac559ee1d29bb77ce3cade02cfa4ed95c24cea7b84844df6521ebbf6213894c6f91499eb782e04e5e778091300f0043d59b9324a78d72d9bea4f40cc67d56cc1
+DIST tree-sitter-c-0.20.6.tar.gz 337801 BLAKE2B 96dfe37535aca85d2bae15af0a2d59a99bd6861a9a32957b6ae9a4fe02ac1a8e8c4f649760e5eccf68f224b30992aa1656a8b3e11da8a3bb43e07c62f4b26063 SHA512 047b47ef9190f3894083be2b8b26dd33c06d87bba6b960e63e9787112b374a76e2239171b89bb346a27b886396c2054a4ecc1e42d4f83a23ab62060907fe2198
 EBUILD tree-sitter-c-0.20.2.ebuild 303 BLAKE2B 435ab2be5213292ef6f33d2205fd20ac83125cceea4f47a47f46a96f463571730293e793f36057c0dcf48d8d248d0c02b57cfcffa8554212a4f44856fe59b5e3 SHA512 fb5066c75625d3988bad9c9ff7a07d1444208f5339af409b02f104a94facaf79f6b4097ca43484d20987304e64f4e9db0c1dd97f84676b58051381ff4d7ff258
+EBUILD tree-sitter-c-0.20.6.ebuild 304 BLAKE2B 70fd74cffe435fc6ef71f20cd0b814a8f34e4cb236b7971a26af5557e73384f4163c9f3855c4c271b62f88243a2004fea5a0cb96fcc11f68ea57cfd9924fe67a SHA512 292ea495a1b81251d2ab858b74b12d1172d61d31b135e74d835c5f8a1f8e133962cc3637926460f39a410d94af296c83509bbdf53fe0cc27a78b9bd92db66373
 MISC metadata.xml 443 BLAKE2B c991c80494cc1964b793eb2ff67aaf92cd85c5d18c1a223bd61b09e9714a314c3594af86cfcaf55e11d5788e80f68578e8b7ffadfe63c0ab0adb2d250b05bb16 SHA512 e62b93fb4eb9f7a0bf2cdc2f8a25fc099f55289c040eec3d4f51a26e2497d6c6695e110e9019d435227856ef33da97677845e6a6b21fa0cb964acb309202c166
diff --git a/dev-libs/tree-sitter-c/tree-sitter-c-0.20.6.ebuild b/dev-libs/tree-sitter-c/tree-sitter-c-0.20.6.ebuild
new file mode 100644
index 000000000000..5aa5533817ab
--- /dev/null
+++ b/dev-libs/tree-sitter-c/tree-sitter-c-0.20.6.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="C grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
diff --git a/dev-libs/tree-sitter-cpp/Manifest b/dev-libs/tree-sitter-cpp/Manifest
index d801d7785b32..6385e1596cc8 100644
--- a/dev-libs/tree-sitter-cpp/Manifest
+++ b/dev-libs/tree-sitter-cpp/Manifest
@@ -1,5 +1,7 @@
 DIST tree-sitter-cpp-0.20.0.tar.gz 504679 BLAKE2B 654f72f7a56a66dccf437ba5a2b2b5f627358ae58aeaafe9a507e0876443937d42b244ddb34b8a72a6723c28e6c10c95851b1fdb2775b3080c344426c0386e4d SHA512 c97d02c8250c93721ed5b951c97cdb1cf6558e20cbef353a33c9937f6b3116e328bbdd4e9e7a70a23dba3e144cbd6318e37ebbb9b6345ac085c62100d09ff34d
 DIST tree-sitter-cpp-0.20.0_p20230410.tar.gz 715821 BLAKE2B fa867ce4e16dd1044007cf366bc711a6eb85dd6fee11796aa32d9bcee4ffbec3b83b7cd56333d5d79c3eb5e6f6e966291626d6edbb7660aed4b4e144caa18e60 SHA512 0d48722962909a708eec0c401e08f71f9eb3e742dc6bbdb0cfc9cb2b31c187b222866f279346de68726811db461f12fa6b1453bafe49d64f6c340a94a6a7abe6
+DIST tree-sitter-cpp-0.20.3.tar.gz 1056333 BLAKE2B 3b1fc2509da265b2f49ec1a9bef7b005b06eba0311432af9e2e97977ec3a568a8ee531375f5330e624675f5b12711c4cf3306959ec82d21f1017380fb6e28b7a SHA512 62630953cb873dccbf6203b90ac6bd62fb596a615c71603c93b4fdc1e21d456c8f6ba74576e9e86732dbce2b7deaa082ea35eddf7fd7387d1ba13236757dfaab
 EBUILD tree-sitter-cpp-0.20.0.ebuild 340 BLAKE2B 7538b5354dec7d1cc491ec4844de1c83a4b9321db37d5af571771a43f82ee9b8ea8eaf2a9aff7e1fa43c2aaf24fbee9a04019a05b6e296caa0435d576e421b51 SHA512 3dc1780ce9527836c585267b63591352ba5b1bea3d4b0c7caa0d4d5f36ec2419cff2bcc5cf05f8dc849f23a55154995cfb13e96a1cca1f846c3a0297fd10d6c2
 EBUILD tree-sitter-cpp-0.20.0_p20230410.ebuild 681 BLAKE2B 1d72270c1e739f09ca656746545fab1e36aac4ca3b33ba3ee6b52f768f7d9b865a2a36c06d92cd2d496068da6df12ca4ece827312fff3feac9c0fb431838a82b SHA512 a01af87f1c55d9cabb7dbe441c1820134dcc34f153bf55823b6ab44b12f2270a301ac974677fd89051fad49f0fe73798bda4ef9ac4db1877a893fbdb5a08a306
+EBUILD tree-sitter-cpp-0.20.3.ebuild 365 BLAKE2B ec697fad9f7d67fb8e75a4ef0f780bcd440bd0df908cbfb8709d196e12f3a75ab827b76582754ca69d6ee291fc13bc3cbc0f428029b81b0334aa333290e9c2af SHA512 c6eb7d96ad8373709255ba81e1bf93765eace004fe7b538021714bffb4e17ed2525fbf7a9a934baa9647772bb0404b8230735c0665d6708a2019c2a0292cd315
 MISC metadata.xml 445 BLAKE2B 38d48d1eecf642f04f8e069f60c9676668736864260ba6e59bb0ba1d67992a18267afbd2854e9455974d8f4db3179c7cb78c34411f8b838f677494023a87e6c3 SHA512 525b59cf53de56d7168998af64fa2b8bbce684defc2e3cecfcdec6e68aa8fa0adb45a4b2afcaff7dc5f4678a69db124785d9d1ca21dd73702bc90a2f3cd6e207
diff --git a/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.3.ebuild b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.3.ebuild
new file mode 100644
index 000000000000..57119f7c66b2
--- /dev/null
+++ b/dev-libs/tree-sitter-cpp/tree-sitter-cpp-0.20.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="C++ grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-cpp"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+
+# requires test data from tree-sitter-c
+RESTRICT="test"