gentoo resync : 31.05.2021

4 files changed, 119 insertions, 6 deletions

diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index d9a59f63afbd..95d9c24d6f8e 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,6 +1,7 @@
 AUX ocl-icd-2.2.12-gcc-10.patch 1551 BLAKE2B 0a2b6c66e83e67db9ba08af5311da65fc8795e36c9de1b25e53db8c593796c3f5903452bc3cc5c9e36c8fc32e286a588b942d9687c38d95133f125054cfbba48 SHA512 4d0a9168d31efe845c20623802aadc91bdf87524700708ba6ffcacd563344f4eb952eed99326ccd7d44b6ffbed145edae7d453b32a70362531d416c1b521bd4a
+AUX ocl-icd-2.3.0-new-headers.patch 4641 BLAKE2B 0013da2cfbe61cf98f98740055b54f2a3a1afacbf7d8845f0a3f53622e4a5e848d8d5d0be279e4717f29bc8e379affb3508aa2efa1c355c073ca42e883bdeead SHA512 951f1fb715031ebd6b1146b08d34fdc98154435129f8c1fb7b7b01ca33e10fdf2b8651c231fc1f47a41d3dc66c77df29786b3535099b7bbaac2e2b62fa4edc93
 DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
-DIST ocl-icd-2.2.14.tar.gz 100629 BLAKE2B 4862560541c979edb06d89f7f57b78a34c02e38843c02b0f125a121649cd6a33570e29c86fe7d3fd6f0fa3d489831777100daef97264e32b82854384075cbbf2 SHA512 78510b6fa4e2c6a52141a51ccf0d0ef3110b0b4902a43bb97f7622ff0ce470b108dc05c9619c28ce8758ccea1e1cf6b2e7f1a296f8b07f52532f23b2b036a5cf
-EBUILD ocl-icd-2.2.12-r3.ebuild 1200 BLAKE2B 30cdb8257c4ec6c10f47edaf53c6f3ef055cfc1107cdea5512be426a21983d9dc4352b5ff518feff23383560c565b9246781274bba8c1239d6f0af79d16d1e0a SHA512 aa0cd0135aa63dcc4521b043dcf1e00dc07bcae6deb6ed49c6802fa3979bdf433e7aaadefcf9638dc95a3a477604f2540b7f3c993ab2947444dd18e1d41838e4
-EBUILD ocl-icd-2.2.14.ebuild 1172 BLAKE2B 1e9f4b6c9a504d7b1f1e2345ceb598716299ea9043d0974e42ad6b26eeec099daf9d6902900d27e1dc3d4dffdd787e06e9f6eaf3e7ff482f777cb5929dd1f1b1 SHA512 885ec62b6b718dde98f1789acb966572292c12c5ac3c4fa650835e002ab9782887d67bbe77485b151b08ac3eead72194393d89287142e383d2764b179f40fe92
+DIST ocl-icd-2.3.0.tar.gz 100848 BLAKE2B b9e5b78df63f4865bb4cb3623fbc6bd336c86b4a9e1f23a29fab1cf11f848cb20d6d8d4a480ff44e442b02d606247a923798143058256ef59c2b16c9daf7098d SHA512 003f3661b7086a7364e79d1058591f12a7095aa2c3decfc4b496f00a0863a91cd81080f33b9308e3948045f8aca5856868ed2725f478654230e51a60d654e613
+EBUILD ocl-icd-2.2.12-r4.ebuild 1245 BLAKE2B 54353b59e3466d5bfc0b4428b77417720e22bf2313ef24db4f3ff4037f5f3752395bcd0bb5aff30213fe15c881856f1922b1184be14e6e8cd272d814d066cddf SHA512 5b2bd8bdcb082456b6f8a11dd8f58a4ee5cfb3748858558c7c9279f06451739ad92f2c7984333f1acdf593bb34813c1bf7c23dd4ad6a2fa884fa873c690dd3fd
+EBUILD ocl-icd-2.3.0.ebuild 1526 BLAKE2B 05d8c1ca540428b0131a5b09a090a1d2d9c2e18ec6548bcf34f94a32bb159a7a7a4895ed8de8452547690ae4e34cbdf3c10c7fe8e5029be052f6e01cf85da65c SHA512 a430f6108f48c20a0590e84fd94888743daceaa091a716136b6f17d69fb3adb8a363c4963d57247b58af6f929e8caaf63c52ad10a0877f0db328134d37682036
 MISC metadata.xml 396 BLAKE2B e87119ee4f6793c9fa1229c9c2430f8eba749df95522f5f658a6bc26fa22265bdcaa185e8338eef057320342beea263b64f162b2a8ad3c6aa4db73307b949244 SHA512 69effb7af79439eae9702055f6f1e20318f30ef76827e5be6d69ae63ff39a6bafbb177c681f76ac9bdf861a9921d7c897cecaea320d796e6d104dbcab9a24b79
diff --git a/dev-libs/ocl-icd/files/ocl-icd-2.3.0-new-headers.patch b/dev-libs/ocl-icd/files/ocl-icd-2.3.0-new-headers.patch
new file mode 100644
index 000000000000..aa35c96ccda6
--- /dev/null
+++ b/dev-libs/ocl-icd/files/ocl-icd-2.3.0-new-headers.patch
@@ -0,0 +1,94 @@
+From aed1832c81c0971ea001e12d41e04df834257f94 Mon Sep 17 00:00:00 2001
+From: Brice Videau <bvideau@anl.gov>
+Date: Wed, 12 May 2021 10:24:44 -0500
+Subject: [PATCH] Updated to support latest Khronos headers.
+
+---
+ icd_generator.rb                              |   4 +-
+ khronos-headers/CL/cl.h                       |  46 +--
+ khronos-headers/CL/cl_d3d10.h                 |  12 +-
+ khronos-headers/CL/cl_d3d11.h                 |  12 +-
+ khronos-headers/CL/cl_dx9_media_sharing.h     |  32 +-
+ khronos-headers/CL/cl_egl.h                   |   8 +-
+ khronos-headers/CL/cl_ext.h                   | 228 +++++++++----
+ khronos-headers/CL/cl_gl.h                    |  22 +-
+ khronos-headers/CL/cl_gl_ext.h                |  26 +-
+ khronos-headers/CL/cl_icd.h                   | 316 +++++++++---------
+ khronos-headers/CL/cl_layer.h                 |   4 +-
+ khronos-headers/CL/cl_platform.h              | 125 ++++---
+ .../CL/cl_va_api_media_sharing_intel.h        |  24 +-
+ khronos-headers/CL/opencl.h                   |   3 +-
+ ocl_interface.yaml                            |  10 +-
+ run_dummy_icd.c                               |   1 -
+ 16 files changed, 484 insertions(+), 389 deletions(-)
+
+diff --git a/icd_generator.rb b/icd_generator.rb
+index bb0f2e9..ed4217f 100644
+--- a/icd_generator.rb
++++ b/icd_generator.rb
+@@ -57,7 +57,7 @@ module IcdGenerator
+                          "clGetGLContextInfoKHR", "clUnloadCompiler",
+     "clCreateContext", "clCreateContextFromType", "clWaitForEvents"]
+   $header_files = ["/usr/include/CL/cl.h", "/usr/include/CL/cl_gl.h", "/usr/include/CL/cl_egl.h",
+-    "/usr/include/CL/cl_ext.h", "/usr/include/CL/cl_gl_ext.h"]
++    "/usr/include/CL/cl_ext.h"]
+   $windows_header_files = ["/usr/include/CL/cl_dx9_media_sharing.h", "/usr/include/CL/cl_d3d11.h", "/usr/include/CL/cl_d3d10.h"]
+   $cl_data_type_error = { "cl_platform_id"   => "CL_INVALID_PLATFORM",
+                           "cl_device_id"     => "CL_INVALID_DEVICE",
+@@ -246,7 +246,7 @@ def self.generate_run_dummy_icd_source
+     run_dummy_icd += "\n\n"
+     $api_entries.each_key { |func_name|
+        next if $forbidden_funcs.include?(func_name)
+-       run_dummy_icd += $api_entries[func_name]+";\n"
++       run_dummy_icd += $api_entries[func_name]+"\n"
+     }
+     run_dummy_icd += "\n\n"
+     run_dummy_icd += "void call_all_OpenCL_functions(cl_platform_id chosen_platform) {\n"
+diff --git a/ocl_interface.yaml b/ocl_interface.yaml
+index 1e80f16..43a0e59 100644
+--- a/ocl_interface.yaml
++++ b/ocl_interface.yaml
+@@ -674,18 +674,18 @@
+                         const cl_device_partition_property_ext * /* properties */,
+                         cl_uint /*num_entries*/,
+                         cl_device_id * /*out_devices*/,
+-                        cl_uint * /*num_devices*/ ) CL_EXT_SUFFIX__VERSION_1_1;
++                        cl_uint * /*num_devices*/ ) CL_API_SUFFIX__VERSION_1_1;
+ 90: |-
+   CL_API_ENTRY cl_int CL_API_CALL
+-  clRetainDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1;
++  clRetainDeviceEXT( cl_device_id /*device*/ ) CL_API_SUFFIX__VERSION_1_1;
+ 91: |-
+   CL_API_ENTRY cl_int CL_API_CALL
+-  clReleaseDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1;
++  clReleaseDeviceEXT( cl_device_id /*device*/ ) CL_API_SUFFIX__VERSION_1_1;
+ 92: |-
+   CL_API_ENTRY cl_event CL_API_CALL
+   clCreateEventFromGLsyncKHR(cl_context           /* context */,
+                              cl_GLsync            /* cl_GLsync */,
+-                             cl_int *             /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1;
++                             cl_int *             /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1;
+ 93: |-
+   CL_API_ENTRY cl_int CL_API_CALL
+   clCreateSubDevices(cl_device_id                         /* in_device */,
+@@ -1016,7 +1016,7 @@
+                              const void * /*input_value*/,
+                              size_t /*param_value_size*/,
+                              void* /*param_value*/,
+-                             size_t* /*param_value_size_ret*/ ) CL_EXT_SUFFIX__VERSION_2_0;
++                             size_t* /*param_value_size_ret*/ ) CL_API_SUFFIX__VERSION_2_0;
+ 137: |-
+   CL_API_ENTRY cl_kernel CL_API_CALL
+   clCloneKernel(cl_kernel     /* source_kernel */,
+diff --git a/run_dummy_icd.c b/run_dummy_icd.c
+index 400c1b0..c064b19 100644
+--- a/run_dummy_icd.c
++++ b/run_dummy_icd.c
+@@ -39,7 +39,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #  include <CL/cl_gl.h>
+ #  include <CL/cl_egl.h>
+ #  include <CL/cl_ext.h>
+-#  include <CL/cl_gl_ext.h>
+ #pragma GCC diagnostic pop
+ #include <string.h>
+ #include "ocl_icd_debug.h"
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild
index 73e2edae5f4f..d3d2516ba6d3 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE="+khronos-headers"
 
 BDEPEND="${RUBY_DEPS}"
+DEPEND="~dev-util/opencl-headers-2020.06.16"
 DEPEND="dev-util/opencl-headers"
 RDEPEND="${DEPEND}
 	!app-eselect/eselect-opencl
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.14.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
index e5b4c9f26236..3a274d0c1685 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.14.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 inherit autotools flag-o-matic multilib-minimal ruby-single
 
 DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
@@ -18,11 +18,15 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+khronos-headers"
 
 BDEPEND="${RUBY_DEPS}"
-DEPEND=">=dev-util/opencl-headers-2020.12.18"
+DEPEND=">=dev-util/opencl-headers-2021.04.29"
 RDEPEND="${DEPEND}
 	!app-eselect/eselect-opencl
 	!dev-libs/opencl-icd-loader"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-new-headers.patch
+)
+
 src_prepare() {
 	replace-flags -Os -O2 # bug 646122
 
@@ -36,6 +40,19 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers
 }
 
+multilib_src_compile() {
+	local candidates=(${USE_RUBY})
+	local ruby=
+	for (( idx=${#candidates[@]}-1 ; idx>=0 ; idx-- )) ; do
+		if ${candidates[idx]} --version &> /dev/null; then
+			ruby=${candidates[idx]} && break
+		fi
+	done
+	[[ -z ${ruby} ]] && die "No ruby executable found"
+
+	emake RUBY=${ruby}
+}
+
 multilib_src_install() {
 	default