profiles: Update the ICD-loader mask (commit a41cdae97af)

One, mask the versions of dev-libs/ocl-icd installing directly into
/usr as well. Two, update the explanation to indicate migration of
nvidia-drivers and non-trivial upgrade path as current reasons for
keeping these masked for now.

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

diff --git a/profiles/package.mask b/profiles/package.mask
index e20e3a85aa60c41bfeaf1cb8db1c7f019601f57a..1530938083e94555c117fe356794f19821acba4d 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -43,14 +43,17 @@ dev-tcltk/tcl-mccp
 >=dev-libs/libressl-3.1.0
 
 # Marek Szuba <marecki@gentoo.org> (2020-04-08)
-# Both of these block app-eselect/eselect-opencl in order to prevent
+# All of these block app-eselect/eselect-opencl in order to prevent
 # file collisions in /usr/include/CL and on /usr/lib/libOpenCL.so* .
-# However, virtual/opencl-3 as it stands now does not support
-# opencl-icd-loader yet and only pulls in dev-libs/ocl-icd - which depends
-# on eselect-opencl.
-# Will extend the virtual and remove the mask once satisfied with both
-# the new ICD loader itself and the sanity of the eselect-free approach
-# to OpenCL.
+# However, eselect-opencl is still required by x11-drivers/nvidia-drivers
+# (even with USE=-uvm, i.e. when it does NOT handle OpenCL) - which by design
+# does not appear in virtual/opencl-3.
+# Moreover, upgrading to either of the loader ebuilds listed here
+# will on systems using FEATURES=collision-protect require prior manual
+# clean-up of libOpenCL links created by eselect-opencl so even with the Nvidia
+# situation taken care of, we should probably publish an appropriate news item
+# before unmasking these.
+>=dev-libs/ocl-icd-2.2.12-r3
 dev-libs/opencl-icd-loader
 dev-util/opencl-headers