gentoo auto-resync : 14:02:2025 - 00:13:14

author: V3n3RiX <venerix@koprulu.sector> 2025-02-14 00:13:14 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2025-02-14 00:13:14 +0000
commit: 4fda045f90a4e301329bddb766e2e12a0b4401de (patch)
tree: 1d486767bfd9de15d6c11d341408385eb7f7debe /dev-libs
parent: 965058196f44550f3bc491dd85064071e085b776 (diff)
67 files changed, 237 insertions, 2551 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ac03b23129ad..4703bf80df12 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 11c1a5abe77e..6aa9f9b79d60 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -2,5 +2,5 @@ AUX appstream-1.0.0-disable-Werror-flags.patch 1297 BLAKE2B e8b9bc262d39332f5390
 DIST AppStream-1.0.3.tar.xz 2644220 BLAKE2B cd7aa28b49c23229ee48b9a69e57a08244f81115e23525695e463930d2296daf80b5c7bb098c89726c220caec8c3e072fd85d77ac808e96c5cf2ff0488ba4ba1 SHA512 9b70d965966d55dbcc6a62d85525fdd5990a28abb1d94b2df91ab1549c24ce9c40d95e2d761c2f24e0c61fe5b74ab6a1f829dda387a8282aa9dff9198dc9610d
 DIST AppStream-1.0.4.tar.xz 2719900 BLAKE2B e8b3ca6092d4cddf73e5f902ac9d5e071d9eb31d8b206fd814e2078f5bcfcba1683e97beccaea9e7024da0285d77c63fb426e3b3d17f15c3add332e964e313d3 SHA512 ea0f9e226401b6c5a004676d14d01c195da295269169807bc956dbfd1d4f4b2b4ba61fe905fbefbe3c562a502c31fc869aba9e87c490dcac1d861f50038d14f1
 EBUILD appstream-1.0.3.ebuild 1924 BLAKE2B bee6229d4bb3d6e783b110e08b386d004ca92d5b8aa8f0b74e19735ca0202b705c90ef602937436e8d9447f9b6a715625a30d51bd2b4cdfb4f922c54d0449e11 SHA512 b1e5a10202f3680ab18d34f534c72a05147e4090f06c678fd9a32c88ccd366c4abe007e09d81df78a1a5c3aeceb52a4a54928fa60c04a71725d8007b281c77c7
-EBUILD appstream-1.0.4.ebuild 2153 BLAKE2B fa267ac2442e5fe9c532d2dd3d369d2b485440ce48ea5f61d1e13b4dfe4990dc79e96806c85bdc273cddd401b0b8e5302ae24d7d687785fb5b97f553f3aee2bc SHA512 32c1352bb71624122ae32f91fe20170b0f3ef449a5e352b4d38040287ebc36d21524796e52e3e08a5153df495fc3ae5e5baf07a84832c646742b308aabd2a231
+EBUILD appstream-1.0.4.ebuild 2294 BLAKE2B ea33759a8ab259fd94e4ada3ab2fd077bd1807ff1d061b954df327d63147380b8d1467b7c5cd308cc57d795015b09f16eebe530149090761a557f453f14a60d9 SHA512 562874479867d4bf4550f535130f5eda9e0b743058fcc463325e21dfcd9b81a8bfc6f563aaf506426feb44468bd3aae9f7362097134c421dfb3d726cce521034
 MISC metadata.xml 455 BLAKE2B 8786bd83d39c561453a1c2c34638e0f430b2e29ee0fb06cfd88ae2c3003c49abfe4a70f2777f12b0432c33af4beeb4db441f58cc8d9739372c665d47e18ef1a6 SHA512 44d38cf7dfbc2a9969ff120a73aa08a296a72d669fd11593ec5486941548fdf1687f5aed844d27a82c6c30767db7e4ec14574f9c8959a8d4cd4c5cc89ce27ce8
diff --git a/dev-libs/appstream/appstream-1.0.4.ebuild b/dev-libs/appstream/appstream-1.0.4.ebuild
index 98d966051a45..8bb10a1d8dac 100644
--- a/dev-libs/appstream/appstream-1.0.4.ebuild
+++ b/dev-libs/appstream/appstream-1.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit meson xdg-utils
+inherit meson xdg-utils vala
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
 LICENSE="LGPL-2.1+ GPL-2+"
 # check as_api_level
 SLOT="0/5"
-IUSE="apt compose doc +introspection qt6 systemd test"
+IUSE="apt compose doc +introspection qt6 systemd test vala"
 RESTRICT="test" # bug 691962
 
 RDEPEND="
@@ -32,25 +32,31 @@ RDEPEND="
 	dev-libs/libyaml
 	dev-libs/snowball-stemmer:=
 	>=net-misc/curl-7.62
-	compose? (	dev-libs/glib:2
-				dev-libs/libyaml
-				gnome-base/librsvg:2
-				media-libs/fontconfig:1.0
-				media-libs/freetype:2
-				x11-libs/cairo
-				x11-libs/gdk-pixbuf:2 )
+	compose? (
+		dev-libs/glib:2
+		dev-libs/libyaml
+		gnome-base/librsvg:2
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+	)
 	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
 	qt6? ( dev-qt/qtbase:6 )
 	systemd? ( sys-apps/systemd:= )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	app-text/docbook-xsl-stylesheets
 	dev-libs/appstream-glib
 	dev-libs/libxslt
+	dev-util/glib-utils
+	dev-util/gperf
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
 	doc? ( app-text/docbook-xml-dtd:4.5 )
 	test? ( dev-qt/qttools:6[linguist] )
+	vala? ( $(vala_depend) )
 "
 
 PATCHES=( "${FILESDIR}"/${PN}-1.0.0-disable-Werror-flags.patch ) # bug 733774
@@ -61,6 +67,8 @@ src_prepare() {
 	if ! use test; then
 		sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
 	fi
+
+	use vala && vala_setup
 }
 
 src_configure() {
@@ -73,7 +81,7 @@ src_configure() {
 		-Dmaintainer=false
 		-Dstatic-analysis=false
 		-Dstemming=true
-		-Dvapi=false
+		-Dvapi=$(usex vala true false)
 		-Dapt-support=$(usex apt true false)
 		-Dcompose=$(usex compose true false)
 		-Dinstall-docs=$(usex doc true false)
diff --git a/dev-libs/c-blosc2/Manifest b/dev-libs/c-blosc2/Manifest
index b0e6d64d148f..91ed77e627ca 100644
--- a/dev-libs/c-blosc2/Manifest
+++ b/dev-libs/c-blosc2/Manifest
@@ -1,3 +1,5 @@
 DIST c-blosc2-2.15.2.gh.tar.gz 3174873 BLAKE2B f656b81689ff30c54fd977e3652c8ee4a74320f2b4d9e2b25aa909254ed6f94021cebc63c6ddc1878a0125f97b56fc6583152c3cfae445adc976149e2449d69f SHA512 6208c2cfdd19eedada0b3a264229b1f17dee09280a66ce7d22dfcee80fe320a6cd68b5cc64994852316b7987f319284a5de70d043feb84f3d756b3ef30b723f7
+DIST c-blosc2-2.16.0.gh.tar.gz 3278011 BLAKE2B b2b724c8b23868c73ffc4894d822f04d2c0112d789927b20dd6f5caecc1fe2ef7703bd794d6b7e0490eb524fc8b1b4ca62b9fa3a614059f2e42f0edb6788ecc8 SHA512 f3c1155bc48fa3d1c67adbc13d5273f4cc0f4c72cc557f6f7f227cefbcbb26bf217911ecd5df1156a4d4f1ab747f649ac0dae83e0418196b902a4575dc9ee98c
 EBUILD c-blosc2-2.15.2.ebuild 1488 BLAKE2B aa6fa8d8067e7d68ab520ef84e93ad971c34c81260ead49675ba02cd48da79cd0c01ef09404a95ef5048356b3e19c98e93a2ea617e4cde495d5b835acaf82f97 SHA512 e3f1ef57a6c2a397dd33cbd71dc2043d72c42d8779f2ccd2eaa4882f0cdadaaa79097d378cecaff2e3e9de5ca4db39998535f75017847700219914f7b23764e7
+EBUILD c-blosc2-2.16.0.ebuild 1493 BLAKE2B f0dab60ccf00888b2ebbbd3836a3516f4cc588ddc61ebfd6f9ad29758418a82fed6ca8554b2045f14351cb959a81e7b42d1d84c54f1271115bf75655534ec0f1 SHA512 3b2fc076a6d5ef76100a5aaebb5677ed59f379ddac900de575bcabbf2d28ccf520ce2de6b409adf88844102657e62e6715ee7e00f564334025adf520645c23f5
 MISC metadata.xml 327 BLAKE2B 5fafd7f688780e7c5479d492da4943b9a95122d5c64e36e4415fe69a708f983f9463824981d771424c1c75f7236a159ef843738a0b31430ccd572770fbc5a74e SHA512 9d2aa06eb8e144bafe1c65b9c7704993633f9e1db629d77209e8c832e09de34c641d9f588cf208d8f5f65ff489c56f1e01ef573213439ba99678601d6a790ee0
diff --git a/dev-libs/c-blosc2/c-blosc2-2.16.0.ebuild b/dev-libs/c-blosc2/c-blosc2-2.16.0.ebuild
new file mode 100644
index 000000000000..00ff5d98f4f1
--- /dev/null
+++ b/dev-libs/c-blosc2/c-blosc2-2.16.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Blocking, shuffling and lossless compression library"
+HOMEPAGE="
+	https://www.blosc.org/c-blosc2/c-blosc2.html
+	https://github.com/Blosc/c-blosc2/
+"
+SRC_URI="
+	https://github.com/Blosc/c-blosc2/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test +zlib +zstd"
+REQUIRED_USE="test? ( zlib zstd )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=app-arch/lz4-1.7.5:=
+	zlib? ( sys-libs/zlib:= )
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_configure() {
+	# remove bundled libs (just in case)
+	rm -rf internal-complibs || die
+
+	local mycmakeargs=(
+		-DBUILD_STATIC=OFF
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_BENCHMARKS=OFF
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_FUZZERS=OFF
+		-DDEACTIVATE_ZLIB=$(usex !zlib)
+		-DDEACTIVATE_ZSTD=$(usex !zstd)
+		-DPREFER_EXTERNAL_LZ4=ON
+		-DPREFER_EXTERNAL_ZLIB=ON
+		-DPREFER_EXTERNAL_ZSTD=ON
+
+		# force regular zlib, at least for  the time being
+		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB_NG=ON
+
+		# upstream overrides CMAKE_C_FLAGS, preventing ${CFLAGS} defaults
+		# from applying, https://github.com/Blosc/c-blosc2/issues/433
+		-DCMAKE_C_FLAGS="${CFLAGS}"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# Tests fail in parallel, https://github.com/Blosc/c-blosc2/issues/432
+	MAKEOPTS=-j1 cmake_src_test
+}
diff --git a/dev-libs/libei/Manifest b/dev-libs/libei/Manifest
index a66f74a9d87d..05034b8b00d3 100644
--- a/dev-libs/libei/Manifest
+++ b/dev-libs/libei/Manifest
@@ -1,6 +1,8 @@
 AUX 1.3.0-scanner-switch-to-using-dataclasses.patch 14276 BLAKE2B f187335730f31476cc42850741c36ab81f41df6298d370cdcc727a5ec4c2afcd3fb1f448cef7bcf5e369a88ace61bbf8e71f66acd933a0d4b43ece1e1baf8b18 SHA512 92c3710e38b06e0c40f01d8a1a46181f8ea500b61a69fd6105cd992ad6b33cd5fec1259b660dd1bb3befa96cfb905d1e701b8fbeedce02c2222f1fc37e400c56
 AUX 1.3.0-skip-protocol-test.patch 675 BLAKE2B 1519b464a2322ab7c46ab449ccc0fb3f1e962b86f97151cefa56d43af2e0727768d58b730486ea2272e76c0d2cbbf2c02152bcf2b6ae615060900458a8df81bb SHA512 62086e3bb62538616eebba7e9e356df79f8c148280b0338557a8fd52a9134257c6d74a6ee11a3788b4da0c44242a65473559fb0d8a8ab3fae8cba8222896ef13
 DIST libei-1.3.0.tar.bz2 175492 BLAKE2B cc5b0ae228a7282e0b5890280cab15cbb4c9179aa40140d6d01dc0d650bc1a646efd3d07dc6db0b501c3d203480d2df2bf3107e8b07e13b49eef8dcea59dd011 SHA512 a63b52c7251660404b307dba82ee24e31b64aaff7140acb174a33aeb60a07e59391522e2a5c56cd7bbdc45ab5e4a0e6111e214f2f1b79834b152e6ebc3e5e0c1
+DIST libei-1.4.0.tar.bz2 182498 BLAKE2B 251c35b0ad0b21896cf5600206646e904c508813bcfa9344954922b7b0156dd528987b9d3678edaf3fac14952996dc98fb1a07e8703ce7fde676e63d27a12553 SHA512 c5ac78687b8cbc174406d9b176968416496cd354a20b5861e2959be0cb361edc9437acad46de0013f78b204ec28594d044f79b00a6442e7bda513e283968270b
 DIST munit-fbbdf1467eb0d04a6ee465def2e529e4c87f2118.tar.gz 27724 BLAKE2B 9670c9b7a0b5d9ee6ec8df2dea9e241b043964ecf1fa3f6060ad1d16c40ab6afe47f53c6d4a791003e101a0b363263b858e6e4e445f868292753dd1ee7f7e3ce SHA512 26b5599fd12be627a692823ebf496fa446be7ed04a1233fb42e0667c05109b0f804f76646e289ac660fc815baf45f77ec8caf0ff2ea7fb0b4f87f0038a2b971c
 EBUILD libei-1.3.0-r2.ebuild 2516 BLAKE2B 5d5a1a75aa0db093971032f7b3b5176dd9015274c889e3416bbb735d47d973ddd9300ef397323ab49569344e2b2d1848ac7cc379cfd6ade36d5ac8f0f92ab0c3 SHA512 18ecaad4e2d66c63dc12478adca668dc9baff5f6fc4a6e55268020786eb51d5025344237c4f43acfdfc0e8b2e89a8daf2f1190eb5591e65ca6518994152c9abb
+EBUILD libei-1.4.0.ebuild 2381 BLAKE2B 5f419e621e4459f694d006aaa95a1a320a6efdc7756f9b129cf975f66b8fcd282acb237576df8d2ac8e360dcf790ca6724dcd0c86cc41912f943aa3b4f4e7404 SHA512 423e3ee4e288187ccb355d1d4b631756b21f3dbb389c390b7073fe0adc5e67af94a7bf960d9012b4ea7250f075d300d7e372d9722a9ffe8dc58148f6742c7321
 MISC metadata.xml 336 BLAKE2B 2fd4200876fa044f3563b0eea2096214af92fed1a8db009cf4885a7cf32f303b0a6911dba18cc8fac942348dbe2668ea2d50fabedd235e33be0793076ab0e5be SHA512 a26feb7d41edc6f728bfbaf805cfefa6bba4c5161e70785e7de5f389492f405f7cd6f2c55cce1d2c6bdf9af3aba17e1e51254d9e4421c4fab2e61f2c563c8f3f
diff --git a/dev-libs/libei/libei-1.4.0.ebuild b/dev-libs/libei/libei-1.4.0.ebuild
new file mode 100644
index 000000000000..10340c3c29fc
--- /dev/null
+++ b/dev-libs/libei/libei-1.4.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit meson python-any-r1
+
+DESCRIPTION="Library for Emulated Input, primarily aimed at the Wayland stack"
+HOMEPAGE="https://gitlab.freedesktop.org/libinput/libei"
+SRC_URI="https://gitlab.freedesktop.org/libinput/${PN}/-/archive/${PV}/${P}.tar.bz2"
+MUNIT_COMMIT="fbbdf1467eb0d04a6ee465def2e529e4c87f2118"
+SRC_URI+=" https://github.com/nemequ/munit/archive/${MUNIT_COMMIT}.tar.gz -> munit-${MUNIT_COMMIT}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="elogind systemd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libevdev-1.9.902
+	|| (
+		systemd? ( >=sys-apps/systemd-237 )
+		elogind? ( >=sys-auth/elogind-237 )
+		sys-libs/basu
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	$(python_gen_any_dep '
+		dev-python/jinja2[${PYTHON_USEDEP}]
+	')
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			dev-python/structlog[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/1.3.0-skip-protocol-test.patch
+)
+
+python_check_deps() {
+	if use test; then
+		python_has_version \
+			"dev-python/pytest[${PYTHON_USEDEP}]" \
+			"dev-python/python-dbusmock[${PYTHON_USEDEP}]" \
+			"dev-python/pyyaml[${PYTHON_USEDEP}]" \
+			"dev-python/structlog[${PYTHON_USEDEP}]" \
+			|| return 1
+	fi
+	python_has_version \
+		"dev-python/jinja2[${PYTHON_USEDEP}]" \
+		|| return 1
+}
+
+src_unpack() {
+	if [[ -n ${A} ]]; then
+		unpack ${A}
+		mv "${WORKDIR}"/munit-${MUNIT_COMMIT} "${WORKDIR}"/${P}/subprojects/munit || die
+		rm "${WORKDIR}"/${P}/subprojects/munit.wrap || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's:^valgrind = .*:valgrind = disabler():g' test/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocumentation=""
+		-Dliboeffis=enabled
+		$(meson_feature test tests)
+	)
+	if use systemd; then
+		emesonargs+=(-Dsd-bus-provider=libsystemd)
+	elif use elogind; then
+		emesonargs+=(-Dsd-bus-provider=libelogind)
+	else
+		emesonargs+=(-Dsd-bus-provider=basu)
+	fi
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# munit subproject is installed but not wanted
+	if use test; then
+		rm "${ED}"/usr/lib*/libmunit.so || die
+	fi
+}
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index 17eeaa327033..aa02a04ae6c1 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -1,9 +1,9 @@
 AUX poco-1.10.1-iodbc-incdir.patch 369 BLAKE2B 345540ebd9c448a21e6c8adccba040a43fdf1db53cb0139f3cab5eb8ca67ca30dfa97058e4db4618d27ab2cd642e205349f5f70970fd2a4961a018aa7e1c5dac SHA512 1a155b10e98cdce8659a9308ac70e8114361a0062a1af469dc774b5d32bc00b5f1aa0e873fa5061625527ddeb006fdf29939b1899939a193d8724e491dedba10
 AUX poco-1.14.0-missing-utf8proc.patch 1979 BLAKE2B 34b8b4595939a0fb95f9acc92636206e80ae0192f35e84fef292a6e62eb2ed2cdb1cd4a7f64290a281aafd7258d25a4c3883c66e6e1865facc1ca1e8bb4183ae SHA512 2b0645880aa1409b0097bfa40396c94b25f29212795f4e600226d59486266d9f605905418bf402ed28cd54419e882f498f72c0d68db460dcd4f350b473c622d2
-DIST poco-1.12.4.tar.gz 11296139 BLAKE2B 45e1214616e78041d5ca512cee46621c006fe21f51231f3261dc40ca4941eb3cd4e52db493aa826779784f9d3f35cfd08e3e9d08fb35ebec2d610fb6528c635a SHA512 730700a24b5a00d44aa85914e7d3c9eff76969a123a67315ba5e9b2d18c0ace70d2664d8a611496851f497aa4985d36685a67813a95e814461ae0fffdb460d91
 DIST poco-1.13.3.tar.gz 11332562 BLAKE2B 04380cae92bbd2427873f0ea1a3fcade244ee5168390e26081983ded9faaf22e456bdd4ae87f9c77bafc92155f860ea9f56678ec2204bcd7c51a871e7f00d759 SHA512 084064fb462c9e7993d069ebdf395802af900ed92c5b294465a2c246162bb86caa3505985de329e8110d3e9fb3bc39ae9536d523843729d4ed5ce00c35289d92
 DIST poco-1.14.0.tar.gz 12158142 BLAKE2B 3ae9a520941634ac9aa72d323541d6433ac2e73d4d19e0654f932ea031d17870ca4ad764a8e3c5e68d69c5dc9750d779102d80d6d810598db275f269928ae8ea SHA512 4475a0ede5d06e4ce9537295fec92fa39b8fd5635d1cfb38498be4f707bc62b4a8b57672d2a15b557114e4115cc45480d27d0c856b7bd982eeec7adad9ff2582
-EBUILD poco-1.12.4.ebuild 4220 BLAKE2B 9be84416a479873236f983cc7b7eed506361e35b6200b8b0f328bc476fec5cf6521a4991198418284136e389cd5ac2a867cf8fd4b66c5251705e781ea51ad2b8 SHA512 dd99c1db6e4e00d31dbe115a972464011b4b138c8f6ef785d3083a7112215fc7655dc199a4b3a913298ac0b9d8ca6c10d63a8d05c0d974ca17f599022f6a2109
+DIST poco-1.14.1.tar.gz 12160003 BLAKE2B 8fe985b8b3c4ab93df57fc63dbea97612c7f748ca0319b5ffea931bdd438f0d563d17e47da259cc9de30311ec5c9622c9420c64058d4c6075bff1a70a819dca9 SHA512 e192818a5f731ec6f6bddf062573d7bedfd15754157f145882c2c9d9bce497b92cf23f639f989d9e5605cb83029c4f303752cab655b525b5a5b5e5b704714725
 EBUILD poco-1.13.3.ebuild 3907 BLAKE2B b570a253f8b7e3d7dc38a2e94b13d518d7e1a5e8e44b1b7d940a88013716a8598b452052ad1978af2a972a669ac4c628975ac6aad503aae0c406be49a8e16c99 SHA512 2d451bf30476b3db92d8155c3f4e60cd64288fc93c1f0a05403d5624d91073135776d8040c0b95c348199672deccb2ff60eb0fe63d07c61bea50eac3d539a768
-EBUILD poco-1.14.0-r1.ebuild 3905 BLAKE2B 1f681cd97e581b3f4bfb0698556618e19dc9353b9e72d9e941e49e61eeabcfd674b913364823873c1197dc87a42d180bf86dd644d9384c761a571b4ac52ddadb SHA512 ddbf28bb7e50d6f7596ee9b8276344772eb3a3f2993a79f699fec56451fdf9843358010a973ccc53e35f1c7053b5051f5de115f396944acf878d9015e3f374f3
+EBUILD poco-1.14.0-r1.ebuild 3901 BLAKE2B 0b9201abe4a7c1f8b5a2782507cb40f27552148f482f82eb9cb94206aea346b2a662788d5022d6e6d545c4803a12422738482f852eeaaa0d79a79986a55d4ba4 SHA512 1f8d305009064cbbe63f0855c3a640be33c34bc3212764240a00f58211cf3a1f52334f1e4397813af077bdbb3e9bc7bdf7c69a597d06ae3553a85baf8261b55a
+EBUILD poco-1.14.1.ebuild 3849 BLAKE2B 455b76f94f6aad13ed614b2ade30966e641631a4762d6e96babeaabc26cf2facf95b5ba6495043c74a3b45c5553a3c657cdc9429fb371e043dedc747bf051e70 SHA512 0d341354cfc3ea1180d7f7ebdb18c7c31c52ffc9c9830abc6bb72ce34de4dcc2f7abdd0a932490fbe2254bcb4895dda79f39e6b8143de66e11d51916473a9b84
 MISC metadata.xml 2947 BLAKE2B b2c04966e9be3ddebceb3098fa213f2196ac594b96cd6885e3fbc1050971e9bf9e88f234f9680ac4dcc313dd766810315066f212b4411ae56d4689c6ad07a24c SHA512 c9c386bacca78595bf35d77b89fc2935d41bf2290e486532f66e484cee039f66a553475202c78e1eb7f57caa7dec7e723469d67a043e79141f698cbeb7144ed7
diff --git a/dev-libs/poco/poco-1.14.0-r1.ebuild b/dev-libs/poco/poco-1.14.0-r1.ebuild
index e93b9e8e1966..b6efc706364f 100644
--- a/dev-libs/poco/poco-1.14.0-r1.ebuild
+++ b/dev-libs/poco/poco-1.14.0-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${P}-release"
 LICENSE="Boost-1.0"
 # SHARED_LIBRARY_VERSION -> "${S}"/libversion
 SLOT="0/110"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 IUSE="7z activerecord avahi cppparser +crypt +data examples +file2pagecompiler iodbc mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc postgres prometheus sqlite test +util +xml +zip"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/dev-libs/poco/poco-1.12.4.ebuild b/dev-libs/poco/poco-1.14.1.ebuild
index 53b41bdf2c35..26255c04501a 100644
--- a/dev-libs/poco/poco-1.12.4.ebuild
+++ b/dev-libs/poco/poco-1.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,31 +12,36 @@ S="${WORKDIR}/${PN}-${P}-release"
 
 LICENSE="Boost-1.0"
 # SHARED_LIBRARY_VERSION -> "${S}"/libversion
-SLOT="0/94"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="7z activerecord cppparser +data examples +file2pagecompiler iodbc +json jwt mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc postgres prometheus sqlite +ssl test +util +xml +zip"
+SLOT="0/111"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="7z activerecord avahi cppparser +crypt +data examples +file2pagecompiler iodbc mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc postgres prometheus sqlite test +util +xml +zip"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	activerecord? ( util xml )
 	7z? ( xml )
 	file2pagecompiler? ( pagecompiler )
 	iodbc? ( odbc )
-	jwt? ( json ssl )
 	mongodb? ( data )
 	mysql? ( data )
 	odbc? ( data )
 	postgres? ( data )
-	pagecompiler? ( json net util xml )
+	pagecompiler? ( net util xml )
 	pocodoc? ( cppparser util xml )
 	sqlite? ( data )
-	ssl? ( util )
-	test? ( data? ( sqlite ) json util xml )
+	crypt? ( util )
+	test? ( data? ( sqlite ) activerecord cppparser crypt pdf prometheus xml )
+"
+
+BDEPEND="
+	virtual/pkgconfig
 "
 
-BDEPEND="virtual/pkgconfig"
 RDEPEND="
-	>=dev-libs/libpcre2-10.40
+	>=dev-libs/libpcre2-10.40:=
+	dev-libs/libutf8proc:=
+
 	activerecord? ( !app-arch/arc )
+	avahi? ( net-dns/avahi:= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	mariadb? ( dev-db/mariadb-connector-c:= )
 	postgres? ( dev-db/postgresql:= )
@@ -44,8 +49,9 @@ RDEPEND="
 		iodbc? ( dev-db/libiodbc )
 		!iodbc? ( dev-db/unixODBC )
 	)
+	pdf? ( media-libs/libpng:= )
 	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
+	crypt? (
 		dev-libs/openssl:=
 	)
 	xml? ( dev-libs/expat )
@@ -53,8 +59,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-1.10.1-iodbc-incdir.patch" )
-
 src_prepare() {
 	cmake_src_prepare
 
@@ -66,28 +70,14 @@ src_prepare() {
 		# ignore missing tests on experimental library
 		# and tests requiring running DB-servers, internet connections, etc.
 		sed -i -e '/testsuite/d' \
-			{Data/{MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,PDF,Redis}/CMakeLists.txt || die
+			{Data/{,MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,Redis}/CMakeLists.txt || die
+
 		# Poco expands ~ using passwd, which does not match $HOME in the build environment
 		sed -i -e '/CppUnit_addTest.*testExpand/d' \
 			Foundation/testsuite/src/PathTest.cpp || die
-		# ignore failing Crypto test since upstream does not seem to care,
-		# see https://github.com/pocoproject/poco/issues/1209
-		sed -i -e '/RSATest, testRSACipherLarge/d' \
-			Crypto/testsuite/src/RSATest.cpp || die
 	fi
 
-	# Fix MariaDB and MySQL detection
-	sed -i -e 's~/usr/include/mysql~~' \
-		-e 's/mysqlclient_r/mysqlclient/' \
-		-e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \
-		cmake/FindMySQL.cmake || die
-
-	# Add missing directory that breaks the build
-	mkdir -p Encodings/testsuite/data || die
-
-	if ! use iodbc ; then
-		sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die
-	fi
+	sed -i 's/ENABLE_DNSSD_AVHAI/ENABLE_DNSSD_AVAHI/' DNSSD/CMakeLists.txt || die
 }
 
 src_configure() {
@@ -98,17 +88,19 @@ src_configure() {
 		-DENABLE_ACTIVERECORD="$(usex activerecord)"
 		-DENABLE_ACTIVERECORD_COMPILER="$(usex activerecord)"
 		-DENABLE_CPPPARSER="$(usex cppparser)"
-		-DENABLE_CRYPTO="$(usex ssl)"
+		-DENABLE_CRYPTO="$(usex crypt)"
 		-DENABLE_DATA="$(usex data)"
 		-DENABLE_DATA_MYSQL="$(usex mysql)"
 		-DENABLE_DATA_ODBC="$(usex odbc)"
 		-DENABLE_DATA_POSTGRESQL="$(usex postgres)"
 		-DENABLE_DATA_SQLITE="$(usex sqlite)"
+		-DENABLE_DNSSD="$(usex avahi)"
+		-DENABLE_DNSSD_AVAHI="$(usex avahi)"
 		-DENABLE_JSON="$(usex util)"
-		-DENABLE_JWT="$(usex jwt)"
+		-DENABLE_JWT="$(usex crypt)"
 		-DENABLE_MONGODB="$(usex mongodb)"
 		-DENABLE_NET="$(usex net)"
-		-DENABLE_NETSSL="$(usex ssl)"
+		-DENABLE_NETSSL="$(usex crypt)"
 		-DENABLE_NETSSL_WIN=OFF
 		-DENABLE_PAGECOMPILER="$(usex pagecompiler)"
 		-DENABLE_PAGECOMPILER_FILE2PAGE="$(usex file2pagecompiler)"
diff --git a/dev-libs/rocdbgapi/Manifest b/dev-libs/rocdbgapi/Manifest
index 82bb798bc10c..f4f252bf8997 100644
--- a/dev-libs/rocdbgapi/Manifest
+++ b/dev-libs/rocdbgapi/Manifest
@@ -3,8 +3,8 @@ DIST rocdbgapi-5.7.1.tar.gz 251913 BLAKE2B 96dc859937fdde75a3d68368b29efdd14711e
 DIST rocdbgapi-6.1.1.tar.gz 254274 BLAKE2B 1621dc715e2540578126ff2fa6dc30dc9db711689e82b5c750dd203aafa091c00f897425a372d4617bec25eddb7b9a44105e8c9b46eb660e197602ede2beecba SHA512 d613e633e27ad9f582b9612d7d088c3ea465c29d6520e94b4821e0340c736e556dcd4a89f8027701097ee4e2d8b55640a232d484f9fa26f8a9165c648f8af219
 DIST rocdbgapi-6.3.0.tar.gz 275368 BLAKE2B da4ee565d0bbafad4838ca6a346525bfc0e174ee39a1e4d99da16f2ba041885211d38cc9f9aac0ab0358b62557061f7c4cfc8fd3bcf241398b510ea952d56254 SHA512 b9acf8787fa6e76bd9d28a36b3c09932d830085cbdc4b6712d481c19cb36c2fd4ff50fb31fd249d9a523c053019657ae7eace850102be94170c327d4efb49e9d
 DIST rocdbgapi-6.3.2.tar.gz 275359 BLAKE2B 085ab87b04fbe165bb689a61016cd7e4e1133c4f9a2504267d30a07dd2922eeeb11fb7507416e426b3a24a8ec3090c7a4b64ccd32f578ccb7bc420fcc52f7fec SHA512 b60312cc29830f1a481f67ab3419c3e9915e07f6a13557e06a1fa4da6022ae7388421264843aea095c49330c984d943771cba7b77f31d3f511a545af5db68c00
-EBUILD rocdbgapi-5.7.1.ebuild 1198 BLAKE2B 228aab82524870227733d7aeb6428de6d97974ce35ba94026766413dae743a80837fddac66984f21d36fd3dc35ed592eb44d41ad3e47ea809b0bc88604fb4a74 SHA512 6f8871f8dfced05905b9e9acc84fcf0bdb9ccc4cae9c96c61aedbf7818b4943fe94696f96ba8dba99f00e24986d1fbef923b2fd7b9744f6e890eace7a659b118
-EBUILD rocdbgapi-6.1.1.ebuild 1325 BLAKE2B b9c0086ce53a33a0280195fcbebe6bd9f030bd9390f73e4dc215bd7013c29985df13a268241da1db239262c102c4ccd32fc4de43b4d96bfe26b5e96fd5aa058c SHA512 fa6a2476f939534ed7ef4862c13e2d87967902822cd666c52c54e582d050af3a0eb3311f3888649abbdddc562698996dee4e534761cc1ccbbf83023ff1c9d81f
-EBUILD rocdbgapi-6.3.0.ebuild 1382 BLAKE2B f86587c1c463cd4577cf1f3fd08cf949c280690ae5ecdb74143f7fa4b4d22f5ee01d8769c9ddf2d6297767b7381f3f0315e8845f40840d9f85fe4596b7e71456 SHA512 ee28d531cd56f2a11501eae6217ccdc3c2b5d4e3593e7700cfcd91a474f25d905f356b8d9679e6a8d70534018c07aada03f2805843550122128bba79ec4bdf86
+EBUILD rocdbgapi-5.7.1.ebuild 1232 BLAKE2B 07dc2b48213045f1d3dfd23aa0eb775f904caf2b84e87c3a3dff4b767fdbf40a123c5c81347fea3813f2380d45389e5b09819520b99ded80ff44ea31fa7e83d7 SHA512 33d31937298c477778bfc10b509ab9e7768afb99b1690fb254307fb825a70757c7f08e7de04ada3b49f4cb4e8709af9adb5e3343d4a86f954d769b20e4eb23ac
+EBUILD rocdbgapi-6.1.1.ebuild 1359 BLAKE2B 6766781177664cb1a83ae41d5e00ccb9e4321d020a98f05fe07251e951c63e37142cb05b69f4b934185820a9064c42d20a12d38f2674a3031dc0d8f848fb168d SHA512 769e5c4025a5c0ab754efc498d657204817d072beb036c44039ca890c51a91b835639fd67302ef904327695be9980963f11307468eb18ee9f638a3c75c5d9d75
+EBUILD rocdbgapi-6.3.0.ebuild 1416 BLAKE2B b32837fb00f51b1f8da69461c64d6ce5495f5f21c36caca62c3a38765253348f7fcb2a577218dc51d9bd3450efc0b23cc92fa71414b3b47e818172b0379f3780 SHA512 90cbfb68e357aadab4f4c2bb23f3820da6cccdf255478f02e7ef7802ed87ff3b6c4e3e6bec18149ff65a57024824721a368fd42d3044b63ca7689b052b0679d2
 EBUILD rocdbgapi-6.3.2.ebuild 1382 BLAKE2B e73f53f3aae34ba5e008198a346ba287bec45ac34ed2b9264e86bbb9167418d16b2513c9fea4138454595aaabf391773f68f8af6bf54b91742a97700d39e55f5 SHA512 34f73245a5aebff6ee5aca88bc469365661723ef84a3cda17f69d3dc046b724b846dceb4454365cb9fa1d9487ca8e3e7a9d0a561f0e0c26a506d87b544439e82
 MISC metadata.xml 499 BLAKE2B bf9cb4f91d5c6160bce2f5df41177fc18b153cd8c8c6a13384c68fddb4a9a6011eb0d40339af7f1d9c01200af57ee431d9193f68ed9724549445ec908ff07796 SHA512 7ed8d2bcb55b46e57cdbea6c4e6242ab5f660c7b1537c9ddfeb0c426495bc4c5e7e78b54bf66940d582c42913a1b3d36c5fc821abd7da666c782c141c001b355
diff --git a/dev-libs/rocdbgapi/rocdbgapi-5.7.1.ebuild b/dev-libs/rocdbgapi/rocdbgapi-5.7.1.ebuild
index 3573342f8b6f..2e7860efde3a 100644
--- a/dev-libs/rocdbgapi/rocdbgapi-5.7.1.ebuild
+++ b/dev-libs/rocdbgapi/rocdbgapi-5.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,6 +16,7 @@ SLOT="0/$(ver_cut 1-2)"
 IUSE="doc"
 
 BDEPEND="
+	dev-build/cmake
 	doc? (
 		app-text/doxygen[dot]
 		virtual/latex-base
@@ -26,6 +27,7 @@ BDEPEND="
 RDEPEND="
 	dev-libs/rocm-comgr:${SLOT}
 	dev-libs/rocr-runtime:${SLOT}
+	sys-apps/hwdata
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/rocdbgapi/rocdbgapi-6.1.1.ebuild b/dev-libs/rocdbgapi/rocdbgapi-6.1.1.ebuild
index eff59469418f..ea23cdc176c6 100644
--- a/dev-libs/rocdbgapi/rocdbgapi-6.1.1.ebuild
+++ b/dev-libs/rocdbgapi/rocdbgapi-6.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,6 +17,7 @@ KEYWORDS="~amd64"
 IUSE="doc"
 
 BDEPEND="
+	dev-build/cmake
 	doc? (
 		app-text/doxygen[dot]
 		virtual/latex-base
@@ -27,6 +28,7 @@ BDEPEND="
 RDEPEND="
 	dev-libs/rocm-comgr:${SLOT}
 	dev-libs/rocr-runtime:${SLOT}
+	sys-apps/hwdata
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/rocdbgapi/rocdbgapi-6.3.0.ebuild b/dev-libs/rocdbgapi/rocdbgapi-6.3.0.ebuild
index bac45a37c3f1..8d08c242d8a4 100644
--- a/dev-libs/rocdbgapi/rocdbgapi-6.3.0.ebuild
+++ b/dev-libs/rocdbgapi/rocdbgapi-6.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,6 +17,7 @@ KEYWORDS="~amd64"
 IUSE="doc"
 
 BDEPEND="
+	dev-build/cmake
 	doc? (
 		app-text/doxygen[dot]
 		virtual/latex-base
@@ -27,6 +28,7 @@ BDEPEND="
 RDEPEND="
 	dev-libs/rocm-comgr:${SLOT}
 	dev-libs/rocr-runtime:${SLOT}
+	sys-apps/hwdata
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index 6efb1c0ea1e5..c86095976c1e 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -1,23 +1,8 @@
-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 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
-AUX rocm-comgr-5.1.3-clang-fix-include.patch 298 BLAKE2B 2cb424491481445a29fff40cfc95284fbf8dce155c65d5cf2ee950fc5c876b3c78660691878ff45846904a9db54f7f5db7581fbd1665156c97f660bd0b69fc48 SHA512 a3b024899d9b0d59b4c8d9dd498349775e25cd428437d97da1de689e14bc8cebd1b3434d9ab034b5c894945f743426abae2ba3ec129084ce9fc176b3cd8befc4
-AUX rocm-comgr-5.1.3-clang-link.patch 380 BLAKE2B a6de9401ff4c668745f49e898546108163c1cb370e2591b6b512e70e4ab63edc4256baca7d9a6a62c6263397764053d22791cc85278d5eb4ef3a766b69bba96c SHA512 1738fb93087c24c05fc8c025e2c39b019cd71534e2878a430a8ab9381d18284053c76f646d29314b33ec80ecdba71c4ac583ab40a5478b607242518aaa198e26
-AUX rocm-comgr-5.1.3-llvm-15-args-changed 880 BLAKE2B b499a27ef0b66e106517621f0b92156985f4acfbfa3212643306f28fd41874228ca033f5d2caefe11501e14873d3ad121bc4e4c86c5ab9db15455035f2adfd47 SHA512 ee0b30cbbbf021aabe8e042cfe6f0fef5e5bd1ee5d44600197137095cee78912aebe520bac0cd79e08ecbd9c0335386c1a972ebd689cf42d0526cfda18cbfd9f
-AUX rocm-comgr-5.1.3-llvm-15-remove-zlib-gnu 879 BLAKE2B d89e8b2c908d360b34da0802497aa14828efdc9353b28ea956e86826f0b7cf69faa5b489679255ca984553affb51bddfd47891da451662e8ebfe79114605c496 SHA512 11778245c2ad8bc11dadf3613df5ce8f6911e15a9850ce22b3962d18ba4e990cb585e09b9cc39daa801c7933329fb3d1541026e90da7aa5df9038a00dc9d7bcf
 AUX rocm-comgr-5.1.3-rocm-path.patch 422 BLAKE2B 23200a9ead9cefe1af9b553da7448d93b1c7d0db7aa02a2dae0fa0b70b44b75056fe720fea8919c5315c5804289c30d6b476e43aa7aeaf25cc5c2430431f7a9a SHA512 6d1d2cfac7f2b70409e8cc3cb1556f516f495c4a217e85408fbd99587697912d82fc6a8745c37d2fe392ddbd0e8503489c353f26b3fbc6bce640c567f4230e89
-AUX rocm-comgr-5.3.3-HIPIncludePath-not-needed.patch 632 BLAKE2B ce681da93373691d24c7e85698f72477a372f65403ee25ba085bd3e36c79cb284b88ec50b9c16e5fe14fd3ce9b88fcf1486120032dfe6f97e9a85e757374a38c SHA512 b88fcf8ca208a7ce30777694903af0a4ad9c2c8c1a93c361f6b6b6f6948073f06ecab5ca607250befe0d16a9ffeace9617f53b1288fcbf43396b5b658e448414
-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
 AUX rocm-comgr-5.7.0-disassembly.patch 656 BLAKE2B b1ac5227b7b4d7a25cc5674ca185075e22dc91eb2e64ea1598fae03915a22153cfdafee4c34afc34e7490515bbdb09d49ba290d4544c617f23427d04296181ac SHA512 647a0a613786df7907616af43397ba9b16a80a7f6e7420ac41be7cc424a94df7f3248875bcb336e13de0f2ae13832362c6cbc42356703b655efc58cc4d6e4b6d
 AUX rocm-comgr-5.7.0-lld.patch 1355 BLAKE2B 565e3052974b99ee5050fc1b64d5f3b337866cf21a5d37fa37888e6257cf00b1718a0d3933b3f0e4e27caca4537652824c1ce01a8600852da503eead94a12d8f SHA512 35e6b2c8ad97d3dd5a870ed5c547c3727cd384c773371fa9608e29f7d525252f34fb784798c82c2071098667fd69ca4b89dfee20a8bf28b73b14bd13b4b00a50
 AUX rocm-comgr-5.7.0-metadata.patch 2738 BLAKE2B de124cc61ad4e59ca182a8868bdff0c2fa44ec8a474f4c2d31aae8b90aabee6b32394959dd3589cf4756d09cb26dc1691df386f0b6687bb365dfabe6b76f2622 SHA512 440a6cc6fed0c4091effc39ffab5b4f59c0d503db7ea6bd8eae681422b4b385f3f8176722f7a2b396cced8229a9c3904ac795c62949bc805284e6a0203ab9bba
@@ -37,20 +22,10 @@ AUX rocm-comgr-6.3.0-llvm-19-compat.patch 2564 BLAKE2B 823db031e8e09946396f7e4e7
 AUX rocm-comgr-6.3.2-rocm_path.patch 419 BLAKE2B f6fa0d84b91811f8aa70bdbce429f66f8f02ec99d480cc55e5f39fb7ca2de3bd5e55f5cf0d5175a8e78e78d2ecc197a38088d91774e564db96f1168f84b8c0e6 SHA512 59295419d96d78635586407342b592fe795a66c7d0b5698a187d190cf34667b7bd451702131b825e76cdc198cc343062f4d2af825590e80bef16f29a5b68ef8f
 DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B 3ef0b6e3c47c66fd80289373e6ff8aaff44751f9b380addfae73a18dc388093c0535f230b0cc7528724bc43f6992e2ae6decd3d0d3c700893ca95a6166b7b8dc SHA512 e320d4eeaa6f61ed1cdbf653d67fe887d3ce9dc0d6743b4713502e1cb5318ab8afbe1ee71f8cba07635c54ce532df6683de40ade0e5be4a52e50ce25a9b70818
 DIST llvm-project-rocm-6.1.2.tar.gz 195992927 BLAKE2B d821f29f2f1f7c1ff414c63a710281f16d2a394b21f3365d01b86710cc09ed27e514b49fb744bf6a36b38815afa56cc26d44f0238f38479a0c2db9bf9989f389 SHA512 5f7e5dbe5976141de35e96e603624bd9d5a2c08b0690ba9fcd81d1b32f540f94bb9f4b74539e2838fd60ae1312dbe5e0b429ba80a03871782cdf3bd834940ce0
-DIST llvm-project-rocm-6.3.0.tar.gz 206677330 BLAKE2B f3e68a8c94599e3a938d3e761af163b9f010a06421680ee70aaaaf8073fb18da9151729c311fc4bd12b281b3afdd15e61cea31c970f0e4d36bb97838fa17ca5f SHA512 674fc3242c6dbb6962f1002dc34ccbd618da6adeb640bac15265d22fdcedf9de16ea3d79899891734ccc1099cb5b5ed9110b1162f4515c4cbc0d847810682b59
 DIST llvm-project-rocm-6.3.2.tar.gz 206671202 BLAKE2B a280e2be22b8eb9fd51814074447baed3637231d4bfbe391047a1fb2409197c8d8ba58cebb3aeaec15aa4daee9371311274b30ede48e0039d7c84e432b15de1a SHA512 314e27577af76268635f3c96ee3516829e4622913c3d0c4c68eccbaee0c9f7f5fc031cbd35827deb4bc29712592c424e296c15ce8c500c897bfb3eb19455899c
-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
-EBUILD rocm-comgr-5.1.3-r3.ebuild 2051 BLAKE2B c3133953c1b8a9e216012ec63d22dcd1bfd9d70bcead694fad13ede77c79814b86cc6c808a0a56fec9ee70d36c3c15f136770b9ffffe04c7d960160156ba8825 SHA512 eb7742f31064abb964a1447bc6f4ad07872b9cdc5279b7fbdeb3062eb8b641c98b9050ec113d47885a3abc9768cc5cab4a5598459751bd46d970678807772f72
-EBUILD rocm-comgr-5.3.3-r2.ebuild 1943 BLAKE2B fb20250cb7fa79ee706b35b9d2d18962179592625f33076875b73b220773091cb629f59d6af5c264edc83c3dca20606507198fc59be48509fb3feeb3f7c70716 SHA512 dd43457ab7aef2fc2b81dc4d142ecd5f2489da33290e0e583cadc208159c5ea412d1cf9455d04367b7591591a356d16e3239080d0a7bd44ebf4d9a3e57a65fd5
-EBUILD rocm-comgr-5.4.3-r1.ebuild 1892 BLAKE2B 0f92e385b4cfb5e6f98c3921646efb8ac24143d91998ab68058514052d3794197b4dcad0982ee6dbe554ef796d26abb9848a504b38447f7c11494b4fc52172f3 SHA512 0824c07d6d424ab71f70952729a319a8e8605d755004594e3dda91b063275a58c7d870187d1f4d43af0d0c884dacea92b456174f193e5ad94d3d3b00b8c6f86f
-EBUILD rocm-comgr-5.5.1.ebuild 2022 BLAKE2B 38cadb6763e798bca799f098b2c4809cc91fcae73d713294036ed9be3f44577e62611035eaf0c1aa9b56027c5cc88cf1bafb2d7e922852c14fd1f762657602c0 SHA512 9eafcc5a17f74936adf29c1050f680f23bbec29f8f4f93bda4914ef6ab2a4aa94229a53ff2ffb61ab56e99f55381ea31ce0dff5129a7a2dee95b30e47cc6c4bd
-EBUILD rocm-comgr-5.7.1.ebuild 2027 BLAKE2B 437bdde0cc68f29c920d7d98731f3c816960039f33dd0e8e5f37a0e063495112394ea8e6d0feff294bb866cf0d5d259c6344280f058f01c5ea6300f6ae70afbd SHA512 d49a7564b5a549a7784db274f5a17463a006ec08dbc32fee365bb56e3dd1c5b90b5643463910209a65a09d0d99f56a53e233b6d394a7c5da3b06e45a4e1b3a1f
+EBUILD rocm-comgr-5.7.1.ebuild 2059 BLAKE2B a366eb8aab05055bd05c520551d1e3c6670f1330283730a9656c7f02b49543be812af2797c2bdae2c7fae143a203a28563b8dc34a24c481024ee27ce70bbd752 SHA512 f80ba6b4241fc972d7efe2611ecc705145a14d6254a80a19e416d43a7c5b17b7f35492f288665c370143ef7aa28f70eaeb394d20897e44d8ad3ad1d0e8232b3f
 EBUILD rocm-comgr-6.1.1.ebuild 2403 BLAKE2B b19d984c535a3fa4df5f1af1a5fc26b9c9f00c2347ac3dcc0faea4be30cd11bf8f3984d7afcb0709a32d4897e825cbbf714accd04e2be33eb12627e8e80f3309 SHA512 4d340d46831c089e2b9f9d1d44e0b1d2a0cd020cb50eed8589a5f745ec5c806b9ff65d0751b7439366135cc3bb801d725586e4f285ec27b24e90cac69383cd3a
 EBUILD rocm-comgr-6.1.2.ebuild 2403 BLAKE2B b19d984c535a3fa4df5f1af1a5fc26b9c9f00c2347ac3dcc0faea4be30cd11bf8f3984d7afcb0709a32d4897e825cbbf714accd04e2be33eb12627e8e80f3309 SHA512 4d340d46831c089e2b9f9d1d44e0b1d2a0cd020cb50eed8589a5f745ec5c806b9ff65d0751b7439366135cc3bb801d725586e4f285ec27b24e90cac69383cd3a
-EBUILD rocm-comgr-6.3.0.ebuild 2418 BLAKE2B 4111a7c233343f694f7c726e02ea37f8be293955804fce29d626889224437198a8cc4e7eec1728af2bcb0e700df113b09a1902e7279ceff9831f443b9d4f7db5 SHA512 e6a4dfd1163ebcce5106c0b3ae1bb536f34741e74ec91f4584dc6d02e9c8bf293229f3fa653169663667b292a9f42f4792795e6c151018c9b19ab17ad6e8275f
-EBUILD rocm-comgr-6.3.2.ebuild 2420 BLAKE2B 42bc47265e2bcaf1b1751cbc6c79e5f51fd6144d4f2f939fcb9f04018dec480bf51ad9a1c645b1f407be5c7b1dd2966591821fcd8c245fa7954fbf02bcd2ce2a SHA512 86382e313aedcbafada922095cb710de46d50f62733f6f5a86a407d47918ba0946470c9703946b4a139095c3e69034ff5b79910a3fc6dbb3947d3e843f81b4ea
+EBUILD rocm-comgr-6.3.2-r1.ebuild 2499 BLAKE2B e4a6e306f6c1a3a47f4392e030ba9e88f6c1bf5a3946c5781145a50df7caf0e98c58f12340dd6cbfbec44dc6ee68c018768b8c5be190660fbe6069dff27fa703 SHA512 34c569412644f7482d282ed9c10a62038584f0c7c97a07932be34808bfad2964ddad2fda10a91fa798007b8c4e9dad73ccc1761fa78e33857d7301277f40a39c
 MISC metadata.xml 638 BLAKE2B d2396daa1a9e505ff3fc3b7a2465f4ca5c933ac8609c08732513c30ebb715f244681075b8b415b75a0d0c330144cb6fab483e6b4231b1144c3bf3bc5091693f3 SHA512 da41a365f6d75e8feabed3a54ca117a8406cabec215137751280ab5985ab86e178a14183e804af220b49b83d4084489c1ec1dd1d543aaa585d910b6636b866c4
diff --git a/dev-libs/rocm-comgr/files/0001-COMGR-changes-needed-for-upstream-llvm.patch b/dev-libs/rocm-comgr/files/0001-COMGR-changes-needed-for-upstream-llvm.patch
deleted file mode 100644
index 8200d4414f8b..000000000000
--- a/dev-libs/rocm-comgr/files/0001-COMGR-changes-needed-for-upstream-llvm.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From be2bcaaea228cdcb5981b261046175275c402fb9 Mon Sep 17 00:00:00 2001
-From: Konstantin Zhuravlyov <kzhuravl_dev@outlook.com>
-Date: Wed, 26 Jan 2022 12:02:52 -0500
-Subject: [PATCH] COMGR changes needed for
- https://github.com/llvm/llvm-project/commit/83d59e05b201760e3f364ff6316301d347cbad95
-
-Change-Id: Iac01d024463865734879faf5f814e0862c26f7a1
----
- lib/comgr/src/comgr-compiler.cpp | 3 ++-
- lib/comgr/src/comgr-env.h        | 1 +
- lib/comgr/src/comgr-objdump.cpp  | 4 +++-
- 3 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/lib/comgr/src/comgr-compiler.cpp b/lib/comgr/src/comgr-compiler.cpp
-index 6c2cba2..db4c8d5 100644
---- a/src/comgr-compiler.cpp
-+++ b/src/comgr-compiler.cpp
-@@ -605,7 +605,8 @@ static amd_comgr_status_t linkWithLLD(llvm::ArrayRef<const char *> Args,
-   ArrayRef<const char *> ArgRefs = llvm::makeArrayRef(LLDArgs);
-   static std::mutex MScreen;
-   MScreen.lock();
--  bool LLDRet = lld::elf::link(ArgRefs, false, LogS, LogE);
-+  bool LLDRet = lld::elf::link(ArgRefs, LogS, LogE, false, false);
-+  lld::CommonLinkerContext::destroy();
-   MScreen.unlock();
-   if (!LLDRet) {
-     return AMD_COMGR_STATUS_ERROR;
-diff --git a/lib/comgr/src/comgr-env.h b/lib/comgr/src/comgr-env.h
-index eb13e61..aef57b3 100644
---- a/src/comgr-env.h
-+++ b/src/comgr-env.h
-@@ -36,6 +36,7 @@
- #ifndef COMGR_ENV_H
- #define COMGR_ENV_H
- 
-+#include "llvm/ADT/Optional.h"
- #include "llvm/ADT/StringRef.h"
- 
- namespace COMGR {
-diff --git a/lib/comgr/src/comgr-objdump.cpp b/lib/comgr/src/comgr-objdump.cpp
-index 094bbac..b41e6c1 100644
---- a/src/comgr-objdump.cpp
-+++ b/src/comgr-objdump.cpp
-@@ -43,6 +43,7 @@
- #include "llvm/ADT/STLExtras.h"
- #include "llvm/ADT/StringExtras.h"
- #include "llvm/ADT/Triple.h"
-+#include "llvm/CodeGen/CommandFlags.h"
- #include "llvm/DebugInfo/DWARF/DWARFContext.h"
- #include "llvm/DebugInfo/Symbolize/Symbolize.h"
- #include "llvm/MC/MCAsmInfo.h"
-@@ -2395,9 +2396,10 @@ llvm::DisassemHelper::disassembleAction(StringRef Input,
-   size_t ArgC = ArgV.size();
-   ArgV.push_back(nullptr);
-   COMGR::clearLLVMOptions();
-+  llvm::codegen::RegisterCodeGenFlags CGF;
-   cl::ParseCommandLineOptions(ArgC, ArgV.data(), "llvm object file dumper\n",
-                               &ErrS);
--  MCPU = lld::getCPUStr();
-+  MCPU = llvm::codegen::getCPUStr();
- 
-   ErrorOr<std::unique_ptr<MemoryBuffer>> BufOrErr =
-       MemoryBuffer::getMemBuffer(Input);
--- 
-2.35.1
-
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-4.5.2-dependencies.patch b/dev-libs/rocm-comgr/files/rocm-comgr-4.5.2-dependencies.patch
deleted file mode 100644
index 13cff2e52dfe..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-4.5.2-dependencies.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/25
-
-From c65cba2e73f9118e128b9ab7e655ee0f8a7798e7 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Sun, 1 Mar 2020 19:24:22 -0500
-Subject: [PATCH] Link additional required LLVM libraries
-
-Without these additional required dependencies, linking fails with errors such as:
-`undefined reference to llvm::errs()'`
----
- CMakeLists.txt | 20 ++++++++++++++++++--
- 1 file changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1794a07..c7b852a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -207,7 +207,11 @@ install(FILES
-   DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}")
- 
- set(CLANG_LIBS
--  clangFrontendTool)
-+  clangFrontendTool
-+  clangFrontend
-+  clangBasic
-+  clangDriver
-+  clangSerialization)
- 
- set(LLD_LIBS
-   lldELF
-@@ -218,8 +222,21 @@ if (LLVM_LINK_LLVM_DYLIB)
- else()
-   llvm_map_components_to_libnames(LLVM_LIBS
-     ${LLVM_TARGETS_TO_BUILD}
-+    Option
-     DebugInfoDWARF
--    Symbolize)
-+    Symbolize
-+    Support
-+    Object
-+    BitWriter
-+    MC
-+    MCParser
-+    MCDisassembler
-+    Core
-+    IRReader
-+    CodeGen
-+    Linker
-+    Demangle
-+    BinaryFormat)
- endif()
- 
- target_link_libraries(amd_comgr
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-fix-include.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-fix-include.patch
deleted file mode 100644
index 6bf47c610dfc..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-fix-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: comgr/src/comgr-env.h
-===================================================================
---- comgr.orig/src/comgr-env.h
-+++ comgr/src/comgr-env.h
-@@ -37,6 +37,7 @@
- #define COMGR_ENV_H
- 
- #include "llvm/ADT/StringRef.h"
-+#include "llvm/ADT/Optional.h"
- 
- namespace COMGR {
- namespace env {
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-link.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-link.patch
deleted file mode 100644
index 0e2a9a668216..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-clang-link.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: comgr/CMakeLists.txt
-===================================================================
---- comgr.orig/CMakeLists.txt
-+++ comgr/CMakeLists.txt
-@@ -283,11 +283,7 @@ install(FILES
-   DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}")
- 
- set(CLANG_LIBS
--  clangFrontendTool
--  clangFrontend
--  clangBasic
--  clangDriver
--  clangSerialization)
-+  clang-cpp)
- 
- set(LLD_LIBS
-   lldELF
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-args-changed b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-args-changed
deleted file mode 100644
index 545b1c632182..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-args-changed
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/comgr-compiler.cpp
-+++ b/src/comgr-compiler.cpp
-@@ -453,7 +453,7 @@ static bool executeAssemblerImpl(AssemblerInvocation &Opts,
-     std::unique_ptr<MCCodeEmitter> MCE;
-     std::unique_ptr<MCAsmBackend> MAB;
-     if (Opts.ShowEncoding) {
--      MCE.reset(TheTarget->createMCCodeEmitter(*MCII, *MRI, Ctx));
-+      MCE.reset(TheTarget->createMCCodeEmitter(*MCII, Ctx));
-       MCTargetOptions Options;
-       MAB.reset(TheTarget->createMCAsmBackend(*STI, *MRI, Options));
-     }
-@@ -472,7 +472,7 @@ static bool executeAssemblerImpl(AssemblerInvocation &Opts,
-       Out = BOS.get();
-     }
- 
--    MCCodeEmitter *CE = TheTarget->createMCCodeEmitter(*MCII, *MRI, Ctx);
-+    MCCodeEmitter *CE = TheTarget->createMCCodeEmitter(*MCII, Ctx);
-     MCTargetOptions Options;
-     MCAsmBackend *MAB = TheTarget->createMCAsmBackend(*STI, *MRI, Options);
-     Triple T(Opts.Triple);
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-remove-zlib-gnu b/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-remove-zlib-gnu
deleted file mode 100644
index 41e51a407ba9..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-5.1.3-llvm-15-remove-zlib-gnu
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/comgr-compiler.cpp
-+++ b/src/comgr-compiler.cpp
-@@ -244,13 +244,12 @@ bool AssemblerInvocation::createFromArgs(AssemblerInvocation &Opts,
-                                      OPT_compress_debug_sections_EQ)) {
-     if (A->getOption().getID() == OPT_compress_debug_sections) {
-       // TODO: be more clever about the compression type auto-detection
--      Opts.CompressDebugSections = llvm::DebugCompressionType::GNU;
-+      Opts.CompressDebugSections = llvm::DebugCompressionType::Z;
-     } else {
-       Opts.CompressDebugSections =
-           llvm::StringSwitch<llvm::DebugCompressionType>(A->getValue())
-               .Case("none", llvm::DebugCompressionType::None)
-               .Case("zlib", llvm::DebugCompressionType::Z)
--              .Case("zlib-gnu", llvm::DebugCompressionType::GNU)
-               .Default(llvm::DebugCompressionType::None);
-     }
-   }
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-HIPIncludePath-not-needed.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-HIPIncludePath-not-needed.patch
deleted file mode 100644
index 54b98726026f..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-HIPIncludePath-not-needed.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-ROCM and HIPIncludePath is now /usr, which disturb the include order
-===================================================================
---- comgr.orig/src/comgr-compiler.cpp
-+++ comgr/src/comgr-compiler.cpp
-@@ -1010,10 +1010,6 @@ amd_comgr_status_t AMDGPUCompiler::addCo
-     Args.push_back("x86_64-unknown-linux-gnu");
-     Args.push_back("--cuda-device-only");
-     Args.push_back("-nogpulib");
--    Args.push_back("-isystem");
--    Args.push_back(ROCMIncludePath.c_str());
--    Args.push_back("-isystem");
--    Args.push_back(HIPIncludePath.c_str());
-     break;
-   default:
-     return AMD_COMGR_STATUS_ERROR_INVALID_ARGUMENT;
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fix-tests.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fix-tests.patch
deleted file mode 100644
index 08a40460c762..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fix-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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/source1.cl
-+++ comgr/test/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.3.3-fno-stack-protector.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fno-stack-protector.patch
deleted file mode 100644
index c8d078ee8946..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-fno-stack-protector.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This add -fno-stack-protector to all compilation, since -f-stack-protector is currently unsupported by ROCm
-Reference: https://bugs.gentoo.org/890377
-index 465187e..0baf925 100644
---- a/src/comgr-compiler.cpp
-+++ b/src/comgr-compiler.cpp
-@@ -850,6 +850,8 @@ amd_comgr_status_t AMDGPUCompiler::processFile(const char *InputFilePath,
-     Argv.push_back(Arg);
-   }
- 
-+  Argv.push_back("-fno-stack-protector");
-+
-   for (auto &Option : ActionInfo->getOptions()) {
-     Argv.push_back(Option.c_str());
-     if (Option.rfind("--rocm-path", 0) == 0) {
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-remove-h-option.patch b/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-remove-h-option.patch
deleted file mode 100644
index 1346ba4ef04d..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-5.3.3-remove-h-option.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/commit/2d05f9e480cbc591a6b888dfd49d9f7ef1bef25f
-Reference: https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/issues/52
-Reference: https://bugs.gentoo.org/851702#c37
-This unblocks building blender with HIP cycles support
-======================================================================
-From 2d05f9e480cbc591a6b888dfd49d9f7ef1bef25f Mon Sep 17 00:00:00 2001
-From: Jacob Lambert <jacob.lambert@amd.com>
-Date: Thu, 12 Jan 2023 08:45:38 -0800
-Subject: [PATCH] Remove -h option from comgr-objdump
-
-The -h option (short for -headers) is a legal objdump option.
-However registering this as an LLVM option by Comgr prevents other
-LLVM tools or instances from registering a -h option in the same
-process, which is an issue because -h is a common short form for
--help.
-
-A long term solution will be to libraryize llvm-obj dump, and
-call it in Comgr via an API instead of re-implementation, which
-will eliminate the need for Comgr to register any LLVM options for
-objdump.
-
-Change-Id: Ieb1981aeb1826422647fd301c4827e2bfb370560
----
- lib/comgr/src/comgr-objdump.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lib/comgr/src/comgr-objdump.cpp b/lib/comgr/src/comgr-objdump.cpp
-index 6d20a3c..ead69fe 100644
---- a/src/comgr-objdump.cpp
-+++ b/src/comgr-objdump.cpp
-@@ -175,9 +175,9 @@ cl::opt<bool> SectionHeaders("section-headers",
- static cl::alias SectionHeadersShort("headers",
-                                      cl::desc("Alias for --section-headers"),
-                                      cl::aliasopt(SectionHeaders));
--static cl::alias SectionHeadersShorter("h",
--                                       cl::desc("Alias for --section-headers"),
--                                       cl::aliasopt(SectionHeaders));
-+// The following option has been removed to avoid conflicts with
-+// other llvm tools/instances also attempting to register a -h option
-+//   static cl::alias SectionHeadersShorter("h", ...)
- 
- cl::list<std::string>
-     FilterSections("section",
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
deleted file mode 100644
index 9fd14df196a2..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-fix-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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
deleted file mode 100644
index 96df9291eb86..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-lld-include.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index 8bb07b55a3ab..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-nullopt.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index aa3e7c370a53..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-opt_mrelax.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index 340df3852fc2..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-5.5.1-subtargetfeatures.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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.1.3-r3.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.1.3-r3.ebuild
deleted file mode 100644
index 3339e71dc276..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-5.1.3-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake llvm prefix
-
-LLVM_MAX_SLOT=15
-
-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
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.2-dependencies.patch"
-	"${FILESDIR}/${PN}-5.1.3-Find-CLANG_RESOURCE_DIR.patch"
-	"${FILESDIR}/${PN}-5.1.3-clang-link.patch"
-	"${FILESDIR}/${PN}-5.1.3-clang-fix-include.patch"
-	"${FILESDIR}/${PN}-5.1.3-rocm-path.patch"
-	"${FILESDIR}/0001-COMGR-changes-needed-for-upstream-llvm.patch"
-	"${FILESDIR}/${PN}-5.1.3-llvm-15-remove-zlib-gnu"
-	"${FILESDIR}/${PN}-5.1.3-llvm-15-args-changed"
-	"${FILESDIR}/${PN}-5.3.3-fno-stack-protector.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}
-	llvm-core/clang:${LLVM_MAX_SLOT}=
-	llvm-core/clang-runtime:=
-	llvm-core/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
-	sed '/Args.push_back(HIPIncludePath/,+1d' -i src/comgr-compiler.cpp || die
-	sed '/Args.push_back(ROCMIncludePath/,+1d' -i src/comgr-compiler.cpp || die # ROCM and HIPIncludePath is now /usr, which disturb the include order
-	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
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-5.3.3-r2.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.3.3-r2.ebuild
deleted file mode 100644
index 30112cb3b0c6..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-5.3.3-r2.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
-
-inherit cmake llvm prefix
-
-LLVM_MAX_SLOT=15
-
-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-clang-fix-include.patch"
-	"${FILESDIR}/${PN}-5.1.3-rocm-path.patch"
-	"${FILESDIR}/${PN}-5.1.3-llvm-15-remove-zlib-gnu"
-	"${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.3.3-fix-tests.patch"
-	"${FILESDIR}/${PN}-5.3.3-fno-stack-protector.patch"
-	"${FILESDIR}/${PN}-5.3.3-remove-h-option.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}
-	llvm-core/clang:${LLVM_MAX_SLOT}=
-	llvm-core/clang-runtime:=
-	llvm-core/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-5.4.3-r1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.4.3-r1.ebuild
deleted file mode 100644
index 7863223f7e6a..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-5.4.3-r1.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
-
-inherit cmake llvm prefix
-
-LLVM_MAX_SLOT=15
-
-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-clang-fix-include.patch"
-	"${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.3.3-fix-tests.patch"
-	"${FILESDIR}/${PN}-5.3.3-fno-stack-protector.patch"
-	"${FILESDIR}/${PN}-5.3.3-remove-h-option.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}
-	llvm-core/clang:${LLVM_MAX_SLOT}=
-	llvm-core/clang-runtime:=
-	llvm-core/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-5.5.1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.5.1.ebuild
deleted file mode 100644
index 77c1f229941c..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-5.5.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 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}
-	llvm-core/clang:${LLVM_MAX_SLOT}=
-	llvm-core/clang-runtime:=
-	llvm-core/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-5.7.1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild
index 15b9eeb38273..51d6b5c419b1 100644
--- a/dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild
+++ b/dev-libs/rocm-comgr/rocm-comgr-5.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -38,7 +38,9 @@ HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
+RDEPEND="
+	>=dev-libs/rocm-device-libs-${PV}
+	<dev-libs/rocm-device-libs-6
 	llvm-core/clang:${LLVM_MAX_SLOT}=
 	llvm-core/clang-runtime:=
 	llvm-core/lld:${LLVM_MAX_SLOT}="
diff --git a/dev-libs/rocm-comgr/rocm-comgr-6.3.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.3.0.ebuild
deleted file mode 100644
index 66239d28f79c..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-6.3.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( 19 )
-
-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/llvm-project/tree/amd-staging/amd/comgr"
-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}-6.0.0-extend-isa-compatibility-check.patch"
-	"${FILESDIR}/${PN}-6.1.0-enforce-oop-compiler.patch"
-	"${FILESDIR}/${PN}-6.3.0-fix-comgr-default-flags.patch"
-	"${FILESDIR}/${PN}-6.1.0-dont-add-nogpulib.patch"
-	"${FILESDIR}/${PN}-6.3.0-llvm-19-compat.patch"
-	"${FILESDIR}/${PN}-6.3.0-bypass-device-libs-copy.patch"
-)
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	llvm-core/clang-runtime:=
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}=
-		llvm-core/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-comgr/rocm-comgr-6.3.2.ebuild b/dev-libs/rocm-comgr/rocm-comgr-6.3.2-r1.ebuild
index bf8986261a9f..cea4ebe78e73 100644
--- a/dev-libs/rocm-comgr/rocm-comgr-6.3.2.ebuild
+++ b/dev-libs/rocm-comgr/rocm-comgr-6.3.2-r1.ebuild
@@ -26,14 +26,14 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.1.3-rocm-path.patch"
 	"${FILESDIR}/0001-Find-CLANG_RESOURCE_DIR-using-clang-print-resource-d.patch"
 	"${FILESDIR}/${PN}-6.0.0-extend-isa-compatibility-check.patch"
-	"${FILESDIR}/${PN}-6.1.0-enforce-oop-compiler.patch"
 	"${FILESDIR}/${PN}-6.3.0-fix-comgr-default-flags.patch"
 	"${FILESDIR}/${PN}-6.1.0-dont-add-nogpulib.patch"
 	"${FILESDIR}/${PN}-6.3.0-llvm-19-compat.patch"
 	"${FILESDIR}/${PN}-6.3.0-bypass-device-libs-copy.patch"
 )
 
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
+RDEPEND="
+	dev-libs/rocm-device-libs:${SLOT}
 	llvm-core/clang-runtime:=
 	$(llvm_gen_dep '
 		llvm-core/clang:${LLVM_SLOT}=
@@ -77,6 +77,8 @@ src_configure() {
 		-DCMAKE_STRIP=""  # disable stripping defined at lib/comgr/CMakeLists.txt:58
 		-DBUILD_TESTING=$(usex test ON OFF)
 	)
+	# Prevent CMake from finding systemwide hip, which breaks tests
+	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_hip=ON )
 	cmake_src_configure
 }
 
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index b76ec7ac45ea..07851076e13d 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,6 +1,3 @@
-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-6.0.0-add-gws-attribute.patch 581 BLAKE2B 40a8b66e44109a0d32c69ee76078c6ae8e45c52b1c3b8fb510040d8c616fbb552c0bfe77d5406a4a632cc0aca112292df2a720a5aba6fde63ad6853af613b565 SHA512 36b8851722e1fdc20de4ebc5875111017c0c80ba34263526f1228d3eb8fbb80ff6b458fecd665be9121a7c083f827343833481c53b221050446486139efdee40
@@ -13,15 +10,7 @@ DIST llvm-project-rocm-6.1.1.tar.gz 196027084 BLAKE2B 3ef0b6e3c47c66fd80289373e6
 DIST llvm-project-rocm-6.1.2.tar.gz 195992927 BLAKE2B d821f29f2f1f7c1ff414c63a710281f16d2a394b21f3365d01b86710cc09ed27e514b49fb744bf6a36b38815afa56cc26d44f0238f38479a0c2db9bf9989f389 SHA512 5f7e5dbe5976141de35e96e603624bd9d5a2c08b0690ba9fcd81d1b32f540f94bb9f4b74539e2838fd60ae1312dbe5e0b429ba80a03871782cdf3bd834940ce0
 DIST llvm-project-rocm-6.3.0.tar.gz 206677330 BLAKE2B f3e68a8c94599e3a938d3e761af163b9f010a06421680ee70aaaaf8073fb18da9151729c311fc4bd12b281b3afdd15e61cea31c970f0e4d36bb97838fa17ca5f SHA512 674fc3242c6dbb6962f1002dc34ccbd618da6adeb640bac15265d22fdcedf9de16ea3d79899891734ccc1099cb5b5ed9110b1162f4515c4cbc0d847810682b59
 DIST llvm-project-rocm-6.3.2.tar.gz 206671202 BLAKE2B a280e2be22b8eb9fd51814074447baed3637231d4bfbe391047a1fb2409197c8d8ba58cebb3aeaec15aa4daee9371311274b30ede48e0039d7c84e432b15de1a SHA512 314e27577af76268635f3c96ee3516829e4622913c3d0c4c68eccbaee0c9f7f5fc031cbd35827deb4bc29712592c424e296c15ce8c500c897bfb3eb19455899c
-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
-EBUILD rocm-device-libs-5.1.3-r1.ebuild 1184 BLAKE2B 76c1a7896d51ce5797af910f5bb5b96d8097e8b58f4308676234a6c85ba3ddd1ea73a18fb92fe88c936df89fbf5bca2db058b03487bc289cbe50a4070c6cb4b8 SHA512 dd467d58f862370cc08dde96b907542118959fba7de4c4c04c59ee6fcf087a9c78d6667977221862401f321cf985773d725c15947709b738cfc1c351adb94c5c
-EBUILD rocm-device-libs-5.3.3.ebuild 1184 BLAKE2B 76c1a7896d51ce5797af910f5bb5b96d8097e8b58f4308676234a6c85ba3ddd1ea73a18fb92fe88c936df89fbf5bca2db058b03487bc289cbe50a4070c6cb4b8 SHA512 dd467d58f862370cc08dde96b907542118959fba7de4c4c04c59ee6fcf087a9c78d6667977221862401f321cf985773d725c15947709b738cfc1c351adb94c5c
-EBUILD rocm-device-libs-5.4.3.ebuild 1250 BLAKE2B 6000c6bc6dc75cf647295f5122749e4c9b72d785a23902e565e54dfc41f3cbb1c216b376fe1ac2bf01c3f7b99cf309eb8b864fd34e2c0b9f2d96382c65ec5afc SHA512 fd47115cbf83126180fc68e27d8597644a779c7f6e42d9d1da4676fd6281778e5a1320f5a8875e1d5bd11801a601f1ad6c507e6d9a48c3393acc6ce89e860fa1
-EBUILD rocm-device-libs-5.5.1.ebuild 1206 BLAKE2B 01dee1e4c7118bca0e2a8e017418bea09a36ea4dedf1d452376b9d1e9d28533e6b718be3f169c6add4188d0d648ce2c1b6b5ef7a6d5e8eefa2d5fc3e49aa2e05 SHA512 8048e7658bda7721bf85adfa521ed94f6648bb2f70ecffcd09b7726bb8f512b4db81b7bcdc08e42c834829cc4fb88f6f6fe9c2bb3eac9387ab735a8d32b3866b
 EBUILD rocm-device-libs-5.7.1.ebuild 1455 BLAKE2B 85df640675a3e163397691198be61e9c7cc11bc02b9cbfbcf4820ed2d4403218b60c83ba4fbcf38a62bb0df49eea6447e94d27f7ecc6beaebb5777d2bf750d04 SHA512 ba10a16ae8f530fbe783fa4b42ff02b9ed1a4e53fc42d40e201d0609fe4300814067d29875367eb67dbf045f7e058cac82d38ce3867f8c720d75bfcbf65aa2d4
 EBUILD rocm-device-libs-6.1.1.ebuild 2378 BLAKE2B 806c3f420e5156f770429208b481b1768350918b1cd9cd9f373bb85e80186132cd2e102c60e9271e8895661c2877c6b979565385e53cc0d544cc9458f31b4746 SHA512 0e773fc157f02e6b8b4beee34bc87217b4c80b83854c85973ab83c595dc9fe29960128d789cb1846c3878f1fe3547aac293d2edc2fbd7cae633cae3d85e71e6f
 EBUILD rocm-device-libs-6.1.2.ebuild 2421 BLAKE2B 8aa35401997852ccbd17cfe6fb836ff4496e1a4ae79fa40f03d4d91e9bc7947fbbb026a484fd7f197c32113037e601aecfe543b3050cd53d99fa65c776433eee SHA512 675809b9017a65b8bc13b88a096fe3e4247947dd3b49501f476eee642b600a7baaa4d9a9c123f1ea3917d3b69d8d3f7225dd330ae56ebf0e83cc6abea9517fdb
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.1.3-llvm-link.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.1.3-llvm-link.patch
deleted file mode 100644
index 9e6dc38921e2..000000000000
--- a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.1.3-llvm-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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_libs} LLVM)
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.1.3-test-bitcode-dir.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.1.3-test-bitcode-dir.patch
deleted file mode 100644
index 9047f8ef90e5..000000000000
--- a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.1.3-test-bitcode-dir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-lib/amdgcn/bitcode is not among the default bitcode dirs of clang
-Add --rocm-device-lib-path to the clang argument
-Excerpt from https://salsa.debian.org/rocm-team/rocm-device-libs/-/blob/d2014eed680ccce5f9bd61ff4fc28a89682575f3/debian/patches/cmake-amdgcn-bitcode.patch
-==============================================
---- rocm-device-libs.orig/test/constant_folding/RunConstantFoldTest.cmake
-+++ rocm-device-libs/test/constant_folding/RunConstantFoldTest.cmake
-@@ -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
---- rocm-device-libs.orig/test/constant_folding/CMakeLists.txt
-+++ rocm-device-libs/test/constant_folding/CMakeLists.txt
-@@ -30,6 +30,7 @@
-      -DFILECHECK_BIN=${FILECHECK_BIN}
-      -DOUTPUT_FILE=output.${name}.ll
-      -DINPUT_FILE=${CMAKE_CURRENT_SOURCE_DIR}/${name}.cl
-+     -DAMDGCN_BITCODES=${PROJECT_BINARY_DIR}/lib/amdgcn/bitcode
-      -DTEST_CPU=gfx900
-      -P ${CMAKE_CURRENT_SOURCE_DIR}/RunConstantFoldTest.cmake)
- endfunction()
diff --git a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.4.3-Revert-Update-counters-for-gfx11.patch b/dev-libs/rocm-device-libs/files/rocm-device-libs-5.4.3-Revert-Update-counters-for-gfx11.patch
deleted file mode 100644
index bf9b2c372600..000000000000
--- a/dev-libs/rocm-device-libs/files/rocm-device-libs-5.4.3-Revert-Update-counters-for-gfx11.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From 8ce920dddac9846254aaf6261bafd8b22976b04e Mon Sep 17 00:00:00 2001
-From: Jeremy Newton <alexjnewt@hotmail.com>
-Date: Sun, 18 Dec 2022 20:48:21 -0500
-Subject: [PATCH] Revert "Update counters for gfx11"
-
-This reverts commit 85f95b94960c6f7ff4ff0242a399deb4a204fb6a.
----
- doc/OCKL.md       |  4 ++--
- ockl/inc/ockl.h   |  3 ---
- ockl/src/dm.cl    | 15 +++++++++++----
- ockl/src/mtime.cl | 35 ++---------------------------------
- ockl/src/wait.cl  | 18 +++++++++---------
- 5 files changed, 24 insertions(+), 51 deletions(-)
-
-diff --git a/doc/OCKL.md b/doc/OCKL.md
-index 07574f6..05c5c49 100644
---- a/doc/OCKL.md
-+++ b/doc/OCKL.md
-@@ -99,8 +99,8 @@ The following table lists the available functions along with a brief description
- | `int __ockl_mul24_i32(int,int);` | Multiply assuming operands fit in 24 bits |
- | `uint __ockl_mul24_u32(uint,uint);` | |
- | - | |
--| `ulong __ockl_cyclectr_u64(void);` | Current value of free running 64-bit clock counter |
--| `ulong __ockl_steadyctr_u64(void);` | Current value of constant speed 64-bit clock counter |
-+| `ulong __ockl_memtime_u64(void);` | Current value of free running 64-bit clock counter |
-+| `ulong __ockl_memrealtime_u64(void);` | Current value of constant speed 64-bit clock counter |
- | - | |
- | `uint __ockl_activelane_u32(void);` | Index of currently lane counting only active lanes in wavefront |
- | - | |
-diff --git a/ockl/inc/ockl.h b/ockl/inc/ockl.h
-index d0b98d4..6300279 100644
---- a/ockl/inc/ockl.h
-+++ b/ockl/inc/ockl.h
-@@ -143,9 +143,6 @@ DECL_OCKL_NULLARY_U32(activelane)
- 
- DECL_OCKL_NULLARY_U64(memtime)
- DECL_OCKL_NULLARY_U64(memrealtime)
--DECL_OCKL_NULLARY_U64(cyclectr)
--DECL_OCKL_NULLARY_U64(steadyctr)
--
- 
- extern half OCKL_MANGLE_T(wfred_add,f16)(half x);
- extern float OCKL_MANGLE_T(wfred_add,f32)(float x);
-diff --git a/ockl/src/dm.cl b/ockl/src/dm.cl
-index 245b4a1..26373dd 100644
---- a/ockl/src/dm.cl
-+++ b/ockl/src/dm.cl
-@@ -201,6 +201,13 @@ get_heap_ptr(void) {
-     }
- }
- 
-+// realtime
-+__attribute__((target("s-memrealtime"))) static ulong
-+realtime(void)
-+{
-+    return __builtin_amdgcn_s_memrealtime();
-+}
-+
- // The actual number of blocks in a slab with blocks of kind k
- static uint
- num_blocks(kind_t k)
-@@ -466,7 +473,7 @@ new_slab_wait(__global heap_t *hp, kind_t k)
-     uint aid = __ockl_activelane_u32();
-     if (aid == 0) {
-         ulong expected = AL(&hp->salloc_time[k].value, memory_order_relaxed);
--        ulong now = __ockl_steadyctr_u64();
-+        ulong now = realtime();
-         ulong dt = now - expected;
-         if  (dt < SLAB_TICKS)
-             __ockl_rtcwait_u32(SLAB_TICKS - (uint)dt);
-@@ -480,7 +487,7 @@ grow_recordable_wait(__global heap_t *hp, kind_t k)
-     uint aid = __ockl_activelane_u32();
-     if (aid == 0) {
-         ulong expected = AL(&hp->grow_time[k].value, memory_order_relaxed);
--        ulong now = __ockl_steadyctr_u64();
-+        ulong now = realtime();
-         ulong dt = now - expected;
-         if  (dt < GROW_TICKS)
-             __ockl_rtcwait_u32(GROW_TICKS - (uint)dt);
-@@ -540,7 +547,7 @@ try_grow_num_recordable_slabs(__global heap_t *hp, kind_t k)
-     uint ret = GROW_BUSY;
-     if (aid == 0) {
-         ulong expected = AL(&hp->grow_time[k].value, memory_order_relaxed);
--        ulong now = __ockl_steadyctr_u64();
-+        ulong now = realtime();
-         if (now - expected >= GROW_TICKS &&
-             ACE(&hp->grow_time[k].value, &expected, now, memory_order_relaxed))
-                 ret = GROW_FAILURE;
-@@ -687,7 +694,7 @@ try_allocate_new_slab(__global heap_t *hp, kind_t k)
- 
-         if (aid == 0) {
-             ulong expected = AL(&hp->salloc_time[k].value, memory_order_relaxed);
--            ulong now = __ockl_steadyctr_u64();
-+            ulong now = realtime();
-             if (now - expected >= SLAB_TICKS &&
-                 ACE(&hp->salloc_time[k].value, &expected, now, memory_order_relaxed))
-                 ret = (__global sdata_t *)0;
-diff --git a/ockl/src/mtime.cl b/ockl/src/mtime.cl
-index 43f4161..543aaa3 100644
---- a/ockl/src/mtime.cl
-+++ b/ockl/src/mtime.cl
-@@ -5,48 +5,17 @@
-  * License. See LICENSE.TXT for details.
-  *===------------------------------------------------------------------------*/
- 
--#include "oclc.h"
- #include "ockl.h"
- 
--__attribute__((target("s-memrealtime"))) static ulong
--mem_realtime(void)
--{
--    return __builtin_amdgcn_s_memrealtime();
--}
--
--__attribute__((target("gfx11-insts"))) static ulong
--msg_realtime(void)
--{
--    return __builtin_amdgcn_s_sendmsg_rtnl(0x83);
--}
--
--// Deprecated
- __attribute__((target("s-memtime-inst"))) ulong
- OCKL_MANGLE_U64(memtime)(void)
- {
-     return __builtin_amdgcn_s_memtime();
- }
- 
--// Deprecated
--ulong
-+__attribute__((target("s-memrealtime"))) ulong
- OCKL_MANGLE_U64(memrealtime)(void)
- {
--    return mem_realtime();
--}
--
--ulong
--OCKL_MANGLE_U64(cyclectr)(void)
--{
--    return __builtin_readcyclecounter();
--}
--
--ulong
--OCKL_MANGLE_U64(steadyctr)(void)
--{
--    if (__oclc_ISA_version >= 11000) {
--        return msg_realtime();
--    } else {
--        return mem_realtime();
--    }
-+    return __builtin_amdgcn_s_memrealtime();
- }
- 
-diff --git a/ockl/src/wait.cl b/ockl/src/wait.cl
-index 49b038e..b249599 100644
---- a/ockl/src/wait.cl
-+++ b/ockl/src/wait.cl
-@@ -10,47 +10,47 @@
- #include "ockl.h"
- #include "oclc.h"
- 
--void
-+__attribute__((target("s-memrealtime"))) void
- OCKL_MANGLE_T(rtcwait,u32)(uint ticks)
- {
--    ulong now = __ockl_steadyctr_u64();
-+    ulong now = __builtin_amdgcn_s_memrealtime();
-     ulong end = now + __builtin_amdgcn_readfirstlane(ticks);
- 
-     if (__oclc_ISA_version >= 9000) {
-         while (end > now + 1625) {
-             __builtin_amdgcn_s_sleep(127);
--            now = __ockl_steadyctr_u64();
-+            now = __builtin_amdgcn_s_memrealtime();
-         }
- 
-         while (end > now + 806) {
-             __builtin_amdgcn_s_sleep(63);
--            now = __ockl_steadyctr_u64();
-+            now = __builtin_amdgcn_s_memrealtime();
-         }
- 
-         while (end > now + 396) {
-             __builtin_amdgcn_s_sleep(31);
--            now = __ockl_steadyctr_u64();
-+            now = __builtin_amdgcn_s_memrealtime();
-         }
-     }
- 
-     while (end > now + 192) {
-         __builtin_amdgcn_s_sleep(15);
--        now = __ockl_steadyctr_u64();
-+        now = __builtin_amdgcn_s_memrealtime();
-     }
- 
-     while (end > now + 89) {
-         __builtin_amdgcn_s_sleep(7);
--        now = __ockl_steadyctr_u64();
-+        now = __builtin_amdgcn_s_memrealtime();
-     }
- 
-     while (end > now + 38) {
-         __builtin_amdgcn_s_sleep(3);
--        now = __ockl_steadyctr_u64();
-+        now = __builtin_amdgcn_s_memrealtime();
-     }
- 
-     while (end > now) {
-         __builtin_amdgcn_s_sleep(1);
--        now = __ockl_steadyctr_u64();
-+        now = __builtin_amdgcn_s_memrealtime();
-     }
- }
- 
--- 
-2.34.1
-
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-5.1.3-r1.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-5.1.3-r1.ebuild
deleted file mode 100644
index b7ff41518668..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-5.1.3-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake llvm
-
-LLVM_MAX_SLOT=15
-
-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="llvm-core/clang:${LLVM_MAX_SLOT}"
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=( "${FILESDIR}/${PN}-5.1.3-test-bitcode-dir.patch"
-	"${FILESDIR}/${PN}-5.1.3-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-device-libs/rocm-device-libs-5.3.3.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-5.3.3.ebuild
deleted file mode 100644
index b7ff41518668..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-5.3.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake llvm
-
-LLVM_MAX_SLOT=15
-
-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="llvm-core/clang:${LLVM_MAX_SLOT}"
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=( "${FILESDIR}/${PN}-5.1.3-test-bitcode-dir.patch"
-	"${FILESDIR}/${PN}-5.1.3-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-device-libs/rocm-device-libs-5.4.3.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-5.4.3.ebuild
deleted file mode 100644
index b6add6d0f153..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-5.4.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake llvm
-
-LLVM_MAX_SLOT=15
-
-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="llvm-core/clang:${LLVM_MAX_SLOT}"
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=( "${FILESDIR}/${PN}-5.1.3-test-bitcode-dir.patch"
-	"${FILESDIR}/${PN}-5.1.3-llvm-link.patch"
-	"${FILESDIR}/${PN}-5.4.3-Revert-Update-counters-for-gfx11.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-device-libs/rocm-device-libs-5.5.1.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-5.5.1.ebuild
deleted file mode 100644
index 223583f417aa..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-5.5.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 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="llvm-core/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 e18d15824124..09c2f2b5c061 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -1,29 +1,11 @@
-AUX rocclr-5.3.3-fix-include.patch 6053 BLAKE2B e215cefd0f2895beda0e3c029a24e48f4de5060dcc10ccdcb4fdf8771d78a66c59f8b0cfe69d70eed3a80aea2c30e30b41607e1a43a77f4b322fa264dcb539e9 SHA512 636f3b91e6c509d1b34ae0d6757a830bc796429c56d0458137a51b9bf4c8575126de7b8259d761b44bc5888839cdb349fdb35c192d1e92e9ef39a6f671997113
-AUX rocclr-5.3.3-gcc13.patch 776 BLAKE2B f34e6167a13dc65a88535492bc0cac7f62fc1c3844bc64170be6b59ae024acc5a776a99c1040a16959c2295012394bc103d64919012b2f76463fa52762a98101 SHA512 ec67a5a04f76204674ed1121f19c642a7eb95656d32da3c0776ba87a5a0a475df60ecb890dbefad069ef5463ea3b3fe3c8da836a878081b7c3ed5df2ac69c94c
-AUX rocm-opencl-runtime-3.5.0-do-not-install-libopencl.patch 548 BLAKE2B ae4234422acdc1fdf0bd82a0469f63239e709c0626e3918d34e6a023b70452eed98aea1725a3638ee8f46d54d08ca885bf114ad3a7689baaa18794a6d5c983b9 SHA512 27682bb65e281744556c2a99c38ae7b3e22e3306ff10ceb98d8c3204950982b17521309dd11d36e1a07ca33b8448dae1270fa31004db9841025ff9a9e9af3d4c
-AUX rocm-opencl-runtime-5.0.2-enable-gfx800.patch 970 BLAKE2B 4080ab450457c21de1c81c7e9eebc75578d7326430732f2dab5688150347de2b7977d8804573fd79bb1d14a2e5b87ede0de41cd7c7920f90fe8762686198f931 SHA512 b4f653fbe1b51e789a8213e37c5e6c43d7035e7971c483a3e24903e1d46bdbf206575b16ac6c78b5c32ba4e32dfa428339723b58f672716c05e51c785543c535
-AUX rocm-opencl-runtime-5.1.3-remove-clinfo.patch 1178 BLAKE2B b708214f9c4a6860a23281e8ece176d4b1968fc005e1b95a88e67752a8c60a23a7f66ff267ef909ddee4a45f4c8441339ea6f5de867d77df10c98d8043bb54d4 SHA512 626574b948a16cd59513496791bd73a5c1f3bda68ae9e01ea982bd036858f7c8817ea33a22e85f180cecdbe19d999afb2604c8cb549bdd71d4bfc56c18f5d4ad
-AUX rocm-opencl-runtime-5.3.3-gcc13.patch 791 BLAKE2B 6b284cb6cd9b273ee6d21850f7a29f75079567c70bdb263b3b95b27632ac71dd5e0be1200db58281c3ac737ff9d042dbd87615300e6182c9f43425098ae3389c SHA512 9edcfed7d5a5ed8e5aa1ccd8e09639d95ef373878eb7bc4ad65aa38539d8138c1d589056ffe9fd95cb18e95aebef3f206f5731557a1451758cbf3ae0e7b30e21
 AUX rocm-opencl-runtime-6.1.2-fix-segfault.patch 1471 BLAKE2B 868e0b7d653277623d1f708680bb2cef8c5899472205345487c117888717987a3697837b6f931b31f3adf8adefdda4e6eb91102219c05c1639c5cf389eda3209 SHA512 27ab04193692a5089b8ee73f9882a9c86e518cb77afd631dc84b3a9ffe9cda48a0ac853dd259d66bc937791cfb2422668429d472fd62b833aef076cfa930180f
 AUX rocm-opencl-runtime-6.1.2-musl.patch 566 BLAKE2B ca84d7a1c38b6ae3e7dedbda8cafa0ad5bf31165c3a7b5af8a1a9714d871eeedb64bd6e6c71960e65ee3f7bed2bdf302d07e7c33e225102123d8516018391430 SHA512 e224e84b6eb4b43fd79e5172ad4882d1862d7a50fcb7ed60afc58148a399a96fafaf14477ed31d503f3ecb4c93ba2b58bdcad3c6dce7afab61ee7a8e60d3f65e
 AUX rocm-opencl-runtime-6.2.4-fix-lib-version.patch 575 BLAKE2B e5e7ad57f54d7c789c6da40d6b1c4460ec5bb4712e91adc63586d382e3e973ebc747d08c2bc2e313b6f7bd32c72b972946126ea4e60d1783d185a7764d581498 SHA512 0496c9f7ac503cad66e2ad9b55ae03e13b783d1698529dbee290a4d3abf23acdc9c4a121bf31a58f3ed09ba80dd106800816fbf4009dc5383356d3d5005a8cfa
-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-clr-5.7.1.tar.gz 2008647 BLAKE2B 3db0760d6f83504e60caf88a2dd5e0bc02c7db9d6f263ad0eb2cfc79aa0f88a3699c412844a0158a796d9d02e79660287e791edad787d814eefffea4fd2298b4 SHA512 d79323481d82fc02c12a32cdcc0d14437d512af023e7737db0387b7eecb27fe6e4ae7c71d6adce57932a04bb24c880440d9dc10aeb5af11a4f2ca64d44330965
 DIST rocm-clr-6.1.1.tar.gz 2031034 BLAKE2B b0485bb015d31986f4988d1db0c029c826856e50b5bb1b58fac2097c14b3966668f1b8d41ec198889e27ac860497a8b3c081ec31d52390d5c9ff5db092bf7cce SHA512 86925e8b9a9e77b06a57daefbc7279887b4ef7c6a79c3717bc2f2d3bf29926281c60063fd17e21c65d7def520d9f579bf88f69051d053a38750ba968f69ca3fc
 DIST rocm-clr-6.1.2.tar.gz 2031283 BLAKE2B d51d32a77794ea97f1a3817786c9fd6b482106b665eea6e2c9b4c11e4dce19a3486386eb5ba111554c2d82c30e2a93add7502eed5768caf3fb709fb5fbb2e71b SHA512 e97224451864efe0084c4117f54893c9624a6a9f365a0b4abad08fd9635f008dea742dc589429fbb714e1b8177d06362c0f5a741f6c4a050d0fd4d48da72d54b
 DIST rocm-clr-6.3.0.tar.gz 2093572 BLAKE2B 14f75f9f5dc4000a2abf28e523659def8cd96112c9c8b95abb634c33433077faa3ddab3fbe659e0ed2e1f309f63a93b7eb03fa6f246b4cea06ca8c512c13308a SHA512 f005baaf2a8f63946811db990e2d373906b31a4085a51427d407c9e4c1d877a14aeb713190a285953cadb960b5517570941c60e2f998adb2b1f9833f1d2f5925
 DIST rocm-clr-6.3.2.tar.gz 2095677 BLAKE2B 2f1122a2058f8ba358fe48a46473f23c46a5413fef16515f103c21a8ae13bb76522fbe587cb9c9e6e3dd06f968402b6a881391823c80381c0c41072597c845ac SHA512 5bade294dc6fc60bf459bfd7124c354f2b0079167d3c8776a9e3d6d8320bb9b1a2a0770a466987e164994293024bf47de158ba207f077968dfccb7bf20fb884b
-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 4053 BLAKE2B f7b35f367f54155504b7e8b73d01ef7ea014eb76fe9dbf502be434ecd07018168a8f41f3d15bfdaa46d447d3ba82107aed11a5000592d1c29a687824fce7bd75 SHA512 3120352aa1733f3ee13ac734d1558241fc325d7a3e2647ed0a3e3e305caa2f1acfc8963349a01f09a70ae0cf2a75b1d830661efddc77111ba6398e148acf4afa
-EBUILD rocm-opencl-runtime-5.3.3-r1.ebuild 3630 BLAKE2B cdafd2367c4b222a43b434e8878208b8920ca68482375c23ad04a626fc3aa295dfb2e7caaa82f2eabf1d69877b08309a44f2a53bad731ca1bedab517b5544cf5 SHA512 9b230ad15ca5d1a6d109637f29919254294ba3a92aed74a9decac5c1aa8259f2a25de8c8a41594e140fbc49c1d4755e2858a62c9977eae5213cad4a5495dc011
-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.1.1.ebuild 2695 BLAKE2B 2e2241518863f36222e755d61f8e5c25510c5a5250458fce110d5830898a36ae3e97a20fce61382d7ebf39346dee705b673dd0c1e4390e3ee44f7c23eff4d1b7 SHA512 edfb87e56c042000e41480771186a8e536e35a58cb2e57ef71f3d118501dcc85eb1025eba6a6af0b25d9c896329aa832d56f9b1037031c4279e5f21367dfa81b
 EBUILD rocm-opencl-runtime-6.1.2-r1.ebuild 2792 BLAKE2B db82b119e08794967bb97ff40816a6311ba8d42968697497163849716cf29ade994cc9b50656c2cd052abf12fb03c0a25784c2cb3b598bbef7dbdad6f2137e46 SHA512 288de016364fd933a5cee3464094374ee79b4b5636ef537658517cf5b2da7a7f0b6b7a83a153a9ef6cbc4b57c658ed1d1b0aa5fb362391b5163ecfeeeff85780
diff --git a/dev-libs/rocm-opencl-runtime/files/rocclr-5.3.3-fix-include.patch b/dev-libs/rocm-opencl-runtime/files/rocclr-5.3.3-fix-include.patch
deleted file mode 100644
index e014fe374bec..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocclr-5.3.3-fix-include.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-For https://bugs.gentoo.org/893602
-==================================
-From 197ea6f76f34e0b3c8ab46d96c2fa5014e467e37 Mon Sep 17 00:00:00 2001
-From: Maneesh Gupta <maneesh.gupta@amd.com>
-Date: Fri, 5 Aug 2022 05:42:39 +0000
-Subject: [PATCH] SWDEV-350289 - Fix build warnings due to file re-org
-
-Change-Id: I0066fa163b9f25fdde4c5b3baed1ef0654390c06
----
- device/comgrctx.hpp           | 2 +-
- device/devkernel.hpp          | 2 +-
- device/devprogram.hpp         | 2 +-
- device/rocm/pro/prodevice.cpp | 2 +-
- device/rocm/pro/prodriver.hpp | 2 +-
- device/rocm/roccounters.hpp   | 2 +-
- device/rocm/rocdevice.hpp     | 8 ++++----
- device/rocm/rocglinterop.hpp  | 2 +-
- device/rocm/rockernel.cpp     | 2 +-
- device/rocm/rocprogram.cpp    | 2 +-
- device/rocm/rocsignal.hpp     | 4 ++--
- device/rocm/rocvirtual.cpp    | 4 ++--
- device/rocm/rocvirtual.hpp    | 8 ++++----
- 13 files changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/device/comgrctx.hpp b/device/comgrctx.hpp
-index d69506e2..31ee24e1 100644
---- a/device/comgrctx.hpp
-+++ b/device/comgrctx.hpp
-@@ -23,7 +23,7 @@
- #include <mutex>
- #if defined(USE_COMGR_LIBRARY)
- #include "top.hpp"
--#include "amd_comgr.h"
-+#include "amd_comgr/amd_comgr.h"
- 
- namespace amd {
- typedef void (*t_amd_comgr_get_version)(size_t *major, size_t *minor);
-diff --git a/device/devkernel.hpp b/device/devkernel.hpp
-index 19b3212d..b256abf3 100644
---- a/device/devkernel.hpp
-+++ b/device/devkernel.hpp
-@@ -105,7 +105,7 @@ struct RuntimeHandle {
-   uint32_t group_segment_size;        //!< From GROUP_SEGMENT_FIXED_SIZE
- };
- 
--#include "amd_comgr.h"
-+#include "amd_comgr/amd_comgr.h"
- 
- //  for Code Object V3
- enum class ArgField : uint8_t {
-diff --git a/device/devprogram.hpp b/device/devprogram.hpp
-index 099d6a37..741d81b0 100644
---- a/device/devprogram.hpp
-+++ b/device/devprogram.hpp
-@@ -29,7 +29,7 @@
- #include "devwavelimiter.hpp"
- 
- #if defined(USE_COMGR_LIBRARY)
--#include "amd_comgr.h"
-+#include "amd_comgr/amd_comgr.h"
- #endif  // defined(USE_COMGR_LIBRARY)
- 
- namespace amd {
-diff --git a/device/rocm/pro/prodevice.cpp b/device/rocm/pro/prodevice.cpp
-index a0e49461..1e366cd2 100644
---- a/device/rocm/pro/prodevice.cpp
-+++ b/device/rocm/pro/prodevice.cpp
-@@ -20,7 +20,7 @@
- 
- #ifndef WITHOUT_HSA_BACKEND
- 
--#include "hsa_ext_amd.h"
-+#include "hsa/hsa_ext_amd.h"
- #include "lnxheaders.h"
- #include "prodevice.hpp"
- #include "amdgpu_drm.h"
-diff --git a/device/rocm/pro/prodriver.hpp b/device/rocm/pro/prodriver.hpp
-index bc420697..819ade27 100644
---- a/device/rocm/pro/prodriver.hpp
-+++ b/device/rocm/pro/prodriver.hpp
-@@ -23,7 +23,7 @@
- #ifndef WITHOUT_HSA_BACKEND
- 
- #include "top.hpp"
--#include "hsa.h"
-+#include "hsa/hsa.h"
- 
- /*! \addtogroup HSA
-  *  @{
-diff --git a/device/rocm/roccounters.hpp b/device/rocm/roccounters.hpp
-index ffc9fad0..45ebbe66 100644
---- a/device/rocm/roccounters.hpp
-+++ b/device/rocm/roccounters.hpp
-@@ -24,7 +24,7 @@
- #include "top.hpp"
- #include "device/device.hpp"
- #include "device/rocm/rocdevice.hpp"
--#include "hsa_ven_amd_aqlprofile.h"
-+#include "hsa/hsa_ven_amd_aqlprofile.h"
- 
- namespace roc {
- 
-diff --git a/device/rocm/rocdevice.hpp b/device/rocm/rocdevice.hpp
-index d8cb4c6c..44339bb9 100644
---- a/device/rocm/rocdevice.hpp
-+++ b/device/rocm/rocdevice.hpp
-@@ -40,10 +40,10 @@
- #include "device/rocm/rocprintf.hpp"
- #include "device/rocm/rocglinterop.hpp"
- 
--#include "hsa.h"
--#include "hsa_ext_image.h"
--#include "hsa_ext_amd.h"
--#include "hsa_ven_amd_loader.h"
-+#include "hsa/hsa.h"
-+#include "hsa/hsa_ext_image.h"
-+#include "hsa/hsa_ext_amd.h"
-+#include "hsa/hsa_ven_amd_loader.h"
- 
- #include <atomic>
- #include <iostream>
-diff --git a/device/rocm/rocglinterop.hpp b/device/rocm/rocglinterop.hpp
-index a539cc6f..588d8a6f 100644
---- a/device/rocm/rocglinterop.hpp
-+++ b/device/rocm/rocglinterop.hpp
-@@ -34,7 +34,7 @@ typedef __GLXcontextRec* GLXContext;
- 
- #include "device/rocm/mesa_glinterop.h"
- #include "device/rocm/rocregisters.hpp"
--#include "hsa_ext_amd.h"
-+#include "hsa/hsa_ext_amd.h"
- 
- namespace roc {
- 
-diff --git a/device/rocm/rockernel.cpp b/device/rocm/rockernel.cpp
-index 76ab76ad..5624c877 100644
---- a/device/rocm/rockernel.cpp
-+++ b/device/rocm/rockernel.cpp
-@@ -19,7 +19,7 @@
-  THE SOFTWARE. */
- 
- #include "rockernel.hpp"
--#include "amd_hsa_kernel_code.h"
-+#include "hsa/amd_hsa_kernel_code.h"
- 
- #include <algorithm>
- 
-diff --git a/device/rocm/rocprogram.cpp b/device/rocm/rocprogram.cpp
-index e4559645..4f77026d 100644
---- a/device/rocm/rocprogram.cpp
-+++ b/device/rocm/rocprogram.cpp
-@@ -25,7 +25,7 @@
- #include "utils/options.hpp"
- #include "rockernel.hpp"
- 
--#include "amd_hsa_kernel_code.h"
-+#include "hsa/amd_hsa_kernel_code.h"
- 
- #include <string>
- #include <vector>
-diff --git a/device/rocm/rocsignal.hpp b/device/rocm/rocsignal.hpp
-index 3e8c1e6e..fff310d5 100644
---- a/device/rocm/rocsignal.hpp
-+++ b/device/rocm/rocsignal.hpp
-@@ -22,7 +22,7 @@
- 
- #include "device/devsignal.hpp"
- 
--#include <hsa.h>
-+#include "hsa/hsa.h"
- 
- namespace roc {
- 
-@@ -44,4 +44,4 @@ public:
-   }
- };
- 
--};
-\ No newline at end of file
-+};
-diff --git a/device/rocm/rocvirtual.cpp b/device/rocm/rocvirtual.cpp
-index 63b96378..1b6287e9 100644
---- a/device/rocm/rocvirtual.cpp
-+++ b/device/rocm/rocvirtual.cpp
-@@ -33,8 +33,8 @@
- #include "platform/sampler.hpp"
- #include "utils/debug.hpp"
- #include "os/os.hpp"
--#include "amd_hsa_kernel_code.h"
--#include "amd_hsa_queue.h"
-+#include "hsa/amd_hsa_kernel_code.h"
-+#include "hsa/amd_hsa_queue.h"
- 
- #include <fstream>
- #include <limits>
-diff --git a/device/rocm/rocvirtual.hpp b/device/rocm/rocvirtual.hpp
-index 6c738776..1bb0868c 100644
---- a/device/rocm/rocvirtual.hpp
-+++ b/device/rocm/rocvirtual.hpp
-@@ -24,11 +24,11 @@
- #include "rocdefs.hpp"
- #include "rocdevice.hpp"
- #include "utils/util.hpp"
--#include "hsa.h"
--#include "hsa_ext_image.h"
--#include "hsa_ext_amd.h"
-+#include "hsa/hsa.h"
-+#include "hsa/hsa_ext_image.h"
-+#include "hsa/hsa_ext_amd.h"
- #include "rocprintf.hpp"
--#include "hsa_ven_amd_aqlprofile.h"
-+#include "hsa/hsa_ven_amd_aqlprofile.h"
- #include "rocsched.hpp"
- 
- namespace roc {
--- 
-2.39.1
-
diff --git a/dev-libs/rocm-opencl-runtime/files/rocclr-5.3.3-gcc13.patch b/dev-libs/rocm-opencl-runtime/files/rocclr-5.3.3-gcc13.patch
deleted file mode 100644
index a86cd9fa120e..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocclr-5.3.3-gcc13.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-For https://bugs.gentoo.org/895382
-==================================
-From ca70cd7c3d63b1036e604116f3b269ca123e7904 Mon Sep 17 00:00:00 2001
-From: Jeremy Newton <Jeremy.Newton@amd.com>
-Date: Wed, 8 Feb 2023 14:03:58 -0500
-Subject: [PATCH] SWDEV-1 - device: Add missing include
-
-Newer GCC's seem to require this.
-
-Change-Id: I85926d4fa552b772f2eb9f8ede7863a546c47f54
-Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com>
----
- device/devhcprintf.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/device/devhcprintf.cpp b/device/devhcprintf.cpp
-index b36f7758..a5aba4a4 100644
---- a/device/devhcprintf.cpp
-+++ b/device/devhcprintf.cpp
-@@ -23,6 +23,7 @@
- 
- #include <assert.h>
- #include <cstdarg>
-+#include <cstdint>
- #include <cstdio>
- #include <cstring>
- #include <string>
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-do-not-install-libopencl.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-do-not-install-libopencl.patch
deleted file mode 100644
index a74b2363c2df..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-do-not-install-libopencl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/khronos/icd/CMakeLists.txt	2020-06-07 16:05:32.425022904 +0200
-+++ b/khronos/icd/CMakeLists.txt	2020-06-07 16:06:03.273022786 +0200
-@@ -132,7 +132,7 @@
-     add_subdirectory (test)
- endif()
- 
--install (TARGETS OpenCL
--    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
--    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+#install (TARGETS OpenCL
-+#    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+#    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+#    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-5.0.2-enable-gfx800.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-5.0.2-enable-gfx800.patch
deleted file mode 100644
index 29482340295e..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-5.0.2-enable-gfx800.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-#From xuhuisheng
-#at https://github.com/RadeonOpenCompute/ROCm/issues/1659#issuecomment-1041026624
-
-diff --git a/utils/flags.hpp b/utils/flags.hpp
-index 8f0228cc..2eaa47c5 100644
---- a/utils/flags.hpp
-+++ b/utils/flags.hpp
-@@ -245,7 +245,7 @@ release(bool, ROC_SYSTEM_SCOPE_SIGNAL, true,                                  \
-         "Enable system scope for signals (uses interrupts).")                 \
- release(bool, ROC_SKIP_COPY_SYNC, false,                                      \
-         "Skips copy syncs if runtime can predict the same engine.")           \
--release(bool, ROC_ENABLE_PRE_VEGA, false,                                     \
-+release(bool, ROC_ENABLE_PRE_VEGA, true,                                     \
-         "Enable support of pre-vega ASICs in ROCm path")                      \
- release(bool, HIP_FORCE_QUEUE_PROFILING, false,                               \
-         "Force command queue profiling by default")                           \
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-5.1.3-remove-clinfo.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-5.1.3-remove-clinfo.patch
deleted file mode 100644
index d169902563e1..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-5.1.3-remove-clinfo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: ROCm-OpenCL-Runtime-rocm-5.1.3/CMakeLists.txt
-===================================================================
---- ROCm-OpenCL-Runtime-rocm-5.1.3.orig/CMakeLists.txt
-+++ ROCm-OpenCL-Runtime-rocm-5.1.3/CMakeLists.txt
-@@ -16,7 +16,6 @@ option(EMU_ENV "Enable building for emul
- set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_LIST_DIR}/khronos/headers/opencl2.2" CACHE PATH "")
- add_subdirectory(khronos/icd)
- add_subdirectory(amdocl)
--add_subdirectory(tools/clinfo)
- add_subdirectory(tools/cltrace)
- if(BUILD_TESTS)
-   add_subdirectory(tests/ocltst)
-Index: ROCm-OpenCL-Runtime-rocm-5.1.3/packaging/CMakeLists.txt
-===================================================================
---- ROCm-OpenCL-Runtime-rocm-5.1.3.orig/packaging/CMakeLists.txt
-+++ ROCm-OpenCL-Runtime-rocm-5.1.3/packaging/CMakeLists.txt
-@@ -5,7 +5,6 @@ set(CPACK_COMPONENTS_ALL binary dev icd)
- set(CPACK_DEB_COMPONENT_INSTALL ON)
- set(CPACK_RPM_COMPONENT_INSTALL ON)
- 
--install(TARGETS clinfo DESTINATION bin COMPONENT binary)
- install(TARGETS amdocl DESTINATION lib COMPONENT binary)
- install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt DESTINATION share/doc/${CMAKE_PROJECT_NAME} COMPONENT binary)
- 
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-5.3.3-gcc13.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-5.3.3-gcc13.patch
deleted file mode 100644
index b1cd513ce6b7..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-5.3.3-gcc13.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-For https://bugs.gentoo.org/895382
-==================================
-From 767241dca886bcd2469d91382afab9d032e1cfa6 Mon Sep 17 00:00:00 2001
-From: Jeremy Newton <Jeremy.Newton@amd.com>
-Date: Wed, 8 Feb 2023 14:16:43 -0500
-Subject: [PATCH] SWDEV-1 - cltrace: Add missing include
-
-Newer GCC's seem to require this.
-
-Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com>
-Change-Id: I56ef934600729e892f1cd7ab11662760df48aed8
----
- tools/cltrace/cltrace.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/cltrace/cltrace.cpp b/tools/cltrace/cltrace.cpp
-index be96298..5ac5b62 100644
---- a/tools/cltrace/cltrace.cpp
-+++ b/tools/cltrace/cltrace.cpp
-@@ -17,6 +17,7 @@
- #include <iostream>
- #include <cstring>
- #include <cstdlib>
-+#include <cstdint>
- 
- #ifdef _MSC_VER
- #include <windows.h>
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.1.3.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.1.3.ebuild
deleted file mode 100644
index b9015cd84b13..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.1.3.ebuild
+++ /dev/null
@@ -1,130 +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 prefix
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-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"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
-	>=virtual/opencl-3
-	media-libs/mesa[-opencl]"
-DEPEND="${RDEPEND}
-	dev-util/opencl-headers"
-BDEPEND=">=dev-build/rocm-cmake-${PV}
-	media-libs/glew
-	test? ( >=x11-apps/mesa-progs-8.5.0[X] )
-	"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.1.3-remove-clinfo.patch"
-	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
-	"${FILESDIR}/${PN}-5.3.3-gcc13.patch"
-)
-
-S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-S1="${WORKDIR}/ROCclr-rocm-${PV}"
-
-src_prepare() {
-	# Remove "clinfo" - use "dev-util/clinfo" instead
-	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
-
-	cmake_src_prepare
-
-	hprefixify amdocl/CMakeLists.txt
-
-	sed -e "s/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/g" -i packaging/CMakeLists.txt || die
-	# remove trailing CR or it won't work
-	sed -e "s/\r$//g" -i tests/ocltst/module/perf/oclperf.exclude || die
-
-	pushd ${S1} || 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-fix-include.patch"
-	eapply "${FILESDIR}/rocclr-5.3.3-gcc13.patch"
-	popd || die
-}
-
-src_configure() {
-	# 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="${S1}"
-		-DAMD_OPENCL_PATH="${S}"
-		-DROCM_PATH="${EPREFIX}/usr"
-		-DBUILD_TESTS=$(usex test ON OFF)
-		-DEMU_ENV=ON
-		# -DCMAKE_STRIP=""
-	)
-	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 liboclgl.so -A ogl.exclude
-		eend $? || die "oclgl test failed"
-	else
-		ewarn "${instruction1}"
-		ewarn "${instruction2}"
-		die "\${OCLGL_DISPLAY} not set."
-	fi
-	edob ./ocltst -m liboclruntime.so -A oclruntime.exclude
-	edob ./ocltst -m liboclperf.so -A oclperf.exclude
-}
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.3.3-r1.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.3.3-r1.ebuild
deleted file mode 100644
index 3e7f3d21381e..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.3.3-r1.ebuild
+++ /dev/null
@@ -1,118 +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"
-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"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
-	>=virtual/opencl-3
-	media-libs/mesa[-opencl]"
-DEPEND="${RDEPEND}
-	dev-util/opencl-headers"
-BDEPEND=">=dev-build/rocm-cmake-${PV}
-	media-libs/glew
-	test? ( >=x11-apps/mesa-progs-8.5.0[X] )
-	"
-
-S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-S1="${WORKDIR}/ROCclr-rocm-${PV}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.3.3-gcc13.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	pushd ${S1} || die
-	# Bug #753377
-	# patch re-enables accidentally disabled gfx800 family
-	eapply "${FILESDIR}/${PN}-5.0.2-enable-gfx800.patch"
-	eapply "${FILESDIR}/rocclr-${PV}-fix-include.patch"
-	eapply "${FILESDIR}/rocclr-5.3.3-gcc13.patch"
-	popd || die
-}
-
-src_configure() {
-	# 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="${S1}"
-		-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 liboclgl.so -A ogl.exclude
-		eend $? || die "oclgl test failed"
-	else
-		ewarn "${instruction1}"
-		ewarn "${instruction2}"
-		die "\${OCLGL_DISPLAY} not set."
-	fi
-	edob ./ocltst -m liboclruntime.so -A oclruntime.exclude
-	edob ./ocltst -m liboclperf.so -A oclperf.exclude
-}
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.4.3-r1.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.4.3-r1.ebuild
deleted file mode 100644
index fea24ac7dafc..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.4.3-r1.ebuild
+++ /dev/null
@@ -1,136 +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
-	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[-opencl]"
-DEPEND="${RDEPEND}
-	dev-util/opencl-headers"
-BDEPEND=">=dev-build/rocm-cmake-5.3
-	test? (
-		>=x11-apps/mesa-progs-8.5.0[X]
-		media-libs/glew
-	)
-	"
-
-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() {
-	# Fix ld.lld linker error: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/155
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	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/rocm-opencl-runtime/rocm-opencl-runtime-5.5.1.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.5.1.ebuild
deleted file mode 100644
index c9a0dfc880b7..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.5.1.ebuild
+++ /dev/null
@@ -1,133 +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
-	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[-opencl]"
-DEPEND="${RDEPEND}"
-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}"
-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() {
-	# 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 f2ae099d540c..84501459be37 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,5 +1,4 @@
 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 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
@@ -7,19 +6,11 @@ AUX rocr-runtime-6.1.0-musl.patch 3589 BLAKE2B b690a5c63ccd7056e8fc6699d0905933b
 AUX rocr-runtime-6.1.2-gcc15-stdint.patch 247 BLAKE2B e58abc680f93c5333c91343c6510a73b067047d202387a61675cdd6b66f6ebfb65695ff31a90eb5c55bce0d877c34b2c66c5410d9466b49873a6d081c2a9af2b SHA512 bd4eb98ebc35077827def53351ac22a5a71e0c5b8757addffc04334cc7720dcf59a356cbaf4a2cbe102bed24f463b10b0db924a5bc2e8eb08e1822d6ee519025
 AUX rocr-runtime-6.3.0-musl.patch 3961 BLAKE2B af9d2b7360d306081de19c8ebae7372627437ad71f1bfc354d36e5cd84ed2238d405819b427dab2267c66239a087c6574445c2187de920644f9a8971ed37d66d SHA512 03f62a64df00d58a2166ba97fc429864e9f5a2bb9e86ce7df0dfc9b487ea88f1b2cf5a2ccfb92fa468ee4273388a5e2d0accbe83ded8ddb109626f8b7d63b738
 AUX rocr-runtime-6.3.0-use-system-hsakmt.patch 837 BLAKE2B 0c913ffa28d0e8a5fc802d386a864e7486ae7291e13d0364d071856a55391756f8df2cf4efae0f2b1d2725235b655b7e975f3887e3582167c880a75659bbf3b3 SHA512 c28e43790b414c33a61568a1dba009ccd65de2a89bdd4d49eb262f07709e0099f8d8e85913cacb8ded839ac5fc6129d00cd74e337039c8488a6451f233b5fb58
-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.1.1.tar.gz 903611 BLAKE2B 175e7267bfd9d70fb805135e765004cf2b43b2d66354f0cef857d417c8dac4ce7638ec1b90a1088324aa5f90ed8354c66b56846115368d68d622a215350d84dd SHA512 5e6e28dee29ef9df9d617f56038b2e52022738d5510833cd8e1738defe1049d0a957db4d9f63bbf55d8efca3a4ea349b95919dd1b6b35b9814ebba575a67af57
 DIST rocr-runtime-6.1.2.tar.gz 903633 BLAKE2B 058492c6c37bb80e8cdb29752f3f1404ac88108dcfd5137042e4fdaff521db01d64bd14bdcbed9e53b8984f8bbb22b126f1a798bd064c393b5bcf76c1d3311ca SHA512 2893aff72a5fbf03bfde67ab64fcf00f4e10b5e5b11ff4617e94ae0c019a24a9b80601d8629d4e119e6a4957dc0aaf03d645111063979af60090fe3b232a477e
 DIST rocr-runtime-6.3.0.tar.gz 2258605 BLAKE2B 53b43a8bc4a327c2138e39db20f5217b2def6866d1b52e48017c41e6c3c8541e6bdce76f5a7669cdffccfb34a4cfa863e56e0ce4058d23c5f38d9d0900903751 SHA512 451e74d88875b8d0a1f21d95c543fd93610d966e69258b50fe4b8796381c58f5ea381384e199e5bcf01a80369a59e5a093d8f318fbe2ed1ca6a97dc915060f7a
 DIST rocr-runtime-6.3.2.tar.gz 2260102 BLAKE2B 706cd4cc61c3007aec2b7822c02a7c98399454b366f2a2c221ae53ea3ee4c288c47c7fcfbe8f1cbd38d071ab5c90a2d79c054a0b0d2a2f6892a051b843794d32 SHA512 0326242deae601275d71fb268781735b117e713e73b1bcac2fd732828d993dee5840dec011fdc4350be2afdbc8266b6d1b65d5dff0d465a5b9c9cc091a5c645c
-EBUILD rocr-runtime-5.1.3-r1.ebuild 1522 BLAKE2B ae7ad025e281985f4748df112fc1bb63a2ec7eb400a32693a1bb81c8eb35bb03fef2d245eed0b32f441d60121115e7a8c2ea595000dae5e8a1a3b392371a2858 SHA512 ad94236736a5dbaebc286d0a1c92187fb7f45c14c6a0ccc968c30cfd585c8599cc9047405e18179da09a37d88e8fbdb485b1e5304914cfef415eeefe737f1ee2
-EBUILD rocr-runtime-5.3.3-r1.ebuild 1338 BLAKE2B c9737cc797fc73b7f2b0068dae1a3d7d3b89a02f3b166033df765cd164bd2d4f0e07e3cab0ebb8aca27b2e7ff39e68af6e9749a5a30a401a7da2c6ade95c4afb SHA512 39bd8f222401c0af6c6990e3d513854aaa28ad12e390c86398c795fc4df2e5da092c883b9cc559f211f3752792746c3181a7c7da7bcc4b726c9fff805df8d5ed
-EBUILD rocr-runtime-5.4.3-r1.ebuild 1549 BLAKE2B b077ccd7be78ebc71d4c34ceb9ed44dbbf09bf8e2699929ef8794d020b12ba610079770fdb6d4fe4ed27683ab6248851336aea7f1a0416afd14437747e03b4d5 SHA512 a20f0564335d51e6332ca3b4d2d45a6d38aeda25ce98d040f9ba93975b350601d7af9dca2fcb7332eb97d761898b179ea6effd29fbffe18156b2136d3321e661
-EBUILD rocr-runtime-5.5.1.ebuild 1338 BLAKE2B 0557b175c46dfd0324bba29ba596a9241872220c8dc5e0862cc82adcfa09a17ac14c13ec84f7e0ea149c722b1f09abaab4f071a8639324b91705e5667f1bc19f SHA512 5a793bd7f9cf9f56ceb7bbbbf746b3a544bdefa093be5173505d8ded66429b41b2e14e42460ddae7a2546c6b2c10ff6d8a87c28d9dd938a53bb95d804459f192
 EBUILD rocr-runtime-5.7.1-r3.ebuild 1599 BLAKE2B b9f9ac349b71da10b6334eb398cf7c0455f8abcfe20c101db7e62ca9b81853d8e1619c0b024942764f6a1b93e8ab7ab32180327b324f2ac8875d9b93e567bcea SHA512 5816d09d2308fb010ed00e306026ac4e0a410db9fab5e1954fc51210f1a172075d9f9a1b0749c2703ce397644426eca9c099ae334da23238a3048409fcc55640
 EBUILD rocr-runtime-6.1.1.ebuild 1533 BLAKE2B 4b786de79180ce430ea31afa574fe011edb1b992bab530675958d98b41638cc658fc8a59f7aa3749c5484afce908ac730f80c61302c43b0b3dcf52422f87cf11 SHA512 77a2c887637477f5e49b70d0ca04adca864997170864b1b94752eb1da081fa587cffec95b6aeab3890f0cc332cd795236e140796dfaa83dfb8e2cf5e2b801851
 EBUILD rocr-runtime-6.1.2.ebuild 1579 BLAKE2B e516c6c3690c171778a831795642f6e2dbf9740fd4760bb65e28d91a2c59f5e3ae82c4eca83dbd129125d4669087c7fb673628f762b23abf7ccbee6de7aa546e SHA512 140cad720d8d1a34b5233f33a29c639d8f61badc84e677a59e05f3af5eee512cf484a21e6aff96f5265e00c5077e835854267026cdf9ef2a73ef9def3f7f34b5
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-5.0.1-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-5.0.1-cmake-install-paths.patch
deleted file mode 100644
index 8715a15d8de1..000000000000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-5.0.1-cmake-install-paths.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: src/CMakeLists.txt
-===================================================================
---- src.orig/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -286,35 +286,17 @@ if( NOT ${BUILD_SHARED_LIBS} )
-   install ( TARGETS ${CORE_RUNTIME_NAME} EXPORT ${CORE_RUNTIME_NAME}Targets )
- endif()
- 
--## Create symlinks for legacy packaging and install
--add_custom_target ( hsa_include_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../include/hsa hsa_include_link )
--if ( ${BUILD_SHARED_LIBS} )
--    add_custom_target ( hsa_lib_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}-link.so )
--    add_custom_target ( hsa_lib_link2 ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} )
--endif()
--
- ## Set install information
- # Installs binaries and exports the library usage data to ${HSAKMT_TARGET}Targets
- # TODO: Fix me for flat directory layout.  Should be ${CMAKE_INSTALL_LIBDIR}
--install ( TARGETS ${CORE_RUNTIME_TARGET} EXPORT ${CORE_RUNTIME_NAME}Targets
--  ARCHIVE DESTINATION lib COMPONENT binary
--  LIBRARY DESTINATION lib COMPONENT binary )
-+install ( TARGETS ${CORE_RUNTIME_TARGET} EXPORT ${CORE_RUNTIME_NAME}Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
- 
- # Install license
- install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT binary )
- 
- # Install public headers
- # TODO: Fix me for flat directory layout.  Should be ${CMAKE_INSTALL_INCLUDEDIR}
--install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION include/hsa COMPONENT dev )
--
--# Legacy symlink - not packaged (CPack is bugged until ~3.18, see https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4637)
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION hsa/include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa )
--
--# Legacy symlinks.
--if ( ${BUILD_SHARED_LIBS} )
--    install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so COMPONENT binary)
--    install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} COMPONENT binary)
--endif ()
-+install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
- 
- ## Configure and install package config file
- # Record our usage data for clients find_package calls.
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
deleted file mode 100644
index 429625f2ae0f..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-5.1.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake llvm
-
-LLVM_MAX_SLOT=15
-
-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}-5.0.1-cmake-install-paths.patch"
-	"${FILESDIR}/${PN}-4.3.0_no-aqlprofiler.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-COMMON_DEPEND="dev-libs/elfutils"
-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
-	llvm-core/clang
-	llvm-core/lld"
-BDEPEND="app-editors/vim-core"
-	# vim-core is needed for "xxd"
-
-CMAKE_BUILD_TYPE=Release
-
-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:/opt/rocm/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
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
deleted file mode 100644
index 22b1fe7f75c7..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-5.3.3-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic llvm
-
-LLVM_MAX_SLOT=15
-
-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}
-	<=dev-libs/rocm-device-libs-6.0
-	llvm-core/clang
-	llvm-core/lld"
-BDEPEND="app-editors/vim-core"
-	# vim-core is needed for "xxd"
-
-src_prepare() {
-	# 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
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	use debug || append-cxxflags "-DNDEBUG"
-	local mycmakeargs=( -DINCLUDE_PATH_COMPATIBILITY=OFF )
-	cmake_src_configure
-}
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
deleted file mode 100644
index 9b577952302f..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-5.4.3-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic llvm
-
-LLVM_MAX_SLOT=15
-
-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}
-	<=dev-libs/rocm-device-libs-6.0
-	llvm-core/clang
-	llvm-core/lld"
-BDEPEND="app-editors/vim-core"
-	# vim-core is needed for "xxd"
-
-src_prepare() {
-	# 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/rocr-runtime/rocr-runtime-5.5.1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild
deleted file mode 100644
index ff647a93c7db..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 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}
-	<=dev-libs/rocm-device-libs-6.0
-	llvm-core/clang
-	llvm-core/lld"
-BDEPEND="app-editors/vim-core"
-	# vim-core is needed for "xxd"
-
-src_prepare() {
-	# 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
-
-	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 699bd1a1da70..5d482ae614e6 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -7,19 +7,11 @@ AUX roct-thunk-interface-5.7.1-musl.patch 1878 BLAKE2B c2103b5b8d76e3a637b79bb70
 AUX roct-thunk-interface-6.1.0-visibility.patch 868 BLAKE2B d32fcc6a230af549b73db30183fcb2339fcd3bc68dfbf1f7dce0e35361a674f77cba58ef485c3212de43e95c5eabf517386c6b7a289e57ed38b5d6e21e191939 SHA512 6c540e70c53a602477943ff9a26d5eab3d02d8a3c8577b1e39d5baf5a3703de70073e1d0db5083d03460bdd1e2d2fff2cf6356e57d7e392ce4d4dac6bae74900
 AUX roct-thunk-interface-6.3.0-functions.patch 293 BLAKE2B e89c9f91f7b14578be5215fe02f8efe3beaf83ffdb3904a8b5211921c6fa8f38459b948da68118c9bcadd5694b4af3b37ce95f6c1221abfd8b7ec8a9c23326ba SHA512 085fd2179b203a2efb65e782036906a89e70cd490bf5acb79fe5b720a009e335b739a4df2922069d4352f4c45cbc40208dc4d360bb2527ea89bf6343842ac0c9
 AUX roct-thunk-interface-6.3.0-musl.patch 2488 BLAKE2B 98677f7bd7906fa7804203564241cd9eb6c4588d97db58c9f7a1934a9ce9eaf610ceee7439d85e0956aa60d583946fa2016e9bb1a42b1e9a8b2f43b4debdca95 SHA512 3015afed7b5055f46b1ec638d3ad406f7bac15fb0ad1f249b640558fc627fac6594f3b1dccfe20e3855c65bd75ed1ccbf390f5b73abacc20a35938397f538c78
-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.1.1.tar.gz 666377 BLAKE2B b30d733fb769f7169e97b8a28eaa61c84205aec06b55d662d24f159a3c84190f3252f090413769e56eb621abc789fae521cb7b26d7cdac952ff1e4e120707bc9 SHA512 2c579606d2ced9f8b5e32841db745819771b7d6ce0cef90b818e3710470e30c7715540125d99ed5ea13c4e672d5af6d8ad2dd5975ef76cab7ba993d86cf74eb4
 DIST roct-thunk-interface-6.1.2.tar.gz 666380 BLAKE2B ffff2405bbb95a6908670a23cf6090147a5669f8ab0c999047203731c99c511738a33ac8d3fc0f0e5432e3744e948ec3fe658d6a578ecc63606c8a5662025b0a SHA512 083b1a865608016f78c094a27ece3858072e72d80e1322e7cef22261222a0f868d3b72ebfcd80a11e4719e90d3d3fc7b0c683aed77714f54f520bb126b13ab7c
 DIST roct-thunk-interface-6.3.0.tar.gz 2258605 BLAKE2B 53b43a8bc4a327c2138e39db20f5217b2def6866d1b52e48017c41e6c3c8541e6bdce76f5a7669cdffccfb34a4cfa863e56e0ce4058d23c5f38d9d0900903751 SHA512 451e74d88875b8d0a1f21d95c543fd93610d966e69258b50fe4b8796381c58f5ea381384e199e5bcf01a80369a59e5a093d8f318fbe2ed1ca6a97dc915060f7a
 DIST roct-thunk-interface-6.3.2.tar.gz 2260102 BLAKE2B 706cd4cc61c3007aec2b7822c02a7c98399454b366f2a2c221ae53ea3ee4c288c47c7fcfbe8f1cbd38d071ab5c90a2d79c054a0b0d2a2f6892a051b843794d32 SHA512 0326242deae601275d71fb268781735b117e713e73b1bcac2fd732828d993dee5840dec011fdc4350be2afdbc8266b6d1b65d5dff0d465a5b9c9cc091a5c645c
-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.1.1.ebuild 1865 BLAKE2B f663ba72e647989b8504b0abd4914f183ced60b420cf9fec2688513db5d86d88037674c47901233704755d743703aece1241ae3b756fec291e4dc38b87feb292 SHA512 4f7d9270828b5c478842dc1cf0ca186bd126fa517fc36588df8a44efb57b73e8e97bc52f4a14bde14684f62c2127e386ff2e62ea7ad7e754543dabe14ef505c8
 EBUILD roct-thunk-interface-6.1.2.ebuild 1988 BLAKE2B 711a69796383d964849f321735e21780ae91a77a16952f7998f68f8cbd14093e112fba762310c130af47a5c05958f1be24b62542a8281ee89fb7a72e8e72dae9 SHA512 70ff633b89ae06481ca6631f0b9ef67fbb4367b9bd30a239233fee9eafce2ba4c25faa862a8681d9711b4cae55919a75644a734d297424ca51de29258b1e3456
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-5.1.3.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-5.1.3.ebuild
deleted file mode 100644
index d0cf376f0b8d..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-5.1.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 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/roct-thunk-interface/roct-thunk-interface-5.3.3.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-5.3.3.ebuild
deleted file mode 100644
index d0cf376f0b8d..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-5.3.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 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/roct-thunk-interface/roct-thunk-interface-5.4.3.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-5.4.3.ebuild
deleted file mode 100644
index 3f391bf5d5e0..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-5.4.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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/roct-thunk-interface/roct-thunk-interface-5.5.1.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-5.5.1.ebuild
deleted file mode 100644
index 4762213b5164..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-5.5.1.ebuild
+++ /dev/null
@@ -1,39 +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
-
-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
-}
author	V3n3RiX <venerix@koprulu.sector>	2025-02-14 00:13:14 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2025-02-14 00:13:14 +0000
commit	4fda045f90a4e301329bddb766e2e12a0b4401de (patch)
tree	1d486767bfd9de15d6c11d341408385eb7f7debe /dev-libs
parent	965058196f44550f3bc491dd85064071e085b776 (diff)