gentoo resync : 15.01.2020

10 files changed, 5 insertions, 483 deletions

diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index 890fe9855efa..3ea42bd21975 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -1,18 +1,6 @@
-AUX rocm-comgr-2.6.0-correctly-install.patch 1397 BLAKE2B 99558ad6f8e7908efe33ae215e1645ab733966d778753a25714a1fb0880db9bf3df43c108c0b200d1bf54475b928607d4e99a7a7a97464863cb5a6ea0cac53e9 SHA512 3dddf76dde36118aa8808178ca6bb6c7653148b83d1d2f3c66d18d6c5421ae7ad438b1467af6e842aa4c24a3256c4ef95717ed46feedba07f965828f47bdedcb
-AUX rocm-comgr-2.6.0-dependencies.patch 713 BLAKE2B 2a4a642044d243d5da9084e8d0dc37b7b230ade108a547a3c46a41f7fe456804288b69a67a8f378032d1ca3d6c0f6416ce711ed9ddb6e5cacfaea166f2313610 SHA512 435d7488516551e7345acb4a645f8ea040d461bec1b6dafdc832c692038061459be4c615b1d42292cd22daa7c88e26cc4b8df41ff4e0f65ede0e23c098223cd8
 AUX rocm-comgr-2.6.0-find-clang.patch 982 BLAKE2B 7284604ac25dbbd292050d35952db0b42fada73465f86bba34a40941c28c38709b6cc5006ba40357dcccece60662d12abde68d3cacc46b138325851f975a63e2 SHA512 74d4042c1c4ddaab22b0708a317db0d3c4e7045dfd36b03b94a10fd8f7c40a3442c5016e20067e59ca2266e1563fd33fc378053ce917c2a161cfc4b71425b33d
 AUX rocm-comgr-2.6.0-find-lld-includes.patch 1886 BLAKE2B b06fc169e9271f9476e17091fa6060518b11bf2dfce700fedc780189f9db4da57aa4290183e743a08bfe4502be9079895690085a89788b1ba56bf4e9f8aa3062 SHA512 211b274280734b7f2478ecb094a36f303f7849cfede46709714a5171d07f2521959c216564623d119a14064d762fa752de4b745cee340480210eea4b757c7e3f
-AUX rocm-comgr-2.6.0-unbundle-yaml-cpp.patch 1082 BLAKE2B 0b44c1731884d225056a18b81c52c99f59a9a3e9d16e06cbe77e683b10703cd83cb96446ff138d6c4c14c48f931a1df0f37699153e0b6f253f89d42f93feebbf SHA512 74190c23d86792bac64b09f3724ad98a3c7b89dd0bbfcbc051d7821222a97e37de9138eee32abb8982ce78982dbddbe640c3f05ad560ef29c287c9196afdef89
-AUX rocm-comgr-2.7.0-llvm-interface-change.patch 6792 BLAKE2B 67977f845b35d5c26da13b123cc2e273161e1614b353a5acfad7cb6b3cb606d0abd55989c4e615b8addc98326d8fa225c949cacec93132d94a2e3af776b88a8f SHA512 df455a07bf3e168be3c18bc9033b984eba8046dc6bdad02e8ebe4cb9b05728e889156e1ad5cfd858ee59e22a07ff224437b96b10e6958b298ab13a2d1d9e51b1
 AUX rocm-comgr-2.8.0-dependencies.patch 2120 BLAKE2B 4c5b50d122b2f92ea35419111e9eece967c09e4b1014639c8f81b5df8a674ff0758ecc8a8b7b1984a6d27b4581704d9b8f494089abc477b221effb2d3652308a SHA512 791d36e56e50c2734529d3bfe286219c6ab8b5769f65c7e993a8c7ab961e52f90239871b31fe63ffbcdc5f2e0c06bf60e33943cf68d797ecdebd37d237849777
-DIST rocm-comgr-2.10.0.tar.gz 87111 BLAKE2B efc9d395f6c0445e3f0af847edb66094905b38a8134d05b938a5bc48f1d71d37db664afc8e6125f82a6618cd4657d4316105f6587937010cd120f68c01172cac SHA512 ce7e698c042291910a27bf261e52ac420dd5f9f676bb86e72b903e8a751753b9b0d2d15fb3dfabafdaef75a94844541b37df81e70db28496545348e93cd4018c
-DIST rocm-comgr-2.6.0.tar.gz 1484343 BLAKE2B fcb496b4997d672640e3f75622e74085eeb9dfe83c88ae025530389d3cdca7628155168060e71f7a3ff915e933ffe70c7026720dc124d128d16ef4df397525e7 SHA512 b14e90603d2b6e17f6b0335ea35da2e5d7e31710f301d7a7f7751a45d996e3dbbfbf84a03e2e911e8798e72e77b87b5cd88317e897cb4de3ee5cf0e7c3222d68
-DIST rocm-comgr-2.7.0.tar.gz 1500771 BLAKE2B 275ad4cab34d554f8a131101eda474926f7270a44a0af9941d8f1233c29b44b3efb3ba83c6b541d501a3e2fc751c591c0f6a993563bbacf539b5bcd04b23963b SHA512 afb4a7318c2e137db6ac0502041ed53e63783ec1ab458962b1b16f0f2f28e09ce2ae70d048b858740eca8bf06328858400a68bed4e91d7cfc4b7714a66d85bc9
-DIST rocm-comgr-2.8.0.tar.gz 85502 BLAKE2B 14e18191a475c3d05e324f15e3b2d0829eed56bfa625b48e217e6540836e005675a4ffdd0813664c7f61177431d0987499eb9a75ec83acfa0e554e954770fbc9 SHA512 516832f2a1be5e66d93dddfd1275861605afcb6e3410cb518e6d8647a25c18da058e37cbce8434d5b7133a2147c8c84dc48a485f7b855b74a3b49c9f7dae4a0e
-DIST rocm-comgr-2.9.0.tar.gz 85505 BLAKE2B 5e69bcd2fb6769cd315a18eb626d00161acb4a2f9922eb67dba6cee081c236ec25798011d4112c37d5e6fba06531e5e7b4f42659080a8dd23d9a8579b71bf2c0 SHA512 8e66c01eee71154d261a8f2a8651f90dc7e60b6d74625aab3f3a0b51226c69059cde66d7a1eab8aacee7d0653cc881ec442849483f21616ee4cd27d4ddad7345
-EBUILD rocm-comgr-2.10.0.ebuild 1094 BLAKE2B 7347448c0f1e812b5932e833971c65a267db520af9cc2084bc919a4e8feeb6eb955d908268f6ee6ffca770e2d18b949263c9047f9ddc1fb490cf1463cead9fcb SHA512 afb18417ae9931bb2a9a8af877b6b85939a2f7cadfd61745cabd879cfdbefcb66270f9a5725f45456b0382a8edf35e89a1831660b3a0cbc6d1efc8c040b6bed3
-EBUILD rocm-comgr-2.6.0.ebuild 1189 BLAKE2B 29d9b7ad1e3dca202024101223422b667c82d58eed20da01492e955c39e768f85b677d9fbbedcb7b22aa41855dd68acf11562f7083303f9d00749fbfd5af9c84 SHA512 ab54afa2597fc0133db00c42fec5226da8118b4d79eb67c6d6af1bf3c111296b9b72c5675469594c403021a00446e68b8ab5ab51b678dec0958ca21e9bcc83c4
-EBUILD rocm-comgr-2.7.0.ebuild 1295 BLAKE2B c6f40531be4c82d2d3c82967bb9f890e8af1f95125857d2cc1d0b9a2c29ddca5574f34abbe42daf78df8b4cf74244478e6afea69a77661a6a65e44442205304b SHA512 7835addd86dfd1878993c5bc0cb9728123623815e678b90008953cd4258abc8ca7e227fd43d26fd2959ed2d5d1cd448ae61c525527c9d56742c3b009b288c509
-EBUILD rocm-comgr-2.8.0.ebuild 1094 BLAKE2B 7347448c0f1e812b5932e833971c65a267db520af9cc2084bc919a4e8feeb6eb955d908268f6ee6ffca770e2d18b949263c9047f9ddc1fb490cf1463cead9fcb SHA512 afb18417ae9931bb2a9a8af877b6b85939a2f7cadfd61745cabd879cfdbefcb66270f9a5725f45456b0382a8edf35e89a1831660b3a0cbc6d1efc8c040b6bed3
-EBUILD rocm-comgr-2.9.0.ebuild 1094 BLAKE2B 7347448c0f1e812b5932e833971c65a267db520af9cc2084bc919a4e8feeb6eb955d908268f6ee6ffca770e2d18b949263c9047f9ddc1fb490cf1463cead9fcb SHA512 afb18417ae9931bb2a9a8af877b6b85939a2f7cadfd61745cabd879cfdbefcb66270f9a5725f45456b0382a8edf35e89a1831660b3a0cbc6d1efc8c040b6bed3
+DIST rocm-comgr-3.0.0.tar.gz 88594 BLAKE2B d3fb356962ba6a9ffc7aa295f1582f6587d55d1f4f2a9a978f5c189f4a0597a9cb3f9806a1f2f43f14e262bc19964e06f41df3c7f45ac3c1579511fe235cc940 SHA512 ffa250c44388b1985ec0dac68bf0dd27820933fe7579f7fc6b35d783852cd03fb02919b5e800b01d536c36eb3c5bff96d1a38f5c8ab6380d6584b2e6d19a25fc
+EBUILD rocm-comgr-3.0.0.ebuild 1033 BLAKE2B d360d157bc06201fdb7533aa2f561b60868212834c659cae28c06540b9777e260845aa85292a2ec5eadeb651360dbc81b200c47b55b4327241a91e51e7f75b83 SHA512 afe248d5df0361f37ae4c38189ad279e023d77e793b3d53de1c3f3297f0130da998a54c934093f2c65fa23cf695a7a7dc54ee1418f16d106ffec32a017b739e5
 MISC metadata.xml 484 BLAKE2B 5afcf22d4b70b094748570fc3f2c756c85b1f192aabc8df86d64e3bad535702444111151282dead984de46a5de2ab04748e0a2b0252f3a3af6e32e1e60416a3b SHA512 da6dbb545060ba024ce5df3439db80210c15e9191953703c9c50b2fed11a4140303a87cc89ee0336ad81f495da0d434fedd85e6c32a1ddede525a1bc5420ca94
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch
deleted file mode 100644
index 74206760f39a..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 98f589636729b1e25625db6880fbd7820dcf9e40 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Wed, 31 Jul 2019 10:04:11 -0400
-Subject: [PATCH] Install to standard locations using GNUInstallDirs
-
-Some distributions require 64 bit libraries to be installed to lib64, for example.
-Using GNUInstallDirs ensures that files are installed to the expected locations.
----
- CMakeLists.txt | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 454b830..a89af16 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,7 @@
- cmake_minimum_required(VERSION 3.2.0)
- 
-+include (GNUInstallDirs)
-+
- # Build ROCM-Compiler-Support with ccache if the package is present.
- set(ROCM_COMPILER_SUPPORT_CCACHE_BUILD OFF CACHE BOOL "Set to ON for a ccache enabled build")
- if(ROCM_COMPILER_SUPPORT_CCACHE_BUILD)
-@@ -146,17 +148,17 @@ configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in"
- 
- install(TARGETS amd_comgr
-   EXPORT amd_comgr_export
--  DESTINATION lib)
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- install(FILES
-   "include/amd_comgr.h"
--  DESTINATION include)
-+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- 
- install(FILES
-   "README.md"
-   "LICENSE.txt"
-   "NOTICES.txt"
--  DESTINATION share/amd_comgr)
-+  DESTINATION ${CMAKE_INSTALL_DATADIR}/amd_comgr)
- 
- # Generate the install-tree package.
- set(AMD_COMGR_PREFIX_CODE "
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch
deleted file mode 100644
index bce19d168b0a..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/19
-
---- comgr/CMakeLists.old	2019-07-19 17:19:26.080276421 +0200
-+++ comgr/CMakeLists.txt	2019-07-19 18:17:25.780163592 +0200
-@@ -185,7 +185,11 @@
- include_directories(./yaml-cpp/include)
- 
- set(CLANG_LIBS
--  clangFrontendTool)
-+  clangFrontendTool
-+  clangFrontend
-+  clangBasic
-+  clangDriver
-+  clangSerialization)
- 
- set(LLD_LIBS
-   lldELF
-@@ -193,8 +197,19 @@
- 
- 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)
- 
- target_link_libraries(amd_comgr
-   PUBLIC
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch
deleted file mode 100644
index d61f4c2a2003..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/lib/comgr/CMakeLists.txt b/lib/comgr/CMakeLists.txt
-index 454b830..70e2526 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -90,12 +90,8 @@ if (UNIX)
-         -Wl,--no-undefined)
-     endif()
-   endif()
--  # FIXME: Remove when yaml-cpp is removed from the build.
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
- else()
-   list(APPEND AMD_COMGR_PRIVATE_COMPILE_OPTIONS "/W0" "/wd4244")
--  # FIXME: Make this private once yaml-cpp is removed from the build.
--  add_definitions(-D_HAS_EXCEPTIONS=0)
- endif()
- 
- # Windows is strict about visibility of exports in shared libraries, so we ask
-@@ -179,10 +175,8 @@ install(EXPORT amd_comgr_export
-   DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}"
-   FILE "${AMD_COMGR_TARGETS_NAME}")
- 
--set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "Enable testing" FORCE)
--set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "Enable parse tools" FORCE)
--add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
--include_directories(./yaml-cpp/include)
-+find_package(yaml-cpp REQUIRED)
-+include_directories(${YAML_CPP_INCLUDE_DIR})
- 
- set(CLANG_LIBS
-   clangFrontendTool)
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.7.0-llvm-interface-change.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.7.0-llvm-interface-change.patch
deleted file mode 100644
index dc8ed42fc466..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.7.0-llvm-interface-change.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From a73e4ce7c686787840454e206a17973685b03e62 Mon Sep 17 00:00:00 2001
-From: Michael LIAO <michaelhongbin.liao@amd.com>
-Date: Thu, 15 Aug 2019 13:25:58 -0400
-Subject: [PATCH] Fix comgr build due to LLVM interface change.
-
-Change-Id: I66c2203f09b683dd06807860eeb5f517cd200f0e
----
- src/comgr-objdump.cpp | 68 +++++++++++++++++++++++----------
- 1 file changed, 47 insertions(+), 21 deletions(-)
-
-diff --git a/src/comgr-objdump.cpp b/src/comgr-objdump.cpp
-index bf490b6..59a9d05 100644
---- a/src/comgr-objdump.cpp
-+++ b/src/comgr-objdump.cpp
-@@ -307,15 +307,18 @@ class SectionFilter {
-   FilterPredicate Predicate;
-   llvm::object::ObjectFile const &Object;
- };
-+
- SectionFilter ToolSectionFilter(llvm::object::ObjectFile const &O) {
-   return SectionFilter(
-       [](llvm::object::SectionRef const &S) {
-         if (FilterSections.empty())
-           return true;
--        llvm::StringRef String;
--        std::error_code error = S.getName(String);
--        if (error)
-+        Expected<StringRef> SecNameOrErr = S.getName();
-+        if (!SecNameOrErr) {
-+          consumeError(SecNameOrErr.takeError());
-           return false;
-+        }
-+        StringRef String = *SecNameOrErr;
-         return is_contained(FilterSections, String);
-       },
-       O);
-@@ -394,6 +397,18 @@ report_error(StringRef ArchiveName, const object::Archive::Child &C,
-     report_error(ArchiveName, NameOrErr.get(), std::move(E), ArchitectureName);
- }
- 
-+static LLVM_ATTRIBUTE_NORETURN void report_error(llvm::Error E,
-+                                                 StringRef File) {
-+  report_error(File, std::move(E));
-+}
-+
-+template <typename T, typename... Ts>
-+T unwrapOrError(Expected<T> EO, Ts &&... Args) {
-+  if (EO)
-+    return std::move(*EO);
-+  report_error(EO.takeError(), std::forward<Ts>(Args)...);
-+}
-+
- static const Target *getTarget(const ObjectFile *Obj = nullptr) {
-   // Figure out the target triple.
-   llvm::Triple TheTriple("unknown-unknown-unknown");
-@@ -822,13 +837,13 @@ static void printRelocationTargetName(const MachOObjectFile *O,
-     for (const SectionRef &Section : ToolSectionFilter(*O)) {
-       std::error_code ec;
- 
--      StringRef Name;
-       uint64_t Addr = Section.getAddress();
-       if (Addr != Val)
-         continue;
--      if ((ec = Section.getName(Name)))
--        report_error(O->getFileName(), ec);
--      fmt << Name;
-+      Expected<StringRef> NameOrErr = Section.getName();
-+      if (!NameOrErr)
-+        report_error(O->getFileName(), NameOrErr.takeError());
-+      fmt << *NameOrErr;
-       return;
-     }
- 
-@@ -854,7 +869,11 @@ static void printRelocationTargetName(const MachOObjectFile *O,
-     section_iterator SI = O->section_begin();
-     // Adjust for the fact that sections are 1-indexed.
-     advance(SI, Val - 1);
--    SI->getName(S);
-+    Expected<StringRef> SOrErr = SI->getName();
-+    if (!SOrErr)
-+      consumeError(SOrErr.takeError());
-+    else
-+      S = *SOrErr;
-   }
- 
-   fmt << S;
-@@ -1362,8 +1381,7 @@ void llvm::DisassemHelper::DisassembleObject(const ObjectFile *Obj,
-       DataRefImpl DR = Section.getRawDataRefImpl();
-       SegmentName = MachO->getSectionFinalSegmentName(DR);
-     }
--    StringRef name;
--    error(Section.getName(name));
-+    StringRef name = unwrapOrError(Section.getName(), Obj->getFileName());
- 
-     if ((SectionAddr <= StopAddress) &&
-         (SectionAddr + SectSize) >= StartAddress) {
-@@ -1675,8 +1693,7 @@ void llvm::DisassemHelper::PrintRelocations(const ObjectFile *Obj) {
-   for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
-     if (Section.relocation_begin() == Section.relocation_end())
-       continue;
--    StringRef secname;
--    error(Section.getName(secname));
-+    StringRef secname = unwrapOrError(Section.getName(), Obj->getFileName());
-     OutS << "RELOCATION RECORDS FOR [" << secname << "]:\n";
-     for (const RelocationRef &Reloc : Section.relocations()) {
-       bool hidden = getHidden(Reloc);
-@@ -1699,8 +1716,7 @@ void llvm::DisassemHelper::PrintSectionHeaders(const ObjectFile *Obj) {
-           "Idx Name          Size      Address          Type\n";
-   unsigned i = 0;
-   for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
--    StringRef Name;
--    error(Section.getName(Name));
-+    StringRef Name = unwrapOrError(Section.getName(), Obj->getFileName());
-     uint64_t Address = Section.getAddress();
-     uint64_t Size = Section.getSize();
-     bool Text = Section.isText();
-@@ -1717,9 +1733,8 @@ void llvm::DisassemHelper::PrintSectionHeaders(const ObjectFile *Obj) {
- void llvm::DisassemHelper::PrintSectionContents(const ObjectFile *Obj) {
-   std::error_code EC;
-   for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
--    StringRef Name;
-     StringRef Contents;
--    error(Section.getName(Name));
-+    StringRef Name = unwrapOrError(Section.getName(), Obj->getFileName());
-     uint64_t BaseAddr = Section.getAddress();
-     uint64_t Size = Section.getSize();
-     if (!Size)
-@@ -1797,7 +1812,11 @@ void llvm::DisassemHelper::PrintSymbolTable(const ObjectFile *o,
-     section_iterator Section = *SectionOrErr;
-     StringRef Name;
-     if (Type == SymbolRef::ST_Debug && Section != o->section_end()) {
--      Section->getName(Name);
-+      Expected<StringRef> NameOrErr = Section->getName();
-+      if (!NameOrErr)
-+        consumeError(NameOrErr.takeError());
-+      else
-+        Name = *NameOrErr;
-     } else {
-       Expected<StringRef> NameOrErr = Symbol.getName();
-       if (!NameOrErr)
-@@ -1846,8 +1865,7 @@ void llvm::DisassemHelper::PrintSymbolTable(const ObjectFile *o,
-         StringRef SegmentName = MachO->getSectionFinalSegmentName(DR);
-         OutS << SegmentName << ",";
-       }
--      StringRef SectionName;
--      error(Section->getName(SectionName));
-+      StringRef SectionName = unwrapOrError(Section->getName(), o->getFileName());
-       OutS << SectionName;
-     }
- 
-@@ -1978,7 +1996,11 @@ void llvm::DisassemHelper::printRawClangAST(const ObjectFile *Obj) {
-   Optional<object::SectionRef> ClangASTSection;
-   for (auto Sec : ToolSectionFilter(*Obj)) {
-     StringRef Name;
--    Sec.getName(Name);
-+    auto NameOrErr = Sec.getName();
-+    if (!NameOrErr) // FIXME: Need better error handling.
-+      consumeError(NameOrErr.takeError());
-+    else
-+      Name = *NameOrErr;
-     if (Name == ClangASTSectionName) {
-       ClangASTSection = Sec;
-       break;
-@@ -2015,7 +2037,11 @@ void llvm::DisassemHelper::printFaultMaps(const ObjectFile *Obj) {
- 
-   for (auto Sec : ToolSectionFilter(*Obj)) {
-     StringRef Name;
--    Sec.getName(Name);
-+    auto NameOrErr = Sec.getName();
-+    if (!NameOrErr) // FIXME: Need better error handling.
-+      consumeError(NameOrErr.takeError());
-+    else
-+      Name = *NameOrErr;
-     if (Name == FaultMapSectionName) {
-       FaultMapSection = Sec;
-       break;
diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.10.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-2.10.0.ebuild
deleted file mode 100644
index ff0ede91ae21..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-2.10.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-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/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
-	KEYWORDS="~amd64"
-fi
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-find-clang.patch"
-	"${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch"
-	"${FILESDIR}/${PN}-2.8.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-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild
deleted file mode 100644
index c000ce55ab71..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-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/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
-	KEYWORDS="~amd64"
-fi
-PATCHES=(
-	"${FILESDIR}/${P}-correctly-install.patch"
-	"${FILESDIR}/${P}-find-clang.patch"
-	"${FILESDIR}/${P}-find-lld-includes.patch"
-	"${FILESDIR}/${P}-dependencies.patch"
-	"${FILESDIR}/${P}-unbundle-yaml-cpp.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
-	dev-cpp/yaml-cpp:=
-	sys-devel/llvm-roc:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	rm -rf yaml-cpp || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.7.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-2.7.0.ebuild
deleted file mode 100644
index e357310f2535..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-2.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-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/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
-	KEYWORDS="~amd64"
-fi
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-correctly-install.patch"
-	"${FILESDIR}/${PN}-2.6.0-find-clang.patch"
-	"${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch"
-	"${FILESDIR}/${PN}-2.6.0-dependencies.patch"
-	"${FILESDIR}/${PN}-2.6.0-unbundle-yaml-cpp.patch"
-	"${FILESDIR}/${PN}-2.7.0-llvm-interface-change.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}
-	dev-cpp/yaml-cpp:=
-	>=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	rm -rf yaml-cpp || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.8.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-2.8.0.ebuild
deleted file mode 100644
index ff0ede91ae21..000000000000
--- a/dev-libs/rocm-comgr/rocm-comgr-2.8.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-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/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
-	KEYWORDS="~amd64"
-fi
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-find-clang.patch"
-	"${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch"
-	"${FILESDIR}/${PN}-2.8.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-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.9.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild
index ff0ede91ae21..ca7dc037fe3d 100644
--- a/dev-libs/rocm-comgr/rocm-comgr-2.9.0.ebuild
+++ b/dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
@@ -30,13 +30,12 @@ RDEPEND=">=dev-libs/rocm-device-libs-${PV}
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }