gentoo auto-resync : 19:12:2022 - 19:49:08

author: V3n3RiX <venerix@koprulu.sector> 2022-12-19 19:49:08 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-12-19 19:49:08 +0000
commit: f287ecad888abdeb38e617d0485de282cd6819db (patch)
tree: 874d56500040734c4dbb9e437e0d5ed80a0a1886 /dev-libs
parent: 844ae757702c53a56ee57056873a8204d256d47e (diff)
77 files changed, 64 insertions, 2750 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 830472803fe8..a949dc5e3613 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/ayatana-ido/Manifest b/dev-libs/ayatana-ido/Manifest
index 2533072477f6..93d33f95e7d5 100644
--- a/dev-libs/ayatana-ido/Manifest
+++ b/dev-libs/ayatana-ido/Manifest
@@ -1,3 +1,3 @@
 DIST ayatana-ido-0.9.2.tar.gz 122286 BLAKE2B f6498591d72fa6deb5d9c8d87ddad399e41b3701719e45fe82dc8d5bd6ede30bb754561fdeaa938713692a90b8c48657ea2cb472c762acab6c3f36c73907b92e SHA512 efc5825d32d707b02397692c347f99f3bca13da2cd653b6ce87882643c85c2698bdac6168e89a01ed98d5ee58c88a820d89dad7b88a5aee235b450c40969d0a7
-EBUILD ayatana-ido-0.9.2.ebuild 907 BLAKE2B a518e7d4b9f5d5ae7ff38165c85f4266cca6ae2990041aa9bf265d5e4d075a627d230c87dad4930c1244d8a36c73953b745a0eebaf3f312e3b8c4874a8535fb6 SHA512 2f55d4151a2412ff463b24a9ea73fc8fa32c43c2f88b7f67a5b2bf27a1a1f6dbe5ede123fba8f66557366176e02851908af57e4d3c47952799515ef876c7c43f
+EBUILD ayatana-ido-0.9.2.ebuild 919 BLAKE2B 16646af8b5b99667f9c241f14138babc199c9ba52eb022a4110d454dc6aae0b80f1bf67c47b7318b314020d10fd3d599c9172b2e7b31172dc7f9f5193d39d42e SHA512 fe8d3917659af98c5d3fa3682ddc963b3ee029d1ecf89f2b73b2fd5dd99dcf02d6694f296244f6eff8888182e56fcc93ba5044027098cea071345324af92c4e1
 MISC metadata.xml 311 BLAKE2B 28fa9db014e9362128d165b27c8f26056169acdc0fe2b438c9d3d47d473a4d05116cf65e061d5a881052b081df278678fa8c8d70d7b16765cd7b4881e6c8a2ea SHA512 504ed1007b71b9964cd9a0718270cf2147069eaa1eac3e13f2837d10486d893fddfad3458835d582c37c9987f8542702782db4f853d51cf3cddcdac96d5fb635
diff --git a/dev-libs/ayatana-ido/ayatana-ido-0.9.2.ebuild b/dev-libs/ayatana-ido/ayatana-ido-0.9.2.ebuild
index 45c5daadf28e..8c6c14eea3a6 100644
--- a/dev-libs/ayatana-ido/ayatana-ido-0.9.2.ebuild
+++ b/dev-libs/ayatana-ido/ayatana-ido-0.9.2.ebuild
@@ -18,7 +18,7 @@ IUSE="test"
 RESTRICT="test"
 #RESTRICT="!test? ( test )"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.58:2
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index e108f45c13c7..703531db8ced 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,6 +1,8 @@
 DIST ell-0.53.tar.xz 550296 BLAKE2B d68952a0d899d8d346aa9e491b19fc5fbe845fd607446b4c16f09816c3d8b38f576a08cf994fdc49d794847277cdbe6483a147146ed4adaafa47c269846d78b5 SHA512 4ebe79834acabaec411bece7d81f50d7d6ea8f5d330769bbeb20596df6c2885ff584f589b6f5bbf9607e1a52158151d6940d4a1438b4aa610d42c38882366ed7
 DIST ell-0.54.tar.xz 562496 BLAKE2B d5aa705d0a72068c18b4f7f2b40c80069fc4d8a746a4c8585140da5387e06a529019b4e8eb37d4caeb9fbb948100e86f78d678ca3a3c0964d03ec368f7a4be64 SHA512 dff507ced951a4919f6fe82b276446ee6a9bfb0b3b9fe7abb2c76a3c22cdccf92f97ebcb0a476946adef5b031fd0d86f5af934b052383bdd87b5a7962b021bac
+DIST ell-0.55.tar.xz 562716 BLAKE2B b49acda837e22dec8469423dd47b397471975acdb0df034f0d85163daf0eb393b9bb75b1dd81c6e8a395e271bb0b8da01939df3497983aae5b6d270a70dcd5fc SHA512 f71b7d20a37009842ae54b72463e4c34509d00f0c344ae3b39acabe784fee83027d04b3f272f51dbc519f82ab794837b9a24ca90da55b97c757725d030c1874e
 EBUILD ell-0.53.ebuild 1175 BLAKE2B 6f34b0b7cd415715039cda1a0fe1387c329cd4f704e96b99adce6b6ea7ae2059a08a24b0041a45cd455b1ec491c7ebc585b414b4afea0182feec5c5fc7c3bb7e SHA512 5a6e778aae87e96794ce29a103e4e4f0591ee8519960a1eefcc3e92d0eb931a2d77fbcbfdf142d0d60da63a4f4e65f31601841282d4fbfabe22af9f4c51ae40e
 EBUILD ell-0.54.ebuild 1181 BLAKE2B bcebe8f38618d85d8fddd3c401b76096bdbcb7f2798540f6582c1e56af78cdebf02f4295d60208254a6d2232bb6061372b6eb2dc12331b8384c668012da91430 SHA512 76571ec809fa9584c1d72dbae3f859db318ce061751a1e7d72e05febd9c715c918da5c30637c8dcfbca81ab038c54401b6f49f0e4cce2a720a24185c6915699a
-EBUILD ell-9999.ebuild 1181 BLAKE2B 882b8780ae8199afea4dda01eedb6e01120646b25fc46b7b7924b6472029abd6716fcd686571234105444a62994f2241ae6577937c6e2bbe3b36222161d7466b SHA512 f8797a2b189c08c3cf29ebf1519970ed4bde3009c0ea3ed21829eface5f7e1fd8a8d541440b858447cb9431e4bc95a31f5178b39230a18c43e3b48b8e4b55155
+EBUILD ell-0.55.ebuild 1181 BLAKE2B bcebe8f38618d85d8fddd3c401b76096bdbcb7f2798540f6582c1e56af78cdebf02f4295d60208254a6d2232bb6061372b6eb2dc12331b8384c668012da91430 SHA512 76571ec809fa9584c1d72dbae3f859db318ce061751a1e7d72e05febd9c715c918da5c30637c8dcfbca81ab038c54401b6f49f0e4cce2a720a24185c6915699a
+EBUILD ell-9999.ebuild 1181 BLAKE2B bcebe8f38618d85d8fddd3c401b76096bdbcb7f2798540f6582c1e56af78cdebf02f4295d60208254a6d2232bb6061372b6eb2dc12331b8384c668012da91430 SHA512 76571ec809fa9584c1d72dbae3f859db318ce061751a1e7d72e05febd9c715c918da5c30637c8dcfbca81ab038c54401b6f49f0e4cce2a720a24185c6915699a
 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/ell/ell-0.55.ebuild b/dev-libs/ell/ell-0.55.ebuild
new file mode 100644
index 000000000000..5f049ed30b76
--- /dev/null
+++ b/dev-libs/ell/ell-0.55.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="pie test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( sys-apps/dbus )"
+
+CONFIG_CHECK="
+	~TIMERFD
+	~EVENTFD
+	~CRYPTO_USER_API
+	~CRYPTO_USER_API_HASH
+	~CRYPTO_MD5
+	~CRYPTO_SHA1
+	~KEY_DH_OPERATIONS
+"
+
+src_prepare() {
+	default
+	sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \
+		unit/test-dbus*.c unit/dbus.conf || die
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	append-cflags "-fsigned-char" #662694
+	local myeconfargs=(
+		$(use_enable pie)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/ell/ell-9999.ebuild b/dev-libs/ell/ell-9999.ebuild
index 8cffe5864e18..5f049ed30b76 100644
--- a/dev-libs/ell/ell-9999.ebuild
+++ b/dev-libs/ell/ell-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic linux-info
 
diff --git a/dev-libs/libayatana-appindicator/Manifest b/dev-libs/libayatana-appindicator/Manifest
index 159c392d5236..f651d2efbd11 100644
--- a/dev-libs/libayatana-appindicator/Manifest
+++ b/dev-libs/libayatana-appindicator/Manifest
@@ -1,3 +1,3 @@
 DIST libayatana-appindicator-0.5.91.tar.gz 158269 BLAKE2B e1df60ce2b3ff5712cabf627a54e0767dcbc94d4e11c96a18fd20079642e6d033bfdd9e57d12235c72075cef1d711f5b042fb0a6282a6120018c8cdcc3b4033c SHA512 cc8631814c881640bf2de91a43205c3405fd1fefcd7d58f259171d0926bf7ab08f9361076f4eea1dd8876e8931f9c9230babd3a328f34dc298bc9c4ff004f8ee
-EBUILD libayatana-appindicator-0.5.91.ebuild 1055 BLAKE2B 8faee83bf1ad99b57ae643d5a256ff5334a756f95bad2db68765f33715b25f9ee83644ebf43caeda9af652b3e760103dce06b2b67c8636c8e333a776b3f87d4f SHA512 0b1026203ec718a7b87c48bb00feba43d24d7afc44809313bb671605543b3fabeaf9952fd4806bc1679ea3a2bd8c54f0e39821143afaded933f6436729e5eebe
+EBUILD libayatana-appindicator-0.5.91.ebuild 1067 BLAKE2B 034c70fb65c694ed4cca156a1cfaeba256470a8b0bec18d627ebbd44a794e8445370886f5e55a62a7e3bf5d69e823b2e498aa9a09bf738f5f4fa1a9d0192e42f SHA512 1d860afdec30643ce0104e9af13941d2b887d33bce59b320be3443047e4e6a3cbfe65e542c6bcf501ce2efa2c51ef1d97c8d9bebec31b7c99489393cfa6664be
 MISC metadata.xml 323 BLAKE2B 62ad338f71f771275eebdf77e713cc18c563be61d5eaee28f05915db16eccb885a436fa5967561b12be5441db354be705d4f9d25c3cbf0d5585e4ec11cd557da SHA512 715eff628c3440dabe9e3d2417f30fb80faae799c599dd4ae7302099e28fe9c1c01b503e0fb7fdc2defd03794bae547ac31bf5ade187e711acea455624d8ec72
diff --git a/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.91.ebuild b/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.91.ebuild
index 906aef94b494..11fb9bbb1a10 100644
--- a/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.91.ebuild
+++ b/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.91.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AyatanaIndicators/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-3 LGPL-2 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libayatana-indicator/Manifest b/dev-libs/libayatana-indicator/Manifest
index 9177be2366c5..99256f565e47 100644
--- a/dev-libs/libayatana-indicator/Manifest
+++ b/dev-libs/libayatana-indicator/Manifest
@@ -1,3 +1,3 @@
 DIST libayatana-indicator-0.9.3.tar.gz 149890 BLAKE2B c15ec72218814d9a33ab8cf654222ff7e05980de5cb175904041973d1ef9506c56a89e5fa8d41c1eaa2367f93a57e056010e23b87c2533cc7e731fbdfb23ef85 SHA512 cc2dd1e304e657cd8497d3107e7993122db6bbcf28c25dc1b41b250831cb76507226b5673abbd65bc954cbd5c3851df5528135df45d1cbb3de85c0c87c279452
-EBUILD libayatana-indicator-0.9.3.ebuild 955 BLAKE2B 60052adda3f140dddef167948b08a2d3a2eee95e1cbe3651a691c794561f88267edf0f7ae19d10909c866117dafe34080d80947805f30ea752587847621fad82 SHA512 8fb6c103de0f5f0a18bf446e0385b4986b9f488af6c7681eba8cbb31d21e34e0f9586c083dc4c3c6a6162f026cb49244b2f0d6205608b1cdbd36c0f1918a4f00
+EBUILD libayatana-indicator-0.9.3.ebuild 967 BLAKE2B 8e3fd9e6d0a5ea44273efff923738a97e2e32ded96f8bc050dcd3167f903cafd2a75a68f4ed787e1374d741295b2c60267941d56dc8bf2ba67ac934325164898 SHA512 20ddea21ca7fcebd0ea7dc8776dd6992eeba25547255e3779835a2487caa8ee175e7ec13629414b49dc018221a6390ed2023ac65f6bd1c80333ad85ef5ff63f6
 MISC metadata.xml 320 BLAKE2B 87ef34f60a6f66effac9de367e4dc493976b8fc08162ed86fd3b5cb15d7b0e51bc3b91d0675db4b3c48d17bcaab88f6fbdfd9ff2b63ec9079f71f56e13ab38fe SHA512 6ac6de8cd88988867e14f0b3a57b10762c171da8d75718c202c3f3a4a41707bd7d2eb4faee10b0b3d6a8130ef7b84036ae1a9575e97b25110ed185cda00e7e60
diff --git a/dev-libs/libayatana-indicator/libayatana-indicator-0.9.3.ebuild b/dev-libs/libayatana-indicator/libayatana-indicator-0.9.3.ebuild
index fefb2d0413db..6714f472988f 100644
--- a/dev-libs/libayatana-indicator/libayatana-indicator-0.9.3.ebuild
+++ b/dev-libs/libayatana-indicator/libayatana-indicator-0.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AyatanaIndicators/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
index f310b27e9b48..8fe67a891b1f 100644
--- a/dev-libs/rccl/Manifest
+++ b/dev-libs/rccl/Manifest
@@ -1,12 +1,7 @@
-AUX rccl-2.7.0-change_install_location.patch 894 BLAKE2B b38635d2eaa2e3f342c9db7ede66eb91a6170cc486ce90f487820895879ad6666a35ffe3673dcc2ee610ade9c8b5fcb6a65f0469aa971aa3c0994ee347d22eae SHA512 97b1d3799e3eb105045d1c29df498c1255bd008433f56dd53cedd602fef77d9cee61b3b9db9281d72ec297da19058e86e74b66380b321f1727053e8c6148e698
 AUX rccl-5.0.2-change_install_location.patch 936 BLAKE2B bd9feabfdeb0e6098e25baca8dd20a512b8761ab6d5b7ee4e723c268dec9b7200d125d4cb36fe540aedca396da51c094123f778d695f644788804e2f890d0697 SHA512 0fb0fadef6137d1a60dff8ae7e44df5a0769ea7142e182b86d2e4acee5a76397424b67ee73f25697494ad5d6e6ef60b71e889208775e6abf6f05f1c0d1b4b2b0
 AUX rccl-5.1.3-remove-chrpath.patch 1852 BLAKE2B 255a295ffe34301c3926fbff412bef9ef7e6625a69a7e3dba2e3c7cc281640f3e4bc30dbaa25c916edf71f6b23e801e9f56a6c06cdb9221f470881a9d1291793 SHA512 05fc9c20c76195f45daba5c4a3612a6d2572ba1ae0028a0710c8c92e55f7c70b03ab7722363942d05d8e3c89a40edaa0364c0aff64f9d712e0739954650a6bae
-DIST rccl-4.0.0.tar.gz 741814 BLAKE2B c20178e45fb7787ef7f5e20326f91f11a1b2a575277b5f28591b0be6efa6730c3509b11255372648f1df50e33b5e593dbe9c3334c5001f39423fc70acfa49d07 SHA512 d25754895d7b5695e46031642c2550cf2b6b5c42628d8381a23d6d1a48699a14a4fdf842205a14b96bdd1339341f9e558492ef9366a63036d8a8a7011d2c1b05
-DIST rccl-4.3.0.tar.gz 836631 BLAKE2B c7fede9cf92d3e75b79da2874c0a1e45c5fd4ad9d24b11c9870e9fdef8d571a286cbf54ae0a033f2aec3d21b06cafc2b1c097aaf87ecd628f0c33e9267103be1 SHA512 1a27e6441955f01c853861f83743da2fc9597978c3ff99f238734d4bafb1e277d626811b72c6a12563d69b2b8265960b8a2566df618921557837035b92993f0e
 DIST rccl-5.0.2.tar.gz 888060 BLAKE2B f75d83b0f52487b4f7a2d30763ae4fb0d216fc353e62de981057cb855d5b26c7b846622c76330029c1ed5bd195695308bcef5c67d39526032dfee254084a40f7 SHA512 ee62720926008f67fcae0fc9a6ace23ca593a156f74fce6012ff2a6fcffdc2e2dc70d48cd3830b217e68449ba3e677b4005d20bd4554aeccf17cba56713cb00f
 DIST rccl-5.1.3.tar.gz 908274 BLAKE2B 46bff7b6e3d60d5884ccd7e19c54b2f47f90a337a8fdc6dca1a3cfee147e3652e1f912642cc134d4a82bf8daabd9f1391edff139d0517ab1078bd3d9650481d7 SHA512 20deb27c7ef3e6b6b73409950ac0d51286b4634f7002ce36a9a02cdd1d5b1f2db51f6decf773af83364c94f58cc96837da25299f5f5494fc15d8559a1b3c7fcc
-EBUILD rccl-4.0.0-r2.ebuild 791 BLAKE2B 1d2b95f2086c0f14ab87779e5d8d0304ec030dd985e8161aa9467455e414457508eac9a9450638bfa43499e38d9c597302399e4a08474568752bb47e6b378321 SHA512 79f6f264b5466b4a8c4389923487c4378fe8c59c9c34f5bbc0f5ded01beb2793b9981c982ee1598b00d5a16668f44a5c226e0d2cb40ed0eea1efd871825b4851
-EBUILD rccl-4.3.0-r1.ebuild 880 BLAKE2B f23e29397a9c9bac4001391438fffa009d0461bf097b650a1cd68e3b0e7bbb85013015662e6edcfef1e49f668923f4fc135eec194dc00e1ffca9a3a3ac9fb934 SHA512 d8d9aaac22ebdce40a9bb2c166e1126426c5f132eb4035b2e646b15c61ac1f73ba831ed8248dd6270a5b1016e2cdc368da0b1f9965bc77a4ef7f74821f72f6b2
 EBUILD rccl-5.0.2.ebuild 897 BLAKE2B 59a9bfcf1b5d4b8555f6217b6c65225716ef770d4076354b576d5999929ad588a14a193a0853a436d39a5d5b246a17f8c2acc1d2cac2f074a8d2b5c5c0a3cfa2 SHA512 855435ac36dda89b2bdb2b86723f8ea25cbad44209b269ee354153e0bc5e5cb01c842ad0c84b6aec707e851d825677784fe901284dbd86431f97b6dfed24de30
 EBUILD rccl-5.1.3.ebuild 1089 BLAKE2B 1b76d183b8c017e4102d75d8503ec5468446f01ceaeaab0310494a48506aa3ddcd9177904c9ca3c8cbb1b0707e9676c5af9499bfab92c0ede14a5e85edf036a1 SHA512 b1b904d5814621258b5f8d49158a1f7101e0ca5c4aa1b69a0386b46053fe105187f4552796d99458686a9805ebc28060415549003be5a219c57b41e408fda4b1
 MISC metadata.xml 598 BLAKE2B bda73827e412b7addb0788cb2bd769138f8872f9be48abc482a455dd88de8bcccce6687041e15d27d79301459cb8455c773447d6cab64fef97ccdaa60c929c90 SHA512 66d6c53cb8f15c595d3c3a2de8eece79460cf0f4c0f5c0a082539a409aadd17f05f5b5561c7d65864db60b56117270c2c36e1ad547a91495f6628bf04f78d015
diff --git a/dev-libs/rccl/files/rccl-2.7.0-change_install_location.patch b/dev-libs/rccl/files/rccl-2.7.0-change_install_location.patch
deleted file mode 100644
index c129e80c62c7..000000000000
--- a/dev-libs/rccl/files/rccl-2.7.0-change_install_location.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/CMakeLists.txt	2019-09-02 18:19:53.540736052 +0200
-+++ b/CMakeLists.txt	2019-09-02 18:21:14.936735741 +0200
-@@ -162,15 +162,16 @@
- 
- rocm_install_targets(TARGETS
-                      rccl
--                     PREFIX
--                     rccl)
-+#                     PREFIX
-+#                     rccl
-+			)
- install(FILES ${PROJECT_BINARY_DIR}/rccl.h
--        DESTINATION rccl/${CMAKE_INSTALL_INCLUDEDIR})
-+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- 
- rocm_export_targets(NAMESPACE
-                     roc::
--                    PREFIX
--                    rccl
-+#                    PREFIX
-+#                    rccl
-                     TARGETS
-                     rccl
-                     DEPENDS
-@@ -190,7 +191,7 @@
-   "<no-reply@amd.com>"
-   LDCONFIG)
- 
--rocm_install_symlink_subdir(rccl)
-+#rocm_install_symlink_subdir(rccl)
- 
- if(BUILD_TESTS)
-   add_subdirectory(test)
diff --git a/dev-libs/rccl/rccl-4.0.0-r2.ebuild b/dev-libs/rccl/rccl-4.0.0-r2.ebuild
deleted file mode 100644
index c909f3d96122..000000000000
--- a/dev-libs/rccl/rccl-4.0.0-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="ROCm Communication Collectives Library (RCCL)"
-HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rccl"
-SRC_URI="https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-${PV}.tar.gz -> rccl-${PV}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="=dev-util/hip-$(ver_cut 1-2)*"
-DEPEND="${RDEPEND}
-	dev-util/rocm-cmake"
-
-S="${WORKDIR}/rccl-rocm-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/rccl-2.7.0-change_install_location.patch"
-)
-
-src_configure() {
-	addwrite /dev/kfd
-	addpredict /dev/dri/
-
-	export DEVICE_LIB_PATH="${EPREFIX}/usr/lib/amdgcn/bitcode/"
-	export CXX=hipcc
-
-	local mycmakeargs=(
-		-DBUILD_TESTS=OFF
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/rccl/rccl-4.3.0-r1.ebuild b/dev-libs/rccl/rccl-4.3.0-r1.ebuild
deleted file mode 100644
index f5615cc20d0e..000000000000
--- a/dev-libs/rccl/rccl-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="ROCm Communication Collectives Library (RCCL)"
-HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rccl"
-SRC_URI="https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-${PV}.tar.gz -> rccl-${PV}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="=dev-util/hip-$(ver_cut 1-2)*"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/cmake-3.22
-	dev-util/rocm-cmake"
-
-S="${WORKDIR}/rccl-rocm-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/rccl-2.7.0-change_install_location.patch"
-)
-
-src_configure() {
-	addwrite /dev/kfd
-	addpredict /dev/dri/
-
-	export DEVICE_LIB_PATH="${EPREFIX}/usr/lib/amdgcn/bitcode/"
-	export CXX=hipcc
-
-	local mycmakeargs=(
-		-DBUILD_TESTS=OFF
-		-Wno-dev
-		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/rocclr/Manifest b/dev-libs/rocclr/Manifest
index 9a54e8c05273..fd841cf9c2d1 100644
--- a/dev-libs/rocclr/Manifest
+++ b/dev-libs/rocclr/Manifest
@@ -1,23 +1,5 @@
 AUX rocclr-3.7.0-cmake-install-destination.patch 1487 BLAKE2B bba1dbe3a029db770c66ec6cb11e2d79e165e98a9a8db1c1aec4abd4b627eb2c6af57d838977e558291c7339d36399d43307a1806604b1c1c87d448433e03eba SHA512 7ba64b84526342c20d9f750c2298d6839c608f83f2b10e63bf5dff610ce8127247b41572c0b14fba84ddf02947ec3f2a7e954e75844105de60329c144ef16ef2
-DIST rocclr-3.10.0.tar.gz 813435 BLAKE2B c49f84d1ea62f14436bb6d24ad950427b353662d0a1e998953c14cb3a5bc7da6e754f04da9357c104a1b0d8ca3a616375ad6f875a704bd3cc5d5b6806f3f249e SHA512 d367777ab47063e53e768b5f16cda61b787a47a9946f6995f4f3e3e5e441737076a609a3aebb15187138a819c97ee0bd59b9476f8a27908b03d0d7c5871eba86
-DIST rocclr-3.8.0.tar.gz 882055 BLAKE2B 12b62d2316f3f2886f656c8fcca946735e262e850d49ef8cdb21dc984eba121d9c37250209696b2945f80be363c8244a66c3da91bc26f8c65405b27625b9538e SHA512 79bbaa628815620824fdf320451d729f630949a0e7cb35e2eca638a93f4788175759f68666a1cae6c1320458692c145a0c577739386681d2299c887420400edb
-DIST rocclr-3.9.0.tar.gz 811081 BLAKE2B 7c3131adcc820a7f331ddd178cd06eb8f3a22dfc85e9634906e60d7cd1b5b1ac3f0ac0327a815139901c8e2d40f74e8b7c84c761a2aecb2c63812559528ebf13 SHA512 211bc0e8008cdaeabe9e9d51f22d939f4f9703d546e6602e59286027c439ee996c44f805154bb31bedc4916ef810e4cffd9b91f054baa76db4a8945b03b07a73
-DIST rocclr-4.0.0.tar.gz 813510 BLAKE2B b9043c6f2725bd8d1769669db522cfa8ece40d83f36dc0e79662137b285a6e89952693d55e5b241144aa7412fa31192c3aafa74ee8d498f02f9a0cffaec7de92 SHA512 81e64af843720efefd24478f65c2a8d9dafc55eb94e9c4865d7fc3e9fa15371570ed54882e3086dcb20f16487bf24bdde0d65c76c07195d854ed51895aad06b8
-DIST rocclr-4.1.0.tar.gz 823082 BLAKE2B 69631f72124d8c7888576963b964b7971304593c1a231f6ea69940ff818b095676e1fef030efcddc4dc89c5e3768413e8e4832a0a95424a042b8df73d0b059e3 SHA512 1c82399d3eda8ebd11609272e756e45565a8c1ebb1354ecf44cf443bfc38a61af9210c6609d346d464e977407f07363da36e8c5ab89faeba3e11bfdc78bc32b3
-DIST rocclr-4.2.0.tar.gz 836337 BLAKE2B 8eefe1db6e16b90ff64069159698a1d4960c6436a9a11ac84a890d572faae6583b998af100f168ce8bb06b0c8094d01c446874edc75de93c7d3b55f8329cbd71 SHA512 33cc61e2f179805567d38b606489394a67f5d43a2cab92baddc14e44992379e3a5a0226e84c6ec6eda59ccbaf999b5d27c52b9da106d0e08fa6d26c38c0885c0
 DIST rocclr-4.3.0.tar.gz 838454 BLAKE2B 957cefd63fdb2facfbbb2e638c80137b78403ec9d162ca057f09582c0566c281db2875649f2d360790186659b0c688f399fbd4dc3e97bf07e23de7e9fb6fab56 SHA512 b0696ccd3dcb9976fa6d78b65b7b90273fc07f0dfaf40487521340c611ee2aaf739bf34e257e79f70cbf6a8c7e80227f96eea1de090f4517940c28b96e794c9a
-DIST rocm-opencl-runtime-3.10.0.tar.gz 1004148 BLAKE2B 3d2539d24f8b3fd039424d606ebe36d7d8d1db2425f646d093a1a48d95c1c8b1c20821674fc628e622c2a5e7cbb30547805c3b84af16ad53f860f1064efa572b SHA512 121d0f310b4b235adf5f34dbf1989016b4c875bb47779b18d35fd9fab01c2118d1860e520cc6202a6fc3405b4c7897f491f611193c992cc25fe48e12bdd9f83f
-DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
-DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485636e94bc83d12d4412da912455cb0ddd39ede3429a749a16428cb3c10775e652ffbe31a63ad00b3ea38a7fa43a120776a12bfe SHA512 e8149e99a7116a2c2af0d04dde55290c35dd5c6c26d95da8c8a04fcfccdb23f6617ab8348f9fc201b6d9fde7202de4ede480d7ac547ae2471c6ae10897e1795e
-DIST rocm-opencl-runtime-4.0.0.tar.gz 1004149 BLAKE2B a41ca63bdac1930599fd808d0a5609dd4c0d475ba5fd6278a6c201e1ac72867a587d1ac6fa7d7a18a29ab708dd14b24abddd1326e1489e6aaa82d4b26be5f2f5 SHA512 913a135d693c133e17e6b3abaecac46a4fbeb5683ed7cf04060e04bec5f37d4ba5dd5ff4b357b8304142346dbde8acd3ddfdc1028f788550e0ca245f7ce665ea
-DIST rocm-opencl-runtime-4.1.0.tar.gz 1005255 BLAKE2B 5833cc4bae3ecd5c9a3f601334424d03596bfe798bfc7c11ffa9d66b23d36f3fe6cfb1dbfd38c208a63ba824d6c5634f69448ace29ada6728c8ef544afcf1c0e SHA512 228c1bb337778b32c86d645fb874d03e9d6ee39ebfad23c813c0b2221a0421225aca63b2526d60c34d84f64147daad3e9324c2063db4b112aa30250359babbd2
-DIST rocm-opencl-runtime-4.2.0.tar.gz 1005604 BLAKE2B 09e100081295e8c3da1f8b6b4371d372bcde8dade66ba2718111044364ab6a9cf1c598bd650c57670759def20aa7e638c5ecfe2076191b51a76d68e57b536605 SHA512 49b07a07949506dfd74a047d01a0bd9e2f719f6a618b4e4786861f9d59a77ddf15e06e1d13e6bda08866e096f5bd73be8656eae3ad9806661149d20cfdd68566
 DIST rocm-opencl-runtime-4.3.0.tar.gz 1006792 BLAKE2B 29fd5843bb0153c7d3fe5250898f0fbdd089db6304122698c9ec9a5436e3a6845916f241f1a1e79a614e369f000297ac12413620edec0660d859ccddaa978d07 SHA512 a514d626700350f2c663db468427479eaa9e39dd912266ac2db6830d712351ffbc18737b208fd37f7ab5afdc2c9f6412d8d765973d6c72759bf51f864fc6bf1d
-EBUILD rocclr-3.10.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
-EBUILD rocclr-3.8.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
-EBUILD rocclr-3.9.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
-EBUILD rocclr-4.0.0.ebuild 1167 BLAKE2B 002e3d86ec49df944af061baa1a8489fad32e3dbb38a7638bf1530752a3f4c807a2b715a5796676d38c642571d777322981c782561222ad74506030d1328025f SHA512 bb4b7fa615e930fea24d233258b5a6822ae5e23d3a0ce6605d37dd489090ec0c7a5821bd12b8aea2a8615de5c8ccee0ec306287f39b049a912e23bcf8fcc90fb
-EBUILD rocclr-4.1.0.ebuild 1167 BLAKE2B 002e3d86ec49df944af061baa1a8489fad32e3dbb38a7638bf1530752a3f4c807a2b715a5796676d38c642571d777322981c782561222ad74506030d1328025f SHA512 bb4b7fa615e930fea24d233258b5a6822ae5e23d3a0ce6605d37dd489090ec0c7a5821bd12b8aea2a8615de5c8ccee0ec306287f39b049a912e23bcf8fcc90fb
-EBUILD rocclr-4.2.0.ebuild 1167 BLAKE2B 002e3d86ec49df944af061baa1a8489fad32e3dbb38a7638bf1530752a3f4c807a2b715a5796676d38c642571d777322981c782561222ad74506030d1328025f SHA512 bb4b7fa615e930fea24d233258b5a6822ae5e23d3a0ce6605d37dd489090ec0c7a5821bd12b8aea2a8615de5c8ccee0ec306287f39b049a912e23bcf8fcc90fb
 EBUILD rocclr-4.3.0.ebuild 954 BLAKE2B a7ce1440c071f579832b7a5fe20ef20222c5190ad179374fcdcf42d5624f5b0e67fb6c6e2834cf8347884e33e47f086a21506aab49bb5e7a586db38d31640243 SHA512 f464948bb9473c29837287f3af4b172b1301d2cf7ef36305ee22a20b2058165b9be00e79548c916dd9bc1b8f81e3bcf3a5293eb0c9c6e2f33a097a00280e15db
 MISC metadata.xml 512 BLAKE2B 1b5837397c1ef1cb6de8f224b6b84757945abcdd037aacc67deaea87ef3766e3d6a726e886cffc130f1e205d751edde95cdc77c51420dfc98bbc1d62734349b3 SHA512 9891f55b15cbbc17d5e9b97e595843895b4e1aee52c713ef7ece999c67e5620f9087dac140f7ac36b47569c214f7191900c9863c5fdaa46b3f2d830b2b50b198
diff --git a/dev-libs/rocclr/rocclr-3.10.0.ebuild b/dev-libs/rocclr/rocclr-3.10.0.ebuild
deleted file mode 100644
index ffa5203065d2..000000000000
--- a/dev-libs/rocclr/rocclr-3.10.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute Common Language Runtime"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/ROCclr"
-SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocr-runtime-${PV}"
-DEPEND="${RDEPEND}
-	>=dev-libs/rocm-comgr-${PV}
-	virtual/opengl
-	>=dev-util/rocm-cmake-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/rocclr-3.7.0-cmake-install-destination.patch"
-)
-
-S="${WORKDIR}/ROCclr-rocm-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=YES
-		-DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-		-DCMAKE_INSTALL_PREFIX="/usr"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# This should be fixed in the CMakeLists.txt
-	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${D}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
-}
diff --git a/dev-libs/rocclr/rocclr-3.8.0.ebuild b/dev-libs/rocclr/rocclr-3.8.0.ebuild
deleted file mode 100644
index ffa5203065d2..000000000000
--- a/dev-libs/rocclr/rocclr-3.8.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute Common Language Runtime"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/ROCclr"
-SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocr-runtime-${PV}"
-DEPEND="${RDEPEND}
-	>=dev-libs/rocm-comgr-${PV}
-	virtual/opengl
-	>=dev-util/rocm-cmake-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/rocclr-3.7.0-cmake-install-destination.patch"
-)
-
-S="${WORKDIR}/ROCclr-rocm-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=YES
-		-DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-		-DCMAKE_INSTALL_PREFIX="/usr"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# This should be fixed in the CMakeLists.txt
-	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${D}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
-}
diff --git a/dev-libs/rocclr/rocclr-3.9.0.ebuild b/dev-libs/rocclr/rocclr-3.9.0.ebuild
deleted file mode 100644
index ffa5203065d2..000000000000
--- a/dev-libs/rocclr/rocclr-3.9.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute Common Language Runtime"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/ROCclr"
-SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocr-runtime-${PV}"
-DEPEND="${RDEPEND}
-	>=dev-libs/rocm-comgr-${PV}
-	virtual/opengl
-	>=dev-util/rocm-cmake-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/rocclr-3.7.0-cmake-install-destination.patch"
-)
-
-S="${WORKDIR}/ROCclr-rocm-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=YES
-		-DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-		-DCMAKE_INSTALL_PREFIX="/usr"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# This should be fixed in the CMakeLists.txt
-	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${D}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
-}
diff --git a/dev-libs/rocclr/rocclr-4.0.0.ebuild b/dev-libs/rocclr/rocclr-4.0.0.ebuild
deleted file mode 100644
index 14d12c5c2f5d..000000000000
--- a/dev-libs/rocclr/rocclr-4.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute Common Language Runtime"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/ROCclr"
-SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocr-runtime-${PV}"
-DEPEND="${RDEPEND}
-	>=dev-libs/rocm-comgr-${PV}
-	virtual/opengl
-	>=dev-util/rocm-cmake-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/rocclr-3.7.0-cmake-install-destination.patch"
-)
-
-S="${WORKDIR}/ROCclr-rocm-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=YES
-		-DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# This should be fixed in the CMakeLists.txt
-	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${ED}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
-}
diff --git a/dev-libs/rocclr/rocclr-4.1.0.ebuild b/dev-libs/rocclr/rocclr-4.1.0.ebuild
deleted file mode 100644
index 14d12c5c2f5d..000000000000
--- a/dev-libs/rocclr/rocclr-4.1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute Common Language Runtime"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/ROCclr"
-SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocr-runtime-${PV}"
-DEPEND="${RDEPEND}
-	>=dev-libs/rocm-comgr-${PV}
-	virtual/opengl
-	>=dev-util/rocm-cmake-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/rocclr-3.7.0-cmake-install-destination.patch"
-)
-
-S="${WORKDIR}/ROCclr-rocm-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=YES
-		-DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# This should be fixed in the CMakeLists.txt
-	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${ED}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
-}
diff --git a/dev-libs/rocclr/rocclr-4.2.0.ebuild b/dev-libs/rocclr/rocclr-4.2.0.ebuild
deleted file mode 100644
index 14d12c5c2f5d..000000000000
--- a/dev-libs/rocclr/rocclr-4.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute Common Language Runtime"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/ROCclr"
-SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocr-runtime-${PV}"
-DEPEND="${RDEPEND}
-	>=dev-libs/rocm-comgr-${PV}
-	virtual/opengl
-	>=dev-util/rocm-cmake-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/rocclr-3.7.0-cmake-install-destination.patch"
-)
-
-S="${WORKDIR}/ROCclr-rocm-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=YES
-		-DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# This should be fixed in the CMakeLists.txt
-	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${ED}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
-}
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index 06c4c0d3db4a..9a86f84505be 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -1,6 +1,4 @@
 AUX 0001-COMGR-changes-needed-for-upstream-llvm.patch 2391 BLAKE2B 2873fa0aad01ad90c9140e54219e40ada995ed69ae9ebe83d79b8a8e674f23bf63a49457d6795cc78260df63ceed8407512edb205d8a3378a217cd3286c8de1f SHA512 83b1b0b2b2baf2ff36ef2d8aadf4083ba8c83f9df56753850780bbb025fde8f4714ac9437c78116d374577b9183f7c7ac9f3f9215ab576359720905900469789
-AUX rocm-comgr-3.1.0-dependencies.patch 1241 BLAKE2B adaebf5f5da85687b431ff237b9ddd49b1afeccc81f9306b26aa35f2bce5309ec45f1449d464b59f8a63b86cbcd43bd58014733f4ff0e3babad91be966379ed2 SHA512 f6162acd8af142efac6596b8e95199b3b14dc7d3906f30515b10b422a74fdc97fef1563d392e8c67bbec2b7c0ed532690c16f4a3bbfffc1b274e0c86c345bcef
-AUX rocm-comgr-4.3.0_strip-usr-include.patch 820 BLAKE2B c6f30de65db0dc690a41d1563bab100d1bc3503101867092e45480d256408d77a1104f49bbea9e38be41fd9b693d7a4e6a0d81ff9b6879681b3f07342abbbb73 SHA512 2c58214bbab369365b8bf38565bb141362041f3e56035e5f4e31b839d7440a62eec627c2fdd87ab1d3f5409a9d49844d14a293887acab5cdb2c53cfac3994761
 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
@@ -9,23 +7,8 @@ AUX rocm-comgr-5.1.3-clang-link.patch 380 BLAKE2B a6de9401ff4c668745f49e89854610
 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
-DIST rocm-comgr-3.10.0.tar.gz 98322 BLAKE2B a7245531eb7e5e7a306a91ca917f03b25a159729a8fbd830cbb02355f807900f439d3d793c416ea277aa0aa64829e697ef8bb32a246a3618ed9bc2c42d25acdf SHA512 b9e0ae6d10a39d55855c35305560af8c5cdbef8f9d41022c40dc60b4fcc629a73a91c6d7235dd0785aba5e14f566f7ce0911a5a1c52c39cebd947f7b585c4d5a
-DIST rocm-comgr-3.9.0.tar.gz 98316 BLAKE2B 424ff5152d99b1ea001985fbd9a6ca1a0925931579205b487505a6c3733d95fe4ee21d91453c538995b3696984acdf4d45cc77c43e1a7c75db78ad1164e3f9e6 SHA512 f49c91ba0db244a0f0d820edeb60013c8a09220e9e1a6be464c48766ac3322b18ed1d0f009e5b1df58340a6dd324a75717194696214e2bb7455cb85e516f071a
-DIST rocm-comgr-4.0.0.tar.gz 98316 BLAKE2B d96200d2fe8929631d1f40577a115b72e2341a66941e9de9de2e61c3d9eab9cb4a0cb51f3b2abc183be832ee86404b5f24d053396615038f4ca6bda23a7331d5 SHA512 fdbb334ff1cb2cd5eb40b9dcf1bbcb138b95d24fac80a90c12c9b5b2ac24226eed4f30ac2fa1923c274fae830e52542d5725436a77c404d1680266b103444549
-DIST rocm-comgr-4.1.0.tar.gz 101923 BLAKE2B 227317d3c96d577ff2df352721e3ffcf75e25548bfef29c425a3417af2b6fdbceeb80bc86508a9a510e9eb7f4dd2ff5c6da3c13af122dfb0dff6475d73a5c9ff SHA512 def3774072262ac6e5c836d7dcd23770045765882e76c8de87e21d04515a562ba213685736ccb4e5b01814de846b68aa9db77e40f0d834a68fc4a9b3301aaff9
-DIST rocm-comgr-4.2.0.tar.gz 101877 BLAKE2B 6796ab4fc7139224af9e26f6adc5ac3ef260b36d125517766bc4adf3dd819709e5aa816680ae073f00db635d15d2a3bde7bfc69bdfbea0f49453f75930fae90d SHA512 dffc00d166eb060c6cf848878cc6c7fc63858168cd20b5f22df2b7cbf3ac7a3253fbab5df4df055823028a06c3dca3e3f379246305ae9872eb94bcdbd30dd602
-DIST rocm-comgr-4.3.0.tar.gz 106250 BLAKE2B 40a3a69147ae4fc96d3713331d35ae65d952dbf92fb3c92bee75bbef394342b11f383cb51c6def85c256326905c5067b1da816e853f793fd3c40a5af9a6e0122 SHA512 5961720bdc78c6d3fc626bd83f52be0aa32b01178bf4db0a503a0639fe05c5c589b7feb2dcbeb78021d36a40ac6f936cb1262cd5ab5cda4689e8e642ab7eddc3
-DIST rocm-comgr-4.5.2.tar.gz 108521 BLAKE2B 9fe238a17bac5739d2d103d859a8dd16cb95d0333f9f85e7fd94463c4ee8bd88801b7b1d1278d978fda7425f391de5e9043a3539583ed3b8d45393a613c19bba SHA512 c466a9bb1b725b79d056673824c6dd79919866f42db88b611e4ac24b0624b12c078affe8bfc7ad7c1373ce0ca60607904c46f13751b47c9f4deaf4105e2c7cd3
 DIST rocm-comgr-5.0.2.tar.gz 117092 BLAKE2B 1ffcb74f9716a8f050d722f569cced66e8e9fa5a23a7156edd1b4dfd7dd7b09a175f3555bbf29ef452d7e4371f65ebe4c6fac30c583468a5563dd59fa92b53e4 SHA512 d2cf4517fc1da1adc367aaa6f53cc099547a931be30cc261d68c8174a5a9ffe3af937fbb298987abbdd7fd5d80364bef6ea9112dcaaf326a410fdd215e568f2f
 DIST rocm-comgr-5.1.3.tar.gz 117155 BLAKE2B 40e415c4c7ae3e709dd50981299291f0fc1133f35310b4c86a86847d3bce5fd7685a3f4480f8f156873ca922921c1d4e1cb620fd33bd5cdc87f155af839f2bbe SHA512 5927250f5e03c32b7f270a1dbfe5221d349dfe32aba34143040da53d4e7eb83faa3073a43edabcff13e1fc977bc17088404523f2ab2ea95e207d2c00beb4249b
-EBUILD rocm-comgr-3.10.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7
-EBUILD rocm-comgr-3.9.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7
-EBUILD rocm-comgr-4.0.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7
-EBUILD rocm-comgr-4.1.0.ebuild 1071 BLAKE2B 4282f0fb3617b28a387e0446764478677fe929a71e1d99145bcf5df4058e018f9cf9abb2a8f4f68dc655a14c4bc81c58a19b2a39b9244f34c6c5f19c499ff7e2 SHA512 79ad997d3e711d111501efe7c276d11c9304cf4ab3c5d1bdf9f5919e2c282f5241c3f8b74207c05acdea70f522d1fb195f3650f5a244d0780f1c2465ad7939b6
-EBUILD rocm-comgr-4.2.0.ebuild 1071 BLAKE2B 4282f0fb3617b28a387e0446764478677fe929a71e1d99145bcf5df4058e018f9cf9abb2a8f4f68dc655a14c4bc81c58a19b2a39b9244f34c6c5f19c499ff7e2 SHA512 79ad997d3e711d111501efe7c276d11c9304cf4ab3c5d1bdf9f5919e2c282f5241c3f8b74207c05acdea70f522d1fb195f3650f5a244d0780f1c2465ad7939b6
-EBUILD rocm-comgr-4.3.0-r1.ebuild 1291 BLAKE2B 841c0cc81d46ab8180a572de5ab911cacc0d92b1e988a7b77822af55cad3d8c58ac2b07d6a3a6a4b126adeb0805c2115644d3211b9dcf8ebb980d88bb588d7bf SHA512 231ded96dbc9c843fc13ff83f9fbf06c6c97fe3ea598388250dfb7eee31cbde63214aa05c18a71ff7b6dbc590cd719ab64be444bdc2c6c77da17ec5c226d00d8
-EBUILD rocm-comgr-4.3.0.ebuild 1071 BLAKE2B 4282f0fb3617b28a387e0446764478677fe929a71e1d99145bcf5df4058e018f9cf9abb2a8f4f68dc655a14c4bc81c58a19b2a39b9244f34c6c5f19c499ff7e2 SHA512 79ad997d3e711d111501efe7c276d11c9304cf4ab3c5d1bdf9f5919e2c282f5241c3f8b74207c05acdea70f522d1fb195f3650f5a244d0780f1c2465ad7939b6
-EBUILD rocm-comgr-4.5.2.ebuild 1097 BLAKE2B 2a8ec9f20371b7c86295dea6a044da83c96a0774c55f774b4b01118fb3c27185beb7b09a94144b43d95e75eed3ac2fae780314244ec7e2f55b7b3f82303a8969 SHA512 7fc5a888c252736f1777580208d6f2701a8b52690ce1753a10f259e5534d0027e09161a12b7d8bb9717c921fd0b1d31a89fda787ce9fb1f605d78d9ab5af2a07
 EBUILD rocm-comgr-5.0.2.ebuild 1633 BLAKE2B e0d150a3926662b7347a57994cadd835c8083215c56536b1eaae3d1fca13b601a59528da12c600c44edbe9ae78918fdc5ee2f32224a59293a30df9e7603e7d7d SHA512 7ae43bbbcf647d5a8c781b7ed0df41e34b7847776bfc4258f4bda4dace11512ddfee18f48c99cbc47124c7e6ad7984d332dee56edc3ac5688c3857408bd1c92f
 EBUILD rocm-comgr-5.1.3-r2.ebuild 1998 BLAKE2B 382d8b057e6fe7ae3adc5543df244c0ad50e4176965a9150eed4b092fe9be27ef27e050df755ca40ecec5bcd7d4b036e53dc8c3f2dffcbc2d63123633464249e SHA512 8ed0e1dc923355a7a7c594ad174835beef091d7a5608421b7c5e131ca426706437cf8779d2f3f291e73f61959855761fd29c5f2c09621d060906e0ebe28695b4
 MISC metadata.xml 382 BLAKE2B c49984c9ac37bdd2ba8f4345d91d4b6e79f4e8d91e0b89dcd286ef32ede9477c964554cafe52419ca1d696a4b2b7391d45c6a8a4316e3a3103268153fc3bdda2 SHA512 d8d0ce6840a73611e02721c1fd458f9756962583484a61c6fe9051dcca1641091008eea4c01a71d4ee70649eb4c29e99d86e1f24861c05e4a542d0c60d388590
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-3.1.0-dependencies.patch b/dev-libs/rocm-comgr/files/rocm-comgr-3.1.0-dependencies.patch
deleted file mode 100644
index d70ed4957002..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-3.1.0-dependencies.patch
+++ /dev/null
@@ -1,52 +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,20 @@ 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
-+    BinaryFormat)
- endif()
- 
- target_link_libraries(amd_comgr
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-4.3.0_strip-usr-include.patch b/dev-libs/rocm-comgr/files/rocm-comgr-4.3.0_strip-usr-include.patch
deleted file mode 100644
index 9d722a57d2a6..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-4.3.0_strip-usr-include.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-On Gentoo, ROCM_PATH=/usr we do not need to set -I${ROCM_PATH}/include.
-Actually it is harmful to the `include_next`s.
-
-Index: ROCm-CompilerSupport-rocm-4.3.0/lib/comgr/src/comgr-compiler.cpp
-===================================================================
---- comgr/src/comgr-compiler.cpp
-+++ comgr/src/comgr-compiler.cpp
-@@ -927,8 +927,6 @@ AMDGPUCompiler::addTargetIdentifierFlags
- 
- amd_comgr_status_t AMDGPUCompiler::addCompilationFlags() {
-   HIPIncludePath = (Twine(env::getHIPPath()) + "/include").str();
--  // HIP headers depend on hsa.h which is in ROCM_DIR/include.
--  ROCMIncludePath = (Twine(env::getROCMPath()) + "/include").str();
-   ClangIncludePath =
-       (Twine(env::getLLVMPath()) + "/lib/clang/" + CLANG_VERSION_STRING).str();
-   ClangIncludePath2 = (Twine(env::getLLVMPath()) + "/lib/clang/" +
diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.10.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.10.0.ebuild
deleted file mode 100644
index 4401982de06b..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-3.10.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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}-3.1.0-dependencies.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLD_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/lld"
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.9.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.9.0.ebuild
deleted file mode 100644
index 4401982de06b..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-3.9.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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}-3.1.0-dependencies.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLD_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/lld"
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-4.0.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-4.0.0.ebuild
deleted file mode 100644
index 4401982de06b..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-4.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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}-3.1.0-dependencies.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLD_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/lld"
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-4.1.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-4.1.0.ebuild
deleted file mode 100644
index 5b3f588b3d54..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-4.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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}-3.1.0-dependencies.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLD_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/lld"
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-4.2.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-4.2.0.ebuild
deleted file mode 100644
index 5b3f588b3d54..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-4.2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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}-3.1.0-dependencies.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLD_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/lld"
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-4.3.0-r1.ebuild b/dev-libs/rocm-comgr/rocm-comgr-4.3.0-r1.ebuild
deleted file mode 100644
index fcb897e2ab38..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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}-3.1.0-dependencies.patch
-	"${FILESDIR}"/${PN}-4.3.0_strip-usr-include.patch
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed '/sys::path::append(HIPPath/s,"hip","lib/hip",' -i src/comgr-env.cpp || die
-	sed '/sys::path::append(LLVMPath/s,"llvm","lib/llvm/roc",' -i src/comgr-env.cpp || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLD_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/lld"
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-4.3.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-4.3.0.ebuild
deleted file mode 100644
index 5b3f588b3d54..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-4.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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}-3.1.0-dependencies.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLD_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/lld"
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-4.5.2.ebuild b/dev-libs/rocm-comgr/rocm-comgr-4.5.2.ebuild
deleted file mode 100644
index 772aeb9b4102..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-4.5.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=Release
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLD_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/lld"
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index 39f4cdf2fe57..8f6ab66aa209 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,26 +1,7 @@
 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
-DIST rocm-device-libs-3.10.0.tar.gz 230505 BLAKE2B 7c34bcacb3056517ad06502c313015a7d08acc483ef86e3b63b1309c974c339fd47e0a6710a973707fc3949399d35c9838a5ff688f1c9ab1faf54101cff9502b SHA512 31b8e70c40bbbef3ac87431d5c562d11458b611a2c9ce6e02e9854ff6361d74bff8e207d87a92ff61ec209dba069d8db98568d9ac8b04afeefeab276a331ff59
-DIST rocm-device-libs-3.7.0.tar.gz 228752 BLAKE2B e7406fd74b9bdfba5c32259c12761b46dee454e73cf1d6cbb0886c4da7bff7bcd13689e91e2715188fa2fe9d61d9dd9c6c481714cd67bdee11b1825a91c47546 SHA512 94b027aa27866257cf239b6951cbff928122fb7dfb23c81edc5957b30ee5aa64e2a25412a13ea33c249b8bd2d026274dcc276ea0908359b5ed14c75b0e59ff1f
-DIST rocm-device-libs-3.8.0.tar.gz 228737 BLAKE2B bf75c3f50960af55cc743d412259789d283fc8357231c31b7590ad81997b5a4ff195bb3e382641e9eed846c9c258174f1e8d27e6e1f0ae9f174c5c22b85ed2ea SHA512 d565c9bfde5f5f2d533cdd0b41e5c73247f9ca15e07b039c340daf3dece120a301c87b69b737af3d230c6c0a3ae1d6fbd5d1f78fee000a06d4ea7bfda3d8d436
-DIST rocm-device-libs-3.9.0.tar.gz 230477 BLAKE2B dba7f2dd57fe39c8c69f2a4de34f06f8347e73c760805cebf8690b11c5c0b4c919d78bc31b05b5d5f283aa5281131b0f7d3fbe9faef525a3117ebdbd4b1b9b35 SHA512 fff70e9426ff2e6b6cf59554c36831b3c24c24a51753ca0f3c9cb4e9961c24e7e7d7714b2e75785622c6dcff92e1cb7fa5d2be0a2a08bb17a157f484845cd276
-DIST rocm-device-libs-4.0.0.tar.gz 230486 BLAKE2B 17d82a29e03d558a408e39550acd9f7fc76fd79a0c68936cb76e3e14bae6e770c0f581a80429aaa86e1d51491c31ce8b02b03095604678d03aa844379cfa9282 SHA512 a35fdc74c17d87ae52ccc218d5098b50863316b88908c147017c3d378c3892411a3f51737c1d5a4d6c1db87b66e1aacc94361bee28f3cc2e984e6e00db1dd7ed
-DIST rocm-device-libs-4.1.0.tar.gz 230813 BLAKE2B 699c23f3b08989765e90d3168e1369d1bf627a51c1f606160e29867718ce237a78ed7b5859ab60b58bbe9790452e75192fb9407819f25cceffc2af94aa006582 SHA512 b4d7ec17711345de27daae7a0d9fc4bce7a5501cfdade51da41788d1a015a4688d47e60031317b2bcc6c395bb096b2cbd4ba35a07b62cc07fe4779ec531208ec
-DIST rocm-device-libs-4.2.0.tar.gz 231971 BLAKE2B 292798ec29b6feb268928a41d7a321b9cffeb2e624557fc4c04b9fa48347a29838f53217b3006b52db53db0981d87b8cc4df6d95578c17d8d10b00b24211d773 SHA512 78aa285f97916ad68aa6108fea22b2c5f223c0c36fd631a4c8f565cf3eb26c0ad58ea31b5e700369a8b13a86f1c076e6cfdb829952cdf03c88a7827c14371aeb
-DIST rocm-device-libs-4.3.0.tar.gz 234910 BLAKE2B af306219df395f9c5e65e6e06dff976698b80009d3b0c330c396c3e9475dca124bee4c96ff31724763bf40b3fd611f1ef55a7fb675f5ef82b992e496bc3a2d6d SHA512 6e93b435d782a50f45d17bafb466ee05df88c39d665a8d796b68d588b6074629934c44afaae233fc84a238dc9c93d15917efeec7633349b4e894f3b3385bf57e
-DIST rocm-device-libs-4.5.2.tar.gz 244532 BLAKE2B fd13f3e518dc0922bb4e2a49863e3b86238158431189f4d4e9665f7e7b1adfa78ca96d915a3737b0da476cfbffcf0a0ad8840349a22062f59a83f59bc9edd05a SHA512 5da2efd685c279ebb1bf67e27e1a8febb20dcdcf33136667b9bf2ca0d3684b366237358269a0c221dd602af37503aa766842cd1932b2711b562c1fc94cd2ae70
 DIST rocm-device-libs-5.0.2.tar.gz 242099 BLAKE2B 3fc2afc3a837557da04bcd5673656c08d0b5ebf48fd6568a4b1687d157dc4b08e3b5cd219a7bf3c2ed82ca1391477c32c42b4e594d07ad47ef429061be351af9 SHA512 1c37401641080e511f325cddb62490c8827d1bcef7f2198449246afbd391162ed3294c24b0529e1b3669129e29544989e2cf12d46c90fea8d880c52cfdca5a72
 DIST rocm-device-libs-5.1.3.tar.gz 242862 BLAKE2B 68d66de897f461e9f876de5fe2214803d4c00665651dea6af0952f0ce579c6704a5ec41b08971fa613ade309a0a85cb611b56b592dc2a25e247183e634ea3378 SHA512 cc3dfb8d4b4841ba777355c537175259d0019159ff462358320674b85082cccd99f6462f60fee66228ddfb88fade043445c1bac62504aa1462ba61b7e2751de7
-EBUILD rocm-device-libs-3.10.0.ebuild 992 BLAKE2B 69f88d0cca4b3bd54be1d9d97eef7941b2892d6301f83f52810474406c951dca13108ea1f63738d901eaf7d0ac701ac18315e57cd73bb73100a189206a02654f SHA512 bc21b9ae816795ab076fc763a7d7a62e1d0cc2902317a6afbb60f5058c02d0590dcf8577ea64c92ffe64b055d356653ad6045d8448ecb5c59a01f5053fb4f44c
-EBUILD rocm-device-libs-3.7.0.ebuild 789 BLAKE2B 780c18e28c86fd1cda12a03d890eacc4e2410fab59cd19b80339a38726e8c62d97474ac8d8a145860e85b89ffbfbdbe316cf880a547ed44d912f633d92317122 SHA512 f0759b90c775788da7bb53be3ebc2bafbfe1d7d50b0a8737d3f7b58eb03cff879c325ae25ce9e91c64d182acd209d6c6ea0e57d301b739a5625e851966dcdef7
-EBUILD rocm-device-libs-3.8.0.ebuild 789 BLAKE2B 780c18e28c86fd1cda12a03d890eacc4e2410fab59cd19b80339a38726e8c62d97474ac8d8a145860e85b89ffbfbdbe316cf880a547ed44d912f633d92317122 SHA512 f0759b90c775788da7bb53be3ebc2bafbfe1d7d50b0a8737d3f7b58eb03cff879c325ae25ce9e91c64d182acd209d6c6ea0e57d301b739a5625e851966dcdef7
-EBUILD rocm-device-libs-3.9.0-r1.ebuild 992 BLAKE2B 69f88d0cca4b3bd54be1d9d97eef7941b2892d6301f83f52810474406c951dca13108ea1f63738d901eaf7d0ac701ac18315e57cd73bb73100a189206a02654f SHA512 bc21b9ae816795ab076fc763a7d7a62e1d0cc2902317a6afbb60f5058c02d0590dcf8577ea64c92ffe64b055d356653ad6045d8448ecb5c59a01f5053fb4f44c
-EBUILD rocm-device-libs-4.0.0.ebuild 992 BLAKE2B 69f88d0cca4b3bd54be1d9d97eef7941b2892d6301f83f52810474406c951dca13108ea1f63738d901eaf7d0ac701ac18315e57cd73bb73100a189206a02654f SHA512 bc21b9ae816795ab076fc763a7d7a62e1d0cc2902317a6afbb60f5058c02d0590dcf8577ea64c92ffe64b055d356653ad6045d8448ecb5c59a01f5053fb4f44c
-EBUILD rocm-device-libs-4.1.0.ebuild 992 BLAKE2B 02897f1fdd8427b3ae26202b9b28f7ed029ae387a2c1e1c620eb723d839ca6fdd09f4cb869712e67302c248ffe7948960b7c3d74b636d9b2a45714b7a1182462 SHA512 0f8da526d5577a466b47e7dec0f29b2c9592884e83b2c7ed2b51a3ca241dff06142e6ab768eba1c886403889eebcaeff8743a0d7c4cb79f4c9018887f90b8e9f
-EBUILD rocm-device-libs-4.2.0.ebuild 992 BLAKE2B 02897f1fdd8427b3ae26202b9b28f7ed029ae387a2c1e1c620eb723d839ca6fdd09f4cb869712e67302c248ffe7948960b7c3d74b636d9b2a45714b7a1182462 SHA512 0f8da526d5577a466b47e7dec0f29b2c9592884e83b2c7ed2b51a3ca241dff06142e6ab768eba1c886403889eebcaeff8743a0d7c4cb79f4c9018887f90b8e9f
-EBUILD rocm-device-libs-4.3.0.ebuild 992 BLAKE2B 02897f1fdd8427b3ae26202b9b28f7ed029ae387a2c1e1c620eb723d839ca6fdd09f4cb869712e67302c248ffe7948960b7c3d74b636d9b2a45714b7a1182462 SHA512 0f8da526d5577a466b47e7dec0f29b2c9592884e83b2c7ed2b51a3ca241dff06142e6ab768eba1c886403889eebcaeff8743a0d7c4cb79f4c9018887f90b8e9f
-EBUILD rocm-device-libs-4.5.2.ebuild 1018 BLAKE2B 21b067394e03510c311f4a52b3d311fef129bb7b2b6c3155a60136261c60b89b7a81c7cd19b5f8472ee97c7b4839f2f2601a18bde399d0177ab51be09244be2b SHA512 ecfb42ce61993db1056fbb977a82aa41196d0d687618002e910e5459bade69e42fe2eb6fdc52e1671e91bce7807451ee6c6298a1bd20d23246e7edf307700383
 EBUILD rocm-device-libs-5.0.2.ebuild 1018 BLAKE2B 1520ae84ad833f3e81555e5dbdfd8ca397000e425a800769b4bd6bc1e32878b0a040ad6d9685a380f87e4abb183d790c4954bd18b8c111375a92e0f27e5a3d83 SHA512 c4ffd4df5c91f93555a30b693552748a885cc1e1c2c3a22d95ccd9ea6d1f012d567bd2d04f1a56da3dbb7494a2a8f904a3e0ecd1d3495a0a1dabc86e77ed61b8
 EBUILD rocm-device-libs-5.1.3-r1.ebuild 1184 BLAKE2B bef07c38844eb218c333cf2fb0014881aff83837092dc62aa29d4971e9782da6a38a7db2dd599f6c8aff0c2bd60c94550d72300d8ee2a6db4ea2688820035803 SHA512 814009470618c7cea132ba28d3aa27eda6a55d65646efa54fc3ce0aa11e247af147f175956d2f7466474d891dd5aef80fe9adcc6bf871352d6f7c20c7f802832
-EBUILD rocm-device-libs-9999.ebuild 804 BLAKE2B 89a47136834feb8bebd6487d0fdc7ba0ca921764f01938812959bd6a006df704524acc14ccdb67a7d08bd032403837bfad358c5837bf4e6e8957293c3b159d72 SHA512 e76d6647cf9ecf6beebb15541503955cd469c50f39c462e1c45be51d87072cbff603fddc9979ad795ad5ec746d625485e24eb751d41610522fbefd8aad64496a
 MISC metadata.xml 378 BLAKE2B d4defdfb2ce3bab811d9c2ac75b92b7892d46d87dad9f89c26cde140b3b167b43bf4022128dee45e063e332d6dfafc3ee8d78b0112909a7ce2d4a4a44c6cfa14 SHA512 0732d51019f0d27ffb1ffea32d76cad8a6d82927cb8788ff983cdb8dcc472015dbe36ba568bda7459d0b32837e89e1a32064ab7dfcefd2b88458cbb4438f452a
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-3.10.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-3.10.0.ebuild
deleted file mode 100644
index 507a68912932..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-3.10.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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)"
-
-RDEPEND=">=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-3.7.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-3.7.0.ebuild
deleted file mode 100644
index 23acf7bb488f..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-3.7.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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)"
-
-RDEPEND=">=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-3.8.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-3.8.0.ebuild
deleted file mode 100644
index 23acf7bb488f..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-3.8.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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)"
-
-RDEPEND=">=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-3.9.0-r1.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-3.9.0-r1.ebuild
deleted file mode 100644
index 507a68912932..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-3.9.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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)"
-
-RDEPEND=">=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-4.0.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-4.0.0.ebuild
deleted file mode 100644
index 507a68912932..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-4.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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)"
-
-RDEPEND=">=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-4.1.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-4.1.0.ebuild
deleted file mode 100644
index 94bddf83d919..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-4.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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)"
-
-RDEPEND=">=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-4.2.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-4.2.0.ebuild
deleted file mode 100644
index 94bddf83d919..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-4.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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)"
-
-RDEPEND=">=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-4.3.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-4.3.0.ebuild
deleted file mode 100644
index 94bddf83d919..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-4.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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)"
-
-RDEPEND=">=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-4.5.2.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-4.5.2.ebuild
deleted file mode 100644
index 0bfbe92e6376..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-4.5.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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)"
-
-RDEPEND=">=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-CMAKE_BUILD_TYPE=Release
-
-src_prepare() {
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
-	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
deleted file mode 100644
index 32684d9ae3f7..000000000000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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)"
-
-RDEPEND="dev-libs/rocr-runtime
-	sys-devel/llvm-roc:="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index 94fc707791c0..e00042160956 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -1,34 +1,11 @@
-AUX rocm-opencl-runtime-3.10.0-add-rocclr-include-directories.patch 603 BLAKE2B 9295be2de67458b61de9e6d8fffd466c4edb67d0d5bdd457baa711df87a66fc54e2433348b3860ed52dfb484c33d43cdf7288519dae9a4f1428718fa4d995ce7 SHA512 ae7bfae7ddb73029f5a4703b47cd51b0976ba3763ca87d5f6f94b52af56cd7714ba6472d199c6c4b737928766b5f84f5c2ebff63a2fed2e1b02cf1bb3e6d28a9
 AUX rocm-opencl-runtime-3.5.0-do-not-install-libopencl.patch 548 BLAKE2B ae4234422acdc1fdf0bd82a0469f63239e709c0626e3918d34e6a023b70452eed98aea1725a3638ee8f46d54d08ca885bf114ad3a7689baaa18794a6d5c983b9 SHA512 27682bb65e281744556c2a99c38ae7b3e22e3306ff10ceb98d8c3204950982b17521309dd11d36e1a07ca33b8448dae1270fa31004db9841025ff9a9e9af3d4c
-AUX rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch 529 BLAKE2B c5902c6582d4ab23196829dd5953bd74469951d41ac393e92b9858d6a6336dd68c73cf57d917a13fb3869c84b1e6930e7a0de71936091011039bcd3bfc3b102e SHA512 2ac5248e05b479b9e84322cd9afb1bb783e03440648fe91e0f92e77bb2f673f9752412a2a689aba152663b5235df176a6ab54b5ecea3a20e720b831bdf6292f9
-AUX rocm-opencl-runtime-3.7.0-amdocl64icd.patch 503 BLAKE2B 33154b45dd539c068cb86d29bfbfe07b189c1bd7ec36bb5ecba7e7b6a8de416c8c6794f9aed5f18f8aab33c50718f25882a46b86e4c0678440e24586eee9d967 SHA512 8f22ba90782290d0b89b3d48dbf24d5ff1418bf2d82effe5f362456ebbd65f4e3ffe044072d9023e585ec38eb3ac501ce598fef297099753818a93948bc06ccd
-AUX rocm-opencl-runtime-3.7.0-change-install-location.patch 2523 BLAKE2B f31cd13f8b50ea75c3ababe89905881ef92ec0319057a98978ff49514f213e5aad0f72d2eda75d300836ee4e90d1ac8b6b897442c968b30ad4c8af6c31f61fca SHA512 945d37ef36adec5ff6915bc4f3cc30801776370bce8097b53bc4e72568d4801fb7f092ebc0103ec0f625a0297d8ab5a43dcaa84d59f7145ea87610a7bc855f79
-AUX rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch 576 BLAKE2B adf9f72b83b57ca9a0205d520b8ffefd44b9b6ea13bae37ba3289ed39ad8bf7a93a1ca4c640c15dd79297fdaee34ca8b8c0f2f95c670d1a26873a73b7b2d02a7 SHA512 e3c673c649ed9a1e4c90c1d51e3f05431f61ea07287056f80879ae24b917474ebb9665ad83c361bbf2c3ca5a01b0ecc1d3d51b845a1c6e5c755fa40f7d92aaaf
-AUX rocm-opencl-runtime-4.2.0-opencl3-header.patch 3227 BLAKE2B f9a23194e9531da59839e3b6636a523a1e50a20bc57af9615f49ad390912af1032131d67ea3c157c76c35529d4776f26fd3c1806342e2b67a71737cc9bd108ae SHA512 4364cad8e0f20dd2df1c3e23d6099be6e96ff585d95fe665e63d926b37e5d03aa4e5729af53e1575066e501230c1c766cebb86da47052d0d9f4dc23da7069b83
 AUX rocm-opencl-runtime-4.5.2-remove-clinfo.patch 577 BLAKE2B e8d57ae30b3ad97721f3afc254d780262c6f73259731d226445a320d7fc620c00398c781c5309bd4b43327ce45a747b5add3421c3abab0600d9e07c46cc20549 SHA512 83b7e1ef6d14f0cfefc2498fe5df191f2442b0265139cc3f2661346b55ff3621cf590a40476e156e729604fffb1285243df705010191b343596cbe3d67ee8c64
 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
-DIST rocclr-4.5.2.tar.gz 846950 BLAKE2B beefc6a98d9a8a1a6c00b03cbfd960215888201002f7d4a0ee079db1fc29f2faa9f53326d49c1ad00f2c3a507d5047aae8175a3abb50ae0a74ba36fdc7df9e22 SHA512 121cfb711172596d9e4d429a38fb333bbb10e427ad49cf337324dc187a04adcd99e94521cda65ba21b6ac3bfd7837f607e4c0fe38c6ebca3d58bb090128d0a43
 DIST rocclr-5.0.2.tar.gz 853965 BLAKE2B a0d568eb3b230845970d8256a5a2f32018e4b9fb68e0f1aa13a1f3fc953e614025315b90cbe68c107f7150cf91b4b1ea438455429062c7dc06ef77d65dedd2ec SHA512 b30a57c09973d8ef624511f422babaf9722685b9f85643783aebc000671b41fd54f44b308cece0baab187e1ee00b10335c6d22b6bad6fb3468abe6ef0da97d73
 DIST rocclr-5.1.3.tar.gz 618606 BLAKE2B 02b7732ddd03c0883bee49c56466cd21c649159f801bfb2537eea6e640c65613eb57b37d942f465a9deb83d65735f51212dde5e4f77ba8239d1a6b7037e1800c SHA512 89fd2eca39ed84a1cf525b2c606089ef39f64c1f997c4880e10722da6de4864110752640e1508db1aeb9d15c48ba4e6fe5dbe7a9e56718853ece42548028b2ca
-DIST rocm-opencl-runtime-3.10.0.tar.gz 1004148 BLAKE2B 3d2539d24f8b3fd039424d606ebe36d7d8d1db2425f646d093a1a48d95c1c8b1c20821674fc628e622c2a5e7cbb30547805c3b84af16ad53f860f1064efa572b SHA512 121d0f310b4b235adf5f34dbf1989016b4c875bb47779b18d35fd9fab01c2118d1860e520cc6202a6fc3405b4c7897f491f611193c992cc25fe48e12bdd9f83f
-DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
-DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485636e94bc83d12d4412da912455cb0ddd39ede3429a749a16428cb3c10775e652ffbe31a63ad00b3ea38a7fa43a120776a12bfe SHA512 e8149e99a7116a2c2af0d04dde55290c35dd5c6c26d95da8c8a04fcfccdb23f6617ab8348f9fc201b6d9fde7202de4ede480d7ac547ae2471c6ae10897e1795e
-DIST rocm-opencl-runtime-4.0.0.tar.gz 1004149 BLAKE2B a41ca63bdac1930599fd808d0a5609dd4c0d475ba5fd6278a6c201e1ac72867a587d1ac6fa7d7a18a29ab708dd14b24abddd1326e1489e6aaa82d4b26be5f2f5 SHA512 913a135d693c133e17e6b3abaecac46a4fbeb5683ed7cf04060e04bec5f37d4ba5dd5ff4b357b8304142346dbde8acd3ddfdc1028f788550e0ca245f7ce665ea
-DIST rocm-opencl-runtime-4.1.0.tar.gz 1005255 BLAKE2B 5833cc4bae3ecd5c9a3f601334424d03596bfe798bfc7c11ffa9d66b23d36f3fe6cfb1dbfd38c208a63ba824d6c5634f69448ace29ada6728c8ef544afcf1c0e SHA512 228c1bb337778b32c86d645fb874d03e9d6ee39ebfad23c813c0b2221a0421225aca63b2526d60c34d84f64147daad3e9324c2063db4b112aa30250359babbd2
-DIST rocm-opencl-runtime-4.2.0.tar.gz 1005604 BLAKE2B 09e100081295e8c3da1f8b6b4371d372bcde8dade66ba2718111044364ab6a9cf1c598bd650c57670759def20aa7e638c5ecfe2076191b51a76d68e57b536605 SHA512 49b07a07949506dfd74a047d01a0bd9e2f719f6a618b4e4786861f9d59a77ddf15e06e1d13e6bda08866e096f5bd73be8656eae3ad9806661149d20cfdd68566
-DIST rocm-opencl-runtime-4.3.0.tar.gz 1006792 BLAKE2B 29fd5843bb0153c7d3fe5250898f0fbdd089db6304122698c9ec9a5436e3a6845916f241f1a1e79a614e369f000297ac12413620edec0660d859ccddaa978d07 SHA512 a514d626700350f2c663db468427479eaa9e39dd912266ac2db6830d712351ffbc18737b208fd37f7ab5afdc2c9f6412d8d765973d6c72759bf51f864fc6bf1d
-DIST rocm-opencl-runtime-4.5.2.tar.gz 998488 BLAKE2B f5b92fca4b8aec8a709fccf6817bb3c6a1074f90a0ca8d38c23efe614672daf597f03e947dffbeca715619595878518e1eb7b8d3e3fd00dd02cdf076135fe626 SHA512 6c26b5517bebb2c3096efaec42bfdcb7485e13551b75397f029fa9b4925fe85201e749b91e3a068705cdf4284895d1d996b2819faf4013e1ed34a10319240452
 DIST rocm-opencl-runtime-5.0.2.tar.gz 1004855 BLAKE2B e2c2beb987053204fbe8fda562ae65d6c1a58447e9e88bf1081aabeee6c9a10738fd8562114b564b647682438fdbd2c535db1008ac6e1cc4eb9a915998eeb3c7 SHA512 fa01d1fafc890181b9e67070353ee7c9100619494b7509cae1a3659f24ef1d00f650024cb24bdb0e6e7eacfdec1115e4683ec6f320228a19f41ae83321780780
 DIST rocm-opencl-runtime-5.1.3.tar.gz 1004765 BLAKE2B 64d9b42026d2be1d0e4aa666785699f6b4ec0584a927904a94bf830883050943503f8bdd7c97438a2fb11c71686a330d526f633959916c5c6c8da2e037841e79 SHA512 b83c3ae0bfad80f867bacce36710a8964f6dd7e64bf50da3ec6ce842217d6de63299d9ceaab9dc25a22252484520a85d02859809463dad5dda9b1f00a86863e0
-EBUILD rocm-opencl-runtime-3.10.0.ebuild 1959 BLAKE2B 55455b2b6c94f4c48f29b49873ad15fa2409441b184c6b6adf679f7e8656f373705b115d6b5a4c6563c75385d0b418590a2041ab69c6948a42950319e1abd85b SHA512 3c4f68ed353c7eef6f44b6f0f81549c4cdc2fa8d0a652a2d84157b29ae5a5b63583744192384d21af2cd5e93fded4fa0886fdfa0ac57b9af090415080881e00b
-EBUILD rocm-opencl-runtime-3.8.0.ebuild 1958 BLAKE2B d9aa4e4227e5e9d9fc7d590f9c1e03c6a408fd910aa070833e0fc6b9f344c0c3470b3d4be6bf8fcc67d96d286814ec366dab5c758e76ead4b9b5b5f21d77849f SHA512 cb7e217a3a416bdf55ed756bb19d27cbf6b15b49ccc7482f0b611d210368e3d6bbb983cb9a1e684efb3df273297c12e90047d766a2195d67a36095435d9b3507
-EBUILD rocm-opencl-runtime-3.9.0.ebuild 1958 BLAKE2B df047f8b49eabf718ad126e9c14ae9313d51ab1fa4c32895229987e375499500c97549ff7f620b6bbdb1b47abe8e7cc2c2f85bd9622cc5ee2132c03385ae7707 SHA512 ff9e05cd503d218f65b5749d056832e543f74ece0f7585d4e89b43b8a450532864dfb44f09e16cbea9b18083cc0460347a9cbdd3eaeabfa3d1268a5265bb856f
-EBUILD rocm-opencl-runtime-4.0.0.ebuild 1723 BLAKE2B c9d75c187aac9926441f35c3fe8da16f2f908a42e979a3f1fe996f1d8297f157620d7f636ae78220f2a5b73c21f140cd90c471d8fc874c75ab9ba6fc9374b59c SHA512 08b5304d7b9c1b3d11cb811c2bb2a114f3b02cff622d9d5f03ee1d82176b910ac6619b0183f375f0a4a7a6fa27d237a6a1fd4ce1da9c7502c801d053d428472c
-EBUILD rocm-opencl-runtime-4.1.0.ebuild 1723 BLAKE2B c9d75c187aac9926441f35c3fe8da16f2f908a42e979a3f1fe996f1d8297f157620d7f636ae78220f2a5b73c21f140cd90c471d8fc874c75ab9ba6fc9374b59c SHA512 08b5304d7b9c1b3d11cb811c2bb2a114f3b02cff622d9d5f03ee1d82176b910ac6619b0183f375f0a4a7a6fa27d237a6a1fd4ce1da9c7502c801d053d428472c
-EBUILD rocm-opencl-runtime-4.2.0.ebuild 1764 BLAKE2B 05fa06033a0ee255ebda6bc17c9341b7b08a8b3f086c29f3104c07a8d78db105ce8d28c83b21ed259569b4d0c5bd00851e0553d84bc2650bd2c9b0f77aec7461 SHA512 88f7343cc137f039b5b374092a5f81cfb1e1223c36b9da9ee3b471e05fd770d9cde6b7d68f9c4288d421d4aa9350e2fa16b02e976411efc790ab4fa86e6e5dbf
-EBUILD rocm-opencl-runtime-4.3.0.ebuild 1771 BLAKE2B 6f89d392b1fa396abbff5bf4c72c874d759128eebd8ecdf9460750b654447f0f2b0e09f9d7bf1c7a468754e055b533f05f679439c0f1fd10c08f8dfbec1aca29 SHA512 a1132d242d3c5fe6718bb207a4a5430b036e77958267dbfe2485dce7d29ff1714bd7984f92c428b5e47cdf246bed1ced6fea1d01d9c1ff2f0b411dd5851b2bde
-EBUILD rocm-opencl-runtime-4.5.2.ebuild 2098 BLAKE2B 927e8c40f12b2dc9648b54af826e0ffa38f28a47dbbf33f3dc5f6504a1201d3a11abf8620486f7df5984dd7388a1160029be2e0d1c9a4f1bc2663d3fed852b34 SHA512 6bb18a36e3a77d83035306273685e3ab6397b91e2d311276e4f3bf469039e6c0b3ab70a73c29f30318fe2dd959244c449334e138e64ec3327c4b9870d5bafe5c
 EBUILD rocm-opencl-runtime-5.0.2-r1.ebuild 2200 BLAKE2B 0482018be30fed0b82efb9bb104e60ed47c8c53ba1acbf444188ca1af62b9a48c9aed68d45727bedb59374bd000d041adde698acfc475738739a108cb0d514e7 SHA512 fff8a6d3c7263aefc87cf17f2e22d9636ef228925747fbca002a5241a2fb676da488f567db83989a18b62f105e39895ebe40e8fdf228662246c5b094410606ff
 EBUILD rocm-opencl-runtime-5.1.3.ebuild 3723 BLAKE2B 004d08f932eeae08adeab1e931e26eca6bb78f52170c359733824e91c7ca348edeb7f1ff099117d6aeb1c65bbdc79e40265d11e6f7791b55e9e7980a4cf3d641 SHA512 2e6f5cfa4f25934a96fe88d668f8956c89f342b4823e99e2c2deb75403f74efac15d4a7a02c138e218f49333073160cbd4c251d0910c47c4bf832d56aa491fb9
 MISC metadata.xml 381 BLAKE2B fbd9237f4928b42544799482f55fc0e72e872a554bf96c3066ea59213e7d840d432c320f834cc333a09498d6deabb0fc751657ad0e861be7997fba6f1788ffac SHA512 8d05a33637e38b0596a98f5dfee096a91bba41ca16c4eba5f5e93f05f800290c480a0393bf4d5a7ce70cbff0a541b95e52d3c95b02cc7a079343c8f740b8e479
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.10.0-add-rocclr-include-directories.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.10.0-add-rocclr-include-directories.patch
deleted file mode 100644
index 13fc581b4cd9..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.10.0-add-rocclr-include-directories.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/amdocl/CMakeLists.txt	2020-12-05 22:05:55.838529158 +0100
-+++ b/amdocl/CMakeLists.txt	2020-12-05 22:07:35.677524507 +0100
-@@ -23,6 +23,9 @@
- include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos)
- include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos/headers)
- include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos/headers/opencl2.2)
-+include_directories(/usr/include/rocclr)
-+include_directories(/usr/include/rocclr/compiler/lib/include/)
-+include_directories(/usr/include/rocclr/elf/)
- 
- if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR
-    (CMAKE_${COMPILER}_COMPILER_ID MATCHES "Clang"))
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch
deleted file mode 100644
index 357b97c7f49e..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/amdocl/CMakeLists.txt	2020-08-23 10:11:28.227839351 +0200
-+++ b/amdocl/CMakeLists.txt	2020-08-23 10:44:34.929831772 +0200
-@@ -23,6 +23,8 @@
- include_directories(${CMAKE_SOURCE_DIR}/khronos)
- include_directories(${CMAKE_SOURCE_DIR}/khronos/headers)
- include_directories(${CMAKE_SOURCE_DIR}/khronos/headers/opencl2.2)
-+include_directories(/usr/include/rocclr)
-+include_directories(/usr/include/rocclr/compiler/lib/include/)
- 
- if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR
-    (CMAKE_${COMPILER}_COMPILER_ID MATCHES "Clang"))
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-amdocl64icd.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-amdocl64icd.patch
deleted file mode 100644
index 6541c69bd48a..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-amdocl64icd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/amdocl/CMakeLists.txt	2020-08-23 10:11:28.227839351 +0200
-+++ b/amdocl/CMakeLists.txt	2020-08-23 10:12:03.697839216 +0200
-@@ -76,3 +76,7 @@
- add_library(amdocl64 SHARED ${amdocl64_src})
- 
- target_link_libraries(amdocl64 amdrocclr_static Threads::Threads dl ${ADDITIONAL_LIBRARIES})
-+
-+file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/amdocl64.icd" CONTENT "$<TARGET_FILE_NAME:amdocl64>")
-+install(FILES "${CMAKE_BINARY_DIR}/amdocl64.icd" DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/OpenCL/vendors/")
-+
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-change-install-location.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-change-install-location.patch
deleted file mode 100644
index 77ce5e9bd332..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-change-install-location.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/CMakeLists.txt	2020-08-23 10:14:54.337838565 +0200
-+++ b/CMakeLists.txt	2020-08-23 10:18:26.993837753 +0200
-@@ -14,6 +14,8 @@
- #example command:
- # cmake -DCMAKE_PREFIX_PATH=/path/to/ROCclr/build/or/install ..
- 
-+include (GNUInstallDirs)
-+
- set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2" CACHE PATH "")
- option(BUILD_SHARED_LIBS "Build shared libs" ON)
- 
-@@ -60,7 +62,7 @@
- 
- add_subdirectory(khronos/icd)
- add_subdirectory(amdocl)
--add_subdirectory(tools/clinfo)
-+#add_subdirectory(tools/clinfo)
- add_subdirectory(tools/cltrace)
- if(BUILD_TESTS)
-   add_subdirectory(tests/ocltst)
-@@ -96,34 +98,34 @@
- ###--- Packaging ------------------------------------------------------------###
- 
- # MAIN package
--install(PROGRAMS $<TARGET_FILE:clinfo>
--        DESTINATION bin
--        COMPONENT MAIN)
--install(PROGRAMS $<TARGET_FILE:cltrace>
--        DESTINATION lib
--        COMPONENT MAIN)
-+#install(PROGRAMS $<TARGET_FILE:clinfo>
-+#        DESTINATION bin
-+#        COMPONENT MAIN)
-+#install(PROGRAMS $<TARGET_FILE:cltrace>
-+#        DESTINATION lib
-+#        COMPONENT MAIN)
- install(PROGRAMS $<TARGET_FILE:amdocl64>
--        DESTINATION lib
--        COMPONENT MAIN)
--install(PROGRAMS $<TARGET_FILE:OpenCL>
--        DESTINATION lib
--        COMPONENT MAIN)
--install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL>
--        DESTINATION lib
-+        DESTINATION lib64
-         COMPONENT MAIN)
-+#install(PROGRAMS $<TARGET_FILE:OpenCL>
-+#        DESTINATION lib
-+#        COMPONENT MAIN)
-+#install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL>
-+#        DESTINATION lib
-+#        COMPONENT MAIN)
- 
- # DEV package
--install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL"
--        DESTINATION include
--        COMPONENT DEV
--        USE_SOURCE_PERMISSIONS
--        PATTERN cl_d3d10.h EXCLUDE
--        PATTERN cl_d3d11.h EXCLUDE
--        PATTERN cl_dx9_media_sharing.h EXCLUDE
--        PATTERN cl_egl.h EXCLUDE)
--install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL>
--        DESTINATION lib
--        COMPONENT DEV)
-+#install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL"
-+#        DESTINATION include
-+#        COMPONENT DEV
-+#        USE_SOURCE_PERMISSIONS
-+#        PATTERN cl_d3d10.h EXCLUDE
-+#        PATTERN cl_d3d11.h EXCLUDE
-+#        PATTERN cl_dx9_media_sharing.h EXCLUDE
-+#        PATTERN cl_egl.h EXCLUDE)
-+#install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL>
-+#        DESTINATION lib
-+#        COMPONENT DEV)
- 
- #############################
- # Packaging steps
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch
deleted file mode 100644
index e9341675d890..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/amdocl/CMakeLists.txt	2020-08-23 10:11:28.227839351 +0200
-+++ b/amdocl/CMakeLists.txt	2020-08-23 10:44:34.929831772 +0200
-@@ -23,6 +23,9 @@
- include_directories(${CMAKE_SOURCE_DIR}/khronos)
- include_directories(${CMAKE_SOURCE_DIR}/khronos/headers)
- include_directories(${CMAKE_SOURCE_DIR}/khronos/headers/opencl2.2)
-+include_directories(/usr/include/rocclr)
-+include_directories(/usr/include/rocclr/compiler/lib/include/)
-+include_directories(/usr/include/rocclr/elf/)
- 
- if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR
-    (CMAKE_${COMPILER}_COMPILER_ID MATCHES "Clang"))
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-4.2.0-opencl3-header.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-4.2.0-opencl3-header.patch
deleted file mode 100644
index 14191adb5d0c..000000000000
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-4.2.0-opencl3-header.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-See bug #789717.
-
-Once opencl-headers is upgraded to 3.0 or higher this package starts
-complaining left and right about missing header definitions for
-CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR.  The correct header for this
-definiton did move as of opencl-headers 3.0 so this makes some sense.
-(Actually I suspect there is a header-guard mismatch behind this problem).
-
-Most of this can be fixed by using -isystem instead of -I for the opencl
-headers. Although not terribly well documented, -isystem in lieu of -I
-comports with best practices for overriding 3rd-party header files in
-system include directories according to the gcc info pages.  Why and how
-are apparently undocumented and appear to be somewhere inside the gcc
-fixincludes rabbit-hole.
-
-This still leaves a similar issue compiling the amdocl files which
-is addressed here with an extra #include.
-
--gmt
-
-diff -urpN ROCm-OpenCL-Runtime-rocm-4.1.0.orig/amdocl/CMakeLists.txt ROCm-OpenCL-Runtime-rocm-4.1.0/amdocl/CMakeLists.txt
---- ROCm-OpenCL-Runtime-rocm-4.1.0.orig/amdocl/CMakeLists.txt	2021-06-26 14:52:32.446875129 -0700
-+++ ROCm-OpenCL-Runtime-rocm-4.1.0/amdocl/CMakeLists.txt	2021-06-26 15:00:30.401582470 -0700
-@@ -19,10 +19,10 @@ if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
-   add_definitions(-DDEBUG)
- endif()
- 
--include_directories(${CMAKE_CURRENT_LIST_DIR}/..)
--include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos)
--include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos/headers)
--include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos/headers/opencl2.2)
-+include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/..)
-+include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../khronos)
-+include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../khronos/headers)
-+include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../khronos/headers/opencl2.2)
- include_directories(/usr/include/rocclr)
- include_directories(/usr/include/rocclr/compiler/lib/include/)
- include_directories(/usr/include/rocclr/elf/)
-diff -urpN ROCm-OpenCL-Runtime-rocm-4.1.0.orig/khronos/icd/CMakeLists.txt ROCm-OpenCL-Runtime-rocm-4.1.0/khronos/icd/CMakeLists.txt
---- ROCm-OpenCL-Runtime-rocm-4.1.0.orig/khronos/icd/CMakeLists.txt	2021-06-26 14:52:32.445875109 -0700
-+++ ROCm-OpenCL-Runtime-rocm-4.1.0/khronos/icd/CMakeLists.txt	2021-06-26 14:59:01.600778554 -0700
-@@ -121,10 +121,10 @@ else()
-     endif ()
- endif ()
- 
--include_directories (${OPENCL_ICD_LOADER_HEADERS_DIR})
-+include_directories (SYSTEM ${OPENCL_ICD_LOADER_HEADERS_DIR})
- add_definitions (-DCL_TARGET_OPENCL_VERSION=220)
- 
--target_include_directories (OpenCL PRIVATE ${CMAKE_CURRENT_BINARY_DIR} loader)
-+target_include_directories (OpenCL SYSTEM PRIVATE ${CMAKE_CURRENT_BINARY_DIR} loader)
- target_link_libraries (OpenCL ${CMAKE_DL_LIBS})
- 
- include (CTest)
-diff -urpN ROCm-OpenCL-Runtime-rocm-4.1.0.orig/amdocl/cl_common.hpp ROCm-OpenCL-Runtime-rocm-4.1.0/amdocl/cl_common.hpp
---- ROCm-OpenCL-Runtime-rocm-4.1.0.orig/amdocl/cl_common.hpp	2021-02-02 10:01:38.000000000 -0800
-+++ ROCm-OpenCL-Runtime-rocm-4.1.0/amdocl/cl_common.hpp	2021-06-26 15:40:57.584449532 -0700
-@@ -21,6 +21,7 @@
- #ifndef CL_COMMON_HPP_
- #define CL_COMMON_HPP_
- 
-+#include <CL/cl_gl_ext.h>
- #ifdef _WIN32
- #include <CL/cl_d3d11.h>
- #include <CL/cl_d3d10.h>
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.10.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.10.0.ebuild
deleted file mode 100644
index 748f8d2b952a..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.10.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=dev-libs/rocclr-${PV}
-	>=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
-	>=virtual/opencl-3
-	media-libs/mesa"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/rocm-cmake-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7.0-change-install-location.patch"
-	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
-	"${FILESDIR}/${PN}-3.10.0-add-rocclr-include-directories.patch"
-	"${FILESDIR}/${PN}-3.7.0-amdocl64icd.patch"
-)
-
-src_prepare() {
-	# Remove "clinfo" - use "dev-util/clinfo" instead
-	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
-
-	# Wrong position of a '"' results in a list of strings instead of a single string and the build fails...
-	sed -e "s:set(CMAKE_SHARED_LINKER_FLAGS \${CMAKE_SHARED_LINKER_FLAGS} \":set(CMAKE_SHARED_LINKER_FLAGS \"\${CMAKE_SHARED_LINKER_FLAGS} :" -i "${S}/amdocl/CMakeLists.txt"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
-	append-cflags -fcommon
-
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=yes
-		-DROCclr_DIR="${EPREFIX}/usr/include/rocclr"
-		-DLIBROCclr_STATIC_DIR="${EPREFIX}/usr/lib/cmake/rocclr"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cd "${BUILD_DIR}" || die
-	insinto /etc/OpenCL/vendors
-	doins amdocl64.icd
-	insinto /usr/lib64
-	doins lib/libamdocl64.so
-}
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.0.ebuild
deleted file mode 100644
index d985d31a0764..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=dev-libs/rocclr-${PV}
-	>=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
-	>=virtual/opencl-3
-	media-libs/mesa"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/rocm-cmake-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7.0-change-install-location.patch"
-	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
-	"${FILESDIR}/${PN}-3.7.0-add-rocclr-include-directories.patch"
-	"${FILESDIR}/${PN}-3.7.0-amdocl64icd.patch"
-)
-
-src_prepare() {
-	# Remove "clinfo" - use "dev-util/clinfo" instead
-	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
-
-	# Wrong position of a '"' results in a list of strings instead of a single string and the build fails...
-	sed -e "s:set(CMAKE_SHARED_LINKER_FLAGS \${CMAKE_SHARED_LINKER_FLAGS} \":set(CMAKE_SHARED_LINKER_FLAGS \"\${CMAKE_SHARED_LINKER_FLAGS} :" -i "${S}/amdocl/CMakeLists.txt"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
-	append-cflags -fcommon
-
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=yes
-		-DROCclr_DIR="${EPREFIX}/usr/include/rocclr"
-		-DLIBROCclr_STATIC_DIR="${EPREFIX}/usr/lib/cmake/rocclr"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cd "${BUILD_DIR}" || die
-	insinto /etc/OpenCL/vendors
-	doins amdocl64.icd
-	insinto /usr/lib64
-	doins lib/libamdocl64.so
-}
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.9.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.9.0.ebuild
deleted file mode 100644
index f2ea94531e96..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.9.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=dev-libs/rocclr-${PV}
-	>=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
-	>=virtual/opencl-3
-	media-libs/mesa"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/rocm-cmake-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7.0-change-install-location.patch"
-	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
-	"${FILESDIR}/${PN}-3.9.0-add-rocclr-include-directories.patch"
-	"${FILESDIR}/${PN}-3.7.0-amdocl64icd.patch"
-)
-
-src_prepare() {
-	# Remove "clinfo" - use "dev-util/clinfo" instead
-	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
-
-	# Wrong position of a '"' results in a list of strings instead of a single string and the build fails...
-	sed -e "s:set(CMAKE_SHARED_LINKER_FLAGS \${CMAKE_SHARED_LINKER_FLAGS} \":set(CMAKE_SHARED_LINKER_FLAGS \"\${CMAKE_SHARED_LINKER_FLAGS} :" -i "${S}/amdocl/CMakeLists.txt"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
-	append-cflags -fcommon
-
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=yes
-		-DROCclr_DIR="${EPREFIX}/usr/include/rocclr"
-		-DLIBROCclr_STATIC_DIR="${EPREFIX}/usr/lib/cmake/rocclr"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cd "${BUILD_DIR}" || die
-	insinto /etc/OpenCL/vendors
-	doins amdocl64.icd
-	insinto /usr/lib64
-	doins lib/libamdocl64.so
-}
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild
deleted file mode 100644
index 7aa7bd6e9a07..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic prefix
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=dev-libs/rocclr-${PV}
-	>=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
-	>=virtual/opencl-3
-	media-libs/mesa"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/rocm-cmake-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7.0-change-install-location.patch"
-	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
-	"${FILESDIR}/${PN}-3.10.0-add-rocclr-include-directories.patch"
-	"${FILESDIR}/${PN}-3.7.0-amdocl64icd.patch"
-)
-
-src_prepare() {
-	# Remove "clinfo" - use "dev-util/clinfo" instead
-	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
-
-	cmake_src_prepare
-
-	hprefixify amdocl/CMakeLists.txt
-}
-
-src_configure() {
-	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
-	append-cflags -fcommon
-
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=yes
-		-DROCclr_DIR="${EPREFIX}/usr/include/rocclr"
-		-DLIBROCclr_STATIC_DIR="${EPREFIX}/usr/lib/cmake/rocclr"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cd "${BUILD_DIR}" || die
-	insinto /etc/OpenCL/vendors
-	doins amdocl64.icd
-	insinto /usr/lib64
-	doins lib/libamdocl64.so
-}
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.1.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.1.0.ebuild
deleted file mode 100644
index 7aa7bd6e9a07..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.1.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic prefix
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=dev-libs/rocclr-${PV}
-	>=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
-	>=virtual/opencl-3
-	media-libs/mesa"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/rocm-cmake-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7.0-change-install-location.patch"
-	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
-	"${FILESDIR}/${PN}-3.10.0-add-rocclr-include-directories.patch"
-	"${FILESDIR}/${PN}-3.7.0-amdocl64icd.patch"
-)
-
-src_prepare() {
-	# Remove "clinfo" - use "dev-util/clinfo" instead
-	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
-
-	cmake_src_prepare
-
-	hprefixify amdocl/CMakeLists.txt
-}
-
-src_configure() {
-	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
-	append-cflags -fcommon
-
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=yes
-		-DROCclr_DIR="${EPREFIX}/usr/include/rocclr"
-		-DLIBROCclr_STATIC_DIR="${EPREFIX}/usr/lib/cmake/rocclr"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cd "${BUILD_DIR}" || die
-	insinto /etc/OpenCL/vendors
-	doins amdocl64.icd
-	insinto /usr/lib64
-	doins lib/libamdocl64.so
-}
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.2.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.2.0.ebuild
deleted file mode 100644
index 336df477b70e..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.2.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic prefix
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=dev-libs/rocclr-${PV}
-	>=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
-	>=virtual/opencl-3
-	media-libs/mesa"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/rocm-cmake-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7.0-change-install-location.patch"
-	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
-	"${FILESDIR}/${PN}-3.10.0-add-rocclr-include-directories.patch"
-	"${FILESDIR}/${PN}-3.7.0-amdocl64icd.patch"
-	"${FILESDIR}/${P}-opencl3-header.patch"
-)
-
-src_prepare() {
-	# Remove "clinfo" - use "dev-util/clinfo" instead
-	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
-
-	cmake_src_prepare
-
-	hprefixify amdocl/CMakeLists.txt
-}
-
-src_configure() {
-	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
-	append-cflags -fcommon
-
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=yes
-		-DROCclr_DIR="${EPREFIX}/usr/include/rocclr"
-		-DLIBROCclr_STATIC_DIR="${EPREFIX}/usr/lib/cmake/rocclr"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cd "${BUILD_DIR}" || die
-	insinto /etc/OpenCL/vendors
-	doins amdocl64.icd
-	insinto /usr/lib64
-	doins lib/libamdocl64.so
-}
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.3.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.3.0.ebuild
deleted file mode 100644
index 5bf69a9823a9..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.3.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic prefix
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
-	>=dev-libs/rocclr-${PV}
-	>=dev-libs/rocm-comgr-${PV}
-	>=dev-libs/rocm-device-libs-${PV}
-	>=virtual/opencl-3
-	media-libs/mesa"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/rocm-cmake-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7.0-change-install-location.patch"
-	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
-	"${FILESDIR}/${PN}-3.10.0-add-rocclr-include-directories.patch"
-	"${FILESDIR}/${PN}-3.7.0-amdocl64icd.patch"
-	"${FILESDIR}/${PN}-4.2.0-opencl3-header.patch"
-)
-
-src_prepare() {
-	# Remove "clinfo" - use "dev-util/clinfo" instead
-	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
-
-	cmake_src_prepare
-
-	hprefixify amdocl/CMakeLists.txt
-}
-
-src_configure() {
-	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
-	append-cflags -fcommon
-
-	local mycmakeargs=(
-		-DUSE_COMGR_LIBRARY=yes
-		-DROCclr_DIR="${EPREFIX}/usr/include/rocclr"
-		-DLIBROCclr_STATIC_DIR="${EPREFIX}/usr/lib/cmake/rocclr"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cd "${BUILD_DIR}" || die
-	insinto /etc/OpenCL/vendors
-	doins amdocl64.icd
-	insinto /usr/lib64
-	doins lib/libamdocl64.so
-}
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.5.2.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.5.2.ebuild
deleted file mode 100644
index a90a016047af..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.5.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake 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)"
-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"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/rocm-cmake-${PV}
-	media-libs/glew
-	"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.2-remove-clinfo.patch"
-	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
-)
-
-S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-S1="${WORKDIR}/ROCclr-rocm-${PV}"
-
-CMAKE_BUILD_TYPE=Release
-
-src_prepare() {
-	# Remove "clinfo" - use "dev-util/clinfo" instead
-	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
-
-	cmake_src_prepare
-
-	hprefixify amdocl/CMakeLists.txt
-
-	local S="${S1}"
-	local CMAKE_USE_DIR="${S1}"
-	# Bug #753377
-	local PATCHES=()
-	BUILD_DIR="${S1}_build" cmake_src_prepare
-}
-
-src_configure() {
-	# configure ROCclr
-	CMAKE_USE_DIR="${S1}"
-	local mycmakeargs=(
-		-Wno-dev
-		-DAMD_OPENCL_PATH="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-	)
-	BUILD_DIR="${S1}_build" cmake_src_configure
-
-	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
-	append-cflags -fcommon
-
-	CMAKE_USE_DIR="${S}"
-	local mycmakeargs=(
-		-Wno-dev
-		-DROCCLR_PATH="${S1}"
-		-DAMD_OPENCL_PATH="${S}"
-		-DROCM_PATH="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	local S="${S1}"
-	BUILD_DIR="${S1}_build" cmake_src_compile
-
-	local S="${S}"
-	cmake_src_compile
-}
-
-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
-}
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index 1f9ec7452ba5..e23663ff124b 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,26 +1,8 @@
-AUX rocr-runtime-3.7.0-cmake-install-paths.patch 4032 BLAKE2B a4252fc7a6740c64a5695ccecc6392f31acf9a341b9886fab37686916c6d0298da8ccd8d723710aaa944f6e2c26afba9b3f0bae84d5a755bf87dc8700c3dd598 SHA512 d29bf929a136dc4f6b0ddc6f2821a3ad73ab31e1c7a265e73344d69712cbe18a0a2a200d23b094fcfdddbcd37275a75d7d6313d163a6994d323a7b7f611a0d75
-AUX rocr-runtime-4.1.0-cmake-install-paths.patch 4031 BLAKE2B 144df57dc9fa014779d6490217ded97511228d88a7e8864e4eea2870f8b48ec361b4a16ca5e3571ed27a1f91e32d07d694d93c3a2075c60af626c57112ae4e86 SHA512 28f6b3db96df74ede81219005d5d62194f2d41b0628de92202a4293983384390e68c9da1005af86b2b2d2f19f1de6fc2ca4ac1f4dcf9358f66ca519c894f2043
 AUX rocr-runtime-4.3.0_no-aqlprofiler.patch 1084 BLAKE2B dfc2b9bbea0360fdbbd04988f0dbed76e53d8d9f9d2a5217f154e02e39f7b78f3408edb0204a93b6b4e927103b2c041788bd6befb8475d3f4e333bdc6ad19a0d SHA512 f90b92eb547640bc8cf71d042f12a55504371e4c3e624b02435c026e7ae9d5885e23a2be3a0f5c443fc502b3a1c8a03fdb5efabaeaabe8be33a28aab3ac9d9ca
 AUX rocr-runtime-4.5.2-cmake-install-paths.patch 2683 BLAKE2B 9f4c3e232e81e7544e77c7388c5f555bd564e4806814d40012820023c4293242bdbbcafb788141e437fdfa6a3269d241710d74587492a657cc80fcb8f9cb29e4 SHA512 62165ed65c9d26194bbd4c3a9e1dae6d0ce2b8d61a6d421d5800e2a9a885e94cde648290090cc3654bf8b4a4c5263899c52e556d1d42e08d6d75f4bf00860928
 AUX rocr-runtime-5.0.1-cmake-install-paths.patch 2744 BLAKE2B fbbecdefbfabcbe4cd7f029e10d6abed94b492f94157839336adf83e98efe5c0e93dbb20856ca6adab32cb315bbd7b6c397c8fc48b66ea784cdbb3becb5f718e SHA512 db7ee8b87b526991a62c3cbfd385e85d27e05ba9a7f4726e8060d7ad29917e154bdcd0715e61a08210dad4b6112c731dfcab9e9f7e809b74da2f74c62a1eab72
-DIST rocr-runtime-3.10.0.tar.gz 691857 BLAKE2B 68403081180fe1aead570f8055f91d13083516766afe6c9fd18d7619162cc12fa6dd0ec824ffdc44832d1ab7e823ac2cc399b7cbb4e603f95db54e492de152c5 SHA512 9ca7c7a22ea2a35437aa1a23a331c36684ada1af0f389f697bd6c1e35c4f9493b851d7e7176a0892be36d3d7de93000f7db37e3d2c109fa6c1932851c3bd703b
-DIST rocr-runtime-3.8.0.tar.gz 691209 BLAKE2B 0664b099a7ea4105e37cf42ee208c31dc58a1900aa35bbc0295df0cabba25e5352b3def0dbc1a8ea889ad4876321f99a73c4c6c9ec042186efda9b3308583825 SHA512 d968e96cabc98951890435a2b9bfc9943df9435848f0c6026a59953c78ad4c1048e7c532a8093e5f633fdc5d32622fb88ba0212f32f317d5473fd7e957e4dc4c
-DIST rocr-runtime-3.9.0.tar.gz 691645 BLAKE2B c90cdba93be510532a65ebfd69322972c61603b23932b95982d9a2bea742979b14acd83728a37ecacd7ec540268311bd313801acece89ec02a234dee66155dbe SHA512 e117536300ad05db27ccd92d2f9fadbdb9711fc724953ef65609c7af1ef369b8cf132c8b0f72d33e7ffd43acc3e59dc5525bacaa1507fd01fab79685f6b8d86e
-DIST rocr-runtime-4.0.0.tar.gz 691835 BLAKE2B 328f7ea54767294036f435894d63354694447d964753de8b58b70ba5ae5f83561e5cda506890b43c80bdc480b1781d246ee77d5a0b08f74c5eb52d1ac5e8ddda SHA512 c95316cd8f221caee84f644e00b2b08d447b75ae4e5fe1871fa2ac6a879da57def497babfcabcaeb988d92421c165070e47d9fe846640b871249d66c82f82bea
-DIST rocr-runtime-4.1.0.tar.gz 698452 BLAKE2B fb1ca1219d2c59db4d8bff414f40eaf6e7cec899a70ed930ce3dc6e2906a173db4823ac4c445fc57cc297a932f83b140747e35ee3d77fa0ed11cec97718fdc47 SHA512 d2162f431adf0b8f8ae5bbfe43ed389d4d94db5897fc8d1b4eb9b152a74f605fa2cf5d80175e6f9cda45e39803ededef6151aa9bdea99f38a16ca2dea29588d9
-DIST rocr-runtime-4.2.0.tar.gz 701445 BLAKE2B 901c256bae823861813a7afdbd3e9f80b6f86cf2c7002815e04c762cef241a9f32274093067c97578e05fdf5c4e699287b7835d00917cb4997302c455e5d593a SHA512 44a798efd0121c7107f3f5df868eb83d0ff9aad1e11c01105d5852bef159c019db6d2aeebe02e8e187dc45a2542d72f145fb5390b27abf64e0b427e192772d6c
-DIST rocr-runtime-4.3.0.tar.gz 709075 BLAKE2B 6856681bd3d56827e517f76838886f793f4d709562c2c7c4f480ef5786c5a5fac25654032b80d565ab5da241f76329d39ab3189daa4806b8cf1564d9f08a837d SHA512 749a8f84a302f7ed518f87688f68cc2a094eea2d104cddc25b3e5d98ddf6e534285750828ca654976054bbf986a61735e17ad211505557671627e44f6831dc0c
-DIST rocr-runtime-4.5.2.tar.gz 717648 BLAKE2B f3acf32943b73b65f1272317bbd8928d1a05e9985ec6242f0480cfdb988052caef198900643fc42288af6acd5fbe2052f063b022219b2ef0d3fb843032de6c92 SHA512 69d7a3f7960ffca339d706a9356e0994851761a135e1b7e7b9b451bcff5782c119b99756432546e7f066f8b60b8717557340cf382f8a9beae6336d23d90ecae4
 DIST rocr-runtime-5.0.2.tar.gz 719840 BLAKE2B 3d0fd6df0a0ab1e180b4a6e61fdf6d796cf71ab7b259057a1942f70dfcbcf8cb5ee6ac563a4baefe3c608139eaf3d8433b5b58e871b45f43cb4d98d1889f6718 SHA512 0590975cab6463a39d78bad933f8e0d30cf23d100b58f5b1968f6d6bc4b88e3c6bca5c46783e321d4bfc9a685837385f90feb8e922523c002c1f4ea0c70bdf72
 DIST rocr-runtime-5.1.3.tar.gz 720567 BLAKE2B bdf2d258ec607ffc69264d48ce82c36787757b7809397d643a24abaa852f3cc217a57210fba760d4d11ef8ce2922dc1ef275d3b47a4bebc5c7b204bbbb5b7c66 SHA512 d47523ea2fe32fee832ca19b56a091f52e16b366db1c571f87e5599514b826376d49281e79ff0936dcaf7349f9becbc8ae9b3e9472a9c3e14b62a3f98d541b35
-EBUILD rocr-runtime-3.10.0.ebuild 1510 BLAKE2B 196532ca9cb64ff2963ab08f06884eeb37b61fa5e209e12caba4ee4e2f1497795a8c73078ba8d482b438e7c06d1cf20b41797d218d2c3799bb10037aaaa54419 SHA512 d0c778bb535ac890f87914752fc4f3cee93e915e567c4bd7226bcc6c999293c7fbec89209458384330f33e3e7738dabdd495b27f4789666010c211c48bfe3387
-EBUILD rocr-runtime-3.8.0.ebuild 1494 BLAKE2B 559ea5454433cf167cb1da2369700ace96729b1b4648f729e251b7e8f41368775766f0c2c288e986af26a5eb2655a9c35115497e8bf3e08e247c2237bca9556a SHA512 32986094590e367f61dc70a2be74716c81a95c03ee063f37321b9b579c5adcc72e1ebbdd71d1b23d6dc6e83a617d2d1ba6d0f3c0e65e6247414d8e7a0208cbea
-EBUILD rocr-runtime-3.9.0.ebuild 1510 BLAKE2B 196532ca9cb64ff2963ab08f06884eeb37b61fa5e209e12caba4ee4e2f1497795a8c73078ba8d482b438e7c06d1cf20b41797d218d2c3799bb10037aaaa54419 SHA512 d0c778bb535ac890f87914752fc4f3cee93e915e567c4bd7226bcc6c999293c7fbec89209458384330f33e3e7738dabdd495b27f4789666010c211c48bfe3387
-EBUILD rocr-runtime-4.0.0.ebuild 1530 BLAKE2B 065d3d28d95d8832f8630496e023b264b28e25f7a99d253be765251047472a3bd4364cb0bedce6b7025221e3b6e92ed1964713884f08bd595017597e8b904bba SHA512 099d1810b5ea7d2fce49e4914b0f4453fd7c202dcee62a2e83875f7e0b47e59c6741e6c21a648f422b6d4c28aa5ccd18d6aa93a6b32d10705b6fac4f5aa68151
-EBUILD rocr-runtime-4.1.0.ebuild 1648 BLAKE2B 6e654ed96e97b9a60e25db92eb8ab80ace4d773dc7c4082adffc805f20dff9ea8b0b139e421df625a99764f1b61d22700864e25296011848bb91f8025b373362 SHA512 abc3ab62999a8e3bb6c6d0616e528b3e2c3914a67e1b40548d71ff31a409ed53f81dfb2c9e0dfdfa23e9d5ae8ca4f092d575bb003acef8695d373dd7fca36c01
-EBUILD rocr-runtime-4.2.0.ebuild 1502 BLAKE2B 6f7d48bc7bcc89ae585b202ad2bd4b523142fec9d00418efa297248548867bd02ddff6812fb01572d03bdb70438837437d777384a78e706d1eb420a12d61eae7 SHA512 df94dcb2549a9da7048b7a9d22ec4c4e5a617b85e95d0f5d576a770ee5f1ac3d1a71504e9b1a92752904568cf1dd11ec0fd8a35b11d17d8329c07dd0aae762fc
-EBUILD rocr-runtime-4.3.0.ebuild 1459 BLAKE2B c9542e8686afc2718d468b363ed926547cc32cd2389c344b6e3c621bd3c1007239f6e9434df645054daccdfcd78f4ddcc8a78156019e4c604a7ee8a88866a28d SHA512 74e81b3beed9e9d564f3ce006b235c60b546adc60701303c3f95e36fb00f4b81b8fbfc4867a3740b4ec368052e68f4eca4b4847f97d858fdf72c5fffa8669625
-EBUILD rocr-runtime-4.5.2.ebuild 1414 BLAKE2B 0c0e4b7d3e1d643e5fda6d3636789811e6a10dc3e990a84900643c0fbae667b2f9ce0dec2c79b801b2730acf83a5ba7de025bab6b0b353363d177891f2884591 SHA512 a1967d10a99f3dfa250f9cec2a244b5e670c80a0c895ee92a0feee00f600428ee7037465ec09b99b15437158c9f69d14d2bfa249cd5dfab7689015c43468b924
 EBUILD rocr-runtime-5.0.2.ebuild 1378 BLAKE2B 31699837b204a3e5b21a237b20f89d766f195f235dade08a194a1a3be9eb60a4c17ea013595bdfc5aca1faac9ea4cde8022887f4787fffad98ccfa9844184eab SHA512 f23c922627b50b0ad5c6482d3b9022390ad8715bf4f39e6317faec73c9b0e1416caae7f4e4828319c7873537db117690b1b567c575faf3b2e993fdcce122cfdf
 EBUILD rocr-runtime-5.1.3-r1.ebuild 1489 BLAKE2B bddcaa60234f530822d4f96ea90c4c178f91af3933c70fad0269287ba97d0a6243626dd88e2d31c62ac3dda7e6bc8abaf50836357d2d512befbbd0a0f2aaf112 SHA512 7a84de93ae70e158d7bb09318c38cc5e4251f5831ab07f0f022b35de87d2140e03f5ce8decc5aa80e67a0c436131753577aa52d1d7c62f0e419e3307e45b63e9
 MISC metadata.xml 515 BLAKE2B ccb566413bfb5e7027d1596b040f6c957dc8d58fc413859c4a08fbd484ab16d536948bcf24cdd1edd5bdc8a4951b5abe6adbb3da6fde37e5a9ba1bdcfd312827 SHA512 6d0f0ab69b8f04a9106d71003f17c00e693b42c03aa5c430ebb03f7ffb3ecb8f4b10128fd22462692b97870c23e85aa3f037433fa65c55a342d64038f0db5a93
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-3.7.0-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-3.7.0-cmake-install-paths.patch
deleted file mode 100644
index ccf397d8092a..000000000000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-3.7.0-cmake-install-paths.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/CMakeLists.txt	2020-08-22 18:24:27.991014917 +0200
-+++ b/CMakeLists.txt	2020-08-22 18:48:03.209009518 +0200
-@@ -296,34 +296,36 @@
- 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()
-+#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
-+#  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 )
-+#install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION include/hsa COMPONENT dev )
-+install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
- 
- # Legacy symlink.
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION hsa/include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa COMPONENT dirlink)
-+#install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION hsa/include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa COMPONENT dirlink)
- 
- # 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 ()
-+#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 ()
- 
- ## Configure and install package config file
- # Record our usage data for clients find_package calls.
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-4.1.0-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-4.1.0-cmake-install-paths.patch
deleted file mode 100644
index 18ce75d8b462..000000000000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-4.1.0-cmake-install-paths.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/CMakeLists.txt	2021-03-25 22:16:45.466833618 +0100
-+++ b/CMakeLists.txt	2021-03-25 22:19:55.025828841 +0100
-@@ -296,34 +296,36 @@
- 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()
-+#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
-+#  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 )
-+#install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION include/hsa COMPONENT dev )
-+install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
- 
- # Legacy symlink.
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION hsa/include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa COMPONENT dirlink)
-+#install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION hsa/include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa COMPONENT dirlink)
- 
- # 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 ()
-+#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 ()
- 
- ## Configure and install package config file
- # Record our usage data for clients find_package calls.
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.10.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.10.0.ebuild
deleted file mode 100644
index 256f7ffb9e4a..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-3.10.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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}-3.7.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-COMMON_DEPEND="sys-process/numactl
-	dev-libs/elfutils:=
-	>=sys-devel/llvm-roc-${PV}"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}
-	>=dev-libs/rocm-device-libs-${PV}"
-BDEPEND="app-editors/vim-core"
-	# vim-core is needed for "xxd"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-
-	# ... otherwise system llvm/clang is used ...
-	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS /usr/lib/llvm/roc ):" -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:/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild
deleted file mode 100644
index 4c5db671ec1a..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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}-3.7.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-COMMON_DEPEND="sys-process/numactl
-	dev-libs/elfutils:=
-	>=sys-devel/llvm-roc-${PV}"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}
-	~dev-libs/rocm-device-libs-${PV}"
-BDEPEND="app-editors/vim-core"
-	# vim-core is needed for "xxd"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-
-	# ... otherwise system llvm/clang is used ...
-	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS /usr/lib/llvm/roc ):" -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:/usr/lib:" -i image/blit_src/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.9.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.9.0.ebuild
deleted file mode 100644
index 256f7ffb9e4a..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-3.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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}-3.7.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-COMMON_DEPEND="sys-process/numactl
-	dev-libs/elfutils:=
-	>=sys-devel/llvm-roc-${PV}"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}
-	>=dev-libs/rocm-device-libs-${PV}"
-BDEPEND="app-editors/vim-core"
-	# vim-core is needed for "xxd"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-
-	# ... otherwise system llvm/clang is used ...
-	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS /usr/lib/llvm/roc ):" -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:/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-4.0.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.0.0.ebuild
deleted file mode 100644
index 6326a7e4b20e..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-4.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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}-3.7.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-COMMON_DEPEND="sys-process/numactl
-	dev-libs/elfutils:=
-	>=sys-devel/llvm-roc-${PV}"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}
-	>=dev-libs/rocm-device-libs-${PV}"
-BDEPEND="app-editors/vim-core"
-	# vim-core is needed for "xxd"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-
-	# ... otherwise system llvm/clang is used ...
-	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS ${EPREFIX}/usr/lib/llvm/roc ):" -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-4.1.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.1.0.ebuild
deleted file mode 100644
index e91c230b519a..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-4.1.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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.1.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="debug"
-
-COMMON_DEPEND="sys-process/numactl
-	dev-libs/elfutils:=
-	>=sys-devel/llvm-roc-${PV}"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}
-	>=dev-libs/rocm-device-libs-${PV}"
-BDEPEND="app-editors/vim-core"
-	# vim-core is needed for "xxd"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-
-	# ... otherwise system llvm/clang is used ...
-	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS ${EPREFIX}/usr/lib/llvm/roc ):" -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
-}
-
-src_configure() {
-	use debug || local mycmakeargs=(-DCMAKE_CXX_FLAGS='-DNDEBUG')
-	cmake_src_configure
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-4.2.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.2.0.ebuild
deleted file mode 100644
index c9bc5602a203..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-4.2.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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.1.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-COMMON_DEPEND="sys-process/numactl
-	dev-libs/elfutils:="
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}
-	>=dev-libs/rocm-device-libs-${PV}"
-BDEPEND="app-editors/vim-core"
-	# vim-core is needed for "xxd"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-
-	# ... otherwise system llvm/clang is used ...
-	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS ${EPREFIX}/usr/lib/llvm/roc ):" -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-4.3.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild
deleted file mode 100644
index fc1b4b73bd0a..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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.1.0-cmake-install-paths.patch"
-	"${FILESDIR}/${PN}-4.3.0_no-aqlprofiler.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-COMMON_DEPEND="sys-process/numactl
-	dev-libs/elfutils:="
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}
-	>=dev-libs/rocm-device-libs-${PV}"
-BDEPEND="app-editors/vim-core"
-	# vim-core is needed for "xxd"
-
-src_prepare() {
-	# ... otherwise system llvm/clang is used ...
-	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS ${EPREFIX}/usr/lib/llvm/roc ):" -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-4.5.2.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.5.2.ebuild
deleted file mode 100644
index d5c28fbc1b76..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-4.5.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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.5.2-cmake-install-paths.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}"
-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 "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS ${EPREFIX}/usr/lib/llvm/roc ):" -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/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index dc0bb4136ecf..1ab087682203 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -1,17 +1,5 @@
-AUX roct-thunk-interface-4.1.0-append-flags.patch 1229 BLAKE2B 9901f0ee86b164e18c7ddd00bab50e84e7be133f0b52149a57a0f75039f91938ef3c7414235f1a821ae0181239e82688768289e32ee17a434211c5e139d3740e SHA512 3d145bc46282b17489886ad6fa3c720fd71b56f46aaf5b9c04de382109c01da7e356c1bec75e86e5ad3c5c315af7b81ae030e68993edb9b7af62487d640ad869
-DIST roct-thunk-interface-4.0.0.tar.gz 2694100 BLAKE2B 49ca128902335fc36d44b9e71d444a467bdd0b39ce0b487c70f1f68180fb4b564b10a65e26e41b71d5e66721c3086ec834aee2550246172965f2d611ce9a644a SHA512 cbb45c4372ce2620fce6ccbf94e8e7600256d12acf6721da9d22aeb619cec9d4e4e25354649b83fb322f8d369347c251ebb7242ff8fc3976cc3983de0d8e30a9
-DIST roct-thunk-interface-4.1.0.tar.gz 2697077 BLAKE2B 6d5d35c57d73c7d23fe28f438421372c1dcd51b1bcbf8720dfc993ce56a4afb3cd2c5d14185f4424436db4ce6d1d48dd5f802d0fc24ea1dd78ceb5cff7604103 SHA512 adef8c6c8f375d6d402c1066859fdb45f1e938578011fa0008ad242e1365d3672c5cb02a50f98b6f2d760269b4ef46b33a77f237521b76afe42ac883c71ecd86
-DIST roct-thunk-interface-4.2.0.tar.gz 3162877 BLAKE2B 48196c2334a5514c17a5b6ca122f0beaf964040f1705bd60532e4379a01d8d6a9b462a7f74916d80841caa9d3a57d5b6e2fb030a9556a1305b879036f9bcec5f SHA512 007cd64e33bada7707f340bffddf6eb9531b0bd5227a5da522c0ff4f0e2efe4a113fc50bf52da19d58fef73008af70a352aad8b41387b327f2ba19b54ede9646
-DIST roct-thunk-interface-4.3.0.tar.gz 3177655 BLAKE2B e3746bb361731484acb5da8c48246fa9ce6cce46919bc771e2670bc4694e09147b51b65274cc58d690e06ce6781aca54d67508625d9ffc1e30f42dbd69adabd5 SHA512 c0515784696464feef906d6ef4446c9bddb77b5abe62e982a7d75331a8b7fb84e94f12ebeaf2e128be28ab8f903bf6894cbf2302aa5ddee23eaf9b2cc807c872
-DIST roct-thunk-interface-4.5.2.tar.gz 3178434 BLAKE2B 3333b3416d1f7f26401a543ff5ef1b728a6efc38c5c9306d98cb03f034f8b0e10f961f9863192c23a6b7a70ff543e2d8abb60169a4a9a0c5992f2483e6f69db2 SHA512 6f51956df14532a3428f56a80479357c703c26589c68b054a340d751e34435211500c441fc90d7edbbb7c6c327a8ba71afafc8355c8c0e7a1cd45a9c9d0d99e6
 DIST roct-thunk-interface-5.0.2.tar.gz 3178727 BLAKE2B 9b8926ec18340a686f0499070dd4846fb9ba3eae2fed2d02615fbbee977c3417cb5815b54a19aed7623484e175702cb757e8f3ac30b8b9f04ce4cf0ce81b2cc5 SHA512 c78a4d22d6e09decfec8c710707bc89ca30d3deba9ee3123af83d530f1bf58cb3681206a8c2ad8a523ff45621b87701020cfce23bba4fd87b81791ee8f04619e
 DIST roct-thunk-interface-5.1.3.tar.gz 3178689 BLAKE2B c46af7bc60772beaa9a214a86a634290cfd7952589f70736c0c2544c0459eb4fdcc65030d897dbb67bfbaae545f529ac647397df3fcfeddeb5d5e05a283cfd6b SHA512 746a04e667ce242160d6e2519594fc93b205520dae28678859fbd40c3c641082aa6219c04c8e2b58289763a5244dd6336b56c2e2016ba671c5e5a6fb9ca5caea
-EBUILD roct-thunk-interface-4.0.0.ebuild 982 BLAKE2B c48fd4af78d9d0ba922049ded53f1e768e4e9781b85780575e33c316af2e82762869d5e1e184bf4cc92d2d08168bc1b3992e76482a15a82790c5822289a49679 SHA512 1c4bbf21b2cbfc453f4a9859c227a15eb92f31e580625f1fbdb19de2c7bde809aff347983464c8ab25cbf4b0efda8ac7bc64f52cac66bc183d3f3b893f3f8183
-EBUILD roct-thunk-interface-4.1.0.ebuild 1056 BLAKE2B 4e20e7086cb909f309899ba94ec5e58d9bd439d954a7f44301ccc36515dee99fdecb2b7e59afeeaf397a0923a9e3e5205b0684c85dd27cca98874e55af32db53 SHA512 1159c9431f4b16098642d32b4ec9d48002088c30bb070e8173528c66a188b443936803b0494dd22f63d078b20348d4ba466a98a145421d932451649bf6e61b73
-EBUILD roct-thunk-interface-4.2.0.ebuild 1056 BLAKE2B 4e20e7086cb909f309899ba94ec5e58d9bd439d954a7f44301ccc36515dee99fdecb2b7e59afeeaf397a0923a9e3e5205b0684c85dd27cca98874e55af32db53 SHA512 1159c9431f4b16098642d32b4ec9d48002088c30bb070e8173528c66a188b443936803b0494dd22f63d078b20348d4ba466a98a145421d932451649bf6e61b73
-EBUILD roct-thunk-interface-4.3.0.ebuild 982 BLAKE2B c48fd4af78d9d0ba922049ded53f1e768e4e9781b85780575e33c316af2e82762869d5e1e184bf4cc92d2d08168bc1b3992e76482a15a82790c5822289a49679 SHA512 1c4bbf21b2cbfc453f4a9859c227a15eb92f31e580625f1fbdb19de2c7bde809aff347983464c8ab25cbf4b0efda8ac7bc64f52cac66bc183d3f3b893f3f8183
-EBUILD roct-thunk-interface-4.5.2.ebuild 1107 BLAKE2B 2d5bc5e7e2cd317cb93ef743e4eaf3c99f4ee969879e0025f2b9525ac39ec57f259348bdf680f819f57948cec57e7fd66b46da5aa37c913509092f711dafc18e SHA512 c1b19d3a7763df634626e64ba1223a1da0e93a4bfb3ac9015cf934ef68c27724c28cba535dd155b74fbd84ba15127896eedb15a94d9cde42a414a15bc670cbf3
 EBUILD roct-thunk-interface-5.0.2.ebuild 1107 BLAKE2B c8d1aad9be55420235043628caa570cfa5f9164c6a3d20c7d90a6cac385ad2c886c44a89f2d9181742f9c284067b0d0b078fb2ea04e44ac9f1a145505f4b9971 SHA512 08bce5619f4e5e163b23928c0088e7f022d0f9f95bfba4b4e237a74ade30a327bf3cf954590f9d788ab7a16dd4f90ff53bd3e87011866af1d68a200bbeeceb7f
 EBUILD roct-thunk-interface-5.1.3.ebuild 1107 BLAKE2B c8d1aad9be55420235043628caa570cfa5f9164c6a3d20c7d90a6cac385ad2c886c44a89f2d9181742f9c284067b0d0b078fb2ea04e44ac9f1a145505f4b9971 SHA512 08bce5619f4e5e163b23928c0088e7f022d0f9f95bfba4b4e237a74ade30a327bf3cf954590f9d788ab7a16dd4f90ff53bd3e87011866af1d68a200bbeeceb7f
-EBUILD roct-thunk-interface-9999.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
 MISC metadata.xml 674 BLAKE2B ceb6cc04ddd9f957a765c89bfe83de382412c5d04bce87e3fa9c0fdfe72fa2d24e597aa47287488463fa34d85a91556d2b7ea073b19c341a48045c9e7f51f9f3 SHA512 8cb0feb4d6ea9d3de4a45a9be0de498b5ebb36a779af03e58f5c04593082e5bd618614c1daf2707f3bb1de019bf88292605669e2be48d9bede6e708c39aae7e2
diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-4.1.0-append-flags.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-4.1.0-append-flags.patch
deleted file mode 100644
index 2f5f1c674944..000000000000
--- a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-4.1.0-append-flags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a3a4d99..0015b0f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -99,17 +99,17 @@ set (HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS} -Wl,--enable-new-dtags -Wl,--versio
- ## Address Sanitize Flag
- if ( ${ADDRESS_SANITIZER} )
-     set ( HSAKMT_C_FLAGS "${HSAKMT_C_FLAGS}" -fsanitize=address )
--    set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS}" -fsanitize=address )
-+    set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS} -fsanitize=address ")
-     if ( BUILD_SHARED_LIBS )
--        set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS}" -shared-libsan )
-+        set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS} -shared-libsan ")
-     else ()
--        set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS}" -static-libsan )
-+        set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS} -static-libsan ")
-     endif ()
- else ()
-     if ( CMAKE_COMPILER_IS_GNUCC )
--        set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS}" -Wl,-no-undefined )
-+        set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS} -Wl,-no-undefined ")
-     else ()
--        set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS}" -Wl,-undefined,error )
-+        set ( HSAKMT_LINK_FLAGS "${HSAKMT_LINK_FLAGS} -Wl,-undefined,error ")
-     endif ()
- endif ()
- 
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-4.0.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-4.0.0.ebuild
deleted file mode 100644
index 3cbf10ed4cd6..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-4.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-4.1.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-4.1.0.ebuild
deleted file mode 100644
index 16e23a2d974c..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-4.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}"
-
-PATCHES=(
-	"${FILESDIR}/roct-thunk-interface-4.1.0-append-flags.patch"
-)
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-4.2.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-4.2.0.ebuild
deleted file mode 100644
index 16e23a2d974c..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-4.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}"
-
-PATCHES=(
-	"${FILESDIR}/roct-thunk-interface-4.1.0-append-flags.patch"
-)
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-4.3.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-4.3.0.ebuild
deleted file mode 100644
index 3cbf10ed4cd6..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-4.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-src_configure() {
-	local mycmakeargs=(
-		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-4.5.2.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-4.5.2.ebuild
deleted file mode 100644
index a141d6d4299a..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-4.5.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-9999.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
deleted file mode 100644
index ee5be506ed83..000000000000
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}"
-
-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>	2022-12-19 19:49:08 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-12-19 19:49:08 +0000
commit	f287ecad888abdeb38e617d0485de282cd6819db (patch)
tree	874d56500040734c4dbb9e437e0d5ed80a0a1886 /dev-libs
parent	844ae757702c53a56ee57056873a8204d256d47e (diff)