19 files changed, 21 insertions, 137 deletions
diff --git a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-390.157-r1 b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-390.157-r2
index 6da1ac67..6da1ac67 100644
--- a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-390.157-r1
+++ b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-390.157-r2
diff --git a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.161.03-r1 b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.161.03-r2
index 5b1e940b..5b1e940b 100644
--- a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.161.03-r1
+++ b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.161.03-r2
diff --git a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-515.86.01-r1 b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-515.86.01-r2
index 046f1184..046f1184 100644
--- a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-515.86.01-r1
+++ b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-515.86.01-r2
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r2
index aac3f975..2f0492c7 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r2
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror strip
 SLOT=390
 SRC_URI=amd64? ( http://http.download.nvidia.com/XFree86/Linux-x86_64/390.157/NVIDIA-Linux-x86_64-390.157.run )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	portability	58227860123d3e8da23290064ce3373e	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	65735fed9c1c30cb461c90db600ac990	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f40fcd6ef9a12555d78e8b531edb2813
+_md5_=511d5b3cda822bcc848685f5a00ef669
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.161.03-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.161.03-r2
index 405dcae9..bed2a7c3 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.161.03-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.161.03-r2
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror strip
 SLOT=470
 SRC_URI=amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/470.161.03/NVIDIA-Linux-x86_64-470.161.03.run )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	portability	58227860123d3e8da23290064ce3373e	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	65735fed9c1c30cb461c90db600ac990	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fe5da112e12d31acad5883378591198e
+_md5_=64568abdd25b9a61c61905a605ec5f37
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.86.01-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.86.01-r2
index 289adf91..96610f13 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.86.01-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.86.01-r2
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror strip
 SLOT=515
 SRC_URI=amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/515.86.01/NVIDIA-Linux-x86_64-515.86.01.run )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	portability	58227860123d3e8da23290064ce3373e	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	65735fed9c1c30cb461c90db600ac990	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=97a9eb511a8ed882784171f500b397ae
+_md5_=5ef71a955507c2c8ac74bedb4c4fb3c5
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index a3c99bef..331f7c55 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -66,7 +66,7 @@ sys-kernel/linux-image-redcore 6.2.8: Redcore Linux Kernel Image
 sys-kernel/linux-image-redcore-lts 5.10.176 5.15.104 6.1.21: Redcore Linux LTS Kernel Image
 sys-kernel/linux-sources-redcore 6.2.8: Redcore Linux Kernel Sources
 sys-kernel/linux-sources-redcore-lts 5.10.176 5.15.104 6.1.21: Redcore Linux LTS Kernel Sources
-sys-kernel/nvidia-drivers-dkms 390.157-r1 470.161.03-r1 515.86.01-r1 525.85.05: NVIDIA driver sources for linux
+sys-kernel/nvidia-drivers-dkms 390.157-r2 470.161.03-r2 515.86.01-r2 525.85.05: NVIDIA driver sources for linux
 sys-kernel/vhba-dkms 20211218: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sources
 sys-kernel/virtualbox-modules-dkms 7.0.6: Kernel Modules source for Virtualbox
 sys-kernel/zfs-dkms 2.1.9-r1: ZFS sources for linux
@@ -80,7 +80,7 @@ virtual/tmpfiles 1.314.1337: Virtual to select between different tmpfiles.d hand
 virtual/udev 314.1337: Virtual to select between different udev daemon providers
 x11-base/xorg-drivers 21.1-r100: Meta package containing deps on all xorg drivers (dummy package)
 x11-base/xorg-server 21.1.7-r10: X.Org X servers
-x11-drivers/nvidia-drivers 390.157-r1 470.161.03-r1 515.86.01-r1 525.85.05: NVIDIA Accelerated Graphics Driver
+x11-drivers/nvidia-drivers 390.157-r2 470.161.03-r2 515.86.01-r2 525.85.05: NVIDIA Accelerated Graphics Driver
 x11-libs/gtk+ 2.24.33-r3 3.24.34-r2: Gimp ToolKit +
 x11-libs/libX11 1.8.1-r1: X.Org X11 library
 x11-misc/nvidia-prime 314: NVIDIA Prime Render Offload configuration and utilities
diff --git a/sys-kernel/nvidia-drivers-dkms/files/dkms390.patch b/sys-kernel/nvidia-drivers-dkms/files/dkms390.patch
index 45fff603..402ecdf1 100644
--- a/sys-kernel/nvidia-drivers-dkms/files/dkms390.patch
+++ b/sys-kernel/nvidia-drivers-dkms/files/dkms390.patch
@@ -1,11 +1,12 @@
 diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf	2021-11-02 06:16:12.000000000 +0000
-+++ b/kernel/dkms.conf	2022-10-16 19:24:47.535006817 +0100
-@@ -1,12 +1,19 @@
+--- a/kernel/dkms.conf	2021-11-07 11:53:27.000000000 +0000
++++ b/kernel/dkms.conf	2023-03-29 11:57:23.888798613 +0100
+@@ -1,12 +1,20 @@
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
 +PACKAGE_NAME="nvidia-drivers-dkms"
 +PACKAGE_VERSION="390.157"
++BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-1]\.)" # only build for kernels v5.x.x up to and including v6.1.x
  AUTOINSTALL="yes"
  
  # By default, DKMS will add KERNELRELEASE to the make command line; however,
diff --git a/sys-kernel/nvidia-drivers-dkms/files/dkms470.patch b/sys-kernel/nvidia-drivers-dkms/files/dkms470.patch
index 2144b6aa..1a6c223c 100644
--- a/sys-kernel/nvidia-drivers-dkms/files/dkms470.patch
+++ b/sys-kernel/nvidia-drivers-dkms/files/dkms470.patch
@@ -1,11 +1,12 @@
 diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf	2022-06-30 19:31:05.000000000 +0100
-+++ b/kernel/dkms.conf	2022-10-16 19:27:00.128002886 +0100
-@@ -1,12 +1,21 @@
+--- a/kernel/dkms.conf	2022-10-19 01:02:01.000000000 +0100
++++ b/kernel/dkms.conf	2023-03-29 11:59:55.126812687 +0100
+@@ -1,12 +1,22 @@
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
 +PACKAGE_NAME="nvidia-drivers-dkms"
 +PACKAGE_VERSION="470.161.03"
++BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-1]\.)" # only build for kernels v5.x.x up to and including v6.1.x
  AUTOINSTALL="yes"
  
  # By default, DKMS will add KERNELRELEASE to the make command line; however,
diff --git a/sys-kernel/nvidia-drivers-dkms/files/dkms515.patch b/sys-kernel/nvidia-drivers-dkms/files/dkms515.patch
index 6d83f27d..b18f38f5 100644
--- a/sys-kernel/nvidia-drivers-dkms/files/dkms515.patch
+++ b/sys-kernel/nvidia-drivers-dkms/files/dkms515.patch
@@ -1,11 +1,12 @@
 diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf	2022-07-20 14:40:39.000000000 +0100
-+++ b/kernel/dkms.conf	2022-10-16 17:59:20.342158844 +0100
-@@ -1,12 +1,21 @@
+--- a/kernel/dkms.conf	2022-10-26 09:58:29.000000000 +0100
++++ b/kernel/dkms.conf	2023-03-29 12:04:16.447837005 +0100
+@@ -1,12 +1,22 @@
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
 +PACKAGE_NAME="nvidia-drivers-dkms"
 +PACKAGE_VERSION="515.86.01"
++BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-1]\.)" # only build for kernels v5.x.x up to and including v6.1.x
  AUTOINSTALL="yes"
  
  # By default, DKMS will add KERNELRELEASE to the make command line; however,
@@ -28,13 +29,14 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
 +BUILT_MODULE_NAME[4]="nvidia-peermem"
 +DEST_MODULE_LOCATION[4]="/extra/dkms"
 diff -Nur a/kernel-open/dkms.conf b/kernel-open/dkms.conf
---- a/kernel-open/dkms.conf	2022-07-20 14:40:39.000000000 +0100
-+++ b/kernel-open/dkms.conf	2022-10-16 17:59:28.942158589 +0100
-@@ -1,12 +1,21 @@
+--- a/kernel-open/dkms.conf	2022-10-26 09:58:29.000000000 +0100
++++ b/kernel-open/dkms.conf	2023-03-29 12:04:25.738837870 +0100
+@@ -1,12 +1,22 @@
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
 +PACKAGE_NAME="nvidia-drivers-dkms"
 +PACKAGE_VERSION="515.86.01"
++BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-1]\.)" # only build for kernels v5.x.x up to and including v6.1.x
  AUTOINSTALL="yes"
  
  # By default, DKMS will add KERNELRELEASE to the make command line; however,
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.157-r1.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.157-r2.ebuild
index 56f68d54..56f68d54 100644
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.157-r1.ebuild
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.157-r2.ebuild
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.161.03-r1.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.161.03-r2.ebuild
index c44811c5..c44811c5 100644
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.161.03-r1.ebuild
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.161.03-r2.ebuild
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-515.86.01-r1.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-515.86.01-r2.ebuild
index 45d81756..45d81756 100644
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-515.86.01-r1.ebuild
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-515.86.01-r2.ebuild
diff --git a/x11-drivers/nvidia-drivers/files/dkms390.patch b/x11-drivers/nvidia-drivers/files/dkms390.patch
deleted file mode 100644
index 45fff603..00000000
--- a/x11-drivers/nvidia-drivers/files/dkms390.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf	2021-11-02 06:16:12.000000000 +0000
-+++ b/kernel/dkms.conf	2022-10-16 19:24:47.535006817 +0100
-@@ -1,12 +1,19 @@
--PACKAGE_NAME="nvidia"
--PACKAGE_VERSION="__VERSION_STRING"
-+PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="390.157"
- AUTOINSTALL="yes"
- 
- # By default, DKMS will add KERNELRELEASE to the make command line; however,
- # this will cause the kernel module build to infer that it was invoked via
- # 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} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules"
- 
- # The list of kernel modules will be generated by nvidia-installer at runtime.
--__DKMS_MODULES
-+BUILT_MODULE_NAME[0]="nvidia"
-+DEST_MODULE_LOCATION[0]="/extra/dkms"
-+BUILT_MODULE_NAME[1]="nvidia-uvm"
-+DEST_MODULE_LOCATION[1]="/extra/dkms"
-+BUILT_MODULE_NAME[2]="nvidia-modeset"
-+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/dkms470.patch b/x11-drivers/nvidia-drivers/files/dkms470.patch
deleted file mode 100644
index 2144b6aa..00000000
--- a/x11-drivers/nvidia-drivers/files/dkms470.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf	2022-06-30 19:31:05.000000000 +0100
-+++ b/kernel/dkms.conf	2022-10-16 19:27:00.128002886 +0100
-@@ -1,12 +1,21 @@
--PACKAGE_NAME="nvidia"
--PACKAGE_VERSION="__VERSION_STRING"
-+PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="470.161.03"
- AUTOINSTALL="yes"
- 
- # By default, DKMS will add KERNELRELEASE to the make command line; however,
- # this will cause the kernel module build to infer that it was invoked via
- # 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} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' 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
-+BUILT_MODULE_NAME[0]="nvidia"
-+DEST_MODULE_LOCATION[0]="/extra/dkms"
-+BUILT_MODULE_NAME[1]="nvidia-uvm"
-+DEST_MODULE_LOCATION[1]="/extra/dkms"
-+BUILT_MODULE_NAME[2]="nvidia-modeset"
-+DEST_MODULE_LOCATION[2]="/extra/dkms"
-+BUILT_MODULE_NAME[3]="nvidia-drm"
-+DEST_MODULE_LOCATION[3]="/extra/dkms"
-+BUILT_MODULE_NAME[4]="nvidia-peermem"
-+DEST_MODULE_LOCATION[4]="/extra/dkms"
diff --git a/x11-drivers/nvidia-drivers/files/dkms515.patch b/x11-drivers/nvidia-drivers/files/dkms515.patch
deleted file mode 100644
index 6d83f27d..00000000
--- a/x11-drivers/nvidia-drivers/files/dkms515.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf	2022-07-20 14:40:39.000000000 +0100
-+++ b/kernel/dkms.conf	2022-10-16 17:59:20.342158844 +0100
-@@ -1,12 +1,21 @@
--PACKAGE_NAME="nvidia"
--PACKAGE_VERSION="__VERSION_STRING"
-+PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="515.86.01"
- AUTOINSTALL="yes"
- 
- # By default, DKMS will add KERNELRELEASE to the make command line; however,
- # this will cause the kernel module build to infer that it was invoked via
- # 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} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules"
- 
- # The list of kernel modules will be generated by nvidia-installer at runtime.
--__DKMS_MODULES
-+BUILT_MODULE_NAME[0]="nvidia"
-+DEST_MODULE_LOCATION[0]="/extra/dkms"
-+BUILT_MODULE_NAME[1]="nvidia-uvm"
-+DEST_MODULE_LOCATION[1]="/extra/dkms"
-+BUILT_MODULE_NAME[2]="nvidia-modeset"
-+DEST_MODULE_LOCATION[2]="/extra/dkms"
-+BUILT_MODULE_NAME[3]="nvidia-drm"
-+DEST_MODULE_LOCATION[3]="/extra/dkms"
-+BUILT_MODULE_NAME[4]="nvidia-peermem"
-+DEST_MODULE_LOCATION[4]="/extra/dkms"
-diff -Nur a/kernel-open/dkms.conf b/kernel-open/dkms.conf
---- a/kernel-open/dkms.conf	2022-07-20 14:40:39.000000000 +0100
-+++ b/kernel-open/dkms.conf	2022-10-16 17:59:28.942158589 +0100
-@@ -1,12 +1,21 @@
--PACKAGE_NAME="nvidia"
--PACKAGE_VERSION="__VERSION_STRING"
-+PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="515.86.01"
- AUTOINSTALL="yes"
- 
- # By default, DKMS will add KERNELRELEASE to the make command line; however,
- # this will cause the kernel module build to infer that it was invoked via
- # 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} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules"
- 
- # The list of kernel modules will be generated by nvidia-installer at runtime.
--__DKMS_MODULES
-+BUILT_MODULE_NAME[0]="nvidia"
-+DEST_MODULE_LOCATION[0]="/extra/dkms"
-+BUILT_MODULE_NAME[1]="nvidia-uvm"
-+DEST_MODULE_LOCATION[1]="/extra/dkms"
-+BUILT_MODULE_NAME[2]="nvidia-modeset"
-+DEST_MODULE_LOCATION[2]="/extra/dkms"
-+BUILT_MODULE_NAME[3]="nvidia-drm"
-+DEST_MODULE_LOCATION[3]="/extra/dkms"
-+BUILT_MODULE_NAME[4]="nvidia-peermem"
-+DEST_MODULE_LOCATION[4]="/extra/dkms"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r2.ebuild
index 245d28c5..d7d6682e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r2.ebuild
@@ -49,10 +49,6 @@ RDEPEND="
 
 QA_PREBUILT="opt/* usr/lib*"
 
-PATCHES=(
-	"${FILESDIR}"/dkms390.patch
-)
-
 S=${WORKDIR}/
 
 pkg_setup() {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03-r2.ebuild
index 8ff9f823..25c5a870 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03-r2.ebuild
@@ -54,7 +54,6 @@ PDEPEND="tools? ( ~x11-misc/nvidia-settings-${PV}:${SLOT} )
 QA_PREBUILT="opt/* usr/lib*"
 S=${WORKDIR}/
 PATCHES=(
-	"${FILESDIR}"/dkms470.patch
 	"${FILESDIR}"/locale.patch
 )
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01-r2.ebuild
index 5d15add9..62400c2f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.86.01-r2.ebuild
@@ -55,7 +55,6 @@ PDEPEND="tools? ( ~x11-misc/nvidia-settings-${PV}:${SLOT} )
 QA_PREBUILT="opt/* usr/lib*"
 S=${WORKDIR}/
 PATCHES=(
-	"${FILESDIR}"/dkms515.patch
 	"${FILESDIR}"/locale.patch
 )