x11-drivers/nvidia-drivers : reorganise things so we support multiple versions

10 files changed, 19 insertions, 83 deletions

diff --git a/x11-drivers/nvidia-drivers-legacy/Manifest b/x11-drivers/nvidia-drivers-legacy/Manifest
deleted file mode 100644
index ea3f9a24..00000000
--- a/x11-drivers/nvidia-drivers-legacy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST NVIDIA-Linux-x86_64-390.154.run 84438529 BLAKE2B e1bd2982f9697e74b593380acf471e03192cd8d20f14bd9b43e6d5925421c518278e75515a0713be25b29bf99d7ea49c770adf2cede79736a03f323d5ed96a33 SHA512 cab7de6db783089c1e385da0296c43d2cbbe266bac2bc177044e279224a6ef9c76495b46c4b7056eb5a82b21932a2002e0c12f7659b446a2586f9df30a69a9a3
diff --git a/x11-drivers/nvidia-drivers-legacy/files/nouveau.conf b/x11-drivers/nvidia-drivers-legacy/files/nouveau.conf
deleted file mode 100644
index 00c6f588..00000000
--- a/x11-drivers/nvidia-drivers-legacy/files/nouveau.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-blacklist nouveau
-options nouveau modeset=0
-alias nouveau off
diff --git a/x11-drivers/nvidia-drivers-legacy/files/nvidia-drm-outputclass.conf b/x11-drivers/nvidia-drivers-legacy/files/nvidia-drm-outputclass.conf
deleted file mode 100644
index a94d18ca..00000000
--- a/x11-drivers/nvidia-drivers-legacy/files/nvidia-drm-outputclass.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-Section "OutputClass"
-    Identifier "nvidia"
-    MatchDriver "nvidia-drm"
-    Driver "nvidia"
-    Option "AllowEmptyInitialConfiguration"
-    ModulePath "/usr/lib64/nvidia/xorg"
-    ModulePath "/usr/lib64/xorg/modules"
-EndSection
diff --git a/x11-drivers/nvidia-drivers-legacy/files/nvidia-persistenced.conf b/x11-drivers/nvidia-drivers-legacy/files/nvidia-persistenced.conf
deleted file mode 100644
index b8be3b7c..00000000
--- a/x11-drivers/nvidia-drivers-legacy/files/nvidia-persistenced.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# run-time configuration file for /etc/init.d/nvidia-persistenced
-
-# NVPD_USER: The user nvidia-persistenced is intended to run for
-NVPD_USER="nvpd"
-
-# ARGS: Additional arguments to set the default persistence mode
-# (see nvidia-persistenced(1))
-ARGS=""
diff --git a/x11-drivers/nvidia-drivers-legacy/files/nvidia-persistenced.init b/x11-drivers/nvidia-drivers-legacy/files/nvidia-persistenced.init
deleted file mode 100644
index f80456d1..00000000
--- a/x11-drivers/nvidia-drivers-legacy/files/nvidia-persistenced.init
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/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-drivers-legacy/files/nvidia-smi.init b/x11-drivers/nvidia-drivers-legacy/files/nvidia-smi.init
deleted file mode 100644
index 8ee51e34..00000000
--- a/x11-drivers/nvidia-drivers-legacy/files/nvidia-smi.init
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/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-drivers-legacy/files/dkms.patch b/x11-drivers/nvidia-drivers/files/dkms390.patch
index 1e9af552..19e98d8d 100644
--- a/x11-drivers/nvidia-drivers-legacy/files/dkms.patch
+++ b/x11-drivers/nvidia-drivers/files/dkms390.patch
@@ -1,11 +1,12 @@
 diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf	2018-03-22 05:39:53.000000000 +0000
-+++ b/kernel/dkms.conf	2018-04-09 16:18:23.177125417 +0100
+--- a/kernel/dkms.conf	2021-11-02 06:16:12.000000000 +0000
++++ b/kernel/dkms.conf	2022-10-16 15:03:27.841471738 +0100
 @@ -1,12 +1,20 @@
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
-+PACKAGE_NAME="nvidia-drivers-legacy-dkms"
++PACKAGE_NAME="nvidia-drivers-dkms"
 +PACKAGE_VERSION="390.154"
++BUILD_EXCLUSIVE_KERNEL=""^5.*"" # only build for Kernel 5
  AUTOINSTALL="yes"
  
  # By default, DKMS will add KERNELRELEASE to the make command line; however,
@@ -13,7 +14,7 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
  # Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting
  # the 'make' command name to suppress this behavior.
 -MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules"
-+MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules"
++MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules"
  
  # The list of kernel modules will be generated by nvidia-installer at runtime.
 -__DKMS_MODULES
@@ -25,4 +26,3 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
 +DEST_MODULE_LOCATION[2]="/extra/dkms"
 +BUILT_MODULE_NAME[3]="nvidia-drm"
 +DEST_MODULE_LOCATION[3]="/extra/dkms"
-+
diff --git a/x11-drivers/nvidia-drivers/files/dkms.patch b/x11-drivers/nvidia-drivers/files/dkms470.patch
index 3e2a7cd9..7ee395df 100644
--- a/x11-drivers/nvidia-drivers/files/dkms.patch
+++ b/x11-drivers/nvidia-drivers/files/dkms470.patch
@@ -1,11 +1,12 @@
 diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf	2021-07-07 23:03:22.000000000 +0100
-+++ b/kernel/dkms.conf	2021-08-07 22:05:52.634341135 +0100
-@@ -1,12 +1,21 @@
+--- a/kernel/dkms.conf	2022-06-30 19:31:05.000000000 +0100
++++ b/kernel/dkms.conf	2022-10-16 15:06:33.644466229 +0100
+@@ -1,12 +1,22 @@
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
 +PACKAGE_NAME="nvidia-drivers-dkms"
 +PACKAGE_VERSION="470.141.03"
++BUILD_EXCLUSIVE_KERNEL=""^5.*"" # Only build for kernel 5
  AUTOINSTALL="yes"
  
  # By default, DKMS will add KERNELRELEASE to the make command line; however,
diff --git a/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.154.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
index 1d3c98cc..daabea52 100644
--- a/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.154.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
 SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )"
 
 LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0"
+SLOT="390"
 KEYWORDS="-* ~amd64"
 RESTRICT="bindist mirror"
 EMULTILIB_PKG="true"
@@ -29,12 +29,13 @@ COMMON="
 	)"
 DEPEND="${COMMON}"
 PDEPEND="
-	tools? ( ~x11-misc/nvidia-settings-legacy-${PV}:${SLOT} )
+	tools? ( ~x11-misc/nvidia-settings-${PV}:${SLOT} )
 "
 RDEPEND="
 	${COMMON}
 	>=virtual/opencl-3
-	!!x11-drivers/nvidia-drivers
+	!!x11-drivers/nvidia-drivers:470
+	!!x11-drivers/nvidia-drivers:515
 	acpi? ( sys-power/acpid )
 	dkms? ( ~sys-kernel/${PN}-dkms-${PV}:${SLOT} )
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
@@ -47,8 +48,9 @@ RDEPEND="
 
 QA_PREBUILT="opt/* usr/lib*"
 
-PATCHES=( 
-	"${FILESDIR}"/dkms.patch
+PATCHES=(
+	"${FILESDIR}"/locale.patch
+	"${FILESDIR}"/dkms390.patch
 )
 
 S=${WORKDIR}/
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild
index 83d2dc99..7af11729 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )"
 EMULTILIB_PKG="true"
 KEYWORDS="-* ~amd64"
 LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0"
+SLOT="470"
 
 IUSE="acpi +dkms multilib +tools wayland +X"
 REQUIRED_USE="tools? ( X )"
@@ -33,7 +33,8 @@ DEPEND="${COMMON}"
 RDEPEND="
 	${COMMON}
 	>=virtual/opencl-3
-	!!x11-drivers/nvidia-drivers-legacy
+	!!x11-drivers/nvidia-drivers:390
+	!!x11-drivers/nvidia-drivers:515
 	acpi? ( sys-power/acpid )
 	dkms? ( ~sys-kernel/${PN}-dkms-${PV}:${SLOT} )
 	wayland? (