gentoo resync : 25.11.2020

3 files changed, 50 insertions, 2 deletions

diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index b52b81bc1872..59b25179bf80 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,5 +1,7 @@
 AUX rocr-runtime-3.7.0-cmake-install-paths.patch 4032 BLAKE2B a4252fc7a6740c64a5695ccecc6392f31acf9a341b9886fab37686916c6d0298da8ccd8d723710aaa944f6e2c26afba9b3f0bae84d5a755bf87dc8700c3dd598 SHA512 d29bf929a136dc4f6b0ddc6f2821a3ad73ab31e1c7a265e73344d69712cbe18a0a2a200d23b094fcfdddbcd37275a75d7d6313d163a6994d323a7b7f611a0d75
 DIST rocr-runtime-3.8.0.tar.gz 691209 BLAKE2B 0664b099a7ea4105e37cf42ee208c31dc58a1900aa35bbc0295df0cabba25e5352b3def0dbc1a8ea889ad4876321f99a73c4c6c9ec042186efda9b3308583825 SHA512 d968e96cabc98951890435a2b9bfc9943df9435848f0c6026a59953c78ad4c1048e7c532a8093e5f633fdc5d32622fb88ba0212f32f317d5473fd7e957e4dc4c
-EBUILD rocr-runtime-3.8.0.ebuild 1467 BLAKE2B e7f4fc90dca852643f1c0ce52d1ae01f5c3f46e47b36c8a9e126e5d8929eb90dad97a7dd2aad1788acbbc07fe4f8b6630360573ddabef2b0189cd8a3957a8bc7 SHA512 8de0ae9086e20d034574f14a474f64b4fa8a506116f19e457fe149abf98dd3b9ffa1c62e2c02528b1fd0daad447fd1f80cf581b709395c2e52d6bc6470eaf019
+DIST rocr-runtime-3.9.0.tar.gz 691645 BLAKE2B c90cdba93be510532a65ebfd69322972c61603b23932b95982d9a2bea742979b14acd83728a37ecacd7ec540268311bd313801acece89ec02a234dee66155dbe SHA512 e117536300ad05db27ccd92d2f9fadbdb9711fc724953ef65609c7af1ef369b8cf132c8b0f72d33e7ffd43acc3e59dc5525bacaa1507fd01fab79685f6b8d86e
+EBUILD rocr-runtime-3.8.0.ebuild 1466 BLAKE2B 263ba0bbd1cde48ce0a07b846e2f24193667766454aa1010e725867818f7becc666180d994143d91d69ab97b78a463f4037519bd8fecd5e61800fa2efc0a3f5e SHA512 b8aa8def450da878b5fafc4b4672f3c154106b5141bfd895bd29731e8fba3ba2941147c9f7ffab874470e270649a0b6eb66057031ae060b6b80671b52088d30f
+EBUILD rocr-runtime-3.9.0.ebuild 1482 BLAKE2B 7fe05d71b16e06f193dad4003aa138e1639b453bd51760e6e272618ed827aacd1f4a554af6a8a4b41dfbe0580c1d41de602001bdb13816d5e000377d63827706 SHA512 02dfacdfb77555e4e1a09aedeead1e47b2197f077a70bffb27624ceebab45e121630ff9f813972c57567debea094742e336e3caec95ed9cc8158b52ecec8dcc1
 EBUILD rocr-runtime-9999.ebuild 1467 BLAKE2B e7f4fc90dca852643f1c0ce52d1ae01f5c3f46e47b36c8a9e126e5d8929eb90dad97a7dd2aad1788acbbc07fe4f8b6630360573ddabef2b0189cd8a3957a8bc7 SHA512 8de0ae9086e20d034574f14a474f64b4fa8a506116f19e457fe149abf98dd3b9ffa1c62e2c02528b1fd0daad447fd1f80cf581b709395c2e52d6bc6470eaf019
 MISC metadata.xml 500 BLAKE2B f56d759b8a8cf351a26095b51f7c48ebd9fb72d06f0a937aa23ea6c905a04d95c1de31c5ad176f5651a3b4c6a706f22e3ace3f4ec8a99a7f293be82de25b4e2b SHA512 33ee8984ef288b26e1315ccbebb03703e3d1648db220e0b3bbbadaef38ff414c938bf01a04c69ece7672cccb268f445a11b14d15da2939729c798ef8f8801719
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild
index 2a972d7fd3d0..a53ba934d9c8 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild
@@ -29,7 +29,7 @@ COMMON_DEPEND="sys-process/numactl
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
-	>=dev-libs/rocm-device-libs-${PV}"
+	~dev-libs/rocm-device-libs-${PV}"
 BDEPEND="app-editors/vim-core"
 	# vim-core is needed for "xxd"
 
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.9.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.9.0.ebuild
new file mode 100644
index 000000000000..22be187e6afe
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-3.9.0.ebuild
@@ -0,0 +1,46 @@
+# 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.7.0-cmake-install-paths.patch"
+)
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+COMMON_DEPEND="sys-process/numactl
+	dev-libs/elfutils:="
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/roct-thunk-interface-${PV}
+	>=dev-libs/rocm-device-libs-${PV}"
+BDEPEND="app-editors/vim-core"
+	# vim-core is needed for "xxd"
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+
+	# ... otherwise system llvm/clang is used ...
+	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS /usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
+
+	# Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
+	sed -e "s:/opt/rocm/amdgcn/bitcode:/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
+
+	cmake_src_prepare
+}