--- /usr/portage/media-libs/mesa/mesa-17.3.0_rc4.ebuild.old	2017-11-15 23:40:34.958224749 +0200
+++ /usr/portage/media-libs/mesa/mesa-17.3.0_rc4.ebuild	2017-11-15 23:44:10.439742855 +0200
@@ -40,8 +40,8 @@
 
 IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
-	+llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
-	vdpau vulkan wayland xvmc xa"
+	+llvm +nptl opencl opencl-icd osmesa pax_kernel openmax pic selinux vaapi
+	valgrind vdpau vulkan wayland xvmc xa"
 
 REQUIRED_USE="
 	d3d9?   ( dri3 gallium )
@@ -50,6 +50,7 @@
 	openmax? ( gallium )
 	gles1?  ( egl )
 	gles2?  ( egl )
+	opencl-icd ( opencl )
 	vaapi? ( gallium )
 	vdpau? ( gallium )
 	vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
@@ -110,6 +111,7 @@
 				app-eselect/eselect-opencl
 				dev-libs/libclc
 				virtual/libelf:0=[${MULTILIB_USEDEP}]
+				opencl-icd? ( dev-libs/ocl-icd )
 			)
 	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
 	vaapi? (
@@ -352,6 +354,7 @@
 		if use opencl; then
 			myconf+="
 				$(use_enable opencl)
+				$(use_enable opencl-icd)
 				--with-clang-libdir="${EPREFIX}/usr/lib"
 				"
 		fi