Merge updates from master

x11-drivers/nvidia-drivers/nvidia-drivers-610.57.04.ebuild

@@ -169,6 +169,14 @@ src_prepare() {
 	# makefile attempts to install wayland library even if not built
 	use wayland || sed -i 's/ WAYLAND_LIB_install$//' \
 		nvidia-settings/src/Makefile || die
+
+	# temporary dirty workaround for clang being stricter than gcc,
+	# reproducing requires a kernel with CONFIG_OF_GPIO enabled
+	# nv-linux.h:1737:51: error: passing 'const struct gpio_device *' [...]
+	if CC=${KERNEL_CC} tc-is-clang; then
+		sed -e 's/-Wno-error/& -Wno-error=incompatible-pointer-types-discards-qualifiers/' \
+			-i kernel-module-source/kernel-open/Kbuild || die
+	fi
 }
 
 src_compile() {