sys-devel/llvm-roc: drop versions

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

23 files changed, 0 insertions, 1728 deletions

diff --git a/sys-devel/llvm-roc/Manifest b/sys-devel/llvm-roc/Manifest
index 393d9f058670..b9b116396d77 100644
--- a/sys-devel/llvm-roc/Manifest
+++ b/sys-devel/llvm-roc/Manifest
@@ -1,12 +1 @@
-DIST llvm-rocm-ocl-3.10.0.tar.gz 123600166 BLAKE2B 9b69dab6c7d1a8dfe0d90c76b54446ec7f8ef6e59c74ad328208ac07dbf8836ae412dc5c32fdcbfc926a2488e81cd8afef71c3ebca6cd8ff745205028ab380d8 SHA512 3bb7dac13d89cadfb61a231564155f49021437b7c35eae8735b88ceae4a23b7950643f17e3bfebb0868621297202a04d41120d50ea52b6ad8980dabe9bc75509
-DIST llvm-rocm-ocl-3.7.0.tar.gz 116973132 BLAKE2B c1cc8a3b95292d726626d3cb59ec1b96549682bfcbec16030e47cf1318c6ea01bc76f3349f012ce4f1e4d8b9fe192c51a025c2d08cf593622c61fe7c61969ba6 SHA512 0626075bedb3898c96c0bb0be7a2aba4662050a1c738115f661bedc03d744ace7a4581b55c6325060740c13a0e50e72e09272bb02c1186c2c4a40fc9b961dcbe
-DIST llvm-rocm-ocl-3.8.0.tar.gz 117004300 BLAKE2B 13c3213f0fb951fb9d574e8f6d76bb6c632fecadfe93dbe68a9720baa22e35aa3269deef8b533c5a5ff50a2c1ee3dd7a1ea0fae4b8ab8573ec5bfc5ca5d04f4f SHA512 4eca387a132c9d1237ebec7c80319e99c80088766209d05a697d09890f4a82c56ba5f48a5c8c8749bb051c177bb5eab67e00405b04d3191681d0ac7cf1ae868c
-DIST llvm-rocm-ocl-3.9.0.tar.gz 123591368 BLAKE2B 54b44d705e7704921df1914bac6dc1da8e420f9383efb698a9cf6a339b653d71cad29aa077a9e24d6764ca81fb8dc55fa70abb0cfac004d40f7d811e20ec9945 SHA512 3404390506b33c1de1d05980fafb219692985f38b52d852e9a47ab94e57228caa25ccd0d0d69da656281de32c75e001f60cb9f22453e70fea7b39d065d4333af
-DIST llvm-rocm-ocl-4.0.0.tar.gz 123595983 BLAKE2B 69dd47a50a53cf7d8168f872778bcda0e028907c2341b165f40152bdf03b668ee6c209dc60fa1018dde2a946d891f15eb92a38cfbc12bb5798dd132c1ce79bf1 SHA512 2ac3d643e0bee72239089003cd2889711a7cd58dc588467fb0ca0a50bec264fda992aa2e3352d5210011a9dc1eea4dd9eacdc7d0c313cd69c7b491df126a4e4e
-DIST llvm-rocm-ocl-4.0.1.tar.gz 123608276 BLAKE2B dd5a4d6bc198c7fb6fdc2514cd8c4533a2df6ded7a574c9b4762cda3cb65498a464a0e78427db94db05b468a29ce78d3d8131ac7c6e42953fc503896732474e3 SHA512 d23dceaee2badf46cda27aa725bce5b82bab2fba7d1c2220fedb4795eee455de5077b4ff7299ecd6850eeb0bbdb131ea12a699357f373aef818758d845550f04
-DIST llvm-rocm-ocl-4.1.0.tar.gz 128913932 BLAKE2B 15a041ec7b9fec91e409c8ab98ff88f2d15ce58822aa8a77a26ff21416378a4a77a5904fce4e26c5447653da4ec2dbbb5bfec4ae70c72e8e64b2a5f5986ffb92 SHA512 8576e5a43754a9587613f166dc6cad18890812f07bfa55e563ab3de150b6f01ae1b5515aaaf4eef238a7f79e87890533ce791ef07528e4557ea8290c2642ebd3
-DIST llvm-rocm-ocl-4.1.1.tar.gz 128914019 BLAKE2B 9806d1da497e9d9864fd015fc92f5e2d8a6077315d96538064357a38347bc9180948c65cdca9e29574b40f8df62c0660762731564822ac9e8b5364bebf016e43 SHA512 0e4c6b9b0c0330d58616f22d8ec6ebdd6c83aef9ce9968765ac56c022bcd76cba8af5a6cdfb47ed560b33cd67832ac5b026502357af6caec4ab699f1443163fd
-DIST llvm-rocm-ocl-4.2.0.tar.gz 132337711 BLAKE2B f08781f881f2853cd551828ef9190c1253e33ca1bfb13aac790b6484838fe5481be9519609ea9cf4bc09a6c8631c54a567123dfe97c25498c51c464d215049de SHA512 694c37c707c84d18cddb92054d8d59e1eea82c9c9928d0111992cbae1421d6bb614a0889891993b444a821c35fa6e91c801ac8555761c2cd0803f89981475952
-DIST llvm-rocm-ocl-4.3.0.tar.gz 134152148 BLAKE2B aaadb75f0b2f72d3c4dca4b375a38b2806491b854d45f6f95bc398c4b7685fccbc4e6df86869c200f08ced5ddb540344ace2402819cdd3c27c5167a71a78bb3b SHA512 4f85f06d5331770b8697bbe62776579ed02016d899ed9c5328d5953fc5992a0996f7934e7417d6062e77a317d242295803fbeab04b0428d5f257cecd4c25c0cd
-DIST llvm-rocm-ocl-4.5.2.tar.gz 137370130 BLAKE2B f91823b9f0a3b78062eb5e9aa564a31752ab377bebc613892938d4aa6f8e54eb2b00123d0e60e5e703cd41d380cedac07234f024e3812b8df71519d0c7c32625 SHA512 fa4147e73fd37db6735e29cb99c5a7da4edcd1f51af30574d35a359b483aba4b3d4bdefa0845d3991fc0d0758b3e403e7e252033712cc4a8c038d07d9539c18f
 DIST llvm-rocm-ocl-5.0.2.tar.gz 150281451 BLAKE2B e4363266e05e13af761dd6f440dbfc30905f219e428fa3b2595800ba0c80c97cd7e2615d68acd9aea4fc66454ee8a3ff7a52a60d3aed4e93af5007050277e5fe SHA512 9be9f1a0ad1a0089aa27858174ce37c7a02902b6dedc338382f42ed0567823cc4bb11b68c130470590c16d4d92ab2735a06c27d248237ffa2d394253328f6705
diff --git a/sys-devel/llvm-roc/files/llvm-roc-3.0.0-add_libraries.patch b/sys-devel/llvm-roc/files/llvm-roc-3.0.0-add_libraries.patch
deleted file mode 100644
index 120ab819f5b4..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-3.0.0-add_libraries.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur a/clang/lib/Basic/CMakeLists.txt b/clang/lib/Basic/CMakeLists.txt
---- a/clang/lib/Basic/CMakeLists.txt	2019-12-28 07:42:49.119055933 +0100
-+++ b/clang/lib/Basic/CMakeLists.txt	2019-12-28 07:42:13.265056070 +0100
-@@ -2,6 +2,7 @@
-   Core
-   MC
-   Support
-+  Option
-   )
- 
- find_first_existing_vc_file("${LLVM_MAIN_SRC_DIR}" llvm_vc)
-diff -Naur a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt
---- a/clang/lib/Driver/CMakeLists.txt	2019-12-28 07:41:39.521056199 +0100
-+++ b/clang/lib/Driver/CMakeLists.txt	2019-12-28 07:40:23.998056487 +0100
-@@ -79,4 +79,5 @@
-   LINK_LIBS
-   clangBasic
-   ${system_libs}
-+  pthread
-   )
diff --git a/sys-devel/llvm-roc/files/llvm-roc-3.7.0-current_pos.patch b/sys-devel/llvm-roc/files/llvm-roc-3.7.0-current_pos.patch
deleted file mode 100644
index a0d3c1df6d99..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-3.7.0-current_pos.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.llvm.org/show_bug.cgi?id=43235
-
-diff --git a/llvm/include/llvm/Support/raw_ostream.h b/llvm/include/llvm/Support/raw_ostream.h
-index 705f1790b1d..a0314b2c46a 100644
---- a/include/llvm/Support/raw_ostream.h
-+++ b/include/llvm/Support/raw_ostream.h
-@@ -507,9 +507,7 @@ class raw_string_ostream : public raw_ostream {
-   /// See raw_ostream::write_impl.
-   void write_impl(const char *Ptr, size_t Size) override;
- 
--  /// Return the current position within the stream, not counting the bytes
--  /// currently in the buffer.
--  uint64_t current_pos() const override { return OS.size(); }
-+  uint64_t current_pos() const override;
- 
- public:
-   explicit raw_string_ostream(std::string &O) : OS(O) {}
-diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
-index 4bb315f824a..742e2aced39 100644
---- a/lib/Support/raw_ostream.cpp
-+++ b/lib/Support/raw_ostream.cpp
-@@ -895,6 +895,10 @@ raw_ostream &llvm::nulls() {
- //  raw_string_ostream
- //===----------------------------------------------------------------------===//
- 
-+/// Return the current position within the stream, not counting the bytes
-+/// currently in the buffer.
-+uint64_t raw_string_ostream::current_pos() const { return OS.size(); }
-+
- raw_string_ostream::~raw_string_ostream() {
-   flush();
- }
diff --git a/sys-devel/llvm-roc/files/llvm-roc-3.9.0-tensorflow.patch b/sys-devel/llvm-roc/files/llvm-roc-3.9.0-tensorflow.patch
deleted file mode 100644
index 3e1124457ad3..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-3.9.0-tensorflow.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- llvm-project-rocm-3.9.0.orig/CMakeLists.txt	2020-11-12 22:03:09.902293395 +0100
-+++ llvm-project-rocm-3.9.0/CMakeLists.txt	2020-11-12 22:07:28.185294853 +0100
-@@ -824,6 +824,11 @@
-   ${LLVM_INCLUDE_DIR}/llvm/Config/Targets.def
-   )
- 
-+# They are not referenced. See set_output_directory().
-+set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/bin )
-+set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} )
-+set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} )
-+
- # For up-to-date instructions for installing the Tensorflow dependency, refer to
- # the bot setup script: https://github.com/google/ml-compiler-opt/blob/master/buildbot/buildbot_init.sh
- # In this case, the latest C API library is available for download from
-@@ -832,18 +837,13 @@
- # LLVM_HAVE_TF_API, through llvm-config.h, so that a user of the LLVM library may
- # also leverage the dependency.
- set(TENSORFLOW_C_LIB_PATH "" CACHE PATH "Path to TensorFlow C library install")
--find_library(tensorflow_c_api tensorflow PATHS ${TENSORFLOW_C_LIB_PATH}/lib)
- 
--if (tensorflow_c_api)
-+if (TENSORFLOW_C_LIB_PATH)
-+  find_library(tensorflow_c_api tensorflow PATHS ${TENSORFLOW_C_LIB_PATH}/lib NO_DEFAULT_PATH REQUIRED)
-   set(LLVM_HAVE_TF_API "ON" CACHE BOOL "Full Tensorflow API available")
-   include_directories(${TENSORFLOW_C_LIB_PATH}/include)
- endif()
- 
--# They are not referenced. See set_output_directory().
--set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/bin )
--set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} )
--set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} )
--
- # For up-to-date instructions for installing the Tensorflow dependency, refer to
- # the bot setup script: https://github.com/google/ml-compiler-opt/blob/master/buildbot/buildbot_init.sh
- # Specifically, assuming python3 is installed:
diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.0.0-hip-location.patch b/sys-devel/llvm-roc/files/llvm-roc-4.0.0-hip-location.patch
deleted file mode 100644
index 225adc709666..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-4.0.0-hip-location.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-replace hardcoded hip finder with Gentoo paths.
-
-It is not necessary to check HIP runtime each time.
-
-Author: Benda Xu <heroxbd@gentoo.org>
-
-Index: llvm-project-rocm-4.0.0/clang/lib/Driver/ToolChains/AMDGPU.cpp
-===================================================================
---- llvm-project-rocm-4.0.0.orig/clang/lib/Driver/ToolChains/AMDGPU.cpp
-+++ llvm-project-rocm-4.0.0/clang/lib/Driver/ToolChains/AMDGPU.cpp
-@@ -116,37 +116,8 @@ RocmInstallationDetector::getInstallatio
-     return Candidates;
-   }
- 
--  // Try to find relative to the compiler binary.
--  const char *InstallDir = D.getInstalledDir();
-+  Candidates.emplace_back(D.SysRoot + "/usr", /*StrictChecking=*/true);
- 
--  // Check both a normal Unix prefix position of the clang binary, as well as
--  // the Windows-esque layout the ROCm packages use with the host architecture
--  // subdirectory of bin.
--
--  // Strip off directory (usually bin)
--  StringRef ParentDir = llvm::sys::path::parent_path(InstallDir);
--  StringRef ParentName = llvm::sys::path::filename(ParentDir);
--
--  // Some builds use bin/{host arch}, so go up again.
--  if (ParentName == "bin") {
--    ParentDir = llvm::sys::path::parent_path(ParentDir);
--    ParentName = llvm::sys::path::filename(ParentDir);
--  }
--
--  // Some versions of the rocm llvm package install to /opt/rocm/llvm/bin
--  if (ParentName == "llvm")
--    ParentDir = llvm::sys::path::parent_path(ParentDir);
--
--  Candidates.emplace_back(ParentDir.str(), /*StrictChecking=*/true);
--
--  // Device library may be installed in clang resource directory.
--  Candidates.emplace_back(D.ResourceDir, /*StrictChecking=*/true);
--
--  Candidates.emplace_back(D.SysRoot + "/opt/rocm", /*StrictChecking=*/true);
--  if (ParentName.startswith("aomp")) {
--    // Some versions of the aomp package install to /opt/rocm/aomp/bin
--    Candidates.emplace_back(ParentDir.str());
--  }
-   return Candidates;
- }
- 
-@@ -273,33 +244,7 @@ void RocmInstallationDetector::detectDev
- }
- 
- void RocmInstallationDetector::detectHIPRuntime() {
--  auto Candidates = getInstallationPathCandidates();
--  auto &FS = D.getVFS();
--
--  for (const auto &Candidate : Candidates) {
--    InstallPath = Candidate.Path;
--    if (InstallPath.empty() || !FS.exists(InstallPath))
--      continue;
--
--    BinPath = InstallPath;
--    llvm::sys::path::append(BinPath, "bin");
--    IncludePath = InstallPath;
--    llvm::sys::path::append(IncludePath, "include");
--    LibPath = InstallPath;
--    llvm::sys::path::append(LibPath, "lib");
--
--    llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> VersionFile =
--        FS.getBufferForFile(BinPath + "/.hipVersion");
--    if (!VersionFile && Candidate.StrictChecking)
--      continue;
--
--    if (HIPVersionArg.empty() && VersionFile)
--      ParseHIPVersionFile((*VersionFile)->getBuffer());
--
--    HasHIPRuntime = true;
--    return;
--  }
--  HasHIPRuntime = false;
-+  HasHIPRuntime = true;
- }
- 
- void RocmInstallationDetector::print(raw_ostream &OS) const {
diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.1.0-fix-missing-include.patch b/sys-devel/llvm-roc/files/llvm-roc-4.1.0-fix-missing-include.patch
deleted file mode 100644
index 4914ba2e7f98..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-4.1.0-fix-missing-include.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From b498303066a63a203d24f739b2d2e0e56dca70d1 Mon Sep 17 00:00:00 2001
-From: serge-sans-paille <sguelton@redhat.com>
-Date: Tue, 10 Nov 2020 14:55:25 +0100
-Subject: [PATCH] [nfc] Fix missing include
-
----
- llvm/utils/benchmark/src/benchmark_register.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/utils/benchmark/src/benchmark_register.h b/llvm/utils/benchmark/src/benchmark_register.h
-index 0705e219f2fa2..4caa5ad4da079 100644
---- a/utils/benchmark/src/benchmark_register.h
-+++ b/utils/benchmark/src/benchmark_register.h
-@@ -1,6 +1,7 @@
- #ifndef BENCHMARK_REGISTER_H
- #define BENCHMARK_REGISTER_H
- 
-+#include <limits>
- #include <vector>
- 
- #include "check.h"
diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.2.0-add_Object.patch b/sys-devel/llvm-roc/files/llvm-roc-4.2.0-add_Object.patch
deleted file mode 100644
index da21ab2fc85a..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-4.2.0-add_Object.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --color -uprN orig/lib/Target/AMDGPU/Disassembler/CMakeLists.txt llvm/lib/Target/AMDGPU/Disassembler/CMakeLists.txt
---- orig/lib/Target/AMDGPU/Disassembler/CMakeLists.txt	2021-06-14 11:57:54.222796911 +0800
-+++ llvm/lib/Target/AMDGPU/Disassembler/CMakeLists.txt	2021-06-14 11:58:35.206796875 +0800
-@@ -11,6 +11,7 @@ add_llvm_component_library(LLVMAMDGPUDis
-   MC
-   MCDisassembler
-   Support
-+  Object
- 
-   ADD_TO_COMPONENT
-   AMDGPU
diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.2.0-cyclades.patch b/sys-devel/llvm-roc/files/llvm-roc-4.2.0-cyclades.patch
deleted file mode 100644
index 629ede5bbc76..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-4.2.0-cyclades.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-https://github.com/RadeonOpenCompute/llvm-project/commit/68d5235cb58f988c71b403334cd9482d663841ab.patch
-https://bugs.gentoo.org/800695
-Differential Revision: https://reviews.llvm.org/D102059
-
-From 68d5235cb58f988c71b403334cd9482d663841ab Mon Sep 17 00:00:00 2001
-From: Tamar Christina <tamar.christina@arm.com>
-Date: Thu, 20 May 2021 18:55:11 +0100
-Subject: [PATCH] libsanitizer: Remove cyclades inclusion in sanitizer
---- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-+++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-@@ -370,15 +370,6 @@ static void ioctl_table_fill() {
- 
- #if SANITIZER_GLIBC
-   // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
--  _(CYGETDEFTHRESH, WRITE, sizeof(int));
--  _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
--  _(CYGETMON, WRITE, struct_cyclades_monitor_sz);
--  _(CYGETTHRESH, WRITE, sizeof(int));
--  _(CYGETTIMEOUT, WRITE, sizeof(int));
--  _(CYSETDEFTHRESH, NONE, 0);
--  _(CYSETDEFTIMEOUT, NONE, 0);
--  _(CYSETTHRESH, NONE, 0);
--  _(CYSETTIMEOUT, NONE, 0);
-   _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz);
-   _(EQL_ENSLAVE, WRITE, struct_ifreq_sz);
-   _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz);
---- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
-+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
-@@ -143,7 +143,6 @@ typedef struct user_fpregs elf_fpregset_t;
- # include <sys/procfs.h>
- #endif
- #include <sys/user.h>
--#include <linux/cyclades.h>
- #include <linux/if_eql.h>
- #include <linux/if_plip.h>
- #include <linux/lp.h>
-@@ -460,7 +459,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- 
- #if SANITIZER_GLIBC
-   unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
--  unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
- #if EV_VERSION > (0x010000)
-   unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry);
- #else
-@@ -824,15 +822,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
- #endif // SANITIZER_LINUX
- 
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
--  unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
--  unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
--  unsigned IOCTL_CYGETMON = CYGETMON;
--  unsigned IOCTL_CYGETTHRESH = CYGETTHRESH;
--  unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT;
--  unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH;
--  unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT;
--  unsigned IOCTL_CYSETTHRESH = CYSETTHRESH;
--  unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT;
-   unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE;
-   unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE;
-   unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG;
---- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
-+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
-@@ -983,7 +983,6 @@ extern unsigned struct_vt_mode_sz;
- 
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
- extern unsigned struct_ax25_parms_struct_sz;
--extern unsigned struct_cyclades_monitor_sz;
- extern unsigned struct_input_keymap_entry_sz;
- extern unsigned struct_ipx_config_data_sz;
- extern unsigned struct_kbdiacrs_sz;
-@@ -1328,15 +1327,6 @@ extern unsigned IOCTL_VT_WAITACTIVE;
- #endif  // SANITIZER_LINUX
- 
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
--extern unsigned IOCTL_CYGETDEFTHRESH;
--extern unsigned IOCTL_CYGETDEFTIMEOUT;
--extern unsigned IOCTL_CYGETMON;
--extern unsigned IOCTL_CYGETTHRESH;
--extern unsigned IOCTL_CYGETTIMEOUT;
--extern unsigned IOCTL_CYSETDEFTHRESH;
--extern unsigned IOCTL_CYSETDEFTIMEOUT;
--extern unsigned IOCTL_CYSETTHRESH;
--extern unsigned IOCTL_CYSETTIMEOUT;
- extern unsigned IOCTL_EQL_EMANCIPATE;
- extern unsigned IOCTL_EQL_ENSLAVE;
- extern unsigned IOCTL_EQL_GETMASTRCFG;
diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.3.0-hip-location.patch b/sys-devel/llvm-roc/files/llvm-roc-4.3.0-hip-location.patch
deleted file mode 100644
index f3d22b996915..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-4.3.0-hip-location.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-replace hardcoded hip finder with Gentoo paths.
-
-It is not necessary to check HIP runtime each time.
-
-Author: Benda Xu <heroxbd@gentoo.org>
-Author: Yiyang Wu <xgreenlandforwyy@gmail.com>
-
---- orig/clang/lib/Driver/ToolChains/AMDGPU.cpp
-+++ llvm-project-rocm-4.3.0/clang/lib/Driver/ToolChains/AMDGPU.cpp
-@@ -165,133 +165,8 @@ bool RocmInstallationDetector::parseHIPV
- /// cached and populated only once.
- const SmallVectorImpl<RocmInstallationDetector::Candidate> &
- RocmInstallationDetector::getInstallationPathCandidates() {
--
--  // Return the cached candidate list if it has already been populated.
--  if (!ROCmSearchDirs.empty())
--    return ROCmSearchDirs;
--
--  auto DoPrintROCmSearchDirs = [&]() {
--    if (PrintROCmSearchDirs)
--      for (auto Cand : ROCmSearchDirs) {
--        llvm::errs() << "ROCm installation search path";
--        if (Cand.isSPACK())
--          llvm::errs() << " (Spack " << Cand.SPACKReleaseStr << ")";
--        llvm::errs() << ": " << Cand.Path << '\n';
--      }
--  };
--
--  // For candidate specified by --rocm-path we do not do strict check, i.e.,
--  // checking existence of HIP version file and device library files.
--  if (!RocmPathArg.empty()) {
--    ROCmSearchDirs.emplace_back(RocmPathArg.str());
--    DoPrintROCmSearchDirs();
--    return ROCmSearchDirs;
--  } else if (const char *RocmPathEnv = ::getenv("ROCM_PATH")) {
--    if (!StringRef(RocmPathEnv).empty()) {
--      ROCmSearchDirs.emplace_back(RocmPathEnv);
--      DoPrintROCmSearchDirs();
--      return ROCmSearchDirs;
--    }
--  }
--
--  // Try to find relative to the compiler binary.
--  const char *InstallDir = D.getInstalledDir();
--
--  // Check both a normal Unix prefix position of the clang binary, as well as
--  // the Windows-esque layout the ROCm packages use with the host architecture
--  // subdirectory of bin.
--  auto DeduceROCmPath = [](StringRef ClangPath) {
--    // Strip off directory (usually bin)
--    StringRef ParentDir = llvm::sys::path::parent_path(ClangPath);
--    StringRef ParentName = llvm::sys::path::filename(ParentDir);
--
--    // Some builds use bin/{host arch}, so go up again.
--    if (ParentName == "bin") {
--      ParentDir = llvm::sys::path::parent_path(ParentDir);
--      ParentName = llvm::sys::path::filename(ParentDir);
--    }
--
--    // Detect ROCm packages built with SPACK.
--    // clang is installed at
--    // <rocm_root>/llvm-amdgpu-<rocm_release_string>-<hash>/bin directory.
--    // We only consider the parent directory of llvm-amdgpu package as ROCm
--    // installation candidate for SPACK.
--    if (ParentName.startswith("llvm-amdgpu-")) {
--      auto SPACKPostfix =
--          ParentName.drop_front(strlen("llvm-amdgpu-")).split('-');
--      auto SPACKReleaseStr = SPACKPostfix.first;
--      if (!SPACKReleaseStr.empty()) {
--        ParentDir = llvm::sys::path::parent_path(ParentDir);
--        return Candidate(ParentDir.str(), /*StrictChecking=*/true,
--                         SPACKReleaseStr);
--      }
--    }
--
--    // Some versions of the rocm llvm package install to /opt/rocm/llvm/bin
--    // Some versions of the aomp package install to /opt/rocm/aomp/bin
--    if (ParentName == "llvm" || ParentName.startswith("aomp"))
--      ParentDir = llvm::sys::path::parent_path(ParentDir);
--
--    return Candidate(ParentDir.str(), /*StrictChecking=*/true);
--  };
--
--  // Deduce ROCm path by the path used to invoke clang. Do not resolve symbolic
--  // link of clang itself.
--  ROCmSearchDirs.emplace_back(DeduceROCmPath(InstallDir));
--
--  // Deduce ROCm path by the real path of the invoked clang, resolving symbolic
--  // link of clang itself.
--  llvm::SmallString<256> RealClangPath;
--  llvm::sys::fs::real_path(D.getClangProgramPath(), RealClangPath);
--  auto ParentPath = llvm::sys::path::parent_path(RealClangPath);
--  if (ParentPath != InstallDir)
--    ROCmSearchDirs.emplace_back(DeduceROCmPath(ParentPath));
--
--  // Device library may be installed in clang resource directory.
--  ROCmSearchDirs.emplace_back(D.ResourceDir,
--                              /*StrictChecking=*/true);
--
--  ROCmSearchDirs.emplace_back(D.SysRoot + "/opt/rocm",
--                              /*StrictChecking=*/true);
--
--  // Find the latest /opt/rocm-{release} directory.
--  std::error_code EC;
--  std::string LatestROCm;
--  llvm::VersionTuple LatestVer;
--  // Get ROCm version from ROCm directory name.
--  auto GetROCmVersion = [](StringRef DirName) {
--    llvm::VersionTuple V;
--    std::string VerStr = DirName.drop_front(strlen("rocm-")).str();
--    // The ROCm directory name follows the format of
--    // rocm-{major}.{minor}.{subMinor}[-{build}]
--    std::replace(VerStr.begin(), VerStr.end(), '-', '.');
--    V.tryParse(VerStr);
--    return V;
--  };
--  for (llvm::vfs::directory_iterator
--           File = D.getVFS().dir_begin(D.SysRoot + "/opt", EC),
--           FileEnd;
--       File != FileEnd && !EC; File.increment(EC)) {
--    llvm::StringRef FileName = llvm::sys::path::filename(File->path());
--    if (!FileName.startswith("rocm-"))
--      continue;
--    if (LatestROCm.empty()) {
--      LatestROCm = FileName.str();
--      LatestVer = GetROCmVersion(LatestROCm);
--      continue;
--    }
--    auto Ver = GetROCmVersion(FileName);
--    if (LatestVer < Ver) {
--      LatestROCm = FileName.str();
--      LatestVer = Ver;
--    }
--  }
--  if (!LatestROCm.empty())
--    ROCmSearchDirs.emplace_back(D.SysRoot + "/opt/" + LatestROCm,
--                                /*StrictChecking=*/true);
--
--  DoPrintROCmSearchDirs();
--  return ROCmSearchDirs;
-+	ROCmSearchDirs.emplace_back(D.SysRoot + "/usr", /*StrictChecking=*/true);
-+	return ROCmSearchDirs;
- }
- 
- RocmInstallationDetector::RocmInstallationDetector(
-@@ -397,7 +272,7 @@ void RocmInstallationDetector::detectDev
-     // - ${ROCM_ROOT}/lib/bitcode/*
-     // so try to detect these layouts.
-     static constexpr std::array<const char *, 2> SubDirsList[] = {
--        {"amdgcn", "bitcode"},
-+        {"lib/amdgcn", "bitcode"},
-         {"lib", ""},
-         {"lib", "bitcode"},
-     };
-@@ -423,42 +298,7 @@ void RocmInstallationDetector::detectDev
- }
- 
- void RocmInstallationDetector::detectHIPRuntime() {
--  SmallVector<Candidate, 4> HIPSearchDirs;
--  if (!HIPPathArg.empty())
--    HIPSearchDirs.emplace_back(HIPPathArg.str(), /*StrictChecking=*/true);
--  else
--    HIPSearchDirs.append(getInstallationPathCandidates());
--  auto &FS = D.getVFS();
--
--  for (const auto &Candidate : HIPSearchDirs) {
--    InstallPath = Candidate.Path;
--    if (InstallPath.empty() || !FS.exists(InstallPath))
--      continue;
--    // HIP runtime built by SPACK is installed to
--    // <rocm_root>/hip-<rocm_release_string>-<hash> directory.
--    auto SPACKPath = findSPACKPackage(Candidate, "hip");
--    InstallPath = SPACKPath.empty() ? InstallPath : SPACKPath;
--
--    BinPath = InstallPath;
--    llvm::sys::path::append(BinPath, "bin");
--    IncludePath = InstallPath;
--    llvm::sys::path::append(IncludePath, "include");
--    LibPath = InstallPath;
--    llvm::sys::path::append(LibPath, "lib");
--
--    llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> VersionFile =
--        FS.getBufferForFile(BinPath + "/.hipVersion");
--    if (!VersionFile && Candidate.StrictChecking)
--      continue;
--
--    if (HIPVersionArg.empty() && VersionFile)
--      if (parseHIPVersionFile((*VersionFile)->getBuffer()))
--        continue;
--
--    HasHIPRuntime = true;
--    return;
--  }
--  HasHIPRuntime = false;
-+  HasHIPRuntime = true;
- }
- 
- void RocmInstallationDetector::print(raw_ostream &OS) const {
diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.5.2-add_libraries.patch b/sys-devel/llvm-roc/files/llvm-roc-4.5.2-add_libraries.patch
deleted file mode 100644
index e2fe9282d837..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-4.5.2-add_libraries.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur a/clang/lib/Basic/CMakeLists.txt b/clang/lib/Basic/CMakeLists.txt
---- a/clang/lib/Basic/CMakeLists.txt	2019-12-28 07:42:49.119055933 +0100
-+++ b/clang/lib/Basic/CMakeLists.txt	2019-12-28 07:42:13.265056070 +0100
-@@ -2,6 +2,7 @@
-   Core
-   MC
-   Support
-+  Option
-   )
- 
- find_first_existing_vc_file("${LLVM_MAIN_SRC_DIR}" llvm_vc)
diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.5.2-hip-location.patch b/sys-devel/llvm-roc/files/llvm-roc-4.5.2-hip-location.patch
deleted file mode 100644
index f6f60cfb1b0f..000000000000
--- a/sys-devel/llvm-roc/files/llvm-roc-4.5.2-hip-location.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-replace hardcoded hip finder with Gentoo paths.
-
-It is not necessary to check HIP runtime each time.
-
-Author: Benda Xu <heroxbd@gentoo.org>
-Author: Yiyang Wu <xgreenlandforwyy@gmail.com>
-
---- orig/clang/lib/Driver/ToolChains/AMDGPU.cpp
-+++ llvm-project-rocm-4.3.0/clang/lib/Driver/ToolChains/AMDGPU.cpp
-@@ -165,133 +165,7 @@
- /// cached and populated only once.
- const SmallVectorImpl<RocmInstallationDetector::Candidate> &
- RocmInstallationDetector::getInstallationPathCandidates() {
--
--  // Return the cached candidate list if it has already been populated.
--  if (!ROCmSearchDirs.empty())
--    return ROCmSearchDirs;
--
--  auto DoPrintROCmSearchDirs = [&]() {
--    if (PrintROCmSearchDirs)
--      for (auto Cand : ROCmSearchDirs) {
--        llvm::errs() << "ROCm installation search path";
--        if (Cand.isSPACK())
--          llvm::errs() << " (Spack " << Cand.SPACKReleaseStr << ")";
--        llvm::errs() << ": " << Cand.Path << '\n';
--      }
--  };
--
--  // For candidate specified by --rocm-path we do not do strict check, i.e.,
--  // checking existence of HIP version file and device library files.
--  if (!RocmPathArg.empty()) {
--    ROCmSearchDirs.emplace_back(RocmPathArg.str());
--    DoPrintROCmSearchDirs();
--    return ROCmSearchDirs;
--  } else if (const char *RocmPathEnv = ::getenv("ROCM_PATH")) {
--    if (!StringRef(RocmPathEnv).empty()) {
--      ROCmSearchDirs.emplace_back(RocmPathEnv);
--      DoPrintROCmSearchDirs();
--      return ROCmSearchDirs;
--    }
--  }
--
--  // Try to find relative to the compiler binary.
--  const char *InstallDir = D.getInstalledDir();
--
--  // Check both a normal Unix prefix position of the clang binary, as well as
--  // the Windows-esque layout the ROCm packages use with the host architecture
--  // subdirectory of bin.
--  auto DeduceROCmPath = [](StringRef ClangPath) {
--    // Strip off directory (usually bin)
--    StringRef ParentDir = llvm::sys::path::parent_path(ClangPath);
--    StringRef ParentName = llvm::sys::path::filename(ParentDir);
--
--    // Some builds use bin/{host arch}, so go up again.
--    if (ParentName == "bin") {
--      ParentDir = llvm::sys::path::parent_path(ParentDir);
--      ParentName = llvm::sys::path::filename(ParentDir);
--    }
--
--    // Detect ROCm packages built with SPACK.
--    // clang is installed at
--    // <rocm_root>/llvm-amdgpu-<rocm_release_string>-<hash>/bin directory.
--    // We only consider the parent directory of llvm-amdgpu package as ROCm
--    // installation candidate for SPACK.
--    if (ParentName.startswith("llvm-amdgpu-")) {
--      auto SPACKPostfix =
--          ParentName.drop_front(strlen("llvm-amdgpu-")).split('-');
--      auto SPACKReleaseStr = SPACKPostfix.first;
--      if (!SPACKReleaseStr.empty()) {
--        ParentDir = llvm::sys::path::parent_path(ParentDir);
--        return Candidate(ParentDir.str(), /*StrictChecking=*/true,
--                         SPACKReleaseStr);
--      }
--    }
--
--    // Some versions of the rocm llvm package install to /opt/rocm/llvm/bin
--    // Some versions of the aomp package install to /opt/rocm/aomp/bin
--    if (ParentName == "llvm" || ParentName.startswith("aomp"))
--      ParentDir = llvm::sys::path::parent_path(ParentDir);
--    // Some versions of the aomp package install to /opt/rocm/aomp/bin
--    // and it seems ParentDir is already pointing to correct place.
--    return Candidate(ParentDir.str(), /*StrictChecking=*/true);
--  };
--
--  // Deduce ROCm path by the path used to invoke clang. Do not resolve symbolic
--  // link of clang itself.
--  ROCmSearchDirs.emplace_back(DeduceROCmPath(InstallDir));
--
--  // Deduce ROCm path by the real path of the invoked clang, resolving symbolic
--  // link of clang itself.
--  llvm::SmallString<256> RealClangPath;
--  llvm::sys::fs::real_path(D.getClangProgramPath(), RealClangPath);
--  auto ParentPath = llvm::sys::path::parent_path(RealClangPath);
--  if (ParentPath != InstallDir)
--    ROCmSearchDirs.emplace_back(DeduceROCmPath(ParentPath));
--
--  // Device library may be installed in clang resource directory.
--  ROCmSearchDirs.emplace_back(D.ResourceDir,
--                              /*StrictChecking=*/true);
--
--  ROCmSearchDirs.emplace_back(D.SysRoot + "/opt/rocm",
--                              /*StrictChecking=*/true);
--
--  // Find the latest /opt/rocm-{release} directory.
--  std::error_code EC;
--  std::string LatestROCm;
--  llvm::VersionTuple LatestVer;
--  // Get ROCm version from ROCm directory name.
--  auto GetROCmVersion = [](StringRef DirName) {
--    llvm::VersionTuple V;
--    std::string VerStr = DirName.drop_front(strlen("rocm-")).str();
--    // The ROCm directory name follows the format of
--    // rocm-{major}.{minor}.{subMinor}[-{build}]
--    std::replace(VerStr.begin(), VerStr.end(), '-', '.');
--    V.tryParse(VerStr);
--    return V;
--  };
--  for (llvm::vfs::directory_iterator
--           File = D.getVFS().dir_begin(D.SysRoot + "/opt", EC),
--           FileEnd;
--       File != FileEnd && !EC; File.increment(EC)) {
--    llvm::StringRef FileName = llvm::sys::path::filename(File->path());
--    if (!FileName.startswith("rocm-"))
--      continue;
--    if (LatestROCm.empty()) {
--      LatestROCm = FileName.str();
--      LatestVer = GetROCmVersion(LatestROCm);
--      continue;
--    }
--    auto Ver = GetROCmVersion(FileName);
--    if (LatestVer < Ver) {
--      LatestROCm = FileName.str();
--      LatestVer = Ver;
--    }
--  }
--  if (!LatestROCm.empty())
--    ROCmSearchDirs.emplace_back(D.SysRoot + "/opt/" + LatestROCm,
--                                /*StrictChecking=*/true);
--
--  DoPrintROCmSearchDirs();
-+  ROCmSearchDirs.emplace_back(D.SysRoot + "/usr", /*StrictChecking=*/true);
-   return ROCmSearchDirs;
- }
- 
-@@ -397,7 +272,7 @@ void RocmInstallationDetector::detectDev
-     // - ${ROCM_ROOT}/lib/bitcode/*
-     // so try to detect these layouts.
-     static constexpr std::array<const char *, 2> SubDirsList[] = {
--        {"amdgcn", "bitcode"},
-+        {"lib/amdgcn", "bitcode"},
-         {"lib", ""},
-         {"lib", "bitcode"},
-     };
-@@ -424,42 +298,7 @@
- }
- 
- void RocmInstallationDetector::detectHIPRuntime() {
--  SmallVector<Candidate, 4> HIPSearchDirs;
--  if (!HIPPathArg.empty())
--    HIPSearchDirs.emplace_back(HIPPathArg.str(), /*StrictChecking=*/true);
--  else
--    HIPSearchDirs.append(getInstallationPathCandidates());
--  auto &FS = D.getVFS();
--
--  for (const auto &Candidate : HIPSearchDirs) {
--    InstallPath = Candidate.Path;
--    if (InstallPath.empty() || !FS.exists(InstallPath))
--      continue;
--    // HIP runtime built by SPACK is installed to
--    // <rocm_root>/hip-<rocm_release_string>-<hash> directory.
--    auto SPACKPath = findSPACKPackage(Candidate, "hip");
--    InstallPath = SPACKPath.empty() ? InstallPath : SPACKPath;
--
--    BinPath = InstallPath;
--    llvm::sys::path::append(BinPath, "bin");
--    IncludePath = InstallPath;
--    llvm::sys::path::append(IncludePath, "include");
--    LibPath = InstallPath;
--    llvm::sys::path::append(LibPath, "lib");
--
--    llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> VersionFile =
--        FS.getBufferForFile(BinPath + "/.hipVersion");
--    if (!VersionFile && Candidate.StrictChecking)
--      continue;
--
--    if (HIPVersionArg.empty() && VersionFile)
--      if (parseHIPVersionFile((*VersionFile)->getBuffer()))
--        continue;
--
--    HasHIPRuntime = true;
--    return;
--  }
--  HasHIPRuntime = false;
-+  HasHIPRuntime = true;
- }
- 
- void RocmInstallationDetector::print(raw_ostream &OS) const {
diff --git a/sys-devel/llvm-roc/llvm-roc-3.10.0.ebuild b/sys-devel/llvm-roc/llvm-roc-3.10.0.ebuild
deleted file mode 100644
index 399b74cc8ee3..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-3.10.0.ebuild
+++ /dev/null
@@ -1,70 +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 llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug runtime"
-
-RDEPEND="virtual/cblas
-	dev-libs/libxml2
-	sys-libs/zlib
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7.0-current_pos.patch"
-	"${FILESDIR}/${PN}-3.9.0-tensorflow.patch"
-)
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
-	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	PROJECTS="clang;lld"
-
-	if usex runtime; then
-		PROJECTS+=";compiler-rt"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_ENABLE_PROJECTS="${PROJECTS}"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-3.7.0-r1.ebuild b/sys-devel/llvm-roc/llvm-roc-3.7.0-r1.ebuild
deleted file mode 100644
index 9e5adf08c009..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-3.7.0-r1.ebuild
+++ /dev/null
@@ -1,63 +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 llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-RDEPEND="virtual/cblas
-	dev-libs/libxml2
-	sys-libs/zlib
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
-
-PATCHES=(
-	"${FILESDIR}/${P}-current_pos.patch"
-)
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
-	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_ENABLE_PROJECTS="clang;lld"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-3.8.0.ebuild b/sys-devel/llvm-roc/llvm-roc-3.8.0.ebuild
deleted file mode 100644
index 69223b7e04a7..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-3.8.0.ebuild
+++ /dev/null
@@ -1,69 +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 llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug runtime"
-
-RDEPEND="virtual/cblas
-	dev-libs/libxml2
-	sys-libs/zlib
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7.0-current_pos.patch"
-)
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
-	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	PROJECTS="clang;lld"
-
-	if usex runtime; then
-		PROJECTS+=";compiler-rt"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_ENABLE_PROJECTS="${PROJECTS}"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-3.9.0.ebuild b/sys-devel/llvm-roc/llvm-roc-3.9.0.ebuild
deleted file mode 100644
index 6dd5e75e0479..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-3.9.0.ebuild
+++ /dev/null
@@ -1,70 +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 llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug runtime"
-
-RDEPEND="virtual/cblas
-	dev-libs/libxml2
-	sys-libs/zlib
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7.0-current_pos.patch"
-	"${FILESDIR}/${P}-tensorflow.patch"
-)
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
-	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	PROJECTS="clang;lld"
-
-	if usex runtime; then
-		PROJECTS+=";compiler-rt"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_ENABLE_PROJECTS="${PROJECTS}"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-4.0.0-r2.ebuild b/sys-devel/llvm-roc/llvm-roc-4.0.0-r2.ebuild
deleted file mode 100644
index 1c7a0fec0170..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-4.0.0-r2.ebuild
+++ /dev/null
@@ -1,93 +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 llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug +runtime"
-
-RDEPEND="virtual/cblas
-	dev-libs/libxml2
-	sys-libs/zlib
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7.0-current_pos.patch"
-	"${FILESDIR}/${PN}-3.9.0-tensorflow.patch"
-)
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
-	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
-	eapply "${FILESDIR}/${PN}-4.0.0-remove-isystem-usr-include.patch"
-	eapply "${FILESDIR}/${PN}-4.0.0-hip-location.patch"
-
-	if [[ -n ${EPREFIX} ]]; then
-		pushd "${S}"/../clang >/dev/null || die
-		sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" CMakeLists.txt
-		eend $?
-		ebegin "Use "${EPREFIX}" as default sysroot"
-		cd lib/Driver/ToolChains >/dev/null || die
-		ebegin "Use dynamic linker from ${EPREFIX}"
-		sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" Linux.cpp
-		eend $?
-
-		ebegin "Remove --sysroot call on ld for native toolchain"
-		sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp
-		eend $?
-		popd >/dev/null || die
-	fi
-
-	# handled by sysroot, don't prefixify here.
-	sed -e 's:/opt/rocm:/usr/lib/hip:' \
-		-i "${S}"/../clang/lib/Driver/ToolChains/AMDGPU.cpp
-
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	PROJECTS="clang;lld"
-
-	if usex runtime; then
-		PROJECTS+=";compiler-rt"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_ENABLE_PROJECTS="${PROJECTS}"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-4.0.0.ebuild b/sys-devel/llvm-roc/llvm-roc-4.0.0.ebuild
deleted file mode 100644
index 3967ddabbea5..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-4.0.0.ebuild
+++ /dev/null
@@ -1,91 +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 llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug runtime"
-
-RDEPEND="virtual/cblas
-	dev-libs/libxml2
-	sys-libs/zlib
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7.0-current_pos.patch"
-	"${FILESDIR}/${PN}-3.9.0-tensorflow.patch"
-)
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
-	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
-
-	if [[ -n ${EPREFIX} ]]; then
-		pushd "${S}"/../clang >/dev/null || die
-		sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" CMakeLists.txt
-		eend $?
-
-		ebegin "Use "${EPREFIX}" as default sysroot"
-		cd lib/Driver/ToolChains >/dev/null || die
-		ebegin "Use dynamic linker from ${EPREFIX}"
-		sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" Linux.cpp
-		eend $?
-
-		ebegin "Remove --sysroot call on ld for native toolchain"
-		sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp
-		eend $?
-		popd >/dev/null || die
-	fi
-
-	sed -e 's:/opt/rocm:/usr/lib/hip:' \
-		-i "${S}"/../clang/lib/Driver/ToolChains/AMDGPU.cpp
-
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	PROJECTS="clang;lld"
-
-	if usex runtime; then
-		PROJECTS+=";compiler-rt"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_ENABLE_PROJECTS="${PROJECTS}"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-4.0.1.ebuild b/sys-devel/llvm-roc/llvm-roc-4.0.1.ebuild
deleted file mode 100644
index 1c7a0fec0170..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-4.0.1.ebuild
+++ /dev/null
@@ -1,93 +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 llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug +runtime"
-
-RDEPEND="virtual/cblas
-	dev-libs/libxml2
-	sys-libs/zlib
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7.0-current_pos.patch"
-	"${FILESDIR}/${PN}-3.9.0-tensorflow.patch"
-)
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
-	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
-	eapply "${FILESDIR}/${PN}-4.0.0-remove-isystem-usr-include.patch"
-	eapply "${FILESDIR}/${PN}-4.0.0-hip-location.patch"
-
-	if [[ -n ${EPREFIX} ]]; then
-		pushd "${S}"/../clang >/dev/null || die
-		sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" CMakeLists.txt
-		eend $?
-		ebegin "Use "${EPREFIX}" as default sysroot"
-		cd lib/Driver/ToolChains >/dev/null || die
-		ebegin "Use dynamic linker from ${EPREFIX}"
-		sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" Linux.cpp
-		eend $?
-
-		ebegin "Remove --sysroot call on ld for native toolchain"
-		sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp
-		eend $?
-		popd >/dev/null || die
-	fi
-
-	# handled by sysroot, don't prefixify here.
-	sed -e 's:/opt/rocm:/usr/lib/hip:' \
-		-i "${S}"/../clang/lib/Driver/ToolChains/AMDGPU.cpp
-
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	PROJECTS="clang;lld"
-
-	if usex runtime; then
-		PROJECTS+=";compiler-rt"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_ENABLE_PROJECTS="${PROJECTS}"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-4.1.0.ebuild b/sys-devel/llvm-roc/llvm-roc-4.1.0.ebuild
deleted file mode 100644
index 68df2726a379..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-4.1.0.ebuild
+++ /dev/null
@@ -1,93 +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 llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug +runtime"
-
-RDEPEND="virtual/cblas
-	dev-libs/libxml2
-	sys-libs/zlib
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7.0-current_pos.patch"
-	"${FILESDIR}/${PN}-4.1.0-fix-missing-include.patch"
-)
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
-	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
-	eapply "${FILESDIR}/${PN}-4.0.0-remove-isystem-usr-include.patch"
-	eapply "${FILESDIR}/${PN}-4.0.0-hip-location.patch"
-
-	if [[ -n ${EPREFIX} ]]; then
-		pushd "${S}"/../clang >/dev/null || die
-		sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" CMakeLists.txt
-		eend $?
-		ebegin "Use "${EPREFIX}" as default sysroot"
-		cd lib/Driver/ToolChains >/dev/null || die
-		ebegin "Use dynamic linker from ${EPREFIX}"
-		sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" Linux.cpp
-		eend $?
-
-		ebegin "Remove --sysroot call on ld for native toolchain"
-		sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp
-		eend $?
-		popd >/dev/null || die
-	fi
-
-	# handled by sysroot, don't prefixify here.
-	sed -e 's:/opt/rocm:/usr/lib/hip:' \
-		-i "${S}"/../clang/lib/Driver/ToolChains/AMDGPU.cpp
-
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	PROJECTS="clang;lld"
-
-	if usex runtime; then
-		PROJECTS+=";compiler-rt"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_ENABLE_PROJECTS="${PROJECTS}"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-4.1.1.ebuild b/sys-devel/llvm-roc/llvm-roc-4.1.1.ebuild
deleted file mode 100644
index 051b2af18e3f..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-4.1.1.ebuild
+++ /dev/null
@@ -1,94 +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 llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug +runtime"
-
-RDEPEND="virtual/cblas
-	dev-libs/libxml2
-	sys-libs/zlib
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7.0-current_pos.patch"
-	"${FILESDIR}/${PN}-4.1.0-fix-missing-include.patch"
-)
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
-	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
-	eapply "${FILESDIR}/${PN}-4.0.0-remove-isystem-usr-include.patch"
-	eapply "${FILESDIR}/${PN}-4.0.0-hip-location.patch"
-
-	if [[ -n ${EPREFIX} ]]; then
-		pushd "${S}"/../clang >/dev/null || die
-		sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" CMakeLists.txt
-		eend $?
-		ebegin "Use "${EPREFIX}" as default sysroot"
-		cd lib/Driver/ToolChains >/dev/null || die
-		ebegin "Use dynamic linker from ${EPREFIX}"
-		sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" Linux.cpp
-		eend $?
-
-		ebegin "Remove --sysroot call on ld for native toolchain"
-		sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp
-		eend $?
-		popd >/dev/null || die
-	fi
-
-	# handled by sysroot, don't prefixify here.
-	sed -e 's:/opt/rocm:/usr/lib/hip:' \
-		-i "${S}"/../clang/lib/Driver/ToolChains/AMDGPU.cpp
-
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	PROJECTS="clang;lld"
-
-	if usex runtime; then
-		PROJECTS+=";compiler-rt"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_ENABLE_PROJECTS="${PROJECTS}"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-4.2.0.ebuild b/sys-devel/llvm-roc/llvm-roc-4.2.0.ebuild
deleted file mode 100644
index d4d6b886d09e..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-4.2.0.ebuild
+++ /dev/null
@@ -1,94 +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 llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug +runtime"
-
-RDEPEND="
-	dev-libs/libxml2
-	sys-libs/zlib
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.0-current_pos.patch"
-	"${FILESDIR}/${PN}-4.2.0-add_Object.patch"
-)
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
-	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
-	eapply "${FILESDIR}/${PN}-4.0.0-remove-isystem-usr-include.patch"
-	eapply "${FILESDIR}/${PN}-4.2.0-cyclades.patch"
-
-	if [[ -n ${EPREFIX} ]]; then
-		pushd "${S}"/../clang >/dev/null || die
-		sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" CMakeLists.txt
-		eend $?
-		ebegin "Use "${EPREFIX}" as default sysroot"
-		cd lib/Driver/ToolChains >/dev/null || die
-		ebegin "Use dynamic linker from ${EPREFIX}"
-		sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" Linux.cpp
-		eend $?
-
-		ebegin "Remove --sysroot call on ld for native toolchain"
-		sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp
-		eend $?
-		popd >/dev/null || die
-	fi
-
-	# handled by sysroot, don't prefixify here.
-	sed -e 's:/opt/rocm:/usr/lib/hip:' \
-		-i "${S}"/../clang/lib/Driver/ToolChains/AMDGPU.cpp
-
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	PROJECTS="clang;lld"
-
-	if usex runtime; then
-		PROJECTS+=";compiler-rt"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
-		-DLLVM_ENABLE_PROJECTS="${PROJECTS}"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-4.3.0-r1.ebuild b/sys-devel/llvm-roc/llvm-roc-4.3.0-r1.ebuild
deleted file mode 100644
index 34567ada1922..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,95 +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 llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug +runtime"
-
-RDEPEND="
-	dev-libs/libxml2
-	sys-libs/zlib
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.0-current_pos.patch"
-	"${FILESDIR}/${PN}-4.2.0-add_Object.patch"
-)
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
-	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
-	eapply "${FILESDIR}/${PN}-4.0.0-remove-isystem-usr-include.patch"
-	eapply "${FILESDIR}/${PN}-4.3.0-hip-location.patch"
-	eapply "${FILESDIR}/${PN}-4.2.0-cyclades.patch"
-
-	if [[ -n ${EPREFIX} ]]; then
-		pushd "${S}"/../clang >/dev/null || die
-		sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" CMakeLists.txt || die
-		eend $?
-		ebegin "Use "${EPREFIX}" as default sysroot"
-		cd lib/Driver/ToolChains >/dev/null || die
-		ebegin "Use dynamic linker from ${EPREFIX}"
-		sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" Linux.cpp || die
-		eend $?
-
-		ebegin "Remove --sysroot call on ld for native toolchain"
-		sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp || die
-		eend $?
-		popd >/dev/null || die
-	fi
-
-	# handled by sysroot, don't prefixify here.
-	sed -e 's:/opt/rocm:/usr/lib/hip:' \
-		-i "${S}"/../clang/lib/Driver/ToolChains/AMDGPU.cpp || die
-
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	PROJECTS="clang;lld"
-
-	if usex runtime; then
-		PROJECTS+=";compiler-rt"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
-		-DLLVM_ENABLE_PROJECTS="${PROJECTS}"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_INSTALL_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}
diff --git a/sys-devel/llvm-roc/llvm-roc-4.5.2.ebuild b/sys-devel/llvm-roc/llvm-roc-4.5.2.ebuild
deleted file mode 100644
index 59ebbeed8b5b..000000000000
--- a/sys-devel/llvm-roc/llvm-roc-4.5.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Radeon Open Compute llvm,lld,clang"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
-SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug +runtime"
-
-RDEPEND="
-	dev-libs/libxml2
-	sys-libs/zlib
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.0-current_pos.patch"
-	"${FILESDIR}/${PN}-4.2.0-add_Object.patch"
-)
-
-CMAKE_BUILD_TYPE=Release
-
-src_prepare() {
-	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
-	eapply "${FILESDIR}/${PN}-4.5.2-add_libraries.patch"
-	eapply "${FILESDIR}/${PN}-4.0.0-remove-isystem-usr-include.patch"
-	eapply "${FILESDIR}/${PN}-4.5.2-hip-location.patch"
-	eapply "${FILESDIR}/${PN}-4.2.0-cyclades.patch"
-
-	if [[ -n ${EPREFIX} ]]; then
-		pushd "${S}"/../clang >/dev/null || die
-		sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" CMakeLists.txt || die
-		eend $?
-		ebegin "Use "${EPREFIX}" as default sysroot"
-		cd lib/Driver/ToolChains >/dev/null || die
-		ebegin "Use dynamic linker from ${EPREFIX}"
-		sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" Linux.cpp || die
-		eend $?
-
-		ebegin "Remove --sysroot call on ld for native toolchain"
-		sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp || die
-		eend $?
-		popd >/dev/null || die
-	fi
-
-	# handled by sysroot, don't prefixify here.
-	sed -e 's:/opt/rocm:/usr/lib/hip:' \
-		-i "${S}"/../clang/lib/Driver/ToolChains/AMDGPU.cpp || die
-
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	PROJECTS="clang;lld;llvm"
-
-	if usex runtime; then
-		PROJECTS+=";compiler-rt"
-	fi
-
-	local mycmakeargs=(
-		-Wno-dev
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
-		-DLLVM_ENABLE_PROJECTS="${PROJECTS}"
-		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
-		-DLLVM_BUILD_DOCS=NO
-		-DLLVM_ENABLE_BINDINGS=OFF
-		-DLLVM_ENABLE_OCAMLDOC=OFF
-		-DLLVM_ENABLE_SPHINX=NO
-		-DLLVM_ENABLE_DOXYGEN=OFF
-		-DLLVM_BUILD_UTILS=ON
-		-DLLVM_VERSION_SUFFIX=roc
-		-DOCAMLFIND=NO
-	)
-
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	cat > "99${PN}" <<-EOF
-		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
-	EOF
-	doenvd "99${PN}"
-}