10 files changed, 71 insertions, 3 deletions
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 7e56b5d2..fd010567 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,2 +1 @@
-DIST NVIDIA-Linux-x86_64-390.132.run 82900057 BLAKE2B e94cc2493701e34c4dd2f0fc4f89501d6b1d3e44abf80af2eff20c19a22c1160ce322c25d2b5b13e212bf48fb41f94d3c1bb6f9251302e6c8facb687d807a3dc SHA512 bad3453472e8af9ef0681b82db75f9c53816a7d57ff2bf1facd2ea010e757bf7fd4fb907317471934a0cb56510eaf2a90503a3a86ec80b76afdacfa2b9ee6c13
 DIST NVIDIA-Linux-x86_64-440.44.run 141266881 BLAKE2B bc5ddcf9a6498c14bd9f9421a622bd647e83c8d296953923525680898548012cc9d01d078722a3194b6def5b5a90ed37b2dc08967a9603affabf449dbc87e69d SHA512 c0c0e19cdb82d47575adbcf46e23580977cf7a5097edfb9d76464c2e678a44f556d8c2d0d49515a86b6765f57176460193c6951927e24c278e6a7f411f89f26b
diff --git a/x11-drivers/nvidia-legacy-drivers/Manifest b/x11-drivers/nvidia-legacy-drivers/Manifest
new file mode 100644
index 00000000..b796b9e4
--- /dev/null
+++ b/x11-drivers/nvidia-legacy-drivers/Manifest
@@ -0,0 +1 @@
+DIST NVIDIA-Linux-x86_64-390.132.run 82900057 BLAKE2B e94cc2493701e34c4dd2f0fc4f89501d6b1d3e44abf80af2eff20c19a22c1160ce322c25d2b5b13e212bf48fb41f94d3c1bb6f9251302e6c8facb687d807a3dc SHA512 bad3453472e8af9ef0681b82db75f9c53816a7d57ff2bf1facd2ea010e757bf7fd4fb907317471934a0cb56510eaf2a90503a3a86ec80b76afdacfa2b9ee6c13
diff --git a/x11-drivers/nvidia-drivers/files/kernel-4.16.patch b/x11-drivers/nvidia-legacy-drivers/files/kernel-4.16.patch
index 67172815..67172815 100644
--- a/x11-drivers/nvidia-drivers/files/kernel-4.16.patch
+++ b/x11-drivers/nvidia-legacy-drivers/files/kernel-4.16.patch
diff --git a/x11-drivers/nvidia-legacy-drivers/files/nvidia-drm-outputclass.conf b/x11-drivers/nvidia-legacy-drivers/files/nvidia-drm-outputclass.conf
new file mode 100644
index 00000000..9c36f59b
--- /dev/null
+++ b/x11-drivers/nvidia-legacy-drivers/files/nvidia-drm-outputclass.conf
@@ -0,0 +1,8 @@
+Section "OutputClass"
+    Identifier "nvidia"
+    MatchDriver "nvidia-drm"
+    Driver "nvidia"
+    Option "AllowEmptyInitialConfiguration"
+    ModulePath "/usr/lib/nvidia/xorg"
+    ModulePath "/usr/lib/xorg/modules"
+EndSection
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.132-conf.patch b/x11-drivers/nvidia-legacy-drivers/files/nvidia-legacy-drivers-390.132-conf.patch
index a121e93b..3ba17a8c 100644
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.132-conf.patch
+++ b/x11-drivers/nvidia-legacy-drivers/files/nvidia-legacy-drivers-390.132-conf.patch
@@ -4,7 +4,7 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
 @@ -1,12 +1,20 @@
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
-+PACKAGE_NAME="nvidia-drivers-dkms"
++PACKAGE_NAME="nvidia-legacy-drivers-dkms"
 +PACKAGE_VERSION="390.132"
  AUTOINSTALL="yes"
  
diff --git a/x11-drivers/nvidia-legacy-drivers/files/nvidia-persistenced.conf b/x11-drivers/nvidia-legacy-drivers/files/nvidia-persistenced.conf
new file mode 100644
index 00000000..637ac1af
--- /dev/null
+++ b/x11-drivers/nvidia-legacy-drivers/files/nvidia-persistenced.conf
@@ -0,0 +1,8 @@
+# run-time configuration file for /etc/init.d/nvidia-persistenced
+
+# NVPD_USER: The user nvidia-persistenced is intended to run for
+NVPD_USER=""
+
+# ARGS: Additional arguments to set the default persistence mode
+# (see nvidia-persistenced(1))
+ARGS=""
diff --git a/x11-drivers/nvidia-legacy-drivers/files/nvidia-persistenced.init b/x11-drivers/nvidia-legacy-drivers/files/nvidia-persistenced.init
new file mode 100644
index 00000000..f80456d1
--- /dev/null
+++ b/x11-drivers/nvidia-legacy-drivers/files/nvidia-persistenced.init
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/var/run/nvidia-persistenced/nvidia-persistenced.pid"
+
+start() {
+	if ! [ "${NVPD_USER}x" = x ]; then
+		ebegin "Starting nvidia-persistenced for ${NVPD_USER}"
+		NVPD_USER_ARG="--user ${NVPD_USER}"
+	else
+		ebegin "Starting nvidia-persistenced"
+	fi
+	start-stop-daemon --start --quiet --pidfile ${pidfile} \
+		--background --exec /opt/bin/nvidia-persistenced \
+		-- ${NVPD_USER_ARG} ${ARGS}
+	eend $?	
+}
+
+stop() {
+	ebegin "Stopping nvidia-persistenced"
+	start-stop-daemon --stop --quiet --pidfile ${pidfile}
+	eend $?
+}
diff --git a/x11-drivers/nvidia-legacy-drivers/files/nvidia-smi.init b/x11-drivers/nvidia-legacy-drivers/files/nvidia-smi.init
new file mode 100644
index 00000000..8ee51e34
--- /dev/null
+++ b/x11-drivers/nvidia-legacy-drivers/files/nvidia-smi.init
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/nvidia-smi.pid"
+
+depend() {
+    after modules
+}
+
+start() {
+	ebegin "Starting NVIDIA System Management Interface"
+	rm -f ${pidfile}
+	start-stop-daemon --start --quiet --pidfile ${pidfile} \
+		--make-pidfile --background --exec /opt/bin/nvidia-smi -- \
+		-q -l 300
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping NVIDIA System Management Interface"
+	start-stop-daemon --stop --quiet --pidfile ${pidfile}
+	eend $?
+}
diff --git a/x11-drivers/nvidia-legacy-drivers/files/nvidia.conf b/x11-drivers/nvidia-legacy-drivers/files/nvidia.conf
new file mode 100644
index 00000000..00c6f588
--- /dev/null
+++ b/x11-drivers/nvidia-legacy-drivers/files/nvidia.conf
@@ -0,0 +1,3 @@
+blacklist nouveau
+options nouveau modeset=0
+alias nouveau off
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132.ebuild b/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-390.132.ebuild
index 07a937c4..b5b74115 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132.ebuild
+++ b/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-390.132.ebuild
@@ -31,9 +31,10 @@ COMMON="
 	)"
 DEPEND="${COMMON}"
 PDEPEND="
-	tools? ( x11-misc/nvidia-settings:${SLOT} )"
+	tools? ( x11-misc/nvidia-legacy-settings:${SLOT} )"
 RDEPEND="
 	${COMMON}
+	!!x11-drivers/nvidia-drivers
 	acpi? ( sys-power/acpid )
 	dkms? ( sys-kernel/${PN}-dkms:${SLOT} )
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )