gentoo resync : 02.09.2020

10 files changed, 19 insertions, 251 deletions

diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index 14e67f181a7d..42b4c63abdf7 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,15 +1,5 @@
-AUX rocr-runtime-3.0.0-cmake-install-paths.patch 2719 BLAKE2B 66e262fed83f839d87e3d31658ac7373bba7d6985d0dceecdc9d34a4734a5aa877007aa6f26d1ee9bbe8c3d232eb22b5dd98379d67c89e3e94a95c1d2e29c3be SHA512 d5ad7aa6d6531616448c131817cfc41044dcab0bb71baf5a49819996370ad8d9bf239132b54bbab1650634a953e05ff3aa5f6ee300f2aba14a70e74d3c44bcfe
-AUX rocr-runtime-3.5.0-cmake-install-paths.patch 2262 BLAKE2B 2ff7e223081ffecf86198c9b227a34952cbcc76fe9d4cf6f76684857381e12f70a64b9c37e83eaf8767bde03ac72240a66f38f476039421f6f2a79cfc414de7e SHA512 ceef7ee2df759a51d3228d6301f72375e06fee4d11e7d09a6bd151456b9fe37f9731459482186dfd93387cc130b5c0a6376e63344dd6378e0c1cf923a7bc0294
 AUX rocr-runtime-3.7.0-cmake-install-paths.patch 4032 BLAKE2B a4252fc7a6740c64a5695ccecc6392f31acf9a341b9886fab37686916c6d0298da8ccd8d723710aaa944f6e2c26afba9b3f0bae84d5a755bf87dc8700c3dd598 SHA512 d29bf929a136dc4f6b0ddc6f2821a3ad73ab31e1c7a265e73344d69712cbe18a0a2a200d23b094fcfdddbcd37275a75d7d6313d163a6994d323a7b7f611a0d75
-DIST rocr-runtime-3.0.0.tar.gz 327908 BLAKE2B 0d95ecc22d27e470dd46f02aca012c59e8d0b0bd76de21133a1198d2daa75547600d95ea6c3a3771da36ce3fdf5e197b40ff68543b71adf36d33079a9d9496ab SHA512 e1a1eeec67bca02defc6f502e94dab71e48833737cc0f45552781c5b0cc36bff9147b2c477d6c2c3c9bd25654569ad1d91cd06aa81fcf412657a489cb56c5674
-DIST rocr-runtime-3.1.0.tar.gz 329176 BLAKE2B 845dcfc5a00e6d571bfef6330b370f588496de95ee7e04caf9c29f81e389f3e82dcdace11d48c86b01119cc0e73bf0a50949da9c4f5383044360f59176670d95 SHA512 a9b540341c649786aa0b53755fc51f540425d67c5a567834abbef9bb55c9b0120b1f14c082bfbc97f3c2a586aa846853f293093116aa8625dc34cae6fe50683a
-DIST rocr-runtime-3.3.0.tar.gz 329386 BLAKE2B 59eb0838d377bb8b10887d7fb432e634190196516fff30a9401b591f2bb7846938c5486bac921fb4fce905a3acfbf4dd064ed9b53122da847fd5fb3d3d2f701c SHA512 ec7950aacd84c318978b9abbad0aafcae1e2d7d7c77806432bde0ce861372e6db92d74ba6445d3ac92c835aa0137b1929d27ddee77b9dae92ca2465a70c4878d
-DIST rocr-runtime-3.5.0.tar.gz 336269 BLAKE2B afde0f9fcfad389a56f31352036174b8b2a5e9960f5bbcff8a7ca9dc54e4b68d92b70afa70af5aa43d040749bccd2df957df89fea1036890abdaf7e6a5c3b620 SHA512 20d95b13dccf2fe5b8da5859661a21279f18d1c45899782c55477265500057708360ce2049a8e9b3aadbcb33f8e4274459edb17a8455dc3db69ccf31b86a581e
 DIST rocr-runtime-3.7.0.tar.gz 691234 BLAKE2B b0f3b1ff6c13c132d00bbf30d405746e793aae377aca2279117c7b9dd6fdc1d466ef2076947061c848913378a20ee0dc7e32847c62a7416e4088ab0705d17dfd SHA512 f7fa77524d7f63980194e93a8e3124f1471dcdfec6ede5eb993699083e5d8fba28737fcc63dbd61949e3ce60e9fbd1455ec055a0aa5c7eee724ae6bb61d3b24f
-EBUILD rocr-runtime-3.0.0.ebuild 957 BLAKE2B 45bc4d6779474edae379f8bfcf0f042eb98d928ae306371c485fbae6b641ea3f2be1a7748cb5837c3e8c8af7f9420ac9ca8bfa10f175362cbd9ec6231bd55821 SHA512 75335a26cc5a5e0de8218f2408bd19668480bff0a609b9af536e7a23423bc28fe14ff8885a27928891b6d259d5eea73ebc7f2e0a798e69380af0f3cc4f785acc
-EBUILD rocr-runtime-3.1.0.ebuild 957 BLAKE2B 45bc4d6779474edae379f8bfcf0f042eb98d928ae306371c485fbae6b641ea3f2be1a7748cb5837c3e8c8af7f9420ac9ca8bfa10f175362cbd9ec6231bd55821 SHA512 75335a26cc5a5e0de8218f2408bd19668480bff0a609b9af536e7a23423bc28fe14ff8885a27928891b6d259d5eea73ebc7f2e0a798e69380af0f3cc4f785acc
-EBUILD rocr-runtime-3.3.0.ebuild 959 BLAKE2B a853aeb83d557601e0db52e7e147543c57d3e18151e3324517464796c372ce8a3142df55b9bc17c660c77acf1db690e078b2652f83eba97eddbfbae48c10bd1d SHA512 ac8f6b61432c6ff3cb934d77e36b77f8b7e679273601f0843c93f994bbdac3c26fbbfce846779f4580be0ae856e8a6838956debea166ea5f436e4faa8140060f
-EBUILD rocr-runtime-3.5.0.ebuild 959 BLAKE2B 9e5fd024a20457bf65ed495a8281ce484d7ccb223c00e07ab8424614a70260e2ea7316e7a02de81e7661c8cda13244795d79c169e05f58c34685e9918e27e3ed SHA512 2265a22322478821e398d5483ea3d1275a346907176ece986865571915539d766b85021793fa43cc84a77e4af8e05052bac6c4559c441b2d2e02d3b78dc68fc3
-EBUILD rocr-runtime-3.7.0.ebuild 1490 BLAKE2B 6d6de26038d2f4d66af347f09306d2a9f1825b5d148416d4d76094354c6a59b51ea768293889430fc9e0f5b5c19bf046065574a9860b0e91fc4fb6cdeb4a8af4 SHA512 535d45c9fbd47491f96bd412a38b709e51636ec8fc2b0db5c26f332d0e70155b555e33c45c1929f1d9165a7044f9c9105a42ac7cb882af0fa50aaabb0c787361
-EBUILD rocr-runtime-9999.ebuild 894 BLAKE2B 9d1066fda6f310e917b7be2adaf1a887d4b75446d4155cce3a21a7bb38191f92d75cfaabb8720259ce3f6acfb16e924ac3eaab43015b1bf55685d9643952a8c4 SHA512 5e1567906914368531ad574890dd4f513e3bc2c7c78f414ba1d7a3bba39dcc50bde60b7091783ec8bb3122c4738a6fbd97abce794f48f2ecad28d75c0a086fd8
-MISC metadata.xml 721 BLAKE2B 6a608a5a2063e626a9a39bf775ad840442cb797d07ff933b00ca763c11b024cd07a552dd0620b46bec7f4e8b7c608e898047822bd6e4b8e8716c2159a4e4eebb SHA512 71cd9916573d9b575cc42db8c878a27922e005fb31096902c1fb59537ffc9f84f23be8d8b4f53f3855e815d86d81e9012f4128fe4bb7d71490a8aa36bc9a444b
+EBUILD rocr-runtime-3.7.0.ebuild 1437 BLAKE2B 25380da075972243c2b6e76d751cb734c448be9dadfc9d442c3ae6c06d46ae8b3d445721be0e8778e10c06067cebe490afed9df94f3662ecb9f2ef2b54ebefa0 SHA512 8cd929b305d1a2a57964dfa01f2696eb8a176202c47ee7e0bd61cd8bdedea48212f33f19fd851988ec6f9e0e95ca79b863884f874a60cc5c1b91681d22c28370
+EBUILD rocr-runtime-9999.ebuild 1437 BLAKE2B 25380da075972243c2b6e76d751cb734c448be9dadfc9d442c3ae6c06d46ae8b3d445721be0e8778e10c06067cebe490afed9df94f3662ecb9f2ef2b54ebefa0 SHA512 8cd929b305d1a2a57964dfa01f2696eb8a176202c47ee7e0bd61cd8bdedea48212f33f19fd851988ec6f9e0e95ca79b863884f874a60cc5c1b91681d22c28370
+MISC metadata.xml 600 BLAKE2B 6bdb934a6f2602bc39dab093a9554a71463e8818181cd9bdb15f108f8d371cc515fdd165742dfe8ac4085073cccc9bbb990a353f0d860d4590049c6965c70e3a SHA512 29543e96a8ccdb2506ba33170822f1bb7399d82c82eb60d342eed616c193902ecf49d377628db010f15aae79b529a65ea1e196ec446621bb2cd9386547c5662c
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-3.0.0-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-3.0.0-cmake-install-paths.patch
deleted file mode 100644
index 29429d0c4807..000000000000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-3.0.0-cmake-install-paths.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/51
-
-From 09a835e8de2d88e917328a78765a1db423d21920 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Sun, 29 Dec 2019 16:57:00 -0500
-Subject: [PATCH] Correctly install the library into the system
-
-Install to standard locations in /usr/{lib,include}/lib (as opposed to /usr/hsa/{lib,include}/hsa)
-Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR from GNUInstallDirs instead of using "lib" and "include"
----
- CMakeLists.txt | 13 +++----------
- 1 file changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f292182..7474dd2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -61,6 +61,7 @@ endif() # if (ROCM_CCACHE_BUILD)
- 
- list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
- include ( utils )
-+include ( GNUInstallDirs )
- include ( hsa_common )
- 
- ## Find LibElf
-@@ -176,17 +177,9 @@ endif ()
- set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY VERSION "${SO_VERSION_STRING}" )
- set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY SOVERSION "${SO_MAJOR}" )
- 
--## 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 ../hsa/include/hsa hsa_include_link )
--add_custom_target ( hsa_lib_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/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 ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so.${SO_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${SO_MAJOR} )
--
- ## Set install information
--install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION hsa/lib )
--install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION hsa/include/hsa )
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa )
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so )
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${SO_MAJOR} DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${SO_MAJOR} )
-+install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-+install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
- 
- ## Packaging directives
- set ( CPACK_GENERATOR "DEB;RPM" CACHE STRING "Package types to build")
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-3.5.0-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-3.5.0-cmake-install-paths.patch
deleted file mode 100644
index a98a5f450f0b..000000000000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-3.5.0-cmake-install-paths.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/CMakeLists.txt	2020-06-06 18:15:44.473493765 +0200
-+++ b/CMakeLists.txt	2020-06-06 18:25:47.688491464 +0200
-@@ -66,6 +66,7 @@
- 
- list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
- include ( utils )
-+include ( GNUInstallDirs )
- include ( hsa_common )
- 
- ## Find LibElf
-@@ -185,22 +186,9 @@
- set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY VERSION "${SO_VERSION_STRING}" )
- set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY SOVERSION "${SO_MAJOR}" )
- 
--## 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 ../hsa/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 ../hsa/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 ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so.${SO_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${SO_MAJOR} )
--endif()
--
- ## Set install information
--install ( TARGETS ${CORE_RUNTIME_TARGET} DESTINATION hsa/lib COMPONENT binary)
--install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION hsa/include/hsa COMPONENT binary)
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa COMPONENT dirlink)
--
--if ( ${BUILD_SHARED_LIBS} )
--    install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so COMPONENT binary)
--    install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${SO_MAJOR} DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${SO_MAJOR} COMPONENT binary)
--endif ()
-+install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-+install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
- 
- ## Packaging directives
- set ( CPACK_GENERATOR "DEB;RPM" CACHE STRING "Package types to build")
diff --git a/dev-libs/rocr-runtime/metadata.xml b/dev-libs/rocr-runtime/metadata.xml
index e13e7321708c..d53b83185ad3 100644
--- a/dev-libs/rocr-runtime/metadata.xml
+++ b/dev-libs/rocr-runtime/metadata.xml
@@ -15,7 +15,4 @@
     <longdescription lang="en">
         Radeon Open Compute Platform Runtime
     </longdescription>
-    <use>
-      <flag name="non-free">Enables HSA image support using <pkg>dev-libs/hsa-ext-rocr</pkg></flag>
-    </use>
 </pkgmetadata>
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild
deleted file mode 100644
index d6ba469a09fe..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild
+++ /dev/null
@@ -1,37 +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/ROCR-Runtime/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="non-free"
-
-COMMON_DEPEND="sys-process/numactl"
-RDEPEND="${COMMON_DEPEND}
-	non-free? ( dev-libs/hsa-ext-rocr )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.1.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.1.0.ebuild
deleted file mode 100644
index d6ba469a09fe..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-3.1.0.ebuild
+++ /dev/null
@@ -1,37 +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/ROCR-Runtime/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="non-free"
-
-COMMON_DEPEND="sys-process/numactl"
-RDEPEND="${COMMON_DEPEND}
-	non-free? ( dev-libs/hsa-ext-rocr )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.3.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.3.0.ebuild
deleted file mode 100644
index 27a97d1c7600..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-3.3.0.ebuild
+++ /dev/null
@@ -1,37 +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/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.0.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="non-free"
-
-COMMON_DEPEND="sys-process/numactl"
-RDEPEND="${COMMON_DEPEND}
-	non-free? ( dev-libs/hsa-ext-rocr )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.5.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.5.0.ebuild
deleted file mode 100644
index 5d787962fa12..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-3.5.0.ebuild
+++ /dev/null
@@ -1,37 +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/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.5.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="non-free"
-
-COMMON_DEPEND="sys-process/numactl"
-RDEPEND="${COMMON_DEPEND}
-	non-free? ( dev-libs/hsa-ext-rocr )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake_src_prepare
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild
index 064969d47e2f..d69d702b2dee 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild
@@ -23,11 +23,9 @@ PATCHES=(
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="non-free"
 
 COMMON_DEPEND="sys-process/numactl"
-RDEPEND="${COMMON_DEPEND}
-	non-free? ( dev-libs/hsa-ext-rocr )"
+RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
 	>=dev-libs/rocm-device-libs-${PV}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
index 5ddab400ad03..d69d702b2dee 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
@@ -17,18 +17,29 @@ 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)"
-IUSE="non-free"
 
 COMMON_DEPEND="sys-process/numactl"
-RDEPEND="${COMMON_DEPEND}
-	non-free? ( dev-libs/hsa-ext-rocr )"
+RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}"
+	>=dev-libs/roct-thunk-interface-${PV}
+	>=dev-libs/rocm-device-libs-${PV}
+	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
 }