gentoo Easter resync : 12.04.2020

3 files changed, 6 insertions, 12 deletions

diff --git a/dev-libs/amdgpu-pro-opencl/Manifest b/dev-libs/amdgpu-pro-opencl/Manifest
index 48ef84ef8987..bf531493b27b 100644
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ b/dev-libs/amdgpu-pro-opencl/Manifest
@@ -1,5 +1,5 @@
 DIST amdgpu-pro-18.20-684755-ubuntu-16.04.tar.xz 229474380 BLAKE2B f589aad71f093b74e37de40ac7c45ebbbeff93609b2fff1baaba711347a4641ef17acdcbe69d371372510a48bd48262cf6269c1f4d05e264023d52a425a423f2 SHA512 240e701acfde4ebe665cf69c8bd3710d036f450822aeb7ee2a21caab289af44167afda1d3b8d0dbe2c46c4e63d9b6fb5e96778311f342c26f334dc7beb4a2d5b
 DIST amdgpu-pro-19.30-838629-ubuntu-18.04.tar.xz 301833044 BLAKE2B ffdd49be431906c5ba20e9b285b44e368b40a70678177412d2329489c987567612f5262b64a9a1aef137cef603f77f768127d674c13488e13dddbc8732cf729c SHA512 7e8091dd37ae176d1ff131e5e2b13961f5a33fc7243052dce074dffb1468476f267d50a920182358188e44f4a93d0cbf39c5d430d56a9a2e09a67409e3478904
-EBUILD amdgpu-pro-opencl-18.20.684755.ebuild 2574 BLAKE2B 5a0803e196fcb4a232e60a7102689f1cdd602f221c81a36048ae2fcd4c8dd971f3e9f46155193369914b120c5a6a3e82956dcaf57017332c0c140f4a63a93d65 SHA512 feac3ec718dff28ca8dbb49e86f0bba8113ea3da4b52129e2f6f26732033bb28f478a99dd04eb80dab1dae2db403bb263fd06be39c0ca50a6d4c9eab9367d42c
-EBUILD amdgpu-pro-opencl-19.30.838629.ebuild 3182 BLAKE2B f1e24bde49315be0f6415d4e8c2c0a2660df7e4ea461ad458913517e1e287e37a7839c7e82a3069dec35b0c3b265ddb3cd4fecea663c728c244af7c60eb6905c SHA512 b600cc8ec5104bd6a2a466608470841329a054833defd680d4295f31a4f7845d0fb4b7248481c6ddc597344cb5b0eca61631bc517d97f1a3f2367564a589db0e
+EBUILD amdgpu-pro-opencl-18.20.684755.ebuild 2491 BLAKE2B 7c99461fe17538e95a80513d27c8d87f4be8eb1c00a81c3abbf6d9c49e671b7d61a56cc70bb0b9ca753cd331417fb2eebccf3793e75689fe1b2b9246a1907591 SHA512 03bcf084c404fd95b3791f766ff01a9b9a0790f5d757a83c0a17c5e4a1daa38ef53ea0e1a9e49b866c04b9a05ee1c74e64f7883a900a14f3bdf247ba8a6825c6
+EBUILD amdgpu-pro-opencl-19.30.838629.ebuild 3099 BLAKE2B 451562cc7dda6ef744ca976eee0527acc42059c5c0454cf8e5c4e06cb9a3ddd84d2abb9df5e23fd1c18481fa5856c74598fb2cccdc6585ffd656a6a826463c9c SHA512 ced6cd69974c5f4f03a29f6a02fa92ab2081cc48cc0c31fdd733dad3d524f175022242dc25318804f1963530136c9c63882fabc4ba621105ab3e6fce52ea386b
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
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 ac280883334e..9a74bfe7877e 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 f231e2b4b31d..74f04d50cda4 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
 }