From 126b3c9aa4647f21728b08988598c3821309a029 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 4 Jan 2020 20:17:15 +0000
Subject: x11-drivers/nvidia-drivers : blacklist nouveau on installation

---
 x11-drivers/nvidia-drivers/files/nvidia.conf             | 1 +
 x11-drivers/nvidia-drivers/nvidia-drivers-390.132.ebuild | 7 +++++--
 x11-drivers/nvidia-drivers/nvidia-drivers-440.44.ebuild  | 9 ++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 x11-drivers/nvidia-drivers/files/nvidia.conf

(limited to 'x11-drivers')

diff --git a/x11-drivers/nvidia-drivers/files/nvidia.conf b/x11-drivers/nvidia-drivers/files/nvidia.conf
new file mode 100644
index 00000000..31075c0d
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia.conf
@@ -0,0 +1 @@
+blacklist nouveau
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132.ebuild
index 4981460c..93f63478 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132.ebuild
@@ -144,6 +144,9 @@ src_install() {
 		doins ${NV_X11}/10_nvidia_wayland.json
 	fi
 
+	insinto /etc/modprobe.d
+	doins "${FILESDIR}"/nvidia.conf
+
 	# NVIDIA kernel <-> userspace driver config lib
 	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
 
@@ -173,8 +176,8 @@ src_install() {
 
 	# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
 	doexe ${NV_OBJ}/nvidia-modprobe
-	#fowners root:video /opt/bin/nvidia-modprobe
-	#fperms 4710 /opt/bin/nvidia-modprobe
+	fowners root:video /opt/bin/nvidia-modprobe
+	fperms 4710 /opt/bin/nvidia-modprobe
 	dosym /{opt,usr}/bin/nvidia-modprobe
 
 	# init
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.44.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.44.ebuild
index dc45391d..f1e13dde 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.44.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.44.ebuild
@@ -145,6 +145,9 @@ src_install() {
 
 		insinto /usr/share/glvnd/egl_vendor.d
 		doins ${NV_X11}/10_nvidia.json
+
+		insinto /etc/vulkan/icd.d
+		doins ${NV_X11}/nvidia_icd.json
 	fi
 
 	if use wayland; then
@@ -152,6 +155,9 @@ src_install() {
 		doins ${NV_X11}/10_nvidia_wayland.json
 	fi
 
+	insinto /etc/modprobe.d
+	doins "${FILESDIR}"/nvidia.conf
+
 	# OpenCL ICD for NVIDIA
 	insinto /etc/OpenCL/vendors
 	doins ${NV_OBJ}/nvidia.icd
@@ -161,9 +167,6 @@ src_install() {
 
 	if use X; then
 		doexe ${NV_OBJ}/nvidia-xconfig
-
-		insinto /etc/vulkan/icd.d
-		doins nvidia_icd.json
 	fi
 
 	doexe ${NV_OBJ}/nvidia-cuda-mps-control
-- 
cgit v1.2.3