gentoo resync : 13.06.2020

3 files changed, 39 insertions, 4 deletions

diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index 05e4904a0cab..55cce08cde2c 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,8 +1,10 @@
 DIST rocm-device-libs-3.0.0.tar.gz 227811 BLAKE2B 8fb866611e82126b5909b75282081371ddeea58a34d732586e43dcf23d512fb8f2ad259f2c9227e35730af0d0d2b235895aa5396a7d19c2987754162d2ed6f49 SHA512 257f8990d93bf8cb0438fa15d7ca91a7f38082c90f0bb96b0691196ec78f16e790142ecef0089bc765edf80c1f0b644210e991a7e6f7e8dfab33cedad6465fa3
 DIST rocm-device-libs-3.1.0.tar.gz 227951 BLAKE2B 06918195f4b7073089dbe3475fb12402f1ff9a514430b143f9135f63ea0f75b0ed125af69bb60995d80974661fb3f3fb8276d72dc935ce48f059bac0e9c23f85 SHA512 4238698011bb2501f15ab081e12f1c9959a92890093c8607188526e69d2a35483edf39fd55c3eba33dbc93fc1865771fde9affc7e1e0aa3bd26f1878af106e47
 DIST rocm-device-libs-3.3.0.tar.gz 227986 BLAKE2B 4d62002e06b4f69641d6733120dc6222aa9bf4a4f6af2709218f42e8d92cb1943fdc967ef6a88f62e19d46828472b91fa9b17a35dab1cda90ef2a0278398d6b7 SHA512 920d7bd6ccd423bab98c97fadb183d4d667a967e6843c41b4c5c6c0c14ceabf57ba10e7c8787cb86b0b8ddf14efa96b7422e6f4a12079e37c5da7053e8bf0a99
+DIST rocm-device-libs-3.5.0.tar.gz 228247 BLAKE2B 05b8e850e5ad4ae80bac92b6392dbc6d7bf78a63f5718e7ce5ed94fb85df356c2d1640a862ebd4587000df6c728c694535e5345a6a702e769c506fd8ebe5c606 SHA512 d8af9e93b0223ea18d96b80c3d9e0c97ef69448e3af823a802cf485ac8ed88c54dd0ac98cf5d6d2c9f66c3b197cd6991822310c7cde53b8c437083c0d6f984ac
 EBUILD rocm-device-libs-3.0.0.ebuild 812 BLAKE2B 830cff0de7f8ea43e929f86d5595a2842793372cc17d1463614127987651ce188b51ad46e2b7e1c0549cd7098800d6cb844b33adf74a14f1db884298a3051024 SHA512 4b123a3c24bb5d57720f8f8fd33d3105168d0fe7bbd750b7aba9410b155024d8b1632b95625a20cb8f4ed3c78058b13eb3ffef37485036a87ef2369611b790dc
 EBUILD rocm-device-libs-3.1.0.ebuild 812 BLAKE2B 830cff0de7f8ea43e929f86d5595a2842793372cc17d1463614127987651ce188b51ad46e2b7e1c0549cd7098800d6cb844b33adf74a14f1db884298a3051024 SHA512 4b123a3c24bb5d57720f8f8fd33d3105168d0fe7bbd750b7aba9410b155024d8b1632b95625a20cb8f4ed3c78058b13eb3ffef37485036a87ef2369611b790dc
 EBUILD rocm-device-libs-3.3.0.ebuild 814 BLAKE2B a86efd3afe14bbb6356226b215951c419cf764e7202b991b291e3e1cad4e7e68bfd100ab9e441866c9ae056876e094e7c9ee5a0b241e533401044426fed27dd7 SHA512 1c8f592d37e1865c5f55b1fe93aa4f1c25e9a0000baf1181a450b27b99c0748eb320756be50fb42e4c21aa18e7acc6bdfc897fd7fb296d13b2a0a0e37a551b30
-EBUILD rocm-device-libs-9999.ebuild 796 BLAKE2B 5367545b958dfcc880ef4f66e4c4eec50e298e5f7c043606713e5ceb1a3e52d345509fa37fca154376d64ce4bdf80de9b963f2cf091977b7133e2ac600729ecd SHA512 922e5c75a06f5e325f6d676bd04042be32ae1a726f6defc02157e011756ce3deaa409079f9e34c52ef28cd1478471d491de42c26b2430d3dc03a4c8eaeea3303
+EBUILD rocm-device-libs-3.5.0.ebuild 820 BLAKE2B cdc41b86105554d1c1cab13cb4a832f90415ebb4f89a2631388db20030a6623b3db2472334113339dff8a4aeec26cd1b50dc8d33507bd14d907c49efd780973a SHA512 1e6499561fe0d0b6caccc77ac0d4d097366c59930ece799996d1cfcc53119ca285a9ea3a496d8f39fc03b8fe5f14135280f5f2c3272ab093c57d4f88efddbd36
+EBUILD rocm-device-libs-9999.ebuild 804 BLAKE2B 89a47136834feb8bebd6487d0fdc7ba0ca921764f01938812959bd6a006df704524acc14ccdb67a7d08bd032403837bfad358c5837bf4e6e8957293c3b159d72 SHA512 e76d6647cf9ecf6beebb15541503955cd469c50f39c462e1c45be51d87072cbff603fddc9979ad795ad5ec746d625485e24eb751d41610522fbefd8aad64496a
 MISC metadata.xml 477 BLAKE2B 75910bca37a606f3ca0b41122d64b786776930f7cf00e8125496b4722d887f31506f1abec272123b66e81ce5e5ff9ffad5e3176c29e64c314e46f71c8baefb4a SHA512 ea01d8303b071b1338e53361ec9b21e73447d42e4d96598f4b723496fa48dab4f811d743f1dd188da28c7240fdf4b132775181c177fc35702d8b99ef40ef7b01
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-3.5.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-3.5.0.ebuild
new file mode 100644
index 000000000000..fa623787da83
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-3.5.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+	>=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
index 580d8c362d72..32684d9ae3f7 100644
--- a/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
@@ -10,8 +10,8 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	S="${WORKDIR}/${P}/src"
 else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
 	KEYWORDS="~amd64"
 fi
 
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
 	)
 	cmake_src_configure
 }