commit:     095334b1c0663323a12ef30c56d83ecb6506227f
Author:     Wilfried Holzke <gentoo <AT> holzke <DOT> net>
AuthorDate: Sun Jun  7 07:36:43 2020 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Sun Jun  7 18:16:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=095334b1

dev-libs/rocm-device-libs: New ebuild for rocm-device-libs 3.5.0

Signed-off-by: Wilfried Holzke <gentoo <AT> holzke.net>
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Closes: https://github.com/gentoo/gentoo/pull/16104
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 dev-libs/rocm-device-libs/Manifest                             |  1 +
 ...m-device-libs-9999.ebuild => rocm-device-libs-3.5.0.ebuild} | 10 +++++-----
 dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild         |  6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dev-libs/rocm-device-libs/Manifest 
b/dev-libs/rocm-device-libs/Manifest
index ec030195cd5..d3f5b39dd2e 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild 
b/dev-libs/rocm-device-libs/rocm-device-libs-3.5.0.ebuild
similarity index 73%
copy from dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
copy to dev-libs/rocm-device-libs/rocm-device-libs-3.5.0.ebuild
index 580d8c362d7..fa623787da8 100644
--- a/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-3.5.0.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
 
@@ -21,13 +21,13 @@ 
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs";
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 
-RDEPEND="dev-libs/rocr-runtime
-       sys-devel/llvm-roc:="
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+       >=sys-devel/llvm-roc-${PV}:="
 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
 }

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 580d8c362d7..32684d9ae3f 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
 }

Reply via email to