--- nvidia-drivers-361.28.ebuild        2016-04-12 07:32:30.000000000 +0200
+++ nvidia-drivers-361.28-r100.ebuild   2016-08-26 16:55:58.709159034 +0200
@@ -29,7 +29,7 @@
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
 
-IUSE="acpi +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm +X"
+IUSE="acpi +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib +opencl pax_kernel static-libs +tools uvm +X"
 REQUIRED_USE="
        tools? ( X )
        static-libs? ( tools )
@@ -427,9 +427,7 @@
                        "libGLX.so.0 ${GL_ROOT}"
                        "libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
                        "libGLdispatch.so.0 ${GL_ROOT}"
-                       "libOpenCL.so.1.0.0 ${CL_ROOT}"
                        "libOpenGL.so.0 ${GL_ROOT}"
-                       "libcuda.so.${NV_SOVER}"
                        "libnvcuvid.so.${NV_SOVER}"
                        "libnvidia-compiler.so.${NV_SOVER}"
                        "libnvidia-eglcore.so.${NV_SOVER}"
@@ -439,7 +437,6 @@
                        "libnvidia-glcore.so.${NV_SOVER}"
                        "libnvidia-glsi.so.${NV_SOVER}"
                        "libnvidia-ifr.so.${NV_SOVER}"
-                       "libnvidia-opencl.so.${NV_SOVER}"
                        "libnvidia-ptxjitcompiler.so.${NV_SOVER}"
                        "libvdpau_nvidia.so.${NV_SOVER}"
                )
@@ -464,6 +461,24 @@
                        donvidia ${libdir}/${NV_LIB}
                done
        fi
+
+       if use opencl; then
+               NV_OPENCL_LIBRARIES=(
+                       "libOpenCL.so.1.0.0 ${CL_ROOT}"
+                       "libcuda.so.${NV_SOVER}"
+                       "libnvidia-opencl.so.${NV_SOVER}"
+               )
+
+               if use kernel_linux; then
+                       NV_OPENCL_LIBRARIES+=(
+                               "libnvidia-ml.so.${NV_SOVER}"
+                       )
+               fi
+
+               for NV_LIB in "${NV_OPENCL_LIBRARIES[@]}"; do
+                       donvidia ${libdir}/${NV_LIB}
+               done
+       fi
 }
 
 pkg_preinst() {