[gentoo-commits] repo/gentoo:master commit in: dev-libs/amdgpu-pro-opencl/

[Marek Szuba]

commit:     1bf3c2372478a246d8a34fcfce8c57402cb47606
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  8 14:55:28 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Apr  8 14:56:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bf3c237

dev-libs/amdgpu-pro-opencl: do not force use of specific ICD loader

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild | 7 ++-----
 dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.ebuild | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild 
b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild
index ac280883334..9a74bfe7877 100644
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,8 +20,7 @@ KEYWORDS="~amd64"
 
 RESTRICT="bindist mirror fetch strip"
 
-COMMON="app-eselect/eselect-opencl
-       dev-libs/ocl-icd"
+COMMON=">=virtual/opencl-3"
 DEPEND="${COMMON}"
 RDEPEND="${COMMON}"
 
@@ -79,6 +78,4 @@ pkg_postinst() {
        elog "This package is now DEPRECATED on amd64 in favour of 
dev-libs/rocm-opencl-runtime."
        elog "Moreover, it only provides legacy AMDGPU-Pro OpenCL libraries 
which are not compatible with Vega 10 and newer GPUs."
        elog ""
-
-       "${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
 }

diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.ebuild 
b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.ebuild
index f231e2b4b31..74f04d50cda 100644
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.ebuild
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,8 +21,7 @@ KEYWORDS="~amd64 ~x86"
 RESTRICT="bindist mirror fetch strip"
 
 BDEPEND="dev-util/patchelf"
-COMMON="app-eselect/eselect-opencl
-       dev-libs/ocl-icd"
+COMMON=">=virtual/opencl-3"
 DEPEND="${COMMON}"
 RDEPEND="${COMMON}
        !media-libs/mesa[opencl]" # Bug #686790
@@ -97,6 +96,4 @@ pkg_postinst() {
        elog "This package is now DEPRECATED on amd64 in favour of 
dev-libs/rocm-opencl-runtime."
        elog "Moreover, it only provides legacy AMDGPU-Pro OpenCL libraries 
which are not compatible with Vega 10 and newer GPUs."
        elog ""
-
-       "${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
 }